diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md
index d9246994676d5..f81c1b77d84ed 100644
--- a/doc/languages-frameworks/haskell.section.md
+++ b/doc/languages-frameworks/haskell.section.md
@@ -260,6 +260,14 @@ the same package with the `previousIntermediates` argument to support
incremental builds. See [“Incremental builds”](#haskell-incremental-builds) for
more information. Defaults to `false`.
+`dontConvertCabalFileToUnix`
+: By default, `haskellPackages.mkDerivation` converts the `.cabal` file of a
+given package to Unix line endings.
+This is intended to work around
+[Hackage converting revised `.cabal` files to DOS line endings](https://github.com/haskell/hackage-server/issues/316)
+which frequently causes patches to stop applying.
+You can pass `true` to disable this behavior.
+
`enableLibraryProfiling`
: Whether to enable [profiling][profiling] for libraries contained in the
package. Enabled by default if supported.
@@ -1249,8 +1257,8 @@ it does for the unstable branches.
### Why is topic X not covered in this section? Why is section Y missing? {#haskell-why-not-covered}
We have been working on [moving the nixpkgs Haskell documentation back into the
-nixpkgs manual](https://github.com/NixOS/nixpkgs/issues/121403). Since this
-process has not been completed yet, you may find some topics missing here
+nixpkgs manual](https://github.com/NixOS/nixpkgs/issues/121403).
+Since this process has not been completed yet, you may find some topics missing here
covered in the old [haskell4nix docs](https://haskell4nix.readthedocs.io/).
If you feel any important topic is not documented at all, feel free to comment
diff --git a/doc/redirects.json b/doc/redirects.json
index f04c437298455..2570eec68018e 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -119,6 +119,12 @@
"inkscape-plugins": [
"index.html#inkscape-plugins"
],
+ "libcxxhardeningextensive": [
+ "index.html#libcxxhardeningextensive"
+ ],
+ "libcxxhardeningfast": [
+ "index.html#libcxxhardeningfast"
+ ],
"julec-hook": [
"index.html#julec-hook"
],
@@ -247,6 +253,9 @@
"sec-building-packages-with-llvm-using-clang-stdenv": [
"index.html#sec-building-packages-with-llvm-using-clang-stdenv"
],
+ "sec-darwin-availability-checks": [
+ "index.html#sec-darwin-availability-checks"
+ ],
"sec-darwin-libcxx-deployment-targets": [
"index.html#sec-darwin-libcxx-deployment-targets"
],
@@ -1242,7 +1251,8 @@
"index.html#sec-purity-in-nixpkgs"
],
"sec-hardening-in-nixpkgs": [
- "index.html#sec-hardening-in-nixpkgs"
+ "index.html#sec-hardening-in-nixpkgs",
+ "index.html#pie"
],
"sec-hardening-flags-enabled-by-default": [
"index.html#sec-hardening-flags-enabled-by-default"
@@ -1277,9 +1287,6 @@
"sec-hardening-flags-disabled-by-default": [
"index.html#sec-hardening-flags-disabled-by-default"
],
- "pie": [
- "index.html#pie"
- ],
"shadowstack": [
"index.html#shadowstack"
],
diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index c36007dad49f3..2a9912f269fcb 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -12,6 +12,18 @@
- 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.
+- **This release of Nixpkgs requires macOS Sonoma 14.0 or newer, as announced in the 25.05 release notes.**
+ The default SDK is now 14.4, but the minimum version is 14.0.
+ cc-wrapper will enforce that availability annotations are used or an appropriate deployment target is set.
+ See the Darwin platform notes for details.
+
+- **We expect to drop support for `x86_64-darwin` by Nixpkgs 26.11,** in light of Apple’s announcement that macOS 26 will be the final version to support Intel Macs.
+ When support is fully removed, we will no longer build packages for the platform or guarantee that it can build at all.
+ This may happen in stages, depending on our available build and maintenance resources and decisions made by projects we rely on.
+
+ By the time of 26.11’s release, Homebrew will offer only limited [Tier 3](https://docs.brew.sh/Support-Tiers#tier-3) support for the platform, but MacPorts will likely continue to support it for a long time.
+ We also recommend users consider installing NixOS, which should continue to run on essentially all Intel Macs, especially after Apple stops security support for macOS 26 in 2028.
+
- 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.
@@ -49,6 +61,8 @@
- GHC 8.6, 8.10, 9.0, 9.2, and their package sets have been removed.
+- The `haskellPackages.mkDerivation` builder now converts packages' cabal files to Unix line endings before `patchPhase`. This behavior can be disabled using `dontConvertCabalFileToUnix`.
+
- `webkitgtk_4_0` has been removed because it depends on an unmaintained version of security-critical libsoup library (`libsoup_2`) and the support will be [dropped upstream soon](https://webkitgtk.org/2025/10/07/webkitgtk-soup2-deprecation.html).
- Support for bootstrapping native GHC compilers on 32‐bit ARM and little‐endian 64‐bit PowerPC has been dropped.
@@ -104,6 +118,8 @@
- `forgejo` main program has been renamed to `bin/forgejo` from the previous `bin/gitea`.
+- the "pie" hardening flag has been removed. compilers are expected to enable PIE by default, as has been common practice since 2016 outside of nixpkgs. If a package needs "pie" disabled pass `-no-pie` in `CFLAGS`. It is unlikely this will be necessary in many cases; due to the prevalance of default PIE toolchains most packages incompatible with PIE already pass no-pie.
+
- `wayclip` now uses the `ext-data-control-v1` Wayland protocol instead of `wlr-data-control-unstable-v1`.
- `cudaPackages.cudatoolkit-legacy-runfile` has been removed.
@@ -154,6 +170,8 @@
- `meilisearch_1_11` has been removed, as it is no longer supported.
+- `budgie-desktop` has been updated [10.9.4](https://github.com/BuddiesOfBudgie/budgie-desktop/releases/tag/v10.9.4). This changes `XDG_CURRENT_DESKTOP` from `Budgie:GNOME` to `Budgie` and contains ABI bumps for libpeas2 migration.
+
- Greetd and its original greeters (`tuigreet`, `gtkgreet`, `qtgreet`, `regreet`, `wlgreet`) were moved from `greetd` namespace to top level (`greetd.tuigreet` -> `tuigreet`, `greetd.greetd` -> `greetd`, etc). The original attrs are available for compatibility as passthrus of `greetd`, but will emit a warning. They will be removed in future releases.
- `carla` no longer support `gtk2` override.
@@ -217,9 +235,10 @@
- `podofo` has been updated from `0.9.8` to `1.0.0`. These releases are by nature very incompatible due to major API changes. The legacy versions can be found under `podofo_0_10` and `podofo_0_9`.
Changelog: https://github.com/podofo/podofo/blob/1.0.0/CHANGELOG.md, API-Migration-Guide: https://github.com/podofo/podofo/blob/1.0.0/API-MIGRATION.md.
-- NetBox was updated to `>= 4.3.0`. Have a look at the breaking changes
- of the [4.3 release](https://github.com/netbox-community/netbox/releases/tag/v4.2.0),
- make the required changes to your database, if needed, then upgrade by setting `services.netbox.package = pkgs.netbox_4_3;` in your configuration.
+- NetBox was updated to `>= 4.4.0`. Have a look at the breaking changes
+ of the [4.3 release](https://github.com/netbox-community/netbox/releases/tag/v4.3.0)
+ and the [4.4 release](https://github.com/netbox-community/netbox/releases/tag/v4.4.0),
+ make the required changes to your database, if needed, then upgrade by setting `services.netbox.package = pkgs.netbox_4_4;` in your configuration.
- `privatebin` has been updated to `2.0.0`. This release changes configuration defaults including switching the template and removing legacy features. See the [v2.0.0 changelog entry](https://github.com/PrivateBin/PrivateBin/releases/tag/2.0.0) for details on how to upgrade.
@@ -277,6 +296,8 @@
- Added `gitConfig` and `gitConfigFile` option to the nixpkgs `config`, to allow for setting a default `gitConfigFile` for all `fetchgit` invocations.
+- Added `npmRegistryOverrides` and `npmRegistryOverridesString` option to the nixpkgs `config`, to allow for setting a default `npmRegistryOverridesString` for all `fetchNpmDeps` invocations.
+
- The `dockerTools.streamLayeredImage` builder now uses a better algorithm for generating layered docker images, such that much more sharing is possible when the number of store paths exceeds the layer limit. It gives each of the largest store paths its own layer and adds dependencies to those layers when they aren't used elsewhere.
- The systemd initrd will now respect `x-systemd.wants` and `x-systemd.requires` for reliably unlocking multi-disk bcachefs volumes.
@@ -297,7 +318,7 @@
- `idris2` supports being instantiated with a package environment with `idris.withPackages (p: [ ])`
-- New hardening flags, `strictflexarrays1` and `strictflexarrays3` were made available, corresponding to the gcc/clang options `-fstrict-flex-arrays=1` and `-fstrict-flex-arrays=3` respectively.
+- New hardening flags `strictflexarrays1`, `strictflexarrays3`, `glibcxxassertions`, `libcxxhardeningfast` and `libcxxhardeningextensive` were made available.
- `gramps` has been updated to 6.0.0
Upstream recommends [backing up your Family Trees](https://gramps-project.org/wiki/index.php/Gramps_6.0_Wiki_Manual_-_Manage_Family_Trees#Backing_up_a_Family_Tree) before upgrading.
@@ -322,8 +343,6 @@
and beware that the migration may take several hours depending on your library size and state.
The process must not be interrupted.
-- A new hardening flag, `glibcxxassertions` was made available, corresponding to the glibc `_GLIBCXX_ASSERTIONS` option.
-
- `versionCheckHook`: Packages that previously relied solely on `pname` to locate the program used to version check, but have a differing `meta.mainProgram` entry, might now fail.
@@ -340,6 +359,8 @@
- `nix-prefetch-git`: Added a `--no-add-path` argument to disable adding the path to the store; this is useful when working with a [read-only store](https://nix.dev/manual/nix/2.28/command-ref/new-cli/nix3-help-stores#store-experimental-local-overlay-store-read-only).
+- `fetchNpmDeps`: Add `npmRegistryOverridesString` argument to pass NPM registry overrides to the fetcher.
+
- `sftpman` has been updated to version 2, a rewrite in Rust which is mostly backward compatible but does include some changes to the CLI.
For more information, [check the project's README](https://github.com/spantaleev/sftpman-rs#is-sftpman-v2-compatible-with-sftpman-v1).
diff --git a/doc/stdenv/platform-notes.chapter.md b/doc/stdenv/platform-notes.chapter.md
index 06662bbc76fa5..99d7cf33fa486 100644
--- a/doc/stdenv/platform-notes.chapter.md
+++ b/doc/stdenv/platform-notes.chapter.md
@@ -47,6 +47,17 @@ 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 fails to build due to missing API availability checks {#sec-darwin-availability-checks}
+
+This is normally a bug in the package or a misconfigured deployment target.
+* If it is using an API from a newer release (e.g., from macOS 26.0 while targeting macOS 14.0), it needs to use an availability check.
+ The code should be patched to use [`__builtin_available`](https://clang.llvm.org/docs/LanguageExtensions.html#objective-c-available).
+ Note that while the linked documentation is for Objective-C, it is applicable to C and C++ except that you use `__builtin_available` in place of `@available`.
+* If the package intends to require the newer platform (i.e., it does not support running on older versions with reduced functionality), use `darwinMinVersionHook` to set the deployment target to the required version.
+ See below for how to use a newer deployment target.
+* If the package actually handles this through some other mechanism (e.g., MoltenVK relies on the running platform’s MSL version), the error can be suppressed.
+ To suppress the error, add `-Wno-error=unguarded-availability` to `env.NIX_CFLAGS_COMPILE`.
+
#### 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.
@@ -106,13 +117,10 @@ The following is a list of Xcode versions, the SDK version in Nixpkgs, and the a
Check your package’s documentation (platform support or installation instructions) to find which Xcode or SDK version to use.
Generally, only the last SDK release for a major version is packaged.
-| Xcode version | SDK version | Nixpkgs attribute |
-|--------------------|--------------------|------------------------------|
-| 12.0–12.5.1 | 11.3 | `apple-sdk_11` / `apple-sdk` |
-| 13.0–13.4.1 | 12.3 | `apple-sdk_12` |
-| 14.0–14.3.1 | 13.3 | `apple-sdk_13` |
-| 15.0–15.4 | 14.4 | `apple-sdk_14` |
-| 16.0 | 15.0 | `apple-sdk_15` |
+| Xcode version | SDK version | Nixpkgs attribute |
+|--------------------|--------------------|-------------------------------|
+| 15.0–15.4 | 14.4 | `apple-sdk_14` / `apple-sdk` |
+| 16.0 | 15.0 | `apple-sdk_15` |
#### Darwin Default SDK versions {#sec-darwin-troubleshooting-darwin-defaults}
diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md
index 24536c35b2c3f..2a0b239740c05 100644
--- a/doc/stdenv/stdenv.chapter.md
+++ b/doc/stdenv/stdenv.chapter.md
@@ -1631,19 +1631,6 @@ The following flags are disabled by default and should be enabled with `hardenin
This flag adds the `-fno-strict-aliasing` compiler option, which prevents the compiler from assuming code has been written strictly following the standard in regards to pointer aliasing and therefore performing optimizations that may be unsafe for code that has not followed these rules.
-#### `pie` {#pie}
-
-This flag is disabled by default for normal `glibc` based NixOS package builds, but enabled by default for
-
- - `musl`-based package builds, except on Aarch64 and Aarch32, where there are issues.
-
- - Statically-linked for OpenBSD builds, where it appears to be required to get a working binary.
-
-Adds the `-fPIE` compiler and `-pie` linker options. Position Independent Executables are needed to take advantage of Address Space Layout Randomization, supported by modern kernel versions. While ASLR can already be enforced for data areas in the stack and heap (brk and mmap), the code areas must be compiled as position-independent. Shared libraries already do this with the `pic` flag, so they gain ASLR automatically, but binary .text regions need to be build with `pie` to gain ASLR. When this happens, ROP attacks are much harder since there are no static locations to bounce off of during a memory corruption attack.
-
-Static libraries need to be compiled with `-fPIE` so that executables can link them in with the `-pie` linker option.
-If the libraries lack `-fPIE`, you will get the error `recompile with -fPIE`.
-
#### `strictflexarrays1` {#strictflexarrays1}
This flag adds the `-fstrict-flex-arrays=1` compiler option, which reduces the cases the compiler treats as "flexible arrays" to those declared with length `[1]`, `[0]` or (the correct) `[]`. This increases the coverage of fortify checks, because such arrays declared as the trailing element of a structure can normally not have their intended length determined by the compiler.
@@ -1688,6 +1675,18 @@ Adds the `-D_GLIBCXX_ASSERTIONS` compiler flag. This flag only has an effect on
These checks may have an impact on performance in some cases.
+#### `libcxxhardeningfast` {#libcxxhardeningfast}
+
+Adds the `-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST` compiler flag. This flag only has an effect on libc++ targets, and when defined, enables a set of assertions that prevent undefined behavior caused by violating preconditions of the standard library. libc++ provides several hardening modes, and this "fast" mode contains a set of security-critical checks that can be done with relatively little overhead in constant time.
+
+Disabling `libcxxhardeningfast` implies disablement of checks from `libcxxhardeningextensive`.
+
+#### `libcxxhardeningextensive` {#libcxxhardeningextensive}
+
+Adds the `-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE` compiler flag. This flag only has an effect on libc++ targets, and when defined, enables a set of assertions that prevent undefined behavior caused by violating preconditions of the standard library. libc++ provides several hardening modes, and this "extensive" mode adds checks for undefined behavior that incur relatively little overhead but aren’t security-critical. The additional rigour impacts performance more than fast mode: benchmarking is recommended to determine if it is acceptable for a particular application.
+
+Enabling this flag implies enablement of checks from `libcxxhardeningfast`. Disabling this flag does not imply disablement of checks from `libcxxhardeningfast`.
+
#### `pacret` {#pacret}
This flag adds the `-mbranch-protection=pac-ret` compiler option on aarch64-linux targets. This uses ARM v8.3's Pointer Authentication feature to sign function return pointers before adding them to the stack. The pointer's authenticity is then validated before returning to its destination. This dramatically increases the difficulty of ROP exploitation techniques.
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 96bde04151ae5..cd1448d811fa3 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -360,8 +360,8 @@ let
null;
# The canonical name for this attribute is darwinSdkVersion, but some
# platforms define the old name "sdkVer".
- darwinSdkVersion = final.sdkVer or "11.3";
- darwinMinVersion = final.darwinSdkVersion;
+ darwinSdkVersion = final.sdkVer or "14.4";
+ darwinMinVersion = "14.0";
darwinMinVersionVariable =
if final.isMacOS then
"MACOSX_DEPLOYMENT_TARGET"
diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh
index 0889f7e1d9ed1..e049064c7564c 100755
--- a/maintainers/scripts/haskell/update-stackage.sh
+++ b/maintainers/scripts/haskell/update-stackage.sh
@@ -99,6 +99,11 @@ sed -r \
-e '/ Agda /d' \
-e '/ stack /d' \
-e '/ git-annex /d' \
+ -e '/ hledger /d' \
+ -e '/ hledger-iadd /d' \
+ -e '/ hledger-lib /d' \
+ -e '/ hledger-ui /d' \
+ -e '/ hledger-web /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/maintainers/scripts/update.py b/maintainers/scripts/update.py
index 10d197d5fe784..ca35f04d1285f 100644
--- a/maintainers/scripts/update.py
+++ b/maintainers/scripts/update.py
@@ -92,7 +92,15 @@ async def attr_instantiation_worker(
) -> tuple[Path, str]:
async with semaphore:
eprint(f"Instantiating {attr_path}…")
- return (await nix_instantiate(attr_path), attr_path)
+ try:
+ return (await nix_instantiate(attr_path), attr_path)
+ except Exception as e:
+ # Failure should normally terminate the script but
+ # looks like Python is buggy so we need to do it ourselves.
+ eprint(f"Failed to instantiate {attr_path}")
+ if e.stderr:
+ eprint(e.stderr.decode("utf-8"))
+ sys.exit(1)
async def requisites_worker(
diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index a1877303f482c..53bdbabb45c99 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -22,6 +22,16 @@
- COSMIC DE has been updated to the beta version, bringing it closer to its first stable release. This includes updates to its core components, applications, and overall stability.
+- GNOME has been updated to version 49.
+
+ - Removes X11 session support. Though you can still run X11 apps using XWayland.
+ - gnome-session’s custom service manager was removed in favour of using systemd.
+ - GDM now allows multiple seats, which is useful for e.g. remote logins. Though we currently [limit this to five greeter instances](https://github.com/NixOS/nixpkgs/issues/458058).
+ - `papers` document viewer is now installed by default, replacing `evince`. Though we still include `evince` transitively by `sushi` (quick previewer used by Files/Nautilus) You can disable either using [](#opt-environment.gnome.excludePackages) and restore `evince` with [](#opt-programs.evince.enable).
+ - `showtime` video player is now installed by default, replacing `totem`. You can disable it using [](#opt-environment.gnome.excludePackages) and restore `totem` with [](#opt-environment.systemPackages).
+
+ Refer to the [GNOME release notes](https://release.gnome.org/49/) for more details.
+
## New Modules {#sec-release-25.11-new-modules}
diff --git a/nixos/modules/config/vte.nix b/nixos/modules/config/vte.nix
index f7c639b627a02..75ac3bae4be37 100644
--- a/nixos/modules/config/vte.nix
+++ b/nixos/modules/config/vte.nix
@@ -9,7 +9,7 @@ let
vteInitSnippet = ''
# Show current working directory in VTE terminals window title.
# Supports both bash and zsh, requires interactive shell.
- . ${pkgs.vte.override { gtkVersion = null; }}/etc/profile.d/vte.sh
+ . ${pkgs.vte-gtk4}/etc/profile.d/vte.sh
'';
in
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 79fb9e5885b29..4e385e1ac4853 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -569,6 +569,7 @@
./services/desktops/gnome/gnome-online-miners.nix
./services/desktops/gnome/gnome-remote-desktop.nix
./services/desktops/gnome/gnome-settings-daemon.nix
+ ./services/desktops/gnome/gnome-software.nix
./services/desktops/gnome/gnome-user-share.nix
./services/desktops/gnome/localsearch.nix
./services/desktops/gnome/rygel.nix
diff --git a/nixos/modules/services/accessibility/orca.nix b/nixos/modules/services/accessibility/orca.nix
index 3fe205498bfe6..2ae7c4514edd9 100644
--- a/nixos/modules/services/accessibility/orca.nix
+++ b/nixos/modules/services/accessibility/orca.nix
@@ -20,9 +20,7 @@ in
config = mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
- systemd.services.display-manager = lib.mkIf config.services.displayManager.enable {
- path = [ cfg.package ];
- };
+ systemd.packages = [ cfg.package ];
services.speechd.enable = true;
};
}
diff --git a/nixos/modules/services/desktop-managers/gnome.nix b/nixos/modules/services/desktop-managers/gnome.nix
index 91f4002e59d76..faa5085cc9e7a 100644
--- a/nixos/modules/services/desktop-managers/gnome.nix
+++ b/nixos/modules/services/desktop-managers/gnome.nix
@@ -232,7 +232,7 @@ in
environment.gnome.excludePackages = mkOption {
default = [ ];
- example = literalExpression "[ pkgs.totem ]";
+ example = literalExpression "[ pkgs.showtime ]";
type = types.listOf types.package;
description = "Which packages gnome should exclude from the default environment";
};
@@ -297,8 +297,12 @@ in
systemd.packages = [
pkgs.gnome-flashback
+ pkgs.metacity
+ (pkgs.gnome-panel-with-modules.override {
+ panelModulePackages = cfg.flashback.panelModulePackages;
+ })
]
- ++ map pkgs.gnome-flashback.mkSystemdTargetForWm flashbackWms;
+ ++ map pkgs.gnome-flashback.mkSystemdTargetForWm cfg.flashback.customSessions;
environment.systemPackages = [
pkgs.gnome-flashback
@@ -311,9 +315,7 @@ in
wm: pkgs.gnome-flashback.mkWmApplication { inherit (wm) wmName wmLabel wmCommand; }
) flashbackWms)
# For /share/pkgs.gnome-session/sessions/gnome-flashback-${wmName}.session
- ++ (map (
- wm: pkgs.gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel enableGnomePanel; }
- ) flashbackWms);
+ ++ (map (wm: pkgs.gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel; }) flashbackWms);
})
(lib.mkIf serviceCfg.core-os-services.enable {
@@ -444,50 +446,49 @@ in
# Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/gnome-48/elements/core/meta-gnome-core-apps.bst
(lib.mkIf serviceCfg.core-apps.enable {
- environment.systemPackages = utils.removePackagesByName (
- [
- pkgs.baobab
- pkgs.decibels
- pkgs.epiphany
- pkgs.gnome-text-editor
- pkgs.gnome-calculator
- pkgs.gnome-calendar
- pkgs.gnome-characters
- pkgs.gnome-clocks
- pkgs.gnome-console
- pkgs.gnome-contacts
- pkgs.gnome-font-viewer
- pkgs.gnome-logs
- pkgs.gnome-maps
- pkgs.gnome-music
- pkgs.gnome-system-monitor
- pkgs.gnome-weather
- pkgs.loupe
- pkgs.nautilus
- pkgs.gnome-connections
- pkgs.simple-scan
- pkgs.snapshot
- pkgs.totem
- pkgs.yelp
- ]
- ++ lib.optionals config.services.flatpak.enable [
- # Since PackageKit Nix support is not there yet,
- # only install gnome-software if flatpak is enabled.
- pkgs.gnome-software
- ]
- ) config.environment.gnome.excludePackages;
+ environment.systemPackages = utils.removePackagesByName [
+ pkgs.baobab
+ pkgs.decibels
+ pkgs.epiphany
+ pkgs.gnome-text-editor
+ pkgs.gnome-calculator
+ pkgs.gnome-calendar
+ pkgs.gnome-characters
+ pkgs.gnome-clocks
+ pkgs.gnome-console
+ pkgs.gnome-contacts
+ pkgs.gnome-font-viewer
+ pkgs.gnome-logs
+ pkgs.gnome-maps
+ pkgs.gnome-music
+ pkgs.gnome-system-monitor
+ pkgs.gnome-weather
+ pkgs.loupe
+ pkgs.nautilus
+ pkgs.papers
+ pkgs.gnome-connections
+ pkgs.showtime
+ pkgs.simple-scan
+ pkgs.snapshot
+ pkgs.yelp
+ ] config.environment.gnome.excludePackages;
# Enable default program modules
# Since some of these have a corresponding package, we only
# enable that program module if the package hasn't been excluded
# through `environment.gnome.excludePackages`
- programs.evince.enable = notExcluded pkgs.evince;
programs.file-roller.enable = notExcluded pkgs.file-roller;
programs.geary.enable = notExcluded pkgs.geary;
programs.gnome-disks.enable = notExcluded pkgs.gnome-disk-utility;
programs.seahorse.enable = notExcluded pkgs.seahorse;
services.gnome.sushi.enable = notExcluded pkgs.sushi;
+ # Since PackageKit Nix support is not there yet,
+ # only install gnome-software if flatpak is enabled.
+ services.gnome.gnome-software.enable = lib.mkIf config.services.flatpak.enable (
+ notExcluded pkgs.gnome-software
+ );
+
# VTE shell integration for gnome-console
programs.bash.vteIntegration = mkDefault true;
programs.zsh.vteIntegration = mkDefault true;
diff --git a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix
index e0241f02b9699..3df01b59738d5 100644
--- a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix
+++ b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix
@@ -77,9 +77,11 @@ in
];
systemd.user.targets."gnome-session".wants = [
- "gnome-initial-setup-copy-worker.service"
"gnome-initial-setup-first-login.service"
- "gnome-welcome-tour.service"
+ ];
+
+ systemd.user.targets."graphical-session-pre".wants = [
+ "gnome-initial-setup-copy-worker.service"
];
systemd.user.targets."gnome-session@gnome-initial-setup".wants = [
@@ -89,6 +91,11 @@ in
programs.dconf.profiles.gnome-initial-setup.databases = [
"${pkgs.gnome-initial-setup}/share/gnome-initial-setup/initial-setup-dconf-defaults"
];
+
+ users = {
+ # TODO: switch to using provided gnome-initial-setup sysusers.d
+ groups.gnome-initial-setup = { };
+ };
};
}
diff --git a/nixos/modules/services/desktops/gnome/gnome-software.nix b/nixos/modules/services/desktops/gnome/gnome-software.nix
new file mode 100644
index 0000000000000..ced2549a9e212
--- /dev/null
+++ b/nixos/modules/services/desktops/gnome/gnome-software.nix
@@ -0,0 +1,28 @@
+{
+ config,
+ pkgs,
+ lib,
+ ...
+}:
+
+{
+ meta = {
+ maintainers = lib.teams.gnome.members;
+ };
+
+ options = {
+ services.gnome.gnome-software = {
+ enable = lib.mkEnableOption "GNOME Software, package manager for GNOME";
+ };
+ };
+
+ config = lib.mkIf config.services.gnome.gnome-software.enable {
+ environment.systemPackages = [
+ pkgs.gnome-software
+ ];
+
+ systemd.packages = [
+ pkgs.gnome-software
+ ];
+ };
+}
diff --git a/nixos/modules/services/display-managers/gdm.nix b/nixos/modules/services/display-managers/gdm.nix
index bdf1822c48162..cd8a168c73478 100644
--- a/nixos/modules/services/display-managers/gdm.nix
+++ b/nixos/modules/services/display-managers/gdm.nix
@@ -183,10 +183,44 @@ in
name = "gdm";
uid = config.ids.uids.gdm;
group = "gdm";
- home = "/run/gdm";
description = "GDM user";
};
+ users.users.gdm-greeter = {
+ isSystemUser = true;
+ uid = 60578;
+ group = "gdm";
+ home = "/run/gdm";
+ };
+
+ users.users.gdm-greeter-1 = {
+ isSystemUser = true;
+ uid = 60579;
+ group = "gdm";
+ home = "/run/gdm-1";
+ };
+
+ users.users.gdm-greeter-2 = {
+ isSystemUser = true;
+ uid = 60580;
+ group = "gdm";
+ home = "/run/gdm-2";
+ };
+
+ users.users.gdm-greeter-3 = {
+ isSystemUser = true;
+ uid = 60581;
+ group = "gdm";
+ home = "/run/gdm-3";
+ };
+
+ users.users.gdm-greeter-4 = {
+ isSystemUser = true;
+ uid = 60582;
+ group = "gdm";
+ home = "/run/gdm-4";
+ };
+
users.groups.gdm.gid = config.ids.gids.gdm;
# GDM needs different xserverArgs, presumable because using wayland by default.
@@ -348,15 +382,15 @@ in
# GDM LFS PAM modules, adapted somehow to NixOS
security.pam.services = {
gdm-launch-environment.text = ''
- auth required pam_succeed_if.so audit quiet_success user = gdm
+ auth required pam_succeed_if.so audit quiet_success user ingroup gdm
auth optional pam_permit.so
- account required pam_succeed_if.so audit quiet_success user = gdm
+ account required pam_succeed_if.so audit quiet_success user ingroup gdm
account sufficient pam_unix.so
password required pam_deny.so
- session required pam_succeed_if.so audit quiet_success user = gdm
+ session required pam_succeed_if.so audit quiet_success user ingroup gdm
session required pam_env.so conffile=/etc/pam/environment readenv=0
session optional ${config.systemd.package}/lib/security/pam_systemd.so
session optional pam_keyinit.so force revoke
diff --git a/nixos/modules/services/web-apps/netbox.nix b/nixos/modules/services/web-apps/netbox.nix
index c61f217b4b68a..440c0e89a389f 100644
--- a/nixos/modules/services/web-apps/netbox.nix
+++ b/nixos/modules/services/web-apps/netbox.nix
@@ -109,10 +109,10 @@ in
package = lib.mkOption {
type = lib.types.package;
default =
- if lib.versionAtLeast config.system.stateVersion "25.11" then pkgs.netbox_4_3 else pkgs.netbox_4_2;
+ if lib.versionAtLeast config.system.stateVersion "25.11" then pkgs.netbox_4_4 else pkgs.netbox_4_2;
defaultText = lib.literalExpression ''
if lib.versionAtLeast config.system.stateVersion "25.11"
- then pkgs.netbox_4_3
+ then pkgs.netbox_4_4
else pkgs.netbox_4_2;
'';
description = ''
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index ce0b086ccaf7b..a7ef6ac7faa7e 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1019,6 +1019,7 @@ in
netbox-upgrade = runTest ./web-apps/netbox-upgrade.nix;
netbox_4_2 = handleTest ./web-apps/netbox/default.nix { netbox = pkgs.netbox_4_2; };
netbox_4_3 = handleTest ./web-apps/netbox/default.nix { netbox = pkgs.netbox_4_3; };
+ netbox_4_4 = handleTest ./web-apps/netbox/default.nix { netbox = pkgs.netbox_4_4; };
netdata = runTest ./netdata.nix;
networking.networkd = handleTest ./networking/networkd-and-scripted.nix { networkd = true; };
networking.networkmanager = handleTest ./networking/networkmanager.nix { };
diff --git a/nixos/tests/budgie.nix b/nixos/tests/budgie.nix
index b003e1c652403..6fbf13ca9111c 100644
--- a/nixos/tests/budgie.nix
+++ b/nixos/tests/budgie.nix
@@ -42,13 +42,7 @@
in
''
with subtest("Wait for login"):
- # wait_for_x() checks graphical-session.target, which is expected to be
- # inactive on Budgie before Budgie manages user session with systemd.
- # https://github.com/BuddiesOfBudgie/budgie-desktop/blob/39e9f0895c978f76/src/session/budgie-desktop.in#L16
- #
- # Previously this was unconditionally touched by xsessionWrapper but was
- # changed in #233981 (we have Budgie:GNOME in XDG_CURRENT_DESKTOP).
- # machine.wait_for_x()
+ machine.wait_for_x()
machine.wait_until_succeeds('journalctl -t budgie-session-binary --grep "Entering running state"')
machine.wait_for_file("${user.home}/.Xauthority")
machine.succeed("xauth merge ${user.home}/.Xauthority")
@@ -58,8 +52,9 @@
machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}")
with subtest("Check if Budgie session components actually start"):
- for i in ["budgie-daemon", "budgie-panel", "budgie-wm", "budgie-desktop-view", "gsd-media-keys"]:
- machine.wait_until_succeeds(f"pgrep -f {i}")
+ for i in ["budgie-daemon", "budgie-panel", "budgie-wm", "bsd-media-keys", "gsd-xsettings"]:
+ machine.wait_until_succeeds(f"pgrep {i}")
+ machine.wait_until_succeeds("pgrep -xf /run/current-system/sw/bin/org.buddiesofbudgie.budgie-desktop-view")
# We don't check xwininfo for budgie-wm.
# See https://github.com/NixOS/nixpkgs/pull/216737#discussion_r1155312754
machine.wait_for_window("budgie-daemon")
@@ -67,7 +62,7 @@
with subtest("Check if various environment variables are set"):
cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/budgie-wm)/environ"
- machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'Budgie:GNOME'")
+ machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'Budgie'")
machine.succeed(f"{cmd} | grep 'BUDGIE_PLUGIN_DATADIR' | grep '${pkgs.budgie-desktop-with-plugins.pname}'")
# From the nixos/budgie module
machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")
diff --git a/nixos/tests/gnome-flashback.nix b/nixos/tests/gnome-flashback.nix
index 46cb6402bbb11..4f2c889eba887 100644
--- a/nixos/tests/gnome-flashback.nix
+++ b/nixos/tests/gnome-flashback.nix
@@ -26,8 +26,17 @@
services.desktopManager.gnome.enable = true;
services.desktopManager.gnome.debug = true;
- services.desktopManager.gnome.flashback.enableMetacity = true;
- services.displayManager.defaultSession = "gnome-flashback-metacity";
+
+ services.desktopManager.gnome.flashback.customSessions = [
+ {
+ # Intentionally a different name to test mkSystemdTargetForWm.
+ wmName = "metacitytest";
+ wmLabel = "Metacity";
+ wmCommand = "${pkgs.metacity}/bin/metacity";
+ enableGnomePanel = true;
+ }
+ ];
+ services.displayManager.defaultSession = "gnome-flashback-metacitytest";
};
testScript =
@@ -40,7 +49,7 @@
''
with subtest("Login to GNOME Flashback with GDM"):
machine.wait_for_x()
- machine.wait_until_succeeds('journalctl -t gnome-session-binary --grep "Entering running state"')
+ machine.wait_until_succeeds('journalctl -t gnome-session-service --grep "Entering running state"')
# Wait for alice to be logged in"
machine.wait_for_unit("default.target", "${user.name}")
machine.wait_for_file("${xauthority}")
diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix
index ab80b8aaabf02..bd0d3b7bc0058 100644
--- a/nixos/tests/login.nix
+++ b/nixos/tests/login.nix
@@ -48,13 +48,12 @@
machine.wait_for_file("/home/alice/done")
with subtest("Systemd gives and removes device ownership as needed"):
- # Change back to /dev/snd/timer after systemd-258.1
- machine.succeed("getfacl /dev/dri/card0 | grep -q alice")
+ machine.succeed("getfacl /dev/snd/timer | grep -q alice")
machine.send_key("alt-f1")
machine.wait_until_succeeds("[ $(fgconsole) = 1 ]")
- machine.fail("getfacl /dev/dri/card0 | grep -q alice")
+ machine.fail("getfacl /dev/snd/timer | grep -q alice")
machine.succeed("chvt 2")
- machine.wait_until_succeeds("getfacl /dev/dri/card0 | grep -q alice")
+ machine.wait_until_succeeds("getfacl /dev/snd/timer | grep -q alice")
with subtest("Virtual console logout"):
machine.send_chars("exit\n")
diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix
index 3e24bff88527b..5ba36442274b3 100644
--- a/nixos/tests/pantheon.nix
+++ b/nixos/tests/pantheon.nix
@@ -66,7 +66,7 @@
with subtest("Login with elementary-greeter"):
machine.send_chars("${user.password}\n")
- machine.wait_until_succeeds('journalctl -t gnome-session-binary --grep "Entering running state"')
+ machine.wait_until_succeeds('journalctl -t gnome-session-service --grep "Entering running state"')
with subtest("Wait for wayland server"):
machine.wait_for_file("/run/user/${toString user.uid}/wayland-0")
diff --git a/nixos/tests/web-apps/netbox-upgrade.nix b/nixos/tests/web-apps/netbox-upgrade.nix
index 29b553829dcbc..5b60e8939ccbf 100644
--- a/nixos/tests/web-apps/netbox-upgrade.nix
+++ b/nixos/tests/web-apps/netbox-upgrade.nix
@@ -1,7 +1,7 @@
{ lib, pkgs, ... }:
let
- oldNetbox = "netbox_4_2";
- newNetbox = "netbox_4_3";
+ oldNetbox = "netbox_4_3";
+ newNetbox = "netbox_4_4";
apiVersion =
version:
diff --git a/nixos/tests/web-apps/netbox/testScript.py b/nixos/tests/web-apps/netbox/testScript.py
index 7d0f9bff10c7c..f6c2c9821e121 100644
--- a/nixos/tests/web-apps/netbox/testScript.py
+++ b/nixos/tests/web-apps/netbox/testScript.py
@@ -61,7 +61,7 @@ def compare(a: str, b: str):
return 0
with subtest("Home screen loads"):
- machine.succeed(
+ machine.wait_until_succeeds(
"curl -sSfL http://[::1]:8001 | grep 'Home | NetBox'"
)
diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
index 8a2974b8517bc..220d3fe68d537 100644
--- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
@@ -32,10 +32,6 @@ stdenv.mkDerivation rec {
faust2lv2
];
- # ld: crtbegin.o: relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a PIE object
- # ld: failed to set dynamic section sizes: bad value
- hardeningDisable = [ "pie" ];
-
enableParallelBuilding = true;
dontWrapQtApps = true;
diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index de4362946baae..eb20cd063c8e4 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.1833";
+ version = "9.1.1869";
outputs = [
"out"
@@ -11,7 +11,7 @@ rec {
owner = "vim";
repo = "vim";
rev = "v${version}";
- hash = "sha256-bcHTwrJt7ERsIYydCj+Um4AY7sREtkdkqlEA0OdgnuM=";
+ hash = "sha256-AHx4AHsJAsEE5LRzKgBeV3LoCaoHUB+0/gq7kOHObMk=";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix
index 9ac68c4ffcea9..4665547f501db 100644
--- a/pkgs/applications/emulators/wine/base.nix
+++ b/pkgs/applications/emulators/wine/base.nix
@@ -40,12 +40,6 @@ let
};
} ./setup-hook-darwin.sh;
- # Using the 14.4 SDK allows Wine to use `os_sync_wait_on_address` for its futex implementation on Darwin.
- # It does an availability check, so older systems will still work.
- darwinFrameworks = lib.optionals stdenv.hostPlatform.isDarwin (
- toBuildInputs pkgArches (pkgs: [ pkgs.apple-sdk_14 ])
- );
-
# Building Wine with these flags isn’t supported on Darwin. Using any of them will result in an evaluation failures
# because they will put Darwin in `meta.badPlatforms`.
darwinUnsupportedFlags = [
@@ -168,7 +162,6 @@ stdenv.mkDerivation (
pkgs.libGL
pkgs.libdrm
]
- ++ lib.optionals stdenv.hostPlatform.isDarwin darwinFrameworks
++ lib.optionals x11Support (
with pkgs.xorg;
[
@@ -213,11 +206,7 @@ stdenv.mkDerivation (
# LD_LIBRARY_PATH.
NIX_LDFLAGS = toString (
map (path: "-rpath " + path) (
- map (x: "${lib.getLib x}/lib") (
- [ stdenv.cc.cc ]
- # Avoid adding rpath references to non-existent framework `lib` paths.
- ++ lib.subtractLists darwinFrameworks finalAttrs.buildInputs
- )
+ map (x: "${lib.getLib x}/lib") [ stdenv.cc.cc ]
# libpulsecommon.so is linked but not found otherwise
++ lib.optionals supportFlags.pulseaudioSupport (
map (x: "${lib.getLib x}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ]))
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index c144a5076e751..01cfa9c61fcd1 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -11,7 +11,7 @@
writeText,
## various stuff that can be plugged in
- ffmpeg,
+ ffmpeg_7,
xorg,
alsa-lib,
libpulseaudio,
@@ -93,7 +93,7 @@ let
++ lib.optional (cfg.speechSynthesisSupport or true) speechd-minimal
)
++ lib.optional pipewireSupport pipewire
- ++ lib.optional ffmpegSupport ffmpeg
+ ++ lib.optional ffmpegSupport ffmpeg_7
++ lib.optional gssSupport libkrb5
++ lib.optional useGlvnd libglvnd
++ lib.optionals (cfg.enableQuakeLive or false) (
diff --git a/pkgs/applications/networking/cluster/linkerd/generic.nix b/pkgs/applications/networking/cluster/linkerd/generic.nix
index ef5835bcd6db9..20f07da27e2b0 100644
--- a/pkgs/applications/networking/cluster/linkerd/generic.nix
+++ b/pkgs/applications/networking/cluster/linkerd/generic.nix
@@ -31,11 +31,6 @@ buildGoModule rec {
env GOFLAGS="" go generate ./jaeger/static
env GOFLAGS="" go generate ./multicluster/static
env GOFLAGS="" go generate ./viz/static
-
- # Necessary for building Musl
- if [[ $NIX_HARDENING_ENABLE =~ "pie" ]]; then
- export GOFLAGS="-buildmode=pie $GOFLAGS"
- fi
'';
tags = [
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 3cea1541e6368..f7c4235b16a8f 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -158,8 +158,6 @@ stdenv.mkDerivation rec {
++ lib.concatMap (p: p.buildInputs) enabledPlugins
++ extraBuildInputs;
- hardeningEnable = [ "pie" ];
-
env.NIX_CFLAGS_COMPILE =
"-I${python}/include/${python.libPrefix}"
# Fix '_res_9_init: undefined symbol' error
diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix
index 796742c045af3..ce71099f1391b 100644
--- a/pkgs/applications/networking/mailreaders/astroid/default.nix
+++ b/pkgs/applications/networking/mailreaders/astroid/default.nix
@@ -41,6 +41,11 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc
sed -i "s~ -geom 10x10~~g" src/config.cc
+
+ # Switch to girepository-2.0
+ substituteInPlace src/plugin/gir_main.c \
+ --replace-fail "" "" \
+ --replace-fail "g_irepository_get_option_group" "gi_repository_get_option_group"
'';
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
index f02a9d700bf0b..ad0b17c1d5df5 100644
--- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
@@ -1,7 +1,6 @@
{
lib,
stdenv,
- fetchpatch,
cmake,
ninja,
intltool,
@@ -47,23 +46,13 @@
stdenv.mkDerivation rec {
pname = "evolution";
- version = "3.56.2";
+ version = "3.58.1";
src = fetchurl {
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- hash = "sha256-ff3JrrLasybav9wfhXfE7MEjoS2gAS+MZKcmBlo8Cys=";
+ hash = "sha256-A9jQzM0QKqGnPDHZ4vN0yz24Os3fwRJskYavY9psvsw=";
};
- patches = [
- # fix crash when opening attachment with recent webkitgtk versions
- # https://gitlab.gnome.org/GNOME/evolution/-/issues/3124
- # remove when updating to 3.58.0
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/evolution/-/commit/811a6df1f990855e49ecc0ba7b1a7f7a5ec251e6.patch";
- hash = "sha256-Aj8H7PnAblInX2zRPQH7n0HOdLNuhITNHunWRYCPBsI=";
- })
- ];
-
nativeBuildInputs = [
cmake
intltool
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index c38d5913d2ea6..4dccabbf7fbf7 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -19,7 +19,6 @@
enableZstd ? true,
zstd,
nixosTests,
- fakeroot,
}:
stdenv.mkDerivation rec {
@@ -58,9 +57,6 @@ stdenv.mkDerivation rec {
++ lib.optional enableOpenSSL openssl
++ lib.optional enableXXHash xxHash;
- # fakeroot doesn't work well on darwin anymore, apparently
- checkInputs = lib.optionals (!stdenv.isDarwin) [ fakeroot ];
-
configureFlags = [
(lib.enableFeature enableLZ4 "lz4")
(lib.enableFeature enableOpenSSL "openssl")
diff --git a/pkgs/applications/office/pdfmixtool/default.nix b/pkgs/applications/office/pdfmixtool/default.nix
deleted file mode 100644
index f19bd4dadf937..0000000000000
--- a/pkgs/applications/office/pdfmixtool/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{
- lib,
- mkDerivation,
- fetchFromGitLab,
- fetchpatch,
- fetchpatch2,
- cmake,
- pkg-config,
- qtbase,
- qttools,
- qpdf,
- podofo,
- imagemagick,
-}:
-
-mkDerivation rec {
- pname = "pdfmixtool";
- version = "1.1.1";
-
- src = fetchFromGitLab {
- owner = "scarpetta";
- repo = "pdfmixtool";
- rev = "v${version}";
- hash = "sha256-fgtRKUG6J/CM6cXUTHWAPemqL8loWZT3wZmGdRHldq8=";
- };
-
- nativeBuildInputs = [
- cmake
- pkg-config
- ];
-
- buildInputs = [
- imagemagick
- qtbase
- qttools
- qpdf
- podofo
- ];
-
- patches = [
- # fix incompatibility with qpdf11.3.0 usage of c++17 - delete this patch when we reach pdfmixtool version > v1.1.1
- (fetchpatch {
- url = "https://gitlab.com/scarpetta/pdfmixtool/-/commit/bd5f78c3a4d977d9b0c74302ce2521c737189b43.diff";
- hash = "sha256-h2g5toFqgEEnObd2TYQms1a1WFTgN7VsIHyy0Uyq4/I=";
- })
- # https://gitlab.com/scarpetta/pdfmixtool/-/merge_requests/14
- (fetchpatch2 {
- url = "https://gitlab.com/scarpetta/pdfmixtool/-/commit/268291317ccd1805dc1c801ff88641ba06c6a7f0.patch";
- hash = "sha256-56bDoFtE+IOQHcV9xPfyrgYYFvTfB0QiLIfRl91irb0=";
- })
- ];
-
- meta = with lib; {
- description = "Application to split, merge, rotate and mix PDF files";
- mainProgram = "pdfmixtool";
- homepage = "https://gitlab.com/scarpetta/pdfmixtool";
- license = licenses.gpl3Only;
- maintainers = with maintainers; [ onny ];
- };
-}
diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
index 0e3fd51885d64..5ca46db3dcf94 100644
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
@@ -60,7 +60,7 @@ assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport;
let
- version = "2.51.0";
+ version = "2.51.2";
svn = subversionClient.override { perlBindings = perlSupport; };
gitwebPerlLibs = with perlPackages; [
CGI
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
}.tar.xz"
else
"https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
- hash = "sha256-YKfCJRzC5YjVzYe65WcmBhfG3gwi3KnNv8TH0riZC2I=";
+ hash = "sha256-Iz1xQ6LVjmB1Xu6bdvVZ7HPqKzwpf1tQMWKs6VlmtOM=";
};
outputs = [ "out" ] ++ lib.optional withManual "doc";
@@ -489,6 +489,12 @@ stdenv.mkDerivation (finalAttrs: {
disable_test t5319-multi-pack-index
disable_test t6421-merge-partial-clone
disable_test t7504-commit-msg-hook
+ disable_test t5515-fetch-merge-logic
+ disable_test t4104-apply-boundary
+ disable_test t7002-mv-sparse-checkout
+ disable_test t4122-apply-symlink-inside
+ disable_test t7513-interpret-trailers
+ disable_test t2200-add-update
# Fails reproducibly on ZFS on Linux with formD normalization
disable_test t0021-conversion
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index fb46fb38a925a..41eb546cff0d8 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -32,8 +32,6 @@
socat,
libslirp,
libcbor,
- apple-sdk_13,
- darwinMinVersionHook,
guestAgentSupport ?
(with stdenv.hostPlatform; isLinux || isNetBSD || isOpenBSD || isSunOS || isWindows) && !minimal,
numaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32 && !minimal,
@@ -128,14 +126,6 @@ assert lib.assertMsg (
let
hexagonSupport = hostCpuTargets == null || lib.elem "hexagon" hostCpuTargets;
-
- # needed in buildInputs and depsBuildBuild
- # check log for warnings eg: `warning: 'hv_vm_config_get_max_ipa_size' is only available on macOS 13.0`
- # to indicate if min version needs to get bumped.
- darwinSDK = [
- apple-sdk_13
- (darwinMinVersionHook "13")
- ];
in
stdenv.mkDerivation (finalAttrs: {
@@ -156,7 +146,6 @@ stdenv.mkDerivation (finalAttrs: {
depsBuildBuild = [
buildPackages.stdenv.cc
]
- ++ lib.optionals stdenv.buildPlatform.isDarwin darwinSDK
++ lib.optionals hexagonSupport [ pkg-config ];
nativeBuildInputs = [
@@ -205,7 +194,6 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optionals (!userOnly) [ curl ]
++ lib.optionals ncursesSupport [ ncurses ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin darwinSDK
++ lib.optionals seccompSupport [ libseccomp ]
++ lib.optionals numaSupport [ numactl ]
++ lib.optionals alsaSupport [ alsa-lib ]
diff --git a/pkgs/build-support/bintools-wrapper/add-hardening.sh b/pkgs/build-support/bintools-wrapper/add-hardening.sh
index db9553c3fc76c..6ce4faf1720ba 100644
--- a/pkgs/build-support/bintools-wrapper/add-hardening.sh
+++ b/pkgs/build-support/bintools-wrapper/add-hardening.sh
@@ -15,7 +15,7 @@ for flag in @hardening_unsupported_flags@; do
done
if (( "${NIX_DEBUG:-0}" >= 1 )); then
- declare -a allHardeningFlags=(pie relro bindnow)
+ declare -a allHardeningFlags=(relro bindnow)
declare -A hardeningDisableMap=()
# Determine which flags were effectively disabled so we can report below.
@@ -36,16 +36,6 @@ fi
for flag in "${!hardeningEnableMap[@]}"; do
case $flag in
- pie)
- if [[ ! (" ${params[*]} " =~ " -shared " \
- || " ${params[*]} " =~ " -static " \
- || " ${params[*]} " =~ " -r " \
- || " ${params[*]} " =~ " -Ur " \
- || " ${params[*]} " =~ " -i ") ]]; then
- if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi
- hardeningLDFlags+=('-pie')
- fi
- ;;
relro)
if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling relro >&2; fi
hardeningLDFlags+=('-z' 'relro')
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 4ceddfa59db53..8f5613e9e7bb5 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -49,30 +49,15 @@
"format"
"fortify"
"fortify3"
+ "libcxxhardeningextensive"
+ "libcxxhardeningfast"
"pic"
"relro"
"stackclashprotection"
"stackprotector"
"strictoverflow"
"zerocallusedregs"
- ]
- ++ lib.optional (
- with stdenvNoCC;
- lib.any (x: x) [
- # OpenBSD static linking requires PIE
- (with targetPlatform; isOpenBSD && isStatic)
- (lib.all (x: x) [
- # Musl-based platforms will keep "pie", other platforms will not.
- # If you change this, make sure to update section `{#sec-hardening-in-nixpkgs}`
- # in the nixpkgs manual to inform users about the defaults.
- (targetPlatform.libc == "musl")
- # Except when:
- # - static aarch64, where compilation works, but produces segfaulting dynamically linked binaries.
- # - static armv7l, where compilation fails.
- (!(targetPlatform.isAarch && targetPlatform.isStatic))
- ])
- ]
- ) "pie",
+ ],
}:
assert propagateDoc -> bintools ? man;
diff --git a/pkgs/build-support/build-mozilla-mach/142-relax-apple-sdk.patch b/pkgs/build-support/build-mozilla-mach/142-relax-apple-sdk.patch
deleted file mode 100644
index c6e28f11be2f1..0000000000000
--- a/pkgs/build-support/build-mozilla-mach/142-relax-apple-sdk.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
-index 37c00230c853..dd89bea24392 100644
---- a/build/moz.configure/toolchain.configure
-+++ b/build/moz.configure/toolchain.configure
-@@ -233,7 +233,7 @@ with only_when(host_is_osx | target_is_osx):
- )
-
- def mac_sdk_min_version():
-- return "15.5"
-+ return "15.2"
-
- @depends(
- "--with-macos-sdk",
diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix
index 8b00b6211c0ee..c064d5d4266fa 100644
--- a/pkgs/build-support/build-mozilla-mach/default.nix
+++ b/pkgs/build-support/build-mozilla-mach/default.nix
@@ -328,15 +328,6 @@ buildStdenv.mkDerivation {
# https://hg-edge.mozilla.org/mozilla-central/rev/aa8a29bd1fb9
./139-wayland-drag-animation.patch
]
- ++
- lib.optionals
- (
- (lib.versionAtLeast version "141.0.2" && lib.versionOlder version "145.0")
- || (lib.versionAtLeast version "140.2.0" && lib.versionOlder version "141.0")
- )
- [
- ./142-relax-apple-sdk.patch
- ]
++ extraPatches;
postPatch = ''
diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl
index f2fdf36f79e5e..f66acf3d5e754 100755
--- a/pkgs/build-support/buildenv/builder.pl
+++ b/pkgs/build-support/buildenv/builder.pl
@@ -15,7 +15,7 @@
my $out = $ENV{"out"};
my $extraPrefix = $ENV{"extraPrefix"};
-my @pathsToLink = split ' ', $ENV{"pathsToLink"};
+my @pathsToLink = @{decode_json $ENV{"pathsToLinkJSON"}};
sub isInPathsToLink($path) {
$path = "/" if $path eq "";
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix
index dbeb2a629f206..5996239a16b40 100644
--- a/pkgs/build-support/buildenv/default.nix
+++ b/pkgs/build-support/buildenv/default.nix
@@ -105,6 +105,7 @@ lib.makeOverridable (
nativeBuildInputs
buildInputs
;
+ pathsToLinkJSON = builtins.toJSON pathsToLink;
pkgs = builtins.toJSON chosenOutputs;
extraPathsFrom = lib.optional includeClosures (writeClosure pathsForClosure);
preferLocalBuild = true;
diff --git a/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh b/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh
index 2b7cd00783a5f..865e0d0548203 100644
--- a/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh
+++ b/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh
@@ -35,3 +35,7 @@ elif [[ $0 != *cpp ]]; then
extraBefore+=(-mabi=@explicitAbiValue@)
fi
fi
+
+if [[ "@darwinMinVersion@" ]]; then
+ extraBefore+=(-Werror=unguarded-availability)
+fi
diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh
index 4fd6d4b324636..98369ff820765 100644
--- a/pkgs/build-support/cc-wrapper/add-hardening.sh
+++ b/pkgs/build-support/cc-wrapper/add-hardening.sh
@@ -25,6 +25,13 @@ if [[ -n "${hardeningEnableMap[strictflexarrays3]-}" ]]; then
hardeningEnableMap["strictflexarrays1"]=1
fi
+# libcxxhardeningextensive implies libcxxhardeningfast enablement - make explicit before
+# we filter unsupported flags because unsupporting libcxxhardeningextensive
+# doesn't mean we should unsupport libcxxhardeningfast too
+if [[ -n "${hardeningEnableMap[libcxxhardeningextensive]-}" ]]; then
+ hardeningEnableMap["libcxxhardeningfast"]=1
+fi
+
# Remove unsupported flags.
for flag in @hardening_unsupported_flags@; do
@@ -37,6 +44,10 @@ for flag in @hardening_unsupported_flags@; do
if [[ "$flag" = 'strictflexarrays1' ]] ; then
unset -v "hardeningEnableMap['strictflexarrays3']"
fi
+ # libcxxhardeningfast being unsupported implies libcxxhardeningextensive is unsupported
+ if [[ "$flag" = 'libcxxhardeningfast' ]] ; then
+ unset -v "hardeningEnableMap['libcxxhardeningextensive']"
+ fi
done
@@ -50,9 +61,14 @@ if [[ -n "${hardeningEnableMap[strictflexarrays3]-}" ]]; then
unset -v "hardeningEnableMap['strictflexarrays1']"
fi
+# now make libcxxhardeningfast and libcxxhardeningextensive mutually exclusive
+if [[ -n "${hardeningEnableMap[libcxxhardeningextensive]-}" ]]; then
+ unset -v "hardeningEnableMap['libcxxhardeningfast']"
+fi
+
if (( "${NIX_DEBUG:-0}" >= 1 )); then
- declare -a allHardeningFlags=(fortify fortify3 shadowstack stackprotector stackclashprotection nostrictaliasing pacret strictflexarrays1 strictflexarrays3 pie pic strictoverflow glibcxxassertions format trivialautovarinit zerocallusedregs)
+ declare -a allHardeningFlags=(fortify fortify3 shadowstack stackprotector stackclashprotection nostrictaliasing pacret strictflexarrays1 strictflexarrays3 pic strictoverflow libcxxhardeningfast libcxxhardeningextensive glibcxxassertions format trivialautovarinit zerocallusedregs)
declare -A hardeningDisableMap=()
# Determine which flags were effectively disabled so we can report below.
@@ -115,27 +131,26 @@ for flag in "${!hardeningEnableMap[@]}"; do
if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling glibcxxassertions >&2; fi
hardeningCFlagsBefore+=('-D_GLIBCXX_ASSERTIONS')
;;
+ libcxxhardeningfast)
+ if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling libcxxhardeningfast >&2; fi
+ hardeningCFlagsBefore+=('-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST')
+ ;;
+ libcxxhardeningextensive)
+ if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling libcxxhardeningextensive >&2; fi
+ hardeningCFlagsBefore+=('-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE')
+ ;;
stackprotector)
if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stackprotector >&2; fi
hardeningCFlagsBefore+=('-fstack-protector-strong' '--param' 'ssp-buffer-size=4')
;;
stackclashprotection)
- if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stack-clash-protection >&2; fi
+ if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stackclashprotection >&2; fi
hardeningCFlagsBefore+=('-fstack-clash-protection')
;;
nostrictaliasing)
if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling nostrictaliasing >&2; fi
hardeningCFlagsBefore+=('-fno-strict-aliasing')
;;
- pie)
- # NB: we do not use `+=` here, because PIE flags must occur before any PIC flags
- if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling CFlags -fPIE >&2; fi
- hardeningCFlagsBefore=('-fPIE' "${hardeningCFlagsBefore[@]}")
- if [[ ! (" ${params[*]} " =~ " -shared " || " ${params[*]} " =~ " -static ") ]]; then
- if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi
- hardeningCFlagsBefore=('-pie' "${hardeningCFlagsBefore[@]}")
- fi
- ;;
pic)
if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling pic >&2; fi
hardeningCFlagsBefore+=('-fPIC')
diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
index eb5b99643dbac..246c1b1f65f6e 100644
--- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
@@ -140,6 +140,15 @@ if [ "$NIX_ENFORCE_NO_NATIVE_@suffixSalt@" = 1 ]; then
params=(${kept+"${kept[@]}"})
fi
+# Some build systems such as Bazel and SwiftPM use `clang` instead of `clang++`,
+# which will find the libc++ headers in the sysroot for C++ files.
+if [[ "$isCxx" = 0 && "@isClang@" ]]; then
+# This duplicates the behavior of a native toolchain, which can find the
+# libc++ headers but requires `-lc++` to be specified explicitly when linking.
+ isCxx=1
+ cxxLibrary=0
+fi
+
if [[ "$isCxx" = 1 ]]; then
if [[ "$cxxInclude" = 1 ]]; then
#
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 3c6126786fccc..f5f6d7a98be51 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -753,14 +753,14 @@ stdenvNoCC.mkDerivation {
# https://github.com/NixOS/nixpkgs/pull/209870#issuecomment-1500550903)
+ optionalString (libcxx == null && isClang && (useGccForLibs && gccForLibs.langCC or false)) ''
for dir in ${gccForLibs}/include/c++/*; do
- include -isystem "$dir" >> $out/nix-support/libcxx-cxxflags
+ include -cxx-isystem "$dir" >> $out/nix-support/libcxx-cxxflags
done
for dir in ${gccForLibs}/include/c++/*/${targetPlatform.config}; do
- include -isystem "$dir" >> $out/nix-support/libcxx-cxxflags
+ include -cxx-isystem "$dir" >> $out/nix-support/libcxx-cxxflags
done
''
+ optionalString (libcxx.isLLVM or false) ''
- include -isystem "${getDev libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags
+ include -cxx-isystem "${getDev libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags
echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags
''
# GCC NG friendly libc++
diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix
index eaeb6e075ae45..30542b1d16c6f 100644
--- a/pkgs/build-support/go/module.nix
+++ b/pkgs/build-support/go/module.nix
@@ -250,6 +250,9 @@ lib.extendMkDerivation {
export GOPATH="$TMPDIR/go"
export GOPROXY=off
export GOSUMDB=off
+ if [ -f "$NIX_CC_FOR_TARGET/nix-support/dynamic-linker" ]; then
+ export GO_LDSO=$(cat $NIX_CC_FOR_TARGET/nix-support/dynamic-linker)
+ fi
cd "$modRoot"
''
+ lib.optionalString (finalAttrs.vendorHash != null) ''
@@ -266,13 +269,6 @@ lib.extendMkDerivation {
}
''
+ ''
-
- # currently pie is only enabled by default in pkgsMusl
- # this will respect the `hardening{Disable,Enable}` flags if set
- if [[ $NIX_HARDENING_ENABLE =~ "pie" ]]; then
- export GOFLAGS="-buildmode=pie $GOFLAGS"
- fi
-
runHook postConfigure
''
);
diff --git a/pkgs/build-support/node/fetch-npm-deps/default.nix b/pkgs/build-support/node/fetch-npm-deps/default.nix
index cac50cb7401ae..997de7becd4ac 100644
--- a/pkgs/build-support/node/fetch-npm-deps/default.nix
+++ b/pkgs/build-support/node/fetch-npm-deps/default.nix
@@ -12,6 +12,7 @@
cacert,
prefetch-npm-deps,
fetchNpmDeps,
+ config,
}:
{
@@ -68,6 +69,7 @@
hash,
forceGitDeps ? false,
forceEmptyCache ? false,
+ npmRegistryOverridesString ? "{}",
}:
testers.invalidateFetcherByDrvHash fetchNpmDeps {
inherit
@@ -75,6 +77,7 @@
hash
forceGitDeps
forceEmptyCache
+ npmRegistryOverridesString
;
src = makeTestSrc { inherit name src; };
@@ -175,6 +178,23 @@
hash = "sha256-FhxlJ0HdJMPiWe7+n1HaGLWOr/2HJEPwiS65uqXZM8Y=";
};
+
+ # Test that npmRegistryOverrides work
+ npmRegistryOverrides = makeTest {
+ name = "npm-registry-overrides";
+
+ src = fetchurl {
+ url = "https://cyberchaos.dev/yuka/trainsearch/-/raw/e3cba6427e8ecfd843d0f697251ddaf5e53c2327/package-lock.json";
+ postFetch = "sed -i 's/registry.npmjs.org/broken.link/' $out";
+ hash = "sha256-Qo24ei1d9Ql4zCLjQJ04zVgS4qhBUpew9NZrhrsBds4=";
+ };
+
+ npmRegistryOverridesString = builtins.toJSON {
+ "broken.link" = "https://registry.npmjs.org";
+ };
+
+ hash = "sha256-QGObVDd9qVtf/U78+ayP6RHVWsU+HXhg70BFblQ1PZs=";
+ };
};
meta = with lib; {
@@ -192,6 +212,9 @@
forceGitDeps ? false,
forceEmptyCache ? false,
nativeBuildInputs ? [ ],
+ # A string with a JSON attrset specifying registry mirrors, for example
+ # {"registry.example.org": "my-mirror.local/registry.example.org"}
+ npmRegistryOverridesString ? config.npmRegistryOverridesString,
...
}@args:
let
@@ -219,12 +242,16 @@
buildPhase = ''
runHook preBuild
- if [[ ! -e package-lock.json ]]; then
+ if [[ -f npm-shrinkwrap.json ]]; then
+ local -r srcLockfile="npm-shrinkwrap.json"
+ elif [[ -f package-lock.json ]]; then
+ local -r srcLockfile="package-lock.json"
+ else
echo
- echo "ERROR: The package-lock.json file does not exist!"
+ echo "ERROR: No lock file!"
echo
- echo "package-lock.json is required to make sure that npmDepsHash doesn't change"
- echo "when packages are updated on npm."
+ echo "package-lock.json or npm-shrinkwrap.json is required to make sure"
+ echo "that npmDepsHash doesn't change when packages are updated on npm."
echo
echo "Hint: You can copy a vendored package-lock.json file via postPatch."
echo
@@ -232,7 +259,7 @@
exit 1
fi
- prefetch-npm-deps package-lock.json $out
+ prefetch-npm-deps $srcLockfile $out
runHook postBuild
'';
@@ -243,6 +270,8 @@
# `{ "registry.example.com": "example-registry-bearer-token", ... }`
impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ "NIX_NPM_TOKENS" ];
+ NIX_NPM_REGISTRY_OVERRIDES = npmRegistryOverridesString;
+
SSL_CERT_FILE =
if
(
diff --git a/pkgs/build-support/node/fetch-npm-deps/src/util.rs b/pkgs/build-support/node/fetch-npm-deps/src/util.rs
index 36e2333a3e1a8..835f77a2f52c8 100644
--- a/pkgs/build-support/node/fetch-npm-deps/src/util.rs
+++ b/pkgs/build-support/node/fetch-npm-deps/src/util.rs
@@ -18,6 +18,22 @@ use std::{
use url::Url;
pub fn get_url(url: &Url) -> Result {
+ let url_ = url.clone();
+ let mut url = url.clone();
+ // Respect NIX_NPM_REGISTRY_OVERRIDES environment variable, which should be a JSON mapping in the shape of:
+ // `{ "registry.example.com": "my-registry.local", ... }`
+ if let Some(host) = url.host_str() {
+ if let Ok(npm_mirrors) = env::var("NIX_NPM_REGISTRY_OVERRIDES") {
+ if let Ok(mirrors) = serde_json::from_str::>(&npm_mirrors) {
+ if let Some(mirror) = mirrors.get(host).and_then(serde_json::Value::as_str) {
+ let mirror_url = Url::parse(mirror)?;
+ url.set_path(&(mirror_url.path().to_owned() + url.path()));
+ url.set_host(Some(mirror_url.host_str().expect(format!("Mirror URL without host part: {mirror_url}").as_str())))?;
+ eprintln!("Replaced URL {url_} with {url}");
+ }
+ }
+ }
+ }
let mut request = Request::get(url.as_str()).redirect_policy(RedirectPolicy::Limit(10));
// Respect SSL_CERT_FILE if environment variable exists
diff --git a/pkgs/build-support/ocaml/oasis.nix b/pkgs/build-support/ocaml/oasis.nix
index 269a433caad4a..de8b7039e84e3 100644
--- a/pkgs/build-support/ocaml/oasis.nix
+++ b/pkgs/build-support/ocaml/oasis.nix
@@ -20,48 +20,47 @@
...
}@args:
-if args ? minimumOCamlVersion && lib.versionOlder ocaml.version args.minimumOCamlVersion then
- throw "${pname}-${version} is not available for OCaml ${ocaml.version}"
-else
+stdenv.mkDerivation (
+ args
+ // {
+ name = "ocaml${ocaml.version}-${pname}-${version}";
- stdenv.mkDerivation (
- args
- // {
- name = "ocaml${ocaml.version}-${pname}-${version}";
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ocamlbuild
+ ocaml_oasis
+ ]
+ ++ nativeBuildInputs;
- nativeBuildInputs = [
- ocaml
- findlib
- ocamlbuild
- ocaml_oasis
- ]
- ++ nativeBuildInputs;
+ inherit createFindlibDestdir;
+ inherit dontStrip;
- inherit createFindlibDestdir;
- inherit dontStrip;
+ strictDeps = true;
- strictDeps = true;
+ buildPhase = ''
+ runHook preBuild
+ oasis setup
+ ocaml setup.ml -configure --prefix $OCAMLFIND_DESTDIR --exec-prefix $out
+ ocaml setup.ml -build
+ runHook postBuild
+ '';
- buildPhase = ''
- runHook preBuild
- oasis setup
- ocaml setup.ml -configure --prefix $OCAMLFIND_DESTDIR --exec-prefix $out
- ocaml setup.ml -build
- runHook postBuild
- '';
+ checkPhase = ''
+ runHook preCheck
+ ocaml setup.ml -test
+ runHook postCheck
+ '';
- checkPhase = ''
- runHook preCheck
- ocaml setup.ml -test
- runHook postCheck
- '';
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out
+ ocaml setup.ml -install
+ runHook postInstall
+ '';
- installPhase = ''
- runHook preInstall
- mkdir -p $out
- ocaml setup.ml -install
- runHook postInstall
- '';
-
- }
- )
+ meta = args.meta // {
+ broken = args ? minimumOCamlVersion && lib.versionOlder ocaml.version args.minimumOCamlVersion;
+ };
+ }
+)
diff --git a/pkgs/build-support/setup-hooks/copy-desktop-items.sh b/pkgs/build-support/setup-hooks/copy-desktop-items.sh
index 313ebc9803445..6d9e8966ec818 100644
--- a/pkgs/build-support/setup-hooks/copy-desktop-items.sh
+++ b/pkgs/build-support/setup-hooks/copy-desktop-items.sh
@@ -28,8 +28,10 @@ copyDesktopItems() {
return
fi
+ concatTo desktopItemsArray desktopItems
+
applications="${!outputBin}/share/applications"
- for desktopItem in $desktopItems; do
+ for desktopItem in "${desktopItemsArray[@]}"; do
if [[ -f "$desktopItem" ]]; then
echo "Copying '$desktopItem' into '${applications}'"
install -D -m 444 -t "${applications}" "$desktopItem"
diff --git a/pkgs/by-name/_1/_1fps/package.nix b/pkgs/by-name/_1/_1fps/package.nix
index 305b2f3ae821d..90fef1a29cbbe 100644
--- a/pkgs/by-name/_1/_1fps/package.nix
+++ b/pkgs/by-name/_1/_1fps/package.nix
@@ -4,7 +4,6 @@
buildGoModule,
xorg,
stdenv,
- apple-sdk_14,
}:
buildGoModule rec {
pname = "1fps";
@@ -25,8 +24,7 @@ buildGoModule rec {
xorg.libX11
xorg.libXtst
xorg.libXi
- ]
- ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_14;
+ ];
meta = {
description = "Encrypted Screen Sharing";
diff --git a/pkgs/by-name/_2/_2ship2harkinian/package.nix b/pkgs/by-name/_2/_2ship2harkinian/package.nix
index 628c25666d95e..ae11ddc63bb33 100644
--- a/pkgs/by-name/_2/_2ship2harkinian/package.nix
+++ b/pkgs/by-name/_2/_2ship2harkinian/package.nix
@@ -150,9 +150,6 @@ stdenv.mkDerivation (finalAttrs: {
# Linking fails without this
hardeningDisable = [ "format" ];
- # Pie needs to be enabled or else it segfaults
- hardeningEnable = [ "pie" ];
-
preConfigure = ''
# mirror 2ship's stb
mkdir stb
diff --git a/pkgs/by-name/ac/accerciser/package.nix b/pkgs/by-name/ac/accerciser/package.nix
index d3c133575abb7..bc41b5d9be941 100644
--- a/pkgs/by-name/ac/accerciser/package.nix
+++ b/pkgs/by-name/ac/accerciser/package.nix
@@ -19,13 +19,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "accerciser";
- version = "3.46.2";
+ version = "3.48.0";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/accerciser/${lib.versions.majorMinor version}/accerciser-${version}.tar.xz";
- hash = "sha256-r/RpRR8k5YdpPE9/en+GpQU8ZrIDOndDrZ2DhHSWdw4=";
+ hash = "sha256-kCiOiQCidKOu4gUw6zkWRZlK6YZyIJFroPXEZ3v+n00=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/ad/adwaita-fonts/package.nix b/pkgs/by-name/ad/adwaita-fonts/package.nix
index b47d77a853343..1512f1b9ba5fb 100644
--- a/pkgs/by-name/ad/adwaita-fonts/package.nix
+++ b/pkgs/by-name/ad/adwaita-fonts/package.nix
@@ -9,11 +9,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "adwaita-fonts";
- version = "48.2";
+ version = "49.0";
src = fetchurl {
url = "mirror://gnome/sources/adwaita-fonts/${lib.versions.major finalAttrs.version}/adwaita-fonts-${finalAttrs.version}.tar.xz";
- hash = "sha256-FW9+kvL4LlJ/xzwwnbsjfApKXDqVvF7pSl77aUfFU+A=";
+ hash = "sha256-MVfGIOtbcrJasVbRlKpOsiP5hw1Uf+g/298G0+e+yzc=";
};
nativeBuildInputs = [
@@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
meta = {
description = "Adwaita Sans, a variation of Inter, and Adwaita Mono, Iosevka customized to match Inter";
homepage = "https://gitlab.gnome.org/GNOME/adwaita-fonts";
- license = lib.licenses.gpl3Plus;
+ license = lib.licenses.ofl;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.qxrein ];
teams = [ lib.teams.gnome ];
diff --git a/pkgs/by-name/ad/adwaita-icon-theme/package.nix b/pkgs/by-name/ad/adwaita-icon-theme/package.nix
index c4fe4a7e27aea..77383abe17258 100644
--- a/pkgs/by-name/ad/adwaita-icon-theme/package.nix
+++ b/pkgs/by-name/ad/adwaita-icon-theme/package.nix
@@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "adwaita-icon-theme";
- version = "48.0";
+ version = "49.0";
src = fetchurl {
url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/adwaita-icon-theme-${version}.tar.xz";
- hash = "sha256-hHBoiIZQ2WcxFb5tvyv9wxpGrrxSimqdtEIOYOZWuNQ=";
+ hash = "sha256-ZRZkYdGyeKqUL1mqjQ/M8RCNccZfNyxiZuFyRJeRdVw=";
};
nativeBuildInputs = [
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 63890c9d93696..c67485419908e 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
@@ -1,538 +1,4 @@
{
- "11.3": {
- "CarbonHeaders": {
- "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=",
- "version": "18.1"
- },
- "CommonCrypto": {
- "hash": "sha256-92v9tuNLqvalwYV4AqQllA8yN9fqGjSpc4MNAmFPrbk=",
- "version": "60178.100.1"
- },
- "IOAudioFamily": {
- "hash": "sha256-dSSbt9ZoL/Tq2xXwvvXsDmD3Xru7igzdK1MxGL1K+Aw=",
- "version": "300.6.1"
- },
- "IOBDStorageFamily": {
- "hash": "sha256-UgLMsQBe1QLzlbScmPmASBN7VH4YBmNOUX2CEDezjmE=",
- "version": "20.100.1"
- },
- "IOCDStorageFamily": {
- "hash": "sha256-w0YhZ38RBfnxSc74Q8r5UdK+WiWOSAX46r5hahHLnSg=",
- "version": "59"
- },
- "IODVDStorageFamily": {
- "hash": "sha256-1Sa8aZBGNtqJBNHva+YXxET6Wcdm2PgVrTzYT/8qrN4=",
- "version": "43"
- },
- "IOFWDVComponents": {
- "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=",
- "version": "208"
- },
- "IOFireWireAVC": {
- "hash": "sha256-7H3WcZC/HuS9xsTNDWRqt+1JzUNK4ndvd4u2ru0GGRE=",
- "version": "428"
- },
- "IOFireWireFamily": {
- "hash": "sha256-2xppN8RJ9cxrHWjPQ4bUIjtupPbzfmrm3rXnT/9QVfc=",
- "version": "483"
- },
- "IOFireWireSBP2": {
- "hash": "sha256-kfhmZy8veqI3/XHDtOTKmKj6P7s+j0B+BiAbcjhGq0M=",
- "version": "442"
- },
- "IOFireWireSerialBusProtocolTransport": {
- "hash": "sha256-WDq2Ak72Jw6gYNIKgZkiexA6LzccrPn1kpSbW5U50ek=",
- "version": "257.40.1"
- },
- "IOGraphics": {
- "hash": "sha256-kEP4RWIZwu3ZPIq9IAPUKM0gIXHr8xD50SnGNFCQRcI=",
- "version": "585.1"
- },
- "IOHIDFamily": {
- "hash": "sha256-QASfvttke+AUx55In4DD4vsQGzC3nbe+MugQQ4ddXGU=",
- "version": "1633.100.36"
- },
- "IOKitUser": {
- "hash": "sha256-NQCRrufElx00B7CqqslBi5BTxf5Zs4lcMcJig4Eab0k=",
- "version": "1845.100.19"
- },
- "IONetworkingFamily": {
- "hash": "sha256-HqTKzrX75mMFYYbxNKwPdXmI7h7t/QWuO3W1Qo//zIo=",
- "version": "151.40.1"
- },
- "IOSerialFamily": {
- "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=",
- "version": "93"
- },
- "IOStorageFamily": {
- "hash": "sha256-dy6CYz/z6SwPw0YfC6GLZO2u62Xy8otMDUNrZ5JhTDY=",
- "version": "260.100.1"
- },
- "IOUSBFamily": {
- "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=",
- "version": "630.4.5"
- },
- "Libc": {
- "hash": "sha256-v01g/EtMW/STZQ1neKDMyUGL7sgaCzlwXN0VDaj/Mf0=",
- "version": "1439.100.3"
- },
- "Libinfo": {
- "hash": "sha256-T7KO6zfswjyTIKSdZJCbvfsdqQfPMLj5nheX9iSIl9o=",
- "version": "542.40.3"
- },
- "Libm": {
- "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=",
- "version": "2026"
- },
- "Libnotify": {
- "hash": "sha256-vcDjdwB5OiTEUdl8ISezzpoHeFttkdvkulY/YbUOZjk=",
- "version": "279.40.4"
- },
- "Librpcsvc": {
- "hash": "sha256-8e8E9TkRTAep3/miyqhF/mSkNdlym12W+AVhXF94+Bg=",
- "version": "26"
- },
- "Libsystem": {
- "hash": "sha256-24T9aD4W71prcpr3MnnaU3pfxIzIwkOz39OyhCwPO/E=",
- "version": "1292.100.5"
- },
- "OpenDirectory": {
- "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=",
- "version": "146"
- },
- "Security": {
- "hash": "sha256-o5MyyqDpERvNPvbEfXNgqMIq0YpQV0+ju72C9g/9OdI=",
- "version": "59754.100.106"
- },
- "architecture": {
- "hash": "sha256-pIX9pEXE1Xjll9qwiWrMRwqw6G4g0isto/ALHsmkUSc=",
- "version": "279"
- },
- "configd": {
- "hash": "sha256-WEorIW5Vl8E9/aB0RBTY2bhkfVOF3tckjNztGDOOueA=",
- "version": "1109.101.1"
- },
- "copyfile": {
- "hash": "sha256-3BHFM67dvwUpinzF0pSX3QiUbIsqtLo77WzB3tMbTW4=",
- "version": "173.40.2"
- },
- "dtrace": {
- "hash": "sha256-FfyaYjEMDeL9wGdUyZ4eJdkbkp/WpdTGyBvaorwKSi8=",
- "version": "370.40.1"
- },
- "dyld": {
- "hash": "sha256-dtDTh6YqubBI4Z+QeytwGgUmU6tutvonIWHqzw6zuxo=",
- "version": "851.27"
- },
- "eap8021x": {
- "hash": "sha256-Ap7qumn/oKYe424n2NW6QkuivgDyLoJgDfl30Q5O7Jo=",
- "version": "304.100.1"
- },
- "hfs": {
- "hash": "sha256-MSnc1pB8DcB+mn308snTD1uRQ7Ro4aWyFuLdWjHtAG4=",
- "version": "556.100.11"
- },
- "launchd": {
- "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=",
- "version": "842.1.4"
- },
- "libclosure": {
- "hash": "sha256-UgmMnDUosaC2yI7IyQ7mkNwZ6/oft77ay+SmGSoycIw=",
- "version": "79"
- },
- "libdispatch": {
- "hash": "sha256-K8QL9NfjGsj8c0jbocKegmKBqydimpKu8yRXnQQqdH8=",
- "version": "1271.100.5"
- },
- "libmalloc": {
- "hash": "sha256-k3dJk7S0Lom3B28vRI9QxIuo0AOkd9OHzWO7MandfUw=",
- "version": "317.100.9"
- },
- "libplatform": {
- "hash": "sha256-BSIGgKj5B6Dr0KQiIl2LSA3+ZEhzk/snQeCauErcq6k=",
- "version": "254.80.2"
- },
- "libpthread": {
- "hash": "sha256-cGaDXLTztUYppbMvv41qj5RqONXfhfdHpt9dqY6+5Lc=",
- "version": "454.100.8"
- },
- "mDNSResponder": {
- "hash": "sha256-eqcv174vIwWYXrIhzph+KO1zG8TdK5jRFVgsaAlV9es=",
- "version": "1310.100.10"
- },
- "objc4": {
- "hash": "sha256-rqOPyN9S4KbMhCCVvtyEmGxTWzy+tsh0kfu3k47szXo=",
- "version": "818.2"
- },
- "ppp": {
- "hash": "sha256-pSOlu/yXQhopCHDLnmhUnQeU89MkXhkQB0ZrN9r3qyk=",
- "version": "877.40.2"
- },
- "removefile": {
- "hash": "sha256-B79A9AQ1/cB+zlmVKWcEXVOJHW6rOrX40S/hrMuWqXU=",
- "version": "49.101.1"
- },
- "xnu": {
- "hash": "sha256-M1XWippH55VUJu4aosRFX8j9aOm/PONYVjPZOPufD80=",
- "version": "7195.101.1"
- }
- },
- "12.3": {
- "CarbonHeaders": {
- "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=",
- "version": "18.1"
- },
- "CommonCrypto": {
- "hash": "sha256-HTGBUE6vHjS80CFTiIQ8F17m8Yd2ZRHccvFu2CA2P9U=",
- "version": "60191.100.1"
- },
- "IOAudioFamily": {
- "hash": "sha256-CuBFZeX2JTKIab2xpp+Yvn66bCl4+aKOv9TvzJef20c=",
- "version": "340.2"
- },
- "IOBDStorageFamily": {
- "hash": "sha256-UgLMsQBe1QLzlbScmPmASBN7VH4YBmNOUX2CEDezjmE=",
- "version": "22"
- },
- "IOCDStorageFamily": {
- "hash": "sha256-p/2qM5zjXFDRb/DISpEHxQEdvmuLlRGt/Ygc71Yu2rI=",
- "version": "61"
- },
- "IODVDStorageFamily": {
- "hash": "sha256-1Sa8aZBGNtqJBNHva+YXxET6Wcdm2PgVrTzYT/8qrN4=",
- "version": "43"
- },
- "IOFWDVComponents": {
- "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=",
- "version": "208"
- },
- "IOFireWireAVC": {
- "hash": "sha256-ruAomp5Lv7zuPu9vHsNKoPtDvD1AIrRARsPMpcx/fh0=",
- "version": "430"
- },
- "IOFireWireFamily": {
- "hash": "sha256-W0KOF4hkA7kFOnL1ThAeFU/YlhFVqoqk9uzGjcBppX8=",
- "version": "487"
- },
- "IOFireWireSBP2": {
- "hash": "sha256-bItnRQIaGUxMyiU0q+4N8e5+jYiDEOUPmsrKhBFXvok=",
- "version": "445"
- },
- "IOFireWireSerialBusProtocolTransport": {
- "hash": "sha256-P7egeaD9SSa+YyrIRzM44gILKbIL7vezXK3M6q3MBOI=",
- "version": "260"
- },
- "IOGraphics": {
- "hash": "sha256-lzxBrPLlF01+2jFKRJtSnwpf0r05C0H3tM7Q0N1RUPA=",
- "version": "594"
- },
- "IOHIDFamily": {
- "hash": "sha256-EQQHAS8WKUoTxZscixylc2ZMoD4UYBlHRUj2O7Ikgac=",
- "version": "1787.100.13"
- },
- "IOKitUser": {
- "hash": "sha256-Cdfa/YXM0W4O15femcU0G1Xcpbm+iADWIBWIdzoeuTE=",
- "version": "1955.100.5"
- },
- "IONetworkingFamily": {
- "hash": "sha256-odUZJQq8lb3UYk7F8dBi1Hds00M+kwdlyGwZkVkSwTg=",
- "version": "160.100.2"
- },
- "IOSerialFamily": {
- "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=",
- "version": "93"
- },
- "IOStorageFamily": {
- "hash": "sha256-2b32qe1z7Z+Od1dVlAGdM142DdF8cBaRC+ElysSuAQ4=",
- "version": "290.100.6"
- },
- "IOUSBFamily": {
- "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=",
- "version": "630.4.5"
- },
- "Libc": {
- "hash": "sha256-obalDxsbE+7gm7YwznUbfxL7MCriamQFP3DrXleNwU4=",
- "version": "1507.100.9"
- },
- "Libinfo": {
- "hash": "sha256-OjnnSHEcifcWarVyXiHvYg/9jbCQy5/lzaq6fJRriy0=",
- "version": "554"
- },
- "Libm": {
- "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=",
- "version": "2026"
- },
- "Libnotify": {
- "hash": "sha256-JXG0kHEdoIs6krVZ4+KsRVES4AuNjnQi8qF+XKSp5jE=",
- "version": "301"
- },
- "Librpcsvc": {
- "hash": "sha256-8e8E9TkRTAep3/miyqhF/mSkNdlym12W+AVhXF94+Bg=",
- "version": "26"
- },
- "Libsystem": {
- "hash": "sha256-mPPAxo67wWLtemO+PuKg1Ui0zKEfjnYVj/qX1/0kNBs=",
- "version": "1311.100.3"
- },
- "OpenDirectory": {
- "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=",
- "version": "146"
- },
- "Security": {
- "hash": "sha256-cIqfXcfQOZonxaKndH80xC5YmmveHw+TxHOxqvc9u8I=",
- "version": "60158.100.133"
- },
- "architecture": {
- "hash": "sha256-PRNUrhzSOrwmxSPkKmV0LV7yEIik65sdkfKdBqcwFhU=",
- "version": "280.100.2"
- },
- "configd": {
- "hash": "sha256-X34mjXdil4HeBLyqY4tyBWdmpjsOFTJDdDE81UQf708=",
- "version": "1163.100.19.0.2"
- },
- "copyfile": {
- "hash": "sha256-3/zI3j/m9b13hebjCsOLry3Mf8ADdWJgrtQOdD0huG0=",
- "version": "180.100.3"
- },
- "dtrace": {
- "hash": "sha256-q8H6slCN4RwJ5TxC5s3og6cIbjALySP5ODfVw6a/a+M=",
- "version": "375"
- },
- "dyld": {
- "hash": "sha256-v1kk/Z3eI2sufNm2rx3FRbA/f9BeKJ3t9i9W7tTksXg=",
- "version": "955"
- },
- "eap8021x": {
- "hash": "sha256-SayP1d2KWoRShykBA/NrQCuRnPoxlTiaLwifoqm0Gkg=",
- "version": "315.100.2"
- },
- "hfs": {
- "hash": "sha256-q1yOIei98oudGAoBMNPRTV5EOYpXFL7iYmlCYsKsG0o=",
- "version": "583.100.10"
- },
- "launchd": {
- "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=",
- "version": "842.1.4"
- },
- "libclosure": {
- "hash": "sha256-Ez75a0m+fJas7mGqFeDjjpc7sFDnyirRbtLMTYQDVxw=",
- "version": "79.1"
- },
- "libdispatch": {
- "hash": "sha256-/VbSUtnWyToWOUyAAg/3wImbJ2w5k1tbJkt827x2lIE=",
- "version": "1325.100.36"
- },
- "libmalloc": {
- "hash": "sha256-tyYce5nk0N923MbzoGzkGqunoKwArbTiZl8PCppYpso=",
- "version": "374.100.5"
- },
- "libplatform": {
- "hash": "sha256-JUD2NdS310OhZ0F8gnOvoD8AgEtWRtPahKDw5iE2QJU=",
- "version": "273.100.5"
- },
- "libpthread": {
- "hash": "sha256-al8QumtH7/D04oJ4LUSYW+6OdX0Ko3S3rwYU53n9/54=",
- "version": "486.100.11"
- },
- "mDNSResponder": {
- "hash": "sha256-hsV0VYTPoO5YpaxrUXpXFy97LxlERzrQT0FRfCMOwic=",
- "version": "1557.101.2"
- },
- "objc4": {
- "hash": "sha256-MKXnfZL46VtmAQMolqd7ATF9fYjCNstapGQfcH4uVwo=",
- "version": "841.13"
- },
- "ppp": {
- "hash": "sha256-YyCE19T3rcM1G5jdXuYXuBXblJgR/nelvjpq+9maMhw=",
- "version": "884"
- },
- "removefile": {
- "hash": "sha256-xF1VtTUhoiGsFQsvuFnFYemwiCdsKeriFJv51vRLqmw=",
- "version": "60"
- },
- "xnu": {
- "hash": "sha256-bfFmDfRBSvoWMdQYVstsJRbcq+15lDjVFqk+0XYWpy8=",
- "version": "8020.101.4"
- }
- },
- "13.3": {
- "CarbonHeaders": {
- "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=",
- "version": "18.1"
- },
- "CommonCrypto": {
- "hash": "sha256-tftAQbs5xIOc5VZLVAKXAUvle9WO/i33/pQ3D64l/yI=",
- "version": "600016.100.4"
- },
- "IOAudioFamily": {
- "hash": "sha256-CuBFZeX2JTKIab2xpp+Yvn66bCl4+aKOv9TvzJef20c=",
- "version": "440.2"
- },
- "IOBDStorageFamily": {
- "hash": "sha256-UgLMsQBe1QLzlbScmPmASBN7VH4YBmNOUX2CEDezjmE=",
- "version": "22"
- },
- "IOCDStorageFamily": {
- "hash": "sha256-p/2qM5zjXFDRb/DISpEHxQEdvmuLlRGt/Ygc71Yu2rI=",
- "version": "61"
- },
- "IODVDStorageFamily": {
- "hash": "sha256-1Sa8aZBGNtqJBNHva+YXxET6Wcdm2PgVrTzYT/8qrN4=",
- "version": "43"
- },
- "IOFWDVComponents": {
- "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=",
- "version": "208"
- },
- "IOFireWireAVC": {
- "hash": "sha256-IUytBKhhCgg0vtI+7q8d5kxpOUgO3tQD7TMy++jrorc=",
- "version": "431"
- },
- "IOFireWireFamily": {
- "hash": "sha256-W0KOF4hkA7kFOnL1ThAeFU/YlhFVqoqk9uzGjcBppX8=",
- "version": "487"
- },
- "IOFireWireSBP2": {
- "hash": "sha256-bItnRQIaGUxMyiU0q+4N8e5+jYiDEOUPmsrKhBFXvok=",
- "version": "445"
- },
- "IOFireWireSerialBusProtocolTransport": {
- "hash": "sha256-P7egeaD9SSa+YyrIRzM44gILKbIL7vezXK3M6q3MBOI=",
- "version": "260"
- },
- "IOGraphics": {
- "hash": "sha256-KubCz8DNwf1WuF7LrtARM2VJugFDP0wfHoUhnIz/faQ=",
- "version": "596.1"
- },
- "IOHIDFamily": {
- "hash": "sha256-7UFMBdF5k9aVFVuoL2riozzKmn8uOt87Aitt8j6XkN8=",
- "version": "1915.100.21"
- },
- "IOKitUser": {
- "hash": "sha256-hgFRHPAuoqSf6aRUBUyfU2y2+dBUA34DKwLHLwhPNms=",
- "version": "2022.100.19"
- },
- "IONetworkingFamily": {
- "hash": "sha256-SwZvXLSB9cMHssZU4dCogGVoV64qYdGN1CGYV3FZ6tk=",
- "version": "170"
- },
- "IOSerialFamily": {
- "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=",
- "version": "93"
- },
- "IOStorageFamily": {
- "hash": "sha256-g4oCrxM5VtHm8h1M+zM81Ar1LsaaiJZLej5fT8EHPG4=",
- "version": "302.100.1"
- },
- "IOUSBFamily": {
- "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=",
- "version": "630.4.5"
- },
- "Libc": {
- "hash": "sha256-dqbdWtBuaRq3IHnSUPH2aj8h/X4zCwUNSOeSdwfKvN8=",
- "version": "1534.100.14"
- },
- "Libinfo": {
- "hash": "sha256-iUyndeUXx7FFZ/jgJ6jRwda3IChOaMs4dZW/ISuAJ1E=",
- "version": "564.101.1"
- },
- "Libm": {
- "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=",
- "version": "2026"
- },
- "Libnotify": {
- "hash": "sha256-7AwTfogvCUMdoabxf413ENWXtFTOM6AUldccoPQ89sU=",
- "version": "312"
- },
- "Librpcsvc": {
- "hash": "sha256-UWYdCQ9QsBqwM01bWr+igINAHSdSluB/FrOclC5AjTI=",
- "version": "31"
- },
- "Libsystem": {
- "hash": "sha256-IIksf0yCg3GdME3HofYzD1MRC+ofsPhHcxddmNd7V2M=",
- "version": "1319.100.3"
- },
- "OpenDirectory": {
- "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=",
- "version": "146"
- },
- "Security": {
- "hash": "sha256-lPq58QIx+H9DouTXAUJSMf1X7dj9V6xu3c8VWr2R1IY=",
- "version": "60420.101.4"
- },
- "architecture": {
- "hash": "sha256-PRNUrhzSOrwmxSPkKmV0LV7yEIik65sdkfKdBqcwFhU=",
- "version": "282"
- },
- "configd": {
- "hash": "sha256-M/fRAnUw2wObhCQp9a6zQbCGhACCQHpju4/1+KGlkjg=",
- "version": "1241.100.11"
- },
- "copyfile": {
- "hash": "sha256-te3WcQudrXPqnTM1s/AtsTdu7VIXf5dIASy+IGnIxv0=",
- "version": "191.100.3"
- },
- "dtrace": {
- "hash": "sha256-7jAG66hG9qmqpRbECazMD1Pyi53CWTOGNnZca1NpcxE=",
- "version": "397"
- },
- "dyld": {
- "hash": "sha256-OkDOTV86EB44LxsqwTD4ZncMcr7iqSHXxw+6U+AP7oU=",
- "version": "1066.8"
- },
- "eap8021x": {
- "hash": "sha256-FMG+IGVPpcwrRe2/OKpFycrY/EFPZkge2vX61NgorGg=",
- "version": "336.100.6"
- },
- "hfs": {
- "hash": "sha256-Au5VDrYRBerI1I6rjC0lVDwB5IBwGARrAdcTI4M+Fx0=",
- "version": "627.100.6"
- },
- "launchd": {
- "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=",
- "version": "842.1.4"
- },
- "libclosure": {
- "hash": "sha256-V1tpp/XG6baETunJt029rI6wp6moYSnFprt+bNGaQ40=",
- "version": "87"
- },
- "libdispatch": {
- "hash": "sha256-d1VObN11bNdtNJlZQqp2y8yP4lit5Wbj+4/aN3StsPc=",
- "version": "1415.100.11"
- },
- "libmalloc": {
- "hash": "sha256-jcR1AO/chcZzfAvELkC+U3q9tzxqPdwgLcHrnkQmN4M=",
- "version": "425.100.7"
- },
- "libplatform": {
- "hash": "sha256-+BB23YGGT0hA326Dh+3k2UvAqBdEJ84A6yGA/ccrihg=",
- "version": "292.100.1"
- },
- "libpthread": {
- "hash": "sha256-/l17vMWhfAs0YhIHi+l84vGVxpGFOzocvxxii7B+WUk=",
- "version": "514.100.2"
- },
- "mDNSResponder": {
- "hash": "sha256-M4yfQsdlKwes5M2QOEEfjv7ldSVZw7oGXLISaDcObjs=",
- "version": "1807.101.2"
- },
- "objc4": {
- "hash": "sha256-qOV9YfP59WP8Izp+IvM/aiYTW8fCoq21uxU64OcIHk8=",
- "version": "876"
- },
- "ppp": {
- "hash": "sha256-Sg5c5qOSk5TaS4pgXZ+eAy/iuGBa1oFML0dkj463DcE=",
- "version": "1010"
- },
- "removefile": {
- "hash": "sha256-oQorWHlJ0ctekCTUsLXHko8k1aCKBJ00A2FHkRd4B3E=",
- "version": "68"
- },
- "xnu": {
- "hash": "sha256-w9/lDZ/E54YzYQkOWptNpX5GomgI/fvZLAy7NY3O+IQ=",
- "version": "8796.101.5"
- }
- },
"14.4": {
"CarbonHeaders": {
"hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=",
diff --git a/pkgs/by-name/ap/apple-sdk/metadata/versions.json b/pkgs/by-name/ap/apple-sdk/metadata/versions.json
index 303f456f96149..b58641c2602a4 100644
--- a/pkgs/by-name/ap/apple-sdk/metadata/versions.json
+++ b/pkgs/by-name/ap/apple-sdk/metadata/versions.json
@@ -1,28 +1,4 @@
{
- "11": {
- "urls": [
- "https://swcdn.apple.com/content/downloads/02/62/071-54303-A_EU2CL1YVT7/943i95dpeyi2ghlnj2mgyq3t202t5gf18b/CLTools_macOSNMOS_SDK.pkg",
- "https://web.archive.org/web/20250210235110/https://swcdn.apple.com/content/downloads/02/62/071-54303-A_EU2CL1YVT7/943i95dpeyi2ghlnj2mgyq3t202t5gf18b/CLTools_macOSNMOS_SDK.pkg"
- ],
- "version": "11.3",
- "hash": "sha256-/go8utcx3jprf6c8V/DUbXwsmNYSFchOAai1OaJs3Bg="
- },
- "12": {
- "urls": [
- "https://swcdn.apple.com/content/downloads/24/42/002-83793-A_74JRE8GVAT/rlnkct919wgc5c0pjq986z5bb9h62uvni2/CLTools_macOSNMOS_SDK.pkg",
- "https://web.archive.org/web/20250210235341/https://swcdn.apple.com/content/downloads/24/42/002-83793-A_74JRE8GVAT/rlnkct919wgc5c0pjq986z5bb9h62uvni2/CLTools_macOSNMOS_SDK.pkg"
- ],
- "version": "12.3",
- "hash": "sha256-qG21ssNUmkqxPLTXALGP2N/RBHu8NMlI1dWvGlV+Wm8="
- },
- "13": {
- "urls": [
- "https://swcdn.apple.com/content/downloads/15/62/032-84673-A_7A1TG1RF8Z/xpc8q44ggn2pkn82iwr0fi1zeb9cxi8ath/CLTools_macOSNMOS_SDK.pkg",
- "https://web.archive.org/web/20250210235949/https://swcdn.apple.com/content/downloads/15/62/032-84673-A_7A1TG1RF8Z/xpc8q44ggn2pkn82iwr0fi1zeb9cxi8ath/CLTools_macOSNMOS_SDK.pkg"
- ],
- "version": "13.3",
- "hash": "sha256-zZ4pbgoXunLGwdYDemxOfyH4CE5WGfMy2s5jN+0q4B4="
- },
"14": {
"urls": [
"https://swcdn.apple.com/content/downloads/14/48/052-59890-A_I0F5YGAY0Y/p9n40hio7892gou31o1v031ng6fnm9sb3c/CLTools_macOSNMOS_SDK.pkg",
diff --git a/pkgs/by-name/ar/ares/package.nix b/pkgs/by-name/ar/ares/package.nix
index 31dbaa0fb4ed3..2ba6f00617db5 100644
--- a/pkgs/by-name/ar/ares/package.nix
+++ b/pkgs/by-name/ar/ares/package.nix
@@ -1,7 +1,7 @@
{
lib,
alsa-lib,
- apple-sdk_14,
+ apple-sdk,
cmake,
fetchzip,
gtk3,
@@ -54,7 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
zlib
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
- apple-sdk_14
moltenvk
]
++ lib.optionals stdenv.hostPlatform.isLinux [
@@ -72,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
(replaceVars ./darwin-build-fixes.patch {
- sdkVersion = apple-sdk_14.version;
+ sdkVersion = apple-sdk.version;
})
];
diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix
index a239b13feed0e..4ef558b4bf1e0 100644
--- a/pkgs/by-name/ar/arrow-cpp/package.nix
+++ b/pkgs/by-name/ar/arrow-cpp/package.nix
@@ -290,6 +290,12 @@ stdenv.mkDerivation (finalAttrs: {
"arrow-flight-integration-test"
# File already exists in database: orc_proto.proto
"arrow-orc-adapter-test"
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ # https://github.com/NixOS/nixpkgs/issues/460687
+ # Failing with "run-test.sh: line 88: 63682 Abort trap: 6"
+ "arrow-flight-internals-test"
+ "arrow-flight-sql-test"
];
in
''
diff --git a/pkgs/by-name/at/at-spi2-core/package.nix b/pkgs/by-name/at/at-spi2-core/package.nix
index 97efa5cc60e47..c9879d33eed53 100644
--- a/pkgs/by-name/at/at-spi2-core/package.nix
+++ b/pkgs/by-name/at/at-spi2-core/package.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
+ fetchpatch,
meson,
ninja,
pkg-config,
@@ -12,6 +13,7 @@
&& stdenv.hostPlatform.emulatorAvailable buildPackages,
gsettings-desktop-schemas,
makeWrapper,
+ python3,
dbus,
glib,
dconf,
@@ -27,7 +29,7 @@
stdenv.mkDerivation rec {
pname = "at-spi2-core";
- version = "2.56.2";
+ version = "2.58.0";
outputs = [
"out"
@@ -37,15 +39,25 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/at-spi2-core/${lib.versions.majorMinor version}/at-spi2-core-${version}.tar.xz";
- hash = "sha256-4bHJg2qJR4UvdEDDLiMXkjTHa9mM2cxAAfN2QF+LeDs=";
+ hash = "sha256-390zANong6IZaf+t4oiYF/t8GQak75JJfrpllps9q1o=";
};
+ # TODO apply unconditionally on rebuild
+ patches = lib.optionals stdenv.isDarwin [
+ (fetchpatch {
+ name = "timersub.patch";
+ url = "https://github.com/GNOME/at-spi2-core/commit/02108ea1b96db0189b2d4a9eceb843e1f13b7bdf.diff";
+ hash = "sha256-pVBhawfRnJoXmovl9CAmzh+YWJkbvlOVrCs8XanjP00=";
+ })
+ ];
+
nativeBuildInputs = [
glib
meson
ninja
pkg-config
makeWrapper
+ python3
]
++ lib.optionals withIntrospection [
gobject-introspection
diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix
index b4638170f8150..be7053870fca9 100644
--- a/pkgs/by-name/at/atuin/package.nix
+++ b/pkgs/by-name/at/atuin/package.nix
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "atuin";
- version = "18.8.0";
+ version = "18.10.0";
src = fetchFromGitHub {
owner = "atuinsh";
repo = "atuin";
tag = "v${finalAttrs.version}";
- hash = "sha256-FJEXIxdeg6ExXvrQ3dtugMK5xw+NwWyB+ld9rj7okoU=";
+ hash = "sha256-bfSa3RtVXxHt3usDqqpE/oXKKDUZOrf+tD9uL59fr6M=";
};
- cargoHash = "sha256-xJPSMu22Bq9Panrafsd5vUSnEQYuJB19OEZaAq8z0mw=";
+ cargoHash = "sha256-67ffivZVCly1GWA3fJ9mT8nGv2EGd6eCthbaIu/IW3M=";
# atuin's default features include 'check-updates', which do not make sense
# for distribution builds. List all other default features.
@@ -41,13 +41,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
--zsh <($out/bin/atuin gen-completions -s zsh)
'';
- passthru = {
- tests = {
- inherit (nixosTests) atuin;
- };
- updateScript = nix-update-script { };
- };
-
checkFlags = [
# tries to make a network access
"--skip=registration"
@@ -56,11 +49,19 @@ rustPlatform.buildRustPackage (finalAttrs: {
# PermissionDenied (Operation not permitted)
"--skip=change_password"
"--skip=multi_user_test"
- "--skip=store::var::tests::build_vars"
- # Tries to touch files
- "--skip=build_aliases"
];
+ preCheck = ''
+ export HOME=$(mktemp -d)
+ '';
+
+ passthru = {
+ tests = {
+ inherit (nixosTests) atuin;
+ };
+ updateScript = nix-update-script { };
+ };
+
meta = {
description = "Replacement for a shell history which records additional commands context with optional encrypted synchronization between machines";
homepage = "https://github.com/atuinsh/atuin";
diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix
index 3f4110c6c7f7a..919298baf10e8 100644
--- a/pkgs/by-name/au/audacity/package.nix
+++ b/pkgs/by-name/au/audacity/package.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
mkdir src/private
substituteInPlace scripts/build/macOS/fix_bundle.py \
- --replace-fail "path.startswith('/usr/lib/')" "path.startswith('${builtins.storeDir}')"
+ --replace-fail "path.startswith('/usr/lib/')" "path.startswith('/usr/lib/') or path.startswith('${builtins.storeDir}')"
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace libraries/lib-files/FileNames.cpp \
diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix
index 7395ada94e134..d16ea8e586772 100644
--- a/pkgs/by-name/au/audit/package.nix
+++ b/pkgs/by-name/au/audit/package.nix
@@ -117,8 +117,7 @@ stdenv.mkDerivation (finalAttrs: {
pythonImportsCheck = [ "audit" ];
- enableParallelChecking = false;
- doCheck = true;
+ doCheck = false;
postInstall = ''
installShellCompletion --bash init.d/audit.bash_completion
@@ -156,6 +155,11 @@ stdenv.mkDerivation (finalAttrs: {
static = pkgsStatic.audit or null;
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
audit = nixosTests.audit;
+ # Broken on a hardened kernel
+ package = finalAttrs.finalPackage.overrideAttrs (previousAttrs: {
+ pname = previousAttrs.pname + "-test";
+ doCheck = true;
+ });
};
};
diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix
index 5bf7c063134b1..9f696c48b8a62 100644
--- a/pkgs/by-name/az/azahar/package.nix
+++ b/pkgs/by-name/az/azahar/package.nix
@@ -42,8 +42,6 @@
gamemode,
enableGamemode ? lib.meta.availableOn stdenv.hostPlatform gamemode,
nix-update-script,
- darwinMinVersionHook,
- apple-sdk_12,
fetchpatch2,
}:
let
@@ -129,10 +127,6 @@ stdenv.mkDerivation (finalAttrs: {
]
++ optionals stdenv.hostPlatform.isDarwin [
moltenvk
-
- # error: 'lowPowerModeEnabled' is unavailable: not available on macOS
- apple-sdk_12
- (darwinMinVersionHook "12.0")
];
postPatch = ''
diff --git a/pkgs/by-name/ba/bakelite/package.nix b/pkgs/by-name/ba/bakelite/package.nix
index 252f4b36a2da7..2505599b78e15 100644
--- a/pkgs/by-name/ba/bakelite/package.nix
+++ b/pkgs/by-name/ba/bakelite/package.nix
@@ -16,7 +16,6 @@ stdenv.mkDerivation {
hash = "sha256-rRJrtCcgfbqC/4qQiTVeUUcPqoJlNfitYRqIO58AmpA=";
};
- hardeningEnable = [ "pie" ];
preBuild = ''
# pipe2() is only exposed with _GNU_SOURCE
# Upstream makefile explicitly uses -O3 to improve SHA-3 performance
diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix
index 247666bb13fbc..66c633728fad2 100644
--- a/pkgs/by-name/ba/balena-cli/package.nix
+++ b/pkgs/by-name/ba/balena-cli/package.nix
@@ -9,7 +9,6 @@
python3,
udev,
cctools,
- apple-sdk_12,
}:
let
@@ -44,13 +43,9 @@ buildNpmPackage' rec {
cctools
];
- buildInputs =
- lib.optionals stdenv.hostPlatform.isLinux [
- udev
- ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [
- apple-sdk_12
- ];
+ buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+ udev
+ ];
doInstallCheck = true;
versionCheckProgram = "${placeholder "out"}/bin/balena";
diff --git a/pkgs/by-name/ba/baobab/package.nix b/pkgs/by-name/ba/baobab/package.nix
index d6355480fcb5c..8aec38204f3c7 100644
--- a/pkgs/by-name/ba/baobab/package.nix
+++ b/pkgs/by-name/ba/baobab/package.nix
@@ -19,11 +19,11 @@
stdenv.mkDerivation rec {
pname = "baobab";
- version = "48.0";
+ version = "49.0";
src = fetchurl {
url = "mirror://gnome/sources/baobab/${lib.versions.major version}/baobab-${version}.tar.xz";
- hash = "sha256-VFklBNSdgH8jWRvn5+7xDGyd/LesUnuBw6zVh4eyb9o=";
+ hash = "sha256-GVwBgtxNf2lN0LTuNucuD0q3V4JfwjgjNAnuwt9IP64=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/ba/bash-completion/package.nix b/pkgs/by-name/ba/bash-completion/package.nix
index fdec25367b2d0..1d7ef107008a8 100644
--- a/pkgs/by-name/ba/bash-completion/package.nix
+++ b/pkgs/by-name/ba/bash-completion/package.nix
@@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
pname = "bash-completion";
- version = "2.16.0";
+ version = "2.17.0";
# Using fetchurl because fetchGithub or fetchzip will have trouble on
# e.g. APFS filesystems (macOS) because of non UTF-8 characters in some of the
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
# See discussion in https://github.com/NixOS/nixpkgs/issues/107768
src = fetchurl {
url = "https://github.com/scop/bash-completion/releases/download/${version}/bash-completion-${version}.tar.xz";
- hash = "sha256-M2m9XkGKdfuZCGOSWu1bQgOYrOuzIOxMAwaz6uI/EHo=";
+ hash = "sha256-3Z2CXklkNfs766Oue+qfd+gh6JRmfQdDHR1MjFcLnlg=";
};
postPatch = ''
diff --git a/pkgs/by-name/be/bespokesynth/package.nix b/pkgs/by-name/be/bespokesynth/package.nix
index 38c057312fb15..ee2b22f4817f3 100644
--- a/pkgs/by-name/be/bespokesynth/package.nix
+++ b/pkgs/by-name/be/bespokesynth/package.nix
@@ -3,7 +3,6 @@
stdenv,
fetchFromGitHub,
gitUpdater,
- apple-sdk_11,
cmake,
pkg-config,
ninja,
@@ -120,9 +119,6 @@ stdenv.mkDerivation (finalAttrs: {
xcb-util-cursor
pcre
mount
- ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [
- apple-sdk_11
];
postInstall =
diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix
index 288fb4747ae78..486745feac1f9 100644
--- a/pkgs/by-name/bi/bitwarden-desktop/package.nix
+++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@@ -1,6 +1,5 @@
{
lib,
- apple-sdk_14,
buildNpmPackage,
cargo,
copyDesktopItems,
@@ -130,10 +129,6 @@ buildNpmPackage' rec {
darwin.autoSignDarwinBinariesHook
];
- buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
- apple-sdk_14
- ];
-
preBuild = ''
if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '^[0-9]+') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then
echo 'ERROR: electron version mismatch'
diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix
index 1cedbfce2aac8..c5ca3d1f982f7 100644
--- a/pkgs/by-name/bl/blender/package.nix
+++ b/pkgs/by-name/bl/blender/package.nix
@@ -16,7 +16,7 @@
embree,
fetchzip,
fetchFromGitHub,
- ffmpeg,
+ ffmpeg_7,
fftw,
fftwFloat,
freetype,
@@ -234,7 +234,7 @@ stdenv'.mkDerivation (finalAttrs: {
buildInputs = [
alembic
boost
- ffmpeg
+ ffmpeg_7
fftw
fftwFloat
freetype
diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix
index ad3ed152731b4..a762ea5eadda3 100644
--- a/pkgs/by-name/bm/bmake/package.nix
+++ b/pkgs/by-name/bm/bmake/package.nix
@@ -3,7 +3,6 @@
bc,
fetchurl,
getopt,
- ksh,
pkgsMusl ? { },
stdenv,
tzdata,
@@ -39,9 +38,6 @@ stdenv.mkDerivation (finalAttrs: {
nativeCheckInputs = [
bc
tzdata
- ]
- ++ lib.optionals (stdenv.hostPlatform.libc != "musl") [
- ksh
];
# The generated makefile is a small wrapper for calling ./boot-strap with a
diff --git a/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix b/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix
index bd0b1dcf1d0e0..d050b32d7ff1d 100644
--- a/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix
+++ b/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix
@@ -8,7 +8,8 @@
vala,
budgie-desktop,
gtk3,
- libpeas,
+ gtk-layer-shell,
+ libpeas2,
nix-update-script,
}:
@@ -33,7 +34,20 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
budgie-desktop
gtk3
- libpeas
+ gtk-layer-shell
+ libpeas2
+ ];
+
+ postPatch = ''
+ # https://github.com/samlane-ma/analogue-clock-applet/issues/7
+ substituteInPlace budgie-analogue-clock-widget/src/meson.build \
+ --replace-fail "dependency('budgie-raven-plugin-1.0')" "dependency('budgie-raven-plugin-2.0')"
+ '';
+
+ mesonFlags = [
+ # The meson option actually enables libpeas2 support
+ # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749
+ "-Dfor-wayland=true"
];
passthru = {
diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix
index 0ac0833517678..1dc34f6398af3 100644
--- a/pkgs/by-name/bu/budgie-control-center/package.nix
+++ b/pkgs/by-name/bu/budgie-control-center/package.nix
@@ -70,14 +70,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "budgie-control-center";
- version = "1.4.0";
+ version = "1.4.1";
src = fetchFromGitHub {
owner = "BuddiesOfBudgie";
repo = "budgie-control-center";
tag = "v${finalAttrs.version}";
fetchSubmodules = true;
- hash = "sha256-W5PF7BPdQdg/7xJ4J+fEnuDdpoG/lyhX56RDnX2DXoY=";
+ hash = "sha256-Je3X1V4U2t0LMxWwtoYZKEI56IS4zK/w6OL615tqKkk=";
};
patches = [
diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix
index 71957c7f352a2..ac014cfcd01a4 100644
--- a/pkgs/by-name/bu/budgie-desktop/package.nix
+++ b/pkgs/by-name/bu/budgie-desktop/package.nix
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
- fetchpatch,
accountsservice,
alsa-lib,
budgie-screensaver,
@@ -10,6 +9,7 @@
glib,
gnome-desktop,
gnome-settings-daemon,
+ gobject-introspection,
graphene,
gst_all_1,
gtk-doc,
@@ -19,10 +19,12 @@
libcanberra-gtk3,
libgee,
libGL,
+ libgudev,
libnotify,
- libpeas,
+ libpeas2,
libpulseaudio,
libuuid,
+ libwacom,
libwnck,
magpie,
libgbm,
@@ -35,6 +37,7 @@
polkit,
sassc,
testers,
+ udev,
upower,
vala,
validatePkgConfig,
@@ -45,14 +48,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "budgie-desktop";
- version = "10.9.2";
+ version = "10.9.4";
src = fetchFromGitHub {
owner = "BuddiesOfBudgie";
repo = "budgie-desktop";
tag = "v${finalAttrs.version}";
fetchSubmodules = true;
- hash = "sha256-lDsQlUAa79gnM8wC5pwyquvFyEiayH4W4gD/uyC5Koo=";
+ hash = "sha256-e1kkmzSYX8TwiY0IIZYIK/FgMbZ/8PqkUn8pk3CcXHU=";
};
outputs = [
@@ -63,31 +66,11 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
./plugins.patch
-
- # Adapt to libxfce4windowing v4.19.8
- # https://github.com/BuddiesOfBudgie/budgie-desktop/pull/627
- (fetchpatch {
- url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/ba8170b4f3108f9de28331b6a98a9d92bb0ed4de.patch";
- hash = "sha256-T//1/NmaV81j0jiIYK7vEp8sgKCgF2i10D+Rk9qAAeE=";
- })
-
- # Resolve vala 0.56.18 compact class inheritance removal
- # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/679
- (fetchpatch {
- url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/46c83b1265b4230668da472d9ef6926941678418.patch";
- hash = "sha256-qnA8iBEctZbE86qIPudI1vMbgFy4xDWrxxej517ORws=";
- })
-
- # Add override for overlay-key to prevent crash with mutter-common v48-rc
- # https://github.com/BuddiesOfBudgie/budgie-desktop/pull/683
- (fetchpatch {
- url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/c24091bb424abe99ebcdd33eedd37068f735ad2a.patch";
- hash = "sha256-4WEkscftOGZmzH7imMTmcTDPH6eHMeEhgto+R5NNlh0=";
- })
];
nativeBuildInputs = [
docbook-xsl-nons
+ gobject-introspection
gtk-doc
intltool
meson
@@ -115,21 +98,30 @@ stdenv.mkDerivation (finalAttrs: {
libcanberra-gtk3
libgee
libGL
+ libgudev
libnotify
libpulseaudio
libuuid
+ libwacom
libwnck
magpie
libgbm
polkit
sassc
+ udev
upower
xfce.libxfce4windowing
];
propagatedBuildInputs = [
# budgie-1.0.pc, budgie-raven-plugin-1.0.pc
- libpeas
+ libpeas2
+ ];
+
+ mesonFlags = [
+ # FIXME: The meson option name is confusing
+ # https://github.com/BuddiesOfBudgie/budgie-desktop/pull/739#discussion_r2359421711
+ "-Dbsd-libexecdir=${gnome-settings-daemon}/libexec"
];
passthru = {
@@ -155,8 +147,8 @@ stdenv.mkDerivation (finalAttrs: {
teams = [ lib.teams.budgie ];
platforms = lib.platforms.linux;
pkgConfigModules = [
- "budgie-1.0"
- "budgie-raven-plugin-1.0"
+ "budgie-2.0"
+ "budgie-raven-plugin-2.0"
"budgie-theme-1.0"
];
};
diff --git a/pkgs/by-name/bu/budgie-desktop/plugins.patch b/pkgs/by-name/bu/budgie-desktop/plugins.patch
index 9fa40adaa5dcc..f8d5ac40adfe4 100644
--- a/pkgs/by-name/bu/budgie-desktop/plugins.patch
+++ b/pkgs/by-name/bu/budgie-desktop/plugins.patch
@@ -1,175 +1,45 @@
-diff --git a/meson.build b/meson.build
-index 6c6e473e..9b8fb73a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -88,11 +88,6 @@ datadir = join_paths(prefix, get_option('datadir'))
- localedir = join_paths(prefix, get_option('localedir'))
- podir = join_paths(meson.source_root(), 'po')
+diff --git a/src/panel/plugin/plugin-manager.c b/src/panel/plugin/plugin-manager.c
+index 1f0d32d60..2f46cee6e 100644
+--- a/src/panel/plugin/plugin-manager.c
++++ b/src/panel/plugin/plugin-manager.c
+@@ -115,12 +115,26 @@ static void budgie_panel_plugin_manager_init(BudgiePanelPluginManager *self) {
+ }
--cdata.set_quoted('DATADIR', datadir)
--cdata.set_quoted('SYSCONFDIR', confdir)
--cdata.set_quoted('LOCALEDIR', localedir)
--cdata.set_quoted('PACKAGE_URL', 'https://buddiesofbudgie.org')
--
- # Handle i18n on the .desktop file
- # Originally stolem from TingPing:
- # https://github.com/vinszent/gnome-twitch/blob/master/data/meson.build
-@@ -111,23 +106,10 @@ cdata.set_quoted('MODULEDIR', plugin_libdir)
- cdata.set_quoted('MODULE_DATA_DIR', plugin_datadir)
- cdata.set_quoted('RAVEN_PLUGIN_LIBDIR', raven_plugin_libdir)
- cdata.set_quoted('RAVEN_PLUGIN_DATADIR', raven_plugin_datadir)
--
--if prefix == '/usr' or prefix == '/usr/local'
-- cdata.set('HAS_SECONDARY_PLUGIN_DIRS', true)
--
-- if prefix == '/usr'
-- secondary_libdir_root = join_paths(prefix, 'local', get_option('libdir'), meson.project_name())
-- secondary_datadir_root = join_paths(prefix, 'local', get_option('datadir'), meson.project_name())
-- else
-- secondary_libdir_root = join_paths('/usr', get_option('libdir'), meson.project_name())
-- secondary_datadir_root = join_paths('/usr', get_option('datadir'), meson.project_name())
-- endif
--
-- cdata.set_quoted('MODULEDIR_SECONDARY', join_paths(secondary_libdir_root, 'plugins'))
-- cdata.set_quoted('MODULE_DATA_DIR_SECONDARY', join_paths(secondary_datadir_root, 'plugins'))
-- cdata.set_quoted('RAVEN_PLUGIN_LIBDIR_SECONDARY', join_paths(secondary_libdir_root, 'raven-plugins'))
-- cdata.set_quoted('RAVEN_PLUGIN_DATADIR_SECONDARY', join_paths(secondary_datadir_root, 'raven-plugins'))
--endif
-+cdata.set_quoted('DATADIR', datadir)
-+cdata.set_quoted('SYSCONFDIR', confdir)
-+cdata.set_quoted('LOCALEDIR', localedir)
-+cdata.set_quoted('PACKAGE_URL', 'https://buddiesofbudgie.org')
+ /* System path */
+- peas_engine_add_search_path(self->engine, BUDGIE_MODULE_DIRECTORY, BUDGIE_MODULE_DATA_DIRECTORY);
++ const gchar* libdir = NULL;
++ const gchar* datadir = NULL;
++ libdir = g_getenv("BUDGIE_PLUGIN_LIBDIR");
++ if (libdir != NULL) {
++ g_debug("BUDGIE_PLUGIN_LIBDIR is set to %s", libdir);
++ } else {
++ g_debug("BUDGIE_PLUGIN_LIBDIR is unset, defaulting to %s", BUDGIE_MODULE_DIRECTORY);
++ libdir = BUDGIE_MODULE_DIRECTORY;
++ }
- with_bluetooth = get_option('with-bluetooth')
- if with_bluetooth == true
-diff --git a/src/config/budgie-config.c b/src/config/budgie-config.c
-index 3ffe3632..da53e054 100644
---- a/src/config/budgie-config.c
-+++ b/src/config/budgie-config.c
-@@ -11,7 +11,6 @@
+- if (BUDGIE_HAS_SECONDARY_PLUGIN_DIRS) {
+- peas_engine_add_search_path(self->engine, BUDGIE_MODULE_DIRECTORY_SECONDARY, BUDGIE_MODULE_DATA_DIRECTORY_SECONDARY);
++ datadir = g_getenv("BUDGIE_PLUGIN_DATADIR");
++ if (datadir != NULL) {
++ g_debug("BUDGIE_PLUGIN_DATADIR is set to %s", datadir);
++ } else {
++ g_debug("BUDGIE_PLUGIN_DATADIR is unset, defaulting to %s", BUDGIE_MODULE_DATA_DIRECTORY);
++ datadir = BUDGIE_MODULE_DATA_DIRECTORY;
+ }
- #ifndef CONFIG_H_INCLUDED
- #include "config.h"
--#include
- #include
-
- /**
-@@ -22,20 +21,6 @@ const char* BUDGIE_MODULE_DATA_DIRECTORY = MODULE_DATA_DIR;
- const char* BUDGIE_RAVEN_PLUGIN_LIBDIR = RAVEN_PLUGIN_LIBDIR;
- const char* BUDGIE_RAVEN_PLUGIN_DATADIR = RAVEN_PLUGIN_DATADIR;
-
--#ifdef HAS_SECONDARY_PLUGIN_DIRS
--const bool BUDGIE_HAS_SECONDARY_PLUGIN_DIRS = true;
--const char* BUDGIE_MODULE_DIRECTORY_SECONDARY = MODULEDIR_SECONDARY;
--const char* BUDGIE_MODULE_DATA_DIRECTORY_SECONDARY = MODULE_DATA_DIR_SECONDARY;
--const char* BUDGIE_RAVEN_PLUGIN_LIBDIR_SECONDARY = RAVEN_PLUGIN_LIBDIR_SECONDARY;
--const char* BUDGIE_RAVEN_PLUGIN_DATADIR_SECONDARY = RAVEN_PLUGIN_DATADIR_SECONDARY;
--#else
--const bool BUDGIE_HAS_SECONDARY_PLUGIN_DIRS = false;
--const char* BUDGIE_MODULE_DIRECTORY_SECONDARY = NULL;
--const char* BUDGIE_MODULE_DATA_DIRECTORY_SECONDARY = NULL;
--const char* BUDGIE_RAVEN_PLUGIN_LIBDIR_SECONDARY = NULL;
--const char* BUDGIE_RAVEN_PLUGIN_DATADIR_SECONDARY = NULL;
--#endif
--
- const char* BUDGIE_DATADIR = DATADIR;
- const char* BUDGIE_VERSION = PACKAGE_VERSION;
- const char* BUDGIE_WEBSITE = PACKAGE_URL;
-diff --git a/src/config/budgie-config.h b/src/config/budgie-config.h
-index b7581203..11df4347 100644
---- a/src/config/budgie-config.h
-+++ b/src/config/budgie-config.h
-@@ -12,7 +12,6 @@
- #ifndef _BUDGIE_CONFIG_H_
- #define _BUDGIE_CONFIG_H_
-
--#include
- #include
-
- /* i.e. /usr/lib/budgie-desktop */
-@@ -27,12 +26,6 @@ extern const char* BUDGIE_RAVEN_PLUGIN_LIBDIR;
- /* i.e. /usr/share/budgie-desktop/raven-plugins */
- extern const char* BUDGIE_RAVEN_PLUGIN_DATADIR;
-
--extern const bool BUDGIE_HAS_SECONDARY_PLUGIN_DIRS;
--extern const char* BUDGIE_MODULE_DIRECTORY_SECONDARY;
--extern const char* BUDGIE_MODULE_DATA_DIRECTORY_SECONDARY;
--extern const char* BUDGIE_RAVEN_PLUGIN_LIBDIR_SECONDARY;
--extern const char* BUDGIE_RAVEN_PLUGIN_DATADIR_SECONDARY;
--
- /* i.e. /usr/share/ */
- extern const char* BUDGIE_DATADIR;
-
-diff --git a/src/config/budgie-config.vapi b/src/config/budgie-config.vapi
-index 5eb445d1..7d27e348 100644
---- a/src/config/budgie-config.vapi
-+++ b/src/config/budgie-config.vapi
-@@ -22,21 +22,6 @@ namespace Budgie {
- [CCode (cheader_filename="budgie-config.h")]
- public extern const string RAVEN_PLUGIN_DATADIR;
-
-- [CCode (cheader_filename="budgie-config.h")]
-- public extern const bool HAS_SECONDARY_PLUGIN_DIRS;
--
-- [CCode (cheader_filename="budgie-config.h")]
-- public extern const string? MODULE_DIRECTORY_SECONDARY;
--
-- [CCode (cheader_filename="budgie-config.h")]
-- public extern const string? MODULE_DATA_DIRECTORY_SECONDARY;
--
-- [CCode (cheader_filename="budgie-config.h")]
-- public extern const string? RAVEN_PLUGIN_LIBDIR_SECONDARY;
--
-- [CCode (cheader_filename="budgie-config.h")]
-- public extern const string? RAVEN_PLUGIN_DATADIR_SECONDARY;
--
- [CCode (cheader_filename="budgie-config.h")]
- public extern const string DATADIR;
-
-diff --git a/src/panel/plugin_manager.vala b/src/panel/plugin_manager.vala
-index f4f2e4da..3dfee49a 100644
---- a/src/panel/plugin_manager.vala
-+++ b/src/panel/plugin_manager.vala
-@@ -40,13 +40,26 @@ namespace Budgie {
- }
-
- /* System path */
-- var dir = Environment.get_user_data_dir();
-- engine.add_search_path(Budgie.MODULE_DIRECTORY, Budgie.MODULE_DATA_DIRECTORY);
-- if (Budgie.HAS_SECONDARY_PLUGIN_DIRS) {
-- engine.add_search_path(Budgie.MODULE_DIRECTORY_SECONDARY, Budgie.MODULE_DATA_DIRECTORY_SECONDARY);
-+ var libdir = Environment.get_variable("BUDGIE_PLUGIN_LIBDIR");
-+ if (libdir != null) {
-+ debug("BUDGIE_PLUGIN_LIBDIR is set to %s", libdir);
-+ } else {
-+ debug("BUDGIE_PLUGIN_LIBDIR is unset, defaulting to %s", Budgie.MODULE_DIRECTORY);
-+ libdir = Budgie.MODULE_DIRECTORY;
-+ }
++ peas_engine_add_search_path(self->engine, libdir, datadir);
+
-+ var datadir = Environment.get_variable("BUDGIE_PLUGIN_DATADIR");
-+ if (datadir != null) {
-+ debug("BUDGIE_PLUGIN_DATADIR is set to %s", datadir);
-+ } else {
-+ debug("BUDGIE_PLUGIN_DATADIR is unset, defaulting to %s", Budgie.MODULE_DATA_DIRECTORY);
-+ datadir = Budgie.MODULE_DATA_DIRECTORY;
- }
-
-+ engine.add_search_path(libdir, datadir);
-+
- /* User path */
-+ var dir = Environment.get_user_data_dir();
- var user_mod = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "plugins");
- var hdata = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "data");
- engine.add_search_path(user_mod, hdata);
+ /* User path */
+ user_data_dir = g_get_user_data_dir();
+ user_mod_dir = g_build_path(G_DIR_SEPARATOR_S, user_data_dir, "budgie-desktop", "plugins", NULL);
diff --git a/src/raven/plugin_manager.vala b/src/raven/plugin_manager.vala
-index 01f32553..2826b7e5 100644
+index 1ff139c9a..809b9b82a 100644
--- a/src/raven/plugin_manager.vala
+++ b/src/raven/plugin_manager.vala
-@@ -51,13 +51,26 @@ namespace Budgie {
- }
+@@ -51,11 +51,24 @@ namespace Budgie {
/* System path */
-- var dir = Environment.get_user_data_dir();
+ var dir = Environment.get_user_data_dir();
- engine.add_search_path(Budgie.RAVEN_PLUGIN_LIBDIR, Budgie.RAVEN_PLUGIN_DATADIR);
- if (Budgie.HAS_SECONDARY_PLUGIN_DIRS) {
- engine.add_search_path(Budgie.RAVEN_PLUGIN_LIBDIR_SECONDARY, Budgie.RAVEN_PLUGIN_DATADIR_SECONDARY);
@@ -192,7 +62,5 @@ index 01f32553..2826b7e5 100644
+ engine.add_search_path(libdir, datadir);
+
/* User path */
-+ var dir = Environment.get_user_data_dir();
var user_mod = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "raven-plugins");
var hdata = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "raven-data");
- engine.add_search_path(user_mod, hdata);
diff --git a/pkgs/by-name/bu/budgie-media-player-applet/package.nix b/pkgs/by-name/bu/budgie-media-player-applet/package.nix
index b0228b8c9ae41..4e42ee0e6482e 100644
--- a/pkgs/by-name/bu/budgie-media-player-applet/package.nix
+++ b/pkgs/by-name/bu/budgie-media-player-applet/package.nix
@@ -43,8 +43,18 @@ stdenv.mkDerivation (finalAttrs: {
requests
];
+ mesonFlags = [
+ # The meson option actually enables libpeas2 support
+ # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749
+ "-Dfor-wayland=true"
+ ];
+
postPatch = ''
substituteInPlace meson.build --replace-fail "/usr" "$out"
+
+ # https://github.com/zalesyc/budgie-media-player-applet/issues/25
+ substituteInPlace src/{applet,testWin,Popover,BudgieMediaPlayer}.py \
+ --replace-fail "gi.require_version('Budgie', '1.0')" "gi.require_version('Budgie', '2.0')"
'';
postFixup = ''
diff --git a/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix b/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix
index b4bb9cb2ae238..462a6daa5bf88 100644
--- a/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix
+++ b/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix
@@ -7,7 +7,7 @@
gtk3,
libgee,
libgtop,
- libpeas,
+ libpeas2,
meson,
ninja,
nix-update-script,
@@ -45,9 +45,17 @@ stdenv.mkDerivation (finalAttrs: {
gtk3
libgee
libgtop
- libpeas
+ libpeas2
];
+ postPatch = ''
+ # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749
+ # https://github.com/prateekmedia/budgie-systemmonitor-applet/issues/4
+ substituteInPlace meson.build \
+ --replace-fail "dependency('libpeas-1.0', version: '>= 1.8.0')" "dependency('libpeas-2')" \
+ --replace-fail "dependency('budgie-1.0', version: '>= 2')" "dependency('budgie-2.0')"
+ '';
+
passthru = {
updateScript = nix-update-script { };
};
diff --git a/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix b/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix
index 8a90ba6725ed6..1da60058ec24e 100644
--- a/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix
+++ b/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix
@@ -7,7 +7,7 @@
gtk3,
intltool,
libgee,
- libpeas,
+ libpeas2,
meson,
ninja,
nix-update-script,
@@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "budgie-user-indicator-redux";
- version = "1.0.2";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "EbonJaeger";
repo = "budgie-user-indicator-redux";
- rev = "v${finalAttrs.version}";
- hash = "sha256-X9b4H4PnrYGb/T7Sg9iXQeNDLoO1l0VCdbOCGUAgwC4=";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-ZvT114F0g+3zpskyb4Bn6grAXHWtMqRqb9MzfF0WLQ8=";
};
nativeBuildInputs = [
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
budgie-desktop
gtk3
libgee
- libpeas
+ libpeas2
sassc
];
diff --git a/pkgs/by-name/bu/buildah-unwrapped/package.nix b/pkgs/by-name/bu/buildah-unwrapped/package.nix
index 73dd15593abc4..d8701d6f833fb 100644
--- a/pkgs/by-name/bu/buildah-unwrapped/package.nix
+++ b/pkgs/by-name/bu/buildah-unwrapped/package.nix
@@ -35,9 +35,6 @@ buildGoModule (finalAttrs: {
doCheck = false;
- # /nix/store/.../bin/ld: internal/mkcw/embed/entrypoint_amd64.o: relocation R_X86_64_32S against `.rodata.1' can not be used when making a PIE object; recompile with -fPIE
- hardeningDisable = [ "pie" ];
-
nativeBuildInputs = [
go-md2man
installShellFiles
diff --git a/pkgs/by-name/ca/calls/package.nix b/pkgs/by-name/ca/calls/package.nix
index c785ae2d70ba2..5c21a92baee23 100644
--- a/pkgs/by-name/ca/calls/package.nix
+++ b/pkgs/by-name/ca/calls/package.nix
@@ -36,7 +36,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "calls";
- version = "48.2";
+ version = "49.1.1";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
repo = "calls";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
- hash = "sha256-S1YWFkwK1tcIUOfyOxlEFtKcLlRDiSKf4iUGnb+VlG8=";
+ hash = "sha256-fqvfzdk1szNFm4aRRGNDaA/AmjJdQjBsMhvEolEetE0=";
};
outputs = [
diff --git a/pkgs/by-name/ca/catch2_3/package.nix b/pkgs/by-name/ca/catch2_3/package.nix
index 269a445c48a4f..586fa9f3d9edb 100644
--- a/pkgs/by-name/ca/catch2_3/package.nix
+++ b/pkgs/by-name/ca/catch2_3/package.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "catch2";
- version = "3.10.0";
+ version = "3.11.0";
src = fetchFromGitHub {
owner = "catchorg";
repo = "Catch2";
tag = "v${version}";
- hash = "sha256-eeqqzHMeXLRiXzbY+ay8gJ/YDuxDj3f6+d6eXA1uZHE=";
+ hash = "sha256-7Dx7PhtRwkbo8vHF57sAns2fQZ442D3cMyCt25RvzJc=";
};
patches = lib.optionals stdenv.cc.isClang [
@@ -40,9 +40,9 @@ stdenv.mkDerivation rec {
"-DCATCH_BUILD_TESTING=${if doCheck then "ON" else "OFF"}"
"-DCATCH_ENABLE_WERROR=OFF"
]
- ++ lib.optionals (stdenv.hostPlatform.isDarwin && doCheck) [
+ ++ lib.optionals (stdenv.cc.isClang && doCheck) [
# test has a faulty path normalization technique that won't work in
- # our darwin build environment https://github.com/catchorg/Catch2/issues/1691
+ # our darwin/LLVM build environment https://github.com/catchorg/Catch2/issues/1691
"-DCMAKE_CTEST_ARGUMENTS=-E;ApprovalTests"
];
diff --git a/pkgs/by-name/cc/cctools/meson.build b/pkgs/by-name/cc/cctools/meson.build
index bfb4f06285d77..6c0a180162035 100644
--- a/pkgs/by-name/cc/cctools/meson.build
+++ b/pkgs/by-name/cc/cctools/meson.build
@@ -12,7 +12,7 @@ project(
'-DCCTB_PROJECT=cctools',
'-DCCTB_PROJVERS=cctools-@version@',
'-DCCTB_VERSION=@version@',
- '-DCURRENT_PROJECT_VERSION="@version@"',
+ '-DCURRENT_PROJECT_VERSION="cctools-@version@"',
'-DCODEDIRECTORY_SUPPORT',
'-DLTO_SUPPORT',
],
diff --git a/pkgs/by-name/ch/choose-gui/package.nix b/pkgs/by-name/ch/choose-gui/package.nix
index 04a74c40d9015..7a36bdfd60f86 100644
--- a/pkgs/by-name/ch/choose-gui/package.nix
+++ b/pkgs/by-name/ch/choose-gui/package.nix
@@ -3,7 +3,6 @@
stdenv,
fetchFromGitHub,
xcbuild,
- apple-sdk_11,
}:
stdenv.mkDerivation rec {
@@ -19,8 +18,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ xcbuild ];
- buildInputs = [ apple-sdk_11 ];
-
buildPhase = ''
runHook preBuild
xcodebuild -configuration Release SYMROOT="./output" HOME="$(mktemp -d)" build
diff --git a/pkgs/by-name/ch/chromaprint/package.nix b/pkgs/by-name/ch/chromaprint/package.nix
index 89674dc9f6a0d..70e5fd0e8b8aa 100644
--- a/pkgs/by-name/ch/chromaprint/package.nix
+++ b/pkgs/by-name/ch/chromaprint/package.nix
@@ -75,12 +75,12 @@ stdenv.mkDerivation (finalAttrs: {
};
# sha256 because actual output of fpcalc is quite long
- expectedHash = "c47ae40e02caf798ff5ab4d91ff00cfdca8f6786c581662436941d3e000c9aac";
+ expectedHash = "e2895130bcbe7190184379021daa60c5f5d476da4a2fecb06df7160819662e20";
in
''
runHook preCheck
tests/all_tests
- ${lib.optionalString withTools "diff -u <(src/cmd/fpcalc ${exampleAudio} | sha256sum | cut -c-64) <(echo '${expectedHash}')"}
+ ${lib.optionalString withTools "diff -u <(src/cmd/fpcalc -plain ${exampleAudio} | sha256sum | cut -c-64) <(echo '${expectedHash}')"}
runHook postCheck
'';
diff --git a/pkgs/by-name/ch/chrony/package.nix b/pkgs/by-name/ch/chrony/package.nix
index 602da83f6b2f2..024e59cce880f 100644
--- a/pkgs/by-name/ch/chrony/package.nix
+++ b/pkgs/by-name/ch/chrony/package.nix
@@ -62,8 +62,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
doCheck = true;
- hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ];
-
passthru.tests = {
inherit (nixosTests) chrony chrony-ptp;
};
diff --git a/pkgs/by-name/cm/cmake/setup-hook.sh b/pkgs/by-name/cm/cmake/setup-hook.sh
index 5e84594934f40..01302284eb4f7 100755
--- a/pkgs/by-name/cm/cmake/setup-hook.sh
+++ b/pkgs/by-name/cm/cmake/setup-hook.sh
@@ -39,13 +39,6 @@ cmakeConfigurePhase() {
prependToVar cmakeFlags "-DCMAKE_RANLIB=$(command -v $RANLIB)"
prependToVar cmakeFlags "-DCMAKE_STRIP=$(command -v $STRIP)"
- # on macOS we want to prefer Unix-style headers to Frameworks
- # because we usually do not package the framework
- prependToVar cmakeFlags "-DCMAKE_FIND_FRAMEWORK=LAST"
-
- # correctly detect our clang compiler
- prependToVar cmakeFlags "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW"
-
# This installs shared libraries with a fully-specified install
# name. By default, cmake installs shared libraries with just the
# basename as the install name, which means that, on Darwin, they
diff --git a/pkgs/by-name/cu/curlMinimal/fix-h2-paused-transfers.patch b/pkgs/by-name/cu/curlMinimal/fix-h2-paused-transfers.patch
new file mode 100644
index 0000000000000..50e202684b8cb
--- /dev/null
+++ b/pkgs/by-name/cu/curlMinimal/fix-h2-paused-transfers.patch
@@ -0,0 +1,27 @@
+From 7e91f24c73256af59ac9061c41b73a184c4690aa Mon Sep 17 00:00:00 2001
+From: Stefan Eissing
+Date: Mon, 3 Nov 2025 15:07:57 +0100
+Subject: [PATCH] cw-out: fix EAGAIN handling on pause
+
+The interim CURLE_AGAIN result was not always converted to a
+CURLE_OK and then caused write callers to report a failure.
+
+Fixes #19334
+Reported-by: pennae on github
+Closes #19338
+---
+ lib/cw-out.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/cw-out.c b/lib/cw-out.c
+index 1f4031649267..9c0a36e7e5e2 100644
+--- a/lib/cw-out.c
++++ b/lib/cw-out.c
+@@ -302,6 +302,7 @@ static CURLcode cw_out_buf_flush(struct cw_out_ctx *ctx,
+ &consumed);
+ if(result && (result != CURLE_AGAIN))
+ return result;
++ result = CURLE_OK;
+
+ if(consumed) {
+ if(consumed == curlx_dyn_len(&cwbuf->b)) {
diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix
index 2ce9522d6f4d8..244454016e478 100644
--- a/pkgs/by-name/cu/curlMinimal/package.nix
+++ b/pkgs/by-name/cu/curlMinimal/package.nix
@@ -98,6 +98,14 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-QMjN28tsxiUcA96kI6Ryps6kA3vmVLpc9d7G6y0i/x0=";
};
+ patches = [
+ # Bug introduced in curl@fa915b (8.16.0) https://github.com/curl/curl/issues/19334 Paused
+ # HTTP/2 transfers will return the wrong errors and trash the whole
+ # transfer. Remove this patch once curl is updated to 8.17.0 which will be
+ # released on the 5th November 2025.
+ ./fix-h2-paused-transfers.patch
+ ];
+
# this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion
# necessary for FreeBSD code path in configure
postPatch = ''
diff --git a/pkgs/by-name/d-/d-spy/package.nix b/pkgs/by-name/d-/d-spy/package.nix
index 36ecd9d1a4d46..705bf5078e5d4 100644
--- a/pkgs/by-name/d-/d-spy/package.nix
+++ b/pkgs/by-name/d-/d-spy/package.nix
@@ -7,6 +7,7 @@
gettext,
gtk4,
libadwaita,
+ libdex,
meson,
ninja,
pkg-config,
@@ -16,7 +17,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "d-spy";
- version = "48.0";
+ version = "49.2";
outputs = [
"out"
@@ -25,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/d-spy/${lib.versions.major finalAttrs.version}/d-spy-${finalAttrs.version}.tar.xz";
- hash = "sha256-D3oJAZBGGU2X/Dw0KzhOocOA4Qqc/IAlv83lfVlcODA=";
+ hash = "sha256-uBT/J9goqrzacvLGLxtB1iA190PQb9mn48XJhsSHmmk=";
};
nativeBuildInputs = [
@@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
glib
gtk4
libadwaita
+ libdex
];
passthru = {
diff --git a/pkgs/by-name/da/dash/package.nix b/pkgs/by-name/da/dash/package.nix
index 6c21d4edeff10..c922ed45d97fb 100644
--- a/pkgs/by-name/da/dash/package.nix
+++ b/pkgs/by-name/da/dash/package.nix
@@ -7,15 +7,19 @@
libedit,
runCommand,
dash,
+
+ # Reverse dependency smoke tests
+ tests,
+ patchRcPathPosix,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "dash";
- version = "0.5.12";
+ version = "0.5.13.1";
src = fetchurl {
url = "http://gondor.apana.org.au/~herbert/dash/files/dash-${finalAttrs.version}.tar.gz";
- hash = "sha256-akdKxG6LCzKRbExg32lMggWNMpfYs4W3RQgDDKSo8oo=";
+ hash = "sha256-2ScbzgnBJ9mGbiXAEVgt3HWrmIlYoEvE2FU6O48w43A=";
};
strictDeps = true;
@@ -43,6 +47,19 @@ stdenv.mkDerivation (finalAttrs: {
[ -s $out/success ]
grep -q "Hello World" $out/success
'';
+
+ /**
+ Reverse dependency smoke tests. Build success of `dash.tests` informs
+ whether an update makes it into staging.
+ */
+ reverseDependencies = lib.recurseIntoAttrs {
+ writers = lib.recurseIntoAttrs {
+ simple = tests.writers.simple.dash;
+ bin = tests.writers.bin.dash;
+ };
+ # Not sure if effective smoke test, but cheap
+ patch-rc-path-posix = patchRcPathPosix.tests.test-posix;
+ };
};
};
diff --git a/pkgs/by-name/dc/dconf-editor/package.nix b/pkgs/by-name/dc/dconf-editor/package.nix
index 49eb2b4f121ce..f44dd682222f5 100644
--- a/pkgs/by-name/dc/dconf-editor/package.nix
+++ b/pkgs/by-name/dc/dconf-editor/package.nix
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchurl,
- fetchpatch,
desktop-file-utils,
meson,
ninja,
@@ -23,20 +22,14 @@
stdenv.mkDerivation rec {
pname = "dconf-editor";
- version = "45.0.1";
+ version = "49.0";
src = fetchurl {
url = "mirror://gnome/sources/dconf-editor/${lib.versions.major version}/dconf-editor-${version}.tar.xz";
- hash = "sha256-EYApdnju2uYhfMUUomOMGH0vHR7ycgy5B5t0DEKZQd0=";
+ hash = "sha256-kKjM+t9R3/MeACgyT7mjWLLSbFroYaccfb+fTdm905k=";
};
patches = [
- # Fix crash with GSETTINGS_SCHEMA_DIR env var.
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/dconf-editor/-/commit/baf183737d459dcde065c9f8f6fe5be7ed874de6.patch";
- hash = "sha256-Vp0qjJChDr6IarUD+tZPLJhdI8v8r6EzWNfqFSnGvqQ=";
- })
-
# Look for compiled schemas in NIX_GSETTINGS_OVERRIDES_DIR
# environment variable, to match what we patched GLib to do.
./schema-override-variable.patch
diff --git a/pkgs/by-name/de/decibels/package.nix b/pkgs/by-name/de/decibels/package.nix
index dbfb975e1530c..2f629f9d17ffd 100644
--- a/pkgs/by-name/de/decibels/package.nix
+++ b/pkgs/by-name/de/decibels/package.nix
@@ -17,11 +17,11 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "decibels";
- version = "48.0";
+ version = "49.0";
src = fetchurl {
url = "mirror://gnome/sources/decibels/${lib.versions.major finalAttrs.version}/decibels-${finalAttrs.version}.tar.xz";
- hash = "sha256-IpsRqSYxR7y4w+If8NSvZZ+yYmL4rs5Uetz4xl4DH3Q=";
+ hash = "sha256-KbebouKWfmkUHjnwrSxnfjj+P/ufug+lx1MflNP2c8o=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/di/diebahn/package.nix b/pkgs/by-name/di/diebahn/package.nix
index abea858d30e77..18e14e4dcfb69 100644
--- a/pkgs/by-name/di/diebahn/package.nix
+++ b/pkgs/by-name/di/diebahn/package.nix
@@ -24,18 +24,18 @@
stdenv.mkDerivation rec {
pname = "diebahn";
- version = "2.8.2";
+ version = "2.9.2";
src = fetchFromGitLab {
owner = "schmiddi-on-mobile";
repo = "railway";
tag = version;
- hash = "sha256-pPjOl46R8hBpyKdwq/gwHv/qCtFkI0LVDsqxcQOgtkU=";
+ hash = "sha256-e39FA0QKn91ZgN+SCY9kYQ6lGc8BgYgLxGj2dSUgi2Q=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
- hash = "sha256-kxt6z2RaSnlso/Jz36B9VNwti2o3b8+Ggd4zDIjFf2c=";
+ hash = "sha256-UQc5Q2Wsr3YRSTjT+VWIWjOvDnS2ggvvcVPde+gjqlw=";
};
nativeBuildInputs = [
@@ -81,6 +81,7 @@ stdenv.mkDerivation rec {
maintainers = with lib.maintainers; [
dotlambda
lilacious
+ cholli
];
teams = [ lib.teams.gnome-circle ];
};
diff --git a/pkgs/by-name/dn/dnsmasq/package.nix b/pkgs/by-name/dn/dnsmasq/package.nix
index 90dca5e23caf3..3b7699cf87c02 100644
--- a/pkgs/by-name/dn/dnsmasq/package.nix
+++ b/pkgs/by-name/dn/dnsmasq/package.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
"PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config"
];
- hardeningEnable = [ "pie" ];
+ enableParallelBuilding = true;
postBuild = lib.optionalString stdenv.hostPlatform.isLinux ''
make -C contrib/lease-tools
diff --git a/pkgs/by-name/do/double-conversion/package.nix b/pkgs/by-name/do/double-conversion/package.nix
index a377165483f0b..30e445519ee19 100644
--- a/pkgs/by-name/do/double-conversion/package.nix
+++ b/pkgs/by-name/do/double-conversion/package.nix
@@ -4,17 +4,19 @@
fetchFromGitHub,
fetchpatch,
cmake,
- enableStatic ? stdenv.hostPlatform.isStatic,
+ ninja,
+ ctestCheckHook,
+ testers,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "double-conversion";
version = "3.3.1";
src = fetchFromGitHub {
owner = "google";
repo = "double-conversion";
- rev = "v${version}";
+ rev = "v${finalAttrs.version}";
sha256 = "sha256-M80H+azCzQYa4/gBLWv5GNNhEuHsH7LbJ/ajwmACnrM=";
};
@@ -30,22 +32,46 @@ stdenv.mkDerivation rec {
url = "https://github.com/google/double-conversion/commit/0604b4c18815aadcf7f4b78dfa6bfcb91a634ed7.patch";
hash = "sha256-cJBp1ou1O/bMQ/7kvcX52dWbUdhmPfQ9aWmEhQdyhis=";
})
+ (fetchpatch {
+ name = "double-conversion-add-pkg-config.patch";
+ url = "https://github.com/google/double-conversion/commit/ddfd18c58ecc32fc74afc1083bb8774240b54efb.patch";
+ hash = "sha256-/pKCL19vS8fNwCm27yTNP+32ApHTH5dEGpnsMI11Lf4=";
+ })
];
- nativeBuildInputs = [ cmake ];
+ outputs = [
+ "out"
+ "dev"
+ ];
+
+ nativeBuildInputs = [
+ cmake
+ ninja
+ ctestCheckHook
+ ];
- cmakeFlags = lib.optional (!enableStatic) "-DBUILD_SHARED_LIBS=ON";
+ doCheck = true;
+
+ cmakeFlags = [
+ (lib.cmakeBool "BUILD_TESTING" true)
+ (lib.cmakeBool "BUILD_SHARED_LIBS" stdenv.hostPlatform.hasSharedLibraries)
+ ];
# Case sensitivity issue
preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
rm BUILD
'';
+ passthru = {
+ tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+ };
+
meta = with lib; {
+ pkgConfigModules = [ "double-conversion" ];
description = "Binary-decimal and decimal-binary routines for IEEE doubles";
homepage = "https://github.com/google/double-conversion";
license = licenses.bsd3;
platforms = platforms.unix ++ platforms.windows;
- maintainers = [ ];
+ maintainers = with lib.maintainers; [ fzakaria ];
};
-}
+})
diff --git a/pkgs/by-name/dr/drawterm/package.nix b/pkgs/by-name/dr/drawterm/package.nix
index 5086ad03fdec8..0e58264092d70 100644
--- a/pkgs/by-name/dr/drawterm/package.nix
+++ b/pkgs/by-name/dr/drawterm/package.nix
@@ -5,7 +5,6 @@
unstableGitUpdater,
installShellFiles,
makeWrapper,
- apple-sdk_13,
xorg,
pkg-config,
wayland-scanner,
@@ -54,8 +53,7 @@ stdenv.mkDerivation {
++ lib.optionals withXorg [
xorg.libX11
xorg.libXt
- ]
- ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_13;
+ ];
makeFlags =
lib.optional withWayland "CONF=linux"
diff --git a/pkgs/by-name/ec/echidna/package.nix b/pkgs/by-name/ec/echidna/package.nix
index 1a6376cba4a57..ca4ca1d3c090c 100644
--- a/pkgs/by-name/ec/echidna/package.nix
+++ b/pkgs/by-name/ec/echidna/package.nix
@@ -96,7 +96,7 @@ haskellPackages.mkDerivation rec {
makeWrapper
];
- preConfigure = ''
+ prePatch = ''
hpack
'';
diff --git a/pkgs/by-name/ed/edencommon/package.nix b/pkgs/by-name/ed/edencommon/package.nix
index 2dbf5e9fbb2c8..87ca034575fdd 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.09.15.00";
+ version = "2025.10.13.00";
outputs = [
"out"
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "facebookexperimental";
repo = "edencommon";
tag = "v${finalAttrs.version}";
- hash = "sha256-KyJAosCLGnpEG968GV9BOyOrsoHS7BbRatTfBqzTelU=";
+ hash = "sha256-yR0J1tfzdAFopApKsiv9yUXlU0W0Q6n6ZlmKlcVbi0E=";
};
patches = [
diff --git a/pkgs/by-name/ei/eigen/include-dir.patch b/pkgs/by-name/ei/eigen/include-dir.patch
deleted file mode 100644
index 9928bbdbed1b1..0000000000000
--- a/pkgs/by-name/ei/eigen/include-dir.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,5 @@
- # cmake_minimum_require must be the first command of the file
--cmake_minimum_required(VERSION 3.5.0)
-+cmake_minimum_required(VERSION 3.7.0)
-
- project(Eigen3)
-
-@@ -443,7 +443,7 @@ set(PKGCONFIG_INSTALL_DIR
- CACHE PATH "The directory relative to CMAKE_INSTALL_PREFIX where eigen3.pc is installed"
- )
-
--foreach(var INCLUDE_INSTALL_DIR CMAKEPACKAGE_INSTALL_DIR PKGCONFIG_INSTALL_DIR)
-+foreach(var CMAKEPACKAGE_INSTALL_DIR PKGCONFIG_INSTALL_DIR)
- # If an absolute path is specified, make it relative to "{CMAKE_INSTALL_PREFIX}".
- if(IS_ABSOLUTE "${${var}}")
- file(RELATIVE_PATH "${var}" "${CMAKE_INSTALL_PREFIX}" "${${var}}")
-@@ -466,13 +466,6 @@ install(FILES
- DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
- )
-
--if(EIGEN_BUILD_PKGCONFIG)
-- configure_file(eigen3.pc.in eigen3.pc @ONLY)
-- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc
-- DESTINATION ${PKGCONFIG_INSTALL_DIR}
-- )
--endif()
--
- install(DIRECTORY Eigen DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
-
-
-@@ -593,8 +586,15 @@ set ( EIGEN_VERSION_MAJOR ${EIGEN_WORLD_VERSION} )
- set ( EIGEN_VERSION_MINOR ${EIGEN_MAJOR_VERSION} )
- set ( EIGEN_VERSION_PATCH ${EIGEN_MINOR_VERSION} )
- set ( EIGEN_DEFINITIONS "")
--set ( EIGEN_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}" )
- set ( EIGEN_ROOT_DIR ${CMAKE_INSTALL_PREFIX} )
-+GNUInstallDirs_get_absolute_install_dir(EIGEN_INCLUDE_DIR INCLUDE_INSTALL_DIR)
-+
-+if(EIGEN_BUILD_PKGCONFIG)
-+ configure_file(eigen3.pc.in eigen3.pc @ONLY)
-+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc
-+ DESTINATION ${PKGCONFIG_INSTALL_DIR}
-+ )
-+endif()
-
- include (CMakePackageConfigHelpers)
-
---- a/eigen3.pc.in
-+++ b/eigen3.pc.in
-@@ -6,4 +6,4 @@ Description: A C++ template library for linear algebra: vectors, matrices, and r
- Requires:
- Version: @EIGEN_VERSION_NUMBER@
- Libs:
--Cflags: -I${prefix}/@INCLUDE_INSTALL_DIR@
-+Cflags: -I@EIGEN_INCLUDE_DIR@
diff --git a/pkgs/by-name/ei/eigen/package.nix b/pkgs/by-name/ei/eigen/package.nix
index 898f83d2d1362..430b27f5be968 100644
--- a/pkgs/by-name/ei/eigen/package.nix
+++ b/pkgs/by-name/ei/eigen/package.nix
@@ -1,43 +1,60 @@
{
lib,
+
stdenv,
fetchFromGitLab,
+ fetchpatch,
+
+ # nativeBuildInputs
cmake,
+
+ # nativeCheckInputs
+ ctestCheckHook,
}:
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
pname = "eigen";
- version = "3.4.0-unstable-2022-05-19";
+ version = "3.4.1";
src = fetchFromGitLab {
owner = "libeigen";
repo = "eigen";
- rev = "e7248b26a1ed53fa030c5c459f7ea095dfd276ac";
- hash = "sha256-uQ1YYV3ojbMVfHdqjXRyUymRPjJZV3WHT36PTxPRius=";
+ tag = finalAttrs.version;
+ hash = "sha256-NSq1tUfy2thz5gtsyASsKeYE4vMf71aSG4uXfrX86rk=";
};
patches = [
- ./include-dir.patch
+ # fix bug1213 test
+ # ref https://gitlab.com/libeigen/eigen/-/merge_requests/2005 merged upstream
+ (fetchpatch {
+ url = "https://gitlab.com/libeigen/eigen/-/commit/3e1367a3b5efcdc8ce716db77a322cedeb5e01b4.patch";
+ hash = "sha256-oykUbzaZeVW1A8nBoiMtJvh68Zpu7PDFtAfAjtTQoC0=";
+ })
+ ];
+
+ nativeBuildInputs = [
+ cmake
+ ];
+
+ nativeCheckInputs = [
+ ctestCheckHook
];
- # ref. https://gitlab.com/libeigen/eigen/-/merge_requests/977
- # This was merged upstream and can be removed on next release
- postPatch = ''
- substituteInPlace Eigen/src/SVD/BDCSVD.h --replace-fail \
- "if (l == 0) {" \
- "if (i >= k && l == 0) {"
- '';
+ cmakeFlags = [
+ (lib.cmakeBool "EIGEN_LEAVE_TEST_IN_ALL_TARGET" true) # Build tests in parallel
+ ];
- nativeBuildInputs = [ cmake ];
+ # too many flaky tests
+ doCheck = false;
- meta = with lib; {
+ meta = {
homepage = "https://eigen.tuxfamily.org";
description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
- license = licenses.lgpl3Plus;
- maintainers = with maintainers; [
+ license = lib.licenses.lgpl3Plus;
+ maintainers = with lib.maintainers; [
sander
raskin
];
- platforms = platforms.unix;
+ platforms = lib.platforms.unix;
};
-}
+})
diff --git a/pkgs/by-name/ei/eigenrand/package.nix b/pkgs/by-name/ei/eigenrand/package.nix
index 954c1fa296c28..2b35100d103f2 100644
--- a/pkgs/by-name/ei/eigenrand/package.nix
+++ b/pkgs/by-name/ei/eigenrand/package.nix
@@ -2,6 +2,7 @@
cmake,
eigen,
fetchFromGitHub,
+ fetchpatch,
gtest,
lib,
stdenv,
@@ -18,6 +19,15 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-mrpkWIb6kfLvppmIfzhjF1/3m1zSd8XG1D07V6Zjlu0=";
};
+ patches = [
+ # ref. https://github.com/bab2min/EigenRand/pull/61 merged upstream
+ (fetchpatch {
+ name = "support-eigen-341.patch";
+ url = "https://github.com/bab2min/EigenRand/commit/8114df93b4c8a84a4f853380f0875a2c9d683cd0.patch";
+ hash = "sha256-2KivLlyYGSRZurtxLghNfWwUNEUNWZdC6q+H65EPLnQ=";
+ })
+ ];
+
# Avoid downloading googletest: we already have it.
postPatch = ''
substituteInPlace CMakeLists.txt --replace-fail \
diff --git a/pkgs/by-name/el/elfutils/package.nix b/pkgs/by-name/el/elfutils/package.nix
index 9b69efdc42de6..db1c0b053bd00 100644
--- a/pkgs/by-name/el/elfutils/package.nix
+++ b/pkgs/by-name/el/elfutils/package.nix
@@ -28,11 +28,11 @@
# TODO: Look at the hardcoded paths to kernel, modules etc.
stdenv.mkDerivation rec {
pname = "elfutils";
- version = "0.193";
+ version = "0.194";
src = fetchurl {
url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2";
- hash = "sha256-eFf0S2JPTY1CHfhRqq57FALP5rzdLYBJ8V/AfT3edjU=";
+ hash = "sha256-CeL/Az05uqiziKLX+8U5C/3pmuO3xnx9qvdDP7zw8B4=";
};
patches = [
@@ -110,18 +110,6 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "strictflexarrays3" ];
- # build elfutils out-of-source-tree to avoid ./stack inclusion
- # as a c++ header on libc++: https://sourceware.org/PR33103
- preConfigure =
- if (stdenv.targetPlatform.useLLVM or false) then
- ''
- mkdir build-tree
- cd build-tree
- ''
- else
- null;
- configureScript = if (stdenv.targetPlatform.useLLVM or false) then "../configure" else null;
-
configureFlags = [
"--program-prefix=eu-" # prevent collisions with binutils
"--enable-deterministic-archives"
@@ -146,14 +134,6 @@ stdenv.mkDerivation rec {
&& (stdenv.hostPlatform == stdenv.buildPlatform);
doInstallCheck = !stdenv.hostPlatform.isMusl && (stdenv.hostPlatform == stdenv.buildPlatform);
- preCheck = ''
- # Workaround lack of rpath linking:
- # ./dwarf_srclang_check: error while loading shared libraries:
- # libelf.so.1: cannot open shared object file: No such file or directory
- # Remove once https://sourceware.org/PR32929 is fixed.
- export LD_LIBRARY_PATH="$PWD/libelf:$LD_LIBRARY_PATH"
- '';
-
passthru.updateScript = gitUpdater {
url = "https://sourceware.org/git/elfutils.git";
rev-prefix = "elfutils-";
diff --git a/pkgs/by-name/en/endeavour/package.nix b/pkgs/by-name/en/endeavour/package.nix
index c2a09da368053..5de5fa50c8bac 100644
--- a/pkgs/by-name/en/endeavour/package.nix
+++ b/pkgs/by-name/en/endeavour/package.nix
@@ -57,6 +57,14 @@ stdenv.mkDerivation rec {
libical
];
+ postPatch = ''
+ # Switch to girepository-2.0
+ # libpeas1 will be dropped in https://gitlab.gnome.org/World/Endeavour/-/merge_requests/153
+ substituteInPlace src/gui/gtd-application.c \
+ --replace-fail "#include " "#include " \
+ --replace-fail "g_irepository_get_option_group" "gi_repository_get_option_group"
+ '';
+
passthru = {
updateScript = gitUpdater { };
};
diff --git a/pkgs/by-name/en/entangle/girepository-2.0.patch b/pkgs/by-name/en/entangle/girepository-2.0.patch
new file mode 100644
index 0000000000000..7454480bc3fad
--- /dev/null
+++ b/pkgs/by-name/en/entangle/girepository-2.0.patch
@@ -0,0 +1,39 @@
+diff --git a/src/entangle-main.c b/src/entangle-main.c
+index 970bfee..8bc16eb 100644
+--- a/src/entangle-main.c
++++ b/src/entangle-main.c
+@@ -21,7 +21,7 @@
+ #include
+ #include
+
+-#include
++#include
+ #include
+ #include
+ #include
+@@ -80,7 +80,11 @@ main(int argc, char **argv)
+ gst_init(NULL, NULL);
+
+ if (ins) {
+- g_irepository_dump(ins, NULL);
++ char **ins_args;
++ ins_args = g_strsplit(ins, ",", 2);
++ if (g_strv_length(ins_args) == 2)
++ gi_repository_dump(ins_args[0], ins_args[1], NULL);
++ g_strfreev(ins_args);
+ return 0;
+ }
+
+diff --git a/src/frontend/entangle-application.c b/src/frontend/entangle-application.c
+index 3e3e1af..f7c03d5 100644
+--- a/src/frontend/entangle-application.c
++++ b/src/frontend/entangle-application.c
+@@ -470,7 +470,7 @@ entangle_application_init(EntangleApplication *app)
+ app->activeCameras = entangle_camera_list_new_active();
+ app->supportedCameras = entangle_camera_list_new_supported();
+
+- g_irepository_require(g_irepository_get_default(), "Peas", "1.0", 0, NULL);
++ gi_repository_require(gi_repository_dup_default(), "Peas", "1.0", 0, NULL);
+
+ userdir =
+ g_build_filename(g_get_user_config_dir(), "entangle/plugins", NULL);
diff --git a/pkgs/by-name/en/entangle/package.nix b/pkgs/by-name/en/entangle/package.nix
index bfd5c8dbae198..9ab3e2973b294 100644
--- a/pkgs/by-name/en/entangle/package.nix
+++ b/pkgs/by-name/en/entangle/package.nix
@@ -51,6 +51,10 @@ stdenv.mkDerivation (finalAttrs: {
};
patches = [
+ # Switch to girepository-2.0
+ # https://src.fedoraproject.org/rpms/libpeas1/pull-request/3
+ ./girepository-2.0.patch
+
# Fix build with meson 0.61, can be removed on next update
# https://gitlab.com/entangle/entangle/-/issues/67
(fetchpatch {
diff --git a/pkgs/by-name/eo/eog/package.nix b/pkgs/by-name/eo/eog/package.nix
index 4169f140d6030..6aa92c5c3492d 100644
--- a/pkgs/by-name/eo/eog/package.nix
+++ b/pkgs/by-name/eo/eog/package.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
+ fetchpatch,
meson,
ninja,
gettext,
@@ -51,6 +52,12 @@ stdenv.mkDerivation rec {
# We patch gobject-introspection to hardcode absolute paths but
# our Meson patch will only pass the info when install_dir is absolute as well.
./fix-gir-lib-path.patch
+
+ # Switch to girepository-2.0
+ (fetchpatch {
+ url = "https://src.fedoraproject.org/rpms/eog/raw/939eee56e5b72b02a8c0f4f867431cf6426adb9e/f/libpeas1_pygobject352.patch";
+ hash = "sha256-5QIkxxUvGKzb0cMCIcfuu7FX9XuY+RrKNunSvRDEDRc=";
+ })
];
nativeBuildInputs = [
diff --git a/pkgs/by-name/ep/epiphany/package.nix b/pkgs/by-name/ep/epiphany/package.nix
index 2f5cbe602e998..832e3fbbd13b1 100644
--- a/pkgs/by-name/ep/epiphany/package.nix
+++ b/pkgs/by-name/ep/epiphany/package.nix
@@ -1,6 +1,7 @@
{
lib,
stdenv,
+ blueprint-compiler,
meson,
ninja,
gettext,
@@ -25,6 +26,7 @@
gcr_4,
isocodes,
desktop-file-utils,
+ docutils,
nettle,
gdk-pixbuf,
gst_all_1,
@@ -37,15 +39,17 @@
stdenv.mkDerivation (finalAttrs: {
pname = "epiphany";
- version = "48.5";
+ version = "49.1";
src = fetchurl {
url = "mirror://gnome/sources/epiphany/${lib.versions.major finalAttrs.version}/epiphany-${finalAttrs.version}.tar.xz";
- hash = "sha256-D2ZVKtZZPHlSo93uW/UVZWyMQ0hxB22fGpGnr5NGsbQ=";
+ hash = "sha256-12fFy7niVmvJkD1BG2iWFh40P3EqozMFNlc52N7axSE=";
};
nativeBuildInputs = [
+ blueprint-compiler
desktop-file-utils
+ docutils # for rst2man
gettext
itstool
meson
diff --git a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch
index 62eae627efd75..e875418bc9cbc 100644
--- a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch
+++ b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch
@@ -1,8 +1,8 @@
diff --git a/src/addressbook/libebook/e-book-client.c b/src/addressbook/libebook/e-book-client.c
-index 5e65ec8..2cae29d 100644
+index c31f3ef..9ebb5f2 100644
--- a/src/addressbook/libebook/e-book-client.c
+++ b/src/addressbook/libebook/e-book-client.c
-@@ -1924,7 +1924,18 @@ e_book_client_get_self (ESourceRegistry *registry,
+@@ -1926,7 +1926,18 @@ e_book_client_get_self (ESourceRegistry *registry,
*out_client = book_client;
@@ -22,7 +22,7 @@ index 5e65ec8..2cae29d 100644
uid = g_settings_get_string (settings, SELF_UID_KEY);
g_object_unref (settings);
-@@ -1992,7 +2003,18 @@ e_book_client_set_self (EBookClient *client,
+@@ -1994,7 +2005,18 @@ e_book_client_set_self (EBookClient *client,
g_return_val_if_fail (
e_contact_get_const (contact, E_CONTACT_UID) != NULL, FALSE);
@@ -42,7 +42,7 @@ index 5e65ec8..2cae29d 100644
g_settings_set_string (
settings, SELF_UID_KEY,
e_contact_get_const (contact, E_CONTACT_UID));
-@@ -2028,8 +2050,20 @@ e_book_client_is_self (EContact *contact)
+@@ -2030,8 +2052,20 @@ e_book_client_is_self (EContact *contact)
* unfortunately the API doesn't allow that.
*/
g_mutex_lock (&mutex);
@@ -66,10 +66,10 @@ index 5e65ec8..2cae29d 100644
g_mutex_unlock (&mutex);
diff --git a/src/addressbook/libebook/e-book.c b/src/addressbook/libebook/e-book.c
-index a9b68e3..6a13b1b 100644
+index 9d986d2..d63902a 100644
--- a/src/addressbook/libebook/e-book.c
+++ b/src/addressbook/libebook/e-book.c
-@@ -2586,7 +2586,18 @@ e_book_get_self (ESourceRegistry *registry,
+@@ -2593,7 +2593,18 @@ e_book_get_self (ESourceRegistry *registry,
return FALSE;
}
@@ -89,7 +89,7 @@ index a9b68e3..6a13b1b 100644
uid = g_settings_get_string (settings, SELF_UID_KEY);
g_object_unref (settings);
-@@ -2641,7 +2652,18 @@ e_book_set_self (EBook *book,
+@@ -2648,7 +2659,18 @@ e_book_set_self (EBook *book,
g_return_val_if_fail (E_IS_BOOK (book), FALSE);
g_return_val_if_fail (E_IS_CONTACT (contact), FALSE);
@@ -109,7 +109,7 @@ index a9b68e3..6a13b1b 100644
g_settings_set_string (
settings, SELF_UID_KEY,
e_contact_get_const (contact, E_CONTACT_UID));
-@@ -2669,7 +2691,18 @@ e_book_is_self (EContact *contact)
+@@ -2676,7 +2698,18 @@ e_book_is_self (EContact *contact)
g_return_val_if_fail (E_IS_CONTACT (contact), FALSE);
@@ -130,10 +130,10 @@ index a9b68e3..6a13b1b 100644
g_object_unref (settings);
diff --git a/src/addressbook/libedata-book/e-book-meta-backend.c b/src/addressbook/libedata-book/e-book-meta-backend.c
-index 752f83f..eaa3dad 100644
+index 2a95a75..950f430 100644
--- a/src/addressbook/libedata-book/e-book-meta-backend.c
+++ b/src/addressbook/libedata-book/e-book-meta-backend.c
-@@ -145,7 +145,18 @@ ebmb_is_power_saver_enabled (void)
+@@ -148,7 +148,18 @@ ebmb_is_power_saver_enabled (void)
GSettings *settings;
gboolean enabled = FALSE;
@@ -178,10 +178,10 @@ index 9f8646a..079aba9 100644
cbc->priv->update_alarms_id = 0;
cbc->priv->alarm_enabled = FALSE;
diff --git a/src/calendar/backends/file/e-cal-backend-file.c b/src/calendar/backends/file/e-cal-backend-file.c
-index 2525856..7ecc1a8 100644
+index 6318854..6b7a88c 100644
--- a/src/calendar/backends/file/e-cal-backend-file.c
+++ b/src/calendar/backends/file/e-cal-backend-file.c
-@@ -3682,7 +3682,20 @@ e_cal_backend_file_receive_objects (ECalBackendSync *backend,
+@@ -3701,7 +3701,20 @@ e_cal_backend_file_receive_objects (ECalBackendSync *backend,
if (is_declined) {
GSettings *settings;
@@ -204,10 +204,10 @@ index 2525856..7ecc1a8 100644
g_clear_object (&settings);
}
diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c
-index 026ae80..e3003c2 100644
+index 92d68e2..d1e1fa4 100644
--- a/src/calendar/libecal/e-reminder-watcher.c
+++ b/src/calendar/libecal/e-reminder-watcher.c
-@@ -2844,8 +2844,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher)
+@@ -2882,8 +2882,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher)
watcher->priv = e_reminder_watcher_get_instance_private (watcher);
watcher->priv->cancellable = g_cancellable_new ();
@@ -244,10 +244,10 @@ index 026ae80..e3003c2 100644
g_signal_connect_object (
watcher->priv->desktop_settings,
diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c
-index 84ccbb0..9010429 100644
+index df89788..4a1ebd0 100644
--- a/src/calendar/libedata-cal/e-cal-meta-backend.c
+++ b/src/calendar/libedata-cal/e-cal-meta-backend.c
-@@ -157,7 +157,18 @@ ecmb_is_power_saver_enabled (void)
+@@ -160,7 +160,18 @@ ecmb_is_power_saver_enabled (void)
GSettings *settings;
gboolean enabled = FALSE;
@@ -267,7 +267,7 @@ index 84ccbb0..9010429 100644
if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) {
GPowerProfileMonitor *power_monitor;
-@@ -2628,7 +2639,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend,
+@@ -2654,7 +2665,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend,
if (is_declined) {
GSettings *settings;
@@ -290,10 +290,10 @@ index 84ccbb0..9010429 100644
g_clear_object (&settings);
}
diff --git a/src/camel/camel-cipher-context.c b/src/camel/camel-cipher-context.c
-index d00fbd5..0f67653 100644
+index 03b5129..3f4256a 100644
--- a/src/camel/camel-cipher-context.c
+++ b/src/camel/camel-cipher-context.c
-@@ -1630,7 +1630,18 @@ camel_cipher_can_load_photos (void)
+@@ -1637,7 +1637,18 @@ camel_cipher_can_load_photos (void)
GSettings *settings;
gboolean load_photos;
@@ -314,10 +314,10 @@ index d00fbd5..0f67653 100644
g_clear_object (&settings);
diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c
-index 4594ab1..e71ce05 100644
+index c5ac40f..fb8ae19 100644
--- a/src/camel/camel-gpg-context.c
+++ b/src/camel/camel-gpg-context.c
-@@ -745,7 +745,18 @@ gpg_ctx_get_executable_name (void)
+@@ -748,7 +748,18 @@ gpg_ctx_get_executable_name (void)
GSettings *settings;
gchar *path;
@@ -338,10 +338,10 @@ index 4594ab1..e71ce05 100644
g_clear_object (&settings);
diff --git a/src/camel/camel-utils.c b/src/camel/camel-utils.c
-index 0c1c7dd..4188934 100644
+index 2c0b6ef..b354332 100644
--- a/src/camel/camel-utils.c
+++ b/src/camel/camel-utils.c
-@@ -361,7 +361,19 @@ void
+@@ -363,7 +363,19 @@ void
_camel_utils_initialize (void)
{
G_LOCK (mi_user_headers);
@@ -363,10 +363,10 @@ index 0c1c7dd..4188934 100644
G_CALLBACK (mi_user_headers_settings_changed_cb), NULL);
G_UNLOCK (mi_user_headers);
diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c
-index 8cf56f0..f4355d5 100644
+index c3c2d7d..e1370db 100644
--- a/src/camel/providers/imapx/camel-imapx-server.c
+++ b/src/camel/providers/imapx/camel-imapx-server.c
-@@ -5681,7 +5681,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder)
+@@ -5671,7 +5671,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder)
if (do_old_flags_update) {
GSettings *eds_settings;
@@ -411,10 +411,10 @@ index f7c5d3c..67732c3 100644
g_clear_object (&settings);
diff --git a/src/libedataserver/e-network-monitor.c b/src/libedataserver/e-network-monitor.c
-index 188f276..939f89b 100644
+index e9cb145..8fc30d5 100644
--- a/src/libedataserver/e-network-monitor.c
+++ b/src/libedataserver/e-network-monitor.c
-@@ -256,7 +256,18 @@ e_network_monitor_constructed (GObject *object)
+@@ -260,7 +260,18 @@ e_network_monitor_constructed (GObject *object)
/* Chain up to parent's method. */
G_OBJECT_CLASS (e_network_monitor_parent_class)->constructed (object);
@@ -531,10 +531,10 @@ index db775f9..fb524db 100644
g_object_unref (settings);
diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c
-index 1539f8b..77cf123 100644
+index bd9822d..3e021dd 100644
--- a/src/libedataserver/e-source-registry.c
+++ b/src/libedataserver/e-source-registry.c
-@@ -1754,7 +1754,19 @@ e_source_registry_init (ESourceRegistry *registry)
+@@ -1781,7 +1781,19 @@ e_source_registry_init (ESourceRegistry *registry)
g_mutex_init (®istry->priv->sources_lock);
@@ -556,10 +556,10 @@ index 1539f8b..77cf123 100644
g_signal_connect (
registry->priv->settings, "changed",
diff --git a/src/libedataserverui/e-reminders-widget.c b/src/libedataserverui/e-reminders-widget.c
-index b47a374..e812fbe 100644
+index 02dcd6e..5dfa7ac 100644
--- a/src/libedataserverui/e-reminders-widget.c
+++ b/src/libedataserverui/e-reminders-widget.c
-@@ -1985,7 +1985,19 @@ static void
+@@ -2132,7 +2132,19 @@ static void
e_reminders_widget_init (ERemindersWidget *reminders)
{
reminders->priv = e_reminders_widget_get_instance_private (reminders);
diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix
index 3a29f92c0c2a8..42bd77f708325 100644
--- a/pkgs/by-name/ev/evolution-data-server/package.nix
+++ b/pkgs/by-name/ev/evolution-data-server/package.nix
@@ -48,9 +48,9 @@
makeHardcodeGsettingsPatch,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "evolution-data-server";
- version = "3.56.2";
+ version = "3.58.1";
outputs = [
"out"
@@ -58,8 +58,8 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
- url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/evolution-data-server-${version}.tar.xz";
- hash = "sha256-307CmVDymnbqxvvg+BTEjSzvfT/bkFACpKiD3XYc6Tw=";
+ url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor finalAttrs.version}/evolution-data-server-${finalAttrs.version}.tar.xz";
+ hash = "sha256-qRSSiBTviH8Jebp46o17zJj5bPB8u3CwBRmAvZDsNfA=";
};
patches = [
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
prePatch = ''
substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch \
- --subst-var-by EDS ${glib.makeSchemaPath "$out" "evolution-data-server-${version}"} \
+ --subst-var-by EDS ${glib.makeSchemaPath "$out" "evolution-data-server-${finalAttrs.version}"} \
--subst-var-by GDS ${glib.getSchemaPath gsettings-desktop-schemas}
patches="$patches $PWD/hardcode-gsettings.patch"
'';
@@ -179,7 +179,7 @@ stdenv.mkDerivation rec {
"org.gnome.evolution-data-server" = "EDS";
"org.gnome.desktop.interface" = "GDS";
};
- inherit src patches;
+ inherit (finalAttrs) src patches;
};
updateScript =
let
@@ -198,9 +198,9 @@ stdenv.mkDerivation rec {
meta = {
description = "Unified backend for programs that work with contacts, tasks, and calendar information";
homepage = "https://gitlab.gnome.org/GNOME/evolution-data-server";
- changelog = "https://gitlab.gnome.org/GNOME/evolution-data-server/-/blob/${version}/NEWS?ref_type=tags";
+ changelog = "https://gitlab.gnome.org/GNOME/evolution-data-server/-/blob/${finalAttrs.version}/NEWS?ref_type=tags";
license = lib.licenses.lgpl2Plus;
teams = [ lib.teams.gnome ];
platforms = lib.platforms.linux; # requires libuuid
};
-}
+})
diff --git a/pkgs/by-name/fa/faustPhysicalModeling/package.nix b/pkgs/by-name/fa/faustPhysicalModeling/package.nix
index a2e9285928425..cd88e6668e45d 100644
--- a/pkgs/by-name/fa/faustPhysicalModeling/package.nix
+++ b/pkgs/by-name/fa/faustPhysicalModeling/package.nix
@@ -26,10 +26,6 @@ stdenv.mkDerivation rec {
bash
];
- # ld: /nix/store/*-gcc-14-20241116/lib/gcc/x86_64-unknown-linux-gnu/14.2.1/crtbegin.o:
- # relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a PIE object
- hardeningDisable = [ "pie" ];
-
dontWrapQtApps = true;
buildPhase = ''
diff --git a/pkgs/by-name/fb/fb303/package.nix b/pkgs/by-name/fb/fb303/package.nix
index 6c5017bde61b2..8e607283bd85a 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.09.15.00";
+ version = "2025.10.13.00";
outputs = [
"out"
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "facebook";
repo = "fb303";
tag = "v${finalAttrs.version}";
- hash = "sha256-6suO1SE8+WASQiHLtiieu3nrjEYqSPnKxw7nHkQ4br0=";
+ hash = "sha256-IF3fQY8QfDBo8DoLFIFuZD8OgrrJfXLXDgFcsD1CmaY=";
};
patches = [
@@ -75,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
kylesferrazza
emily
techknowlogick
+ lf-
];
};
})
diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix
index 71e759c7def15..7eeb083253f47 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.09.15.00";
+ version = "2025.10.13.00";
outputs = [
# Trying to split this up further into `bin`, `out`, and `dev`
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "facebook";
repo = "fbthrift";
tag = "v${finalAttrs.version}";
- hash = "sha256-4u3SbbmSgtvnW3/VH3CfQrEddAlkQuUl9dmnGGKL4mE=";
+ hash = "sha256-6Vlmb7PfPl9hyJkpH0vsF4mjNTOxd4lu8CWPE0rRvVo=";
};
patches = [
@@ -135,6 +135,7 @@ stdenv.mkDerivation (finalAttrs: {
kylesferrazza
emily
techknowlogick
+ lf-
];
};
})
diff --git a/pkgs/by-name/ff/ffmpegthumbnailer/package.nix b/pkgs/by-name/ff/ffmpegthumbnailer/package.nix
index a19a0f5dafd5e..ccd6ee4a6abb8 100644
--- a/pkgs/by-name/ff/ffmpegthumbnailer/package.nix
+++ b/pkgs/by-name/ff/ffmpegthumbnailer/package.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
+ fetchpatch,
cmake,
pkg-config,
ffmpeg-headless,
@@ -9,17 +10,25 @@
libjpeg,
}:
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
pname = "ffmpegthumbnailer";
- version = "unstable-2024-01-04";
+ version = "2.2.3";
src = fetchFromGitHub {
owner = "dirkvdb";
repo = "ffmpegthumbnailer";
- rev = "1b5a77983240bcf00a4ef7702c07bcd8f4e5f97c";
- hash = "sha256-7SPRQMPgdvP7J3HCf7F1eXxZjUH5vCYZ9UOwTUFMLp0=";
+ tag = finalAttrs.version;
+ hash = "sha256-1hVPtCPwfovCtA6aagViUJkYTCFuiFkOqGEqMHIoZe8=";
};
+ patches = [
+ (fetchpatch {
+ name = "ffmpeg-8-fix.patch";
+ url = "https://github.com/dirkvdb/ffmpegthumbnailer/commit/df789ec326ae0f2c619f91c8f2fc8b5e45b50a70.patch";
+ hash = "sha256-PArrcKuaWWA6/H59MbdC36B57GSvvp5sHz24QLTBZYw=";
+ })
+ ];
+
nativeBuildInputs = [
cmake
pkg-config
@@ -60,4 +69,4 @@ stdenv.mkDerivation {
platforms = platforms.unix;
mainProgram = "ffmpegthumbnailer";
};
-}
+})
diff --git a/pkgs/by-name/fi/file-roller/package.nix b/pkgs/by-name/fi/file-roller/package.nix
index 92fadc2993002..d55680d17cf93 100644
--- a/pkgs/by-name/fi/file-roller/package.nix
+++ b/pkgs/by-name/fi/file-roller/package.nix
@@ -24,11 +24,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "file-roller";
- version = "44.5";
+ version = "44.6";
src = fetchurl {
url = "mirror://gnome/sources/file-roller/${lib.versions.major finalAttrs.version}/file-roller-${finalAttrs.version}.tar.xz";
- hash = "sha256-369LuYnAuJhr6L2un//quNDzBmmuOmJ+jD35TyOIgzk=";
+ hash = "sha256-noc7UAW8QleZqM1LI34f/0MOyNazSpksYDPx38bjdk4=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/fi/fizz/package.nix b/pkgs/by-name/fi/fizz/package.nix
index b56562148195f..47871e1eb4bf6 100644
--- a/pkgs/by-name/fi/fizz/package.nix
+++ b/pkgs/by-name/fi/fizz/package.nix
@@ -26,7 +26,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fizz";
- version = "2025.09.15.00";
+ version = "2025.10.13.00";
outputs = [
"bin"
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "facebookincubator";
repo = "fizz";
tag = "v${finalAttrs.version}";
- hash = "sha256-8j8Nt8XCbMGui7bELhvP+o8E2bqYobkXLhvZVkzCMzU=";
+ hash = "sha256-MNkPf289QGZ1x6Yr2E8vnlCFan94Opjiw6RItodWGaw=";
};
patches = [
@@ -116,6 +116,7 @@ stdenv.mkDerivation (finalAttrs: {
kylesferrazza
emily
techknowlogick
+ lf-
];
};
})
diff --git a/pkgs/by-name/fl/fluidsynth/package.nix b/pkgs/by-name/fl/fluidsynth/package.nix
index 28c8b9ef066fa..88e0135024215 100644
--- a/pkgs/by-name/fl/fluidsynth/package.nix
+++ b/pkgs/by-name/fl/fluidsynth/package.nix
@@ -6,7 +6,6 @@
pkg-config,
cmake,
alsa-lib,
- glib,
libjack2,
libsndfile,
libpulseaudio,
@@ -14,13 +13,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fluidsynth";
- version = "2.4.8";
+ version = "2.5.0";
src = fetchFromGitHub {
owner = "FluidSynth";
repo = "fluidsynth";
tag = "v${finalAttrs.version}";
- hash = "sha256-rOPoRV0NWrlFZohqQ76gnXvt4/ryEI4nSlX+mNW+qf8=";
+ hash = "sha256-ouPCbXg9vgxSAHsReC7dmF1cstQZ1HaUoWcLChE35Hk=";
+ fetchSubmodules = true;
};
outputs = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
- glib
+ stdenv.cc.cc.lib
libsndfile
libjack2
]
@@ -47,6 +47,8 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
"-Denable-framework=off"
+ "-Dosal=cpp11"
+ "-Denable-libinstpatch=0"
];
meta = {
diff --git a/pkgs/by-name/fo/folly/fix-stdexcept-include.patch b/pkgs/by-name/fo/folly/fix-stdexcept-include.patch
deleted file mode 100644
index c13632abf599a..0000000000000
--- a/pkgs/by-name/fo/folly/fix-stdexcept-include.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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/package.nix b/pkgs/by-name/fo/folly/package.nix
index cce2c4aee1c93..2e6584d324824 100644
--- a/pkgs/by-name/fo/folly/package.nix
+++ b/pkgs/by-name/fo/folly/package.nix
@@ -41,7 +41,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "folly";
- version = "2025.09.15.00";
+ version = "2025.10.13.00";
# split outputs to reduce downstream closure sizes
outputs = [
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "facebook";
repo = "folly";
tag = "v${finalAttrs.version}";
- hash = "sha256-//gx081nMFXAcUgkHQToiFHhECfLW22Fl0eXEsObxUs=";
+ hash = "sha256-k7PGxYF3HlNc5nPBV+MkELya/4yllkaMA37vcfES4NE=";
};
nativeBuildInputs = [
@@ -145,16 +145,6 @@ stdenv.mkDerivation (finalAttrs: {
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:
@@ -237,6 +227,7 @@ stdenv.mkDerivation (finalAttrs: {
pierreis
emily
techknowlogick
+ lf-
];
};
})
diff --git a/pkgs/by-name/fo/fontforge/package.nix b/pkgs/by-name/fo/fontforge/package.nix
index c6c3199bb3183..610d0cc8771b2 100644
--- a/pkgs/by-name/fo/fontforge/package.nix
+++ b/pkgs/by-name/fo/fontforge/package.nix
@@ -2,7 +2,6 @@
stdenv,
fetchFromGitHub,
lib,
- fetchpatch,
replaceVars,
cmake,
pkg-config,
@@ -34,46 +33,18 @@ assert withGTK -> withGUI;
let
py = python3.withPackages (ps: with ps; [ setuptools ]);
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "fontforge";
- version = "20230101";
+ version = "20251009";
src = fetchFromGitHub {
owner = "fontforge";
repo = "fontforge";
- rev = version;
- sha256 = "sha256-/RYhvL+Z4n4hJ8dmm+jbA1Ful23ni2DbCRZC5A3+pP0=";
+ tag = finalAttrs.version;
+ hash = "sha256-tlpdd+x1mA+HeLXpy5LotNC6sabxI6U7S+m/qOn1jwc=";
};
patches = [
- (fetchpatch {
- name = "CVE-2024-25081.CVE-2024-25082.patch";
- url = "https://github.com/fontforge/fontforge/commit/216eb14b558df344b206bf82e2bdaf03a1f2f429.patch";
- hash = "sha256-aRnir09FSQMT50keoB7z6AyhWAVBxjSQsTRvBzeBuHU=";
- })
-
- # Replace distutils use in the build script
- (fetchpatch {
- name = "replace-distutils.patch";
- url = "https://github.com/fontforge/fontforge/commit/8c75293e924602ed09a9481b0eeb67ba6c623a81.patch";
- includes = [ "pyhook/CMakeLists.txt" ];
- hash = "sha256-3CEwC8vygmCztKRmeD45aZIqyoj8yk5CLwxX2SGP7z4=";
- })
-
- # Fixes translation compatibility with gettext 0.22
- (fetchpatch {
- name = "update-translation-compatibility.patch";
- url = "https://github.com/fontforge/fontforge/commit/642d8a3db6d4bc0e70b429622fdf01ecb09c4c10.patch";
- hash = "sha256-uO9uEhB64hkVa6O2tJKE8BLFR96m27d8NEN9UikNcvg=";
- })
-
- # Updates to new Python initialization API
- (fetchpatch {
- name = "modern-python-initialization-api.patch";
- url = "https://github.com/fontforge/fontforge/commit/2f2ba54c15c5565acbde04eb6608868cbc871e01.patch";
- hash = "sha256-qF4DqFpiZDbULi9+POPM73HF6pEot8BAFSVaVCNQrMU=";
- })
-
# Provide a Nix-controlled location for the initial `sys.path` entry.
(replaceVars ./set-python-sys-path.patch { python = "${py}/${py.sitePackages}"; })
];
@@ -128,7 +99,7 @@ stdenv.mkDerivation rec {
preConfigure = ''
# The way $version propagates to $version of .pe-scripts (https://github.com/dejavu-fonts/dejavu-fonts/blob/358190f/scripts/generate.pe#L19)
- export SOURCE_DATE_EPOCH=$(date -d ${version} +%s)
+ export SOURCE_DATE_EPOCH=$(date -d ${finalAttrs.version} +%s)
'';
meta = {
@@ -141,4 +112,4 @@ stdenv.mkDerivation rec {
ulysseszhan
];
};
-}
+})
diff --git a/pkgs/by-name/fr/fractal/package.nix b/pkgs/by-name/fr/fractal/package.nix
index 1f182654142c5..57e2d580238e1 100644
--- a/pkgs/by-name/fr/fractal/package.nix
+++ b/pkgs/by-name/fr/fractal/package.nix
@@ -15,7 +15,6 @@
gtksourceview5,
lcms2,
libadwaita,
- libglycin,
gst_all_1,
desktop-file-utils,
appstream-glib,
@@ -23,6 +22,8 @@
pipewire,
libshumate,
wrapGAppsHook4,
+ blueprint-compiler,
+ bubblewrap,
sqlite,
xdg-desktop-portal,
libseccomp,
@@ -32,19 +33,19 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fractal";
- version = "12.1";
+ version = "13";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "fractal";
tag = finalAttrs.version;
- hash = "sha256-xeB6N4ljXGzysy5RnDRK1wPiIRUSDcl+5BIdp6NO5ZA=";
+ hash = "sha256-zIB04OIhMSm6OWHalnLO9Ng87dsvsmYurrro3hKwoYU=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
- hash = "sha256-CHduzW++BYzasFv/x0Q1T7EaTlo1EqYY2gxQJv+ek0A=";
+ hash = "sha256-5wI74sKytewbRs0T/IQZFEaRTgJcF6HyDEK0mpjy0LU=";
};
patches = [
@@ -55,16 +56,8 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
substituteInPlace src/meson.build --replace-fail \
- "'src' / rust_target / meson.project_name()" \
- "'src' / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()"
- '';
-
- # Dirty approach to add patches after cargoSetupPostUnpackHook
- # We should eventually use a cargo vendor patch hook instead
- preConfigure = ''
- pushd ../$(stripHash $cargoDeps)/glycin-2.*
- patch -p3 < ${libglycin.passthru.glycinPathsPatch}
- popd
+ "target_dir / rust_target / meson.project_name()" \
+ "target_dir / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()"
'';
nativeBuildInputs = [
@@ -81,6 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
desktop-file-utils
appstream-glib
wrapGAppsHook4
+ blueprint-compiler
];
buildInputs = [
@@ -108,6 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
preFixup = ''
gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${glycin-loaders}/share"
+ --prefix PATH : "${lib.makeBinPath [ bubblewrap ]}"
)
'';
diff --git a/pkgs/by-name/gd/gdm/fix-paths.patch b/pkgs/by-name/gd/gdm/fix-paths.patch
index 93763ce5ff094..2de3f651a3271 100644
--- a/pkgs/by-name/gd/gdm/fix-paths.patch
+++ b/pkgs/by-name/gd/gdm/fix-paths.patch
@@ -1,12 +1,9 @@
diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
+index ad2e65cf7..61fb78db8 100644
--- a/daemon/gdm-local-display-factory.c
+++ b/daemon/gdm-local-display-factory.c
-@@ -245,9 +245,9 @@ struct GdmDisplayServerConfiguration {
- const char *session_type;
- } display_server_configuration[] = {
- #ifdef ENABLE_WAYLAND_SUPPORT
-- { "wayland", GDM_KEY_WAYLAND_ENABLE, "/usr/bin/Xwayland", "wayland" },
-+ { "wayland", GDM_KEY_WAYLAND_ENABLE, "@xwayland@/bin/Xwayland", "wayland" },
+@@ -272,7 +272,7 @@ struct GdmDisplayServerConfiguration {
+ { "wayland", GDM_KEY_WAYLAND_ENABLE, NULL, "wayland" },
#endif
#ifdef ENABLE_X11_SUPPORT
- { "xorg", GDM_KEY_XORG_ENABLE, "/usr/bin/Xorg", "x11" },
@@ -15,10 +12,10 @@ diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-facto
{ NULL, NULL, NULL },
};
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
-index fc5aef6ac..c61e0046b 100644
+index 457dcf88d..a71b89ba8 100644
--- a/daemon/gdm-manager.c
+++ b/daemon/gdm-manager.c
-@@ -151,7 +151,7 @@ plymouth_is_running (void)
+@@ -154,7 +154,7 @@ plymouth_is_running (void)
GError *error;
error = NULL;
@@ -27,7 +24,7 @@ index fc5aef6ac..c61e0046b 100644
NULL, NULL, &status, &error);
if (! res) {
g_debug ("Could not ping plymouth: %s", error->message);
-@@ -169,7 +169,7 @@ plymouth_prepare_for_transition (void)
+@@ -172,7 +172,7 @@ plymouth_prepare_for_transition (void)
GError *error;
error = NULL;
@@ -36,7 +33,7 @@ index fc5aef6ac..c61e0046b 100644
NULL, NULL, NULL, &error);
if (! res) {
g_warning ("Could not deactivate plymouth: %s", error->message);
-@@ -184,7 +184,7 @@ plymouth_quit_with_transition (void)
+@@ -187,7 +187,7 @@ plymouth_quit_with_transition (void)
GError *error;
error = NULL;
@@ -45,7 +42,7 @@ index fc5aef6ac..c61e0046b 100644
if (! res) {
g_warning ("Could not quit plymouth: %s", error->message);
g_error_free (error);
-@@ -200,7 +200,7 @@ plymouth_quit_without_transition (void)
+@@ -203,7 +203,7 @@ plymouth_quit_without_transition (void)
GError *error;
error = NULL;
@@ -54,30 +51,32 @@ index fc5aef6ac..c61e0046b 100644
if (! res) {
g_warning ("Could not quit plymouth: %s", error->message);
g_error_free (error);
-diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
-index a4c4b2dcf..67416b204 100644
---- a/daemon/gdm-session.c
-+++ b/daemon/gdm-session.c
-@@ -3193,16 +3193,16 @@ gdm_session_start_session (GdmSession *self,
- */
- if (run_launcher) {
- if (is_x11) {
-- program = g_strdup_printf (LIBEXECDIR "/gdm-x-session %s\"dbus-run-session -- %s\"",
-+ program = g_strdup_printf (LIBEXECDIR "/gdm-x-session %s\"@dbus@/bin/dbus-run-session --dbus-daemon=@dbus@/bin/dbus-daemon -- %s\"",
- register_session ? "--register-session " : "",
- self->selected_program);
- } else {
-- program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"dbus-run-session -- %s\"",
-+ program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"@dbus@/bin/dbus-run-session --dbus-daemon=@dbus@/bin/dbus-daemon -- %s\"",
- register_session ? "--register-session " : "",
- self->selected_program);
- }
- } else {
-- program = g_strdup_printf ("dbus-run-session -- %s",
-+ program = g_strdup_printf ("@dbus@/bin/dbus-run-session --dbus-daemon=@dbus@/bin/dbus-daemon -- %s",
- self->selected_program);
- }
- }
+diff --git a/daemon/gdm-wayland-session.c b/daemon/gdm-wayland-session.c
+index d0404d2c1..e916c2723 100644
+--- a/daemon/gdm-wayland-session.c
++++ b/daemon/gdm-wayland-session.c
+@@ -136,7 +136,7 @@ spawn_bus (State *state,
+
+ bus_address_fd_string = g_strdup_printf ("%d", BUS_ADDRESS_FILENO);
+
+- g_ptr_array_add (arguments, "dbus-daemon");
++ g_ptr_array_add (arguments, "@dbus@/bin/dbus-daemon");
+
+ g_ptr_array_add (arguments, "--print-address");
+ g_ptr_array_add (arguments, bus_address_fd_string);
+diff --git a/daemon/gdm-x-session.c b/daemon/gdm-x-session.c
+index a998d1555..4fe50a2d0 100644
+--- a/daemon/gdm-x-session.c
++++ b/daemon/gdm-x-session.c
+@@ -463,7 +463,7 @@ spawn_bus (State *state,
+
+ bus_address_fd_string = g_strdup_printf ("%d", BUS_ADDRESS_FILENO);
+
+- g_ptr_array_add (arguments, "dbus-daemon");
++ g_ptr_array_add (arguments, "@dbus@/bin/dbus-daemon");
+
+ g_ptr_array_add (arguments, "--print-address");
+ g_ptr_array_add (arguments, bus_address_fd_string);
diff --git a/data/gdm.service.in b/data/gdm.service.in
index 17e8a8de8..afc709778 100644
--- a/data/gdm.service.in
diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix
index 9145153e384a3..b47e16314df3d 100644
--- a/pkgs/by-name/gd/gdm/package.nix
+++ b/pkgs/by-name/gd/gdm/package.nix
@@ -27,7 +27,6 @@
plymouth,
coreutils,
xorgserver,
- xwayland,
dbus,
nixos-icons,
runCommand,
@@ -44,7 +43,7 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "gdm";
- version = "48.0";
+ version = "49.1";
outputs = [
"out"
@@ -53,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/gdm-${finalAttrs.version}.tar.xz";
- hash = "sha256-G8Btr/CT7HteN+y0+S5do0dKGxugdu25FR7pZ9HDCt8=";
+ hash = "sha256-adpdExncLGit9c05StWb7Jm7LiTyhARaG7Ss13QAROU=";
};
mesonFlags = [
@@ -112,7 +111,6 @@ stdenv.mkDerivation (finalAttrs: {
coreutils
plymouth
xorgserver
- xwayland
dbus
;
})
@@ -145,6 +143,10 @@ stdenv.mkDerivation (finalAttrs: {
# installed (mostly just because .passthru.tests can make use of it).
substituteInPlace meson.build \
--replace-fail "dconf_prefix = dconf_dep.get_variable(pkgconfig: 'prefix')" "dconf_prefix = gdm_prefix"
+
+ # Disable userdb dynamic users for now
+ substituteInPlace meson.build \
+ --replace-fail 'have_userdb = libsystemd_dep' 'have_userdb = false #'
'';
doInstallCheck = true;
diff --git a/pkgs/by-name/ge/geos/package.nix b/pkgs/by-name/ge/geos/package.nix
index 422269bea2477..597fad1ec7240 100644
--- a/pkgs/by-name/ge/geos/package.nix
+++ b/pkgs/by-name/ge/geos/package.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "geos";
- version = "3.14.0";
+ version = "3.14.1";
src = fetchFromGitHub {
owner = "libgeos";
repo = "geos";
tag = finalAttrs.version;
- hash = "sha256-tPuAYNi2Gfc/2hj8SFqnvuDztXkSAEoGPcvXVULrLKg=";
+ hash = "sha256-lOf14Qva/bbbiywbSE7GbkDQftjY0RudTOaqjllnsj4=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/gh/ghex/package.nix b/pkgs/by-name/gh/ghex/package.nix
index a92b7a771e5bc..61cc33efbcf8e 100644
--- a/pkgs/by-name/gh/ghex/package.nix
+++ b/pkgs/by-name/gh/ghex/package.nix
@@ -21,7 +21,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ghex";
- version = "48.0";
+ version = "48.3";
outputs = [
"out"
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/ghex/${lib.versions.major finalAttrs.version}/ghex-${finalAttrs.version}.tar.xz";
- hash = "sha256-qh0KtfdDBKqjGYehgtQh1j8ZzgJGXXxkJpbjFhI+MKg=";
+ hash = "sha256-y8hEJ7Kt6pQDUCoSXzZrnyiIE/cugb9rGRVGBvFZ3Tk=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/gh/ghostunnel/package.nix b/pkgs/by-name/gh/ghostunnel/package.nix
index ed4cc9f9c7a53..6b90c1acb6889 100644
--- a/pkgs/by-name/gh/ghostunnel/package.nix
+++ b/pkgs/by-name/gh/ghostunnel/package.nix
@@ -5,8 +5,6 @@
lib,
nixosTests,
ghostunnel,
- apple-sdk_12,
- darwinMinVersionHook,
writeScript,
runtimeShell,
}:
@@ -26,11 +24,6 @@ buildGoModule rec {
deleteVendor = true;
- buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
- apple-sdk_12
- (darwinMinVersionHook "12.0")
- ];
-
# These tests don't exist for Linux, and on Darwin they attempt to use the macOS Keychain
# which doesn't work from a nix build. Presumably other platform implementations of the
# certstore would have similar issues, so it probably makes sense to skip them in
diff --git a/pkgs/by-name/gi/gi-docgen/package.nix b/pkgs/by-name/gi/gi-docgen/package.nix
index b1e6d687cd78c..1ff554f2f4a50 100644
--- a/pkgs/by-name/gi/gi-docgen/package.nix
+++ b/pkgs/by-name/gi/gi-docgen/package.nix
@@ -9,13 +9,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "gi-docgen";
- version = "2025.3";
+ version = "2025.4";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/gi-docgen/${lib.versions.major version}/gi-docgen-${version}.tar.xz";
- hash = "sha256-iomli8D3ffw+iioONJf8OfVBOuNeVZfp7GFgq/juFNg=";
+ hash = "sha256-Zshl1Fn+vfteQHiojfBhg2IMPpH3JtHcYI2I7jYFUm4=";
};
depsBuildBuild = [
diff --git a/pkgs/by-name/gi/gitg/package.nix b/pkgs/by-name/gi/gitg/package.nix
index ebf6f2f21194c..60db4a99330a7 100644
--- a/pkgs/by-name/gi/gitg/package.nix
+++ b/pkgs/by-name/gi/gitg/package.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
+ fetchpatch,
vala,
pkg-config,
gtk3,
@@ -38,6 +39,15 @@ stdenv.mkDerivation rec {
hash = "sha256-NCoxaE2rlnHNNBvT485mWtzuBGDCoIHdxJPNvAMTJTA=";
};
+ patches = [
+ # Switch to girepository-2.0
+ # https://gitlab.gnome.org/GNOME/gitg/-/merge_requests/278
+ (fetchpatch {
+ url = "https://src.fedoraproject.org/rpms/gitg/raw/630cf1bdb50ad37fb20b81d76caa8622e7225c58/f/gitg-gir-2.0.patch";
+ hash = "sha256-9pC7wrxWcI1C/8yB5AcaED0RyaVbQzT0Ajuz0TM4hmo=";
+ })
+ ];
+
nativeBuildInputs = [
gobject-introspection
meson
diff --git a/pkgs/by-name/gj/gjs/disable-introspection-test.patch b/pkgs/by-name/gj/gjs/disable-introspection-test.patch
index 1c438dd6b4019..d597f99b02d81 100644
--- a/pkgs/by-name/gj/gjs/disable-introspection-test.patch
+++ b/pkgs/by-name/gj/gjs/disable-introspection-test.patch
@@ -2,7 +2,7 @@ diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
index 07759690..43c87c59 100644
--- a/installed-tests/js/meson.build
+++ b/installed-tests/js/meson.build
-@@ -123,7 +123,6 @@ jasmine_tests = [
+@@ -34,7 +34,6 @@ jasmine_tests = [
'GTypeClass',
'Importer',
'Importer2',
diff --git a/pkgs/by-name/gj/gjs/fix-paths.patch b/pkgs/by-name/gj/gjs/fix-paths.patch
index 5ca5372ea9470..99e82c9be3dc2 100644
--- a/pkgs/by-name/gj/gjs/fix-paths.patch
+++ b/pkgs/by-name/gj/gjs/fix-paths.patch
@@ -2,7 +2,7 @@ diff --git a/installed-tests/debugger-test.sh b/installed-tests/debugger-test.sh
index 0d118490..54c5507e 100755
--- a/installed-tests/debugger-test.sh
+++ b/installed-tests/debugger-test.sh
-@@ -3,7 +3,7 @@
+@@ -6,7 +6,7 @@
if test "$GJS_USE_UNINSTALLED_FILES" = "1"; then
gjs="$TOP_BUILDDIR/gjs-console"
else
diff --git a/pkgs/by-name/gj/gjs/installed-tests-path.patch b/pkgs/by-name/gj/gjs/installed-tests-path.patch
index aa1510f5807b1..403a9c372d4ed 100644
--- a/pkgs/by-name/gj/gjs/installed-tests-path.patch
+++ b/pkgs/by-name/gj/gjs/installed-tests-path.patch
@@ -11,7 +11,7 @@ index 98475f7d..942d9eca 100644
],
include_directories: top_include,
install: get_option('installed_tests'), install_dir: installed_tests_execdir)
-@@ -82,7 +82,7 @@ foreach test : jasmine_tests
+@@ -90,7 +90,7 @@ foreach test : jasmine_tests
test_description_subst = {
'name': 'test@0@.js'.format(test),
@@ -20,16 +20,16 @@ index 98475f7d..942d9eca 100644
}
configure_file(configuration: test_description_subst,
input: '../minijasmine.test.in',
-@@ -125,7 +125,7 @@ foreach test : dbus_tests
+@@ -122,7 +122,7 @@ foreach test : dbus_tests
- dbus_test_description_subst = {
- 'name': 'test@0@.js'.format(test),
-- 'installed_tests_execdir': prefix / installed_tests_execdir,
-+ 'installed_tests_execdir': installed_tests_execdir,
- }
- configure_file(
- configuration: dbus_test_description_subst,
-@@ -163,7 +163,7 @@ foreach test : modules_tests
+ dbus_test_description_subst = {
+ 'name': 'testGDBus.js',
+- 'installed_tests_execdir': prefix / installed_tests_execdir,
++ 'installed_tests_execdir': installed_tests_execdir,
+ }
+ configure_file(
+ configuration: dbus_test_description_subst,
+@@ -159,7 +159,7 @@ foreach test : modules_tests
esm_test_description_subst = {
'name': 'test@0@.js'.format(test),
@@ -42,7 +42,7 @@ diff --git a/installed-tests/meson.build b/installed-tests/meson.build
index 7a7c48ab..52508c2c 100644
--- a/installed-tests/meson.build
+++ b/installed-tests/meson.build
-@@ -30,7 +30,7 @@ foreach test : simple_tests
+@@ -34,7 +34,7 @@ foreach test : simple_tests
test_description_subst = {
'name': 'test@0@.sh'.format(test),
@@ -51,7 +51,7 @@ index 7a7c48ab..52508c2c 100644
}
configure_file(configuration: test_description_subst,
input: 'script.test.in', output: 'test@0@.sh.test'.format(test),
-@@ -85,7 +85,7 @@ foreach test : debugger_tests
+@@ -123,7 +123,7 @@ foreach test : debugger_tests
test_description_subst = {
'name': '@0@.debugger'.format(test),
diff --git a/pkgs/by-name/gj/gjs/package.nix b/pkgs/by-name/gj/gjs/package.nix
index f9b1f3c1ffa38..0f17692a1d58e 100644
--- a/pkgs/by-name/gj/gjs/package.nix
+++ b/pkgs/by-name/gj/gjs/package.nix
@@ -11,7 +11,7 @@
gtk4,
atk,
gobject-introspection,
- spidermonkey_128,
+ spidermonkey_140,
pango,
cairo,
readline,
@@ -41,7 +41,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gjs";
- version = "1.84.2";
+ version = "1.86.0";
outputs = [
"out"
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor finalAttrs.version}/gjs-${finalAttrs.version}.tar.xz";
- hash = "sha256-NRQu3zRXBWNjACkew6fVg/FJaf8/rg/zD0qVseZ0AWY=";
+ hash = "sha256-Y0SPeleATUwqjQx/XpDiJNBNTrLVYBQsB2xlqO2gB5k=";
};
patches = [
@@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
cairo
readline
libsysprof-capture
- spidermonkey_128
+ spidermonkey_140
];
nativeCheckInputs = [
diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix
index 99e289918ecd4..b217b4a0dbf49 100644
--- a/pkgs/by-name/gl/glib/package.nix
+++ b/pkgs/by-name/gl/glib/package.nix
@@ -74,7 +74,7 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "glib";
- version = "2.84.4";
+ version = "2.86.1";
outputs = [
"bin"
@@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz";
- hash = "sha256-ip6hCUPDb8EX4lP4DJHkd7ZzUlrkV2KUKFiu9XYxu5A=";
+ hash = "sha256-EZ0XCMoCJVbW0pie6QrRuCvZwNFmfgZpRKbQAg4tXlc=";
};
patches =
diff --git a/pkgs/by-name/gl/glycin-loaders/package.nix b/pkgs/by-name/gl/glycin-loaders/package.nix
index b8df7fcaba32b..2b4f70aeafba7 100644
--- a/pkgs/by-name/gl/glycin-loaders/package.nix
+++ b/pkgs/by-name/gl/glycin-loaders/package.nix
@@ -19,18 +19,25 @@
pkg-config,
rustc,
rustPlatform,
+ common-updater-scripts,
+ _experimental-update-script-combinators,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "glycin-loaders";
- version = "1.2.3";
+ version = "2.0.5";
src = fetchurl {
url = "mirror://gnome/sources/glycin/${lib.versions.majorMinor finalAttrs.version}/glycin-${finalAttrs.version}.tar.xz";
- hash = "sha256-OAqv4r+07KDEW0JmDr/0SWANAKQ7YJ1bHIP3lfXI+zw=";
+ hash = "sha256-hK431LVux1WH/TtDs00Jw64T9sBu2LKWobOyCgGOf80=";
};
- cargoVendorDir = "vendor";
+ cargoDeps = rustPlatform.fetchCargoVendor {
+ inherit (finalAttrs) src;
+ name = "glycin-loaders-deps-${finalAttrs.version}";
+ hash = "sha256-U5Ro3ahrYK+B+82bchkdoXR4BwtCBn18oKcqeXl39ag=";
+ dontConfigure = true;
+ };
nativeBuildInputs = [
cargo
@@ -56,24 +63,49 @@ stdenv.mkDerivation (finalAttrs: {
mesonFlags = [
"-Dglycin-loaders=true"
+ "-Dglycin-thumbnailer=false"
"-Dlibglycin=false"
+ "-Dlibglycin-gtk4=false"
"-Dvapi=false"
];
strictDeps = true;
postPatch = ''
- substituteInPlace loaders/meson.build \
+ substituteInPlace glycin-loaders/meson.build \
--replace-fail "cargo_target_dir / rust_target / loader," "cargo_target_dir / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / loader,"
'';
env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;
passthru = {
- updateScript = gnome.updateScript {
- attrPath = "glycin-loaders";
- packageName = "glycin";
- };
+ updateScript =
+ let
+ updateSource = gnome.updateScript {
+ attrPath = "glycin-loaders";
+ packageName = "glycin";
+ };
+ updateLockfile = {
+ command = [
+ "sh"
+ "-c"
+ ''
+ PATH=${
+ lib.makeBinPath [
+ common-updater-scripts
+ ]
+ }
+ update-source-version glycin-loaders --ignore-same-version --source-key=cargoDeps.vendorStaging > /dev/null
+ ''
+ ];
+ # Experimental feature: do not copy!
+ supportedFeatures = [ "silent" ];
+ };
+ in
+ _experimental-update-script-combinators.sequence [
+ updateSource
+ updateLockfile
+ ];
};
meta = with lib; {
diff --git a/pkgs/by-name/gn/gn/package.nix b/pkgs/by-name/gn/gn/package.nix
index 17f0b7daea278..286cb5d53af64 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-07-29";
+ _version = "0-unstable-2025-08-29";
in
_version,
- rev ? "3a4f5cea73eca32e9586e8145f97b04cbd4a1aee",
- hash ? "sha256-Z7bTto8BHnJzjvmKmcVAZ0/BrXimcAETV6YGKNTorQw=",
+ rev ? "5d0a4153b0bcc86c5a23310d5b648a587be3c56d",
+ hash ? "sha256-WERLGrReUATmn3RhxtmyZcJBxdIY/WZqBDranCLDYEg=",
}:
stdenv.mkDerivation {
diff --git a/pkgs/by-name/gn/gnome-applets/package.nix b/pkgs/by-name/gn/gnome-applets/package.nix
index e5f866eac2cea..5d8b8178a4b49 100644
--- a/pkgs/by-name/gn/gnome-applets/package.nix
+++ b/pkgs/by-name/gn/gnome-applets/package.nix
@@ -25,11 +25,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-applets";
- version = "3.56.0";
+ version = "3.58.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-applets/${lib.versions.majorMinor finalAttrs.version}/gnome-applets-${finalAttrs.version}.tar.xz";
- hash = "sha256-+heu3JVa3ZgaouQ7TAcTU/aGu9HuwdcXqJCnNTIK0XE=";
+ hash = "sha256-5h7bcTRNzV2qbnF137snSnWL6LWEUnc1abs1ZFuFojg=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-backgrounds/package.nix b/pkgs/by-name/gn/gnome-backgrounds/package.nix
index 849131c3ee53b..08dd14cf8c41a 100644
--- a/pkgs/by-name/gn/gnome-backgrounds/package.nix
+++ b/pkgs/by-name/gn/gnome-backgrounds/package.nix
@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "gnome-backgrounds";
- version = "48.2.1";
+ version = "49.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/gnome-backgrounds-${version}.tar.xz";
- hash = "sha256-ahxbey4Nj1zpd5JtVfnC1l3RgIIs3qXlkVDc+1q9Htk=";
+ hash = "sha256-Af4mDeWLoA5Eq6WJqZjjPovHrsxwHfC+5kz0z7pE9LU=";
};
patches = [
diff --git a/pkgs/by-name/gn/gnome-boxes/package.nix b/pkgs/by-name/gn/gnome-boxes/package.nix
index a5bc86e04ea07..a2a4547ba5ef2 100644
--- a/pkgs/by-name/gn/gnome-boxes/package.nix
+++ b/pkgs/by-name/gn/gnome-boxes/package.nix
@@ -50,11 +50,11 @@
stdenv.mkDerivation rec {
pname = "gnome-boxes";
- version = "48.0";
+ version = "49.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-boxes/${lib.versions.major version}/gnome-boxes-${version}.tar.xz";
- hash = "sha256-0F9fQlaPr79tiHcRYbBu1fc51DEhJ41BjK6VxW5RPq0=";
+ hash = "sha256-+kcmbab173qQTFuHadTYcbzNTmtjmjY8MjVDjXsOdXo=";
};
patches = [
diff --git a/pkgs/by-name/gn/gnome-builder/package.nix b/pkgs/by-name/gn/gnome-builder/package.nix
index d8b3287f780aa..cba93a6574285 100644
--- a/pkgs/by-name/gn/gnome-builder/package.nix
+++ b/pkgs/by-name/gn/gnome-builder/package.nix
@@ -24,6 +24,7 @@
libspelling,
libsysprof-capture,
libxml2,
+ libyaml,
meson,
ninja,
ostree,
@@ -42,7 +43,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-builder";
- version = "48.2";
+ version = "49.1";
outputs = [
"out"
@@ -51,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/gnome-builder/${lib.versions.major finalAttrs.version}/gnome-builder-${finalAttrs.version}.tar.xz";
- hash = "sha256-7BKA1H6BSjE7dMuSfVoFk4BUSqD1bodVKXg5fWx0zGM=";
+ hash = "sha256-O55HmDiPlZ4QMsas5KX7e05Yi2M5/OTCLsJqvoafiis=";
};
patches = [
@@ -99,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
libspelling
libsysprof-capture
libxml2
+ libyaml
ostree
pcre2
python3
diff --git a/pkgs/by-name/gn/gnome-calculator/package.nix b/pkgs/by-name/gn/gnome-calculator/package.nix
index f0e5454cd4dcc..3f00285d5e00e 100644
--- a/pkgs/by-name/gn/gnome-calculator/package.nix
+++ b/pkgs/by-name/gn/gnome-calculator/package.nix
@@ -2,6 +2,7 @@
stdenv,
lib,
appstream,
+ blueprint-compiler,
meson,
ninja,
vala,
@@ -26,15 +27,16 @@
stdenv.mkDerivation rec {
pname = "gnome-calculator";
- version = "48.1";
+ version = "49.1.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/gnome-calculator-${version}.tar.xz";
- hash = "sha256-vEvUGpuhkPRcvuDYxnUs3F0osM7xxr0MAeLa4fPBkWI=";
+ hash = "sha256-hA00We1p8nh6lmn5b2s/nv8Wy0hpAMcZrCUsQkVjRj0=";
};
nativeBuildInputs = [
appstream
+ blueprint-compiler
meson
ninja
pkg-config
diff --git a/pkgs/by-name/gn/gnome-calendar/package.nix b/pkgs/by-name/gn/gnome-calendar/package.nix
index b457a6c1b67de..37bc7f32d6a8e 100644
--- a/pkgs/by-name/gn/gnome-calendar/package.nix
+++ b/pkgs/by-name/gn/gnome-calendar/package.nix
@@ -2,6 +2,7 @@
stdenv,
lib,
fetchurl,
+ blueprint-compiler,
meson,
ninja,
pkg-config,
@@ -22,14 +23,15 @@
stdenv.mkDerivation rec {
pname = "gnome-calendar";
- version = "48.1";
+ version = "49.0.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-calendar/${lib.versions.major version}/gnome-calendar-${version}.tar.xz";
- hash = "sha256-Bs6t1cAL6ONYGB1CHs8mgs4K6i/LEtkDsw0pyjMonwI=";
+ hash = "sha256-4L/k6hCUItraB0Xdj4wOAjCriCB3ENHAfiRTIs+RP/I=";
};
nativeBuildInputs = [
+ blueprint-compiler
meson
ninja
pkg-config
diff --git a/pkgs/by-name/gn/gnome-characters/package.nix b/pkgs/by-name/gn/gnome-characters/package.nix
index 73d26f0c44cc6..a1145af293412 100644
--- a/pkgs/by-name/gn/gnome-characters/package.nix
+++ b/pkgs/by-name/gn/gnome-characters/package.nix
@@ -22,11 +22,11 @@
stdenv.mkDerivation rec {
pname = "gnome-characters";
- version = "48.0";
+ version = "49.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/gnome-characters-${version}.tar.xz";
- hash = "sha256-osMspU2RHbJARCA1DTRC5pGi3Oiw9dAImfZs/4w8jXE=";
+ hash = "sha256-eVwP5DTmAtx4M5H7WDDbx9jh6gXKdyEPsUDi9vQKFFw=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-chess/package.nix b/pkgs/by-name/gn/gnome-chess/package.nix
index 9c0fb5f950bd5..f1001c6026aa4 100644
--- a/pkgs/by-name/gn/gnome-chess/package.nix
+++ b/pkgs/by-name/gn/gnome-chess/package.nix
@@ -22,11 +22,11 @@
stdenv.mkDerivation rec {
pname = "gnome-chess";
- version = "48.0";
+ version = "49.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/gnome-chess-${version}.tar.xz";
- hash = "sha256-eDTEdvCLvyd5BrApNjLtMugDdMuUQyayGeqQVqapXz8=";
+ hash = "sha256-xAoABKRz/nSawvpPrZjbZBGNGPn9msAu7Po2TwPb6bA=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-clocks/package.nix b/pkgs/by-name/gn/gnome-clocks/package.nix
index 15c66b54168f5..ed0b223c66ddd 100644
--- a/pkgs/by-name/gn/gnome-clocks/package.nix
+++ b/pkgs/by-name/gn/gnome-clocks/package.nix
@@ -26,11 +26,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-clocks";
- version = "48.0";
+ version = "49.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major finalAttrs.version}/gnome-clocks-${finalAttrs.version}.tar.xz";
- hash = "sha256-YW7h+3UwCx8muXZiGelUdRNgyg+g9JExG8+DvzgIfGI=";
+ hash = "sha256-v3aRXypJLooFkv5As1NGWTqjnk5ogdYXbg79h3HU5vo=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-connections/package.nix b/pkgs/by-name/gn/gnome-connections/package.nix
index 7213e140b8945..4694bc8cab2e6 100644
--- a/pkgs/by-name/gn/gnome-connections/package.nix
+++ b/pkgs/by-name/gn/gnome-connections/package.nix
@@ -17,16 +17,18 @@
libxml2,
gtk-vnc,
gtk-frdp,
+ spice-gtk,
+ spice-protocol,
gnome,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-connections";
- version = "48.0";
+ version = "49.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-connections/${lib.versions.major finalAttrs.version}/gnome-connections-${finalAttrs.version}.tar.xz";
- hash = "sha256-Nw75QFBrVybG8rfLl5ayI9HW1Chfg8/DOFvWdMMon9A=";
+ hash = "sha256-Oh+UZrpUkUdHI1+uIexuoybJf2+NAJDLmc+worJMc54=";
};
nativeBuildInputs = [
@@ -49,6 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
libsecret
libxml2
gtk-frdp
+ spice-gtk
+ spice-protocol
];
passthru = {
diff --git a/pkgs/by-name/gn/gnome-console/package.nix b/pkgs/by-name/gn/gnome-console/package.nix
index ead44457a72e2..dca8e48b97ecb 100644
--- a/pkgs/by-name/gn/gnome-console/package.nix
+++ b/pkgs/by-name/gn/gnome-console/package.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
+ appstream,
gettext,
gnome,
libgtop,
@@ -20,14 +21,15 @@
stdenv.mkDerivation rec {
pname = "gnome-console";
- version = "48.0.1";
+ version = "49.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz";
- hash = "sha256-AY6Qjk2uvPyxUNTxuyjZgnKqnRTWgV6vjaRfiJ2wXEk=";
+ hash = "sha256-/KOf0EHgXufKbSpcggAZN9Aq4VE/PzZRvTeuDi72bj4=";
};
nativeBuildInputs = [
+ appstream
desktop-file-utils
gettext
meson
diff --git a/pkgs/by-name/gn/gnome-contacts/package.nix b/pkgs/by-name/gn/gnome-contacts/package.nix
index 6addc8e84af30..57f1fcf4655b8 100644
--- a/pkgs/by-name/gn/gnome-contacts/package.nix
+++ b/pkgs/by-name/gn/gnome-contacts/package.nix
@@ -3,6 +3,7 @@
stdenv,
gettext,
fetchurl,
+ blueprint-compiler,
evolution-data-server-gtk4,
pkg-config,
libxslt,
@@ -29,14 +30,15 @@
stdenv.mkDerivation rec {
pname = "gnome-contacts";
- version = "48.0";
+ version = "49.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/gnome-contacts-${version}.tar.xz";
- hash = "sha256-onYplbWUJ+w/GF8otVlONwd7cqcM18GSF+1jRjfswbU=";
+ hash = "sha256-JfIcZ7wp133vLZzT4i0oRg0StH/ySKIBdzG1TbSF5K8=";
};
nativeBuildInputs = [
+ blueprint-compiler
meson
ninja
pkg-config
diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix
index 9b54758a84890..d5256787d8ffc 100644
--- a/pkgs/by-name/gn/gnome-control-center/package.nix
+++ b/pkgs/by-name/gn/gnome-control-center/package.nix
@@ -5,6 +5,7 @@
replaceVars,
accountsservice,
adwaita-icon-theme,
+ blueprint-compiler,
colord,
colord-gtk4,
cups,
@@ -27,6 +28,7 @@
gsettings-desktop-schemas,
gsound,
gst_all_1,
+ gtk3,
gtk4,
ibus,
json-glib,
@@ -42,7 +44,6 @@
libsecret,
libsoup_3,
libwacom,
- libXi,
libxml2,
libxslt,
meson,
@@ -75,11 +76,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-control-center";
- version = "48.4";
+ version = "49.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz";
- hash = "sha256-KiDu5uBcjTrdru+lJNzh7p+Ip32Djj/R7e88DC5GetI=";
+ hash = "sha256-VALv+PIxY6dV3sJJNmwbOmXoDw2mDwd0p0DR5YdG+Gk=";
};
patches = [
@@ -91,6 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
];
nativeBuildInputs = [
+ blueprint-compiler
docbook-xsl-nons
gettext
libxslt
@@ -123,6 +125,7 @@ stdenv.mkDerivation (finalAttrs: {
gnome-user-share # optional, sharing panel
gsettings-desktop-schemas
gsound
+ gtk3 # org.gtk.Settings.FileChooser schema (datetime panel sets clock-format)
gtk4
ibus
json-glib
@@ -138,7 +141,6 @@ stdenv.mkDerivation (finalAttrs: {
libsecret
libsoup_3
libwacom
- libXi
libxml2
modemmanager
mutter # schemas for the keybindings
diff --git a/pkgs/by-name/gn/gnome-control-center/paths.patch b/pkgs/by-name/gn/gnome-control-center/paths.patch
index 41dd5979aa4bc..87d8f737ba438 100644
--- a/pkgs/by-name/gn/gnome-control-center/paths.patch
+++ b/pkgs/by-name/gn/gnome-control-center/paths.patch
@@ -1,17 +1,8 @@
diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c
-index f6c84e3d2..cd897f8f5 100644
+index dac0e51..71af3e2 100644
--- a/panels/color/cc-color-panel.c
+++ b/panels/color/cc-color-panel.c
-@@ -614,7 +614,7 @@ gcm_prefs_calibrate_cb (CcColorPanel *self)
-
- /* run with modal set */
- argv = g_ptr_array_new_with_free_func (g_free);
-- g_ptr_array_add (argv, g_strdup ("gcm-calibrate"));
-+ g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-calibrate", NULL));
- g_ptr_array_add (argv, g_strdup ("--device"));
- g_ptr_array_add (argv, g_strdup (cd_device_get_id (self->current_device)));
- g_ptr_array_add (argv, g_strdup ("--parent-window"));
-@@ -989,7 +989,7 @@ gcm_prefs_profile_view (CcColorPanel *self, CdProfile *profile)
+@@ -973,7 +973,7 @@ gcm_prefs_profile_view (CcColorPanel *self, CdProfile *profile)
/* open up gcm-viewer as a info pane */
argv = g_ptr_array_new_with_free_func (g_free);
@@ -20,7 +11,7 @@ index f6c84e3d2..cd897f8f5 100644
g_ptr_array_add (argv, g_strdup ("--profile"));
g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile)));
g_ptr_array_add (argv, g_strdup ("--parent-window"));
-@@ -1221,15 +1221,12 @@ gcm_prefs_device_clicked (CcColorPanel *self, CdDevice *device)
+@@ -1141,15 +1141,12 @@ gcm_prefs_device_clicked (CcColorPanel *self, CdDevice *device)
static void
gcm_prefs_profile_clicked (CcColorPanel *self, CdProfile *profile, CdDevice *device)
{
@@ -38,7 +29,7 @@ index f6c84e3d2..cd897f8f5 100644
else
gtk_widget_set_sensitive (self->toolbutton_profile_view, FALSE);
diff --git a/panels/system/datetime/tz.h b/panels/system/datetime/tz.h
-index feef16580..4b88ef7b1 100644
+index feef165..4b88ef7 100644
--- a/panels/system/datetime/tz.h
+++ b/panels/system/datetime/tz.h
@@ -27,11 +27,7 @@
@@ -55,10 +46,10 @@ index feef16580..4b88ef7b1 100644
typedef struct _TzDB TzDB;
typedef struct _TzLocation TzLocation;
diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c
-index ec5a905a5..689fdbebe 100644
+index f1cae8d..faee22a 100644
--- a/panels/network/connection-editor/net-connection-editor.c
+++ b/panels/network/connection-editor/net-connection-editor.c
-@@ -377,7 +377,7 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type)
+@@ -384,7 +384,7 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type)
GPid child_pid;
builder = g_strv_builder_new ();
@@ -68,7 +59,7 @@ index ec5a905a5..689fdbebe 100644
if (self->is_new_connection) {
g_autofree gchar *type_str = NULL;
diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c
-index 166670224..36f720d36 100644
+index d0b0206..8276af0 100644
--- a/panels/network/net-device-mobile.c
+++ b/panels/network/net-device-mobile.c
@@ -521,7 +521,7 @@ options_button_clicked_cb (NetDeviceMobile *self)
@@ -90,7 +81,7 @@ index 166670224..36f720d36 100644
}
diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c
-index a31a606e3..ed5133d29 100644
+index a31a606..ed5133d 100644
--- a/panels/printers/pp-host.c
+++ b/panels/printers/pp-host.c
@@ -256,7 +256,7 @@ _pp_host_get_snmp_devices_thread (GTask *task,
@@ -103,7 +94,7 @@ index a31a606e3..ed5133d29 100644
/* Use SNMP to get printer's informations */
diff --git a/panels/system/users/run-passwd.c b/panels/system/users/run-passwd.c
-index edbc99830..1e1d90141 100644
+index fb9efc6..452486a 100644
--- a/panels/system/users/run-passwd.c
+++ b/panels/system/users/run-passwd.c
@@ -152,7 +152,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error)
@@ -116,10 +107,10 @@ index edbc99830..1e1d90141 100644
envp = g_get_environ ();
diff --git a/panels/system/users/user-utils.c b/panels/system/users/user-utils.c
-index 5b7bc1f02..13ffe6ca8 100644
+index 16dc79e..f543e7b 100644
--- a/panels/system/users/user-utils.c
+++ b/panels/system/users/user-utils.c
-@@ -215,7 +215,7 @@ is_valid_username_async (const gchar *username,
+@@ -217,7 +217,7 @@ is_valid_username_async (const gchar *username,
* future, so it would be nice to have some official way for this
* instead of relying on the current "--login" implementation.
*/
@@ -129,7 +120,7 @@ index 5b7bc1f02..13ffe6ca8 100644
argv[2] = data->username;
argv[3] = "--";
diff --git a/tests/datetime/test-endianess.c b/tests/datetime/test-endianess.c
-index 9cb92007a..84d2f0fa3 100644
+index 9cb9200..84d2f0f 100644
--- a/tests/datetime/test-endianess.c
+++ b/tests/datetime/test-endianess.c
@@ -26,7 +26,7 @@ test_endianess (void)
diff --git a/pkgs/by-name/gn/gnome-desktop/package.nix b/pkgs/by-name/gn/gnome-desktop/package.nix
index 567f272183f13..722d0e70886f0 100644
--- a/pkgs/by-name/gn/gnome-desktop/package.nix
+++ b/pkgs/by-name/gn/gnome-desktop/package.nix
@@ -30,7 +30,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-desktop";
- version = "44.3";
+ version = "44.4";
outputs = [
"out"
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major finalAttrs.version}/gnome-desktop-${finalAttrs.version}.tar.xz";
- sha256 = "sha256-QO+pqo1Q7/7ZIno9cGceMuncNeIPMxyrO1YpdZePT40=";
+ sha256 = "sha256-HYy5xqMo62ibDBJpz1ODTMhNhR1+cZcM2ruoJwa0SYQ=";
};
patches = lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/by-name/gn/gnome-firmware/package.nix b/pkgs/by-name/gn/gnome-firmware/package.nix
index 2821adcbff51c..5684b2c931fa4 100644
--- a/pkgs/by-name/gn/gnome-firmware/package.nix
+++ b/pkgs/by-name/gn/gnome-firmware/package.nix
@@ -21,14 +21,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-firmware";
- version = "47.0";
+ version = "49.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "gnome-firmware";
rev = finalAttrs.version;
- sha256 = "sha256-dI9tE/I+14IhYZ+IDLErPunlT4L29AudbZXh0at4jKQ=";
+ sha256 = "sha256-3uU0N40O1eoK5JHWMwacSrBzOTq/c+qYwoH9kBOsqrM=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-flashback/package.nix b/pkgs/by-name/gn/gnome-flashback/package.nix
index 6d64cd8f16cbe..d8b98b99b1179 100644
--- a/pkgs/by-name/gn/gnome-flashback/package.nix
+++ b/pkgs/by-name/gn/gnome-flashback/package.nix
@@ -17,6 +17,7 @@
libpulseaudio,
libxkbfile,
libxml2,
+ metacity,
pkg-config,
polkit,
gdm,
@@ -34,43 +35,13 @@
buildEnv,
}:
-let
- # From data/sessions/Makefile.am
- requiredComponentsCommon =
- enableGnomePanel: [ "gnome-flashback" ] ++ lib.optional enableGnomePanel "gnome-panel";
- requiredComponentsGsd = [
- "org.gnome.SettingsDaemon.A11ySettings"
- "org.gnome.SettingsDaemon.Color"
- "org.gnome.SettingsDaemon.Datetime"
- "org.gnome.SettingsDaemon.Housekeeping"
- "org.gnome.SettingsDaemon.Keyboard"
- "org.gnome.SettingsDaemon.MediaKeys"
- "org.gnome.SettingsDaemon.Power"
- "org.gnome.SettingsDaemon.PrintNotifications"
- "org.gnome.SettingsDaemon.Rfkill"
- "org.gnome.SettingsDaemon.ScreensaverProxy"
- "org.gnome.SettingsDaemon.Sharing"
- "org.gnome.SettingsDaemon.Smartcard"
- "org.gnome.SettingsDaemon.Sound"
- "org.gnome.SettingsDaemon.UsbProtection"
- "org.gnome.SettingsDaemon.Wacom"
- "org.gnome.SettingsDaemon.XSettings"
- ];
- requiredComponents =
- wmName: enableGnomePanel:
- "RequiredComponents=${
- lib.concatStringsSep ";" (
- [ wmName ] ++ requiredComponentsCommon enableGnomePanel ++ requiredComponentsGsd
- )
- };";
-in
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-flashback";
- version = "3.56.0";
+ version = "3.58.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-flashback/${lib.versions.majorMinor finalAttrs.version}/gnome-flashback-${finalAttrs.version}.tar.xz";
- hash = "sha256-LQ+iLzc9sIDq7w5Wk7lijN6ETyVjPVqQMTsEndlSkmA=";
+ hash = "sha256-qqI+cEJHfnQfJCebRoudIK9OwZXuQ7PTEs2q+E2YwyE=";
};
patches = [
@@ -90,10 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
'';
postInstall = ''
- # Check that our expected RequiredComponents match the stock session files, but then don't install them.
- # They can be installed using mkSessionForWm.
- grep '${requiredComponents "metacity" true}' $out/share/gnome-session/sessions/gnome-flashback-metacity.session || (echo "RequiredComponents have changed, please update gnome-flashback/default.nix."; false)
-
rm -r $out/share/gnome-session
rm -r $out/share/xsessions
rm $out/libexec/gnome-flashback-metacity
@@ -167,7 +134,6 @@ stdenv.mkDerivation (finalAttrs: {
{
wmName,
wmLabel,
- enableGnomePanel,
}:
writeTextFile {
name = "gnome-flashback-${wmName}-gnome-session";
@@ -175,7 +141,6 @@ stdenv.mkDerivation (finalAttrs: {
text = ''
[GNOME Session]
Name=GNOME Flashback (${wmLabel})
- ${requiredComponents wmName enableGnomePanel}
'';
};
@@ -209,11 +174,33 @@ stdenv.mkDerivation (finalAttrs: {
wmCommand,
enableGnomePanel,
}:
- runCommand "gnome-flashback-${wmName}.target" { } ''
- mkdir -p $out/lib/systemd/user
- cp -r "${finalAttrs.finalPackage}/lib/systemd/user/gnome-session@gnome-flashback-metacity.target.d" \
- "$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d"
- '';
+ runCommand "gnome-flashback-${wmName}.target" { } (
+ ''
+ if [ "${wmName}" = "metacity" ]; then
+ echo "Use `services.xserver.windowManager.metacity.enable` instead."
+ exit 1
+ fi
+
+ mkdir -p $out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d
+ cp "${finalAttrs.finalPackage}/lib/systemd/user/gnome-session@gnome-flashback-metacity.target.d/session.conf" \
+ "$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d/session.conf"
+
+ substitute ${finalAttrs.finalPackage}/lib/systemd/user/gnome-session-x11@gnome-flashback-metacity.target \
+ "$out/lib/systemd/user/gnome-session-x11@gnome-flashback-${wmName}.target" \
+ --replace-fail "(Metacity)" "(${wmLabel})"
+
+ echo -e "[Unit]\nWants=${wmName}.service" >> "$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d/${wmName}.conf"
+
+ substitute ${metacity}/lib/systemd/user/metacity.service \
+ "$out/lib/systemd/user/${wmName}.service" \
+ --replace-fail "Description=Metacity" "Description=${wmLabel}" \
+ --replace-fail "ExecStart=${metacity}/bin/metacity" "ExecStart=${wmCommand}"
+ ''
+ + lib.optionalString (!enableGnomePanel) ''
+ substituteInPlace "$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d/session.conf" \
+ --replace-fail "Wants=gnome-panel.service" ""
+ ''
+ );
tests = {
inherit (nixosTests) gnome-flashback;
diff --git a/pkgs/by-name/gn/gnome-font-viewer/package.nix b/pkgs/by-name/gn/gnome-font-viewer/package.nix
index 067bc0f82fdf4..95c425477b6ee 100644
--- a/pkgs/by-name/gn/gnome-font-viewer/package.nix
+++ b/pkgs/by-name/gn/gnome-font-viewer/package.nix
@@ -18,11 +18,11 @@
stdenv.mkDerivation rec {
pname = "gnome-font-viewer";
- version = "48.0";
+ version = "49.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/gnome-font-viewer-${version}.tar.xz";
- hash = "sha256-cyYkIxtiT/XHrAOoznG+Ejk9qlNVHRFVCyDXsKOocqc=";
+ hash = "sha256-fAGJJcKFdxtV19Gm8VcRwMGT10UO2YceINRPJUhWJAQ=";
};
doCheck = true;
diff --git a/pkgs/by-name/gn/gnome-initial-setup/0001-fix-paths.patch b/pkgs/by-name/gn/gnome-initial-setup/0001-fix-paths.patch
index f3cd9f6f04273..f429b4830144e 100644
--- a/pkgs/by-name/gn/gnome-initial-setup/0001-fix-paths.patch
+++ b/pkgs/by-name/gn/gnome-initial-setup/0001-fix-paths.patch
@@ -25,15 +25,6 @@ index 196abf6..613d0e5 100644
g_spawn_command_line_async (commandline, NULL);
g_free (commandline);
-@@ -831,7 +831,7 @@ cc_input_chooser_class_init (CcInputChooserClass *klass)
- g_param_spec_string ("showing-extra", "", "", "",
- G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-
-- signals[CHANGED] =
-+ signals[CHANGED] =
- g_signal_new ("changed",
- G_TYPE_FROM_CLASS (object_class),
- G_SIGNAL_RUN_FIRST,
diff --git a/gnome-initial-setup/pages/timezone/tz.h b/gnome-initial-setup/pages/timezone/tz.h
index a2376f8..5cb7bc9 100644
--- a/gnome-initial-setup/pages/timezone/tz.h
diff --git a/pkgs/by-name/gn/gnome-initial-setup/package.nix b/pkgs/by-name/gn/gnome-initial-setup/package.nix
index bc0f06ce9ef84..7ac614841bc4a 100644
--- a/pkgs/by-name/gn/gnome-initial-setup/package.nix
+++ b/pkgs/by-name/gn/gnome-initial-setup/package.nix
@@ -37,11 +37,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-initial-setup";
- version = "48.1";
+ version = "49.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-initial-setup/${lib.versions.major finalAttrs.version}/gnome-initial-setup-${finalAttrs.version}.tar.xz";
- hash = "sha256-s9q/fnm2Zf8SJB+9umFUiVE9iGIkdZmGr49IZXWSMV4=";
+ hash = "sha256-KiixpAugiYaRiTBY9hggfemykj17pXpUeQ5aztztzPg=";
};
patches = [
diff --git a/pkgs/by-name/gn/gnome-keysign/package.nix b/pkgs/by-name/gn/gnome-keysign/package.nix
index 0e17038371b90..871de9db73c03 100644
--- a/pkgs/by-name/gn/gnome-keysign/package.nix
+++ b/pkgs/by-name/gn/gnome-keysign/package.nix
@@ -1,6 +1,7 @@
{
lib,
fetchFromGitLab,
+ fetchpatch,
python3,
wrapGAppsHook3,
gobject-introspection,
@@ -22,6 +23,14 @@ python3.pkgs.buildPythonApplication rec {
hash = "sha256-k77z8Yligzs4rHpPckRGcC5qnCHynHQRjdDkzxwt1Ss=";
};
+ patches = [
+ # Remove broken future dependency
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gnome-keysign/-/commit/ea197254baf70a499a371678369eda85aff7a4c5.patch";
+ hash = "sha256-Msd0NzNAkoAAxZ/WNiM3xV382lnx+xT6gyQiNGDEMM8=";
+ })
+ ];
+
nativeBuildInputs = [
wrapGAppsHook3
gobject-introspection
@@ -43,7 +52,6 @@ python3.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with python3.pkgs; [
dbus-python
- future
gpgme
magic-wormhole
pygobject3
diff --git a/pkgs/by-name/gn/gnome-logs/package.nix b/pkgs/by-name/gn/gnome-logs/package.nix
index 61f978fcfcd76..bd83e74d52a41 100644
--- a/pkgs/by-name/gn/gnome-logs/package.nix
+++ b/pkgs/by-name/gn/gnome-logs/package.nix
@@ -2,6 +2,7 @@
stdenv,
lib,
fetchurl,
+ appstream,
meson,
ninja,
pkg-config,
@@ -23,14 +24,15 @@
stdenv.mkDerivation rec {
pname = "gnome-logs";
- version = "45.0";
+ version = "49.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-logs/${lib.versions.major version}/gnome-logs-${version}.tar.xz";
- hash = "sha256-sooG6lyYvRfyhztQfwhbDKDemBATZhH08u6wmGFOzlI=";
+ hash = "sha256-+PV56wu22ajWrl7hQj+UR6+RIAeFF4tQu63UrC0lXUU=";
};
nativeBuildInputs = [
+ appstream
meson
ninja
pkg-config
diff --git a/pkgs/by-name/gn/gnome-mahjongg/package.nix b/pkgs/by-name/gn/gnome-mahjongg/package.nix
index ddc8b0315e7f7..87afee2674f37 100644
--- a/pkgs/by-name/gn/gnome-mahjongg/package.nix
+++ b/pkgs/by-name/gn/gnome-mahjongg/package.nix
@@ -20,11 +20,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-mahjongg";
- version = "48.1";
+ version = "49.0.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-mahjongg/${lib.versions.major finalAttrs.version}/gnome-mahjongg-${finalAttrs.version}.tar.xz";
- hash = "sha256-3Ujg+BrKNL6tpGxdIhsyWRuO2B6dNhw6JY359rIiLIQ=";
+ hash = "sha256-RbOkjcse1hiaY7a/VVCOizjrWpVmV6f+KlIlzC+LwTI=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-maps/package.nix b/pkgs/by-name/gn/gnome-maps/package.nix
index a4cf70cbdf19b..709d32a47fefc 100644
--- a/pkgs/by-name/gn/gnome-maps/package.nix
+++ b/pkgs/by-name/gn/gnome-maps/package.nix
@@ -30,11 +30,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-maps";
- version = "48.6";
+ version = "49.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz";
- hash = "sha256-OtqaMVUXWlGdQV8Ll9D+129PS+uLYCEqAXaXoyy+gaY=";
+ hash = "sha256-dd4/kCjDInLTbgnbqhG/3myFz3USCGVdO6RIJo08PzA=";
};
doCheck = !stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/by-name/gn/gnome-mines/package.nix b/pkgs/by-name/gn/gnome-mines/package.nix
index 4ffe501953827..d33b2108f958f 100644
--- a/pkgs/by-name/gn/gnome-mines/package.nix
+++ b/pkgs/by-name/gn/gnome-mines/package.nix
@@ -14,18 +14,17 @@
gettext,
itstool,
libxml2,
- libgnome-games-support_2_0,
libgee,
desktop-file-utils,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-mines";
- version = "48.1";
+ version = "49.0.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-mines/${lib.versions.major finalAttrs.version}/gnome-mines-${finalAttrs.version}.tar.xz";
- hash = "sha256-70stLd477GFBV+3eTZGJzGr+aSlSot1VsocOLmLtgQQ=";
+ hash = "sha256-iwygXAM7PCWZyZL4jr2UyysMjjiOoMAq5x2yb0P1bIQ=";
};
nativeBuildInputs = [
@@ -43,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
gtk4
libadwaita
- libgnome-games-support_2_0
librsvg
libgee
];
diff --git a/pkgs/by-name/gn/gnome-music/package.nix b/pkgs/by-name/gn/gnome-music/package.nix
index 50cb9d4058a72..5869783e519c6 100644
--- a/pkgs/by-name/gn/gnome-music/package.nix
+++ b/pkgs/by-name/gn/gnome-music/package.nix
@@ -31,13 +31,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "gnome-music";
- version = "48.1";
+ version = "49.1";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/gnome-music/${lib.versions.major version}/gnome-music-${version}.tar.xz";
- hash = "sha256-QL9XMC2l2zNraIVS7dAU2/vitEUEGWYAcpTGwrDAeN4=";
+ hash = "sha256-uoga4LVeNOYmn9LT342L+jxex+N7rIlFrseLf/IHvGc=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-nibbles/package.nix b/pkgs/by-name/gn/gnome-nibbles/package.nix
index b82651f754629..def763a920461 100644
--- a/pkgs/by-name/gn/gnome-nibbles/package.nix
+++ b/pkgs/by-name/gn/gnome-nibbles/package.nix
@@ -14,7 +14,6 @@
libxml2,
libadwaita,
libgee,
- libgnome-games-support_2_0,
meson,
ninja,
desktop-file-utils,
@@ -22,11 +21,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-nibbles";
- version = "4.2.2";
+ version = "4.4.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-nibbles/${lib.versions.majorMinor finalAttrs.version}/gnome-nibbles-${finalAttrs.version}.tar.xz";
- hash = "sha256-Pkofm68cV7joNd7fCGnjJy5lNKHdacTib64QxCAKrwA=";
+ hash = "sha256-FuBgKHBkamZTh2y8Ye4j92NAwmsSyeicfDASCEUEQVU=";
};
nativeBuildInputs = [
@@ -47,16 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
librsvg
libadwaita
libgee
- libgnome-games-support_2_0
];
- # The "we can link with libadwaita?" valac.links() check fails otherwise.
- # Command line: `valac testfile.vala --pkg=libadwaita-1 --Xcc=-w --Xcc=-DVALA_STRICT_C` -> 1
- # testfile.vala.c:50:46: error: passing argument 2 of 'adw_about_dialog_set_developers'
- # from incompatible pointer type [-Wincompatible-pointer-types]
- # 50 | adw_about_dialog_set_developers (ad, s);
- env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
-
passthru = {
updateScript = gnome.updateScript { packageName = "gnome-nibbles"; };
};
diff --git a/pkgs/by-name/gn/gnome-notes/package.nix b/pkgs/by-name/gn/gnome-notes/package.nix
index 85a6238d34d1a..2b9bb48cfce2c 100644
--- a/pkgs/by-name/gn/gnome-notes/package.nix
+++ b/pkgs/by-name/gn/gnome-notes/package.nix
@@ -5,7 +5,6 @@
ninja,
gettext,
fetchurl,
- fetchpatch,
pkg-config,
wrapGAppsHook3,
itstool,
@@ -29,29 +28,13 @@
stdenv.mkDerivation rec {
pname = "gnome-notes";
- version = "40.1";
+ version = "40.2";
src = fetchurl {
url = "mirror://gnome/sources/bijiben/${lib.versions.major version}/bijiben-${version}.tar.xz";
- hash = "sha256-BaBvsGbpgC9fJKtnsNL3FFGGY2O6Pjn593X9SadYe78=";
+ hash = "sha256-siERvAaVa+81mqzx1u3h5So1sADIgROTZjL4rGztzmc=";
};
- patches = [
- # Fix build with meson 0.61
- # data/appdata/meson.build:3:5: ERROR: Function does not take positional arguments.
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/gnome-notes/-/commit/994af76ce5144062d55d141129bf6bf5fab002ee.patch";
- hash = "sha256-z7dPOLZzaqvdqUIDy6+V3dKossRbG0EDjBu2oJCF6b4=";
- })
-
- # build: Depend on webkit2gtk-4.1
- # https://gitlab.gnome.org/GNOME/gnome-notes/-/merge_requests/200
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/gnome-notes/-/commit/0791507873c96d0463cd0c83108415541f854edd.patch";
- hash = "sha256-TwCi9sDudeiOjrH2VevAynxvy/WTmwB2HrWqhviPg8o=";
- })
- ];
-
doCheck = true;
postPatch = ''
diff --git a/pkgs/by-name/gn/gnome-online-accounts/package.nix b/pkgs/by-name/gn/gnome-online-accounts/package.nix
index 8b40938372840..231cfb389e9ae 100644
--- a/pkgs/by-name/gn/gnome-online-accounts/package.nix
+++ b/pkgs/by-name/gn/gnome-online-accounts/package.nix
@@ -32,7 +32,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-online-accounts";
- version = "3.54.5";
+ version = "3.56.1";
outputs = [
"out"
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz";
- hash = "sha256-6PEntTIpWimRLRwAc0kx35r/pOv8RK0N5cKWw9J9LJU=";
+ hash = "sha256-ZEWTYKNTHrft7i4DvVq3fslfEFG1aeEaR5tPlPQFxT8=";
};
mesonFlags = [
diff --git a/pkgs/by-name/gn/gnome-panel/package.nix b/pkgs/by-name/gn/gnome-panel/package.nix
index 4ab8da344c094..2eb9c202360fa 100644
--- a/pkgs/by-name/gn/gnome-panel/package.nix
+++ b/pkgs/by-name/gn/gnome-panel/package.nix
@@ -25,7 +25,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-panel";
- version = "3.56.0";
+ version = "3.58.1";
outputs = [
"out"
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/gnome-panel/${lib.versions.majorMinor finalAttrs.version}/gnome-panel-${finalAttrs.version}.tar.xz";
- hash = "sha256-UoptZ92E7a5sgKXuZW+E+9lC87Nx1g+XottgZc9P0XA=";
+ hash = "sha256-fovKQ6gaE0xmazp4uvKv+wxdMO+xvKZTiH/EGzHdXmQ=";
};
patches = [
diff --git a/pkgs/by-name/gn/gnome-panel/wrapper.nix b/pkgs/by-name/gn/gnome-panel/wrapper.nix
index 30f9c18238571..0d7fb34e47729 100644
--- a/pkgs/by-name/gn/gnome-panel/wrapper.nix
+++ b/pkgs/by-name/gn/gnome-panel/wrapper.nix
@@ -39,6 +39,8 @@ stdenv.mkDerivation {
dontUnpack = true;
dontConfigure = true;
dontBuild = true;
+ # $output/lib/systemd/user is already a symlink
+ dontMoveSystemdUserUnits = true;
preferLocalBuild = true;
allowSubstitutes = false;
@@ -52,10 +54,10 @@ stdenv.mkDerivation {
rm -r $out/lib/gnome-panel/modules
${xorg.lndir}/bin/lndir -silent ${panelModulesEnv} $out
- rm $out/share/applications/gnome-panel.desktop
-
- ln -s ${gnome-panel}/share/applications/gnome-panel.desktop \
- $out/share/applications/gnome-panel.desktop
+ rm $out/share/systemd/user/gnome-panel.service
+ substitute ${gnome-panel}/share/systemd/user/gnome-panel.service \
+ $out/share/systemd/user/gnome-panel.service \
+ --replace-fail "ExecStart=${gnome-panel}/bin/gnome-panel" "ExecStart=$out/bin/gnome-panel"
runHook postInstall
'';
diff --git a/pkgs/by-name/gn/gnome-podcasts/package.nix b/pkgs/by-name/gn/gnome-podcasts/package.nix
index 599e5401935cd..8db622714de6c 100644
--- a/pkgs/by-name/gn/gnome-podcasts/package.nix
+++ b/pkgs/by-name/gn/gnome-podcasts/package.nix
@@ -25,19 +25,19 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-podcasts";
- version = "25.2";
+ version = "25.3";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "podcasts";
tag = finalAttrs.version;
- hash = "sha256-pVGut7kmwybPrR7ZaXPoDx03FOYeZSvchXl++2cdPck=";
+ hash = "sha256-SblEHmKB/WZwT3T3vnlB4yJjY9JhftDkO21/yY//BRM=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
- hash = "sha256-HKU4rd5OzxhYcN6QKiTVj+NnkdyG8T+D6X1txznZ/xM=";
+ hash = "sha256-Ii5M6W5v5t+qppQNZI1ypHGMM5urUMv7e3Fef3FjfAA=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-recipes/package.nix b/pkgs/by-name/gn/gnome-recipes/package.nix
deleted file mode 100644
index b2e7461a3b6d6..0000000000000
--- a/pkgs/by-name/gn/gnome-recipes/package.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-{
- stdenv,
- lib,
- fetchFromGitLab,
- fetchpatch,
- meson,
- ninja,
- pkg-config,
- desktop-file-utils,
- gettext,
- itstool,
- python3,
- wrapGAppsHook3,
- gtk3,
- glib,
- libsoup_2_4,
- gnome-online-accounts,
- librest,
- json-glib,
- gnome-autoar,
- gspell,
- libcanberra,
- nix-update-script,
-}:
-
-stdenv.mkDerivation rec {
- pname = "gnome-recipes";
- version = "2.0.4";
-
- src = fetchFromGitLab {
- domain = "gitlab.gnome.org";
- owner = "GNOME";
- repo = "recipes";
- rev = version;
- fetchSubmodules = true;
- sha256 = "GyFOwEYmipQdFLtTXn7+NvhDTzxBlOAghr3cZT4QpQw=";
- };
-
- patches = [
- # gcc-14 build failure fix
- (fetchpatch {
- name = "gcc-14.patch";
- url = "https://gitlab.gnome.org/GNOME/recipes/-/commit/c0304675f63a33737b24fdf37e06c6b154a91a31.patch";
- hash = "sha256-YTf4NDwUiU/q96RAXKTO499pW9sPrgh8IvdPBPEnV6Q=";
- })
- ];
-
- nativeBuildInputs = [
- meson
- ninja
- pkg-config
- desktop-file-utils
- gettext
- itstool
- python3
- wrapGAppsHook3
- ];
-
- buildInputs = [
- gtk3
- glib
- libsoup_2_4
- gnome-online-accounts
- librest
- json-glib
- gnome-autoar
- gspell
- libcanberra
- ];
-
- postPatch = ''
- chmod +x src/list_to_c.py
- patchShebangs src/list_to_c.py
- patchShebangs meson_post_install.py
- '';
-
- passthru = {
- updateScript = nix-update-script { };
- };
-
- meta = with lib; {
- description = "Recipe management application for GNOME";
- mainProgram = "gnome-recipes";
- homepage = "https://gitlab.gnome.org/GNOME/recipes";
- teams = [ teams.gnome ];
- license = licenses.gpl3Plus;
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/by-name/gn/gnome-remote-desktop/package.nix b/pkgs/by-name/gn/gnome-remote-desktop/package.nix
index 7c2c8b80db4f7..ba5b3f8d97037 100644
--- a/pkgs/by-name/gn/gnome-remote-desktop/package.nix
+++ b/pkgs/by-name/gn/gnome-remote-desktop/package.nix
@@ -34,11 +34,11 @@
stdenv.mkDerivation rec {
pname = "gnome-remote-desktop";
- version = "48.1";
+ version = "49.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-remote-desktop/${lib.versions.major version}/gnome-remote-desktop-${version}.tar.xz";
- hash = "sha256-vPN3D8oPrtovrjsaP/by6QoCd492pC6P0QPK4YYo9PI=";
+ hash = "sha256-eADziDAe64FHsL5V6Pp8vXUhBmpIoGEVzA6tnwzqGIo=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-session/ctl.nix b/pkgs/by-name/gn/gnome-session/ctl.nix
index 5aecef4ce1612..47282b471728d 100644
--- a/pkgs/by-name/gn/gnome-session/ctl.nix
+++ b/pkgs/by-name/gn/gnome-session/ctl.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "gnome-session-ctl";
- version = "47.0.1";
+ version = "49.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = "gnome-session-ctl";
rev = version;
- hash = "sha256-RY0+iIwwjd7268m3EYrZ1yUBLHXmaWddtSxqgUUH6qQ=";
+ hash = "sha256-rudb7ioTE5iaou0tzU5i2gWFW06NyWF5W5tjx2b5/0Y=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-session/fix-paths.patch b/pkgs/by-name/gn/gnome-session/fix-paths.patch
deleted file mode 100644
index 22f06ddfd2e80..0000000000000
--- a/pkgs/by-name/gn/gnome-session/fix-paths.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in
-index b4b1f8fa..99d52cba 100755
---- a/gnome-session/gnome-session.in
-+++ b/gnome-session/gnome-session.in
-@@ -4,13 +4,15 @@ if [ "x$XDG_SESSION_TYPE" = "xwayland" ] &&
- [ "x$XDG_SESSION_CLASS" != "xgreeter" ] &&
- [ -n "$SHELL" ]; then
- if [ "$1" != '-l' ]; then
-- exec bash -c "exec -l '$SHELL' -c 'exec $0 -l $*'"
-+ # Make sure the shell actually sets up the environment.
-+ unset __NIXOS_SET_ENVIRONMENT_DONE
-+ exec @bash@ -c "exec -l '$SHELL' -c 'exec $0 -l $*'"
- else
- shift
- fi
- fi
-
--SETTING=$(G_MESSAGES_DEBUG='' gsettings get org.gnome.system.locale region)
-+SETTING=$(G_MESSAGES_DEBUG='' @gsettings@ get org.gnome.system.locale region)
- REGION=${SETTING#\'}
- REGION=${REGION%\'}
-
-diff --git a/gnome-session/main.c b/gnome-session/main.c
-index a460a849..9d07898f 100644
---- a/gnome-session/main.c
-+++ b/gnome-session/main.c
-@@ -215,7 +215,7 @@ require_dbus_session (int argc,
- }
- new_argv[i + 2] = NULL;
-
-- if (!execvp ("dbus-launch", new_argv)) {
-+ if (!execvp ("@dbusLaunch@", new_argv)) {
- g_set_error (error,
- G_SPAWN_ERROR,
- G_SPAWN_ERROR_FAILED,
diff --git a/pkgs/by-name/gn/gnome-session/nixos_set_environment_done.patch b/pkgs/by-name/gn/gnome-session/nixos_set_environment_done.patch
new file mode 100644
index 0000000000000..50101ca681c17
--- /dev/null
+++ b/pkgs/by-name/gn/gnome-session/nixos_set_environment_done.patch
@@ -0,0 +1,14 @@
+diff --git a/gnome-session/leader-main.c b/gnome-session/leader-main.c
+index 511166d6..8bac2912 100644
+--- a/gnome-session/leader-main.c
++++ b/gnome-session/leader-main.c
+@@ -92,6 +92,9 @@ maybe_reexec_with_login_shell (GStrv argv)
+
+ g_debug ("Relaunching with login shell %s (%s)", login_shell, shell);
+
++ /* Make sure the shell actually sets up the environment */
++ g_unsetenv ("__NIXOS_SET_ENVIRONMENT_DONE");
++
+ /* First, we construct the command executed by the login shell */
+ builder = g_strv_builder_new ();
+ g_strv_builder_add (builder, "exec");
diff --git a/pkgs/by-name/gn/gnome-session/package.nix b/pkgs/by-name/gn/gnome-session/package.nix
index d60b3ca2d110c..b449a7b8b0cbf 100644
--- a/pkgs/by-name/gn/gnome-session/package.nix
+++ b/pkgs/by-name/gn/gnome-session/package.nix
@@ -7,9 +7,10 @@
ninja,
pkg-config,
gnome,
+ gobject-introspection,
adwaita-icon-theme,
glib,
- gtk3,
+ gtk4,
gsettings-desktop-schemas,
gnome-desktop,
gnome-settings-daemon,
@@ -19,22 +20,21 @@
libICE,
xmlto,
docbook_xsl,
- docbook_xml_dtd_412,
+ docbook_xml_dtd_45,
python3,
libxslt,
gettext,
- makeWrapper,
systemd,
xorg,
libepoxy,
- bash,
gnome-session-ctl,
+ wrapGAppsHook4,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-session";
# Also bump ./ctl.nix when bumping major version.
- version = "48.0";
+ version = "49.1";
outputs = [
"out"
@@ -43,34 +43,32 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/gnome-session/${lib.versions.major finalAttrs.version}/gnome-session-${finalAttrs.version}.tar.xz";
- hash = "sha256-3ZCfvFsizb2y/E3xpH140bWUPMxeYeaiChhGJGNHxBc=";
+ hash = "sha256-F5UQvjc2KNeb56xYk+nTpeqUnAhhfX0uId45DjIN8fY=";
};
patches = [
- (replaceVars ./fix-paths.patch {
- gsettings = "${glib.bin}/bin/gsettings";
- dbusLaunch = "${dbus.lib}/bin/dbus-launch";
- bash = "${bash}/bin/bash";
- })
+ # https://github.com/NixOS/nixpkgs/pull/48517
+ ./nixos_set_environment_done.patch
];
nativeBuildInputs = [
+ gobject-introspection.setupHook
meson
ninja
pkg-config
gettext
- makeWrapper
xmlto
libxslt
docbook_xsl
- docbook_xml_dtd_412
+ docbook_xml_dtd_45
python3
dbus # for DTD
+ wrapGAppsHook4
];
buildInputs = [
glib
- gtk3
+ gtk4
libICE
gnome-desktop
json-glib
@@ -107,15 +105,11 @@ stdenv.mkDerivation (finalAttrs: {
rm -rf $out/libexec/gnome-session-ctl
'';
- # `bin/gnome-session` will reset the environment when run in wayland, we
- # therefor wrap `libexec/gnome-session-binary` instead which is the actual
- # binary needing wrapping
preFixup = ''
- wrapProgram "$out/libexec/gnome-session-binary" \
- --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
- --suffix XDG_DATA_DIRS : "${gnome-shell}/share" \
+ gappsWrapperArgs+=(
+ --suffix XDG_DATA_DIRS : "${gnome-shell}/share"
--suffix XDG_CONFIG_DIRS : "${gnome-settings-daemon}/etc/xdg"
+ )
'';
separateDebugInfo = true;
@@ -126,7 +120,6 @@ stdenv.mkDerivation (finalAttrs: {
};
providedSessions = [
"gnome"
- "gnome-xorg"
];
};
diff --git a/pkgs/by-name/gn/gnome-settings-daemon/package.nix b/pkgs/by-name/gn/gnome-settings-daemon/package.nix
index 11d273c814928..dc464bb6fb39c 100644
--- a/pkgs/by-name/gn/gnome-settings-daemon/package.nix
+++ b/pkgs/by-name/gn/gnome-settings-daemon/package.nix
@@ -10,13 +10,12 @@
gnome,
perl,
gettext,
- gtk3,
glib,
libnotify,
libgnomekbd,
libpulseaudio,
alsa-lib,
- libcanberra-gtk3,
+ libcanberra,
upower,
colord,
libgweather,
@@ -25,15 +24,14 @@
geoclue2,
systemd,
libgudev,
- libwacom,
libxslt,
libxml2,
modemmanager,
networkmanager,
gnome-desktop,
geocode-glib_2,
- docbook_xsl,
- wrapGAppsHook3,
+ docbook-xsl-nons,
+ wrapGAppsNoGuiHook,
python3,
tzdata,
gcr_4,
@@ -44,11 +42,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-settings-daemon";
- version = "48.1";
+ version = "49.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major finalAttrs.version}/gnome-settings-daemon-${finalAttrs.version}.tar.xz";
- hash = "sha256-OGCi6iFNy8tmAK56HjNYpTiSFQh7w+SkfO4/h7ruBi4=";
+ hash = "sha256-KplX/E+Rw7kSe0lIQXm+9IUSDZwcII5E1E5qdG5swcE=";
};
patches = [
@@ -74,14 +72,13 @@ stdenv.mkDerivation (finalAttrs: {
glib
libxml2
libxslt
- docbook_xsl
- wrapGAppsHook3
+ docbook-xsl-nons
+ wrapGAppsNoGuiHook
python3
udevCheckHook
];
buildInputs = [
- gtk3
glib
gsettings-desktop-schemas
modemmanager
@@ -91,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
gnome-desktop
libpulseaudio
alsa-lib
- libcanberra-gtk3
+ libcanberra
upower
colord
libgweather
@@ -99,7 +96,6 @@ stdenv.mkDerivation (finalAttrs: {
geocode-glib_2
geoclue2
libgudev
- libwacom
gcr_4
]
++ lib.optionals withSystemd [
diff --git a/pkgs/by-name/gn/gnome-shell-extensions/package.nix b/pkgs/by-name/gn/gnome-shell-extensions/package.nix
index d190a459755f0..0bc2e8667c201 100644
--- a/pkgs/by-name/gn/gnome-shell-extensions/package.nix
+++ b/pkgs/by-name/gn/gnome-shell-extensions/package.nix
@@ -15,11 +15,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-shell-extensions";
- version = "48.3";
+ version = "49.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz";
- hash = "sha256-rd40wI9AtjQRvm8dF+I1VQoAkElIceZIHDEpidf0otQ=";
+ hash = "sha256-FXDgZHhstDiXWeBIPzob29W5s48GJG600dUJKSqcamI=";
};
patches = [
diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix
index caba99c112608..6be3cf5d3bc4c 100644
--- a/pkgs/by-name/gn/gnome-shell/package.nix
+++ b/pkgs/by-name/gn/gnome-shell/package.nix
@@ -51,16 +51,20 @@
pipewire,
gst_all_1,
adwaita-icon-theme,
+ glycin-loaders,
gnome-bluetooth,
gnome-clocks,
gnome-settings-daemon,
gnome-autoar,
gnome-tecla,
bash-completion,
+ lcms2,
libgbm,
libGL,
libXi,
libX11,
+ libxkbcommon,
+ libsoup_3,
libxml2,
}:
@@ -69,7 +73,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-shell";
- version = "48.4";
+ version = "49.1";
outputs = [
"out"
@@ -78,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz";
- hash = "sha256-QOLtdLRTZ/DKOPv6oKtHCGjSNZHQPcQNCr1v930jtwc=";
+ hash = "sha256-tC0HMYnkAK+U/Dna66vlo2e7D2z3hOxc6VFodZXvvOs=";
};
patches = [
@@ -152,10 +156,13 @@ stdenv.mkDerivation (finalAttrs: {
ibus
gnome-desktop
gnome-settings-daemon
+ lcms2 # required by mutter-clutter
libgbm
libGL # for egl, required by mutter-clutter
libXi # required by libmutter
libX11
+ libxkbcommon
+ libsoup_3
libxml2
# recording
@@ -185,7 +192,7 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
patchShebangs \
src/data-to-c.py \
- meson/generate-app-list.py
+ build-aux/generate-app-list.py
# We can generate it ourselves.
rm -f man/gnome-shell.1
@@ -215,9 +222,15 @@ stdenv.mkDerivation (finalAttrs: {
preFixup = ''
gappsWrapperArgs+=(
- # Until glib’s xdgmime is patched
- # Fixes “Failed to load resource:///org/gnome/shell/theme/noise-texture.png: Unrecognized image file format”
- --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
+ --prefix XDG_DATA_DIRS : ${
+ lib.makeSearchPath "share" [
+ # Until glib’s xdgmime is patched
+ # Fixes “Failed to load resource:///org/gnome/shell/theme/noise-texture.png: Unrecognized image file format”
+ shared-mime-info
+ # For background images https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4554
+ glycin-loaders
+ ]
+ }
)
'';
diff --git a/pkgs/by-name/gn/gnome-shell/shew-gir-path.patch b/pkgs/by-name/gn/gnome-shell/shew-gir-path.patch
index 6d888725b5d2e..b3a55bcc291ec 100644
--- a/pkgs/by-name/gn/gnome-shell/shew-gir-path.patch
+++ b/pkgs/by-name/gn/gnome-shell/shew-gir-path.patch
@@ -1,5 +1,5 @@
---- a/subprojects/shew/src/meson.build
-+++ b/subprojects/shew/src/meson.build
+--- a/subprojects/libshew/src/meson.build
++++ b/subprojects/libshew/src/meson.build
@@ -13,7 +13,7 @@ shew_sources = [
libshew = library(full_name,
sources: shew_sources,
diff --git a/pkgs/by-name/gn/gnome-software/package.nix b/pkgs/by-name/gn/gnome-software/package.nix
index a82d9f541d8e3..ac0b3685c4b44 100644
--- a/pkgs/by-name/gn/gnome-software/package.nix
+++ b/pkgs/by-name/gn/gnome-software/package.nix
@@ -48,11 +48,11 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-software";
- version = "48.4";
+ version = "49.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz";
- hash = "sha256-nNEwvGLNCLY6Ii6yZmG8xxfnXVjuGzwYgMTRt2zNJjs=";
+ hash = "sha256-Sd/sp3kogBdW0MU4bB0gRUygd2AKXR7WbsRu4zoyxm0=";
};
patches = [
diff --git a/pkgs/by-name/gn/gnome-sudoku/package.nix b/pkgs/by-name/gn/gnome-sudoku/package.nix
index d2fa96c74b526..3ea2e4d2224e5 100644
--- a/pkgs/by-name/gn/gnome-sudoku/package.nix
+++ b/pkgs/by-name/gn/gnome-sudoku/package.nix
@@ -23,11 +23,11 @@
stdenv.mkDerivation rec {
pname = "gnome-sudoku";
- version = "48.1";
+ version = "49.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/gnome-sudoku-${version}.tar.xz";
- hash = "sha256-eXE62CpZkEzWlv8CJV627ZNk6I8+eDNDsfnQygnyx+M=";
+ hash = "sha256-ymcPrHPZ5cPngz/aNVZxC0Ig22Qz577FCnEFYNp9uEA=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-system-monitor/package.nix b/pkgs/by-name/gn/gnome-system-monitor/package.nix
index fa8aae787c36c..6a5ea9560478b 100644
--- a/pkgs/by-name/gn/gnome-system-monitor/package.nix
+++ b/pkgs/by-name/gn/gnome-system-monitor/package.nix
@@ -5,7 +5,6 @@
fetchurl,
pkg-config,
gtkmm4,
- libxml2,
bash,
catch2_3,
gtk4,
@@ -26,11 +25,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-system-monitor";
- version = "48.1";
+ version = "49.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major finalAttrs.version}/gnome-system-monitor-${finalAttrs.version}.tar.xz";
- hash = "sha256-Ezw6bihjZuZZ/S2AWCQJp71e2uRW5jxPacz2btb8Zjg=";
+ hash = "sha256-kVtqMhraEuunv1eMIMn+XkH1XVMoR8vRJLvdquwR1w8=";
};
patches = [
@@ -54,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: {
gtk4
libadwaita
glib
- libxml2
gtkmm4
libgtop
gdk-pixbuf
@@ -64,6 +62,11 @@ stdenv.mkDerivation (finalAttrs: {
systemd
];
+ mesonFlags = [
+ # :(.text.startup+0x56): undefined reference to `GsmApplication::get()'
+ "-Db_lto=false"
+ ];
+
doCheck = true;
passthru = {
diff --git a/pkgs/by-name/gn/gnome-tecla/package.nix b/pkgs/by-name/gn/gnome-tecla/package.nix
index e08ec43dd48fe..ebc0df1577c60 100644
--- a/pkgs/by-name/gn/gnome-tecla/package.nix
+++ b/pkgs/by-name/gn/gnome-tecla/package.nix
@@ -16,11 +16,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "tecla";
- version = "48.0.2";
+ version = "49.0";
src = fetchurl {
url = "mirror://gnome/sources/tecla/${lib.versions.major finalAttrs.version}/tecla-${finalAttrs.version}.tar.xz";
- hash = "sha256-eD00ZNKiz36xUHZJ29n/Cc4khSwqbJoNNl24QGPT1AE=";
+ hash = "sha256-LKQk5AK69gzWsTd3cDtwHrsfr489Dy+XEUTYI/ZRJJ8=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-terminal/package.nix b/pkgs/by-name/gn/gnome-terminal/package.nix
index 2bae985a569de..3569ddfa55430 100644
--- a/pkgs/by-name/gn/gnome-terminal/package.nix
+++ b/pkgs/by-name/gn/gnome-terminal/package.nix
@@ -30,11 +30,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-terminal";
- version = "3.56.2";
+ version = "3.58.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor finalAttrs.version}/gnome-terminal-${finalAttrs.version}.tar.xz";
- hash = "sha256-I1vAnfo0zF8elRIum/YCA6hNr4Yc+s9+RJbF9UgjmXg=";
+ hash = "sha256-B+vHrxNRa+Wzd3f1INJkCzMSBiDpm7sF3upfgoD9ac4=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-tetravex/package.nix b/pkgs/by-name/gn/gnome-tetravex/package.nix
index 95282a3fa14f4..9a88b11305a53 100644
--- a/pkgs/by-name/gn/gnome-tetravex/package.nix
+++ b/pkgs/by-name/gn/gnome-tetravex/package.nix
@@ -2,7 +2,6 @@
stdenv,
lib,
fetchurl,
- fetchpatch,
pkg-config,
gnome,
adwaita-icon-theme,
@@ -20,24 +19,13 @@
stdenv.mkDerivation rec {
pname = "gnome-tetravex";
- version = "3.38.2";
+ version = "3.38.3";
src = fetchurl {
url = "mirror://gnome/sources/gnome-tetravex/${lib.versions.majorMinor version}/gnome-tetravex-${version}.tar.xz";
- hash = "sha256-H83xCXm5o1JgCdeDociKOJkY82DaTttE+6JccfGGkRs=";
+ hash = "sha256-g4SawGTUVuHdRrbiAcaGFSYkw9HsS5mTWYWkmqeRcss=";
};
- patches = [
- # Fix build with meson 0.61
- # data/meson.build:37:0: ERROR: Function does not take positional arguments.
- # data/meson.build:59:0: ERROR: Function does not take positional arguments.
- # Taken from https://gitlab.gnome.org/GNOME/gnome-tetravex/-/merge_requests/20
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/gnome-tetravex/-/commit/80912d06f5e588f6aca966fa516103275e58d94e.patch";
- hash = "sha256-2+nFw5sJzbInibKaq3J10Ufbl3CnZWlgnUtzRTZ5G0I=";
- })
- ];
-
nativeBuildInputs = [
wrapGAppsHook3
itstool
@@ -68,7 +56,7 @@ stdenv.mkDerivation rec {
description = "Complete the puzzle by matching numbered tiles";
mainProgram = "gnome-tetravex";
teams = [ teams.gnome ];
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
platforms = platforms.unix;
};
}
diff --git a/pkgs/by-name/gn/gnome-text-editor/package.nix b/pkgs/by-name/gn/gnome-text-editor/package.nix
index 753f4b247b07e..4953f1aca8f36 100644
--- a/pkgs/by-name/gn/gnome-text-editor/package.nix
+++ b/pkgs/by-name/gn/gnome-text-editor/package.nix
@@ -12,7 +12,6 @@
wrapGAppsHook4,
ninja,
gnome,
- cairo,
icu,
itstool,
libadwaita,
@@ -24,11 +23,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-text-editor";
- version = "48.3";
+ version = "49.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major finalAttrs.version}/gnome-text-editor-${finalAttrs.version}.tar.xz";
- hash = "sha256-P56XIjlO200hRcBtaSELPT/KXNK5DWMmQ751CEPVVro=";
+ hash = "sha256-jkOwz6gVLNPHYw3lZd4taTDoh88ti4RID7+FOivCyKY=";
};
nativeBuildInputs = [
@@ -43,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
- cairo
icu
glib
gsettings-desktop-schemas
diff --git a/pkgs/by-name/gn/gnome-tour/package.nix b/pkgs/by-name/gn/gnome-tour/package.nix
index 17bf79a473bbb..a6a415130fd18 100644
--- a/pkgs/by-name/gn/gnome-tour/package.nix
+++ b/pkgs/by-name/gn/gnome-tour/package.nix
@@ -22,11 +22,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-tour";
- version = "48.1";
+ version = "49.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-tour/${lib.versions.major finalAttrs.version}/gnome-tour-${finalAttrs.version}.tar.xz";
- hash = "sha256-uKA7JXTrlWq+mvFBQWHMsX+DDVNgC5wEmc7zu29BJ8U=";
+ hash = "sha256-LX2KKgzRF4BjpBTaWAk9JsD7GndgjYrX+9eRGl1iZNM=";
};
cargoVendorDir = "vendor";
diff --git a/pkgs/by-name/gn/gnome-tweaks/package.nix b/pkgs/by-name/gn/gnome-tweaks/package.nix
index 7bdf8bcf9f2a9..c01b3e3e4ffb1 100644
--- a/pkgs/by-name/gn/gnome-tweaks/package.nix
+++ b/pkgs/by-name/gn/gnome-tweaks/package.nix
@@ -28,12 +28,12 @@
python3Packages.buildPythonApplication rec {
pname = "gnome-tweaks";
- version = "46.1";
+ version = "49.0";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
- hash = "sha256-LxkqcIX71oQ+z4JXFtnaIeyScgKRSeo18+FZ4Kwwm4A=";
+ hash = "sha256-s5Cb3LSQW2hCfWq1geAfQ23/jlwKOJseCxRQDxiAbrs=";
};
nativeBuildInputs = [
@@ -84,7 +84,7 @@ python3Packages.buildPythonApplication rec {
passthru = {
updateScript = gnome.updateScript {
- packageName = pname;
+ packageName = "gnome-tweaks";
};
};
diff --git a/pkgs/by-name/gn/gnome-usage/package.nix b/pkgs/by-name/gn/gnome-usage/package.nix
index 059aadd85b82c..9bcbb5d885c05 100644
--- a/pkgs/by-name/gn/gnome-usage/package.nix
+++ b/pkgs/by-name/gn/gnome-usage/package.nix
@@ -23,11 +23,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-usage";
- version = "48.rc";
+ version = "48.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-usage/${lib.versions.major finalAttrs.version}/gnome-usage-${finalAttrs.version}.tar.xz";
- hash = "sha256-LUbc2QcKkY/sMUdxaaQDI2CdCFa5XHo3wBusqULTk+w=";
+ hash = "sha256-UB3jxtTWU9Wc4NcHdY3M+D3D6oGi7RSS0vMzFi/uChc=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-user-docs/package.nix b/pkgs/by-name/gn/gnome-user-docs/package.nix
index 92f83a105f285..1f37e38bdbc1f 100644
--- a/pkgs/by-name/gn/gnome-user-docs/package.nix
+++ b/pkgs/by-name/gn/gnome-user-docs/package.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "gnome-user-docs";
- version = "48.2";
+ version = "49.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz";
- hash = "sha256-Z4Kfdkumctf5n/cu9lE7QMyTH7QBv3vX21+AXnv6Pbk=";
+ hash = "sha256-DlC4u0/OqpEoNnzTRY5e24YclieMGqmnOm7AQCt7xhc=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-weather/package.nix b/pkgs/by-name/gn/gnome-weather/package.nix
index aecb98b3d246c..4b4ec42b2d255 100644
--- a/pkgs/by-name/gn/gnome-weather/package.nix
+++ b/pkgs/by-name/gn/gnome-weather/package.nix
@@ -17,15 +17,16 @@
geoclue2,
python3,
gsettings-desktop-schemas,
+ typescript,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "gnome-weather";
- version = "48.0";
+ version = "49.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/gnome-weather-${version}.tar.xz";
- hash = "sha256-TAVps9gVri+UFtRxNMvTBWNAZA/xhtMalMhlgTtL27U=";
+ url = "mirror://gnome/sources/gnome-weather/${lib.versions.major finalAttrs.version}/gnome-weather-${finalAttrs.version}.tar.xz";
+ hash = "sha256-7h92uF66nbDI1cAgQanYXs3SKrtexrs/8yIlkpwPzl8=";
};
nativeBuildInputs = [
@@ -37,6 +38,7 @@ stdenv.mkDerivation rec {
python3
gobject-introspection
gjs
+ typescript
];
buildInputs = [
@@ -62,7 +64,9 @@ stdenv.mkDerivation rec {
'';
passthru = {
- updateScript = gnome.updateScript { packageName = "gnome-weather"; };
+ updateScript = gnome.updateScript {
+ packageName = "gnome-weather";
+ };
};
meta = with lib; {
@@ -73,4 +77,4 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/by-name/go/golly/package.nix b/pkgs/by-name/go/golly/package.nix
index 5c291cdaf2162..4372f564c8c27 100644
--- a/pkgs/by-name/go/golly/package.nix
+++ b/pkgs/by-name/go/golly/package.nix
@@ -31,7 +31,10 @@ stdenv.mkDerivation (finalAttrs: {
];
nativeBuildInputs = [
- (python3.withPackages (ps: [ ps.setuptools ]))
+ (python3.withPackages (ps: [
+ ps.setuptools
+ ps.distutils
+ ]))
wrapGAppsHook3
];
diff --git a/pkgs/by-name/go/gom/package.nix b/pkgs/by-name/go/gom/package.nix
index 465f8aa0933e0..d54564dcadc2f 100644
--- a/pkgs/by-name/go/gom/package.nix
+++ b/pkgs/by-name/go/gom/package.nix
@@ -15,7 +15,7 @@
stdenv.mkDerivation rec {
pname = "gom";
- version = "0.5.3";
+ version = "0.5.5";
outputs = [
"out"
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gom/${lib.versions.majorMinor version}/gom-${version}.tar.xz";
- sha256 = "Bp0JCfvca00n7feoeTZhlOOrUIsDVIv1uJ/2NUbSAXc=";
+ sha256 = "rWHwWvIxenqxdx/PqBaYn7ujsYlX0uC13t6e9F8JtTQ=";
};
patches = [
diff --git a/pkgs/by-name/go/gopass-jsonapi/package.nix b/pkgs/by-name/go/gopass-jsonapi/package.nix
index 91a8baccd8a10..b3f5941556958 100644
--- a/pkgs/by-name/go/gopass-jsonapi/package.nix
+++ b/pkgs/by-name/go/gopass-jsonapi/package.nix
@@ -8,7 +8,6 @@
jq,
gnupg,
gopass,
- apple-sdk_14,
}:
let
@@ -45,11 +44,6 @@ buildGoModule rec {
makeWrapper
];
- buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
- # For ScreenCaptureKit.h, see https://github.com/NixOS/nixpkgs/pull/358760#discussion_r1858327365
- apple-sdk_14
- ];
-
ldflags = [
"-s"
"-w"
diff --git a/pkgs/by-name/gr/grpc/package.nix b/pkgs/by-name/gr/grpc/package.nix
index 0e71063ec0b0b..2763b6a619f60 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.75.1"; # N.B: if you change this, please update:
+ version = "1.76.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-SnKK52VLO4MM/ftfmzRV/LeLfOucdIyHMyWk6EKRfvM=";
+ hash = "sha256-f25ccZC0pJw00ETgxBtXU6+0OnlJsV7zXjK/ayiCIJY=";
fetchSubmodules = true;
};
diff --git a/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix b/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix
index cb40b950a43e7..cbeece5a07aa9 100644
--- a/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix
+++ b/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix
@@ -17,11 +17,11 @@
stdenv.mkDerivation rec {
pname = "gsettings-desktop-schemas";
- version = "48.0";
+ version = "49.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
- hash = "sha256-5o8VWBO/GPhlqLLI6dRzWItsytyvu2Zqt4iFfGwtG9M=";
+ hash = "sha256-kSkFzEU4KIikdwLtEQHGsI69ASKjKmfZQKuBFqlsUg0=";
};
strictDeps = true;
diff --git a/pkgs/by-name/gt/gtk-doc/package.nix b/pkgs/by-name/gt/gtk-doc/package.nix
index 716b2fa57947d..50f5cdacbfc69 100644
--- a/pkgs/by-name/gt/gtk-doc/package.nix
+++ b/pkgs/by-name/gt/gtk-doc/package.nix
@@ -16,7 +16,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "gtk-doc";
- version = "1.34.0";
+ version = "1.35.1";
outputDevdoc = "out";
@@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "GNOME";
repo = "gtk-doc";
rev = version;
- hash = "sha256-Jt6d5wbhAoSQ2sWyYWW68Y81duc3+QOJK/5JR/lCmnQ=";
+ hash = "sha256-EqU7lnBnOn3gR3hT95yjdTUb3cqX2XJK5UAKsFw2Q10=";
};
patches = [
diff --git a/pkgs/by-name/gt/gtk-frdp/package.nix b/pkgs/by-name/gt/gtk-frdp/package.nix
index 9196214e4616e..1a4c228b398d5 100644
--- a/pkgs/by-name/gt/gtk-frdp/package.nix
+++ b/pkgs/by-name/gt/gtk-frdp/package.nix
@@ -16,14 +16,14 @@
stdenv.mkDerivation {
pname = "gtk-frdp";
- version = "0-unstable-2025-03-14";
+ version = "0-unstable-2025-08-15";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "gtk-frdp";
- rev = "a0187fa02e1ff249e9583e8c09a2c2f5915ce2a3";
- hash = "sha256-oi4Iwi9/elfUDKK0IhoNgtS8ORIzVUBagqBVdNRxGjI=";
+ rev = "b59dc88624511311576dca607d3cb9317569de34";
+ hash = "sha256-6zCaegBshOLQWeHtUYOaofbUVK797vyn5bdpwHD0Z/s=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/gu/gucharmap/package.nix b/pkgs/by-name/gu/gucharmap/package.nix
index 9eec9079f8e2d..e84aea3306d3f 100644
--- a/pkgs/by-name/gu/gucharmap/package.nix
+++ b/pkgs/by-name/gu/gucharmap/package.nix
@@ -47,7 +47,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gucharmap";
- version = "16.0.2";
+ version = "17.0.0";
outputs = [
"out"
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "GNOME";
repo = "gucharmap";
rev = finalAttrs.version;
- hash = "sha256-UaXgQIhAoI27iYWgZuZeO7Lv6J9pj06HPp0SZs/5abM=";
+ hash = "sha256-BYplW+gVTgWdXYW+h2g4xwxmFSl+WoygZfw8dug4qkw=";
};
strictDeps = true;
diff --git a/pkgs/by-name/gv/gvfs/package.nix b/pkgs/by-name/gv/gvfs/package.nix
index e8e383077aeef..2e8ee141c156c 100644
--- a/pkgs/by-name/gv/gvfs/package.nix
+++ b/pkgs/by-name/gv/gvfs/package.nix
@@ -49,11 +49,11 @@
assert googleSupport -> gnomeSupport;
stdenv.mkDerivation (finalAttrs: {
pname = "gvfs";
- version = "1.57.2";
+ version = "1.58.0";
src = fetchurl {
url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor finalAttrs.version}/gvfs-${finalAttrs.version}.tar.xz";
- hash = "sha256-8Wvvjsof1sEX6F2wEdIekVZpeQ1VhnNJxfGykSmelYU=";
+ hash = "sha256-3ZvjaHPQ/LMJ64mo0nR3DOV2KHYoos8RG9OH4cNPGC8=";
};
patches = [
diff --git a/pkgs/by-name/ha/harfbuzz/package.nix b/pkgs/by-name/ha/harfbuzz/package.nix
index 3742ae1313127..82fb59100c38b 100644
--- a/pkgs/by-name/ha/harfbuzz/package.nix
+++ b/pkgs/by-name/ha/harfbuzz/package.nix
@@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "OpenType text shaping engine";
homepage = "https://harfbuzz.github.io/";
changelog = "https://github.com/harfbuzz/harfbuzz/raw/${finalAttrs.version}/NEWS";
- maintainers = [ ];
+ maintainers = [ maintainers.cobalt ];
license = licenses.mit;
platforms = platforms.unix ++ platforms.windows;
pkgConfigModules = [
diff --git a/pkgs/by-name/ic/icecast/package.nix b/pkgs/by-name/ic/icecast/package.nix
index 5affabed1b520..7200b2e25c902 100644
--- a/pkgs/by-name/ic/icecast/package.nix
+++ b/pkgs/by-name/ic/icecast/package.nix
@@ -32,8 +32,6 @@ stdenv.mkDerivation rec {
libopus
];
- hardeningEnable = [ "pie" ];
-
meta = {
description = "Server software for streaming multimedia";
mainProgram = "icecast";
diff --git a/pkgs/by-name/im/impression/package.nix b/pkgs/by-name/im/impression/package.nix
index 99144834ec563..e7a57617c2d43 100644
--- a/pkgs/by-name/im/impression/package.nix
+++ b/pkgs/by-name/im/impression/package.nix
@@ -24,18 +24,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "impression";
- version = "3.5.1";
+ version = "3.5.3";
src = fetchFromGitLab {
owner = "adhami3310";
repo = "Impression";
tag = "v${finalAttrs.version}";
- hash = "sha256-xSgH1k/K52sh3qcIHWyv/WgRX9sVWZAXm+OabWbbNJo=";
+ hash = "sha256-kS2uWYwYNdgHF5NBPqvFlkFvnv7VTTqWG5Y2g282d24=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
- hash = "sha256-cBaScjnhWW9nLFdeCuW7jzlJ8qZecc0FxjpJTRZJ6Lo=";
+ hash = "sha256-j1fSzEGgKVp5iPvU+yoXFHrG7E6HsaNWk0Ofpr0SHzQ=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/in/inih/package.nix b/pkgs/by-name/in/inih/package.nix
index 14336b289ac78..4bfe3df86292f 100644
--- a/pkgs/by-name/in/inih/package.nix
+++ b/pkgs/by-name/in/inih/package.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "inih";
- version = "61";
+ version = "62";
src = fetchFromGitHub {
owner = "benhoyt";
repo = "inih";
rev = "r${version}";
- hash = "sha256-tSmdd9uAXaRQtnqj0hKuT0wofcZcYjqgPbhtaR+cr84=";
+ hash = "sha256-jnMGOncnH+ffgtyNzA8tZPtxPCR/yq9jmPsJZE4BhXo=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/ip/iproute2/package.nix b/pkgs/by-name/ip/iproute2/package.nix
index ea44bacf92f25..fd2e5d893031c 100644
--- a/pkgs/by-name/ip/iproute2/package.nix
+++ b/pkgs/by-name/ip/iproute2/package.nix
@@ -26,20 +26,6 @@ stdenv.mkDerivation rec {
};
patches = [
- (fetchurl {
- name = "musl-endian.patch";
- url = "https://lore.kernel.org/netdev/20240712191209.31324-1-contact@hacktivis.me/raw";
- hash = "sha256-MX+P+PSEh6XlhoWgzZEBlOV9aXhJNd20Gi0fJCcSZ5E=";
- })
- (fetchurl {
- name = "musl-basename.patch";
- url = "https://lore.kernel.org/netdev/20240804161054.942439-1-dilfridge@gentoo.org/raw";
- hash = "sha256-47obv6mIn/HO47lt47slpTAFDxiQ3U/voHKzIiIGCTM=";
- })
- ]
- # Temporarily gated to keep rebuild counts under control.
- # The proper fix (targeted to staging) is done in https://github.com/NixOS/nixpkgs/pull/451397
- ++ lib.optionals stdenv.hostPlatform.isMusl [
(fetchurl {
name = "musl-redefinition.patch";
url = "https://lore.kernel.org/netdev/20251012124002.296018-1-yureka@cyberchaos.dev/raw";
diff --git a/pkgs/by-name/is/isc-cron/package.nix b/pkgs/by-name/is/isc-cron/package.nix
index 137273c9f3932..fb9b58c586f7b 100644
--- a/pkgs/by-name/is/isc-cron/package.nix
+++ b/pkgs/by-name/is/isc-cron/package.nix
@@ -35,8 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
"DESTROOT=$(out)"
];
- hardeningEnable = [ "pie" ];
-
unpackCmd = ''
mkdir cron
pushd cron
diff --git a/pkgs/by-name/jj/jj-pre-push/package.nix b/pkgs/by-name/jj/jj-pre-push/package.nix
index e9407b41f6365..fc291159e46ca 100644
--- a/pkgs/by-name/jj/jj-pre-push/package.nix
+++ b/pkgs/by-name/jj/jj-pre-push/package.nix
@@ -2,6 +2,7 @@
lib,
python3Packages,
fetchFromGitHub,
+ fetchpatch2,
}:
python3Packages.buildPythonApplication rec {
diff --git a/pkgs/by-name/ka/kanata/package.nix b/pkgs/by-name/ka/kanata/package.nix
index 6b5fd10ceb63c..6ffb65922076d 100644
--- a/pkgs/by-name/ka/kanata/package.nix
+++ b/pkgs/by-name/ka/kanata/package.nix
@@ -2,8 +2,6 @@
stdenv,
lib,
gnused,
- apple-sdk_13,
- darwinMinVersionHook,
rustPlatform,
karabiner-dk,
fetchFromGitHub,
@@ -29,14 +27,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoHash = "sha256-LfjuQHR3vVUr2e0efVymnfCnyYkFRx7ZiNdSIjBZc5s=";
- buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
- apple-sdk_13
- (darwinMinVersionHook "13.0")
- ];
-
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
(writeShellScriptBin "sw_vers" ''
- echo 'ProductVersion: 13.0'
+ echo 'ProductVersion: ${stdenv.hostPlatform.darwinMinVersion}'
'')
];
diff --git a/pkgs/by-name/ke/kexec-tools/package.nix b/pkgs/by-name/ke/kexec-tools/package.nix
index d4afe126caa45..c11eff6bc3faf 100644
--- a/pkgs/by-name/ke/kexec-tools/package.nix
+++ b/pkgs/by-name/ke/kexec-tools/package.nix
@@ -12,22 +12,17 @@
stdenv.mkDerivation rec {
pname = "kexec-tools";
- version = "2.0.31";
+ version = "2.0.32";
src = fetchurl {
urls = [
"mirror://kernel/linux/utils/kernel/kexec/${pname}-${version}.tar.xz"
"http://horms.net/projects/kexec/kexec-tools/${pname}-${version}.tar.xz"
];
- sha256 = "sha256-io81Ddxm4ckFo6tSWn6bqWyB4E5w72k5ewFVtnuSLDE=";
+ sha256 = "sha256-j4FCKl/SNiz2ywAbUR5TVWXtDzLC9EUfteto/tZxCl0=";
};
patches = [
- # Fix for static builds, will likely be removable on the next release
- (fetchpatch {
- url = "https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/patch/?id=daa29443819d3045338792b5ba950ed90e79d7a5";
- hash = "sha256-Nq5HIcLY6KSvvrs2sbfE/vovMbleJYElHW9AVRU5rSA=";
- })
]
++ lib.optionals (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isAbiElfv2) [
# Use ELFv2 ABI on ppc64be
@@ -42,7 +37,6 @@ stdenv.mkDerivation rec {
"format"
"pic"
"relro"
- "pie"
];
# Prevent kexec-tools from using uname to detect target, which is wrong in
diff --git a/pkgs/by-name/ke/keydb/package.nix b/pkgs/by-name/ke/keydb/package.nix
index c0fc9248be383..6d7bae68fc48c 100644
--- a/pkgs/by-name/ke/keydb/package.nix
+++ b/pkgs/by-name/ke/keydb/package.nix
@@ -57,8 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
enableParallelBuilding = true;
- hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ];
-
# darwin currently lacks a pure `pgrep` which is extensively used here
doCheck = !stdenv.hostPlatform.isDarwin;
nativeCheckInputs = [
diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index 72cd7a7bbae98..e4c647cd4f981 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -7,8 +7,6 @@
tk,
addDriverRunpath,
- apple-sdk_13,
-
koboldLiteSupport ? true,
config,
@@ -71,7 +69,6 @@ effectiveStdenv.mkDerivation (finalAttrs: {
tk
]
++ finalAttrs.pythonInputs
- ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_13 ]
++ lib.optionals cublasSupport [
cudaPackages.libcublas
cudaPackages.cuda_nvcc
diff --git a/pkgs/by-name/ks/ksh/package.nix b/pkgs/by-name/ks/ksh/package.nix
index 86f06ae202667..b0780eebc8c1c 100644
--- a/pkgs/by-name/ks/ksh/package.nix
+++ b/pkgs/by-name/ks/ksh/package.nix
@@ -50,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/att/ast";
license = lib.licenses.cpl10;
maintainers = with lib.maintainers; [ sigmanificient ];
+ mainProgram = "ksh";
platforms = lib.platforms.all;
};
diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix
index ba91f71d49a0f..fcc04fcb579f5 100644
--- a/pkgs/by-name/la/ladybird/package.nix
+++ b/pkgs/by-name/la/ladybird/package.nix
@@ -27,7 +27,6 @@
skia,
nixosTests,
unstableGitUpdater,
- apple-sdk_14,
libtommath,
sdl3,
}:
@@ -107,9 +106,6 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optional stdenv.hostPlatform.isLinux [
libpulseaudio.dev
qt6Packages.qtwayland
- ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [
- apple-sdk_14
];
cmakeFlags = [
diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix
index c6e5c7cff9692..f6a1dfc2cdf8d 100644
--- a/pkgs/by-name/ld/ld64/package.nix
+++ b/pkgs/by-name/ld/ld64/package.nix
@@ -119,6 +119,9 @@ stdenv.mkDerivation (finalAttrs: {
xar
];
+ # ld built with this fails to link glib's gio on x86_64 darwin
+ hardeningDisable = [ "libcxxhardeningfast" ];
+
dontUseCmakeConfigure = true; # CMake is only needed because it’s used by Meson to find LLVM.
# Note for overrides: ld64 cannot be built as a debug build because of UB in its iteration implementations,
diff --git a/pkgs/by-name/li/libadwaita/package.nix b/pkgs/by-name/li/libadwaita/package.nix
index 91c1f3cb8b1d3..dd4ea744d0c18 100644
--- a/pkgs/by-name/li/libadwaita/package.nix
+++ b/pkgs/by-name/li/libadwaita/package.nix
@@ -23,7 +23,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libadwaita";
- version = "1.7.6";
+ version = "1.8.0";
outputs = [
"out"
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "GNOME";
repo = "libadwaita";
tag = finalAttrs.version;
- hash = "sha256-HpjP6VSkEAFeXIFXLbndQzEWJwVvHe6B3aSwCz6KiIM=";
+ hash = "sha256-neF7nt7x3QhSsWuWGouqniFlDHw1Soco7Dpzhy15gWE=";
};
depsBuildBuild = [
diff --git a/pkgs/by-name/li/libarchive/fix-darwin-tmpdir-handling.patch b/pkgs/by-name/li/libarchive/fix-darwin-tmpdir-handling.patch
deleted file mode 100644
index 3e88c15dbdf2f..0000000000000
--- a/pkgs/by-name/li/libarchive/fix-darwin-tmpdir-handling.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 87bbe8ec8d343c70ae42ccb9606ec80ad73ceffb Mon Sep 17 00:00:00 2001
-From: Emily
-Date: Tue, 29 Jul 2025 16:53:15 +0100
-Subject: [PATCH] Fix setup_mac_metadata when TMPDIR does not end with a slash
-
----
- libarchive/archive_read_disk_entry_from_file.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
-index 19d049770b..87389642db 100644
---- a/libarchive/archive_read_disk_entry_from_file.c
-+++ b/libarchive/archive_read_disk_entry_from_file.c
-@@ -364,7 +364,7 @@ setup_mac_metadata(struct archive_read_disk *a,
- tempdir = _PATH_TMP;
- archive_string_init(&tempfile);
- archive_strcpy(&tempfile, tempdir);
-- archive_strcat(&tempfile, "tar.md.XXXXXX");
-+ archive_strcat(&tempfile, "/tar.md.XXXXXX");
- tempfd = mkstemp(tempfile.s);
- if (tempfd < 0) {
- archive_set_error(&a->archive, errno,
diff --git a/pkgs/by-name/li/libarchive/package.nix b/pkgs/by-name/li/libarchive/package.nix
index a6034a421eaa8..f0bfd5355b44f 100644
--- a/pkgs/by-name/li/libarchive/package.nix
+++ b/pkgs/by-name/li/libarchive/package.nix
@@ -6,7 +6,6 @@
attr,
autoreconfHook,
bzip2,
- fetchpatch,
glibcLocalesUtf8,
lzo,
openssl,
@@ -32,29 +31,15 @@
assert xarSupport -> libxml2 != null;
stdenv.mkDerivation (finalAttrs: {
pname = "libarchive";
- version = "3.8.1";
+ version = "3.8.2";
src = fetchFromGitHub {
owner = "libarchive";
repo = "libarchive";
rev = "v${finalAttrs.version}";
- hash = "sha256-KN5SvQ+/g/OOa+hntMX3D8p5IEWO0smke5WK+DwrOH0=";
+ hash = "sha256-s7duwuNFyYq8obTS3qc6JewJ9f8LJhItlEx8wxnMgwk=";
};
- patches = [
- # https://github.com/libarchive/libarchive/pull/2689
- # Remove after next release.
- (fetchpatch {
- url = "https://github.com/libarchive/libarchive/commit/489d0b8e2f1fafd3b7ebf98f389ca67462c34651.patch?full_index=1";
- hash = "sha256-r+tSJ+WA0VKCjg+8MfS5/RqcB+aAMZ2dK0YUh+U1q78=";
- })
- # Fix the tests on Darwin when `$TMPDIR` does not end with a slash
- # and its parent directory is not writable by the build user, as on
- # Nix ≥ 2.30.0 and Lix ≥ 2.91.2, ≥ 2.92.2, ≥ 2.93.1.
- #
- ./fix-darwin-tmpdir-handling.patch
- ];
-
outputs = [
"out"
"lib"
diff --git a/pkgs/by-name/li/libchamplain/package.nix b/pkgs/by-name/li/libchamplain/package.nix
index a37ccdd952641..433c828b51827 100644
--- a/pkgs/by-name/li/libchamplain/package.nix
+++ b/pkgs/by-name/li/libchamplain/package.nix
@@ -69,7 +69,8 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
- packageName = pname;
+ packageName = "libchamplain";
+ attrPath = "libchamplain_libsoup3";
versionPolicy = "odd-unstable";
};
};
@@ -88,7 +89,7 @@ stdenv.mkDerivation rec {
OpenCycleMap, OpenAerialMap, and Maps for free.
'';
- teams = [
+ teams = lib.optionals withLibsoup3 [
teams.gnome
teams.pantheon
];
diff --git a/pkgs/by-name/li/libdecor/package.nix b/pkgs/by-name/li/libdecor/package.nix
index 1c1d8931ea8da..4e1c2e3e88192 100644
--- a/pkgs/by-name/li/libdecor/package.nix
+++ b/pkgs/by-name/li/libdecor/package.nix
@@ -16,14 +16,14 @@
stdenv.mkDerivation rec {
pname = "libdecor";
- version = "0.2.3";
+ version = "0.2.4";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "libdecor";
repo = "libdecor";
rev = version;
- hash = "sha256-7h/Xfw8chzRmmWKcOyIB7KSL+ZzNGDpElfE22ReoJqY=";
+ hash = "sha256-l0MmNpC+449BaluynbzG5d0/v57F5rltOIBzBagkYbc=";
};
outputs = [
diff --git a/pkgs/by-name/li/libdex/package.nix b/pkgs/by-name/li/libdex/package.nix
index 34078fc48c3c2..f9901e8b3ae39 100644
--- a/pkgs/by-name/li/libdex/package.nix
+++ b/pkgs/by-name/li/libdex/package.nix
@@ -15,7 +15,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libdex";
- version = "0.10.1";
+ version = "1.0.0";
outputs = [
"out"
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/libdex/${lib.versions.majorMinor finalAttrs.version}/libdex-${finalAttrs.version}.tar.xz";
- hash = "sha256-dHLogJDbKyKDB1Be3rpEg+hyaBNAywQErmSsPaW+0KY=";
+ hash = "sha256-e49cXbN5bhThLhBCLiNWdmuoMLkoFf7nC7yGe1sgf10=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libdrm/package.nix b/pkgs/by-name/li/libdrm/package.nix
index e9bb0c3d449b8..9c38c381502e4 100644
--- a/pkgs/by-name/li/libdrm/package.nix
+++ b/pkgs/by-name/li/libdrm/package.nix
@@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "libdrm";
- version = "2.4.126";
+ version = "2.4.127";
src = fetchurl {
url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz";
- hash = "sha256-bKsW1NJZtqvJ9IUjOGNFQRSjwwfsqAZnmq0+2+lnv0I=";
+ hash = "sha256-BRrrPlQqV2IQGP/EQ/sIjdabeO7wzkgItgTOD+rJ9H8=";
};
outputs = [
diff --git a/pkgs/by-name/li/libedit/package.nix b/pkgs/by-name/li/libedit/package.nix
index 14bb1f1c532ca..6f3caa1f45dab 100644
--- a/pkgs/by-name/li/libedit/package.nix
+++ b/pkgs/by-name/li/libedit/package.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libedit";
- version = "20250104-3.1";
+ version = "20251016-3.1";
src = fetchurl {
url = "https://thrysoee.dk/editline/libedit-${finalAttrs.version}.tar.gz";
- hash = "sha256-I3knAWlFUKU3IGMM0c1hZxAbV3Ot3ctBBPc0W3OlaKw=";
+ hash = "sha256-ITYrAGU7v8HHH3GnV42ma1tSA1WdQxNNLddxnjE84EE=";
};
outputs = [
diff --git a/pkgs/by-name/li/libfabric/package.nix b/pkgs/by-name/li/libfabric/package.nix
index 11b83ef7a87c8..47ce9db99b9b8 100644
--- a/pkgs/by-name/li/libfabric/package.nix
+++ b/pkgs/by-name/li/libfabric/package.nix
@@ -13,7 +13,7 @@
stdenv.mkDerivation rec {
pname = "libfabric";
- version = "2.3.0";
+ version = "2.3.1";
enableParallelBuilding = true;
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
owner = "ofiwg";
repo = "libfabric";
rev = "v${version}";
- sha256 = "sha256-pxSv6mg51It4+P1nAgXdWizTGpI31rn5+n3f4vD6ooY=";
+ sha256 = "sha256-Zaf7iGr2/HWiMcH7zERz5Y9YzJ0QpHCCs+bU+qmoQTI=";
};
outputs = [
diff --git a/pkgs/by-name/li/libglycin/fix-glycin-3-paths.patch b/pkgs/by-name/li/libglycin/fix-glycin-3-paths.patch
new file mode 100644
index 0000000000000..35b22f06fa367
--- /dev/null
+++ b/pkgs/by-name/li/libglycin/fix-glycin-3-paths.patch
@@ -0,0 +1,13 @@
+diff --git a/vendor/glycin/src/sandbox.rs b/vendor/glycin/src/sandbox.rs
+index 90cd5f6..17a6469 100644
+--- a/vendor/glycin/src/sandbox.rs
++++ b/vendor/glycin/src/sandbox.rs
+@@ -251,7 +251,7 @@ impl Sandbox {
+ }
+
+ async fn bwrap_command(&self, seccomp_memfd: &Memfd) -> Result {
+- let mut command = Command::new("bwrap");
++ let mut command = Command::new("@bwrap@");
+
+ command.args([
+ "--unshare-all",
diff --git a/pkgs/by-name/li/libglycin/package.nix b/pkgs/by-name/li/libglycin/package.nix
index 74f78c18fa7a7..88bed1c78d5b4 100644
--- a/pkgs/by-name/li/libglycin/package.nix
+++ b/pkgs/by-name/li/libglycin/package.nix
@@ -7,13 +7,14 @@
pkg-config,
rustc,
cargo,
+ python3,
rustPlatform,
vala,
gi-docgen,
+ gobject-introspection,
libseccomp,
lcms2,
gtk4,
- gobject-introspection,
gnome,
replaceVars,
bubblewrap,
@@ -26,14 +27,14 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libglycin";
- version = "1.2.3";
+ version = "2.0.5";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "glycin";
tag = finalAttrs.version;
- hash = "sha256-O7Z7kzC0BU7FAF1UZC6LbXVIXPDertsAUNYwHAjkzPI=";
+ hash = "sha256-RrklQ1+9v2iEIv0/gQLEyYV7ELazcm+vSn/6gyXA6mo=";
};
nativeBuildInputs = [
@@ -42,24 +43,25 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config
rustc
cargo
+ python3
rustPlatform.cargoSetupHook
]
++ lib.optionals withIntrospection [
vala
gi-docgen
+ gobject-introspection
];
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
- hash = "sha256-g2tsQ6q+sUxn3itu3IgZ5EGtDorPzhaO5B1hlEW5xzs=";
+ hash = "sha256-u1zHQwqrPT22Utl7Woah/JdKJSe65Q2Jc7cuh7b+R5Q=";
};
buildInputs = [
libseccomp
lcms2
gtk4
- ]
- ++ lib.optionals withIntrospection [ gobject-introspection ];
+ ];
propagatedBuildInputs = [
libseccomp
@@ -68,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
mesonFlags = [
(lib.mesonBool "glycin-loaders" false)
+ (lib.mesonBool "glycin-thumbnailer" false)
(lib.mesonBool "libglycin" true)
(lib.mesonBool "introspection" withIntrospection)
(lib.mesonBool "vapi" withIntrospection)
@@ -75,7 +78,10 @@ stdenv.mkDerivation (finalAttrs: {
];
postPatch = ''
- patch -p2 < ${finalAttrs.passthru.glycinPathsPatch}
+ patch -p2 < ${finalAttrs.passthru.glycin3PathsPatch}
+
+ patchShebangs \
+ build-aux/crates-version.py
'';
passthru = {
@@ -110,6 +116,10 @@ stdenv.mkDerivation (finalAttrs: {
glycinPathsPatch = replaceVars ./fix-glycin-paths.patch {
bwrap = "${bubblewrap}/bin/bwrap";
};
+
+ glycin3PathsPatch = replaceVars ./fix-glycin-3-paths.patch {
+ bwrap = "${bubblewrap}/bin/bwrap";
+ };
};
meta = {
diff --git a/pkgs/by-name/li/libjxl/package.nix b/pkgs/by-name/li/libjxl/package.nix
index af5041e2ca5bd..d5615b27d1a0f 100644
--- a/pkgs/by-name/li/libjxl/package.nix
+++ b/pkgs/by-name/li/libjxl/package.nix
@@ -5,6 +5,7 @@
fetchpatch,
brotli,
cmake,
+ ctestCheckHook,
giflib,
gperftools,
gtest,
@@ -97,6 +98,10 @@ stdenv.mkDerivation rec {
libhwy
];
+ nativeCheckInputs = [
+ ctestCheckHook
+ ];
+
cmakeFlags = [
# For C dependencies like brotli, which are dynamically linked,
# we want to use the system libraries, so that we don't have to care about
@@ -176,6 +181,30 @@ stdenv.mkDerivation rec {
# https://github.com/NixOS/nixpkgs/pull/204030#issuecomment-1352768690
doCheck = with stdenv; !(hostPlatform.isi686 || isDarwin && isx86_64);
+ disabledTests = lib.optionals stdenv.hostPlatform.isBigEndian [
+ # https://github.com/libjxl/libjxl/issues/3629
+ "DecodeTest.ProgressionTestLosslessAlpha"
+ "DecodeTest.FlushTestLosslessProgressiveAlpha"
+ "EncodeTest.FrameSettingsTest"
+ "JxlTest.RoundtripAlphaResampling"
+ "JxlTest.RoundtripAlphaResamplingOnlyAlpha"
+ "JxlTest.RoundtripAlpha16"
+ "JxlTest.RoundtripProgressive"
+ "JxlTest.RoundtripProgressiveLevel2Slow"
+ "ModularTest.RoundtripLossyDeltaPalette"
+ "ModularTest.RoundtripLossy"
+ "ModularTest.RoundtripLossy16"
+ "PassesTest.ProgressiveDownsample2DegradesCorrectlyGrayscale"
+ "PassesTest.ProgressiveDownsample2DegradesCorrectly"
+ ];
+
+ ctestFlags = lib.optionals stdenv.hostPlatform.isBigEndian [
+ # https://github.com/libjxl/libjxl/issues/3629
+ # These didn't seem to be accepted via disabledTests
+ "--exclude-regex"
+ ".*bitSqueeze.*"
+ ];
+
meta = with lib; {
homepage = "https://github.com/libjxl/libjxl";
description = "JPEG XL image format reference implementation";
diff --git a/pkgs/by-name/li/libnbd/package.nix b/pkgs/by-name/li/libnbd/package.nix
index 55fca95e04937..b0a9b3fd78d1c 100644
--- a/pkgs/by-name/li/libnbd/package.nix
+++ b/pkgs/by-name/li/libnbd/package.nix
@@ -16,83 +16,80 @@
autoreconfHook,
}:
-lib.throwIf (buildOcamlBindings && !lib.versionAtLeast ocamlPackages.ocaml.version "4.05")
- "OCaml binding are not available for OCaml < 4.05"
+stdenv.mkDerivation rec {
+ pname = "libnbd";
+ version = "1.22.1";
- stdenv.mkDerivation
- rec {
- pname = "libnbd";
- version = "1.22.1";
+ src = fetchurl {
+ url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz";
+ hash = "sha256-9oVJrU2YcXGnKaDf8SoHKGtG7vpH5355/DKIiYrchHI=";
+ };
- src = fetchurl {
- url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz";
- hash = "sha256-9oVJrU2YcXGnKaDf8SoHKGtG7vpH5355/DKIiYrchHI=";
- };
-
- nativeBuildInputs = [
- bash-completion
- pkg-config
- perl
- autoreconfHook
+ nativeBuildInputs = [
+ bash-completion
+ pkg-config
+ perl
+ autoreconfHook
+ ]
+ ++ lib.optionals buildPythonBindings [ python3 ]
+ ++ lib.optionals buildOcamlBindings (
+ with ocamlPackages;
+ [
+ findlib
+ ocaml
]
- ++ lib.optionals buildPythonBindings [ python3 ]
- ++ lib.optionals buildOcamlBindings (
- with ocamlPackages;
- [
- findlib
- ocaml
- ]
- );
+ );
- buildInputs = [
- fuse
- fuse3
- gnutls
- libxml2
- ];
+ buildInputs = [
+ fuse
+ fuse3
+ gnutls
+ libxml2
+ ];
- postPatch = lib.optionalString buildOcamlBindings ''
- substituteInPlace ocaml/Makefile.am \
- --replace-fail '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib'
- '';
+ postPatch = lib.optionalString buildOcamlBindings ''
+ substituteInPlace ocaml/Makefile.am \
+ --replace-fail '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib'
+ '';
- configureFlags = lib.optionals buildPythonBindings [
- "--with-python-installdir=${placeholder "out"}/${python3.sitePackages}"
- ];
+ configureFlags = lib.optionals buildPythonBindings [
+ "--with-python-installdir=${placeholder "out"}/${python3.sitePackages}"
+ ];
- installFlags = [ "bashcompdir=$(out)/share/bash-completion/completions" ];
+ installFlags = [ "bashcompdir=$(out)/share/bash-completion/completions" ];
- postInstall = lib.optionalString buildPythonBindings ''
- LIBNBD_PYTHON_METADATA='${placeholder "out"}/${python3.sitePackages}/nbd-${version}.dist-info/METADATA'
- install -Dm644 -T ${./libnbd-metadata} $LIBNBD_PYTHON_METADATA
- substituteAllInPlace $LIBNBD_PYTHON_METADATA
- '';
+ postInstall = lib.optionalString buildPythonBindings ''
+ LIBNBD_PYTHON_METADATA='${placeholder "out"}/${python3.sitePackages}/nbd-${version}.dist-info/METADATA'
+ install -Dm644 -T ${./libnbd-metadata} $LIBNBD_PYTHON_METADATA
+ substituteAllInPlace $LIBNBD_PYTHON_METADATA
+ '';
- meta = with lib; {
- homepage = "https://gitlab.com/nbdkit/libnbd";
- description = "Network Block Device client library in userspace";
- longDescription = ''
- NBD — Network Block Device — is a protocol for accessing Block Devices
- (hard disks and disk-like things) over a Network. This is the NBD client
- library in userspace, a simple library for writing NBD clients.
+ meta = with lib; {
+ homepage = "https://gitlab.com/nbdkit/libnbd";
+ description = "Network Block Device client library in userspace";
+ longDescription = ''
+ NBD — Network Block Device — is a protocol for accessing Block Devices
+ (hard disks and disk-like things) over a Network. This is the NBD client
+ library in userspace, a simple library for writing NBD clients.
- The key features are:
- - Synchronous API for ease of use.
- - Asynchronous API for writing non-blocking, multithreaded clients. You
- can mix both APIs freely.
- - High performance.
- - Minimal dependencies for the basic library.
- - Well-documented, stable API.
- - Bindings in several programming languages.
- - Shell (nbdsh) for command line and scripting.
- '';
- license = with licenses; lgpl21Plus;
- maintainers = with maintainers; [
- humancalico
- ];
- platforms = with platforms; linux;
- };
- }
+ The key features are:
+ - Synchronous API for ease of use.
+ - Asynchronous API for writing non-blocking, multithreaded clients. You
+ can mix both APIs freely.
+ - High performance.
+ - Minimal dependencies for the basic library.
+ - Well-documented, stable API.
+ - Bindings in several programming languages.
+ - Shell (nbdsh) for command line and scripting.
+ '';
+ license = with licenses; lgpl21Plus;
+ maintainers = with maintainers; [
+ humancalico
+ ];
+ platforms = with platforms; linux;
+ broken = buildOcamlBindings && !lib.versionAtLeast ocamlPackages.ocaml.version "4.05";
+ };
+}
# TODO: package the 1.6-stable version too
# TODO: git version needs ocaml
# TODO: bindings for go
diff --git a/pkgs/by-name/li/libpanel/package.nix b/pkgs/by-name/li/libpanel/package.nix
index b577910323a38..9cf2460f3f25b 100644
--- a/pkgs/by-name/li/libpanel/package.nix
+++ b/pkgs/by-name/li/libpanel/package.nix
@@ -16,7 +16,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libpanel";
- version = "1.10.0";
+ version = "1.10.3";
outputs = [
"out"
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/libpanel/${lib.versions.majorMinor finalAttrs.version}/libpanel-${finalAttrs.version}.tar.xz";
- hash = "sha256-V4zlEieP8rte7rtVCZOSxSU3pavZvQYpVn8QJTKziyU=";
+ hash = "sha256-QqAbr4uURA8ZTqg0KyRL1pkt+wJMoxYMlHf/SY7DorY=";
};
strictDeps = true;
diff --git a/pkgs/by-name/li/librsvg/expect-any-error-too-many-elements.patch b/pkgs/by-name/li/librsvg/expect-any-error-too-many-elements.patch
deleted file mode 100644
index 94f145bb744ce..0000000000000
--- a/pkgs/by-name/li/librsvg/expect-any-error-too-many-elements.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/rsvg/tests/errors.rs b/rsvg/tests/errors.rs
-index 02b134bee..46391fa5d 100644
---- a/rsvg/tests/errors.rs
-+++ b/rsvg/tests/errors.rs
-@@ -14,15 +14,12 @@ use rsvg::{CairoRenderer, ImplementationLimit, Loader, LoadingError, RenderingEr
-
- #[ignore]
- #[test]
-+#[should_panic]
- fn too_many_elements() {
- let name = "tests/fixtures/errors/bug515-too-many-elements.svgz";
-
-- assert!(matches!(
-- Loader::new().read_path(name),
-- Err(LoadingError::LimitExceeded(
-- ImplementationLimit::TooManyLoadedElements
-- ))
-- ));
-+ // libxml2 might return an error without updating the element count, so just expect any error, not specifically too many elements
-+ Loader::new().read_path(name).unwrap();
- }
-
- fn rendering_instancing_limit(name: &str) {
diff --git a/pkgs/by-name/li/librsvg/package.nix b/pkgs/by-name/li/librsvg/package.nix
index 4317c8cbb3197..978cc3cad3b71 100644
--- a/pkgs/by-name/li/librsvg/package.nix
+++ b/pkgs/by-name/li/librsvg/package.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
+ fetchpatch,
pkg-config,
meson,
ninja,
@@ -49,7 +50,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "librsvg";
- version = "2.61.1";
+ version = "2.61.2";
outputs = [
"out"
@@ -61,24 +62,23 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/librsvg/${lib.versions.majorMinor finalAttrs.version}/librsvg-${finalAttrs.version}.tar.xz";
- hash = "sha256-vBu81BkSCwmNsovqVTNdneJHDU5qn27pcge0EPwVhn0=";
+ hash = "sha256-RkTYNiPdYcxEecKzw3Lh2isoFVLryQA1yNGsUC6x3AA=";
};
patches = [
- # too_many_elements test fails with libxml 2.15.0,
- # because libxml2 no longer updates the element count
- # before erroring out, which breaks the librsvg limit check.
- #
- # This is okay, because the error is still detected.
- # The error is simply not reported accurately.
- # https://gitlab.gnome.org/GNOME/librsvg/-/issues/1201
- ./expect-any-error-too-many-elements.patch
+ (fetchpatch {
+ # https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/1149
+ # libxml 2.15+ requires adjustments to error handling
+ # remove next librsvg release
+ url = "https://gitlab.gnome.org/GNOME/librsvg/-/commit/6663df8e9aec323f0c124e97a7c7447a90c67c4a.patch";
+ hash = "sha256-+iyRvxVMxSCW0IIizXXheBFytwhBtU4cyJNTBebCOSg=";
+ })
];
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
name = "librsvg-deps-${finalAttrs.version}";
- hash = "sha256-3DAFyY7uNB5cP8ry28v12QsFdxHtpr1nyLtzhojBq7c=";
+ hash = "sha256-OZspQg9ryDNILUZMiB77vIF0uGCMyVe7blX5BJk102k=";
dontConfigure = true;
};
diff --git a/pkgs/by-name/li/libshumate/package.nix b/pkgs/by-name/li/libshumate/package.nix
index 6e9cbb678d062..e65a9f14dc523 100644
--- a/pkgs/by-name/li/libshumate/package.nix
+++ b/pkgs/by-name/li/libshumate/package.nix
@@ -23,7 +23,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libshumate";
- version = "1.4.0";
+ version = "1.5.1";
outputs = [
"out"
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/libshumate/${lib.versions.majorMinor finalAttrs.version}/libshumate-${finalAttrs.version}.tar.xz";
- hash = "sha256-OYQ2jgJZhis4ENHdyG0trdbTcqKzI3bM9K/3wuSMbTA=";
+ hash = "sha256-2q34twATQ4jH6TPgtiNYaqp/L76LOmJZOHUTMDuYduY=";
};
depsBuildBuild = [
diff --git a/pkgs/by-name/li/livekit-libwebrtc/package.nix b/pkgs/by-name/li/livekit-libwebrtc/package.nix
index fe5235d5b4925..89fbc8ec6f116 100644
--- a/pkgs/by-name/li/livekit-libwebrtc/package.nix
+++ b/pkgs/by-name/li/livekit-libwebrtc/package.nix
@@ -9,7 +9,6 @@
xcbuild,
python3,
ninja,
- apple-sdk_14,
darwinMinVersionHook,
git,
cpio,
@@ -191,11 +190,7 @@ stdenv.mkDerivation {
glib
alsa-lib
pulseaudio
- ])
- ++ lib.optionals stdenv.hostPlatform.isDarwin [
- apple-sdk_14
- (darwinMinVersionHook "12.3")
- ];
+ ]);
preConfigure = ''
echo "generate_location_tags = true" >> build/config/gclient_args.gni
@@ -234,7 +229,7 @@ stdenv.mkDerivation {
"is_clang=false"
])
++ (lib.optionals stdenv.hostPlatform.isDarwin [
- ''mac_deployment_target="12.3"''
+ ''mac_deployment_target="${stdenv.hostPlatform.darwinMinVersion}"''
"rtc_enable_symbol_export=true"
"rtc_enable_objc_symbol_export=true"
"rtc_include_dav1d_in_internal_decoder_factory=true"
diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index 864ca4e10c8ee..975e361a58ebd 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -30,7 +30,6 @@
metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && !openclSupport,
vulkanSupport ? false,
rpcSupport ? false,
- apple-sdk_14,
curl,
llama-cpp,
shaderc,
@@ -106,7 +105,6 @@ effectiveStdenv.mkDerivation (finalAttrs: {
++ optionals rocmSupport rocmBuildInputs
++ optionals blasSupport [ blas ]
++ optionals vulkanSupport vulkanBuildInputs
- ++ optionals metalSupport [ apple-sdk_14 ]
++ [ curl ];
preConfigure = ''
diff --git a/pkgs/by-name/lo/localsearch/package.nix b/pkgs/by-name/lo/localsearch/package.nix
index 361545417bf89..a234bedc5f7fc 100644
--- a/pkgs/by-name/lo/localsearch/package.nix
+++ b/pkgs/by-name/lo/localsearch/package.nix
@@ -38,6 +38,7 @@
libseccomp,
libtiff,
libuuid,
+ libwebp,
libxml2,
poppler,
systemd,
@@ -49,11 +50,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "localsearch";
- version = "3.9.0";
+ version = "3.10.1";
src = fetchurl {
url = "mirror://gnome/sources/localsearch/${lib.versions.majorMinor finalAttrs.version}/localsearch-${finalAttrs.version}.tar.xz";
- hash = "sha256-1C9AjcP7KP5U9amrv18d7PWBjbnC6exRwJRkvf0MFLk=";
+ hash = "sha256-XK7zgWDgSV2tj9FVWmmZ9NTVNtnX66GP1J7BdzOMXcI=";
};
patches = [
@@ -102,6 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
libpng
libtiff
libuuid
+ libwebp
libxml2
poppler
taglib
diff --git a/pkgs/by-name/lo/loupe/package.nix b/pkgs/by-name/lo/loupe/package.nix
index a43aae827f4a8..38a902de5a81f 100644
--- a/pkgs/by-name/lo/loupe/package.nix
+++ b/pkgs/by-name/lo/loupe/package.nix
@@ -25,17 +25,17 @@
stdenv.mkDerivation (finalAttrs: {
pname = "loupe";
- version = "48.1";
+ version = "49.1";
src = fetchurl {
url = "mirror://gnome/sources/loupe/${lib.versions.major finalAttrs.version}/loupe-${finalAttrs.version}.tar.xz";
- hash = "sha256-EHE9PpZ4nQd659M4lFKl9sOX3fQ6UMBxy/4tEnJZcN4=";
+ hash = "sha256-MAmLyXmhyHouyye0patyWr+QC9cQu5wrzAyULVFcUcU=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
name = "loupe-deps-${finalAttrs.version}";
- hash = "sha256-PKkyZDd4FLWGZ/kDKWkaSV8p8NDniSQGcR9Htce6uCg=";
+ hash = "sha256-GqPHvUBA5aRUnRSP+PpdOCC9sL8axnEdfqtHFp2KYJc=";
};
postPatch = ''
@@ -67,8 +67,8 @@ stdenv.mkDerivation (finalAttrs: {
preConfigure = ''
# Dirty approach to add patches after cargoSetupPostUnpackHook
# We should eventually use a cargo vendor patch hook instead
- pushd ../$(stripHash $cargoDeps)/glycin-2.*
- patch -p3 < ${libglycin.passthru.glycinPathsPatch}
+ pushd ../$(stripHash $cargoDeps)/glycin-3.*
+ patch -p3 < ${libglycin.passthru.glycin3PathsPatch}
popd
'';
diff --git a/pkgs/by-name/lu/luit/package.nix b/pkgs/by-name/lu/luit/package.nix
index 8be9df590ad74..86cc095272425 100644
--- a/pkgs/by-name/lu/luit/package.nix
+++ b/pkgs/by-name/lu/luit/package.nix
@@ -8,11 +8,11 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "luit";
- version = "20240910";
+ version = "20250912";
src = fetchurl {
url = "https://invisible-mirror.net/archives/luit/luit-${finalAttrs.version}.tgz";
- hash = "sha256-oV1/y/wlrhRT1hrsI/9roEFF1ue3s7AHHrXP2jo6SdU=";
+ hash = "sha256-RpWAYOZvNby4pRuiLaHBPXJtKKhsHPUgURvPeRS+854=";
};
hardeningDisable = [
"bindnow"
diff --git a/pkgs/by-name/lw/lwan/package.nix b/pkgs/by-name/lw/lwan/package.nix
index fc93de1a31b22..7f6a9e0b54a0c 100644
--- a/pkgs/by-name/lw/lwan/package.nix
+++ b/pkgs/by-name/lw/lwan/package.nix
@@ -31,8 +31,6 @@ stdenv.mkDerivation rec {
# Note: tcmalloc and mimalloc are also supported (and normal malloc)
cmakeFlags = lib.optional enableJemalloc "-DUSE_ALTERNATIVE_MALLOC=jemalloc";
- hardeningDisable = lib.optional stdenv.hostPlatform.isMusl "pie";
-
meta = with lib; {
description = "Lightweight high-performance multi-threaded web server";
mainProgram = "lwan";
diff --git a/pkgs/by-name/ly/lynx/package.nix b/pkgs/by-name/ly/lynx/package.nix
index c5e48d45e42f6..9aedcccb6e812 100644
--- a/pkgs/by-name/ly/lynx/package.nix
+++ b/pkgs/by-name/ly/lynx/package.nix
@@ -25,8 +25,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- hardeningEnable = [ "pie" ];
-
configureFlags = [
"--enable-default-colors"
"--enable-widec"
diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix
index abb2695d21a1b..51d0131951974 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.5";
+ version = "1.9.6";
src = fetchFromGitHub {
owner = "PyO3";
repo = "maturin";
rev = "v${version}";
- hash = "sha256-2WiQtNuhuCJfKIoRKNFaX50Jah4nn2aqlAGrRq/+kww=";
+ hash = "sha256-hMMX59nq9Wusb0XZb8i5/EmQiPL4WopuZX7maycj0J4=";
};
- cargoHash = "sha256-lLWQy9f7vQ+8K0gOCcantAf5644v6Y6MDRvaBvJZJKA=";
+ cargoHash = "sha256-hNFbRtt/sVlEffu7RgXxC1NHzakP8miMyHIV/cf4sfM=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
libiconv
diff --git a/pkgs/by-name/me/memcached/package.nix b/pkgs/by-name/me/memcached/package.nix
index dcce7f82a05ea..ce401cc550f3b 100644
--- a/pkgs/by-name/me/memcached/package.nix
+++ b/pkgs/by-name/me/memcached/package.nix
@@ -25,8 +25,6 @@ stdenv.mkDerivation rec {
libevent
];
- hardeningEnable = [ "pie" ];
-
env.NIX_CFLAGS_COMPILE = toString (
[ "-Wno-error=deprecated-declarations" ] ++ lib.optional stdenv.hostPlatform.isDarwin "-Wno-error"
);
diff --git a/pkgs/by-name/me/mercurial/package.nix b/pkgs/by-name/me/mercurial/package.nix
index 7df8e2b3955eb..c6137a31a783f 100644
--- a/pkgs/by-name/me/mercurial/package.nix
+++ b/pkgs/by-name/me/mercurial/package.nix
@@ -30,7 +30,7 @@ let
inherit (python3Packages)
docutils
python
- fb-re2
+ google-re2
pygit2
pygments
setuptools
@@ -64,7 +64,7 @@ let
cargoRoot = if rustSupport then "rust" else null;
propagatedBuildInputs =
- lib.optional re2Support fb-re2
+ lib.optional re2Support google-re2
++ lib.optional gitSupport pygit2
++ lib.optional highlightSupport pygments;
nativeBuildInputs = [
diff --git a/pkgs/by-name/me/metacity/package.nix b/pkgs/by-name/me/metacity/package.nix
index f1406de7b9ccc..74bc821b80737 100644
--- a/pkgs/by-name/me/metacity/package.nix
+++ b/pkgs/by-name/me/metacity/package.nix
@@ -13,26 +13,18 @@
libstartup_notification,
libxml2,
pkg-config,
- replaceVars,
wrapGAppsHook3,
- zenity,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "metacity";
- version = "3.56.0";
+ version = "3.58.1";
src = fetchurl {
- url = "mirror://gnome/sources/metacity/${lib.versions.majorMinor version}/metacity-${version}.tar.xz";
- hash = "sha256-dVSZcQSyb/DnmgKzeiuhib3058zVQibw+vSxpZAGyQE=";
+ url = "mirror://gnome/sources/metacity/${lib.versions.majorMinor finalAttrs.version}/metacity-${finalAttrs.version}.tar.xz";
+ hash = "sha256-5DDIqSQJ7y+RpNq9UKcePTu8xHSj3sHK7DgTs4HX0bA=";
};
- patches = [
- (replaceVars ./fix-paths.patch {
- inherit zenity;
- })
- ];
-
nativeBuildInputs = [
gettext
libxml2
@@ -44,13 +36,13 @@ stdenv.mkDerivation rec {
xorg.libXres
xorg.libXpresent
xorg.libXdamage
+ xorg.libX11
glib
gsettings-desktop-schemas
gtk3
libcanberra-gtk3
libgtop
libstartup_notification
- zenity
];
enableParallelBuilding = true;
@@ -67,9 +59,9 @@ stdenv.mkDerivation rec {
meta = {
description = "Window manager used in Gnome Flashback";
homepage = "https://gitlab.gnome.org/GNOME/metacity";
- changelog = "https://gitlab.gnome.org/GNOME/metacity/-/blob/${version}/NEWS?ref_type=tags";
+ changelog = "https://gitlab.gnome.org/GNOME/metacity/-/blob/${finalAttrs.version}/NEWS?ref_type=tags";
license = lib.licenses.gpl2;
teams = [ lib.teams.gnome ];
platforms = lib.platforms.linux;
};
-}
+})
diff --git a/pkgs/by-name/ml/mlt/package.nix b/pkgs/by-name/ml/mlt/package.nix
index 41e7af71554e9..ae965a28077cf 100644
--- a/pkgs/by-name/ml/mlt/package.nix
+++ b/pkgs/by-name/ml/mlt/package.nix
@@ -6,7 +6,7 @@
cmake,
pkg-config,
which,
- ffmpeg,
+ ffmpeg_7,
fftw,
frei0r,
libdv,
@@ -71,8 +71,8 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- (opencv4.override { inherit ffmpeg; })
- ffmpeg
+ (opencv4.override { inherit ffmpeg_7; })
+ ffmpeg_7
fftw
frei0r
libdv
@@ -137,7 +137,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
- inherit ffmpeg;
+ ffmpeg = ffmpeg_7;
};
passthru.updateScript = gitUpdater {
diff --git a/pkgs/by-name/mo/moltenvk/package.nix b/pkgs/by-name/mo/moltenvk/package.nix
index 576cab57fa59c..635d6ceab8489 100644
--- a/pkgs/by-name/mo/moltenvk/package.nix
+++ b/pkgs/by-name/mo/moltenvk/package.nix
@@ -21,7 +21,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "MoltenVK";
- version = "1.3.0";
+ version = "1.4.0";
strictDeps = true;
@@ -47,10 +47,17 @@ stdenv.mkDerivation (finalAttrs: {
owner = "KhronosGroup";
repo = "MoltenVK";
rev = "v${finalAttrs.version}";
- hash = "sha256-V69P1t48XP/pAPgpVsnFeCBidhHk60XGHRkHF6AEke0=";
+ hash = "sha256-ydXyah6/J6/1Lzuv+7JnMurkqnvQPs+6Vec0uUrxGq0=";
};
postPatch = ''
+ # Update the deployment target for the minimum target used by nixpkgs.
+ while IFS= read -d "" proj; do
+ echo "Updating deployment target to ${stdenv.hostPlatform.darwinMinVersion}: $proj"
+ substituteInPlace "$proj" \
+ --replace-fail 'MACOSX_DEPLOYMENT_TARGET = 10.15' "MACOSX_DEPLOYMENT_TARGET = $MACOSX_DEPLOYMENT_TARGET"
+ done < <(grep -Z -rl --include=project.pbxproj MACOSX_DEPLOYMENT_TARGET)
+
# Move `mvkGitRevDerived.h` to a stable location
substituteInPlace Scripts/gen_moltenvk_rev_hdr.sh \
--replace-fail '$'''{BUILT_PRODUCTS_DIR}' "$NIX_BUILD_TOP/$sourceRoot/build/include" \
@@ -91,7 +98,11 @@ stdenv.mkDerivation (finalAttrs: {
'';
env.NIX_CFLAGS_COMPILE = toString (
- lib.optional (stdenv.cc.libcxx != null) "-isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"
+ # MoltenVK does its own checks for availability by probing the version at runtime and checking the MSL version.
+ [ "-Wno-error=unguarded-availability" ]
+ ++ lib.optional (
+ stdenv.cc.libcxx != null
+ ) "-isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"
++ [
"-I${lib.getDev spirv-cross}/include/spirv_cross"
"-I${lib.getDev spirv-headers}/include/spirv/unified1"
diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix
index 82447b34a4c5f..cd1bea612afa1 100644
--- a/pkgs/by-name/mu/mupdf/package.nix
+++ b/pkgs/by-name/mu/mupdf/package.nix
@@ -38,17 +38,13 @@
xcbuild,
gitUpdater,
enableBarcode ? false,
-
# for passthru.tests
cups-filters,
zathura,
mupdf,
}:
-
assert enablePython -> enableCxx;
-
let
-
freeglut-mupdf = freeglut.overrideAttrs (old: rec {
pname = "freeglut-mupdf";
version = "3.0.0-r${src.rev}";
@@ -67,16 +63,14 @@ let
--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.8";
+ version = "1.26.10";
pname = "mupdf";
src = fetchurl {
url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz";
- hash = "sha256-6NJIpmbSOG9KIBTWgLbojeXOn9jIR7DidMvswSTzPMc=";
+ hash = "sha256-FlPzW9j72XDwVSPv3H+G5B6XKOJWSjKVKW4Dz1mlFDc=";
};
patches = [
diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix
index 840ed7f1d55e9..105fb476ba33b 100644
--- a/pkgs/by-name/mu/mutter/package.nix
+++ b/pkgs/by-name/mu/mutter/package.nix
@@ -19,7 +19,6 @@
libadwaita,
libxcvt,
libGL,
- libICE,
libX11,
libXcomposite,
libXcursor,
@@ -27,8 +26,6 @@
libXext,
libXfixes,
libXi,
- libXtst,
- libxkbfile,
xkeyboard_config,
libxkbcommon,
libxcb,
@@ -39,9 +36,11 @@
libdrm,
libgbm,
libei,
+ libepoxy,
libdisplay-info,
gsettings-desktop-schemas,
glib,
+ libglycin,
atk,
gtk4,
fribidi,
@@ -72,7 +71,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mutter";
- version = "48.4";
+ version = "49.1.1";
outputs = [
"out"
@@ -83,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
- hash = "sha256-EYnPfmPMh8/dHzqG6PFNl8M9ap2iVPI+gWVVSbbFDZM=";
+ hash = "sha256-EykM/0l0EA4r/XsPrlwG+X+nXSH9xA8fXn5ILzPL0Cc=";
};
mesonFlags = [
@@ -131,6 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
cairo
egl-wayland
glib
+ libglycin
gnome-desktop
gnome-settings-daemon
gsettings-desktop-schemas
@@ -139,8 +139,10 @@ stdenv.mkDerivation (finalAttrs: {
harfbuzz
libcanberra
libdrm
+ libadwaita
libgbm
libei
+ libepoxy
libdisplay-info
libGL
libgudev
@@ -159,7 +161,6 @@ stdenv.mkDerivation (finalAttrs: {
wayland-protocols
# X11 client
gtk4
- libICE
libX11
libXcomposite
libXcursor
@@ -167,8 +168,6 @@ stdenv.mkDerivation (finalAttrs: {
libXext
libXfixes
libXi
- libXtst
- libxkbfile
xkeyboard_config
libxkbcommon
libxcb
@@ -176,8 +175,9 @@ stdenv.mkDerivation (finalAttrs: {
libXinerama
libXau
- # for gdctl shebang
+ # for gdctl and gnome-service-client shebangs
(python3.withPackages (pp: [
+ pp.dbus-python
pp.pygobject3
pp.argcomplete
]))
@@ -206,7 +206,7 @@ stdenv.mkDerivation (finalAttrs: {
doInstallCheck = true;
passthru = {
- libmutter_api_version = "16"; # bumped each dev cycle
+ libmutter_api_version = "17"; # bumped each dev cycle
libdir = "${finalAttrs.finalPackage}/lib/mutter-${finalAttrs.passthru.libmutter_api_version}";
tests = {
diff --git a/pkgs/by-name/mv/mvfst/package.nix b/pkgs/by-name/mv/mvfst/package.nix
index 01a9af81b1c86..65952f295588b 100644
--- a/pkgs/by-name/mv/mvfst/package.nix
+++ b/pkgs/by-name/mv/mvfst/package.nix
@@ -22,7 +22,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mvfst";
- version = "2025.09.15.00";
+ version = "2025.10.13.00";
outputs = [
"bin"
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "facebook";
repo = "mvfst";
tag = "v${finalAttrs.version}";
- hash = "sha256-ZgzqkR72xtO5VVd2cyMM3vSsUWdW6HEvu9T1sM+cPi8=";
+ hash = "sha256-bsg+Zqv+aEDH6r6lZazCG25Wj2zG/VSgpmEOKrb44/k=";
};
patches = [
@@ -126,6 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
ris
emily
techknowlogick
+ lf-
];
};
})
diff --git a/pkgs/by-name/na/nautilus-python/package.nix b/pkgs/by-name/na/nautilus-python/package.nix
index decd2c848b6eb..e9a76b856ad91 100644
--- a/pkgs/by-name/na/nautilus-python/package.nix
+++ b/pkgs/by-name/na/nautilus-python/package.nix
@@ -16,7 +16,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "nautilus-python";
- version = "4.0.1";
+ version = "4.1.0";
outputs = [
"out"
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/nautilus-python/${lib.versions.majorMinor finalAttrs.version}/nautilus-python-${finalAttrs.version}.tar.xz";
- hash = "sha256-/EnBBPsyoK0ZWmawE2eEzRnRDYs+jVnV7n9z6PlOko8=";
+ hash = "sha256-/EpEi8yxoJtohlQJueKu0XHSii1ayA975E9fzKhO4ME=";
};
patches = [
diff --git a/pkgs/by-name/na/nautilus/package.nix b/pkgs/by-name/na/nautilus/package.nix
index 0fad8a9d816d5..8d3924e4ee8d1 100644
--- a/pkgs/by-name/na/nautilus/package.nix
+++ b/pkgs/by-name/na/nautilus/package.nix
@@ -18,6 +18,7 @@
adwaita-icon-theme,
gnome-autoar,
glib-networking,
+ icu,
shared-mime-info,
libnotify,
libexif,
@@ -40,7 +41,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "nautilus";
- version = "48.3";
+ version = "49.1";
outputs = [
"out"
@@ -50,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz";
- hash = "sha256-IaKuoAUWDbCDx6HU0sCYm4RcxyLATvnrtgElp+xbOT0=";
+ hash = "sha256-rdKg5BD9ItooUd3QxbPSLJ6djDMRFRHzNpYeO0YbU14=";
};
patches = [
@@ -74,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
gexiv2
glib-networking
+ icu
gnome-desktop
adwaita-icon-theme
gsettings-desktop-schemas
diff --git a/pkgs/by-name/nc/nchat/package.nix b/pkgs/by-name/nc/nchat/package.nix
index 532cc91d6081d..a33295cf05714 100644
--- a/pkgs/by-name/nc/nchat/package.nix
+++ b/pkgs/by-name/nc/nchat/package.nix
@@ -13,7 +13,6 @@
gperf,
nix-update-script,
withWhatsApp ? true,
- apple-sdk_12,
}:
let
@@ -88,10 +87,6 @@ stdenv.mkDerivation rec {
readline
sqlite
zlib
- ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [
- # For SecTrustCopyCertificateChain, see https://github.com/NixOS/nixpkgs/pull/445063#pullrequestreview-3261846621
- apple-sdk_12
];
cmakeFlags = [
diff --git a/pkgs/by-name/ne/netbox_4_3/package.nix b/pkgs/by-name/ne/netbox_4_3/package.nix
index 81af0510f3aef..dc58076395989 100644
--- a/pkgs/by-name/ne/netbox_4_3/package.nix
+++ b/pkgs/by-name/ne/netbox_4_3/package.nix
@@ -121,6 +121,9 @@ py.pkgs.buildPythonApplication rec {
description = "IP address management (IPAM) and data center infrastructure management (DCIM) tool";
mainProgram = "netbox";
license = lib.licenses.asl20;
+ knownVulnerabilities = [
+ "Netbox Version ${version} is EOL; please upgrade by following the current release notes instructions"
+ ];
maintainers = with lib.maintainers; [
minijackson
raitobezarius
diff --git a/pkgs/by-name/ne/netbox_4_4/custom-static-root.patch b/pkgs/by-name/ne/netbox_4_4/custom-static-root.patch
new file mode 100644
index 0000000000000..c9219fa2b871a
--- /dev/null
+++ b/pkgs/by-name/ne/netbox_4_4/custom-static-root.patch
@@ -0,0 +1,13 @@
+diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
+index 2de06dd10..00406af48 100644
+--- a/netbox/netbox/settings.py
++++ b/netbox/netbox/settings.py
+@@ -410,7 +412,7 @@ USE_X_FORWARDED_HOST = True
+ X_FRAME_OPTIONS = 'SAMEORIGIN'
+
+ # Static files (CSS, JavaScript, Images)
+-STATIC_ROOT = BASE_DIR + '/static'
++STATIC_ROOT = getattr(configuration, 'STATIC_ROOT', os.path.join(BASE_DIR, 'static')).rstrip('/')
+ STATIC_URL = f'/{BASE_PATH}static/'
+ STATICFILES_DIRS = (
+ os.path.join(BASE_DIR, 'project-static', 'dist'),
diff --git a/pkgs/by-name/ne/netbox_4_4/package.nix b/pkgs/by-name/ne/netbox_4_4/package.nix
new file mode 100644
index 0000000000000..cd59bfeae2685
--- /dev/null
+++ b/pkgs/by-name/ne/netbox_4_4/package.nix
@@ -0,0 +1,132 @@
+{
+ lib,
+ fetchFromGitHub,
+ python3,
+ plugins ? _ps: [ ],
+ nixosTests,
+ nix-update-script,
+}:
+let
+ py = python3.override {
+ self = py;
+ packageOverrides = _final: prev: { django = prev.django_5_2; };
+ };
+
+ extraBuildInputs = plugins py.pkgs;
+in
+py.pkgs.buildPythonApplication rec {
+ pname = "netbox";
+ version = "4.4.2";
+ pyproject = false;
+
+ src = fetchFromGitHub {
+ owner = "netbox-community";
+ repo = "netbox";
+ tag = "v${version}";
+ hash = "sha256-1POwxp7BTCZo7JlGrLVGNzBGCplmhZ0Y6wujunIVGsA=";
+ };
+
+ patches = [
+ ./custom-static-root.patch
+ ];
+
+ dependencies =
+ (
+ with py.pkgs;
+ [
+ colorama
+ django
+ django-cors-headers
+ django-debug-toolbar
+ django-filter
+ django-graphiql-debug-toolbar
+ django-htmx
+ django-mptt
+ django-pglocks
+ django-prometheus
+ django-redis
+ django-rq
+ django-storages
+ django-tables2
+ django-taggit
+ django-timezone-field
+ djangorestframework
+ drf-spectacular
+ drf-spectacular-sidecar
+ feedparser
+ jinja2
+ markdown
+ netaddr
+ nh3
+ pillow
+ psycopg
+ pyyaml
+ requests
+ social-auth-core
+ social-auth-app-django
+ sorl-thumbnail
+ strawberry-graphql
+ strawberry-django
+ svgwrite
+ tablib
+
+ # Optional dependencies, kept here for backward compatibility
+
+ # for the S3 data source backend
+ boto3
+ # for Git data source backend
+ dulwich
+ # for error reporting
+ sentry-sdk
+ ]
+ ++ psycopg.optional-dependencies.c
+ ++ psycopg.optional-dependencies.pool
+ ++ social-auth-core.optional-dependencies.openidconnect
+ )
+ ++ extraBuildInputs;
+
+ nativeBuildInputs = with py.pkgs; [
+ mkdocs-material
+ mkdocs-material-extensions
+ mkdocstrings
+ mkdocstrings-python
+ ];
+
+ postBuild = ''
+ PYTHONPATH=$PYTHONPATH:netbox/
+ ${py.interpreter} -m mkdocs build
+ '';
+
+ installPhase = ''
+ mkdir -p $out/opt/netbox
+ cp -r . $out/opt/netbox
+ chmod +x $out/opt/netbox/netbox/manage.py
+ makeWrapper $out/opt/netbox/netbox/manage.py $out/bin/netbox \
+ --prefix PYTHONPATH : "$PYTHONPATH"
+ '';
+
+ passthru = {
+ python = py;
+ # PYTHONPATH of all dependencies used by the package
+ pythonPath = py.pkgs.makePythonPath dependencies;
+ inherit (py.pkgs) gunicorn;
+ tests = {
+ netbox = nixosTests.netbox_4_3;
+ inherit (nixosTests) netbox-upgrade;
+ };
+ updateScript = nix-update-script { };
+ };
+
+ meta = {
+ homepage = "https://github.com/netbox-community/netbox";
+ changelog = "https://github.com/netbox-community/netbox/blob/${src.tag}/docs/release-notes/version-${lib.versions.majorMinor version}.md";
+ description = "IP address management (IPAM) and data center infrastructure management (DCIM) tool";
+ mainProgram = "netbox";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [
+ minijackson
+ raitobezarius
+ transcaffeine
+ ];
+ };
+}
diff --git a/pkgs/by-name/ne/netclient/package.nix b/pkgs/by-name/ne/netclient/package.nix
index aa368abda7c2b..645aba44e5d14 100644
--- a/pkgs/by-name/ne/netclient/package.nix
+++ b/pkgs/by-name/ne/netclient/package.nix
@@ -21,8 +21,6 @@ buildGoModule rec {
buildInputs = lib.optional stdenv.hostPlatform.isLinux libX11;
- hardeningEnabled = [ "pie" ];
-
meta = {
description = "Automated WireGuard® Management Client";
mainProgram = "netclient";
diff --git a/pkgs/by-name/ne/networkmanager/package.nix b/pkgs/by-name/ne/networkmanager/package.nix
index 51e267cb8a288..d950c7393cc3e 100644
--- a/pkgs/by-name/ne/networkmanager/package.nix
+++ b/pkgs/by-name/ne/networkmanager/package.nix
@@ -44,6 +44,7 @@
meson,
mesonEmulatorHook,
ninja,
+ libnvme,
libpsl,
mobile-broadband-provider-info,
runtimeShell,
@@ -53,6 +54,9 @@
udev,
udevCheckHook,
withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
+ # NBFT (NVMe Boot Firmware Table) support, opt-in due to closure size
+ # https://github.com/NixOS/nixpkgs/pull/446121#discussion_r2380598419
+ withNbft ? false,
}:
let
@@ -60,11 +64,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "networkmanager";
- version = "1.52.1";
+ version = "1.54.1";
src = fetchurl {
url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/releases/${finalAttrs.version}/downloads/NetworkManager-${finalAttrs.version}.tar.xz";
- hash = "sha256-ixIsc0k6cvK65SfBJc69h3EWcbkDUtvisXiKupV1rG8=";
+ hash = "sha256-APPwvhKsTUhY6/FSQwuS3vFXSAP/YQf378dkoFbUxMc=";
};
outputs = [
@@ -107,6 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
"-Dnmtui=true"
"-Ddnsmasq=${dnsmasq}/bin/dnsmasq"
"-Dqt=false"
+ (lib.mesonBool "nbft" withNbft)
# Handlers
"-Dresolvconf=${openresolv}/bin/resolvconf"
@@ -158,6 +163,9 @@ stdenv.mkDerivation (finalAttrs: {
newt
jansson
dbus # used to get directory paths with pkg-config during configuration
+ ]
+ ++ lib.optionals withNbft [
+ libnvme
];
propagatedBuildInputs = [
diff --git a/pkgs/by-name/nl/nlohmann_json/package.nix b/pkgs/by-name/nl/nlohmann_json/package.nix
index 23b36c48cffda..d32c7366011b1 100644
--- a/pkgs/by-name/nl/nlohmann_json/package.nix
+++ b/pkgs/by-name/nl/nlohmann_json/package.nix
@@ -25,6 +25,13 @@ stdenv.mkDerivation (finalAttrs: {
};
patches = [
+ # Fix missing char8_t support
+ # https://github.com/nlohmann/json/pull/4736
+ (fetchpatch {
+ name = "fix-char8_t.patch";
+ url = "https://github.com/nlohmann/json/commit/756ca22ec5b0d89b5d107b4c30891d1293650c87.patch?full_index=1";
+ hash = "sha256-OK8FIXClj5paZNiEvPwJWr5PxyVYtJ3zkRlcZoe8d20=";
+ })
# 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
diff --git a/pkgs/by-name/nt/ntp/package.nix b/pkgs/by-name/nt/ntp/package.nix
index 3f1fb3134c68b..fcf00bce2845e 100644
--- a/pkgs/by-name/nt/ntp/package.nix
+++ b/pkgs/by-name/nt/ntp/package.nix
@@ -45,8 +45,6 @@ stdenv.mkDerivation rec {
libcap
];
- hardeningEnable = [ "pie" ];
-
postInstall = ''
rm -rf $out/share/doc
'';
diff --git a/pkgs/by-name/on/onetbb/package.nix b/pkgs/by-name/on/onetbb/package.nix
index ad181f1464ca6..f820dc7a80acd 100644
--- a/pkgs/by-name/on/onetbb/package.nix
+++ b/pkgs/by-name/on/onetbb/package.nix
@@ -12,7 +12,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "onetbb";
- version = "2022.2.0";
+ version = "2022.3.0";
outputs = [
"out"
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "oneapi-src";
repo = "oneTBB";
tag = "v${finalAttrs.version}";
- hash = "sha256-ASQPAGm5e4q7imvTVWlmj5ON4fGEao1L5m2C5wF7EhI=";
+ hash = "sha256-HIHF6KHlEI4rgQ9Epe0+DmNe1y95K9iYa4V/wFnJfEU=";
};
patches = [
@@ -39,18 +39,6 @@ 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 = [
diff --git a/pkgs/by-name/op/openjpeg/package.nix b/pkgs/by-name/op/openjpeg/package.nix
index 4e6920fa3d409..8d4ca00ca6dfb 100644
--- a/pkgs/by-name/op/openjpeg/package.nix
+++ b/pkgs/by-name/op/openjpeg/package.nix
@@ -34,36 +34,21 @@ let
test-data = fetchFromGitHub {
owner = "uclouvain";
repo = "openjpeg-data";
- rev = "a428429db695fccfc6d698bd13b6937dffd9d005";
- hash = "sha256-udUi7sPNQJ5uCIAM8SqMGee6vRj1QbF9pLjdpNTQE5k=";
+ rev = "39524bd3a601d90ed8e0177559400d23945f96a9";
+ hash = "sha256-ckZHCZV5UJicVUoi/mZDwvCJneXC3X+NA8Byp6GLE0w=";
};
in
stdenv.mkDerivation rec {
pname = "openjpeg";
- version = "2.5.2";
+ version = "2.5.4";
src = fetchFromGitHub {
owner = "uclouvain";
repo = "openjpeg";
rev = "v${version}";
- hash = "sha256-mQ9B3MJY2/bg0yY/7jUJrAXM6ozAHT5fmwES5Q1SGxw=";
+ hash = "sha256-HSXGdpHUbwlYy5a+zKpcLo2d+b507Qf5nsaMghVBlZ8=";
};
- patches = [
- (fetchpatch {
- # https://github.com/uclouvain/openjpeg/issues/1564
- name = "CVE-2024-56826_ISSUE1564.patch";
- url = "https://github.com/uclouvain/openjpeg/commit/e492644fbded4c820ca55b5e50e598d346e850e8.patch";
- hash = "sha256-v+odu4/MXRA+RKOlPO+m/Xk66BMH6mOcEN4ScHn3VAo=";
- })
- (fetchpatch {
- # https://github.com/uclouvain/openjpeg/issues/1563
- name = "CVE-2024-56826_ISSUE1563.patch";
- url = "https://github.com/uclouvain/openjpeg/commit/98592ee6d6904f1b48e8207238779b89a63befa2.patch";
- hash = "sha256-1ScnEZAPuvclyRME5kbeo7dBMG31Njs5CaYC4sGyx08=";
- })
- ];
-
outputs = [
"out"
"dev"
diff --git a/pkgs/by-name/op/openrct2/package.nix b/pkgs/by-name/op/openrct2/package.nix
index c25a9e238739d..5285de166ca2a 100644
--- a/pkgs/by-name/op/openrct2/package.nix
+++ b/pkgs/by-name/op/openrct2/package.nix
@@ -34,14 +34,14 @@
}:
let
- openrct2-version = "0.4.26";
+ openrct2-version = "0.4.28";
# Those versions MUST match the pinned versions within the CMakeLists.txt
# file. The REPLAYS repository from the CMakeLists.txt is not necessary.
objects-version = "1.7.3";
openmsx-version = "1.6.1";
opensfx-version = "1.0.6";
- title-sequences-version = "0.4.14";
+ title-sequences-version = "0.4.26";
objects = fetchurl {
url = "https://github.com/OpenRCT2/objects/releases/download/v${objects-version}/objects.zip";
@@ -57,7 +57,7 @@ let
};
title-sequences = fetchurl {
url = "https://github.com/OpenRCT2/title-sequences/releases/download/v${title-sequences-version}/title-sequences.zip";
- hash = "sha256-FA33FOgG/tQRzEl2Pn8WsPzypIelcAHR5Q/Oj5FIqfM=";
+ hash = "sha256-2ruXh7FXY0L8pN2fZLP4z6BKfmzpwruWEPR7dikFyFg=";
};
in
stdenv.mkDerivation (finalAttrs: {
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "OpenRCT2";
repo = "OpenRCT2";
tag = "v${openrct2-version}";
- hash = "sha256-C6DK1gT/QSgI5ZDyg2FWf9H/BMskS9N2mVMaVb643PE=";
+ hash = "sha256-/sgvlfJ3aMqpv5hJNzmnpOq7Bx0BTtGzLOMKGA543O8=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/or/orca/fix-paths.patch b/pkgs/by-name/or/orca/fix-paths.patch
index 49b5cc34ac890..49142eed47d96 100644
--- a/pkgs/by-name/or/orca/fix-paths.patch
+++ b/pkgs/by-name/or/orca/fix-paths.patch
@@ -1,18 +1,18 @@
diff --git a/src/orca/ax_utilities_application.py b/src/orca/ax_utilities_application.py
-index 60c172f78..e8dadf76d 100644
+index dbaca2e48..80f2640d4 100644
--- a/src/orca/ax_utilities_application.py
+++ b/src/orca/ax_utilities_application.py
-@@ -189,7 +189,7 @@ class AXUtilitiesApplication:
+@@ -188,7 +188,7 @@ class AXUtilitiesApplication:
pid = AXUtilitiesApplication.get_process_id(app)
try:
- state = subprocess.getoutput(f"cat /proc/{pid}/status | grep State")
+ state = subprocess.getoutput(f"@cat@ /proc/{pid}/status | @grep@ State")
state = state.split()[1]
- except Exception as error:
+ except (GLib.GError, IndexError) as error:
tokens = [f"AXUtilitiesApplication: Exception checking state of pid {pid}: {error}"]
diff --git a/src/orca/debugging_tools_manager.py b/src/orca/debugging_tools_manager.py
-index 740f1a690..85f74d2dc 100644
+index b4abce719..cff5a78a6 100644
--- a/src/orca/debugging_tools_manager.py
+++ b/src/orca/debugging_tools_manager.py
@@ -243,7 +243,7 @@ class DebuggingToolsManager:
@@ -21,22 +21,22 @@ index 740f1a690..85f74d2dc 100644
try:
- cmdline = subprocess.getoutput(f"cat /proc/{pid}/cmdline")
+ cmdline = subprocess.getoutput(f"@cat@ /proc/{pid}/cmdline")
- except Exception as error:
+ except subprocess.SubprocessError as error:
cmdline = f"EXCEPTION: {error}"
else:
diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in
-index 6cb4c7772..903b344f0 100755
+index 3fc845dc3..a82947911 100755
--- a/src/orca/orca_bin.py.in
+++ b/src/orca/orca_bin.py.in
-@@ -186,7 +186,7 @@ def inGraphicalDesktop():
- def otherOrcas():
+@@ -238,7 +238,7 @@ def in_graphical_desktop() -> bool:
+ def other_orcas() -> list[int]:
"""Returns the pid of any other instances of Orca owned by this user."""
-- openFile = subprocess.Popen('pgrep -u %s -x orca' % os.getuid(),
-+ openFile = subprocess.Popen('@pgrep@ -u %s -x orca' % os.getuid(),
- shell=True,
- stdout=subprocess.PIPE).stdout
- pids = openFile.read()
+- with subprocess.Popen(f"pgrep -u {os.getuid()} -x orca",
++ with subprocess.Popen(f"@pgrep@ -u {os.getuid()} -x orca",
+ shell=True,
+ stdout=subprocess.PIPE) as proc:
+ pids = proc.stdout.read() if proc.stdout else b""
diff --git a/src/orca/orca_modifier_manager.py b/src/orca/orca_modifier_manager.py
index 3407be009..452297a3f 100644
--- a/src/orca/orca_modifier_manager.py
diff --git a/pkgs/by-name/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix
index 34a51734082a9..a76c4f54d48b3 100644
--- a/pkgs/by-name/or/orca/package.nix
+++ b/pkgs/by-name/or/orca/package.nix
@@ -29,13 +29,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "orca";
- version = "48.6";
+ version = "49.4";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/orca/${lib.versions.major version}/orca-${version}.tar.xz";
- hash = "sha256-7cUDRODf1yR2tcFLOqclyiaHGOpt2JvE7ib0ULM51pY=";
+ hash = "sha256-trpMxYeEEcNKfVt+6bLFybHQSt0Qv9IPbiMx1ZQWUgc=";
};
patches = [
@@ -59,6 +59,7 @@ python3.pkgs.buildPythonApplication rec {
];
pythonPath = with python3.pkgs; [
+ dasbus
pygobject3
dbus-python
pyxdg
diff --git a/pkgs/by-name/p1/p11-kit/package.nix b/pkgs/by-name/p1/p11-kit/package.nix
index d770115b423d3..bbdf20b66a936 100644
--- a/pkgs/by-name/p1/p11-kit/package.nix
+++ b/pkgs/by-name/p1/p11-kit/package.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "p11-kit";
- version = "0.25.9";
+ version = "0.25.10";
src = fetchFromGitHub {
owner = "p11-glue";
repo = "p11-kit";
tag = version;
- hash = "sha256-lvm//lsG5xSz1dBuvp4bJvNS+zCYTuAqXC22Po95JJg=";
+ hash = "sha256-srZyY14PqPoPMcEj/3WWEPrBuCcAGibvziKgZV1vxO8=";
fetchSubmodules = true;
};
diff --git a/pkgs/by-name/pa/pango/package.nix b/pkgs/by-name/pa/pango/package.nix
index aa2a81bfe635b..42227dd4fc387 100644
--- a/pkgs/by-name/pa/pango/package.nix
+++ b/pkgs/by-name/pa/pango/package.nix
@@ -29,7 +29,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pango";
- version = "1.56.4";
+ version = "1.57.0";
outputs = [
"bin"
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/pango/${lib.versions.majorMinor finalAttrs.version}/pango-${finalAttrs.version}.tar.xz";
- hash = "sha256-FwZeL8xfWlvb/8iEyVa/x8RRqW6MT7L4rYN8ZBPLWgE=";
+ hash = "sha256-iQZAyEHa530649j+iVN4S5MPokGxdCPmEgx7/fi4kec=";
};
depsBuildBuild = [
diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix
index c3dbc70c19834..5285fd8282118 100644
--- a/pkgs/by-name/pa/papers/package.nix
+++ b/pkgs/by-name/pa/papers/package.nix
@@ -6,6 +6,7 @@
ninja,
pkg-config,
appstream,
+ blueprint-compiler,
desktop-file-utils,
gtk4,
glib,
@@ -33,11 +34,14 @@
exempi,
cargo,
rustPlatform,
+ _experimental-update-script-combinators,
+ common-updater-scripts,
+ gnome,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "papers";
- version = "48.5";
+ version = "49.1";
outputs = [
"out"
@@ -47,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/papers/${lib.versions.major finalAttrs.version}/papers-${finalAttrs.version}.tar.xz";
- hash = "sha256-DMjXLHHT2KqxvhCuGUGkzZLNHip+gwq3aA4sgt+xnAs=";
+ hash = "sha256-SrI6Z4l73da+LWKYIQ//YCz+wPNWiLxb/ycDYLB4TCk=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
@@ -56,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
pname
version
;
- hash = "sha256-1HFecOTn84m9lT166HlmYjqP+KN/ZOTWW4ztigrpqNQ=";
+ hash = "sha256-Pjhpo44Zau2z6aWEQEcIPy3aUYplwdF/XIkO/1Zl+kg=";
};
nativeBuildInputs = [
@@ -71,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
wrapGAppsHook4
yelp-tools
cargo
+ blueprint-compiler
rustPlatform.cargoSetupHook
];
@@ -109,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;
postPatch = ''
- substituteInPlace shell/src/meson.build --replace-fail \
+ substituteInPlace shell/src/meson.build thumbnailer/meson.build --replace-fail \
"meson.current_build_dir() / rust_target / meson.project_name()" \
"meson.current_build_dir() / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()"
'';
@@ -133,6 +138,36 @@ stdenv.mkDerivation (finalAttrs: {
moveToOutput "share/doc" "$devdoc"
'';
+ passthru = {
+ updateScript =
+ let
+ updateSource = gnome.updateScript {
+ packageName = "papers";
+ };
+
+ updateLockfile = {
+ command = [
+ "sh"
+ "-c"
+ ''
+ PATH=${
+ lib.makeBinPath [
+ common-updater-scripts
+ ]
+ }
+ update-source-version papers --ignore-same-version --source-key=cargoDeps.vendorStaging > /dev/null
+ ''
+ ];
+ # Experimental feature: do not copy!
+ supportedFeatures = [ "silent" ];
+ };
+ in
+ _experimental-update-script-combinators.sequence [
+ updateSource
+ updateLockfile
+ ];
+ };
+
meta = with lib; {
homepage = "https://gitlab.gnome.org/GNOME/papers";
changelog = "https://gitlab.gnome.org/GNOME/papers/-/blob/${finalAttrs.version}/NEWS?ref_type=tags";
diff --git a/pkgs/by-name/pd/pdfmixtool/package.nix b/pkgs/by-name/pd/pdfmixtool/package.nix
new file mode 100644
index 0000000000000..59c43ddb578fa
--- /dev/null
+++ b/pkgs/by-name/pd/pdfmixtool/package.nix
@@ -0,0 +1,46 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitLab,
+ cmake,
+ pkg-config,
+ qt6Packages,
+ qpdf,
+ podofo,
+ imagemagick,
+}:
+
+stdenv.mkDerivation rec {
+ pname = "pdfmixtool";
+ version = "1.2.1";
+
+ src = fetchFromGitLab {
+ owner = "scarpetta";
+ repo = "pdfmixtool";
+ rev = "v${version}";
+ hash = "sha256-UuRTMLlUIyo2RF+XjI229kkE67ybmllIy98p97PjWCE=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ qt6Packages.wrapQtAppsHook
+ ];
+
+ buildInputs = [
+ imagemagick
+ qt6Packages.poppler
+ qt6Packages.qtbase
+ qt6Packages.qttools
+ qpdf
+ podofo
+ ];
+
+ meta = with lib; {
+ description = "Application to split, merge, rotate and mix PDF files";
+ mainProgram = "pdfmixtool";
+ homepage = "https://gitlab.com/scarpetta/pdfmixtool";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ onny ];
+ };
+}
diff --git a/pkgs/by-name/po/polari/package.nix b/pkgs/by-name/po/polari/package.nix
index 7703671c93191..70ee17118cf97 100644
--- a/pkgs/by-name/po/polari/package.nix
+++ b/pkgs/by-name/po/polari/package.nix
@@ -3,6 +3,7 @@
lib,
itstool,
fetchurl,
+ fetchpatch,
gdk-pixbuf,
telepathy-glib,
gjs,
@@ -42,6 +43,13 @@ stdenv.mkDerivation rec {
# If we wrap it in a shell script, gjs can no longer run it.
# Let’s change the code to run the script directly by making it executable and having gjs in shebang.
./make-thumbnailer-wrappable.patch
+
+ # Switch to girepository-2.0
+ # https://gitlab.gnome.org/GNOME/polari/-/merge_requests/356
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/polari/-/commit/d7946c7fe39f112cd3f751bb95b170446022980d.patch";
+ hash = "sha256-naRzZ5Iple11HJ+d8DL9oJy3C4VKLkz+FdMuhO7sc7k=";
+ })
];
propagatedUserEnvPkgs = [ telepathy-idle ];
diff --git a/pkgs/by-name/po/ponyc/package.nix b/pkgs/by-name/po/ponyc/package.nix
index bee369fbb2cb5..1363bb316ed89 100644
--- a/pkgs/by-name/po/ponyc/package.nix
+++ b/pkgs/by-name/po/ponyc/package.nix
@@ -3,10 +3,9 @@
nix-update-script,
stdenv,
fetchFromGitHub,
- apple-sdk_13,
+ apple-sdk,
cmake,
coreutils,
- darwinMinVersionHook,
libxml2,
lto ? true,
makeWrapper,
@@ -59,9 +58,6 @@ stdenv.mkDerivation rec {
git
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
- # Keep in sync with `PONY_OSX_PLATFORM`.
- apple-sdk_13
- (darwinMinVersionHook "13.0")
cctools.libtool
];
@@ -77,7 +73,7 @@ stdenv.mkDerivation rec {
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
(replaceVars ./fix-darwin-build.patch {
- apple-sdk = apple-sdk_13;
+ inherit apple-sdk;
})
];
diff --git a/pkgs/by-name/po/postfix/package.nix b/pkgs/by-name/po/postfix/package.nix
index e801abfa0c049..ffabc89ef7a5a 100644
--- a/pkgs/by-name/po/postfix/package.nix
+++ b/pkgs/by-name/po/postfix/package.nix
@@ -100,7 +100,6 @@ stdenv.mkDerivation rec {
++ lib.optional withTLSRPT libtlsrpt;
hardeningDisable = [ "format" ];
- hardeningEnable = [ "pie" ];
patches = [
./postfix-script-shell.patch
diff --git a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
index c08ca124feae4..c7c579ad6f35b 100644
--- a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
+++ b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
@@ -74,8 +74,6 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optional gamemodeSupport gamemode;
- hardeningEnable = lib.optionals stdenv.hostPlatform.isLinux [ "pie" ];
-
cmakeFlags = [
# downstream branding
(lib.cmakeFeature "Launcher_BUILD_PLATFORM" "nixpkgs")
diff --git a/pkgs/by-name/pu/publicsuffix-list/package.nix b/pkgs/by-name/pu/publicsuffix-list/package.nix
index 491b7adaa8ed1..1edfa926dd478 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-08-28";
+ version = "0-unstable-2025-10-08";
src = fetchFromGitHub {
owner = "publicsuffix";
repo = "list";
- rev = "4103956c4300902436b03d7da482536e757b3601";
- hash = "sha256-QIjDAbPfbdV+V4RV6v8/85YTxiRbXLBlulObXpkPmxQ=";
+ rev = "ee7dec4a99602baaf51879dd8469b6642881a494";
+ hash = "sha256-IlR3dICad9EZeizI3V0A1YCQZiV/xg2GxtmTLG4EASU=";
};
dontBuild = true;
diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix
index dea2ba75cea09..99f9dbab65304 100644
--- a/pkgs/by-name/py/pyright/package.nix
+++ b/pkgs/by-name/py/pyright/package.nix
@@ -7,13 +7,13 @@
}:
let
- version = "1.1.406";
+ version = "1.1.407";
src = fetchFromGitHub {
owner = "Microsoft";
repo = "pyright";
tag = version;
- hash = "sha256-hSPnUjIZf9od1u7PwgEFDXGWmizjdqSiXjb45wZIM9Q=";
+ hash = "sha256-TQrmA65CzXar++79DLRWINaMsjoqNFdvNlwDzAcqOjM=";
};
patchedPackageJSON = runCommand "package.json" { } ''
@@ -44,7 +44,7 @@ let
pname = "pyright-internal";
inherit version src;
sourceRoot = "${src.name}/packages/pyright-internal";
- npmDepsHash = "sha256-BzyZEJUOEqPBpPrVNhf/kDOBS3Q4Hgkpfz+JDccHr4g=";
+ npmDepsHash = "sha256-0czcnWOgIp/KtqBts908r4vGgMuwFLvIom89v+uCzpk=";
dontNpmBuild = true;
installPhase = ''
runHook preInstall
@@ -58,7 +58,7 @@ buildNpmPackage rec {
inherit version src;
sourceRoot = "${src.name}/packages/pyright";
- npmDepsHash = "sha256-Ye8r7m4755GfU74G8Neetu+BlrHQWoQe7y2TyOjvBOo=";
+ npmDepsHash = "sha256-NyZAvboojw9gTj52WrdNIL2Oyy2wtpVnb5JyxKLJqWM=";
postPatch = ''
chmod +w ../../
diff --git a/pkgs/by-name/qp/qpdf/package.nix b/pkgs/by-name/qp/qpdf/package.nix
index 82c7ded43f252..e5f5ccc8df142 100644
--- a/pkgs/by-name/qp/qpdf/package.nix
+++ b/pkgs/by-name/qp/qpdf/package.nix
@@ -19,13 +19,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qpdf";
- version = "11.10.1";
+ version = "12.2.0";
src = fetchFromGitHub {
owner = "qpdf";
repo = "qpdf";
- rev = "v${finalAttrs.version}";
- hash = "sha256-MkJpbAIoPZmsYupOjQKOwZomh/rUF+r/kKTdHfT5Dc8=";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-tzOZVQ/XO2mWNtz3mFTdrpdD2PvvCwje5nbEyiIkcZw=";
};
outputs = [
@@ -88,10 +88,10 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://qpdf.sourceforge.io/";
description = "C++ library and set of programs that inspect and manipulate the structure of PDF files";
license = lib.licenses.asl20; # as of 7.0.0, people may stay at artistic2
- maintainers = [ ];
+ maintainers = [ lib.maintainers.dotlambda ];
mainProgram = "qpdf";
platforms = lib.platforms.all;
- changelog = "https://github.com/qpdf/qpdf/blob/v${finalAttrs.version}/ChangeLog";
+ changelog = "https://qpdf.readthedocs.io/en/${lib.versions.majorMinor finalAttrs.version}/release-notes.html";
pkgConfigModules = [ "libqpdf" ];
};
})
diff --git a/pkgs/by-name/qu/quadrapassel/package.nix b/pkgs/by-name/qu/quadrapassel/package.nix
index 0efef1f7a502f..b88d2343b3b76 100644
--- a/pkgs/by-name/qu/quadrapassel/package.nix
+++ b/pkgs/by-name/qu/quadrapassel/package.nix
@@ -3,71 +3,68 @@
lib,
fetchurl,
pkg-config,
- gtk3,
+ gtk4,
+ libadwaita,
+ libgee,
+ pango,
gnome,
- adwaita-icon-theme,
gdk-pixbuf,
librsvg,
gsound,
libmanette,
- gettext,
itstool,
- libxml2,
- clutter,
- clutter-gtk,
- wrapGAppsHook3,
+ blueprint-compiler,
+ wrapGAppsHook4,
meson,
ninja,
- python3,
vala,
desktop-file-utils,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "quadrapassel";
- version = "40.2";
+ version = "49.1";
src = fetchurl {
- url = "mirror://gnome/sources/quadrapassel/${lib.versions.major version}/quadrapassel-${version}.tar.xz";
- hash = "sha256-C9giQUIHxzEj7WpJ9yPaWsjdTfXTXtwJn/6i4TmcwAo=";
+ url = "mirror://gnome/sources/quadrapassel/${lib.versions.major finalAttrs.version}/quadrapassel-${finalAttrs.version}.tar.xz";
+ hash = "sha256-ttejtndabcTxmAvZN4MkZmF6iX7KoQmPOixZvhdhZQk=";
};
nativeBuildInputs = [
meson
ninja
- python3
vala
desktop-file-utils
pkg-config
- adwaita-icon-theme
- libxml2
itstool
- gettext
- wrapGAppsHook3
+ blueprint-compiler
+ wrapGAppsHook4
];
buildInputs = [
- gtk3
+ gtk4
+ libadwaita
+ libgee
+ pango
gdk-pixbuf
librsvg
libmanette
gsound
- clutter
- libxml2
- clutter-gtk
];
passthru = {
- updateScript = gnome.updateScript { packageName = "quadrapassel"; };
+ updateScript = gnome.updateScript {
+ packageName = "quadrapassel";
+ };
};
meta = {
description = "Classic falling-block game, Tetris";
mainProgram = "quadrapassel";
homepage = "https://gitlab.gnome.org/GNOME/quadrapassel";
- changelog = "https://gitlab.gnome.org/GNOME/quadrapassel/-/blob/${version}/NEWS?ref_type=tags";
+ changelog = "https://gitlab.gnome.org/GNOME/quadrapassel/-/blob/${finalAttrs.version}/NEWS?ref_type=tags";
license = lib.licenses.gpl2Plus;
teams = [ lib.teams.gnome ];
platforms = lib.platforms.linux;
};
-}
+})
diff --git a/pkgs/by-name/rd/rdma-core/package.nix b/pkgs/by-name/rd/rdma-core/package.nix
index c3fe8d64bdaa2..6eeab6eed2ac0 100644
--- a/pkgs/by-name/rd/rdma-core/package.nix
+++ b/pkgs/by-name/rd/rdma-core/package.nix
@@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rdma-core";
- version = "59.0";
+ version = "60.0";
src = fetchFromGitHub {
owner = "linux-rdma";
repo = "rdma-core";
rev = "v${finalAttrs.version}";
- hash = "sha256-GSARu2HNej4tI62RjLWkjS+5FKVbeNmX7jh0atlEpX0=";
+ hash = "sha256-2V8I/kcOr+/5JxyIAln/r7NnL6bET3vUPgg7PGNe1vc=";
};
strictDeps = true;
diff --git a/pkgs/by-name/re/re2/package.nix b/pkgs/by-name/re/re2/package.nix
index 28e9bb9432b0d..faa843290e1c7 100644
--- a/pkgs/by-name/re/re2/package.nix
+++ b/pkgs/by-name/re/re2/package.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru.tests = {
inherit chromium grpc mercurial;
- inherit (python3Packages) fb-re2 google-re2;
+ inherit (python3Packages) google-re2;
haskell-re2 = haskellPackages.re2;
};
diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix
index 48eccfc821eb5..bf25ebe52b1d5 100644
--- a/pkgs/by-name/re/redis/package.nix
+++ b/pkgs/by-name/re/redis/package.nix
@@ -66,8 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
enableParallelBuilding = true;
- hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ];
-
env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isFreeBSD "-lexecinfo";
# darwin currently lacks a pure `pgrep` which is extensively used here
diff --git a/pkgs/by-name/re/retroarch-bare/package.nix b/pkgs/by-name/re/retroarch-bare/package.nix
index 44fa61e1b9475..266ac84cbdf91 100644
--- a/pkgs/by-name/re/retroarch-bare/package.nix
+++ b/pkgs/by-name/re/retroarch-bare/package.nix
@@ -5,7 +5,7 @@
alsa-lib,
dbus,
fetchFromGitHub,
- ffmpeg,
+ ffmpeg_7,
flac,
freetype,
gamemode,
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
++ lib.optional (runtimeLibs != [ ]) makeBinaryWrapper;
buildInputs = [
- ffmpeg
+ ffmpeg_7
flac
freetype
libGL
diff --git a/pkgs/by-name/rh/rhythmbox/package.nix b/pkgs/by-name/rh/rhythmbox/package.nix
index 12696be0fd5f2..0bf1975d40742 100644
--- a/pkgs/by-name/rh/rhythmbox/package.nix
+++ b/pkgs/by-name/rh/rhythmbox/package.nix
@@ -2,6 +2,7 @@
stdenv,
lib,
fetchurl,
+ fetchpatch,
pkg-config,
meson,
ninja,
@@ -46,6 +47,21 @@ stdenv.mkDerivation rec {
sha256 = "5CKRoY33oh/+azUr9z8F1+KYu04FvOWWf5jujO5ECPE=";
};
+ patches = [
+ # Add support for girepository 2.0
+ # https://gitlab.gnome.org/GNOME/rhythmbox/-/issues/2113
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/rhythmbox/-/commit/0cc5960f8ae516967515554eaa89faa9796701c5.patch";
+ hash = "sha256-IAOaQBDCyRkzzrxwdYQKm8Si8sn5yeBFWqKbe5mUU6k=";
+ })
+ ];
+
+ postPatch = ''
+ # We backported girepository-2.0 support to libpeas 1.36
+ substituteInPlace meson.build \
+ --replace-fail "and libpeas.version() > '1.36'" ""
+ '';
+
nativeBuildInputs = [
pkg-config
meson
diff --git a/pkgs/by-name/rs/rspamd/package.nix b/pkgs/by-name/rs/rspamd/package.nix
index 3159e749318e7..86ebff4bccfdf 100644
--- a/pkgs/by-name/rs/rspamd/package.nix
+++ b/pkgs/by-name/rs/rspamd/package.nix
@@ -56,8 +56,6 @@ stdenv.mkDerivation rec {
})
];
- hardeningEnable = [ "pie" ];
-
nativeBuildInputs = [
cmake
pkg-config
diff --git a/pkgs/by-name/rs/rstudio/package.nix b/pkgs/by-name/rs/rstudio/package.nix
index 94ee478ea25fa..510a1a39eebb6 100644
--- a/pkgs/by-name/rs/rstudio/package.nix
+++ b/pkgs/by-name/rs/rstudio/package.nix
@@ -24,7 +24,6 @@
yarnConfigHook,
zip,
- apple-sdk_11,
boost187,
electron_37,
fontconfig,
@@ -160,9 +159,6 @@ stdenv.mkDerivation rec {
soci
sqlite.dev
]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [
- apple-sdk_11
- ]
++ lib.optionals (!server) [
fontconfig
]
diff --git a/pkgs/by-name/ru/rust-cbindgen/package.nix b/pkgs/by-name/ru/rust-cbindgen/package.nix
index 57b3004ecc255..0190edf76fea5 100644
--- a/pkgs/by-name/ru/rust-cbindgen/package.nix
+++ b/pkgs/by-name/ru/rust-cbindgen/package.nix
@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage rec {
pname = "rust-cbindgen";
- version = "0.29.0";
+ version = "0.29.2";
src = fetchFromGitHub {
owner = "mozilla";
repo = "cbindgen";
rev = "v${version}";
- hash = "sha256-wCl2GpHqF7wKIE8UFyZRY0M1hxonZek2FN6+5x/jGWI=";
+ hash = "sha256-P2A+XSLrcuYsI48gnZSNNs5qX+EatiuEJSEJbMvMSxg=";
};
- cargoHash = "sha256-BErgOnmatxpfF5Ip44WOqnEWOzOJaVP6vfhXPsF9wuc=";
+ cargoHash = "sha256-DbmlpjiOraLWPh5RgJqCIGIYzE1h82MH2S6gpLH+CIQ=";
nativeCheckInputs = [
cmake
diff --git a/pkgs/by-name/ry/rygel/package.nix b/pkgs/by-name/ry/rygel/package.nix
index ee3bb60d93105..d1b8b42e588e0 100644
--- a/pkgs/by-name/ry/rygel/package.nix
+++ b/pkgs/by-name/ry/rygel/package.nix
@@ -11,7 +11,7 @@
libxml2,
libxslt,
gobject-introspection,
- wrapGAppsHook3,
+ wrapGAppsHook4,
wrapGAppsNoGuiHook,
python3,
gdk-pixbuf,
@@ -25,7 +25,7 @@
libsoup_3,
libX11,
withGtk ? true,
- gtk3,
+ gtk4,
libmediaart,
pipewire,
sqlite,
@@ -38,7 +38,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rygel";
- version = "0.44.2";
+ version = "45.0";
# TODO: split out lib
outputs = [
@@ -47,8 +47,8 @@ stdenv.mkDerivation (finalAttrs: {
];
src = fetchurl {
- url = "mirror://gnome/sources/rygel/${lib.versions.majorMinor finalAttrs.version}/rygel-${finalAttrs.version}.tar.xz";
- hash = "sha256-eW7uSUzfYNwr+CsAuPmaFLocfPQNKUSBf/DBqmBz1aA=";
+ url = "mirror://gnome/sources/rygel/${lib.versions.major finalAttrs.version}/rygel-${finalAttrs.version}.tar.xz";
+ hash = "sha256-gmZ7kC/AZy5kz5HrcnpwE3qP3+ej2aTBWLD0sfxwCII=";
};
patches = [
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
libxml2
libxslt # for xsltproc
gobject-introspection
- (if withGtk then wrapGAppsHook3 else wrapGAppsNoGuiHook)
+ (if withGtk then wrapGAppsHook4 else wrapGAppsNoGuiHook)
python3
];
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
tinysparql
shared-mime-info
]
- ++ lib.optionals withGtk [ gtk3 ]
+ ++ lib.optionals withGtk [ gtk4 ]
++ (with gst_all_1; [
gstreamer
gst-editing-services
diff --git a/pkgs/by-name/s2/s2n-tls/package.nix b/pkgs/by-name/s2/s2n-tls/package.nix
index f4d0276b9f252..3671fa7e321e4 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.26";
+ version = "1.5.27";
src = fetchFromGitHub {
owner = "aws";
repo = "s2n-tls";
rev = "v${version}";
- hash = "sha256-6Py1ygHinx3n7k/hQN+85C57YXh7ag0OGYR+NOnx1rE=";
+ hash = "sha256-aJRw1a/XJivNZS3NkZ4U6nC12+wY/aoNv33mbAzNl0k=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/sc/screen-pipe/package.nix b/pkgs/by-name/sc/screen-pipe/package.nix
index a54576c598a12..c26a380f77f5d 100644
--- a/pkgs/by-name/sc/screen-pipe/package.nix
+++ b/pkgs/by-name/sc/screen-pipe/package.nix
@@ -11,7 +11,6 @@
stdenv,
alsa-lib,
xorg,
- apple-sdk_12,
}:
rustPlatform.buildRustPackage rec {
pname = "screen-pipe";
@@ -48,9 +47,6 @@ rustPlatform.buildRustPackage rec {
openssl
sqlite
]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [
- apple-sdk_12
- ]
++ lib.optionals stdenv.hostPlatform.isLinux [
alsa-lib
xorg.libxcb
diff --git a/pkgs/by-name/sd/sdcc/package.nix b/pkgs/by-name/sd/sdcc/package.nix
index 47921b2f32833..d96e7a9882156 100644
--- a/pkgs/by-name/sd/sdcc/package.nix
+++ b/pkgs/by-name/sd/sdcc/package.nix
@@ -104,10 +104,6 @@ stdenv.mkDerivation (finalAttrs: {
fi
'';
- # ${src}/support/cpp/gcc/Makefile.in states:
- # We don't want to compile the compilers with -fPIE, it make PCH fail.
- hardeningDisable = [ "pie" ];
-
meta = {
homepage = "https://sdcc.sourceforge.net/";
description = "Small Device C Compiler";
diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix
index e8890a344cfad..0aec5ddf963f8 100644
--- a/pkgs/by-name/sd/sdl2-compat/package.nix
+++ b/pkgs/by-name/sd/sdl2-compat/package.nix
@@ -30,13 +30,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "sdl2-compat";
- version = "2.32.56";
+ version = "2.32.58";
src = fetchFromGitHub {
owner = "libsdl-org";
repo = "sdl2-compat";
tag = "release-${finalAttrs.version}";
- hash = "sha256-Xg886KX54vwGANIhTAFslzPw/sZs2SvpXzXUXcOKgMs=";
+ hash = "sha256-Ngmr/KG5dQ1IDVafn2Jw/29hFCzPGKc9GOenT/4fsIM=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix
index 17a3d9c068606..0e5feb85776ad 100644
--- a/pkgs/by-name/sd/sdl3/package.nix
+++ b/pkgs/by-name/sd/sdl3/package.nix
@@ -3,7 +3,6 @@
stdenv,
config,
alsa-lib,
- apple-sdk_11,
cmake,
darwinMinVersionHook,
dbus,
@@ -62,7 +61,7 @@ assert lib.assertMsg (ibusSupport -> dbusSupport) "SDL3 requires dbus support to
stdenv.mkDerivation (finalAttrs: {
pname = "sdl3";
- version = "3.2.24";
+ version = "3.2.26";
outputs = [
"lib"
@@ -75,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "libsdl-org";
repo = "SDL";
tag = "release-${finalAttrs.version}";
- hash = "sha256-LUkj9Rrf+zOW0IdV7aGccb/5bKh3TWf1IGtQkCDHd4k=";
+ hash = "sha256-edcub/zeho4mB3tItp+PSD5l+H6jUPm3seiBP6ppT0k=";
};
postPatch =
@@ -144,12 +143,6 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optional (openglSupport && !stdenv.hostPlatform.isDarwin) libGL
++ 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
diff --git a/pkgs/by-name/sd/sdrangel/package.nix b/pkgs/by-name/sd/sdrangel/package.nix
index 8f91a991b0245..562220f0386a7 100644
--- a/pkgs/by-name/sd/sdrangel/package.nix
+++ b/pkgs/by-name/sd/sdrangel/package.nix
@@ -3,7 +3,6 @@
stdenv,
airspy,
airspyhf,
- apple-sdk_12,
aptdec,
boost,
cm256cc,
@@ -102,7 +101,6 @@ stdenv.mkDerivation (finalAttrs: {
zlib
]
++ lib.optionals stdenv.hostPlatform.isLinux [ qt6Packages.qtwayland ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_12 ]
++ lib.optionals withSDRplay [ sdrplay ];
cmakeFlags = [
diff --git a/pkgs/by-name/se/seabios/package.nix b/pkgs/by-name/se/seabios/package.nix
index a03cb8b0730c4..b92735de1e737 100644
--- a/pkgs/by-name/se/seabios/package.nix
+++ b/pkgs/by-name/se/seabios/package.nix
@@ -65,7 +65,6 @@ stdenv.mkDerivation (finalAttrs: {
hardeningDisable = [
"fortify"
"pic"
- "pie" # ld: warning: creating DT_TEXTREL in a PIE (and more)
"stackprotector"
];
diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix
index 6ec0104350f54..e2f25f4687875 100644
--- a/pkgs/by-name/se/servo/package.nix
+++ b/pkgs/by-name/se/servo/package.nix
@@ -24,7 +24,6 @@
yasm,
# runtime deps
- apple-sdk_14,
fontconfig,
freetype,
gst_all_1,
@@ -143,9 +142,6 @@ rustPlatform.buildRustPackage {
xorg.libxcb
udev
vulkan-loader
- ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [
- apple-sdk_14
];
# Builds with additional features for aarch64, see https://github.com/servo/servo/issues/36819
diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix
index 1d7398fa68327..37076cf1e1975 100644
--- a/pkgs/by-name/sh/shipwright/package.nix
+++ b/pkgs/by-name/sh/shipwright/package.nix
@@ -1,5 +1,4 @@
{
- apple-sdk_13,
stdenv,
cmake,
lsb-release,
@@ -178,10 +177,6 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals stdenv.hostPlatform.isLinux [
libpulseaudio
zenity
- ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [
- # Metal.hpp requires macOS 13.x min.
- apple-sdk_13
];
cmakeFlags = [
diff --git a/pkgs/by-name/sh/shncpd/package.nix b/pkgs/by-name/sh/shncpd/package.nix
index 787371f121124..248421cc4454f 100644
--- a/pkgs/by-name/sh/shncpd/package.nix
+++ b/pkgs/by-name/sh/shncpd/package.nix
@@ -15,8 +15,6 @@ stdenv.mkDerivation {
sha256 = "1sj7a77isc2jmh7gw2naw9l9366kjx6jb909h7spj7daxdwvji8f";
};
- hardeningEnable = [ "pie" ];
-
preConfigure = ''
makeFlags=( "PREFIX=$out" )
'';
diff --git a/pkgs/by-name/sh/showtime/package.nix b/pkgs/by-name/sh/showtime/package.nix
index 3cc0e1f47a829..85fed910f7011 100644
--- a/pkgs/by-name/sh/showtime/package.nix
+++ b/pkgs/by-name/sh/showtime/package.nix
@@ -3,15 +3,16 @@
appstream,
blueprint-compiler,
desktop-file-utils,
- fetchFromGitLab,
+ fetchurl,
+ fetchpatch,
glib,
+ gnome,
gobject-introspection,
gst_all_1,
gtk4,
libadwaita,
meson,
ninja,
- nix-update-script,
pkg-config,
python3Packages,
wrapGAppsHook4,
@@ -19,20 +20,29 @@
python3Packages.buildPythonApplication rec {
pname = "showtime";
- version = "48.1";
+ version = "49.0";
pyproject = false;
- src = fetchFromGitLab {
- domain = "gitlab.gnome.org";
- group = "GNOME";
- owner = "Incubator";
- repo = "showtime";
- rev = "refs/tags/${version}";
- hash = "sha256-uk3KgiLsYjqBhlKssnkWO6D4ufwJb/o+rQYSA7pa1lU=";
+ src = fetchurl {
+ url = "mirror://gnome/sources/showtime/${lib.versions.major version}/showtime-${version}.tar.xz";
+ hash = "sha256-Wryvl6telTADgoKEhYjozmwmFztzA+9nVr69sLIO05g=";
};
+ patches = [
+ # Fix startup crash when missing state directory.
+ # https://gitlab.gnome.org/GNOME/showtime/-/merge_requests/80
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/showtime/-/commit/a5d57a6b023664c9dc5aeb55a3467a8b56e1b7bc.patch";
+ hash = "sha256-IUkopJ3J381+9MnvaItx7dn9NAVrqO9y4LjgPh8MU/M=";
+ })
+ ];
+
strictDeps = true;
+ depsBuildBuild = [
+ pkg-config
+ ];
+
nativeBuildInputs = [
appstream
blueprint-compiler
@@ -64,8 +74,15 @@ python3Packages.buildPythonApplication rec {
pythonImportsCheck = [ "showtime" ];
+ preInstallCheck = ''
+ export XDG_DATA_DIRS="${glib.makeSchemaDataDirPath "$out" "$name"}:$XDG_DATA_DIRS"
+ export HOME="$TEMPDIR"
+ '';
+
passthru = {
- updateScript = nix-update-script { };
+ updateScript = gnome.updateScript {
+ packageName = "showtime";
+ };
};
meta = {
@@ -73,6 +90,7 @@ python3Packages.buildPythonApplication rec {
homepage = "https://apps.gnome.org/Showtime";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ getchoo ];
+ teams = [ lib.teams.gnome ];
mainProgram = "showtime";
};
}
diff --git a/pkgs/by-name/si/simple-scan/package.nix b/pkgs/by-name/si/simple-scan/package.nix
index da3d143821fde..215b758c51191 100644
--- a/pkgs/by-name/si/simple-scan/package.nix
+++ b/pkgs/by-name/si/simple-scan/package.nix
@@ -1,7 +1,7 @@
{
lib,
stdenv,
- fetchFromGitLab,
+ fetchurl,
meson,
ninja,
pkg-config,
@@ -20,20 +20,17 @@
libxml2,
sane-backends,
vala,
- gitUpdater,
+ gnome,
gobject-introspection,
}:
stdenv.mkDerivation rec {
pname = "simple-scan";
- version = "48.1";
+ version = "49.1";
- src = fetchFromGitLab {
- domain = "gitlab.gnome.org";
- owner = "GNOME";
- repo = "simple-scan";
- tag = version;
- hash = "sha256-Y+uVAW0jpXJgadP6CjG8zeLgikFY2Pm0z4TZoyYK4+g=";
+ src = fetchurl {
+ url = "mirror://gnome/sources/simple-scan/${lib.versions.major version}/simple-scan-${version}.tar.xz";
+ hash = "sha256-mujUFR7K+VhF65+ZtDbVecg48s8Cdj+6O8A3gCUb4zQ=";
};
nativeBuildInputs = [
@@ -64,9 +61,8 @@ stdenv.mkDerivation rec {
doCheck = true;
passthru = {
- updateScript = gitUpdater {
- # Ignore tags like 48.1-2, which actually does not introduce any changes.
- ignoredVersions = "-";
+ updateScript = gnome.updateScript {
+ packageName = "simple-scan";
};
};
diff --git a/pkgs/by-name/sn/snapshot/package.nix b/pkgs/by-name/sn/snapshot/package.nix
index 9bc4466f32526..8c8a480bfeb1c 100644
--- a/pkgs/by-name/sn/snapshot/package.nix
+++ b/pkgs/by-name/sn/snapshot/package.nix
@@ -19,6 +19,7 @@
gtk4,
libadwaita,
libcamera,
+ lcms2,
libseccomp,
pipewire,
gnome,
@@ -26,16 +27,16 @@
stdenv.mkDerivation (finalAttrs: {
pname = "snapshot";
- version = "48.0.1";
+ version = "49.0";
src = fetchurl {
url = "mirror://gnome/sources/snapshot/${lib.versions.major finalAttrs.version}/snapshot-${finalAttrs.version}.tar.xz";
- hash = "sha256-OTF2hZogt9I138MDAxuiDGhkQRBpiNyRHdkbe21m4f0=";
+ hash = "sha256-X5YZPSkZxzVXRdJqGwHyPDyzCpPHQtWD7EKSfEpFrhg=";
};
patches = [
# Fix paths in glycin library
- libglycin.passthru.glycinPathsPatch
+ libglycin.passthru.glycin3PathsPatch
];
cargoVendorDir = "vendor";
@@ -63,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
gtk4
libadwaita
libcamera # for the gstreamer plugin
+ lcms2
libseccomp
pipewire # for device provider
];
diff --git a/pkgs/by-name/so/socat/package.nix b/pkgs/by-name/so/socat/package.nix
index e208234f23324..f3e1774f6c480 100644
--- a/pkgs/by-name/so/socat/package.nix
+++ b/pkgs/by-name/so/socat/package.nix
@@ -38,8 +38,6 @@ stdenv.mkDerivation rec {
readline
];
- hardeningEnable = [ "pie" ];
-
enableParallelBuilding = true;
nativeCheckInputs = [
diff --git a/pkgs/by-name/so/solo5/package.nix b/pkgs/by-name/so/solo5/package.nix
index 7f92d9d08b158..dc8f605786122 100644
--- a/pkgs/by-name/so/solo5/package.nix
+++ b/pkgs/by-name/so/solo5/package.nix
@@ -40,8 +40,6 @@ stdenv.mkDerivation {
hash = "sha256-KbeY667Y/ZPUuRIGYOZMMAuVEVJ7Kn9UDUSThX5zfII=";
};
- hardeningEnable = [ "pie" ];
-
configurePhase = ''
runHook preConfigure
sh configure.sh --prefix=/
diff --git a/pkgs/by-name/sp/spacebar/package.nix b/pkgs/by-name/sp/spacebar/package.nix
index dec0ec5dc6ac0..2fcb62b978513 100644
--- a/pkgs/by-name/sp/spacebar/package.nix
+++ b/pkgs/by-name/sp/spacebar/package.nix
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
- apple-sdk_12,
}:
stdenv.mkDerivation rec {
@@ -16,10 +15,6 @@ stdenv.mkDerivation rec {
sha256 = "sha256-4LiG43kPZtsm7SQ/28RaGMpYsDshCaGvc1mouPG3jFM=";
};
- buildInputs = [
- apple-sdk_12
- ];
-
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/share/man/man1/
diff --git a/pkgs/by-name/sp/spek/ffmpeg8-compat.patch b/pkgs/by-name/sp/spek/ffmpeg8-compat.patch
new file mode 100644
index 0000000000000..59d6dd6088549
--- /dev/null
+++ b/pkgs/by-name/sp/spek/ffmpeg8-compat.patch
@@ -0,0 +1,74 @@
+From df8402575f1550d79c751051e9006fd3b7fa0fe0 Mon Sep 17 00:00:00 2001
+From: Hannes Braun
+Date: Thu, 9 Oct 2025 20:28:34 +0200
+Subject: [PATCH] Fix compatibility with FFmpeg 8
+
+---
+ src/spek-fft.cc | 25 ++++++++++++++++---------
+ 1 file changed, 16 insertions(+), 9 deletions(-)
+
+diff --git a/src/spek-fft.cc b/src/spek-fft.cc
+index 3105213f..00d4fa5c 100644
+--- a/src/spek-fft.cc
++++ b/src/spek-fft.cc
+@@ -2,7 +2,7 @@
+
+ #define __STDC_CONSTANT_MACROS
+ extern "C" {
+-#include
++#include
+ }
+
+ #include "spek-fft.h"
+@@ -16,7 +16,10 @@ class FFTPlanImpl : public FFTPlan
+ void execute() override;
+
+ private:
+- struct RDFTContext *cx;
++ struct AVTXContext *cx;
++ av_tx_fn tx;
++ float* tmp;
++ const int len;
+ };
+
+ std::unique_ptr FFT::create(int nbits)
+@@ -24,27 +27,31 @@ std::unique_ptr FFT::create(int nbits)
+ return std::unique_ptr(new FFTPlanImpl(nbits));
+ }
+
+-FFTPlanImpl::FFTPlanImpl(int nbits) : FFTPlan(nbits), cx(av_rdft_init(nbits, DFT_R2C))
++FFTPlanImpl::FFTPlanImpl(int nbits) : FFTPlan(nbits), len(1 << nbits)
+ {
++ const float scale = 1.0;
++ av_tx_init(&this->cx, &this->tx, AV_TX_FLOAT_RDFT, 0, this->len, &scale, 0);
++ this->tmp = (float*) av_malloc((this->len + 2) * sizeof(float));
+ }
+
+ FFTPlanImpl::~FFTPlanImpl()
+ {
+- av_rdft_end(this->cx);
++ av_tx_uninit(&this->cx);
++ av_freep(&this->tmp);
+ }
+
+ void FFTPlanImpl::execute()
+ {
+- av_rdft_calc(this->cx, this->get_input());
++ this->tx(this->cx, this->tmp, this->get_input(), sizeof(AVComplexFloat));
+
+ // Calculate magnitudes.
+ int n = this->get_input_size();
+ float n2 = n * n;
+- this->set_output(0, 10.0f * log10f(this->get_input(0) * this->get_input(0) / n2));
+- this->set_output(n / 2, 10.0f * log10f(this->get_input(1) * this->get_input(1) / n2));
++ this->set_output(0, 10.0f * log10f(this->tmp[0] * this->tmp[0] / n2));
+ for (int i = 1; i < n / 2; i++) {
+- float re = this->get_input(i * 2);
+- float im = this->get_input(i * 2 + 1);
++ float re = this->tmp[i * 2];
++ float im = this->tmp[i * 2 + 1];
+ this->set_output(i, 10.0f * log10f((re * re + im * im) / n2));
+ }
++ this->set_output(n / 2, 10.0f * log10f(this->tmp[this->len] * this->tmp[this->len] / n2));
+ }
+
diff --git a/pkgs/by-name/sp/spek/package.nix b/pkgs/by-name/sp/spek/package.nix
index 5ff36e44fdbde..1abbb0b2a2d89 100644
--- a/pkgs/by-name/sp/spek/package.nix
+++ b/pkgs/by-name/sp/spek/package.nix
@@ -24,6 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
./autoconf.patch
+ # https://github.com/alexkay/spek/pull/338
+ ./ffmpeg8-compat.patch
];
nativeBuildInputs = [
diff --git a/pkgs/by-name/sp/spotifyd/package.nix b/pkgs/by-name/sp/spotifyd/package.nix
index e76e0950d8521..639c448b9a789 100644
--- a/pkgs/by-name/sp/spotifyd/package.nix
+++ b/pkgs/by-name/sp/spotifyd/package.nix
@@ -3,7 +3,6 @@
stdenv,
config,
alsa-lib,
- apple-sdk_11,
cmake,
dbus,
fetchFromGitHub,
@@ -42,8 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
];
buildInputs =
- lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]
- ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl ]
+ lib.optionals stdenv.hostPlatform.isLinux [ openssl ]
# The `dbus_mpris` feature works on other platforms, but only requires `dbus` on Linux
++ lib.optional (withMpris && stdenv.hostPlatform.isLinux) dbus
++ lib.optional (withALSA || withJack) alsa-lib
diff --git a/pkgs/by-name/ss/sshesame/package.nix b/pkgs/by-name/ss/sshesame/package.nix
index 1b0b5daf257de..6814abb0ef8a0 100644
--- a/pkgs/by-name/ss/sshesame/package.nix
+++ b/pkgs/by-name/ss/sshesame/package.nix
@@ -24,8 +24,6 @@ buildGoModule rec {
"-w"
];
- hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ];
-
passthru.updateScript = nix-update-script { };
meta = {
diff --git a/pkgs/by-name/ss/sshwifty/package.nix b/pkgs/by-name/ss/sshwifty/package.nix
index 934fc1a2186e8..f7a9298884bf9 100644
--- a/pkgs/by-name/ss/sshwifty/package.nix
+++ b/pkgs/by-name/ss/sshwifty/package.nix
@@ -10,20 +10,20 @@
}:
buildGo125Module (finalAttrs: {
pname = "sshwifty";
- version = "0.4.0-beta-release";
+ version = "0.4.1-beta-release";
src = fetchFromGitHub {
owner = "nirui";
repo = "sshwifty";
tag = finalAttrs.version;
- hash = "sha256-7ZfS46+aflKIQ8S9T18JjCb7bY8mB6cJl/lgJi5Hukg=";
+ hash = "sha256-Kg5aE4lkzSedo+VJgdsfO5XTKupsPU2DhZNdNhEQ/Q4=";
};
sshwifty-ui = buildNpmPackage {
pname = "sshwifty-ui";
inherit (finalAttrs) version src;
- npmDepsHash = "sha256-I96VixL21cF2kp9AK6q0ipjphjdWuSETKakbsprGek0=";
+ npmDepsHash = "sha256-vX3CtjwjzcxxIPYG6QXsPybyBRow1YdS9pHr961P1HA=";
npmBuildScript = "generate";
@@ -39,7 +39,7 @@ buildGo125Module (finalAttrs: {
cp -r ${finalAttrs.sshwifty-ui}/lib/node_modules/sshwifty-ui/* .
'';
- vendorHash = "sha256-kLKydjvZtFEY7vjqxK1cCwZSTbdqYWPRmxYSN0LYqsg=";
+ vendorHash = "sha256-/SLUC0xM195QfKgX9te8UP1bbzRbKF+Npyugi19JijY=";
ldflags = [
"-s"
@@ -55,7 +55,14 @@ buildGo125Module (finalAttrs: {
passthru = {
tests = { inherit (nixosTests) sshwifty; };
- updateScript = nix-update-script { };
+ updateScript = nix-update-script {
+ extraArgs = [
+ "--version=unstable"
+ "--version-regex=^([0-9.]+(?!.+-prebuild).+$)"
+ "--subpackage"
+ "sshwifty-ui"
+ ];
+ };
};
meta = {
diff --git a/pkgs/by-name/sw/switchfin/package.nix b/pkgs/by-name/sw/switchfin/package.nix
index bc43234016871..3bdcf7309b7c1 100644
--- a/pkgs/by-name/sw/switchfin/package.nix
+++ b/pkgs/by-name/sw/switchfin/package.nix
@@ -7,7 +7,7 @@
curl,
dbus,
ffmpeg,
- fmt,
+ fmt_11,
libwebp,
mpv,
SDL2,
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
curl
dbus
ffmpeg
- fmt
+ fmt_11
libwebp
mpv
SDL2
diff --git a/pkgs/by-name/sy/syslinux/package.nix b/pkgs/by-name/sy/syslinux/package.nix
index a77d8f66a2c0c..abc948ed3321f 100644
--- a/pkgs/by-name/sy/syslinux/package.nix
+++ b/pkgs/by-name/sy/syslinux/package.nix
@@ -83,7 +83,6 @@ stdenv.mkDerivation {
hardeningDisable = [
"pic"
- "pie" # MBR gets too big with PIE
"stackprotector"
"fortify"
];
diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index d74d12f859719..590fdc997d6f5 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.88.4";
+ version = "1.90.6";
outputs = [
"out"
@@ -35,10 +35,10 @@ buildGoModule (finalAttrs: {
owner = "tailscale";
repo = "tailscale";
tag = "v${finalAttrs.version}";
- hash = "sha256-fzJwRTB2U2GuLmv1XUSMLnhyLlp+4kGorLGAvRVjDqw=";
+ hash = "sha256-Uy5HDhZTO/lydVzT/dzp8OWgaZ8ZVQo0b7lvvzXyysI=";
};
- vendorHash = "sha256-8aE6dWMkTLdWRD9WnLVSzpOQQh61voEnjZAJHtbGCSs=";
+ vendorHash = "sha256-AUOjLomba75qfzb9Vxc0Sktyeces6hBSuOMgboWcDnE=";
nativeBuildInputs = [
makeWrapper
diff --git a/pkgs/by-name/te/template-glib/package.nix b/pkgs/by-name/te/template-glib/package.nix
index e4a1a4034d25e..454149b612f80 100644
--- a/pkgs/by-name/te/template-glib/package.nix
+++ b/pkgs/by-name/te/template-glib/package.nix
@@ -5,6 +5,7 @@
meson,
ninja,
pkg-config,
+ gi-docgen,
glib,
gobject-introspection,
flex,
@@ -12,14 +13,11 @@
vala,
gettext,
gnome,
- gtk-doc,
- docbook_xsl,
- docbook_xml_dtd_43,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "template-glib";
- version = "3.36.3";
+ version = "3.38.0";
outputs = [
"out"
@@ -28,8 +26,8 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
- url = "mirror://gnome/sources/template-glib/${lib.versions.majorMinor version}/template-glib-${version}.tar.xz";
- hash = "sha256-1SizWyz5Dgfa5Q4l4S+62w6wSPV/1RUc+fbpjM4d8g4=";
+ url = "mirror://gnome/sources/template-glib/${lib.versions.majorMinor finalAttrs.version}/template-glib-${finalAttrs.version}.tar.xz";
+ hash = "sha256-QNANwiPc8ut/LsQi997FpnNzoMoRAavKD0nGLwUMsxI=";
};
nativeBuildInputs = [
@@ -40,10 +38,8 @@ stdenv.mkDerivation rec {
flex
bison
vala
+ gi-docgen
glib
- gtk-doc
- docbook_xsl
- docbook_xml_dtd_43
gobject-introspection
];
@@ -52,11 +48,16 @@ stdenv.mkDerivation rec {
];
mesonFlags = [
- "-Dgtk_doc=true"
+ "-Ddocs=true"
];
doCheck = true;
+ postFixup = ''
+ # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
+ moveToOutput share/doc/template-glib-1.0 "$devdoc"
+ '';
+
passthru = {
updateScript = gnome.updateScript {
packageName = "template-glib";
@@ -71,4 +72,4 @@ stdenv.mkDerivation rec {
teams = [ teams.gnome ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/by-name/ti/tinysparql/package.nix b/pkgs/by-name/ti/tinysparql/package.nix
index 627fca114f06d..fbe6f91e93487 100644
--- a/pkgs/by-name/ti/tinysparql/package.nix
+++ b/pkgs/by-name/ti/tinysparql/package.nix
@@ -2,7 +2,6 @@
stdenv,
lib,
fetchurl,
- fetchpatch2,
gettext,
meson,
mesonEmulatorHook,
@@ -35,7 +34,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "tinysparql";
- version = "3.9.2";
+ version = "3.10.1";
outputs = [
"out"
@@ -47,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
url =
with finalAttrs;
"mirror://gnome/sources/tinysparql/${lib.versions.majorMinor version}/tinysparql-${version}.tar.xz";
- hash = "sha256-FM4DkCQTXhgQIrzOSxqtLgA3fdnH2BK5g5HM/HVtrY4=";
+ hash = "sha256-Wn8+eJ22ZxpVDtYoDtT2CmC+p3No2pK+aNx9jX4jAmU=";
};
strictDeps = true;
@@ -112,14 +111,6 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = true;
- patches = [
- (fetchpatch2 {
- name = "make-dbus-dep-optional.patch";
- url = "https://gitlab.gnome.org/GNOME/tinysparql/-/commit/31b5a793cd40cdce032e0f7d7c3ef7841c6e3691.patch?full_index=1";
- hash = "sha256-YoWJEa2bFIjZdPW9pJ3iHTxi0dvveYDjKaDokcIvnj8=";
- })
- ];
-
postPatch = ''
patchShebangs \
utils/data-generators/cc/generate
diff --git a/pkgs/by-name/to/totem/package.nix b/pkgs/by-name/to/totem/package.nix
index c5e8d2d5c7da4..5f294657bfd09 100644
--- a/pkgs/by-name/to/totem/package.nix
+++ b/pkgs/by-name/to/totem/package.nix
@@ -2,6 +2,7 @@
stdenv,
lib,
fetchurl,
+ fetchpatch,
meson,
ninja,
gettext,
@@ -40,6 +41,15 @@ stdenv.mkDerivation rec {
hash = "sha256-CwB9MPu5O5WmBPFISKSX9X/DM6dcLmOKJJly6ZwB5qQ=";
};
+ patches = [
+ # Use girepository-2.0
+ # This will be ported to libpeas2 in https://gitlab.gnome.org/GNOME/totem/-/merge_requests/373
+ (fetchpatch {
+ url = "https://src.fedoraproject.org/rpms/totem/raw/a213a514b7c2ac22d4e012e168e41eaf839e8112/f/girepository-2.0.patch";
+ hash = "sha256-D+i45yebZMbA7Ybfog3bwtOghoIHHVMqyXiUcZTkpxk=";
+ })
+ ];
+
nativeBuildInputs = [
meson
ninja
diff --git a/pkgs/by-name/ty/typesetter/package.nix b/pkgs/by-name/ty/typesetter/package.nix
new file mode 100644
index 0000000000000..6325c3880b40c
--- /dev/null
+++ b/pkgs/by-name/ty/typesetter/package.nix
@@ -0,0 +1,85 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitea,
+ rustPlatform,
+
+ # nativeBuildInputs
+ cargo,
+ desktop-file-utils,
+ gettext,
+ meson,
+ ninja,
+ pkg-config,
+ python3,
+ rustc,
+ wrapGAppsHook4,
+
+ # buildInputs
+ gdk-pixbuf,
+ graphene,
+ gtk4,
+ gtksourceview5,
+ libadwaita,
+ libspelling,
+ openssl,
+ pango,
+
+ nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "typesetter";
+ version = "0.5.0";
+
+ src = fetchFromGitea {
+ domain = "codeberg.org";
+ owner = "haydn";
+ repo = "typesetter";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-TYSmkjYvRUlKxilKr7WlUYQ2U/PsSuI/b8HOnUreXYk=";
+ };
+
+ cargoDeps = rustPlatform.fetchCargoVendor {
+ inherit (finalAttrs) pname version src;
+ hash = "sha256-lizLARb0wL3hHRl3kbxrlWyt0rB1BUuoZbaVIUeFMXU=";
+ };
+
+ strictDeps = true;
+
+ nativeBuildInputs = [
+ cargo
+ desktop-file-utils
+ gettext # msgfmt
+ meson
+ ninja
+ pkg-config
+ python3
+ rustPlatform.cargoSetupHook
+ rustc
+ wrapGAppsHook4
+ ];
+
+ buildInputs = [
+ gdk-pixbuf
+ graphene
+ gtk4
+ gtksourceview5
+ libadwaita
+ libspelling
+ openssl
+ pango
+ ];
+
+ env.OPENSSL_NO_VENDOR = true;
+
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ description = "Minimalist, local-first Typst editor";
+ homepage = "https://codeberg.org/haydn/typesetter";
+ license = lib.licenses.gpl3Only;
+ maintainers = with lib.maintainers; [ GaetanLepage ];
+ mainProgram = "typesetter";
+ };
+})
diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix
index 99fcaf1497c44..62657e2f4c360 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.24.0";
+ version = "1.24.1";
src = fetchFromGitHub {
owner = "NLnetLabs";
repo = "unbound";
tag = "release-${finalAttrs.version}";
- hash = "sha256-M5gn18HTgcpqsOZGtxPoQbQd5tPW3T4r0YeMK5Mwgls=";
+ hash = "sha256-meWgu1UGhR9d8wVb8guqbnGE3UHs6uJHR20iDFnIThQ=";
};
outputs = [
diff --git a/pkgs/by-name/un/unicode-character-database/package.nix b/pkgs/by-name/un/unicode-character-database/package.nix
index 48e17bdd6654c..a2237aa121dcf 100644
--- a/pkgs/by-name/un/unicode-character-database/package.nix
+++ b/pkgs/by-name/un/unicode-character-database/package.nix
@@ -7,11 +7,11 @@
stdenvNoCC.mkDerivation rec {
pname = "unicode-character-database";
- version = "16.0.0";
+ version = "17.0.0";
src = fetchurl {
- url = "https://www.unicode.org/Public/zipped/${version}/UCD.zip";
- sha256 = "sha256-yG3YHysUpDsMwGSqX4mqckE4aAHjXFnHmE5XmDJjTrI=";
+ url = "https://www.unicode.org/Public/${version}/ucd/UCD.zip";
+ sha256 = "sha256-IGbRkJsuqTkWzgktocDuSAjqPvhAfJS08U9bfrJj0o4=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/un/unifdef/package.nix b/pkgs/by-name/un/unifdef/package.nix
index d3a8bf96ae743..ac4c84e882fe1 100644
--- a/pkgs/by-name/un/unifdef/package.nix
+++ b/pkgs/by-name/un/unifdef/package.nix
@@ -4,25 +4,31 @@
fetchurl,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "unifdef";
version = "2.12";
src = fetchurl {
- url = "https://dotat.at/prog/unifdef/unifdef-${version}.tar.xz";
- sha256 = "00647bp3m9n01ck6ilw6r24fk4mivmimamvm4hxp5p6wxh10zkj3";
+ url = "https://dotat.at/prog/unifdef/unifdef-${finalAttrs.version}.tar.xz";
+ hash = "sha256-Q84PAuzc3HI7JHVXVWPdsZLpiMiG02gmC8CmOu46xAA=";
};
+ patches = [
+ # Fix build with gcc15
+ # https://github.com/fanf2/unifdef/pull/19
+ ./unifdef-fix-build-with-gcc15.patch
+ ];
+
makeFlags = [
"prefix=$(out)"
"DESTDIR="
];
- meta = with lib; {
+ meta = {
homepage = "https://dotat.at/prog/unifdef/";
description = "Selectively remove C preprocessor conditionals";
- license = licenses.bsd2;
- platforms = platforms.unix;
- maintainers = with maintainers; [ orivej ];
+ license = lib.licenses.bsd2;
+ platforms = lib.platforms.unix;
+ maintainers = with lib.maintainers; [ orivej ];
};
-}
+})
diff --git a/pkgs/by-name/un/unifdef/unifdef-fix-build-with-gcc15.patch b/pkgs/by-name/un/unifdef/unifdef-fix-build-with-gcc15.patch
new file mode 100644
index 0000000000000..0b6fbb0b3a7ee
--- /dev/null
+++ b/pkgs/by-name/un/unifdef/unifdef-fix-build-with-gcc15.patch
@@ -0,0 +1,54 @@
+From d616741e6b0d5b57b66447e85ad32b283b28adde Mon Sep 17 00:00:00 2001
+From: Sam James
+Date: Sun, 17 Nov 2024 01:26:27 +0000
+Subject: [PATCH] Don't use C23 constexpr keyword
+
+This fixes building with upcoming GCC 15 which defaults to -std=gnu23.
+---
+ unifdef.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/unifdef.c b/unifdef.c
+index dc145a2..4bd3bda 100644
+--- a/unifdef.c
++++ b/unifdef.c
+@@ -202,7 +202,7 @@ static int depth; /* current #if nesting */
+ static int delcount; /* count of deleted lines */
+ static unsigned blankcount; /* count of blank lines */
+ static unsigned blankmax; /* maximum recent blankcount */
+-static bool constexpr; /* constant #if expression */
++static bool is_constexpr; /* constant #if expression */
+ static bool zerosyms; /* to format symdepth output */
+ static bool firstsym; /* ditto */
+
+@@ -1086,7 +1086,7 @@ eval_unary(const struct ops *ops, long *valp, const char **cpp)
+ *valp = (value[sym] != NULL);
+ lt = *valp ? LT_TRUE : LT_FALSE;
+ }
+- constexpr = false;
++ is_constexpr = false;
+ } else if (!endsym(*cp)) {
+ debug("eval%d symbol", prec(ops));
+ sym = findsym(&cp);
+@@ -1103,7 +1103,7 @@ eval_unary(const struct ops *ops, long *valp, const char **cpp)
+ lt = *valp ? LT_TRUE : LT_FALSE;
+ cp = skipargs(cp);
+ }
+- constexpr = false;
++ is_constexpr = false;
+ } else {
+ debug("eval%d bad expr", prec(ops));
+ return (LT_ERROR);
+@@ -1170,10 +1170,10 @@ ifeval(const char **cpp)
+ long val = 0;
+
+ debug("eval %s", *cpp);
+- constexpr = killconsts ? false : true;
++ is_constexpr = killconsts ? false : true;
+ ret = eval_table(eval_ops, &val, cpp);
+ debug("eval = %d", val);
+- return (constexpr ? LT_IF : ret == LT_ERROR ? LT_IF : ret);
++ return (is_constexpr ? LT_IF : ret == LT_ERROR ? LT_IF : ret);
+ }
+
+ /*
diff --git a/pkgs/by-name/un/unihan-database/package.nix b/pkgs/by-name/un/unihan-database/package.nix
index e3b2d493c6440..9e0a0937d10fa 100644
--- a/pkgs/by-name/un/unihan-database/package.nix
+++ b/pkgs/by-name/un/unihan-database/package.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "unihan-database";
- version = "15.1.0";
+ version = "17.0.0";
src = fetchurl {
- url = "https://www.unicode.org/Public/zipped/${version}/Unihan.zip";
- hash = "sha256-oCJmEOMkvPeErDgOEfTL9TPuHms9AosJkb+MDcP4WFM=";
+ url = "https://www.unicode.org/Public/${version}/ucd/Unihan.zip";
+ hash = "sha256-96SLK1Raz6p3stYHrih0dATOArrv7hY5bF0teo7zS14=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 8122b1afea866..11a3d85cf6159 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.23";
+ version = "0.9.7";
src = fetchFromGitHub {
owner = "astral-sh";
repo = "uv";
tag = finalAttrs.version;
- hash = "sha256-5L/FipR5MPsscpWfpDURbC5qwn6XB5KoOrjedk1HzDo=";
+ hash = "sha256-I0Oe6vaH7iQh+Ubp5RIk8Ol6Ni7OPu8HKX0fqLdewyk=";
};
- cargoHash = "sha256-JHfqsT/W7RvoHx9WbA4fdQZw2/+BOSRuGV3mcMx1FN4=";
+ cargoHash = "sha256-K/RP7EA0VAAI8TGx+VwfKPmyT6+x4p3kekuoMZ0/egc=";
buildInputs = [
rust-jemalloc-sys
diff --git a/pkgs/by-name/v4/v4l-utils/package.nix b/pkgs/by-name/v4/v4l-utils/package.nix
index beaaeaffdd0f8..b8adda9766aca 100644
--- a/pkgs/by-name/v4/v4l-utils/package.nix
+++ b/pkgs/by-name/v4/v4l-utils/package.nix
@@ -34,11 +34,11 @@ in
# we need to use stdenv.mkDerivation in order not to pollute the libv4l’s closure with Qt
stdenv.mkDerivation (finalAttrs: {
pname = "v4l-utils";
- version = "1.30.1";
+ version = "1.32.0";
src = fetchurl {
url = "https://linuxtv.org/downloads/v4l-utils/v4l-utils-${finalAttrs.version}.tar.xz";
- hash = "sha256-wc9UnC7DzznrXse/FXMTSeYbJqIbXpY5IttCIzO64Zc=";
+ hash = "sha256-aCiCihd3VSbrk/slipKU0dEHPWM8NE3XHs1Oeh/7ffw=";
};
patches = [
@@ -106,17 +106,8 @@ stdenv.mkDerivation (finalAttrs: {
propagatedBuildInputs = [ libjpeg ];
- # these two `substituteInPlace` have been sent upstream as patches
- # https://lore.kernel.org/linux-media/867c4d2e-7871-4280-8c89-d4b654597f32@public-files.de/T/
- # they might fail and have to be removed once the patches get accepted
postPatch = ''
patchShebangs utils/
- substituteInPlace \
- lib/libdvbv5/meson.build \
- --replace-fail "install_dir: 'include/libdvbv5'" "install_dir: get_option('includedir') / 'libdvbv5'"
- substituteInPlace \
- meson.build \
- --replace-fail "get_option('datadir') / 'locale'" "get_option('localedir')"
'';
# Meson unable to find moc/uic/rcc in case of cross-compilation
diff --git a/pkgs/by-name/va/valgrind/package.nix b/pkgs/by-name/va/valgrind/package.nix
index f15572b5acbfd..bb420e060fac0 100644
--- a/pkgs/by-name/va/valgrind/package.nix
+++ b/pkgs/by-name/va/valgrind/package.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "valgrind";
- version = "3.25.1";
+ version = "3.26.0";
src = fetchurl {
url = "https://sourceware.org/pub/${pname}/${pname}-${version}.tar.bz2";
- hash = "sha256-Yd640HJ7RcJo79wbO2yeZ5zZfL9e5LKNHerXyLeica8=";
+ hash = "sha256-jVTHFwKRBvFkSq2vgCq5aS5T2T3QFcvRnnQZDrpha9c=";
};
patches = [
@@ -25,6 +25,12 @@ stdenv.mkDerivation rec {
url = "https://bugsfiles.kde.org/attachment.cgi?id=148912";
sha256 = "Za+7K93pgnuEUQ+jDItEzWlN0izhbynX2crSOXBBY/I=";
})
+ # https://bugs.kde.org/show_bug.cgi?id=511548
+ (fetchpatch {
+ url = "https://bugsfiles.kde.org/attachment.cgi?id=186451";
+ hash = "sha256-IGmyHwwGoy00hcz3XxQSDcwcU8zHLBJ9dfqTvWDQ520=";
+ })
+
# Fix build on armv7l.
# see also https://bugs.kde.org/show_bug.cgi?id=454346
(fetchpatch {
@@ -41,7 +47,6 @@ stdenv.mkDerivation rec {
];
hardeningDisable = [
- "pie"
"stackprotector"
];
@@ -105,7 +110,7 @@ stdenv.mkDerivation rec {
Valgrind to build new tools.
'';
- license = lib.licenses.gpl2Plus;
+ license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.eelco ];
platforms =
diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix
index beb4b27c8f3ec..9f8d6098eaa06 100644
--- a/pkgs/by-name/va/valkey/package.nix
+++ b/pkgs/by-name/va/valkey/package.nix
@@ -64,8 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
enableParallelBuilding = true;
- hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ];
-
env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-std=c11" ]);
# darwin currently lacks a pure `pgrep` which is extensively used here
diff --git a/pkgs/by-name/vt/vte/package.nix b/pkgs/by-name/vt/vte/package.nix
index c873530f2037e..6dc2f3aaecbaa 100644
--- a/pkgs/by-name/vt/vte/package.nix
+++ b/pkgs/by-name/vt/vte/package.nix
@@ -23,9 +23,11 @@
pango,
pcre2,
cairo,
+ fmt_11,
fribidi,
lz4,
icu,
+ simdutf,
systemd,
systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd,
fast-float,
@@ -36,7 +38,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "vte";
- version = "0.80.3";
+ version = "0.82.1";
outputs = [
"out"
@@ -46,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz";
- hash = "sha256-Lllv0/vqu3FTFmIiTnH2osN/aEQmE21ihUYnJ2709pk=";
+ hash = "sha256-eTdtcEAtJx4tOEJEGOGupyNXk00nLjIeOQa3Fwanjjo=";
};
patches = [
@@ -76,6 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
cairo
+ fmt_11
fribidi
gnutls
pango # duplicated with propagatedBuildInputs to support gtkVersion == null
@@ -83,6 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
lz4
icu
fast-float
+ simdutf
]
++ lib.optionals systemdSupport [
systemd
diff --git a/pkgs/by-name/wa/wangle/package.nix b/pkgs/by-name/wa/wangle/package.nix
index 56928c88ffbd1..baba9795b63a6 100644
--- a/pkgs/by-name/wa/wangle/package.nix
+++ b/pkgs/by-name/wa/wangle/package.nix
@@ -24,7 +24,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "wangle";
- version = "2025.09.15.00";
+ version = "2025.10.13.00";
outputs = [
"out"
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "facebook";
repo = "wangle";
tag = "v${finalAttrs.version}";
- hash = "sha256-S2L3ifQTwyidz3x5pPrVEGEJXvM1czqTRXYsYUqIeRY=";
+ hash = "sha256-lptILtCaVeO8yXlIYHaATfJw6VyPxUJCx7nxfOZVIIc=";
};
patches = [
@@ -109,6 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
kylesferrazza
emily
techknowlogick
+ lf-
];
};
})
diff --git a/pkgs/by-name/wa/wasilibc/package.nix b/pkgs/by-name/wa/wasilibc/package.nix
index c5c5204454f7d..219d639aadd71 100644
--- a/pkgs/by-name/wa/wasilibc/package.nix
+++ b/pkgs/by-name/wa/wasilibc/package.nix
@@ -19,6 +19,12 @@ stdenvNoLibc.mkDerivation (finalAttrs: {
fetchSubmodules = true;
};
+ # These flags break pkgsCross.wasi32.llvmPackages.libcxx
+ hardeningDisable = [
+ "libcxxhardeningfast"
+ "libcxxhardeningextensive"
+ ];
+
outputs = [
"out"
"dev"
diff --git a/pkgs/by-name/wa/watchman/package.nix b/pkgs/by-name/wa/watchman/package.nix
index 960f02a703557..0dcd7685782d0 100644
--- a/pkgs/by-name/wa/watchman/package.nix
+++ b/pkgs/by-name/wa/watchman/package.nix
@@ -26,21 +26,17 @@
cpptoml,
gtest,
-
- nix-update-script,
-
- stateDir ? "",
}:
stdenv.mkDerivation (finalAttrs: {
pname = "watchman";
- version = "2025.09.15.00";
+ version = "2025.10.13.00";
src = fetchFromGitHub {
owner = "facebook";
repo = "watchman";
tag = "v${finalAttrs.version}";
- hash = "sha256-ZIFGCOoIuy4Ns51oek3HnBLtCSnI742FTA2YmorBpyk=";
+ hash = "sha256-yD8OaA6n2aqwgyQ58VEiBw6+IbwUgXrWEUPinJDip+U=";
};
patches = [
@@ -78,8 +74,11 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
(lib.cmakeBool "CMAKE_INSTALL_RPATH_USE_LINK_PATH" true)
+ # If we want to have one watchman per system, we need to have the state in
+ # $HOME for reliability in face of differing TMPDIR values.
+ # https://github.com/facebook/watchman/issues/1092
+ (lib.cmakeBool "WATCHMAN_USE_XDG_STATE_HOME" true)
- (lib.cmakeFeature "WATCHMAN_STATE_DIR" stateDir)
(lib.cmakeFeature "WATCHMAN_VERSION_OVERRIDE" finalAttrs.version)
];
@@ -118,6 +117,7 @@ stdenv.mkDerivation (finalAttrs: {
kylesferrazza
emily
techknowlogick
+ lf-
];
mainProgram = "watchman";
platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/wh/whisper-cpp/package.nix b/pkgs/by-name/wh/whisper-cpp/package.nix
index 1d10f2ee5c9d3..e54b0c4f5bd83 100644
--- a/pkgs/by-name/wh/whisper-cpp/package.nix
+++ b/pkgs/by-name/wh/whisper-cpp/package.nix
@@ -3,7 +3,6 @@
stdenv,
cmake,
git,
- apple-sdk_13,
ninja,
fetchFromGitHub,
SDL2,
@@ -47,8 +46,6 @@ let
optionals
;
- darwinBuildInputs = [ apple-sdk_13 ];
-
cudaBuildInputs = with cudaPackages; [
cuda_cccl #
@@ -111,7 +108,6 @@ effectiveStdenv.mkDerivation (finalAttrs: {
buildInputs =
optional withSDL SDL2
- ++ optionals effectiveStdenv.hostPlatform.isDarwin darwinBuildInputs
++ optionals cudaSupport cudaBuildInputs
++ optionals rocmSupport rocmBuildInputs
++ optionals vulkanSupport vulkanBuildInputs;
diff --git a/pkgs/by-name/wx/wxGTK31/package.nix b/pkgs/by-name/wx/wxGTK31/package.nix
index e474550d6223b..b9176a2487308 100644
--- a/pkgs/by-name/wx/wxGTK31/package.nix
+++ b/pkgs/by-name/wx/wxGTK31/package.nix
@@ -80,6 +80,7 @@ stdenv.mkDerivation rec {
++ lib.optional withPrivateFonts "--enable-privatefonts"
++ lib.optional withMesa "--with-opengl"
++ lib.optionals stdenv.hostPlatform.isDarwin [
+ "--with-macosx-version-min=${stdenv.hostPlatform.darwinMinVersion}"
"--with-osx_cocoa"
"--with-libiconv"
]
diff --git a/pkgs/by-name/wx/wxGTK32/package.nix b/pkgs/by-name/wx/wxGTK32/package.nix
index 80a179152dfbe..ef47cfef5bab7 100644
--- a/pkgs/by-name/wx/wxGTK32/package.nix
+++ b/pkgs/by-name/wx/wxGTK32/package.nix
@@ -101,6 +101,7 @@ stdenv.mkDerivation rec {
++ lib.optional unicode "--enable-unicode"
++ lib.optional withMesa "--with-opengl"
++ lib.optionals stdenv.hostPlatform.isDarwin [
+ "--with-macosx-version-min=${stdenv.hostPlatform.darwinMinVersion}"
"--with-osx_cocoa"
"--with-libiconv"
"--with-urlsession" # for wxWebRequest
diff --git a/pkgs/by-name/wx/wxwidgets_3_3/package.nix b/pkgs/by-name/wx/wxwidgets_3_3/package.nix
index 9f16a12edbb5d..7a8236a7792fe 100644
--- a/pkgs/by-name/wx/wxwidgets_3_3/package.nix
+++ b/pkgs/by-name/wx/wxwidgets_3_3/package.nix
@@ -86,6 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optional withMesa "--with-opengl"
++ lib.optionals stdenv.hostPlatform.isDarwin [
+ "--with-macosx-version-min=${stdenv.hostPlatform.darwinMinVersion}"
"--with-osx_cocoa"
"--with-libiconv"
"--with-urlsession" # for wxWebRequest
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix
index 9fa4feeef447f..ac116af4e2ffc 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix
@@ -23,11 +23,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "xdg-desktop-portal-gnome";
- version = "48.0";
+ version = "49.0";
src = fetchurl {
url = "mirror://gnome/sources/xdg-desktop-portal-gnome/${lib.versions.major finalAttrs.version}/xdg-desktop-portal-gnome-${finalAttrs.version}.tar.xz";
- hash = "sha256-zRWsouE2TaMI6zeWu4rkpXfmDKT+EgBrMVIyz9GciGE=";
+ hash = "sha256-QB2vzfjLkR8JwI0oE/d03YZBJ6v8qT/0yvH8TJtexNI=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/xe/xed-editor/package.nix b/pkgs/by-name/xe/xed-editor/package.nix
index bc87c6c0775ee..a9aa21391afd3 100644
--- a/pkgs/by-name/xe/xed-editor/package.nix
+++ b/pkgs/by-name/xe/xed-editor/package.nix
@@ -2,6 +2,7 @@
stdenv,
lib,
fetchFromGitHub,
+ fetchpatch,
libxml2,
libpeas,
glib,
@@ -34,6 +35,12 @@ stdenv.mkDerivation rec {
# We patch gobject-introspection and meson to store absolute paths to libraries in typelibs
# but that requires the install_dir is an absolute path.
./correct-gir-lib-path.patch
+
+ # Switch to girepository-2.0
+ (fetchpatch {
+ url = "https://src.fedoraproject.org/rpms/xed/raw/6c1a775158f166a3bc5759a6c7bd57bab8f2771a/f/libpeas_libgirepository2.patch";
+ hash = "sha256-wGbmS33YHMiSfd3S0fQRhL6tT536kto69MSgPkY2QIs=";
+ })
];
nativeBuildInputs = [
diff --git a/pkgs/by-name/xe/xemu/package.nix b/pkgs/by-name/xe/xemu/package.nix
index 4ed76403f436d..f2aa6a7627171 100644
--- a/pkgs/by-name/xe/xemu/package.nix
+++ b/pkgs/by-name/xe/xemu/package.nix
@@ -29,7 +29,6 @@
wrapGAppsHook3,
cacert,
darwin,
- apple-sdk_12,
desktopToDarwinBundle,
}:
@@ -98,9 +97,6 @@ stdenv.mkDerivation (finalAttrs: {
libdrm
libgbm
vte
- ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [
- apple-sdk_12
];
configureFlags = [
diff --git a/pkgs/by-name/xt/xterm/package.nix b/pkgs/by-name/xt/xterm/package.nix
index 2c06f83173eeb..a53997d95010f 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 = "402";
+ version = "403";
src = fetchurl {
urls = [
"ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz"
"https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz"
];
- hash = "sha256-UmDFeTzVZMaeU+9vUowArwZq5ntC0CE3+374+v5wu3o=";
+ hash = "sha256-EzGw31kZyyQ//jJtxv8QopHmg6Ji9wzflkpmS+czrYM=";
};
patches = [ ./sixel-256.support.patch ];
diff --git a/pkgs/by-name/xv/xviewer/package.nix b/pkgs/by-name/xv/xviewer/package.nix
index 40f5c92759299..d4326ad4b1b01 100644
--- a/pkgs/by-name/xv/xviewer/package.nix
+++ b/pkgs/by-name/xv/xviewer/package.nix
@@ -65,6 +65,18 @@ stdenv.mkDerivation rec {
xapp
];
+ postPatch = ''
+ # Switch to girepository-2.0
+ substituteInPlace src/main.c \
+ --replace-fail "#include " "#include " \
+ --replace-fail "g_irepository_get_option_group" "gi_repository_get_option_group"
+
+ substituteInPlace src/xviewer-plugin-engine.c \
+ --replace-fail "#include " "#include " \
+ --replace-fail "g_irepository_get_default" "gi_repository_dup_default" \
+ --replace-fail "g_irepository_require" "gi_repository_require"
+ '';
+
meta = with lib; {
description = "Generic image viewer from Linux Mint";
mainProgram = "xviewer";
diff --git a/pkgs/by-name/ye/yelp-xsl/package.nix b/pkgs/by-name/ye/yelp-xsl/package.nix
index 4004318a7ce1a..a908a60c04497 100644
--- a/pkgs/by-name/ye/yelp-xsl/package.nix
+++ b/pkgs/by-name/ye/yelp-xsl/package.nix
@@ -7,18 +7,17 @@
fetchurl,
pkg-config,
itstool,
- libxml2,
libxslt,
gnome,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "yelp-xsl";
- version = "42.4";
+ version = "49.0";
src = fetchurl {
url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major finalAttrs.version}/yelp-xsl-${finalAttrs.version}.tar.xz";
- hash = "sha256-/euwfrLman+3oNzmrYJIrSmku7E0uoKRKMoQT1ir19E=";
+ hash = "sha256-WdQ6j4/me3hPFPmgTdSnoJKn9KZKZecbkP4CpHpQ++w=";
};
nativeBuildInputs = [
@@ -27,7 +26,6 @@ stdenv.mkDerivation (finalAttrs: {
ninja
gettext
itstool
- libxml2
libxslt
];
diff --git a/pkgs/by-name/ye/yelp/package.nix b/pkgs/by-name/ye/yelp/package.nix
index ca376a4359f5a..197b9a79dff15 100644
--- a/pkgs/by-name/ye/yelp/package.nix
+++ b/pkgs/by-name/ye/yelp/package.nix
@@ -2,20 +2,21 @@
stdenv,
lib,
fetchurl,
+ desktop-file-utils,
gettext,
itstool,
meson,
ninja,
pkg-config,
- wrapGAppsHook3,
+ wrapGAppsHook4,
bzip2,
glib,
- gtk3,
- libhandy,
+ gtk4,
+ libadwaita,
libxml2,
libxslt,
sqlite,
- webkitgtk_4_1,
+ webkitgtk_6_0,
xz,
yelp-xsl,
gnome,
@@ -23,31 +24,32 @@
stdenv.mkDerivation (finalAttrs: {
pname = "yelp";
- version = "42.3";
+ version = "49.0";
src = fetchurl {
url = "mirror://gnome/sources/yelp/${lib.versions.major finalAttrs.version}/yelp-${finalAttrs.version}.tar.xz";
- hash = "sha256-JszEImeanmp6OqCD2Q/Ns0f18jAL4+AUMaMNDN0qiaM=";
+ hash = "sha256-5mFOCx9Lpf57jRSb3UJnPwMGVvvc1zaumGBxkZfGNFc=";
};
nativeBuildInputs = [
+ desktop-file-utils
gettext
itstool
meson
ninja
pkg-config
- wrapGAppsHook3
+ wrapGAppsHook4
];
buildInputs = [
bzip2
glib
- gtk3
- libhandy
+ gtk4
+ libadwaita
libxml2
libxslt
sqlite
- webkitgtk_4_1
+ webkitgtk_6_0
xz
yelp-xsl
];
diff --git a/pkgs/by-name/ze/zenity/package.nix b/pkgs/by-name/ze/zenity/package.nix
index 72ee2d4932257..85c9ba21641a1 100644
--- a/pkgs/by-name/ze/zenity/package.nix
+++ b/pkgs/by-name/ze/zenity/package.nix
@@ -17,11 +17,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "zenity";
- version = "4.1.90";
+ version = "4.2.1";
src = fetchurl {
url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor finalAttrs.version}/zenity-${finalAttrs.version}.tar.xz";
- hash = "sha256-vzZ5xiBf9I3OvR4d/zo6SmoLOlPhy8OwmKnsC2K9cjY=";
+ hash = "sha256-Wp/Y2DFvkMsuGlqPDUEeufyvhZV6ginqPoA+gQBKHr0=";
};
nativeBuildInputs = [
diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json
index 3f9a293f08ae2..c142225113246 100644
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@@ -1,6 +1,6 @@
{
- "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"
+ "commit": "598216fa2815cc50449239d72043b12a04a83709",
+ "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/598216fa2815cc50449239d72043b12a04a83709.tar.gz",
+ "sha256": "030yfbdzzdsxfjin97kl1kzqqnvkvjvjfns3p84xkq59fw8096cr",
+ "msg": "Update from Hackage at 2025-10-22T21:20:29Z"
}
diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix
index 2d5fc1840b9be..e93b46a08ccbf 100644
--- a/pkgs/desktops/mate/eom/default.nix
+++ b/pkgs/desktops/mate/eom/default.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
+ fetchpatch,
pkg-config,
gettext,
itstool,
@@ -29,6 +30,14 @@ stdenv.mkDerivation rec {
sha256 = "mgHKsplaGoxyWMhl6uXxgu1HMMRGcq/cOgfkI+3VOrw=";
};
+ patches = [
+ # Switch to girepository-2.0
+ (fetchpatch {
+ url = "https://src.fedoraproject.org/rpms/eom/raw/84b45dc6302f378926be390d39a7cca3ec4f26ea/f/libpeas1_pygobject352.patch";
+ hash = "sha256-HcwWXAnVzz5uuAz8Mljci2FA72TZJTD28qLvczXVtZU=";
+ })
+ ];
+
nativeBuildInputs = [
pkg-config
gettext
diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix
index 274d01796e70e..13d03f2e0212d 100644
--- a/pkgs/desktops/mate/pluma/default.nix
+++ b/pkgs/desktops/mate/pluma/default.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
+ fetchpatch,
pkg-config,
gettext,
perl,
@@ -26,6 +27,14 @@ stdenv.mkDerivation rec {
sha256 = "qorflYk0UJOlDjCyft5KeKJCHRcnwn9GX8h8Q1llodQ=";
};
+ patches = [
+ # Switch to girepository-2.0
+ (fetchpatch {
+ url = "https://src.fedoraproject.org/rpms/pluma/raw/55b770fa4d899bd92aa5ce94f3be7e2e3523a096/f/libpeas1_pygobject352.patch";
+ hash = "sha256-uNGz6LEnJU4HxU1yzcm2mmrGM6QyuRSwc3w7XDYCNaQ=";
+ })
+ ];
+
nativeBuildInputs = [
gettext
isocodes
diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix
index a8b9958f4c8ed..882055e26b4f1 100644
--- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
+ fetchpatch,
nix-update-script,
pkg-config,
meson,
@@ -33,6 +34,15 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-6T/OTiuDVAPBqp8BPawf/MVEuWTPrLa3/N1Blvt/7Q8=";
};
+ patches = [
+ # Adapt to libcamel API changes in 3.57.1
+ # https://github.com/elementary/mail/pull/1023
+ (fetchpatch {
+ url = "https://github.com/elementary/mail/commit/8cb5bb87ceca9000c2a556bafeb059b9f1cbf2f1.patch";
+ hash = "sha256-NFZVvKJyPTV+lRcefTIgm2jOmCfrY+TlawDYzGTBd7Y=";
+ })
+ ];
+
nativeBuildInputs = [
libxml2
meson
diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix
index de5f3e80864ae..dfa746b215f05 100644
--- a/pkgs/development/compilers/dotnet/vmr.nix
+++ b/pkgs/development/compilers/dotnet/vmr.nix
@@ -18,7 +18,6 @@
darwin,
xcbuild,
swiftPackages,
- apple-sdk_13,
openssl,
getconf,
python3,
@@ -112,15 +111,12 @@ stdenv.mkDerivation rec {
krb5
lttng-ust_2_12
]
- ++ lib.optionals isDarwin (
- [
- xcbuild
- swift
- krb5
- sigtool
- ]
- ++ lib.optional (lib.versionAtLeast version "10") apple-sdk_13
- );
+ ++ lib.optionals isDarwin [
+ xcbuild
+ swift
+ krb5
+ sigtool
+ ];
# This is required to fix the error:
# > CSSM_ModuleLoad(): One or more parameters passed to a function were not valid.
diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix
index 7ac3fc7524431..7cef2840a9021 100644
--- a/pkgs/development/compilers/fpc/default.nix
+++ b/pkgs/development/compilers/fpc/default.nix
@@ -80,9 +80,6 @@ stdenv.mkDerivation rec {
"FPC=${startFPC}/bin/fpc"
];
- # disabled by default in fpcsrc/compiler/llvm/agllvm.pas
- hardeningDisable = [ "pie" ];
-
installFlags = [ "INSTALL_PREFIX=\${out}" ];
postInstall = ''
diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix
index 74d482bea2057..7f5ba5aa8bf19 100644
--- a/pkgs/development/compilers/gcc/default.nix
+++ b/pkgs/development/compilers/gcc/default.nix
@@ -234,7 +234,6 @@ pipe
hardeningDisable = [
"format"
- "pie"
"stackclashprotection"
];
diff --git a/pkgs/development/compilers/ghc/9.0.2-binary.nix b/pkgs/development/compilers/ghc/9.0.2-binary.nix
index acf7effd7083c..3ff091165b39e 100644
--- a/pkgs/development/compilers/ghc/9.0.2-binary.nix
+++ b/pkgs/development/compilers/ghc/9.0.2-binary.nix
@@ -474,13 +474,6 @@ stdenv.mkDerivation {
"$out/bin/ghc-pkg" --package-db="$package_db" recache
'';
- # GHC cannot currently produce outputs that are ready for `-pie` linking.
- # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear.
- # See:
- # * https://github.com/NixOS/nixpkgs/issues/129247
- # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580
- hardeningDisable = [ "pie" ];
-
doInstallCheck = true;
installCheckPhase = ''
# Sanity check, can ghc create executables?
diff --git a/pkgs/development/compilers/ghc/9.10.1.nix b/pkgs/development/compilers/ghc/9.10.1.nix
deleted file mode 100644
index d1824ce680fd9..0000000000000
--- a/pkgs/development/compilers/ghc/9.10.1.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import ./common-hadrian.nix {
- version = "9.10.1";
- sha256 = "bf386a302d4ee054791ffd51748900f15d71760fd199157922d120cc1f89e2f7";
-}
diff --git a/pkgs/development/compilers/ghc/9.12.1.nix b/pkgs/development/compilers/ghc/9.12.1.nix
deleted file mode 100644
index 6dd4bac79411c..0000000000000
--- a/pkgs/development/compilers/ghc/9.12.1.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import ./common-hadrian.nix {
- version = "9.12.1";
- sha256 = "4a7410bdeec70f75717087b8f94bf5a6598fd61b3a0e1f8501d8f10be1492754";
-}
diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix
deleted file mode 100644
index 44544744244a7..0000000000000
--- a/pkgs/development/compilers/ghc/9.2.4-binary.nix
+++ /dev/null
@@ -1,500 +0,0 @@
-{
- lib,
- stdenv,
- fetchurl,
- perl,
- gcc,
- ncurses5,
- ncurses6,
- gmp,
- libiconv,
- numactl,
- libffi,
- coreutils,
- targetPackages,
-
- # minimal = true; will remove files that aren't strictly necessary for
- # regular builds and GHC bootstrapping.
- # This is "useful" for staying within hydra's output limits for at least the
- # aarch64-linux architecture.
- minimal ? false,
-}:
-
-# Prebuilt only does native
-assert stdenv.targetPlatform == stdenv.hostPlatform;
-
-let
- downloadsUrl = "https://downloads.haskell.org/ghc";
-
- # Copy sha256 from https://downloads.haskell.org/~ghc/9.2.4/SHA256SUMS
- version = "9.2.4";
-
- # Information about available bindists that we use in the build.
- #
- # # Bindist library checking
- #
- # The field `archSpecificLibraries` also provides a way for us get notified
- # early when the upstream bindist changes its dependencies (e.g. because a
- # newer Debian version is used that uses a new `ncurses` version).
- #
- # Usage:
- #
- # * You can find the `fileToCheckFor` of libraries by running `readelf -d`
- # on the compiler binary (`exePathForLibraryCheck`).
- # * To skip library checking for an architecture,
- # set `exePathForLibraryCheck = null`.
- # * To skip file checking for a specific arch specific library,
- # set `fileToCheckFor = null`.
- ghcBinDists = {
- # Binary distributions for the default libc (e.g. glibc, or libSystem on Darwin)
- # nixpkgs uses for the respective system.
- defaultLibc = {
- i686-linux = {
- variantSuffix = "";
- src = {
- url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz";
- sha256 = "5dc1eb9c65f01b1e5c5693af72af07a4e9e75c6920e620fd598daeefa804487a";
- };
- exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2";
- archSpecificLibraries = [
- {
- nixPackage = gmp;
- fileToCheckFor = null;
- }
- # The i686-linux bindist provided by GHC HQ is currently built on Debian 9,
- # which link it against `libtinfo.so.5` (ncurses 5).
- # Other bindists are linked `libtinfo.so.6` (ncurses 6).
- {
- nixPackage = ncurses5;
- fileToCheckFor = "libtinfo.so.5";
- }
- ];
- };
- x86_64-linux = {
- variantSuffix = "";
- src = {
- url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-deb10-linux.tar.xz";
- sha256 = "a77a91a39d9b0167124b7e97648b2b52973ae0978cb259e0d44f0752a75037cb";
- };
- exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2";
- archSpecificLibraries = [
- {
- nixPackage = gmp;
- fileToCheckFor = null;
- }
- {
- nixPackage = ncurses6;
- fileToCheckFor = "libtinfo.so.6";
- }
- ];
- };
- aarch64-linux = {
- variantSuffix = "";
- src = {
- url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz";
- sha256 = "fc7dbc6bae36ea5ac30b7e9a263b7e5be3b45b0eb3e893ad0bc2c950a61f14ec";
- };
- exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2";
- archSpecificLibraries = [
- {
- nixPackage = gmp;
- fileToCheckFor = null;
- }
- {
- nixPackage = ncurses6;
- fileToCheckFor = "libtinfo.so.6";
- }
- {
- nixPackage = numactl;
- fileToCheckFor = null;
- }
- ];
- };
- x86_64-darwin = {
- variantSuffix = "";
- src = {
- url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
- sha256 = "f2e8366fd3754dd9388510792aba2d2abecb1c2f7f1e5555f6065c3c5e2ffec4";
- };
- exePathForLibraryCheck = null; # we don't have a library check for darwin yet
- archSpecificLibraries = [
- {
- nixPackage = gmp;
- fileToCheckFor = null;
- }
- {
- nixPackage = ncurses6;
- fileToCheckFor = null;
- }
- {
- nixPackage = libiconv;
- fileToCheckFor = null;
- }
- ];
- isHadrian = true;
- };
- aarch64-darwin = {
- variantSuffix = "";
- src = {
- url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-apple-darwin.tar.xz";
- sha256 = "8cf8408544a1a43adf1bbbb0dd6b074efadffc68bfa1a792947c52e825171224";
- };
- exePathForLibraryCheck = null; # we don't have a library check for darwin yet
- archSpecificLibraries = [
- {
- nixPackage = gmp;
- fileToCheckFor = null;
- }
- {
- nixPackage = ncurses6;
- fileToCheckFor = null;
- }
- {
- nixPackage = libiconv;
- fileToCheckFor = null;
- }
- ];
- isHadrian = true;
- };
- };
- # Binary distributions for the musl libc for the respective system.
- musl = {
- x86_64-linux = {
- variantSuffix = "-musl";
- src = {
- url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-alpine3.12-linux-gmp.tar.xz";
- sha256 = "026348947d30a156b84de5d6afeaa48fdcb2795b47954cd8341db00d3263a481";
- };
- isStatic = true;
- isHadrian = true;
- # We can't check the RPATH for statically linked executable
- exePathForLibraryCheck = null;
- archSpecificLibraries = [
- {
- nixPackage = gmp.override { withStatic = true; };
- fileToCheckFor = null;
- }
- ];
- };
- };
- };
-
- distSetName = if stdenv.hostPlatform.isMusl then "musl" else "defaultLibc";
-
- binDistUsed =
- ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}
- or (throw "cannot bootstrap GHC on this platform ('${stdenv.hostPlatform.system}' with libc '${distSetName}')");
-
- gmpUsed =
- (builtins.head (
- builtins.filter (
- drv: lib.hasPrefix "gmp" (drv.nixPackage.name or "")
- ) binDistUsed.archSpecificLibraries
- )).nixPackage;
-
- libPath = lib.makeLibraryPath (
- # Add arch-specific libraries.
- map ({ nixPackage, ... }: nixPackage) binDistUsed.archSpecificLibraries
- );
-
- libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH";
-
- runtimeDeps = [
- targetPackages.stdenv.cc
- targetPackages.stdenv.cc.bintools
- coreutils # for cat
- ]
- # On darwin, we need unwrapped bintools as well (for otool)
- ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
- targetPackages.stdenv.cc.bintools.bintools
- ];
-
-in
-
-stdenv.mkDerivation {
- inherit version;
- pname = "ghc-binary${binDistUsed.variantSuffix}";
-
- src = fetchurl binDistUsed.src;
-
- nativeBuildInputs = [ perl ];
-
- # Set LD_LIBRARY_PATH or equivalent so that the programs running as part
- # of the bindist installer can find the libraries they expect.
- # Cannot patchelf beforehand due to relative RPATHs that anticipate
- # the final install location.
- ${libEnvVar} = libPath;
-
- postUnpack =
- # Verify our assumptions of which `libtinfo.so` (ncurses) version is used,
- # so that we know when ghc bindists upgrade that and we need to update the
- # version used in `libPath`.
- lib.optionalString (binDistUsed.exePathForLibraryCheck != null)
- # Note the `*` glob because some GHCs have a suffix when unpacked, e.g.
- # the musl bindist has dir `ghc-VERSION-x86_64-unknown-linux/`.
- # As a result, don't shell-quote this glob when splicing the string.
- (
- let
- buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"'';
- in
- lib.concatStringsSep "\n" [
- ''
- shopt -u nullglob
- echo "Checking that ghc binary exists in bindist at ${buildExeGlob}"
- if ! test -e ${buildExeGlob}; then
- echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1;
- fi
- ''
- (lib.concatMapStringsSep "\n" (
- { fileToCheckFor, nixPackage }:
- lib.optionalString (fileToCheckFor != null) ''
- echo "Checking bindist for ${fileToCheckFor} to ensure that is still used"
- if ! readelf -d ${buildExeGlob} | grep "${fileToCheckFor}"; then
- echo >&2 "File ${fileToCheckFor} could not be found in ${binDistUsed.exePathForLibraryCheck} for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1;
- fi
-
- echo "Checking that the nix package ${nixPackage} contains ${fileToCheckFor}"
- if ! test -e "${lib.getLib nixPackage}/lib/${fileToCheckFor}"; then
- echo >&2 "Nix package ${nixPackage} did not contain ${fileToCheckFor} for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1;
- fi
- ''
- ) binDistUsed.archSpecificLibraries)
- ]
- )
- # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib
- # during linking
- + lib.optionalString stdenv.hostPlatform.isDarwin ''
- export NIX_LDFLAGS+=" -no_dtrace_dof"
- # not enough room in the object files for the full path to libiconv :(
- for exe in $(find . -type f -executable); do
- isScript $exe && continue
- ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
- install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
- done
- ''
- +
-
- # Some scripts used during the build need to have their shebangs patched
- ''
- patchShebangs ghc-${version}/utils/
- patchShebangs ghc-${version}/configure
- test -d ghc-${version}/inplace/bin && \
- patchShebangs ghc-${version}/inplace/bin
- ''
- +
- # We have to patch the GMP paths for the integer-gmp package.
- ''
- find . -name ghc-bignum.buildinfo \
- -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${lib.getLib gmpUsed}/lib@" {} \;
-
- # we need to modify the package db directly for hadrian bindists
- find . -name 'ghc-bignum*.conf' \
- -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib gmpUsed}/lib' -i {} \;
- ''
- + lib.optionalString stdenv.hostPlatform.isDarwin ''
- # we need to modify the package db directly for hadrian bindists
- # (all darwin bindists are hadrian-based for 9.2.2)
- find . -name 'base*.conf' \
- -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib libiconv}/lib' -i {} \;
-
- # To link RTS in the end we also need libffi now
- find . -name 'rts*.conf' \
- -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib libffi}/lib' \
- -e 's@/Library/Developer/.*/usr/include/ffi@${lib.getDev libffi}/include@' \
- -i {} \;
- ''
- +
- # Some platforms do HAVE_NUMA so -lnuma requires it in library-dirs in rts/package.conf.in
- # FFI_LIB_DIR is a good indication of places it must be needed.
- lib.optionalString
- (
- lib.meta.availableOn stdenv.hostPlatform numactl
- && builtins.any ({ nixPackage, ... }: nixPackage == numactl) binDistUsed.archSpecificLibraries
- )
- ''
- find . -name package.conf.in \
- -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \;
- ''
- +
- # Rename needed libraries and binaries, fix interpreter
- lib.optionalString stdenv.hostPlatform.isLinux ''
- find . -type f -executable -exec patchelf \
- --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \;
- '';
-
- # fix for `configure: error: Your linker is affected by binutils #16177`
- preConfigure = lib.optionalString stdenv.targetPlatform.isAarch32 "LD=ld.gold";
-
- configurePlatforms = [ ];
- configureFlags = [
- "--with-gmp-includes=${lib.getDev gmpUsed}/include"
- # Note `--with-gmp-libraries` does nothing for GHC bindists:
- # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124
- ]
- ++ lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
- # From: https://github.com/NixOS/nixpkgs/pull/43369/commits
- ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
-
- # No building is necessary, but calling make without flags ironically
- # calls install-strip ...
- dontBuild = true;
-
- # GHC tries to remove xattrs when installing to work around Gatekeeper
- # (see https://gitlab.haskell.org/ghc/ghc/-/issues/17418). This step normally
- # succeeds in nixpkgs because xattrs are not allowed in the store, but it
- # can fail when a file has the `com.apple.provenance` xattr, and it can’t be
- # modified (such as target of the symlink to `libiconv.dylib`).
- # The `com.apple.provenance` xattr is a new feature of macOS as of macOS 13.
- # See: https://eclecticlight.co/2023/03/13/ventura-has-changed-app-quarantine-with-a-new-xattr/
- makeFlags = lib.optionals stdenv.buildPlatform.isDarwin [ "XATTR=/does-not-exist" ];
-
- # Patch scripts to include runtime dependencies in $PATH.
- postInstall = ''
- for i in "$out/bin/"*; do
- test ! -h "$i" || continue
- isScript "$i" || continue
- sed -i -e '2i export PATH="${lib.makeBinPath runtimeDeps}:$PATH"' "$i"
- done
- '';
-
- # Apparently necessary for the ghc Alpine (musl) bindist:
- # When we strip, and then run the
- # patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p
- # below, running ghc (e.g. during `installCheckPhase)` gives some apparently
- # corrupted rpath or whatever makes the loader work on nonsensical strings:
- # running install tests
- # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: : symbol not found
- # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: ir6zf6c9f86pfx8sr30n2vjy-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/../lib/x86_64-linux-ghc-8.10.5/libHSexceptions-0.10.4-ghc8.10.5.so: symbol not found
- # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: y/lib/ghc-8.10.5/bin/../lib/x86_64-linux-ghc-8.10.5/libHStemplate-haskell-2.16.0.0-ghc8.10.5.so: symbol not found
- # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: 8.10.5/libHStemplate-haskell-2.16.0.0-ghc8.10.5.so: symbol not found
- # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: �: symbol not found
- # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: �?: symbol not found
- # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: 64-linux-ghc-8.10.5/libHSexceptions-0.10.4-ghc8.10.5.so: symbol not found
- # This is extremely bogus and should be investigated.
- dontStrip = if stdenv.hostPlatform.isMusl then true else false; # `if` for explicitness
-
- # On Linux, use patchelf to modify the executables so that they can
- # find editline/gmp.
- postFixup =
- lib.optionalString (stdenv.hostPlatform.isLinux && !(binDistUsed.isStatic or false)) (
- if stdenv.hostPlatform.isAarch64 then
- # Keep rpath as small as possible on aarch64 for patchelf#244. All Elfs
- # are 2 directories deep from $out/lib, so pooling symlinks there makes
- # a short rpath.
- ''
- (cd $out/lib; ln -s ${ncurses6.out}/lib/libtinfo.so.6)
- (cd $out/lib; ln -s ${lib.getLib gmpUsed}/lib/libgmp.so.10)
- (cd $out/lib; ln -s ${numactl.out}/lib/libnuma.so.1)
- for p in $(find "$out/lib" -type f -name "*\.so*"); do
- (cd $out/lib; ln -s $p)
- done
-
- for p in $(find "$out/lib" -type f -executable); do
- if isELF "$p"; then
- echo "Patchelfing $p"
- patchelf --set-rpath "\$ORIGIN:\$ORIGIN/../.." $p
- fi
- done
- ''
- else
- ''
- for p in $(find "$out" -type f -executable); do
- if isELF "$p"; then
- echo "Patchelfing $p"
- patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p
- fi
- done
- ''
- )
- + lib.optionalString stdenv.hostPlatform.isDarwin ''
- # not enough room in the object files for the full path to libiconv :(
- for exe in $(find "$out" -type f -executable); do
- isScript $exe && continue
- ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
- install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
- done
-
- for file in $(find "$out" -name setup-config); do
- substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)"
- done
- ''
- + lib.optionalString minimal ''
- # Remove profiling files
- find $out -type f -name '*.p_o' -delete
- find $out -type f -name '*.p_hi' -delete
- find $out -type f -name '*_p.a' -delete
- # `-f` because e.g. musl bindist does not have this file.
- rm -f $out/lib/ghc-*/bin/ghc-iserv-prof
- # Hydra will redistribute this derivation, so we have to keep the docs for
- # legal reasons (retaining the legal notices etc)
- # As a last resort we could unpack the docs separately and symlink them in.
- # They're in $out/share/{doc,man}.
- ''
- # Recache package db which needs to happen for Hadrian bindists
- # where we modify the package db before installing
- + ''
- shopt -s nullglob
- package_db=("$out"/lib/ghc-*/lib/package.conf.d "$out"/lib/ghc-*/package.conf.d)
- "$out/bin/ghc-pkg" --package-db="$package_db" recache
- '';
-
- # GHC cannot currently produce outputs that are ready for `-pie` linking.
- # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear.
- # See:
- # * https://github.com/NixOS/nixpkgs/issues/129247
- # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580
- hardeningDisable = [ "pie" ];
-
- doInstallCheck = true;
- installCheckPhase = ''
- # Sanity check, can ghc create executables?
- cd $TMP
- mkdir test-ghc; cd test-ghc
- cat > main.hs << EOF
- {-# LANGUAGE TemplateHaskell #-}
- module Main where
- main = putStrLn \$([|"yes"|])
- EOF
- env -i $out/bin/ghc --make main.hs || exit 1
- echo compilation ok
- [ $(./main) == "yes" ]
- '';
-
- passthru = {
- targetPrefix = "";
- enableShared = true;
-
- llvmPackages = null;
-
- # Our Cabal compiler name
- haskellCompilerName = "ghc-${version}";
- }
- # We duplicate binDistUsed here since we have a sensible default even if no bindist is available,
- # this makes sure that getting the `meta` attribute doesn't throw even on unsupported platforms.
- // lib.optionalAttrs (ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}.isHadrian or false) {
- # Normal GHC derivations expose the hadrian derivation used to build them
- # here. In the case of bindists we just make sure that the attribute exists,
- # as it is used for checking if a GHC derivation has been built with hadrian.
- # The isHadrian mechanism will become obsolete with GHCs that use hadrian
- # exclusively, i.e. 9.6 (and 9.4?).
- hadrian = null;
- };
-
- meta = {
- homepage = "http://haskell.org/ghc";
- description = "Glasgow Haskell Compiler";
- license = lib.licenses.bsd3;
- # HACK: since we can't encode the libc / abi in platforms, we need
- # to make the platform list dependent on the evaluation platform
- # in order to avoid eval errors with musl which supports less
- # platforms than the default libcs (i. e. glibc / libSystem).
- # This is done for the benefit of Hydra, so `packagePlatforms`
- # won't return any platforms that would cause an evaluation
- # failure for `pkgsMusl.haskell.compiler.ghc922Binary`, as
- # long as the evaluator runs on a platform that supports
- # `pkgsMusl`.
- platforms = builtins.attrNames ghcBinDists.${distSetName};
- teams = [ lib.teams.haskell ];
- broken = !(import ./common-have-ncg.nix { inherit lib stdenv version; });
- };
-}
diff --git a/pkgs/development/compilers/ghc/9.6.3-binary.nix b/pkgs/development/compilers/ghc/9.6.3-binary.nix
deleted file mode 100644
index 2ca353f8ee213..0000000000000
--- a/pkgs/development/compilers/ghc/9.6.3-binary.nix
+++ /dev/null
@@ -1,474 +0,0 @@
-{
- lib,
- stdenv,
- fetchurl,
- perl,
- gcc,
- ncurses5,
- ncurses6,
- gmp,
- libiconv,
- numactl,
- libffi,
- coreutils,
- targetPackages,
-
- # minimal = true; will remove files that aren't strictly necessary for
- # regular builds and GHC bootstrapping.
- # This is "useful" for staying within hydra's output limits for at least the
- # aarch64-linux architecture.
- minimal ? false,
-}:
-
-# Prebuilt only does native
-assert stdenv.targetPlatform == stdenv.hostPlatform;
-
-let
- downloadsUrl = "https://downloads.haskell.org/ghc";
-
- # Copy sha256 from https://downloads.haskell.org/~ghc/9.6.3/SHA256SUMS
- version = "9.6.3";
-
- # Information about available bindists that we use in the build.
- #
- # # Bindist library checking
- #
- # The field `archSpecificLibraries` also provides a way for us get notified
- # early when the upstream bindist changes its dependencies (e.g. because a
- # newer Debian version is used that uses a new `ncurses` version).
- #
- # Usage:
- #
- # * You can find the `fileToCheckFor` of libraries by running `readelf -d`
- # on the compiler binary (`exePathForLibraryCheck`).
- # * To skip library checking for an architecture,
- # set `exePathForLibraryCheck = null`.
- # * To skip file checking for a specific arch specific library,
- # set `fileToCheckFor = null`.
- ghcBinDists = {
- # Binary distributions for the default libc (e.g. glibc, or libSystem on Darwin)
- # nixpkgs uses for the respective system.
- defaultLibc = {
- i686-linux = {
- variantSuffix = "";
- src = {
- url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz";
- sha256 = "58be26f8b8f6b5bd8baf5c32abb03e2c4621646b2142fab10e5c7de5af5c50f8";
- };
- exePathForLibraryCheck = "bin/ghc";
- archSpecificLibraries = [
- {
- nixPackage = gmp;
- fileToCheckFor = null;
- }
- # The i686-linux bindist provided by GHC HQ is currently built on Debian 9,
- # which link it against `libtinfo.so.5` (ncurses 5).
- # Other bindists are linked `libtinfo.so.6` (ncurses 6).
- {
- nixPackage = ncurses5;
- fileToCheckFor = "libtinfo.so.5";
- }
- ];
- };
- x86_64-linux = {
- variantSuffix = "";
- src = {
- url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-deb11-linux.tar.xz";
- sha256 = "c4c0124857265926f1cf22a09d950d7ba989ff94053a4ddf3dcdab5359f4cab7";
- };
- exePathForLibraryCheck = "bin/ghc";
- archSpecificLibraries = [
- {
- nixPackage = gmp;
- fileToCheckFor = null;
- }
- {
- nixPackage = ncurses6;
- fileToCheckFor = "libtinfo.so.6";
- }
- ];
- };
- aarch64-linux = {
- variantSuffix = "";
- src = {
- url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz";
- sha256 = "03c389859319f09452081310fc13af7525063ea8930830ef76be2a14b312271e";
- };
- exePathForLibraryCheck = "bin/ghc";
- archSpecificLibraries = [
- {
- nixPackage = gmp;
- fileToCheckFor = null;
- }
- {
- nixPackage = ncurses6;
- fileToCheckFor = "libtinfo.so.6";
- }
- {
- nixPackage = numactl;
- fileToCheckFor = null;
- }
- ];
- };
- x86_64-darwin = {
- variantSuffix = "";
- src = {
- url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
- sha256 = "dde46118ab8388fb1066312c097123e93b1dcf6ae366e3370f88ea456382c9db";
- };
- exePathForLibraryCheck = null; # we don't have a library check for darwin yet
- archSpecificLibraries = [
- {
- nixPackage = gmp;
- fileToCheckFor = null;
- }
- {
- nixPackage = ncurses6;
- fileToCheckFor = null;
- }
- {
- nixPackage = libiconv;
- fileToCheckFor = null;
- }
- ];
- };
- aarch64-darwin = {
- variantSuffix = "";
- src = {
- url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-apple-darwin.tar.xz";
- sha256 = "e1cdf458926b2eaf52d2a8287d99a965040ff9051171f5c3b7467049cf0eb213";
- };
- exePathForLibraryCheck = null; # we don't have a library check for darwin yet
- archSpecificLibraries = [
- {
- nixPackage = gmp;
- fileToCheckFor = null;
- }
- {
- nixPackage = ncurses6;
- fileToCheckFor = null;
- }
- {
- nixPackage = libiconv;
- fileToCheckFor = null;
- }
- ];
- };
- };
- # Binary distributions for the musl libc for the respective system.
- musl = {
- x86_64-linux = {
- variantSuffix = "-musl";
- src = {
- url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-alpine3_12-linux.tar.xz";
- sha256 = "8f457af0aa40127049c11134c8793f64351a446e87da1f8ec256e1279b5ab61f";
- };
- exePathForLibraryCheck = "bin/ghc";
- archSpecificLibraries = [
- {
- nixPackage = gmp;
- fileToCheckFor = null;
- }
- {
- nixPackage = ncurses6;
- fileToCheckFor = "libncursesw.so.6";
- }
- ];
- };
- };
- };
-
- distSetName = if stdenv.hostPlatform.isMusl then "musl" else "defaultLibc";
-
- binDistUsed =
- ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}
- or (throw "cannot bootstrap GHC on this platform ('${stdenv.hostPlatform.system}' with libc '${distSetName}')");
-
- gmpUsed =
- (builtins.head (
- builtins.filter (
- drv: lib.hasPrefix "gmp" (drv.nixPackage.name or "")
- ) binDistUsed.archSpecificLibraries
- )).nixPackage;
-
- libPath = lib.makeLibraryPath (
- # Add arch-specific libraries.
- map ({ nixPackage, ... }: nixPackage) binDistUsed.archSpecificLibraries
- );
-
- libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH";
-
- runtimeDeps = [
- targetPackages.stdenv.cc
- targetPackages.stdenv.cc.bintools
- coreutils # for cat
- ]
- # On darwin, we need unwrapped bintools as well (for otool)
- ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
- targetPackages.stdenv.cc.bintools.bintools
- ];
-
-in
-
-stdenv.mkDerivation {
- inherit version;
- pname = "ghc-binary${binDistUsed.variantSuffix}";
-
- src = fetchurl binDistUsed.src;
-
- nativeBuildInputs = [ perl ];
-
- # Set LD_LIBRARY_PATH or equivalent so that the programs running as part
- # of the bindist installer can find the libraries they expect.
- # Cannot patchelf beforehand due to relative RPATHs that anticipate
- # the final install location.
- ${libEnvVar} = libPath;
-
- postUnpack =
- # Verify our assumptions of which `libtinfo.so` (ncurses) version is used,
- # so that we know when ghc bindists upgrade that and we need to update the
- # version used in `libPath`.
- lib.optionalString (binDistUsed.exePathForLibraryCheck != null)
- # Note the `*` glob because some GHCs have a suffix when unpacked, e.g.
- # the musl bindist has dir `ghc-VERSION-x86_64-unknown-linux/`.
- # As a result, don't shell-quote this glob when splicing the string.
- (
- let
- buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"'';
- in
- lib.concatStringsSep "\n" [
- ''
- shopt -u nullglob
- echo "Checking that ghc binary exists in bindist at ${buildExeGlob}"
- if ! test -e ${buildExeGlob}; then
- echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1;
- fi
- ''
- (lib.concatMapStringsSep "\n" (
- { fileToCheckFor, nixPackage }:
- lib.optionalString (fileToCheckFor != null) ''
- echo "Checking bindist for ${fileToCheckFor} to ensure that is still used"
- if ! readelf -d ${buildExeGlob} | grep "${fileToCheckFor}"; then
- echo >&2 "File ${fileToCheckFor} could not be found in ${binDistUsed.exePathForLibraryCheck} for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1;
- fi
-
- echo "Checking that the nix package ${nixPackage} contains ${fileToCheckFor}"
- if ! test -e "${lib.getLib nixPackage}/lib/${fileToCheckFor}"; then
- echo >&2 "Nix package ${nixPackage} did not contain ${fileToCheckFor} for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1;
- fi
- ''
- ) binDistUsed.archSpecificLibraries)
- ]
- )
- # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib
- # during linking
- + lib.optionalString stdenv.hostPlatform.isDarwin ''
- export NIX_LDFLAGS+=" -no_dtrace_dof"
- # not enough room in the object files for the full path to libiconv :(
- for exe in $(find . -type f -executable); do
- isMachO $exe || continue
- ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
- install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
- done
- ''
-
- # We have to patch the GMP paths for the ghc-bignum package, for hadrian by
- # modifying the package-db directly
- + ''
- find . -name 'ghc-bignum*.conf' \
- -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib gmpUsed}/lib' -i {} \;
- ''
- # Similar for iconv and libffi on darwin
- + lib.optionalString stdenv.hostPlatform.isDarwin ''
- find . -name 'base*.conf' \
- -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib libiconv}/lib' -i {} \;
-
- # To link RTS in the end we also need libffi now
- find . -name 'rts*.conf' \
- -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib libffi}/lib' \
- -e 's@/Library/Developer/.*/usr/include/ffi@${lib.getDev libffi}/include@' \
- -i {} \;
- ''
- +
- # Some platforms do HAVE_NUMA so -lnuma requires it in library-dirs in rts/package.conf.in
- # FFI_LIB_DIR is a good indication of places it must be needed.
- lib.optionalString
- (
- lib.meta.availableOn stdenv.hostPlatform numactl
- && builtins.any ({ nixPackage, ... }: nixPackage == numactl) binDistUsed.archSpecificLibraries
- )
- ''
- find . -name package.conf.in \
- -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \;
- ''
- +
- # Rename needed libraries and binaries, fix interpreter
- lib.optionalString stdenv.hostPlatform.isLinux ''
- find . -type f -executable -exec patchelf \
- --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \;
- '';
-
- # fix for `configure: error: Your linker is affected by binutils #16177`
- preConfigure = lib.optionalString stdenv.targetPlatform.isAarch32 "LD=ld.gold";
-
- # GHC has a patched config.sub and bindists' platforms should always work
- dontUpdateAutotoolsGnuConfigScripts = true;
-
- configurePlatforms = [ ];
- configureFlags =
- lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
- # From: https://github.com/NixOS/nixpkgs/pull/43369/commits
- ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
-
- # No building is necessary, but calling make without flags ironically
- # calls install-strip ...
- dontBuild = true;
-
- # GHC tries to remove xattrs when installing to work around Gatekeeper
- # (see https://gitlab.haskell.org/ghc/ghc/-/issues/17418). This step normally
- # succeeds in nixpkgs because xattrs are not allowed in the store, but it
- # can fail when a file has the `com.apple.provenance` xattr, and it can’t be
- # modified (such as target of the symlink to `libiconv.dylib`).
- # The `com.apple.provenance` xattr is a new feature of macOS as of macOS 13.
- # See: https://eclecticlight.co/2023/03/13/ventura-has-changed-app-quarantine-with-a-new-xattr/
- makeFlags = lib.optionals stdenv.buildPlatform.isDarwin [ "XATTR=/does-not-exist" ];
-
- # Patch scripts to include runtime dependencies in $PATH.
- postInstall = ''
- for i in "$out/bin/"*; do
- test ! -h "$i" || continue
- isScript "$i" || continue
- sed -i -e '2i export PATH="${lib.makeBinPath runtimeDeps}:$PATH"' "$i"
- done
- ''
- + lib.optionalString stdenv.targetPlatform.isDarwin ''
- # Work around building with binary GHC on Darwin due to GHC’s use of `ar -L` when it
- # detects `llvm-ar` even though the resulting archives are not supported by ld64.
- # https://gitlab.haskell.org/ghc/ghc/-/issues/23188
- # https://github.com/haskell/cabal/issues/8882
- sed -i -e 's/,("ar supports -L", "YES")/,("ar supports -L", "NO")/' "$out/lib/ghc-${version}/lib/settings"
- '';
-
- # Apparently necessary for the ghc Alpine (musl) bindist:
- # When we strip, and then run the
- # patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p
- # below, running ghc (e.g. during `installCheckPhase)` gives some apparently
- # corrupted rpath or whatever makes the loader work on nonsensical strings:
- # running install tests
- # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: : symbol not found
- # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: ir6zf6c9f86pfx8sr30n2vjy-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/../lib/x86_64-linux-ghc-8.10.5/libHSexceptions-0.10.4-ghc8.10.5.so: symbol not found
- # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: y/lib/ghc-8.10.5/bin/../lib/x86_64-linux-ghc-8.10.5/libHStemplate-haskell-2.16.0.0-ghc8.10.5.so: symbol not found
- # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: 8.10.5/libHStemplate-haskell-2.16.0.0-ghc8.10.5.so: symbol not found
- # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: �: symbol not found
- # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: �?: symbol not found
- # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: 64-linux-ghc-8.10.5/libHSexceptions-0.10.4-ghc8.10.5.so: symbol not found
- # This is extremely bogus and should be investigated.
- dontStrip = if stdenv.hostPlatform.isMusl then true else false; # `if` for explicitness
-
- # On Linux, use patchelf to modify the executables so that they can
- # find editline/gmp.
- postFixup =
- lib.optionalString (stdenv.hostPlatform.isLinux && !(binDistUsed.isStatic or false)) (
- if stdenv.hostPlatform.isAarch64 then
- # Keep rpath as small as possible on aarch64 for patchelf#244. All Elfs
- # are 2 directories deep from $out/lib, so pooling symlinks there makes
- # a short rpath.
- ''
- (cd $out/lib; ln -s ${ncurses6.out}/lib/libtinfo.so.6)
- (cd $out/lib; ln -s ${lib.getLib gmpUsed}/lib/libgmp.so.10)
- (cd $out/lib; ln -s ${numactl.out}/lib/libnuma.so.1)
- for p in $(find "$out/lib" -type f -name "*\.so*"); do
- (cd $out/lib; ln -s $p)
- done
-
- for p in $(find "$out/lib" -type f -executable); do
- if isELF "$p"; then
- echo "Patchelfing $p"
- patchelf --set-rpath "\$ORIGIN:\$ORIGIN/../.." $p
- fi
- done
- ''
- else
- ''
- for p in $(find "$out" -type f -executable); do
- if isELF "$p"; then
- echo "Patchelfing $p"
- patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p
- fi
- done
- ''
- )
- + lib.optionalString stdenv.hostPlatform.isDarwin ''
- # not enough room in the object files for the full path to libiconv :(
- for exe in $(find "$out" -type f -executable); do
- isMachO $exe || continue
- ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
- install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
- done
-
- for file in $(find "$out" -name setup-config); do
- substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)"
- done
- ''
- # Recache package db which needs to happen for Hadrian bindists
- # where we modify the package db before installing
- + ''
- package_db=("$out"/lib/ghc-*/lib/package.conf.d)
- "$out/bin/ghc-pkg" --package-db="$package_db" recache
- '';
-
- # GHC cannot currently produce outputs that are ready for `-pie` linking.
- # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear.
- # See:
- # * https://github.com/NixOS/nixpkgs/issues/129247
- # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580
- hardeningDisable = [ "pie" ];
-
- doInstallCheck = true;
- installCheckPhase = ''
- # Sanity check, can ghc create executables?
- cd $TMP
- mkdir test-ghc; cd test-ghc
- cat > main.hs << EOF
- {-# LANGUAGE TemplateHaskell #-}
- module Main where
- main = putStrLn \$([|"yes"|])
- EOF
- env -i $out/bin/ghc --make main.hs || exit 1
- echo compilation ok
- [ $(./main) == "yes" ]
- '';
-
- passthru = {
- targetPrefix = "";
- enableShared = true;
-
- llvmPackages = null;
-
- # Our Cabal compiler name
- haskellCompilerName = "ghc-${version}";
-
- # Normal GHC derivations expose the hadrian derivation used to build them
- # here. In the case of bindists we just make sure that the attribute exists,
- # as it is used for checking if a GHC derivation has been built with hadrian.
- hadrian = null;
- };
-
- meta = {
- homepage = "http://haskell.org/ghc";
- description = "Glasgow Haskell Compiler";
- license = lib.licenses.bsd3;
- # HACK: since we can't encode the libc / abi in platforms, we need
- # to make the platform list dependent on the evaluation platform
- # in order to avoid eval errors with musl which supports less
- # platforms than the default libcs (i. e. glibc / libSystem).
- # This is done for the benefit of Hydra, so `packagePlatforms`
- # won't return any platforms that would cause an evaluation
- # failure for `pkgsMusl.haskell.compiler.ghc922Binary`, as
- # long as the evaluator runs on a platform that supports
- # `pkgsMusl`.
- platforms = builtins.attrNames ghcBinDists.${distSetName};
- teams = [ lib.teams.haskell ];
- broken = !(import ./common-have-ncg.nix { inherit lib stdenv version; });
- };
-}
diff --git a/pkgs/development/compilers/ghc/9.8.4-binary.nix b/pkgs/development/compilers/ghc/9.8.4-binary.nix
index df3f507f33d86..0ef74e55f4307 100644
--- a/pkgs/development/compilers/ghc/9.8.4-binary.nix
+++ b/pkgs/development/compilers/ghc/9.8.4-binary.nix
@@ -100,10 +100,6 @@ let
nixPackage = ncurses6;
fileToCheckFor = "libtinfo.so.6";
}
- {
- nixPackage = numactl;
- fileToCheckFor = null;
- }
];
};
x86_64-darwin = {
@@ -432,13 +428,6 @@ stdenv.mkDerivation {
"$out/bin/ghc-pkg" --package-db="$package_db" recache
'';
- # GHC cannot currently produce outputs that are ready for `-pie` linking.
- # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear.
- # See:
- # * https://github.com/NixOS/nixpkgs/issues/129247
- # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580
- hardeningDisable = [ "pie" ];
-
doInstallCheck = true;
installCheckPhase = ''
# Sanity check, can ghc create executables?
diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix
index 62691f861584e..e32880fb02b7c 100644
--- a/pkgs/development/compilers/ghc/common-hadrian.nix
+++ b/pkgs/development/compilers/ghc/common-hadrian.nix
@@ -55,7 +55,8 @@
gmp,
# If enabled, use -fPIC when compiling static libs.
- enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform,
+ enableRelocatedStaticLibs ?
+ stdenv.targetPlatform != stdenv.hostPlatform && !stdenv.targetPlatform.isWindows,
# Exceeds Hydra output limit (at the time of writing ~3GB) when cross compiled to riscv64.
# A riscv64 cross-compiler fits into the limit comfortably.
@@ -185,32 +186,9 @@
|| (lib.versionAtLeast version "9.8" && lib.versionOlder version "9.11");
in
- 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") [
+ lib.optionals (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
+ # settings file: https://gitlab.haskell.org/ghc/ghc/-/issues/23317 krank:ignore-line
(fetchpatch {
name = "ghc-9.6-fix-unlit-path.patch";
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/8fde4ac84ec7b1ead238cb158bbef48555d12af9.patch";
@@ -223,7 +201,7 @@
#
# These cause problems as they're not eliminated by GHC's dead code
# elimination on aarch64-darwin. (see
- # https://github.com/NixOS/nixpkgs/issues/140774 for details).
+ # https://github.com/NixOS/nixpkgs/issues/140774 for details). krank:ignore-line
(
if lib.versionOlder version "9.10" then
./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch
@@ -239,12 +217,17 @@
hash = "sha256-sb+AHdkGkCu8MW0xoQIpD5kEc0zYX8udAMDoC+TWc0Q=";
})
]
+ ++ lib.optionals stdenv.targetPlatform.isGhcjs [
+ # https://gitlab.haskell.org/ghc/ghc/-/issues/26290
+ ./export-heap-methods.patch
+ ]
# Prevents passing --hyperlinked-source to haddock. Note that this can
# be configured via a user defined flavour now. Unfortunately, it is
# impossible to import an existing flavour in UserSettings, so patching
# the defaults is actually simpler and less maintenance intensive
# compared to keeping an entire flavour definition in sync with upstream
- # manually. See also https://gitlab.haskell.org/ghc/ghc/-/issues/23625
+ # manually.
+ # See also https://gitlab.haskell.org/ghc/ghc/-/issues/23625 krank:ignore-line
++ lib.optionals (!enableHyperlinkedSource) [
(
if lib.versionOlder version "9.8" then
@@ -279,7 +262,7 @@
]
# Fixes stack overrun in rts which crashes an process whenever
# freeHaskellFunPtr is called with nixpkgs' hardening flags.
- # https://gitlab.haskell.org/ghc/ghc/-/issues/25485
+ # https://gitlab.haskell.org/ghc/ghc/-/issues/25485 krank:ignore-line
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13599
++ lib.optionals (lib.versionOlder version "9.13") [
(fetchpatch {
@@ -292,7 +275,9 @@
# Missing ELF symbols
++ lib.optionals stdenv.targetPlatform.isAndroid [
./ghc-define-undefined-elf-st-visibility.patch
- ];
+ ]
+
+ ++ (import ./common-llvm-patches.nix { inherit lib version fetchpatch; });
stdenv = stdenvNoCC;
},
@@ -348,6 +333,8 @@ let
# documentation) makes the GHC RTS able to load static libraries, which may
# be needed for TemplateHaskell. This solution was described in
# https://www.tweag.io/blog/2020-09-30-bazel-static-haskell
+ #
+ # Note `-fexternal-dynamic-refs` causes `undefined reference` errors when building GHC cross compiler for windows
lib.optionals enableRelocatedStaticLibs [
"*.*.ghc.*.opts += -fPIC -fexternal-dynamic-refs"
]
@@ -780,14 +767,8 @@ stdenv.mkDerivation (
checkTarget = "test";
- # GHC cannot currently produce outputs that are ready for `-pie` linking.
- # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear.
- # See:
- # * https://github.com/NixOS/nixpkgs/issues/129247
- # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580
hardeningDisable = [
"format"
- "pie"
];
# big-parallel allows us to build with more than 2 cores on
@@ -808,7 +789,8 @@ stdenv.mkDerivation (
''
# the bindist configure script uses different env variables than the GHC configure script
- # see https://github.com/NixOS/nixpkgs/issues/267250 and https://gitlab.haskell.org/ghc/ghc/-/issues/24211
+ # see https://github.com/NixOS/nixpkgs/issues/267250 krank:ignore-line
+ # https://gitlab.haskell.org/ghc/ghc/-/issues/24211 krank:ignore-line
+ lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
export InstallNameToolCmd=$INSTALL_NAME_TOOL
export OtoolCmd=$OTOOL
@@ -894,8 +876,6 @@ stdenv.mkDerivation (
timeout = 24 * 3600;
platforms = lib.platforms.all;
inherit (bootPkgs.ghc.meta) license;
- # To be fixed by .
- broken = useLLVM;
};
dontStrip = targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm;
diff --git a/pkgs/development/compilers/ghc/common-llvm-patches.nix b/pkgs/development/compilers/ghc/common-llvm-patches.nix
new file mode 100644
index 0000000000000..999e77f44ad42
--- /dev/null
+++ b/pkgs/development/compilers/ghc/common-llvm-patches.nix
@@ -0,0 +1,126 @@
+{
+ lib,
+ version,
+ fetchpatch,
+}:
+
+# Backports for LLVM support.
+#
+# These primarily focus on backporting patches that are relevant to
+# supporting newer LLVM versions, rather than aiming to backport every
+# LLVM backend bug fix or improvement from newer GHC releases.
+#
+# Potentially of interest for cross‐compiling GHC 9.4.8 to LoongArch64:
+#
+# *
+# *
+
+[ ]
+
+++ lib.optionals (lib.versionOlder version "9.6") [
+ #
+ (fetchpatch {
+ name = "ghc-9.4-llvm-support-15.patch";
+ url = "https://gitlab.haskell.org/ghc/ghc/-/commit/0cc16aaf89d7dc3963764b7193ceac73e4e3329b.patch";
+ hash = "sha256-G0gqrj5iPuQ5JuC2+d151yka72XZMbrqMWPZd4EuT04=";
+ })
+
+ #
+ ./ghc-9.4-llvm-fix-version-detection.patch
+]
+
+++ lib.optionals (lib.versionOlder version "9.8") [
+ (
+ # The upstream backport of !13763 in 9.6.7 removed an unused import
+ # that is required by the next series.
+ if lib.versionOlder version "9.6" then null else ./ghc-9.6-llvm-restore-import.patch
+ )
+]
+
+++ lib.optionals (lib.versionOlder version "9.10") [
+ #
+ (
+ if lib.versionOlder version "9.8" then
+ ./ghc-9.4-llvm-add-metadata-exports.patch
+ else
+ fetchpatch {
+ name = "ghc-9.8-llvm-add-metadata-exports.patch";
+ url = "https://gitlab.haskell.org/ghc/ghc/-/commit/fcfc1777c22ad47613256c3c5e7304cfd29bc761.patch";
+ hash = "sha256-9rpyeH8TUVeKoW4PA6qn7DG2+P9MhBCywmbi1O/NsTQ=";
+ }
+ )
+ (
+ if lib.versionOlder version "9.8" then
+ ./ghc-9.4-llvm-allow-llvmlits-in-metaexprs.patch
+ else
+ fetchpatch {
+ name = "ghc-9.8-llvm-allow-llvmlits-in-metaexprs.patch";
+ url = "https://gitlab.haskell.org/ghc/ghc/-/commit/5880fff6d353a14785c457999fded5a7100c9514.patch";
+ hash = "sha256-NDMGNc0PYpWJUW+nI2YvMsBOWRIfNix4oWHQZAIxrVY=";
+ }
+ )
+ (
+ # `GHC.Driver.DynFlags` was not split out until 9.8, so this can be
+ # omitted with no functional effect on the rest of the series on
+ # earlier versions.
+ if lib.versionOlder version "9.8" then
+ null
+ else
+ fetchpatch {
+ name = "ghc-9.8-move-feature-predicates-to-dynflags.patch";
+ url = "https://gitlab.haskell.org/ghc/ghc/-/commit/86ce92a2f81a04aa980da2891d0e300cb3cb7efd.patch";
+ hash = "sha256-SzJgzq4b5wAMPz+/QSa67iSOxB2enqejvV0lsF0+9L8=";
+ }
+ )
+ (fetchpatch {
+ name = "ghc-9.4-llvm-add-module-flag-metadata-infra.patch";
+ url = "https://gitlab.haskell.org/ghc/ghc/-/commit/a6a3874276ced1b037365c059dcd0a758e813a5b.patch";
+ hash = "sha256-tAYDRNXmpp5cZtyONpO8vlsDmnNEBbh4J3oSCy/uWWc=";
+ })
+ (
+ if lib.versionOlder version "9.8" then
+ ./ghc-9.4-llvm-fix-stack-alignment.patch
+ else
+ fetchpatch {
+ name = "ghc-9.8-llvm-fix-stack-alignment.patch";
+ url = "https://gitlab.haskell.org/ghc/ghc/-/commit/e9af2cf3f16ab60b5c79ed91df95359b11784df6.patch";
+ hash = "sha256-RmYwFN3c3AgJxF9KXWQLdwOgugzepCW1wcTdJX1h0C4=";
+ }
+ )
+
+ #
+ (
+ if lib.versionOlder version "9.6" then
+ ./ghc-9.4-llvm-use-new-pass-manager.patch
+ else if lib.versionOlder version "9.8" then
+ ./ghc-9.6-llvm-use-new-pass-manager.patch
+ else
+ ./ghc-9.8-llvm-use-new-pass-manager.patch
+ )
+]
+
+++ lib.optionals (lib.versionOlder version "9.12") [
+ #
+ (fetchpatch {
+ name = "ghc-9.4-llvm-support-16-17-18.patch";
+ url = "https://gitlab.haskell.org/ghc/ghc/-/commit/ae170155e82f1e5f78882f7a682d02a8e46a5823.patch";
+ hash = "sha256-U1znWqXZTORmAg480p5TjTL53T2Zn+1+9Fnk2V1Drfs=";
+ })
+
+ #
+ (fetchpatch {
+ name = "ghc-9.4-llvm-support-19.patch";
+ url = "https://gitlab.haskell.org/ghc/ghc/-/commit/36bbb167f354a2fbc6c4842755f2b1e374e3580e.patch";
+ excludes = [ ".gitlab-ci.yml" ];
+ hash = "sha256-v8T/FtriDPbibcIDZmU2yotBoDVo+wU2+gw+CCdQlm0=";
+ })
+]
+
+++ lib.optionals (lib.versionOlder version "9.14") [
+ #
+ (fetchpatch {
+ name = "ghc-9.4-llvm-support-20.patch";
+ url = "https://gitlab.haskell.org/ghc/ghc/-/commit/ca03226db2db2696460bfcb8035dd3268d546706.patch";
+ hash = "sha256-7cO049DQtJHUAhwPujoFO+zQtXsMg6VFTHtMDwenrKs=";
+ })
+]
diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix
index 401a65a11ded7..2300e0470ca79 100644
--- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix
+++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix
@@ -14,14 +14,12 @@
# build-tools
bootPkgs,
- autoconf,
- automake,
+ autoreconfHook,
coreutils,
fetchpatch,
fetchurl,
perl,
python3,
- m4,
sphinx,
xattr,
autoSignDarwinBinariesHook,
@@ -134,7 +132,7 @@ let
# program is built (which we generally always want to have a complete GHC install)
# and whether it is run on the GHC sources to generate hyperlinked source code
# (which is impossible for cross-compilation); see:
- # https://gitlab.haskell.org/ghc/ghc/-/issues/20077
+ # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 krank:ignore-line
# This implies that currently a cross-compiled GHC will never have a `haddock`
# program, so it can never generate haddocks for any packages.
# If this is solved in the future, we'd like to unconditionally
@@ -292,8 +290,8 @@ stdenv.mkDerivation (
patches = [
# 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
+ # https://github.com/haskell/ghcup-hs/issues/1107 krank:ignore-line
+ # https://gitlab.haskell.org/ghc/ghc/-/issues/25095 krank:ignore-line
# 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 {
@@ -304,7 +302,7 @@ stdenv.mkDerivation (
extraPrefix = "libraries/unix/";
})
- # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129
+ # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 krank:ignore-line
./docs-sphinx-7.patch
# Correctly record libnuma's library and include directories in the
@@ -328,7 +326,7 @@ stdenv.mkDerivation (
# the solution is to backport those changes from GHC 9.6 that skip the intermediate
# assembly step.
#
- # https://gitlab.haskell.org/ghc/ghc/-/issues/25608#note_622589
+ # https://gitlab.haskell.org/ghc/ghc/-/issues/25608#note_622589 krank:ignore-line
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6877
++ [
# Need to use this patch so the next one applies, passes file location info to the cc phase
@@ -369,7 +367,7 @@ stdenv.mkDerivation (
# Fixes stack overrun in rts which crashes an process whenever
# freeHaskellFunPtr is called with nixpkgs' hardening flags.
- # https://gitlab.haskell.org/ghc/ghc/-/issues/25485
+ # https://gitlab.haskell.org/ghc/ghc/-/issues/25485 krank:ignore-line
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13599
# TODO: patch doesn't apply for < 9.4, but may still be necessary?
++ [
@@ -386,9 +384,11 @@ stdenv.mkDerivation (
#
# These cause problems as they're not eliminated by GHC's dead code
# elimination on aarch64-darwin. (see
- # https://github.com/NixOS/nixpkgs/issues/140774 for details).
+ # https://github.com/NixOS/nixpkgs/issues/140774 for details). krank:ignore-line
./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch
- ];
+ ]
+
+ ++ (import ./common-llvm-patches.nix { inherit lib version fetchpatch; });
postPatch = "patchShebangs .";
@@ -444,7 +444,6 @@ stdenv.mkDerivation (
export AR_STAGE0="$AR_FOR_BUILD"
echo -n "${buildMK}" > mk/build.mk
- sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
''
# Haddock and sphinx need a working locale
+ lib.optionalString (enableDocs || enableHaddockProgram) (
@@ -479,8 +478,7 @@ stdenv.mkDerivation (
grep linux-musl llvm-targets | sed 's/^/ /'
echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
- # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
- for x in configure aclocal.m4; do
+ for x in aclocal.m4; do
substituteInPlace $x \
--replace '*-android*|*-gnueabi*)' \
'*-android*|*-gnueabi*|*-musleabi*)'
@@ -547,10 +545,8 @@ stdenv.mkDerivation (
dontAddExtraLibs = true;
nativeBuildInputs = [
+ autoreconfHook
perl
- autoconf
- automake
- m4
python3
bootPkgs.alex
bootPkgs.happy
@@ -600,14 +596,8 @@ stdenv.mkDerivation (
checkTarget = "test";
- # GHC cannot currently produce outputs that are ready for `-pie` linking.
- # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear.
- # See:
- # * https://github.com/NixOS/nixpkgs/issues/129247
- # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580
hardeningDisable = [
"format"
- "pie"
];
# big-parallel allows us to build with more than 2 cores on
@@ -683,8 +673,6 @@ stdenv.mkDerivation (
timeout = 24 * 3600;
platforms = lib.platforms.all;
inherit (bootPkgs.ghc.meta) license;
- # To be fixed by .
- broken = useLLVM;
};
}
diff --git a/pkgs/development/compilers/ghc/docs-sphinx-7.patch b/pkgs/development/compilers/ghc/docs-sphinx-7.patch
index 49fa45d1b9a23..d1321c4214920 100644
--- a/pkgs/development/compilers/ghc/docs-sphinx-7.patch
+++ b/pkgs/development/compilers/ghc/docs-sphinx-7.patch
@@ -1,6 +1,6 @@
Fix build of docs after sphinx update.
https://github.com/sphinx-doc/sphinx/pull/11381
-https://gitlab.haskell.org/ghc/ghc/-/issues/24129
+https://gitlab.haskell.org/ghc/ghc/-/issues/24129 krank:ignore-line
--- a/docs/users_guide/rtd-theme/layout.html
+++ b/docs/users_guide/rtd-theme/layout.html
@@ -67 +67 @@
diff --git a/pkgs/development/compilers/ghc/export-heap-methods.patch b/pkgs/development/compilers/ghc/export-heap-methods.patch
new file mode 100644
index 0000000000000..ff4ce1263aee9
--- /dev/null
+++ b/pkgs/development/compilers/ghc/export-heap-methods.patch
@@ -0,0 +1,11 @@
+diff --git a/rts/js/mem.js b/rts/js/mem.js
+index 44c5c37ac4..1f150c5d55 100644
+--- a/rts/js/mem.js
++++ b/rts/js/mem.js
+@@ -1,5 +1,5 @@
+ //#OPTIONS:CPP
+-//#OPTIONS:EMCC:EXPORTED_RUNTIME_METHODS=addFunction,removeFunction,getEmptyTableSlot
++//#OPTIONS:EMCC:EXPORTED_RUNTIME_METHODS=addFunction,removeFunction,getEmptyTableSlot,HEAP8,HEAPU8
+
+ // #define GHCJS_TRACE_META 1
+
diff --git a/pkgs/development/compilers/ghc/ghc-9.4-llvm-add-metadata-exports.patch b/pkgs/development/compilers/ghc/ghc-9.4-llvm-add-metadata-exports.patch
new file mode 100644
index 0000000000000..ec2fa19d452c8
--- /dev/null
+++ b/pkgs/development/compilers/ghc/ghc-9.4-llvm-add-metadata-exports.patch
@@ -0,0 +1,31 @@
+From 701154fdbceff2edb121768eb660713a98580af8 Mon Sep 17 00:00:00 2001
+From: Ben Gamari
+Date: Tue, 22 Aug 2023 12:23:26 -0400
+Subject: [PATCH] llvmGen: Add export list to GHC.Llvm.MetaData
+
+(cherry picked from commit fcfc1777c22ad47613256c3c5e7304cfd29bc761)
+---
+ compiler/GHC/Llvm/MetaData.hs | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/compiler/GHC/Llvm/MetaData.hs b/compiler/GHC/Llvm/MetaData.hs
+index f46ae0a101..3526c11bc3 100644
+--- a/compiler/GHC/Llvm/MetaData.hs
++++ b/compiler/GHC/Llvm/MetaData.hs
+@@ -1,6 +1,12 @@
+ {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+
+-module GHC.Llvm.MetaData where
++module GHC.Llvm.MetaData
++ ( MetaId(..)
++ , ppr
++ , MetaExpr(..)
++ , MetaAnnot(..)
++ , MetaDecl(..)
++ ) where
+
+ import GHC.Prelude
+
+--
+2.50.1
+
diff --git a/pkgs/development/compilers/ghc/ghc-9.4-llvm-allow-llvmlits-in-metaexprs.patch b/pkgs/development/compilers/ghc/ghc-9.4-llvm-allow-llvmlits-in-metaexprs.patch
new file mode 100644
index 0000000000000..6c34f9800472b
--- /dev/null
+++ b/pkgs/development/compilers/ghc/ghc-9.4-llvm-allow-llvmlits-in-metaexprs.patch
@@ -0,0 +1,40 @@
+From 51765e343e9829f1d3e95d1d7303fa3594ae91cc Mon Sep 17 00:00:00 2001
+From: Ben Gamari
+Date: Tue, 22 Aug 2023 12:24:53 -0400
+Subject: [PATCH] llvmGen: Allow LlvmLits in MetaExprs
+
+This omission appears to be an oversight.
+
+(cherry picked from commit 5880fff6d353a14785c457999fded5a7100c9514)
+---
+ compiler/GHC/Llvm/MetaData.hs | 1 +
+ compiler/GHC/Llvm/Ppr.hs | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/compiler/GHC/Llvm/MetaData.hs b/compiler/GHC/Llvm/MetaData.hs
+index f46ae0a101..121cdd5788 100644
+--- a/compiler/GHC/Llvm/MetaData.hs
++++ b/compiler/GHC/Llvm/MetaData.hs
+@@ -68,6 +68,7 @@ instance Outputable MetaId where
+
+ -- | LLVM metadata expressions
+ data MetaExpr = MetaStr !LMString
++ | MetaLit !LlvmLit
+ | MetaNode !MetaId
+ | MetaVar !LlvmVar
+ | MetaStruct [MetaExpr]
+diff --git a/compiler/GHC/Llvm/Ppr.hs b/compiler/GHC/Llvm/Ppr.hs
+index f48e7aa034..bc88a13439 100644
+--- a/compiler/GHC/Llvm/Ppr.hs
++++ b/compiler/GHC/Llvm/Ppr.hs
+@@ -256,6 +256,7 @@ ppMetaExpr :: LlvmCgConfig -> MetaExpr -> SDoc
+ ppMetaExpr opts = \case
+ MetaVar (LMLitVar (LMNullLit _)) -> text "null"
+ MetaStr s -> char '!' <> doubleQuotes (ftext s)
++ MetaLit l -> ppTypeLit opts l
+ MetaNode n -> ppr n
+ MetaVar v -> ppVar opts v
+ MetaStruct es -> char '!' <> braces (ppCommaJoin (map (ppMetaExpr opts) es))
+--
+2.50.1
+
diff --git a/pkgs/development/compilers/ghc/ghc-9.4-llvm-fix-stack-alignment.patch b/pkgs/development/compilers/ghc/ghc-9.4-llvm-fix-stack-alignment.patch
new file mode 100644
index 0000000000000..23c4e0717c5ec
--- /dev/null
+++ b/pkgs/development/compilers/ghc/ghc-9.4-llvm-fix-stack-alignment.patch
@@ -0,0 +1,137 @@
+From 646d62e74c16be785ef08735ae5b24f4af6bcf78 Mon Sep 17 00:00:00 2001
+From: Ben Gamari
+Date: Tue, 22 Aug 2023 13:26:58 -0400
+Subject: [PATCH] llvmGen: Don't pass stack alignment via command line
+
+As of https://reviews.llvm.org/D103048 LLVM no longer supports the
+`-stack-alignment=...` flag. Instead this information is passed via a
+module flag metadata node.
+
+This requires dropping support for LLVM 11 and 12.
+
+Fixes #23870
+
+(cherry picked from commit e9af2cf3f16ab60b5c79ed91df95359b11784df6)
+---
+ compiler/GHC/CmmToLlvm.hs | 29 ++++++++++++++++++++++++-
+ compiler/GHC/CmmToLlvm/Config.hs | 1 +
+ compiler/GHC/Driver/Config/CmmToLlvm.hs | 1 +
+ compiler/GHC/Driver/Pipeline/Execute.hs | 7 ------
+ configure.ac | 2 +-
+ 5 files changed, 31 insertions(+), 9 deletions(-)
+
+diff --git a/compiler/GHC/CmmToLlvm.hs b/compiler/GHC/CmmToLlvm.hs
+index 7d48693765..b9036daef1 100644
+--- a/compiler/GHC/CmmToLlvm.hs
++++ b/compiler/GHC/CmmToLlvm.hs
+@@ -190,7 +190,7 @@ cmmLlvmGen _ = return ()
+
+ cmmMetaLlvmPrelude :: LlvmM ()
+ cmmMetaLlvmPrelude = do
+- metas <- flip mapM stgTBAA $ \(uniq, name, parent) -> do
++ tbaa_metas <- flip mapM stgTBAA $ \(uniq, name, parent) -> do
+ -- Generate / lookup meta data IDs
+ tbaaId <- getMetaUniqueId
+ setUniqMeta uniq tbaaId
+@@ -203,9 +203,36 @@ cmmMetaLlvmPrelude = do
+ -- just a name on its own. Previously `null` was accepted as the
+ -- name.
+ Nothing -> [ MetaStr name ]
++
++ platform <- getPlatform
++ cfg <- getConfig
++ let stack_alignment_metas =
++ case platformArch platform of
++ ArchX86_64 | llvmCgAvxEnabled cfg -> [mkStackAlignmentMeta 32]
++ _ -> []
++ module_flags_metas <- mkModuleFlagsMeta stack_alignment_metas
++ let metas = tbaa_metas ++ module_flags_metas
+ cfg <- getConfig
+ renderLlvm $ ppLlvmMetas cfg metas
+
++mkNamedMeta :: LMString -> [MetaExpr] -> LlvmM [MetaDecl]
++mkNamedMeta name exprs = do
++ (ids, decls) <- unzip <$> mapM f exprs
++ return $ decls ++ [MetaNamed name ids]
++ where
++ f expr = do
++ i <- getMetaUniqueId
++ return (i, MetaUnnamed i expr)
++
++mkModuleFlagsMeta :: [ModuleFlag] -> LlvmM [MetaDecl]
++mkModuleFlagsMeta =
++ mkNamedMeta "llvm.module.flags" . map moduleFlagToMetaExpr
++
++mkStackAlignmentMeta :: Integer -> ModuleFlag
++mkStackAlignmentMeta alignment =
++ ModuleFlag MFBError "override-stack-alignment" (MetaLit $ LMIntLit alignment i32)
++
++
+ -- -----------------------------------------------------------------------------
+ -- | Marks variables as used where necessary
+ --
+diff --git a/compiler/GHC/CmmToLlvm/Config.hs b/compiler/GHC/CmmToLlvm/Config.hs
+index 649a33c2f6..ecab7fdcc1 100644
+--- a/compiler/GHC/CmmToLlvm/Config.hs
++++ b/compiler/GHC/CmmToLlvm/Config.hs
+@@ -36,6 +36,7 @@ data LlvmCgConfig = LlvmCgConfig
+ , llvmCgContext :: !SDocContext -- ^ Context for LLVM code generation
+ , llvmCgFillUndefWithGarbage :: !Bool -- ^ Fill undefined literals with garbage values
+ , llvmCgSplitSection :: !Bool -- ^ Split sections
++ , llvmCgAvxEnabled :: !Bool
+ , llvmCgBmiVersion :: Maybe BmiVersion -- ^ (x86) BMI instructions
+ , llvmCgLlvmVersion :: Maybe LlvmVersion -- ^ version of Llvm we're using
+ , llvmCgDoWarn :: !Bool -- ^ True ==> warn unsupported Llvm version
+diff --git a/compiler/GHC/Driver/Config/CmmToLlvm.hs b/compiler/GHC/Driver/Config/CmmToLlvm.hs
+index 8097bbec7e..752ba987ca 100644
+--- a/compiler/GHC/Driver/Config/CmmToLlvm.hs
++++ b/compiler/GHC/Driver/Config/CmmToLlvm.hs
+@@ -23,6 +23,7 @@ initLlvmCgConfig logger config_cache dflags = do
+ , llvmCgContext = initSDocContext dflags PprCode
+ , llvmCgFillUndefWithGarbage = gopt Opt_LlvmFillUndefWithGarbage dflags
+ , llvmCgSplitSection = gopt Opt_SplitSections dflags
++ , llvmCgAvxEnabled = isAvxEnabled dflags
+ , llvmCgBmiVersion = case platformArch (targetPlatform dflags) of
+ ArchX86_64 -> bmiVersion dflags
+ ArchX86 -> bmiVersion dflags
+diff --git a/compiler/GHC/Driver/Pipeline/Execute.hs b/compiler/GHC/Driver/Pipeline/Execute.hs
+index fac2a595f2..4fa72be475 100644
+--- a/compiler/GHC/Driver/Pipeline/Execute.hs
++++ b/compiler/GHC/Driver/Pipeline/Execute.hs
+@@ -992,8 +992,6 @@ llvmOptions llvm_config dflags =
+ [("-enable-tbaa -tbaa", "-enable-tbaa") | gopt Opt_LlvmTBAA dflags ]
+ ++ [("-relocation-model=" ++ rmodel
+ ,"-relocation-model=" ++ rmodel) | not (null rmodel)]
+- ++ [("-stack-alignment=" ++ (show align)
+- ,"-stack-alignment=" ++ (show align)) | align > 0 ]
+
+ -- Additional llc flags
+ ++ [("", "-mcpu=" ++ mcpu) | not (null mcpu)
+@@ -1012,11 +1010,6 @@ llvmOptions llvm_config dflags =
+
+ platform = targetPlatform dflags
+
+- align :: Int
+- align = case platformArch platform of
+- ArchX86_64 | isAvxEnabled dflags -> 32
+- _ -> 0
+-
+ attrs :: String
+ attrs = intercalate "," $ mattr
+ ++ ["+sse42" | isSse4_2Enabled dflags ]
+diff --git a/configure.ac b/configure.ac
+index 16f2e8b339..0440d5051b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -555,7 +555,7 @@ AC_SUBST(InstallNameToolCmd)
+ # tools we are looking for. In the past, GHC supported a number of
+ # versions of LLVM simultaneously, but that stopped working around
+ # 3.5/3.6 release of LLVM.
+-LlvmMinVersion=11 # inclusive
++LlvmMinVersion=13 # inclusive
+ LlvmMaxVersion=16 # not inclusive
+ AC_SUBST([LlvmMinVersion])
+ AC_SUBST([LlvmMaxVersion])
+--
+2.50.1
+
diff --git a/pkgs/development/compilers/ghc/ghc-9.4-llvm-fix-version-detection.patch b/pkgs/development/compilers/ghc/ghc-9.4-llvm-fix-version-detection.patch
new file mode 100644
index 0000000000000..721909363d6be
--- /dev/null
+++ b/pkgs/development/compilers/ghc/ghc-9.4-llvm-fix-version-detection.patch
@@ -0,0 +1,103 @@
+From c1229507e29e5c44b6f23d6f2afb5d55e7fb9606 Mon Sep 17 00:00:00 2001
+From: ARATA Mizuki
+Date: Wed, 25 Dec 2024 22:50:46 +0900
+Subject: [PATCH] Fix LLVM version detection
+
+With a recent LLVM, `llc -version` emits the version on the first line
+if the vendor is set. It emits the version on the second line
+otherwise.
+
+Therefore, we need to check the both lines to detect the version.
+
+GHC now emits a warning if it fails to detect the LLVM version,
+so we can notice if the output of `llc -version` changes in the future.
+
+Also, the warning for using LLVM < 10 on s390x is removed, because
+we assume LLVM >= 13 now.
+
+This fixes the definition of __GLASGOW_HASKELL_LLVM__ macro.
+
+Fixes #25606
+
+(cherry picked from commit a928c326011f1a6bef3289a4c36d4e19b5951229)
+---
+ compiler/GHC/CmmToLlvm.hs | 14 ++++++++------
+ compiler/GHC/SysTools/Tasks.hs | 13 ++++++++-----
+ docs/users_guide/phases.rst | 2 +-
+ 3 files changed, 17 insertions(+), 12 deletions(-)
+
+diff --git a/compiler/GHC/CmmToLlvm.hs b/compiler/GHC/CmmToLlvm.hs
+index ecf111c636..76541c477c 100644
+--- a/compiler/GHC/CmmToLlvm.hs
++++ b/compiler/GHC/CmmToLlvm.hs
+@@ -38,7 +38,7 @@ import GHC.Utils.Logger
+ import qualified GHC.Data.Stream as Stream
+
+ import Control.Monad ( when, forM_ )
+-import Data.Maybe ( fromMaybe, catMaybes )
++import Data.Maybe ( fromMaybe, catMaybes, isNothing )
+ import System.IO
+
+ -- -----------------------------------------------------------------------------
+@@ -68,11 +68,13 @@ llvmCodeGen logger cfg h cmm_stream
+ "up to" <+> text (llvmVersionStr supportedLlvmVersionUpperBound) <+> "(non inclusive) is supported." <+>
+ "System LLVM version: " <> text (llvmVersionStr ver) $$
+ "We will try though..."
+- let isS390X = platformArch (llvmCgPlatform cfg) == ArchS390X
+- let major_ver = head . llvmVersionList $ ver
+- when (isS390X && major_ver < 10 && doWarn) $ putMsg logger $
+- "Warning: For s390x the GHC calling convention is only supported since LLVM version 10." <+>
+- "You are using LLVM version: " <> text (llvmVersionStr ver)
++
++ when (isNothing mb_ver) $ do
++ let doWarn = llvmCgDoWarn cfg
++ when doWarn $ putMsg logger $
++ "Failed to detect LLVM version!" $$
++ "Make sure LLVM is installed correctly." $$
++ "We will try though..."
+
+ -- HACK: the Nothing case here is potentially wrong here but we
+ -- currently don't use the LLVM version to guide code generation
+diff --git a/compiler/GHC/SysTools/Tasks.hs b/compiler/GHC/SysTools/Tasks.hs
+index 7cd5188d5f..165e1602cf 100644
+--- a/compiler/GHC/SysTools/Tasks.hs
++++ b/compiler/GHC/SysTools/Tasks.hs
+@@ -236,14 +236,17 @@ figureLlvmVersion logger dflags = traceToolCommand logger "llc" $ do
+ (pin, pout, perr, p) <- runInteractiveProcess pgm args'
+ Nothing Nothing
+ {- > llc -version
+- LLVM (http://llvm.org/):
+- LLVM version 3.5.2
++ LLVM version 15.0.7
+ ...
++ OR
++ LLVM (http://llvm.org/):
++ LLVM version 14.0.6
+ -}
+ hSetBinaryMode pout False
+- _ <- hGetLine pout
+- vline <- hGetLine pout
+- let mb_ver = parseLlvmVersion vline
++ line1 <- hGetLine pout
++ mb_ver <- case parseLlvmVersion line1 of
++ mb_ver@(Just _) -> return mb_ver
++ Nothing -> parseLlvmVersion <$> hGetLine pout -- Try the second line
+ hClose pin
+ hClose pout
+ hClose perr
+diff --git a/docs/users_guide/phases.rst b/docs/users_guide/phases.rst
+index 6a2d4b3c20..9ccd2aa034 100644
+--- a/docs/users_guide/phases.rst
++++ b/docs/users_guide/phases.rst
+@@ -474,7 +474,7 @@ defined by your local GHC installation, the following trick is useful:
+ .. index::
+ single: __GLASGOW_HASKELL_LLVM__
+
+- Only defined when `:ghc-flag:`-fllvm` is specified. When GHC is using version
++ Only defined when :ghc-flag:`-fllvm` is specified. When GHC is using version
+ ``x.y.z`` of LLVM, the value of ``__GLASGOW_HASKELL_LLVM__`` is the
+ integer ⟨xyy⟩ (if ⟨y⟩ is a single digit, then a leading zero
+ is added, so for example when using version 3.7 of LLVM,
+--
+2.50.1
+
diff --git a/pkgs/development/compilers/ghc/ghc-9.4-llvm-use-new-pass-manager.patch b/pkgs/development/compilers/ghc/ghc-9.4-llvm-use-new-pass-manager.patch
new file mode 100644
index 0000000000000..6fbaa6b6c36ac
--- /dev/null
+++ b/pkgs/development/compilers/ghc/ghc-9.4-llvm-use-new-pass-manager.patch
@@ -0,0 +1,87 @@
+From 857d84f43f288019d6b926ac562f0d3eff30bc1e Mon Sep 17 00:00:00 2001
+From: Ben Gamari
+Date: Wed, 31 Jan 2024 08:58:58 -0500
+Subject: [PATCH] llvmGen: Adapt to allow use of new pass manager.
+
+We now must use `-passes` in place of `-O` due to #21936.
+
+Closes #21936.
+
+(cherry picked from commit 77db84aba1ba00f6d146e9107b24c6203798e796)
+---
+ compiler/GHC/Driver/Flags.hs | 2 --
+ compiler/GHC/Driver/Pipeline/Execute.hs | 3 +--
+ compiler/GHC/Driver/Session.hs | 2 --
+ llvm-passes | 6 +++---
+ 4 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/compiler/GHC/Driver/Flags.hs b/compiler/GHC/Driver/Flags.hs
+index 8f6c37d5a7..2e5189f42f 100644
+--- a/compiler/GHC/Driver/Flags.hs
++++ b/compiler/GHC/Driver/Flags.hs
+@@ -213,7 +213,6 @@ data GeneralFlag
+ | Opt_RegsGraph -- do graph coloring register allocation
+ | Opt_RegsIterative -- do iterative coalescing graph coloring register allocation
+ | Opt_PedanticBottoms -- Be picky about how we treat bottom
+- | Opt_LlvmTBAA -- Use LLVM TBAA infrastructure for improving AA (hidden flag)
+ | Opt_LlvmFillUndefWithGarbage -- Testing for undef bugs (hidden flag)
+ | Opt_IrrefutableTuples
+ | Opt_CmmSink
+@@ -446,7 +445,6 @@ optimisationFlags = EnumSet.fromList
+ , Opt_RegsGraph
+ , Opt_RegsIterative
+ , Opt_PedanticBottoms
+- , Opt_LlvmTBAA
+ , Opt_LlvmFillUndefWithGarbage
+ , Opt_IrrefutableTuples
+ , Opt_CmmSink
+diff --git a/compiler/GHC/Driver/Pipeline/Execute.hs b/compiler/GHC/Driver/Pipeline/Execute.hs
+index b78ed19160..8c752f5546 100644
+--- a/compiler/GHC/Driver/Pipeline/Execute.hs
++++ b/compiler/GHC/Driver/Pipeline/Execute.hs
+@@ -882,8 +882,7 @@ getOutputFilename logger tmpfs stop_phase output basename dflags next_phase mayb
+ llvmOptions :: DynFlags
+ -> [(String, String)] -- ^ pairs of (opt, llc) arguments
+ llvmOptions dflags =
+- [("-enable-tbaa -tbaa", "-enable-tbaa") | gopt Opt_LlvmTBAA dflags ]
+- ++ [("-relocation-model=" ++ rmodel
++ [("-relocation-model=" ++ rmodel
+ ,"-relocation-model=" ++ rmodel) | not (null rmodel)]
+
+ -- Additional llc flags
+diff --git a/compiler/GHC/Driver/Session.hs b/compiler/GHC/Driver/Session.hs
+index 51d27cd0f8..ae8566ffb2 100644
+--- a/compiler/GHC/Driver/Session.hs
++++ b/compiler/GHC/Driver/Session.hs
+@@ -3457,7 +3457,6 @@ fFlagsDeps = [
+ flagSpec "late-dmd-anal" Opt_LateDmdAnal,
+ flagSpec "late-specialise" Opt_LateSpecialise,
+ flagSpec "liberate-case" Opt_LiberateCase,
+- flagHiddenSpec "llvm-tbaa" Opt_LlvmTBAA,
+ flagHiddenSpec "llvm-fill-undef-with-garbage" Opt_LlvmFillUndefWithGarbage,
+ flagSpec "loopification" Opt_Loopification,
+ flagSpec "block-layout-cfg" Opt_CfgBlocklayout,
+@@ -3992,7 +3991,6 @@ optLevelFlags :: [([Int], GeneralFlag)]
+ optLevelFlags -- see Note [Documenting optimisation flags]
+ = [ ([0,1,2], Opt_DoLambdaEtaExpansion)
+ , ([0,1,2], Opt_DoEtaReduction) -- See Note [Eta-reduction in -O0]
+- , ([0,1,2], Opt_LlvmTBAA)
+ , ([0,1,2], Opt_ProfManualCcs )
+ , ([2], Opt_DictsStrict)
+
+diff --git a/llvm-passes b/llvm-passes
+index 52d203e745..0ee2889d32 100644
+--- a/llvm-passes
++++ b/llvm-passes
+@@ -1,5 +1,5 @@
+ [
+-(0, "-enable-new-pm=0 -mem2reg -globalopt -lower-expect"),
+-(1, "-enable-new-pm=0 -O1 -globalopt"),
+-(2, "-enable-new-pm=0 -O2")
++(0, "-passes=function(require),function(mem2reg),globalopt,function(lower-expect)"),
++(1, "-passes=default"),
++(2, "-passes=default")
+ ]
+--
+2.50.1
+
diff --git a/pkgs/development/compilers/ghc/ghc-9.6-llvm-restore-import.patch b/pkgs/development/compilers/ghc/ghc-9.6-llvm-restore-import.patch
new file mode 100644
index 0000000000000..01f933bebc7d6
--- /dev/null
+++ b/pkgs/development/compilers/ghc/ghc-9.6-llvm-restore-import.patch
@@ -0,0 +1,12 @@
+diff --git a/compiler/GHC/CmmToLlvm.hs b/compiler/GHC/CmmToLlvm.hs
+index 7d48693765..6290779a44 100644
+--- a/compiler/GHC/CmmToLlvm.hs
++++ b/compiler/GHC/CmmToLlvm.hs
+@@ -28,6 +28,7 @@
+
+ import GHC.Utils.BufHandle
+ import GHC.Driver.Session
++import GHC.Platform ( platformArch, Arch(..) )
+ import GHC.Utils.Error
+ import GHC.Data.FastString
+ import GHC.Utils.Outputable
diff --git a/pkgs/development/compilers/ghc/ghc-9.6-llvm-use-new-pass-manager.patch b/pkgs/development/compilers/ghc/ghc-9.6-llvm-use-new-pass-manager.patch
new file mode 100644
index 0000000000000..e42ae9151a1a8
--- /dev/null
+++ b/pkgs/development/compilers/ghc/ghc-9.6-llvm-use-new-pass-manager.patch
@@ -0,0 +1,87 @@
+From 291a336ac81d009b66a2d09c3bb5271e40646e15 Mon Sep 17 00:00:00 2001
+From: Ben Gamari
+Date: Wed, 31 Jan 2024 08:58:58 -0500
+Subject: [PATCH] llvmGen: Adapt to allow use of new pass manager.
+
+We now must use `-passes` in place of `-O` due to #21936.
+
+Closes #21936.
+
+(cherry picked from commit 77db84aba1ba00f6d146e9107b24c6203798e796)
+---
+ compiler/GHC/Driver/Flags.hs | 2 --
+ compiler/GHC/Driver/Pipeline/Execute.hs | 3 +--
+ compiler/GHC/Driver/Session.hs | 2 --
+ llvm-passes | 6 +++---
+ 4 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/compiler/GHC/Driver/Flags.hs b/compiler/GHC/Driver/Flags.hs
+index bd9e3355f0..970dba81d0 100644
+--- a/compiler/GHC/Driver/Flags.hs
++++ b/compiler/GHC/Driver/Flags.hs
+@@ -273,7 +273,6 @@ data GeneralFlag
+ | Opt_RegsGraph -- do graph coloring register allocation
+ | Opt_RegsIterative -- do iterative coalescing graph coloring register allocation
+ | Opt_PedanticBottoms -- Be picky about how we treat bottom
+- | Opt_LlvmTBAA -- Use LLVM TBAA infrastructure for improving AA (hidden flag)
+ | Opt_LlvmFillUndefWithGarbage -- Testing for undef bugs (hidden flag)
+ | Opt_IrrefutableTuples
+ | Opt_CmmSink
+@@ -511,7 +510,6 @@ optimisationFlags = EnumSet.fromList
+ , Opt_EnableRewriteRules
+ , Opt_RegsGraph
+ , Opt_RegsIterative
+- , Opt_LlvmTBAA
+ , Opt_IrrefutableTuples
+ , Opt_CmmSink
+ , Opt_CmmElimCommonBlocks
+diff --git a/compiler/GHC/Driver/Pipeline/Execute.hs b/compiler/GHC/Driver/Pipeline/Execute.hs
+index 4fa72be475..d63b409fc1 100644
+--- a/compiler/GHC/Driver/Pipeline/Execute.hs
++++ b/compiler/GHC/Driver/Pipeline/Execute.hs
+@@ -989,8 +989,7 @@ llvmOptions :: LlvmConfig
+ -> DynFlags
+ -> [(String, String)] -- ^ pairs of (opt, llc) arguments
+ llvmOptions llvm_config dflags =
+- [("-enable-tbaa -tbaa", "-enable-tbaa") | gopt Opt_LlvmTBAA dflags ]
+- ++ [("-relocation-model=" ++ rmodel
++ [("-relocation-model=" ++ rmodel
+ ,"-relocation-model=" ++ rmodel) | not (null rmodel)]
+
+ -- Additional llc flags
+diff --git a/compiler/GHC/Driver/Session.hs b/compiler/GHC/Driver/Session.hs
+index 21d27c406e..9656f1d247 100644
+--- a/compiler/GHC/Driver/Session.hs
++++ b/compiler/GHC/Driver/Session.hs
+@@ -3431,7 +3431,6 @@ fFlagsDeps = [
+ flagSpec "late-dmd-anal" Opt_LateDmdAnal,
+ flagSpec "late-specialise" Opt_LateSpecialise,
+ flagSpec "liberate-case" Opt_LiberateCase,
+- flagHiddenSpec "llvm-tbaa" Opt_LlvmTBAA,
+ flagHiddenSpec "llvm-fill-undef-with-garbage" Opt_LlvmFillUndefWithGarbage,
+ flagSpec "loopification" Opt_Loopification,
+ flagSpec "block-layout-cfg" Opt_CfgBlocklayout,
+@@ -3992,7 +3991,6 @@ optLevelFlags :: [([Int], GeneralFlag)]
+ optLevelFlags -- see Note [Documenting optimisation flags]
+ = [ ([0,1,2], Opt_DoLambdaEtaExpansion)
+ , ([0,1,2], Opt_DoEtaReduction) -- See Note [Eta-reduction in -O0]
+- , ([0,1,2], Opt_LlvmTBAA)
+ , ([0,1,2], Opt_ProfManualCcs )
+ , ([2], Opt_DictsStrict)
+
+diff --git a/llvm-passes b/llvm-passes
+index 52d203e745..0ee2889d32 100644
+--- a/llvm-passes
++++ b/llvm-passes
+@@ -1,5 +1,5 @@
+ [
+-(0, "-enable-new-pm=0 -mem2reg -globalopt -lower-expect"),
+-(1, "-enable-new-pm=0 -O1 -globalopt"),
+-(2, "-enable-new-pm=0 -O2")
++(0, "-passes=function(require),function(mem2reg),globalopt,function(lower-expect)"),
++(1, "-passes=default"),
++(2, "-passes=default")
+ ]
+--
+2.50.1
+
diff --git a/pkgs/development/compilers/ghc/ghc-9.8-llvm-use-new-pass-manager.patch b/pkgs/development/compilers/ghc/ghc-9.8-llvm-use-new-pass-manager.patch
new file mode 100644
index 0000000000000..1ed19d9d5d46a
--- /dev/null
+++ b/pkgs/development/compilers/ghc/ghc-9.8-llvm-use-new-pass-manager.patch
@@ -0,0 +1,92 @@
+From c7667212c958ef00926986782b8e1ac173bce0f9 Mon Sep 17 00:00:00 2001
+From: Ben Gamari
+Date: Wed, 31 Jan 2024 08:58:58 -0500
+Subject: [PATCH] llvmGen: Adapt to allow use of new pass manager.
+
+We now must use `-passes` in place of `-O` due to #21936.
+
+Closes #21936.
+
+(cherry picked from commit 77db84aba1ba00f6d146e9107b24c6203798e796)
+---
+ compiler/GHC/Driver/DynFlags.hs | 1 -
+ compiler/GHC/Driver/Flags.hs | 2 --
+ compiler/GHC/Driver/Pipeline/Execute.hs | 3 +--
+ compiler/GHC/Driver/Session.hs | 1 -
+ llvm-passes | 6 +++---
+ 5 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/compiler/GHC/Driver/DynFlags.hs b/compiler/GHC/Driver/DynFlags.hs
+index ac9e6581cf..edc92e35ad 100644
+--- a/compiler/GHC/Driver/DynFlags.hs
++++ b/compiler/GHC/Driver/DynFlags.hs
+@@ -1261,7 +1261,6 @@ optLevelFlags :: [([Int], GeneralFlag)]
+ optLevelFlags -- see Note [Documenting optimisation flags]
+ = [ ([0,1,2], Opt_DoLambdaEtaExpansion)
+ , ([0,1,2], Opt_DoEtaReduction) -- See Note [Eta-reduction in -O0]
+- , ([0,1,2], Opt_LlvmTBAA)
+ , ([0,1,2], Opt_ProfManualCcs )
+ , ([2], Opt_DictsStrict)
+
+diff --git a/compiler/GHC/Driver/Flags.hs b/compiler/GHC/Driver/Flags.hs
+index 0f6715f3cb..32e52b4b9a 100644
+--- a/compiler/GHC/Driver/Flags.hs
++++ b/compiler/GHC/Driver/Flags.hs
+@@ -285,7 +285,6 @@ data GeneralFlag
+ | Opt_RegsGraph -- do graph coloring register allocation
+ | Opt_RegsIterative -- do iterative coalescing graph coloring register allocation
+ | Opt_PedanticBottoms -- Be picky about how we treat bottom
+- | Opt_LlvmTBAA -- Use LLVM TBAA infrastructure for improving AA (hidden flag)
+ | Opt_LlvmFillUndefWithGarbage -- Testing for undef bugs (hidden flag)
+ | Opt_IrrefutableTuples
+ | Opt_CmmSink
+@@ -525,7 +524,6 @@ optimisationFlags = EnumSet.fromList
+ , Opt_EnableRewriteRules
+ , Opt_RegsGraph
+ , Opt_RegsIterative
+- , Opt_LlvmTBAA
+ , Opt_IrrefutableTuples
+ , Opt_CmmSink
+ , Opt_CmmElimCommonBlocks
+diff --git a/compiler/GHC/Driver/Pipeline/Execute.hs b/compiler/GHC/Driver/Pipeline/Execute.hs
+index 40d0aec44a..ca5c13442a 100644
+--- a/compiler/GHC/Driver/Pipeline/Execute.hs
++++ b/compiler/GHC/Driver/Pipeline/Execute.hs
+@@ -968,8 +968,7 @@ llvmOptions :: LlvmConfig
+ -> DynFlags
+ -> [(String, String)] -- ^ pairs of (opt, llc) arguments
+ llvmOptions llvm_config dflags =
+- [("-enable-tbaa -tbaa", "-enable-tbaa") | gopt Opt_LlvmTBAA dflags ]
+- ++ [("-relocation-model=" ++ rmodel
++ [("-relocation-model=" ++ rmodel
+ ,"-relocation-model=" ++ rmodel) | not (null rmodel)]
+
+ -- Additional llc flags
+diff --git a/compiler/GHC/Driver/Session.hs b/compiler/GHC/Driver/Session.hs
+index 582fa5bd8d..1c19f8368b 100644
+--- a/compiler/GHC/Driver/Session.hs
++++ b/compiler/GHC/Driver/Session.hs
+@@ -2401,7 +2401,6 @@ fFlagsDeps = [
+ flagSpec "late-dmd-anal" Opt_LateDmdAnal,
+ flagSpec "late-specialise" Opt_LateSpecialise,
+ flagSpec "liberate-case" Opt_LiberateCase,
+- flagHiddenSpec "llvm-tbaa" Opt_LlvmTBAA,
+ flagHiddenSpec "llvm-fill-undef-with-garbage" Opt_LlvmFillUndefWithGarbage,
+ flagSpec "loopification" Opt_Loopification,
+ flagSpec "block-layout-cfg" Opt_CfgBlocklayout,
+diff --git a/llvm-passes b/llvm-passes
+index 52d203e745..0ee2889d32 100644
+--- a/llvm-passes
++++ b/llvm-passes
+@@ -1,5 +1,5 @@
+ [
+-(0, "-enable-new-pm=0 -mem2reg -globalopt -lower-expect"),
+-(1, "-enable-new-pm=0 -O1 -globalopt"),
+-(2, "-enable-new-pm=0 -O2")
++(0, "-passes=function(require),function(mem2reg),globalopt,function(lower-expect)"),
++(1, "-passes=default"),
++(2, "-passes=default")
+ ]
+--
+2.50.1
+
diff --git a/pkgs/development/compilers/ghc/subopt.bash b/pkgs/development/compilers/ghc/subopt.bash
index 1f3d3a3ebdcc5..0f3817fdeab18 100644
--- a/pkgs/development/compilers/ghc/subopt.bash
+++ b/pkgs/development/compilers/ghc/subopt.bash
@@ -14,8 +14,9 @@
#
# No attempt is made to support custom LLVM optimization flags, or the
# undocumented flag to disable TBAA, or avoid
-# , as these are not
-# required to bootstrap GHC and at worst will produce an error message.
+# (krank:ignore-line),
+# as these are not required to bootstrap GHC and at worst will produce an
+# error message.
#
# It is called `subopt` to reflect the fact that it uses `opt(1)` as a
# subprocess, and the fact that the GHC build system situation
diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix
index 11e2e4ab294f3..17be8a607ec0e 100644
--- a/pkgs/development/compilers/go/1.24.nix
+++ b/pkgs/development/compilers/go/1.24.nix
@@ -24,6 +24,30 @@ let
targetCC = pkgsBuildTarget.targetPackages.stdenv.cc;
isCross = stdenv.buildPlatform != stdenv.targetPlatform;
+
+ # In order for buildmode=pie to work either Go's internal linker must know how
+ # to produce position-independent executables or Go must be using an external linker.
+ #
+ # go-default-pie.patch tries to enable position-independent codegen (PIE) only when the platform
+ # reports support (via BuildModeSupported(..., "pie", ...)).
+ #
+ # That probe is not fully reliable: for example, `pkgsi686Linux.go` can fail during bootstrap
+ # with message 'default PIE binary requires external (cgo) linking, but cgo is not enabled'
+ # despite CGO being enabled. (we set `CGO_ENABLED=1`).
+ #
+ # To avoid such breakage, limit this patch to a small set of explicitly tested platforms
+ # rather than relying on the general BuildModeSupported("pie") check.
+ supportsDefaultPie =
+ let
+ hasPie = {
+ "amd64" = true;
+ "arm64" = true;
+ "ppc64le" = true;
+ "riscv64" = true;
+ };
+ in
+ hasPie.${stdenv.hostPlatform.go.GOARCH} or false
+ && hasPie.${stdenv.targetPlatform.go.GOARCH} or false;
in
stdenv.mkDerivation (finalAttrs: {
pname = "go";
@@ -64,6 +88,12 @@ stdenv.mkDerivation (finalAttrs: {
})
./remove-tools-1.11.patch
./go_no_vendor_checks-1.23.patch
+ ./go-env-go_ldso.patch
+ ]
+ ++ lib.optionals supportsDefaultPie [
+ (replaceVars ./go-default-pie.patch {
+ inherit (stdenv.targetPlatform.go) GOARCH;
+ })
];
inherit (stdenv.targetPlatform.go) GOOS GOARCH GOARM;
@@ -99,6 +129,9 @@ stdenv.mkDerivation (finalAttrs: {
buildPhase = ''
runHook preBuild
export GOCACHE=$TMPDIR/go-cache
+ if [ -f "$NIX_CC/nix-support/dynamic-linker" ]; then
+ export GO_LDSO=$(cat $NIX_CC/nix-support/dynamic-linker)
+ fi
export PATH=$(pwd)/bin:$PATH
@@ -106,6 +139,12 @@ stdenv.mkDerivation (finalAttrs: {
# Independent from host/target, CC should produce code for the building system.
# We only set it when cross-compiling.
export CC=${buildPackages.stdenv.cc}/bin/cc
+ # Prefer external linker for cross when CGO is supported, since
+ # we haven't taught go's internal linker to pick the correct ELF
+ # interpreter for cross
+ # When CGO is not supported we rely on static binaries being built
+ # since they don't need an ELF interpreter
+ export GO_EXTLINK_ENABLED=${toString finalAttrs.CGO_ENABLED}
''}
ulimit -a
diff --git a/pkgs/development/compilers/go/1.25.nix b/pkgs/development/compilers/go/1.25.nix
index 0908ef39dec9a..20f8bc52a5338 100644
--- a/pkgs/development/compilers/go/1.25.nix
+++ b/pkgs/development/compilers/go/1.25.nix
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchurl,
- apple-sdk_12,
tzdata,
replaceVars,
iana-etc,
@@ -10,8 +9,12 @@
buildPackages,
pkgsBuildTarget,
targetPackages,
+ # for testing
testers,
+ runCommand,
+ bintools,
skopeo,
+ clickhouse-backup,
buildGo125Module,
}:
@@ -19,20 +22,45 @@ let
goBootstrap = buildPackages.callPackage ./bootstrap122.nix { };
skopeoTest = skopeo.override { buildGoModule = buildGo125Module; };
+ clickhouse-backupTest = clickhouse-backup.override { buildGoModule = buildGo125Module; };
# We need a target compiler which is still runnable at build time,
# to handle the cross-building case where build != host == target
targetCC = pkgsBuildTarget.targetPackages.stdenv.cc;
isCross = stdenv.buildPlatform != stdenv.targetPlatform;
+
+ # go-default-pie.patch tries to enable position-independent codegen (PIE) only when the platform
+ # reports support (via BuildModeSupported(..., "pie", ...)).
+ #
+ # In order for buildmode=pie to work either Go's internal linker must know how
+ # to produce position-independent executables or Go must be using an external linker.
+ #
+ # That probe is not fully reliable: for example, `pkgsi686Linux.go` can fail during bootstrap
+ # with message 'default PIE binary requires external (cgo) linking, but cgo is not enabled'
+ # despite CGO being enabled. (we set `CGO_ENABLED=1`).
+ #
+ # To avoid such breakage, limit this patch to a small set of explicitly tested platforms
+ # rather than relying on the general BuildModeSupported("pie") check.
+ supportsDefaultPie =
+ let
+ hasPie = {
+ "amd64" = true;
+ "arm64" = true;
+ "ppc64le" = true;
+ "riscv64" = true;
+ };
+ in
+ hasPie.${stdenv.hostPlatform.go.GOARCH} or false
+ && hasPie.${stdenv.targetPlatform.go.GOARCH} or false;
in
stdenv.mkDerivation (finalAttrs: {
pname = "go";
- version = "1.25.2";
+ version = "1.25.3";
src = fetchurl {
url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
- hash = "sha256-NxEUDPuH/Oj3oT982GDfBB5sEvdhD0DKxuxvorZeluQ=";
+ hash = "sha256-qBpLpZPQAV4QxR4mfeP/B8eskU38oDfZUX0ClRcJd5U=";
};
strictDeps = true;
@@ -41,10 +69,6 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.libc.out ]
++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
- depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [
- apple-sdk_12
- ];
-
depsBuildTarget = lib.optional isCross targetCC;
depsTargetTarget = lib.optional stdenv.targetPlatform.isMinGW targetPackages.threads.package;
@@ -69,6 +93,12 @@ stdenv.mkDerivation (finalAttrs: {
})
./remove-tools-1.11.patch
./go_no_vendor_checks-1.23.patch
+ ./go-env-go_ldso.patch
+ ]
+ ++ lib.optionals supportsDefaultPie [
+ (replaceVars ./go-default-pie.patch {
+ inherit (stdenv.targetPlatform.go) GOARCH;
+ })
];
inherit (stdenv.targetPlatform.go) GOOS GOARCH GOARM;
@@ -104,6 +134,9 @@ stdenv.mkDerivation (finalAttrs: {
buildPhase = ''
runHook preBuild
export GOCACHE=$TMPDIR/go-cache
+ if [ -f "$NIX_CC/nix-support/dynamic-linker" ]; then
+ export GO_LDSO=$(cat $NIX_CC/nix-support/dynamic-linker)
+ fi
export PATH=$(pwd)/bin:$PATH
@@ -111,6 +144,12 @@ stdenv.mkDerivation (finalAttrs: {
# Independent from host/target, CC should produce code for the building system.
# We only set it when cross-compiling.
export CC=${buildPackages.stdenv.cc}/bin/cc
+ # Prefer external linker for cross when CGO is supported, since
+ # we haven't taught go's internal linker to pick the correct ELF
+ # interpreter for cross
+ # When CGO is not supported we rely on static binaries being built
+ # since they don't need an ELF interpreter
+ export GO_EXTLINK_ENABLED=${toString finalAttrs.CGO_ENABLED}
''}
ulimit -a
@@ -169,6 +208,23 @@ stdenv.mkDerivation (finalAttrs: {
command = "go version";
version = "go${finalAttrs.version}";
};
+ # Picked clickhouse-backup as a package that sets CGO_ENABLED=0
+ # Running and outputting the right version proves a working ELF interpreter was picked
+ clickhouse-backup = testers.testVersion { package = clickhouse-backupTest; };
+ clickhouse-backup-is-pie = runCommand "has-pie" { meta.broken = stdenv.hostPlatform.isStatic; } ''
+ ${lib.optionalString (!isCross) ''
+ if ${lib.getExe' bintools "readelf"} -p .comment ${lib.getExe clickhouse-backup} | grep -Fq "GCC: (GNU)"; then
+ echo "${lib.getExe clickhouse-backup} has a GCC .comment, but it should have used the internal go linker"
+ exit 1
+ fi
+ ''}
+ if ${lib.getExe' bintools "readelf"} -h ${lib.getExe clickhouse-backup} | grep -q "Type:.*DYN"; then
+ touch $out
+ else
+ echo "ERROR: clickhouse-backup is NOT PIE"
+ exit 1
+ fi
+ '';
};
};
diff --git a/pkgs/development/compilers/go/go-default-pie.patch b/pkgs/development/compilers/go/go-default-pie.patch
new file mode 100644
index 0000000000000..bce8d8dafd3de
--- /dev/null
+++ b/pkgs/development/compilers/go/go-default-pie.patch
@@ -0,0 +1,13 @@
+diff --git a/src/internal/platform/supported.go b/src/internal/platform/supported.go
+index f9706a6988..abac42d550 100644
+--- a/src/internal/platform/supported.go
++++ b/src/internal/platform/supported.go
+@@ -249,7 +253,7 @@ func DefaultPIE(goos, goarch string, isRace bool) bool {
+ case "darwin":
+ return true
+ }
+- return false
++ return goarch == "@GOARCH@" && BuildModeSupported("gc", "pie", goos, goarch)
+ }
+
+ // ExecutableHasDWARF reports whether the linked executable includes DWARF
diff --git a/pkgs/development/compilers/go/go-env-go_ldso.patch b/pkgs/development/compilers/go/go-env-go_ldso.patch
new file mode 100644
index 0000000000000..395b1dab3bf4c
--- /dev/null
+++ b/pkgs/development/compilers/go/go-env-go_ldso.patch
@@ -0,0 +1,44 @@
+diff --git a/src/cmd/dist/buildruntime.go b/src/cmd/dist/buildruntime.go
+index 87e8867176..dbb635011f 100644
+--- a/src/cmd/dist/buildruntime.go
++++ b/src/cmd/dist/buildruntime.go
+@@ -62,7 +62,7 @@ func mkbuildcfg(file string) {
+ fmt.Fprintf(&buf, "const DefaultGORISCV64 = `%s`\n", goriscv64)
+ fmt.Fprintf(&buf, "const defaultGOEXPERIMENT = `%s`\n", goexperiment)
+ fmt.Fprintf(&buf, "const defaultGO_EXTLINK_ENABLED = `%s`\n", goextlinkenabled)
+- fmt.Fprintf(&buf, "const defaultGO_LDSO = `%s`\n", defaultldso)
++ fmt.Fprintf(&buf, "const DefaultGO_LDSO = `%s`\n", defaultldso)
+ fmt.Fprintf(&buf, "const version = `%s`\n", findgoversion())
+ fmt.Fprintf(&buf, "const defaultGOOS = runtime.GOOS\n")
+ fmt.Fprintf(&buf, "const defaultGOARCH = runtime.GOARCH\n")
+diff --git a/src/cmd/link/internal/ld/elf.go b/src/cmd/link/internal/ld/elf.go
+index 6ff1d94383..147a7d91c9 100644
+--- a/src/cmd/link/internal/ld/elf.go
++++ b/src/cmd/link/internal/ld/elf.go
+@@ -1927,8 +1927,12 @@ func asmbElf(ctxt *Link) {
+ sh.Flags = uint64(elf.SHF_ALLOC)
+ sh.Addralign = 1
+
+- if interpreter == "" && buildcfg.GOOS == runtime.GOOS && buildcfg.GOARCH == runtime.GOARCH && buildcfg.GO_LDSO != "" {
+- interpreter = buildcfg.GO_LDSO
++ if interpreter == "" {
++ if goLdso := os.Getenv("GO_LDSO"); goLdso != "" {
++ interpreter = goLdso
++ } else if buildcfg.GOOS == runtime.GOOS && buildcfg.GOARCH == runtime.GOARCH {
++ interpreter = buildcfg.DefaultGO_LDSO
++ }
+ }
+
+ if interpreter == "" {
+diff --git a/src/internal/buildcfg/cfg.go b/src/internal/buildcfg/cfg.go
+index 7e4ee365df..8aaa70fb36 100644
+--- a/src/internal/buildcfg/cfg.go
++++ b/src/internal/buildcfg/cfg.go
+@@ -33,7 +33,6 @@ var (
+ GORISCV64 = goriscv64()
+ GOWASM = gowasm()
+ ToolTags = toolTags()
+- GO_LDSO = defaultGO_LDSO
+ GOFIPS140 = gofips140()
+ Version = version
+ )
diff --git a/pkgs/development/compilers/mezzo/default.nix b/pkgs/development/compilers/mezzo/default.nix
index 51df8e7062d47..033266efa5640 100644
--- a/pkgs/development/compilers/mezzo/default.nix
+++ b/pkgs/development/compilers/mezzo/default.nix
@@ -15,69 +15,66 @@
functory,
}:
-if lib.versionAtLeast ocaml.version "4.06" then
- throw "mezzo is not available for OCaml ${ocaml.version}"
-else
+let
+ check-ocaml-version = lib.versionAtLeast (lib.getVersion ocaml);
+in
- let
- check-ocaml-version = lib.versionAtLeast (lib.getVersion ocaml);
- in
+assert check-ocaml-version "4";
- assert check-ocaml-version "4";
+stdenv.mkDerivation {
- stdenv.mkDerivation {
+ pname = "mezzo";
+ version = "0.0.m8";
- pname = "mezzo";
- version = "0.0.m8";
+ src = fetchFromGitHub {
+ owner = "protz";
+ repo = "mezzo";
+ rev = "m8";
+ sha256 = "0yck5r6di0935s3iy2mm9538jkf77ssr789qb06ms7sivd7g3ip6";
+ };
- src = fetchFromGitHub {
- owner = "protz";
- repo = "mezzo";
- rev = "m8";
- sha256 = "0yck5r6di0935s3iy2mm9538jkf77ssr789qb06ms7sivd7g3ip6";
- };
+ strictDeps = true;
- strictDeps = true;
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ocamlbuild
+ camlp4
+ menhir
+ ];
+ buildInputs = [
+ yojson
+ menhirLib
+ ulex
+ pprint
+ fix
+ functory
+ ocamlbuild
+ ];
- nativeBuildInputs = [
- ocaml
- findlib
- ocamlbuild
- camlp4
- menhir
- ];
- buildInputs = [
- yojson
- menhirLib
- ulex
- pprint
- fix
- functory
- ocamlbuild
- ];
-
- # Sets warning 3 as non-fatal
- prePatch =
- lib.optionalString (check-ocaml-version "4.02") ''
- substituteInPlace myocamlbuild.pre.ml \
- --replace '@1..3' '@1..2+3'
- ''
- # Compatibility with PPrint ≥ 20220103
- + ''
- substituteInPlace typing/Fact.ml --replace PPrintOCaml PPrint.OCaml
- '';
+ # Sets warning 3 as non-fatal
+ prePatch =
+ lib.optionalString (check-ocaml-version "4.02") ''
+ substituteInPlace myocamlbuild.pre.ml \
+ --replace '@1..3' '@1..2+3'
+ ''
+ # Compatibility with PPrint ≥ 20220103
+ + ''
+ substituteInPlace typing/Fact.ml --replace PPrintOCaml PPrint.OCaml
+ '';
- createFindlibDestdir = true;
+ createFindlibDestdir = true;
- postInstall = ''
- mkdir $out/bin
- cp mezzo $out/bin/
- '';
+ postInstall = ''
+ mkdir $out/bin
+ cp mezzo $out/bin/
+ '';
- meta = with lib; {
- homepage = "http://protz.github.io/mezzo/";
- description = "Programming language in the ML tradition, which places strong emphasis on the control of aliasing and access to mutable memory";
- license = licenses.gpl2;
- platforms = ocaml.meta.platforms or [ ];
- };
- }
+ meta = with lib; {
+ homepage = "http://protz.github.io/mezzo/";
+ description = "Programming language in the ML tradition, which places strong emphasis on the control of aliasing and access to mutable memory";
+ license = licenses.gpl2;
+ broken = lib.versionAtLeast ocaml.version "4.06";
+ platforms = ocaml.meta.platforms or [ ];
+ };
+}
diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index 4d834f2727407..f7cba3bda1169 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -134,8 +134,7 @@ stdenv.mkDerivation (
];
# x86_64-unknown-linux-musl-ld: -r and -pie may not be used together
hardeningDisable =
- lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie"
- ++ lib.optional (lib.versionAtLeast version "5.0" && stdenv.cc.isClang) "strictoverflow"
+ lib.optional (lib.versionAtLeast version "5.0" && stdenv.cc.isClang) "strictoverflow"
++ lib.optionals (args ? hardeningDisable) args.hardeningDisable;
# Older versions have some race:
diff --git a/pkgs/development/compilers/openjdk/21/source.json b/pkgs/development/compilers/openjdk/21/source.json
index 438a484ff2b6a..a43dec0d90665 100644
--- a/pkgs/development/compilers/openjdk/21/source.json
+++ b/pkgs/development/compilers/openjdk/21/source.json
@@ -1,6 +1,6 @@
{
- "hash": "sha256-NgunrSUchIlHkaXM9h75U4xcf44ukCuhhPPHHGVOKXo=",
+ "hash": "sha256-VYTitbgKgd9co9LXVnneaaKjMwAXFmscYp9McJV01Jg=",
"owner": "openjdk",
"repo": "jdk21u",
- "rev": "refs/tags/jdk-21.0.9+8"
+ "rev": "refs/tags/jdk-21.0.9+10"
}
diff --git a/pkgs/development/compilers/rust/1_89.nix b/pkgs/development/compilers/rust/1_90.nix
similarity index 51%
rename from pkgs/development/compilers/rust/1_89.nix
rename to pkgs/development/compilers/rust/1_90.nix
index c84289c03c85c..22124d21362be 100644
--- a/pkgs/development/compilers/rust/1_89.nix
+++ b/pkgs/development/compilers/rust/1_90.nix
@@ -44,8 +44,8 @@ let
in
import ./default.nix
{
- rustcVersion = "1.89.0";
- rustcSha256 = "sha256-JXb59EDdmbAVG9KPWaoKxhAtXE8+1O+KgQyN0FBXJQ0=";
+ rustcVersion = "1.90.0";
+ rustcSha256 = "sha256-eZqfnLpO1TUeBxBIvPa1VgdV2QCWSN7zOkB91JYfm34=";
llvmSharedForBuild = llvmSharedFor pkgsBuildBuild;
llvmSharedForHost = llvmSharedFor pkgsBuildHost;
@@ -59,30 +59,30 @@ import ./default.nix
# Note: the version MUST be the same version that we are building. Upstream
# ensures that each released compiler can compile itself:
# https://github.com/NixOS/nixpkgs/pull/351028#issuecomment-2438244363
- bootstrapVersion = "1.89.0";
+ bootstrapVersion = "1.90.0";
# fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
bootstrapHashes = {
- i686-unknown-linux-gnu = "676ef74ce8ce3137ca66e3941b0221516e1713862053d8aa219e91b491417dd9";
- x86_64-unknown-linux-gnu = "542f517d0624cbee516627221482b166bf0ffe5fd560ec32beb778c01f5c99b6";
- x86_64-unknown-linux-musl = "35695721d53d7eb83ce0153be4c399babf5afd8597bed84f3386d9aac2b4b391";
- arm-unknown-linux-gnueabihf = "e618d08b1547c143cfbfc040023914f4a33a4fcf7addff6778d7cfccbd444c5e";
- armv7-unknown-linux-gnueabihf = "09a295d2d6821a404ca3bf5d1163b9642139105618d0583241b05b7dbf6e22dc";
- aarch64-unknown-linux-gnu = "26d6de84ac59da702aa8c2f903e3c344e3259da02e02ce92ad1c735916b29a4a";
- aarch64-unknown-linux-musl = "b5fdcad8289adf94c45727c33773a05acca994b01b333cf7a508f95fa6adc454";
- x86_64-apple-darwin = "8590528cade978ecb5249184112887489c9d77ae846539e3ef4d04214a6d8663";
- aarch64-apple-darwin = "87baeb57fb29339744ac5f99857f0077b12fa463217fc165dfd8f77412f38118";
- powerpc64-unknown-linux-gnu = "30d97f8d757c6ff171815c8af36eed85e44401a58c5e04f25b721c7776ed8337";
- powerpc64le-unknown-linux-gnu = "80db8e203357a050780fb8a2cdc027b81d5ae1634fa999c3be69cf8a2e10bbf6";
- powerpc64le-unknown-linux-musl = "88d370dec3c382db9f1227822c725bab88621904c60f8f950745fa2e903264a4";
- riscv64gc-unknown-linux-gnu = "3885629641fd670e50c9e6553bdc6505457ef2163757a27dbf33fbc6351b2161";
- s390x-unknown-linux-gnu = "696dad74886467a5092ee8bd2265aaab85039fc563803166966c7cae389e2ef7";
- loongarch64-unknown-linux-gnu = "171696c45e4a91ccf17a239f00d5a3a8bbd40125d7a274506e1630423d714bec";
- loongarch64-unknown-linux-musl = "86e5d8b0f0c868559de3ec2a0902d0e516a710adb845c8904595c54807e821c2";
- x86_64-unknown-freebsd = "4baf0d5a44e64eecc91dc7ab89d8b0a8f8607e1d39b6989767861b34459a0396";
+ i686-unknown-linux-gnu = "8f389b9eb1513785f5589816b60b5a7ca3b24c29bedce7ec0d1c2f8c3ccfb0cc";
+ x86_64-unknown-linux-gnu = "e453bae1c68d02fe2eae065c5452d5731308164cd154154c6ee442d2fa590685";
+ x86_64-unknown-linux-musl = "251c9fe4e3374f2f9f629a7a83238c618e016b1bda1b9de5e8385cb3a6f057fa";
+ arm-unknown-linux-gnueabihf = "61f3987f61bf73562f04dcacfee1a2bad8d16d41f7a3f81ad82dd9b9cbc559ce";
+ armv7-unknown-linux-gnueabihf = "06cfb7f1bd3ce50480eed73ad9ae4f8f665d154fa4c713bc08541197eecd4ae0";
+ aarch64-unknown-linux-gnu = "293f412e3412c3aa3398c78ebbdf898fa08eacad80c85a7332ce1a455504c5fc";
+ aarch64-unknown-linux-musl = "b3ac31ca2e1a720709bf4fb678b2a2f98464c55662c516dfffcbdadd95a420c9";
+ x86_64-apple-darwin = "3d1d24e1d4bedb421ca1a16060c21f4d803eaefba585c0b5b5d0b1e56692ef4b";
+ aarch64-apple-darwin = "a11b52e34f5e80cb25d49f7943ae60e0b069b431727a4c09b2c890ceebee3687";
+ powerpc64-unknown-linux-gnu = "39720c905b8a730cfa725b7e201cd238d15c33112bd4c31b168ca6d1cb898cac";
+ powerpc64le-unknown-linux-gnu = "4061405099dc0aba379fe7b7a616d320272ef9325114dfa8f106c303f9b5695c";
+ powerpc64le-unknown-linux-musl = "0d97ef122126a0de87a8581f48ef85ff0887b733b429ffcec4651699b5444511";
+ riscv64gc-unknown-linux-gnu = "42cc3b3bb008e24a39bd98887c43ef32c2d997f801c86ca47f2119e5e3589fcb";
+ s390x-unknown-linux-gnu = "345c9b902ebee656533d2cfba39c1a020e6a41a4a9609f87430ff8a5d680d649";
+ loongarch64-unknown-linux-gnu = "1c116041a2bc7ab2697218f99ad8cccbe3d6b63fcbf516cb9d985cb00efcdb09";
+ loongarch64-unknown-linux-musl = "0ae18468c7cd3872d1b685cf960426aeb7467629f69eabb497bee6f0fff9cb04";
+ x86_64-unknown-freebsd = "6c7ebf6acbe00873680a190152d47aeebe76e237195b974c593a67227123b2ef";
};
- selectRustPackage = pkgs: pkgs.rust_1_89;
+ selectRustPackage = pkgs: pkgs.rust_1_90;
}
(
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index 475d61d06d0a8..b1302a8f0a36b 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -62,6 +62,13 @@ rustPlatform.buildRustPackage.override
# fixes: the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel
RUSTC_BOOTSTRAP = 1;
+ RUSTFLAGS =
+ if stdenv.hostPlatform.rust.rustcTargetSpec == "x86_64-unknown-linux-gnu" then
+ # Upstream defaults to lld on x86_64-unknown-linux-gnu, we want to use our linker
+ "-Clinker-features=-lld -Clink-self-contained=-linker"
+ else
+ null;
+
postInstall = ''
wrapProgram "$out/bin/cargo" --suffix PATH : "${rustc}/bin"
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index d8f25d52d8505..463c0133015fa 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -97,8 +97,17 @@ stdenv.mkDerivation (finalAttrs: {
++ optional stdenv.hostPlatform.isDarwin "-rpath ${llvmSharedForHost.lib}/lib"
);
- # Increase codegen units to introduce parallelism within the compiler.
- RUSTFLAGS = "-Ccodegen-units=10";
+ RUSTFLAGS = lib.concatStringsSep " " (
+ [
+ # Increase codegen units to introduce parallelism within the compiler.
+ "-Ccodegen-units=10"
+ ]
+ ++ lib.optionals (stdenv.hostPlatform.rust.rustcTargetSpec == "x86_64-unknown-linux-gnu") [
+ # Upstream defaults to lld on x86_64-unknown-linux-gnu, we want to use our linker
+ "-Clinker-features=-lld"
+ "-Clink-self-contained=-linker"
+ ]
+ );
RUSTDOCFLAGS = "-A rustdoc::broken-intra-doc-links";
# We need rust to build rust. If we don't provide it, configure will try to download it.
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 389b50c4bca31..69235fe11ca8f 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -30,8 +30,8 @@ let
"2.4.10".sha256 = "sha256-zus5a2nSkT7uBIQcKva+ylw0LOFGTD/j5FPy3hDF4vg=";
# By unofficial and very loose convention we keep the latest version of
# SBCL, and the previous one in case someone quickly needs to roll back.
- "2.5.5".sha256 = "sha256-ZQJnCvs2G6m+RKL6/pr5tZ57JK5QmnkaZrVIHylVlQs=";
"2.5.7".sha256 = "sha256-xPr+t5VpnVvP+QhQkazHYtz15V+FI1Yl89eu8SyJ0dM=";
+ "2.5.9".sha256 = "sha256-0bGQItQ9xJPtyXK25ZyTrmaEyWP90rQTsJZeGM1r0eI=";
};
# Collection of pre-built SBCL binaries for platforms that need them for
# bootstrapping. Ideally these are to be avoided. If ECL (or any other
@@ -156,6 +156,22 @@ stdenv.mkDerivation (self: {
"threads.pure.lisp"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
+ # This test has a gotcha on Darwin which originally showed up in
+ # 57b36ea5c83a1841b174ec6cd5e423439fe9d7a0, and later again around Oct
+ # 2025 in staging. The test wants a clean environment (using
+ # run-program, akin to fork & execve), but darwin keeps injecting this
+ # envvar:
+ #
+ # __CF_USER_TEXT_ENCODING=0x15F:0:0
+ #
+ # It’s not clear to maintainers where the problem lies exactly, but
+ # removing the test at least fixes the build and unblocks others.
+ #
+ # see:
+ # - https://github.com/NixOS/nixpkgs/pull/359214
+ # - https://github.com/NixOS/nixpkgs/pull/453099
+ "run-program.test.sh"
+
# Fails in sandbox
"sb-posix.impure.lisp"
];
diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix
index c71a22589d9fc..5bb32d8496cd6 100644
--- a/pkgs/development/compilers/swift/compiler/default.nix
+++ b/pkgs/development/compilers/swift/compiler/default.nix
@@ -523,8 +523,10 @@ stdenv.mkDerivation {
# Add appleSwiftCore to the search paths. Adding the whole SDK results in build failures.
OLD_NIX_SWIFTFLAGS_COMPILE="$NIX_SWIFTFLAGS_COMPILE"
OLD_NIX_LDFLAGS="$NIX_LDFLAGS"
+ OLD_NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE"
export NIX_SWIFTFLAGS_COMPILE=" -I ${appleSwiftCore}/lib/swift"
export NIX_LDFLAGS+=" -L ${appleSwiftCore}/lib/swift"
+ export NIX_CFLAGS_COMPILE+=" -Wno-error=unguarded-availability"
''
+ ''
@@ -568,6 +570,7 @@ stdenv.mkDerivation {
# Restore search paths to remove appleSwiftCore.
export NIX_SWIFTFLAGS_COMPILE="$OLD_NIX_SWIFTFLAGS_COMPILE"
export NIX_LDFLAGS="$OLD_NIX_LDFLAGS"
+ export NIX_CFLAGS_COMPILE="$OLD_NIX_CFLAGS_COMPILE"
''
+ ''
diff --git a/pkgs/development/compilers/swift/wrapper/wrapper.sh b/pkgs/development/compilers/swift/wrapper/wrapper.sh
index 21fba53951237..2017f580cef25 100644
--- a/pkgs/development/compilers/swift/wrapper/wrapper.sh
+++ b/pkgs/development/compilers/swift/wrapper/wrapper.sh
@@ -248,6 +248,9 @@ fi
# TODO: If we ever need to expand functionality of this hook, it may no longer
# be compatible with Swift. Right now, it is only used on Darwin to force
# -target, which also happens to work with Swift.
+# As of 369cc5c66b1efdbca2f136aa0055fedca1117304 (#445119), this hook also sets
+# the -Werror=unguarded-availability flag, which Swift can't accept. We prefix
+# that flag with -Xcc in the for loop below
if [[ -e $cc_wrapper/nix-support/add-local-cc-cflags-before.sh ]]; then
source $cc_wrapper/nix-support/add-local-cc-cflags-before.sh
fi
@@ -262,7 +265,7 @@ for ((i=0; i < ${#extraBefore[@]}; i++));do
# TODO: Assumes macOS.
extraBefore[i]="${extraBefore[i]/-apple-darwin/-apple-macosx${MACOSX_DEPLOYMENT_TARGET:-11.0}}"
;;
- -march=*|-mcpu=*|-mfloat-abi=*|-mfpu=*|-mmode=*|-mthumb|-marm|-mtune=*)
+ -march=*|-mcpu=*|-mfloat-abi=*|-mfpu=*|-mmode=*|-mthumb|-marm|-mtune=*|-Werror=*)
[[ i -gt 0 && ${extraBefore[i-1]} == -Xcc ]] && continue
extraBefore=(
"${extraBefore[@]:0:i}"
diff --git a/pkgs/development/compilers/yosys/plugins/symbiflow.nix b/pkgs/development/compilers/yosys/plugins/symbiflow.nix
index 4b6a8c3ecbd60..6e36efad13316 100644
--- a/pkgs/development/compilers/yosys/plugins/symbiflow.nix
+++ b/pkgs/development/compilers/yosys/plugins/symbiflow.nix
@@ -39,7 +39,6 @@ let
static_gtest = gtest.overrideAttrs (old: {
dontDisableStatic = true;
- disableHardening = [ "pie" ];
cmakeFlags = old.cmakeFlags ++ [ "-DBUILD_SHARED_LIBS=OFF" ];
});
diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md
index 0cadbefea0c9f..56f72e92abb1b 100644
--- a/pkgs/development/haskell-modules/HACKING.md
+++ b/pkgs/development/haskell-modules/HACKING.md
@@ -199,10 +199,6 @@ opening the next one. When you want to merge the currently open
$ gh auth status
```
-1. Make sure you have setup your `~/.cabal/config` file for authentication
- for uploading the NixOS package versions to Hackage. See the following
- section for details on how to do this.
-
1. Make sure you have correctly marked packages broken. One of the previous
sections explains how to do this.
@@ -237,8 +233,6 @@ opening the next one. When you want to merge the currently open
1. Merges the currently open `haskell-updates` PR.
- 1. Updates the version of Haskell packages in NixOS on Hackage.
-
1. Updates Stackage and Hackage snapshots. Regenerates the Haskell package set.
1. Pushes the commits updating Stackage and Hackage and opens a new
diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix
index 2acec69475c09..dc82033beeef2 100644
--- a/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix
@@ -35,10 +35,10 @@
}:
mkDerivation {
pname = "cabal2nix";
- version = "2.20.1-unstable-2025-09-17";
+ version = "2.20.1-unstable-2025-11-11";
src = fetchzip {
- url = "https://github.com/NixOS/cabal2nix/archive/3cc36a5df16a10bac9a858208845e3d05b79845d.tar.gz";
- sha256 = "1z1knv2ggm9ddyl0v120nhcnjmq50z7q1m88qj7rfz51gx1ifnim";
+ url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz";
+ sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49";
};
postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
isLibrary = true;
diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix
index eade3a05863b7..00afd0bb28c42 100644
--- a/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix
@@ -18,10 +18,10 @@
}:
mkDerivation {
pname = "distribution-nixpkgs";
- version = "1.7.1.1-unstable-2025-09-17";
+ version = "1.7.1.1-unstable-2025-11-11";
src = fetchzip {
- url = "https://github.com/NixOS/cabal2nix/archive/3cc36a5df16a10bac9a858208845e3d05b79845d.tar.gz";
- sha256 = "1z1knv2ggm9ddyl0v120nhcnjmq50z7q1m88qj7rfz51gx1ifnim";
+ url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz";
+ sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49";
};
postUnpack = "sourceRoot+=/distribution-nixpkgs; echo source root reset to $sourceRoot";
enableSeparateDataOutput = true;
diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix
index 3ea1fab647d58..2ad97d7259df4 100644
--- a/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix
@@ -17,10 +17,10 @@
}:
mkDerivation {
pname = "hackage-db";
- version = "2.1.3-unstable-2025-09-17";
+ version = "2.1.3-unstable-2025-11-11";
src = fetchzip {
- url = "https://github.com/NixOS/cabal2nix/archive/3cc36a5df16a10bac9a858208845e3d05b79845d.tar.gz";
- sha256 = "1z1knv2ggm9ddyl0v120nhcnjmq50z7q1m88qj7rfz51gx1ifnim";
+ url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz";
+ sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49";
};
postUnpack = "sourceRoot+=/hackage-db; echo source root reset to $sourceRoot";
isLibrary = true;
diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix
index d453e54c9bbab..d0e04dc856ab2 100644
--- a/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix
@@ -13,10 +13,10 @@
}:
mkDerivation {
pname = "language-nix";
- version = "2.3.0-unstable-2025-09-17";
+ version = "2.3.0-unstable-2025-11-11";
src = fetchzip {
- url = "https://github.com/NixOS/cabal2nix/archive/3cc36a5df16a10bac9a858208845e3d05b79845d.tar.gz";
- sha256 = "1z1knv2ggm9ddyl0v120nhcnjmq50z7q1m88qj7rfz51gx1ifnim";
+ url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz";
+ sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49";
};
postUnpack = "sourceRoot+=/language-nix; echo source root reset to $sourceRoot";
libraryHaskellDepends = [
diff --git a/pkgs/development/haskell-modules/configuration-arm.nix b/pkgs/development/haskell-modules/configuration-arm.nix
index 5a4df23a384ce..c124a4e5fc1f8 100644
--- a/pkgs/development/haskell-modules/configuration-arm.nix
+++ b/pkgs/development/haskell-modules/configuration-arm.nix
@@ -117,7 +117,7 @@ self: super:
# AARCH32-SPECIFIC OVERRIDES
# KAT/ECB/D2 test segfaults on armv7l
- # https://github.com/haskell-crypto/cryptonite/issues/367
+ # https://github.com/haskell-crypto/cryptonite/issues/367 krank:ignore-line
cryptonite = dontCheck super.cryptonite;
}
// lib.optionalAttrs (with pkgs.stdenv.hostPlatform; isAarch && isAndroid) {
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b42dbb5a4b334..c08915cbc734b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -52,9 +52,6 @@ with haskellLib;
}))
];
- # https://github.com/ivanperez-keera/dunai/issues/427
- dunai = addBuildDepend self.list-transformer (enableCabalFlag "list-transformer" super.dunai);
-
# Make sure that Cabal_* can be built as-is
Cabal_3_10_3_0 = doDistribute (
super.Cabal_3_10_3_0.override {
@@ -130,38 +127,7 @@ with haskellLib;
# to bogus references to some dependencies.
overrideCabal (
old:
- {
- # Prevent DOS line endings from Hackage from breaking a patch
- prePatch = old.prePatch or "" + ''
- ${pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal
- '';
- # Ignore unix bound intended to prevent an unix bug on 32bit systems.
- # We apply a patch for this issue to the GHC core packages directly.
- # See unix-fix-ctimeval-size-32-bit.patch in ../compilers/ghc/common-*.nix
- patches =
- old.patches or [ ]
- ++
- lib.optionals
- (
- scope.unix == null
- && lib.elem self.ghc.version [
- "9.6.1"
- "9.6.2"
- "9.6.3"
- "9.6.4"
- "9.6.5"
- "9.6.6"
- "9.8.1"
- "9.8.2"
- "9.8.3"
- "9.10.1"
- ]
- )
- [
- ./patches/cabal-install-3.16-lift-unix-bound.patch
- ];
- }
- // lib.optionalAttrs (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) {
+ lib.optionalAttrs (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) {
postInstall = ''
${old.postInstall or ""}
remove-references-to -t ${scope.HTTP} "$out/bin/.cabal-wrapped"
@@ -239,13 +205,8 @@ with haskellLib;
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;
+ extensions = doJailbreak lself.extensions_0_1_1_0;
# 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
@@ -264,7 +225,6 @@ with haskellLib;
# 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 [
@@ -283,6 +243,9 @@ with haskellLib;
fourmolu
ormolu
haskell-language-server
+ hls-plugin-api
+ ghcide
+ lsp-types
;
# For -f-auto see cabal.project in haskell-language-server.
@@ -290,9 +253,6 @@ with haskellLib;
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 ###
###########################################
@@ -383,11 +343,6 @@ with haskellLib;
HsOpenSSL = appendConfigureFlags [
"--ghc-option=-optc=-Wno-error=incompatible-pointer-types"
] super.HsOpenSSL;
- # Work around compilation failures with gcc >= 14
- # https://github.com/audreyt/hssyck/issues/5
- HsSyck = appendConfigureFlags [
- "--ghc-option=-optc=-Wno-error=implicit-function-declaration"
- ] super.HsSyck;
# https://github.com/rethab/bindings-dsl/issues/46
bindings-libcddb = appendConfigureFlags [
"--ghc-option=-optc=-Wno-error=incompatible-pointer-types"
@@ -465,28 +420,15 @@ with haskellLib;
# store. Testing is done upstream.
arion-compose = dontCheck super.arion-compose;
- # 2023-07-17: Outdated base bound https://github.com/srid/lvar/issues/5
- lvar = doJailbreak super.lvar;
-
# Don't call setEnv in parallel in the test suite (which leads to flaky failures)
- env-extra =
- appendPatches
- [
- (pkgs.fetchpatch {
- name = "env-extra-no-parallel-setenv.patch";
- url = "https://github.com/d12frosted/env-extra/commit/4fcbc031b210e71e4243fcfe7c48d381e2f51d78.patch";
- sha256 = "sha256-EbXk+VOmxMJAMCMTXpTiW8fkbNI9za7f1alzCeaJaV4=";
- excludes = [ "package.yaml" ];
- })
- ]
- (
- overrideCabal (drv: {
- prePatch = ''
- ${drv.prePatch or ""}
- ${lib.getExe' pkgs.buildPackages.dos2unix "dos2unix"} *.cabal
- '';
- }) super.env-extra
- );
+ env-extra = appendPatches [
+ (pkgs.fetchpatch {
+ name = "env-extra-no-parallel-setenv.patch";
+ url = "https://github.com/d12frosted/env-extra/commit/4fcbc031b210e71e4243fcfe7c48d381e2f51d78.patch";
+ sha256 = "sha256-EbXk+VOmxMJAMCMTXpTiW8fkbNI9za7f1alzCeaJaV4=";
+ excludes = [ "package.yaml" ];
+ })
+ ] super.env-extra;
# This used to be a core package provided by GHC, but then the compiler
# dropped it. We define the name here to make sure that old packages which
@@ -554,19 +496,14 @@ with haskellLib;
# Fixes compilation for basement on i686
# https://github.com/haskell-foundation/foundation/pull/573
- # Don't apply patch for GHC == 9.2.* on 64bit where it breaks compilation:
- # https://github.com/haskell-foundation/foundation/pull/573#issuecomment-1669468867
- 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;
+ basement = appendPatches [
+ (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
@@ -643,14 +580,6 @@ 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);
@@ -661,10 +590,6 @@ with haskellLib;
# check requires mysql server
mysql-simple = dontCheck super.mysql-simple;
- # Test data missing
- # https://github.com/FPtje/GLuaFixer/issues/165
- glualint = dontCheck super.glualint;
-
# Hackage tarball only includes what is supported by `cabal install git-annex`,
# but we want e.g. completions as well. See
# https://web.archive.org/web/20160724083703/https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/
@@ -676,7 +601,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-s3EleptCwmVxHjAcPDe40Ch+fULFqf+6H1pLjXNFZ1Y=";
+ sha256 = "sha256-HkUrc9T8qpGsONIuM7ciKbx4vuJTOLFNxneIPte0wv4=";
# 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
@@ -715,7 +640,8 @@ with haskellLib;
postPatch = "sed -i s/home/tmp/ test/Spec.hs";
}) super.shell-conduit;
- # https://github.com/serokell/nixfmt/issues/130
+ # No maintenance planned until eventual removal
+ # https://github.com/NixOS/nixfmt/issues/340#issuecomment-3315920564
nixfmt = doJailbreak super.nixfmt;
# Too strict upper bounds on turtle and text
@@ -726,25 +652,50 @@ 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
+ # Pass in `pkgs.nix` for the required tools. This means that overriding
+ # them sort of works, but only if you override all instances.
+ nix-paths =
+ if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then
+ super.nix-paths.override {
+ nix-build = pkgs.nix;
+ nix-env = pkgs.nix;
+ nix-hash = pkgs.nix;
+ nix-instantiate = pkgs.nix;
+ nix-store = pkgs.nix;
+ }
+ else
+ # When cross-compiling, nix-paths won't be able to detect
+ # the path to the (host) tools at build time from PATH,
+ # so we instruct it to check at runtime.
+ enableCabalFlag "allow-relative-paths" (
+ super.nix-paths {
+ nix-build = null;
+ nix-env = null;
+ nix-hash = null;
+ nix-instantiate = null;
+ nix-store = null;
+ }
);
- # Too strict bounds on hspec
- # https://github.com/illia-shkroba/pfile/issues/2
+ # Fix `mv` not working on directories
+ turtle = appendPatches [
+ (pkgs.fetchpatch {
+ name = "turtle-fix-mv.patch";
+ url = "https://github.com/Gabriella439/turtle/commit/b3975531f8d6345da54b005f226adab095085865.patch";
+ sha256 = "sha256-EqvMQpRz/7hbY6wJ0xG8Ou6oKhwWdpjzBv+NPW6tnSY=";
+ includes = [ "src/Turtle/Prelude.hs" ];
+ })
+ ] super.turtle;
+
+ # 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=";
+ }) super.algebraic-graphs;
+
+ # Too strict bounds on filepath, hpsec, tasty, tasty-quickcheck, transformers
+ # https://github.com/illia-shkroba/pfile/issues/3
pfile = doJailbreak super.pfile;
# Overly strict bounds on postgresql-simple (< 0.7), tasty (< 1.5) and tasty-quickcheck (< 0.11)
@@ -752,18 +703,7 @@ with haskellLib;
migrant-core = doJailbreak super.migrant-core;
migrant-sqlite-simple = doJailbreak super.migrant-sqlite-simple;
migrant-hdbc = doJailbreak super.migrant-hdbc;
- migrant-postgresql-simple = lib.pipe super.migrant-postgresql-simple [
- (overrideCabal {
- preCheck = ''
- postgresqlTestUserOptions="LOGIN SUPERUSER"
- '';
- })
- (addTestToolDepends [
- pkgs.postgresql
- pkgs.postgresqlTestHook
- ])
- doJailbreak
- ];
+ migrant-postgresql-simple = doJailbreak super.migrant-postgresql-simple;
# https://github.com/froozen/kademlia/issues/2
kademlia = dontCheck super.kademlia;
@@ -788,8 +728,8 @@ with haskellLib;
else
dontDistribute (markBroken super.fclabels);
- # Bounds on base are too strict.
- # https://github.com/phadej/regex-applicative-text/issues/13
+ # Bounds on base are too strict. Upstream is no longer maintained:
+ # https://github.com/phadej/regex-applicative-text/issues/13 krank:ignore-line
regex-applicative-text = doJailbreak super.regex-applicative-text;
# Tests require a Kafka broker running locally
@@ -834,9 +774,6 @@ with haskellLib;
# Upstream notified by e-mail.
permutation = dontCheck super.permutation;
- # https://github.com/jputcu/serialport/issues/25
- serialport = dontCheck super.serialport;
-
# Test suite depends on source code being available
simple-affine-space = dontCheck super.simple-affine-space;
@@ -874,12 +811,9 @@ with haskellLib;
sha256 = "sha256-EAyTVkAqCvJ0lRD0+q/htzBJ8iD5qP47j5i2fKhRrlw=";
}) super.xml-picklers;
- # 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")
+ # https://github.com/lierdakil/pandoc-crossref/issues/492
doJailbreak
-
# We are still using pandoc == 3.7.*
(appendPatch (
lib.warnIf (lib.versionAtLeast self.pandoc.version "3.8")
@@ -894,6 +828,16 @@ with haskellLib;
))
];
+ pandoc = appendPatches [
+ # Adjust text fixtures for djot >= 0.1.2.3, patch extracted from unrelated change.
+ (pkgs.fetchpatch {
+ name = "pandoc-djot-0.1.2.3.patch";
+ url = "https://github.com/jgm/pandoc/commit/643712ca70b924c0edcc059699aa1ee42234be34.patch";
+ hash = "sha256-khDkb1PzC0fTaWTq3T04UvgoI+XefOJMaTV1d3Du8BU=";
+ includes = [ "test/djot-reader.native" ];
+ })
+ ] super.pandoc;
+
# 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;
@@ -908,7 +852,7 @@ with haskellLib;
matterhorn = doJailbreak super.matterhorn;
# Too strict bounds on transformers and resourcet
- # https://github.com/alphaHeavy/lzma-conduit/issues/23
+ # https://github.com/alphaHeavy/lzma-conduit/issues/23 krank:ignore-line
lzma-conduit = doJailbreak super.lzma-conduit;
# 2020-06-05: HACK: does not pass own build suite - `dontCheck`
@@ -940,10 +884,21 @@ with haskellLib;
# https://github.com/ekmett/structures/issues/3
structures = dontCheck super.structures;
+ # ships broken Setup.hs https://github.com/facebook/Haxl/issues/165
+ # https://github.com/facebook/Haxl/pull/164
+ haxl = overrideCabal (drv: {
+ postPatch = ''
+ ${drv.postPatch or ""}
+ rm Setup.hs
+ '';
+ # non-deterministic failure https://github.com/facebook/Haxl/issues/85
+ # doesn't compile with text-2.1.2 in <2.5.1.2
+ doCheck = false;
+ }) super.haxl;
+
# Disable test suites to fix the build.
acme-year = dontCheck super.acme-year; # http://hydra.cryp.to/build/497858/log/raw
aeson-lens = dontCheck super.aeson-lens; # http://hydra.cryp.to/build/496769/log/raw
- aeson-schema = dontCheck super.aeson-schema; # https://github.com/timjb/aeson-schema/issues/9
angel = dontCheck super.angel;
apache-md5 = dontCheck super.apache-md5; # http://hydra.cryp.to/build/498709/nixlog/1/raw
app-settings = dontCheck super.app-settings; # http://hydra.cryp.to/build/497327/log/raw
@@ -979,12 +934,10 @@ with haskellLib;
git-vogue = dontCheck super.git-vogue;
github-rest = dontCheck super.github-rest; # test suite needs the network
gitlib-cmdline = dontCheck super.gitlib-cmdline;
- GLFW-b = dontCheck super.GLFW-b; # https://github.com/bsl/GLFW-b/issues/50
hackport = dontCheck super.hackport;
hadoop-formats = dontCheck super.hadoop-formats;
hashed-storage = dontCheck super.hashed-storage;
hashring = dontCheck super.hashring;
- haxl = dontCheck super.haxl; # non-deterministic failure https://github.com/facebook/Haxl/issues/85
haxl-facebook = dontCheck super.haxl-facebook; # needs facebook credentials for testing
hdbi-postgresql = dontCheck super.hdbi-postgresql;
hedis = dontCheck super.hedis;
@@ -1224,7 +1177,6 @@ with haskellLib;
Cabal-ide-backend = dontCheck super.Cabal-ide-backend;
# This package can't be built on non-Windows systems.
- Win32 = overrideCabal (drv: { broken = !pkgs.stdenv.hostPlatform.isCygwin; }) super.Win32;
inline-c-win32 = dontDistribute super.inline-c-win32;
Southpaw = dontDistribute super.Southpaw;
@@ -1533,14 +1485,6 @@ with haskellLib;
# dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test
unix-time = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.unix-time else super.unix-time;
- # Workaround for https://github.com/sol/hpack/issues/528
- # The hpack test suite can't deal with the CRLF line endings hackage revisions insert
- hpack = overrideCabal (drv: {
- postPatch = drv.postPatch or "" + ''
- "${lib.getBin pkgs.buildPackages.dos2unix}/bin/dos2unix" *.cabal
- '';
- }) super.hpack;
-
# hslua has tests that break when using musl.
# https://github.com/hslua/hslua/issues/106
hslua-core =
@@ -1582,33 +1526,6 @@ with haskellLib;
# https://github.com/mgajda/json-autotype/issues/25
json-autotype = dontCheck super.json-autotype;
- postgresql-simple-migration = overrideCabal (drv: {
- preCheck = ''
- PGUSER=test
- PGDATABASE=test
- '';
- testToolDepends = drv.testToolDepends or [ ] ++ [
- pkgs.postgresql
- pkgs.postgresqlTestHook
- ];
- }) (doJailbreak super.postgresql-simple-migration);
-
- postgresql-simple = addTestToolDepends [
- pkgs.postgresql
- pkgs.postgresqlTestHook
- ] super.postgresql-simple;
-
- beam-postgres = lib.pipe super.beam-postgres [
- # Requires pg_ctl command during tests
- (addTestToolDepends [ pkgs.postgresql ])
- (dontCheckIf (!pkgs.postgresql.doInstallCheck || !self.testcontainers.doCheck))
- ];
-
- users-postgresql-simple = addTestToolDepends [
- pkgs.postgresql
- pkgs.postgresqlTestHook
- ] super.users-postgresql-simple;
-
gargoyle-postgresql-nix = addBuildTool [ pkgs.postgresql ] super.gargoyle-postgresql-nix;
# PortMidi needs an environment variable to have ALSA find its plugins:
@@ -1639,31 +1556,6 @@ with haskellLib;
# Fix build with attr-2.4.48 (see #53716)
xattr = appendPatch ./patches/xattr-fix-build.patch super.xattr;
- esqueleto =
- overrideCabal
- (drv: {
- postPatch = drv.postPatch or "" + ''
- # patch out TCP usage: https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook-tcp
- sed -i test/PostgreSQL/Test.hs \
- -e s^host=localhost^^
- '';
- # Match the test suite defaults (or hardcoded values?)
- preCheck = drv.preCheck or "" + ''
- PGUSER=esqutest
- PGDATABASE=esqutest
- '';
- testFlags = drv.testFlags or [ ] ++ [
- # We don't have a MySQL test hook yet
- "--skip=/Esqueleto/MySQL"
- ];
- testToolDepends = drv.testToolDepends or [ ] ++ [
- pkgs.postgresql
- pkgs.postgresqlTestHook
- ];
- })
- # https://github.com/NixOS/nixpkgs/issues/198495
- (dontCheckIf (pkgs.postgresqlTestHook.meta.broken) super.esqueleto);
-
# Requires API keys to run tests
algolia = dontCheck super.algolia;
openai-hs = dontCheck super.openai-hs;
@@ -1694,10 +1586,6 @@ with haskellLib;
# https://github.com/haskell-servant/servant-ekg/issues/15
servant-ekg = doJailbreak super.servant-ekg;
- hledger_1_50 = super.hledger_1_50.override {
- hledger-lib = self.hledger-lib_1_50;
- };
-
# it wants to build a statically linked binary by default
hledger-flow = overrideCabal (drv: {
postPatch = (drv.postPatch or "") + ''
@@ -1726,54 +1614,23 @@ with haskellLib;
# Test suite requires database
persistent-mysql = dontCheck super.persistent-mysql;
- persistent-postgresql =
- # TODO: move this override to configuration-nix.nix
- overrideCabal
- (drv: {
- postPatch = drv.postPath or "" + ''
- # patch out TCP usage: https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook-tcp
- # NOTE: upstream host variable takes only two values...
- sed -i test/PgInit.hs \
- -e s^'host=" <> host <> "'^^
- '';
- preCheck = drv.preCheck or "" + ''
- PGDATABASE=test
- PGUSER=test
- '';
- testToolDepends = drv.testToolDepends or [ ] ++ [
- pkgs.postgresql
- pkgs.postgresqlTestHook
- ];
- })
- # https://github.com/NixOS/nixpkgs/issues/198495
- (dontCheckIf (pkgs.postgresqlTestHook.meta.broken) super.persistent-postgresql);
- 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
- );
+ 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";
+ })
+ ] 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 [
@@ -1782,6 +1639,21 @@ with haskellLib;
unmarkBroken
];
+ # Unreleased patch fixing compilation with text >= 2.1.2
+ dom-parser = appendPatches [
+ (pkgs.fetchpatch {
+ name = "dom-parser-text-2.1.2.patch";
+ url = "https://github.com/typeable/dom-parser/commit/b8d9af75595072026a1706e94750dba55e65326b.patch";
+ hash = "sha256-c7ea0YCtXhv4u+pTuxcWoISa+yV2oEtxS/RmC6Bbx1M=";
+ })
+ ] super.dom-parser;
+
+ # Requires jsaddle-webkit2gtk to build outside of pkgsCross.ghcjs
+ # which requires a version of libsoup that's marked as insecure
+ reflex-dom = dontDistribute super.reflex-dom;
+ reflex-localize-dom = dontDistribute super.reflex-localize-dom;
+ trasa-reflex = dontDistribute super.trasa-reflex;
+
# https://github.com/ghcjs/jsaddle/pull/160/
jsaddle = appendPatch (fetchpatch {
name = "fix-on-firefox.patch";
@@ -1812,6 +1684,14 @@ with haskellLib;
}
);
+ # https://github.com/danfran/cabal-macosx/pull/19
+ cabal-macosx = appendPatch (fetchpatch {
+ name = "support-cabal-3.14.patch";
+ url = "https://github.com/danfran/cabal-macosx/commit/24ef850a4c743e525433a6f9eaa3f8924408db10.patch";
+ excludes = [ ".gitignore" ];
+ sha256 = "sha256-ORonk31yStWH0I83B4hCpnap7KK4o49UVrwdrZjCRaU=";
+ }) super.cabal-macosx;
+
# 2020-06-24: Jailbreaking because of restrictive test dep bounds
# Upstream issue: https://github.com/kowainik/trial/issues/62
trial = doJailbreak super.trial;
@@ -1875,7 +1755,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_4_0 = doDistribute (dontCheck super.haskeline_0_8_4_0);
+ haskeline_0_8_4_1 = doDistribute (dontCheck super.haskeline_0_8_4_1);
# Test suite fails to compile https://github.com/agrafix/Spock/issues/177
Spock = dontCheck super.Spock;
@@ -1910,23 +1790,13 @@ with haskellLib;
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
- );
+ 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=";
+ })
+ ] super.optparse-applicative;
# chell-quickcheck doesn't work with QuickCheck >= 2.15 with no known fix yet
# https://github.com/typeclasses/chell/issues/5
@@ -2533,8 +2403,6 @@ with haskellLib;
# The shipped Setup.hs file is broken.
csv = overrideCabal (drv: { preCompileBuildDriver = "rm Setup.hs"; }) super.csv;
- # Build-type is simple, but ships a broken Setup.hs
- digits = overrideCabal (drv: { preCompileBuildDriver = "rm Setup.lhs"; }) super.digits;
cabal-fmt = doJailbreak (
super.cabal-fmt.override {
@@ -2564,9 +2432,6 @@ with haskellLib;
))
];
- # 2025-02-11: Too strict bounds on base < 4.17
- ema = doJailbreak super.ema;
-
# Too strict bounds on text and tls
# https://github.com/barrucadu/irc-conduit/issues/54
# Use crypton-connection instead of connection
@@ -2699,9 +2564,10 @@ with haskellLib;
# hexstring is not compatible with newer versions of base16-bytestring
# See https://github.com/solatis/haskell-hexstring/issues/3
hexstring = overrideCabal (old: {
- # Prevent DOS line endings from Hackage from breaking a patch
+ # GitHub doesn't generate a patch with DOS line endings, so we
+ # need to convert the patched file to Unix line endings
prePatch = old.prePatch or "" + ''
- ${pkgs.buildPackages.dos2unix}/bin/dos2unix src/Data/HexString.hs
+ sed -i -e 's/\r$//' src/Data/HexString.hs
'';
patches = old.patches or [ ] ++ [
(pkgs.fetchpatch {
@@ -2800,36 +2666,27 @@ with haskellLib;
# Overly strict bounds on tasty-quickcheck (test suite) (< 0.11)
hashable = doJailbreak super.hashable;
- cborg = lib.pipe super.cborg [
- (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
- '';
- }))
- ];
+ cborg = 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;
+ })
+ ] super.cborg;
# Doesn't compile with tasty-quickcheck == 0.11 (see issue above)
serialise = dontCheck super.serialise;
@@ -2912,20 +2769,6 @@ with haskellLib;
# https://github.com/brandonchinn178/tasty-autocollect/issues/54
tasty-autocollect = dontCheck super.tasty-autocollect;
- postgres-websockets = lib.pipe super.postgres-websockets [
- (addTestToolDepends [
- pkgs.postgresql
- pkgs.postgresqlTestHook
- ])
- (dontCheckIf pkgs.postgresqlTestHook.meta.broken)
- (overrideCabal {
- preCheck = ''
- export postgresqlEnableTCP=1
- export PGDATABASE=postgres_ws_test
- '';
- })
- ];
-
postgrest =
lib.pipe
(super.postgrest.overrideScope (
@@ -2949,22 +2792,26 @@ with haskellLib;
(addBuildDepends [
self.cache
self.extra
+ self.focus
self.fuzzyset_0_2_4
+ self.http-client
self.jose-jwt
self.neat-interpolation
self.prometheus-client
+ self.some
+ self.stm-hamt
self.timeit
])
# 2022-12-02: Too strict bounds.
doJailbreak
# 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275
(overrideSrc rec {
- version = "13.0.7";
+ version = "14.0";
src = pkgs.fetchFromGitHub {
owner = "PostgREST";
repo = "postgrest";
rev = "v${version}";
- hash = "sha256-5bWemChm2MpogtGuiBuuep4lhRBhnKOOeBqm+Sqcgl4=";
+ hash = "sha256-GokYeVDuVdIbowU6xE3l8iaGbH4jnpqQFy/E+sb/Unw=";
};
})
];
@@ -3080,11 +2927,12 @@ with haskellLib;
hash = "sha256-JxraFWzErJT4EhELa3PWBGHaLT9OLgEPNSnxwpdpHd0=";
}) (doJailbreak super.argon2); # Unmaintained
- # 2024-07-09: zinza has bumped their QuickCheck and tasty dependencies beyond stackage lts.
- # Can possibly be removed once QuickCheck >= 2.15 and tasty >= 1.5
+ # 2025-10-02: Too strict upper bound on tasty-quickcheck (<0.11)
+ # https://github.com/phadej/zinza/pull/28
zinza = dontCheck super.zinza;
pdftotext = overrideCabal (drv: {
+ jailbreak = true;
postPatch = ''
# Fixes https://todo.sr.ht/~geyaeb/haskell-pdftotext/6
substituteInPlace pdftotext.cabal --replace-quiet c-sources cxx-sources
@@ -3096,29 +2944,21 @@ with haskellLib;
substituteInPlace pdftotext.cabal --replace-quiet BSD3 BSD-3-Clause
''
+ (drv.postPatch or "");
- }) (doJailbreak (addExtraLibrary pkgs.pkg-config (addExtraLibrary pkgs.poppler super.pdftotext)));
+ }) super.pdftotext;
# QuickCheck <2.15
# https://github.com/google/proto-lens/issues/403
proto-lens-arbitrary = doJailbreak super.proto-lens-arbitrary;
+ # Forbids QuickCheck >= 2.15
+ # https://github.com/mchav/granite/issues/12#issuecomment-3360209408
+ granite = doJailbreak super.granite;
+
+ # Erroneously forbids vector >= 0.13.2.0
+ # https://github.com/mchav/snappy-hs/commit/400490df38e0db7f353c0427f034a231bdf73098#r167007963
+ snappy-hs = doJailbreak super.snappy-hs;
+
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";
@@ -3140,9 +2980,19 @@ with haskellLib;
# 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
+ # Hackage release trails a good deal behind master
proto3-suite = lib.pipe super.proto3-suite [
- dontCheck # Hackage release trails a good deal behind master
+ dontCheck
doJailbreak
+ (overrideSrc {
+ version = "0.9.0-unstable-2025-04-10";
+ src = pkgs.fetchFromGitHub {
+ owner = "awakesecurity";
+ repo = "proto3-suite";
+ rev = "24bb3f9c6c83b4ecc31783fa5a8fa4406e6ef0d8";
+ hash = "sha256-009UNd1rEg/wDCCxReQWhPwHaONwlB6l6qoIPR0mVBU=";
+ };
+ })
];
# Tests require docker
@@ -3232,12 +3082,6 @@ 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);
@@ -3479,10 +3323,6 @@ with haskellLib;
# 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;
@@ -3491,13 +3331,24 @@ with haskellLib;
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 {
- url = "https://github.com/haskell-cryptography/botan/commit/99de68c3938187b7ab740c6534ec032a4a236747.patch";
- sha256 = "sha256-v255WFO9HsRuTAWFZG27TYbpoK7rJ1AuiCFNFIV18mI=";
- stripLen = 1;
- }) super.botan-bindings;
+ # 2025-10-12: gi-gtk was renamed to gi-gtk3
+ # https://github.com/haskell-gi/haskell-gi/issues/478
+ gi-gtk-hs =
+ appendPatches
+ [
+ (pkgs.fetchpatch {
+ name = "gi-gtk-hs-use-gtk3.patch";
+ url = "https://github.com/haskell-gi/haskell-gi/commit/e2ed85835499f70e119f050a2f37f22481f93886.patch";
+ sha256 = "sha256-MzxXtBNBbJJaNwTOrq/CYqK4yGfS4Yk5fQ38ihFcclA=";
+ relative = "gi-gtk-hs";
+ })
+ ]
+ (
+ super.gi-gtk-hs.override {
+ gi-gdk = self.gi-gdk3;
+ gi-gtk = self.gi-gtk3;
+ }
+ );
# 2025-08-04: Disable failing testcases. It would feel bad to disable all the
# checks in a cryptography related package.
diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix
index f3387cd2ce7fb..9569f4b36597b 100644
--- a/pkgs/development/haskell-modules/configuration-darwin.nix
+++ b/pkgs/development/haskell-modules/configuration-darwin.nix
@@ -36,10 +36,6 @@ self: super:
double-conversion = addExtraLibrary pkgs.libcxx super.double-conversion;
- # "erf table" test fails on Darwin
- # https://github.com/bos/math-functions/issues/63
- math-functions = dontCheck super.math-functions;
-
# darwin doesn't have sub-second resolution
# https://github.com/hspec/mockery/issues/11
mockery = overrideCabal (drv: {
@@ -94,7 +90,7 @@ self: super:
drv:
lib.optionalAttrs (!pkgs.stdenv.cc.nativeLibc) {
postPatch = ''
- substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security
+ substituteInPlace System/X509/MacOS.hs --replace-fail security /usr/bin/security
''
+ (drv.postPatch or "");
}
@@ -103,11 +99,20 @@ self: super:
drv:
lib.optionalAttrs (!pkgs.stdenv.cc.nativeLibc) {
postPatch = ''
- substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security
+ substituteInPlace System/X509/MacOS.hs --replace-fail security /usr/bin/security
''
+ (drv.postPatch or "");
}
) super.crypton-x509-system;
+ HsOpenSSL-x509-system = overrideCabal (
+ drv:
+ lib.optionalAttrs (!pkgs.stdenv.cc.nativeLibc) {
+ postPatch = ''
+ substituteInPlace OpenSSL/X509/SystemStore/MacOSX.hs --replace-fail security /usr/bin/security
+ ''
+ + (drv.postPatch or "");
+ }
+ ) super.HsOpenSSL-x509-system;
# https://github.com/haskell-foundation/foundation/pull/412
foundation = dontCheck super.foundation;
@@ -124,7 +129,7 @@ self: super:
# when called from GHC, probably because clang is version 7, but we are
# using LLVM8.
preCompileBuildDriver = ''
- substituteInPlace Setup.hs --replace "addToLdLibraryPath libDir" "pure ()"
+ substituteInPlace Setup.hs --replace-fail "addToLdLibraryPath libDir" "pure ()"
''
+ (oldAttrs.preCompileBuildDriver or "");
}) super.llvm-hs;
@@ -165,7 +170,7 @@ self: super:
HTF = overrideCabal (drv: {
# GNU find is not prefixed in stdenv
postPatch = ''
- substituteInPlace scripts/local-htfpp --replace "find=gfind" "find=find"
+ substituteInPlace scripts/local-htfpp --replace-fail "find=gfind" "find=find"
''
+ (drv.postPatch or "");
}) super.HTF;
@@ -185,7 +190,7 @@ self: super:
# however linking against it is also not necessary there
GLHUI = overrideCabal (drv: {
postPatch = ''
- substituteInPlace GLHUI.cabal --replace " rt" ""
+ substituteInPlace GLHUI.cabal --replace-fail " rt" ""
''
+ (drv.postPatch or "");
}) super.GLHUI;
@@ -194,7 +199,7 @@ self: super:
# Prevent darwin-specific configuration code path being taken
# which doesn't work with nixpkgs' SDL libraries
postPatch = ''
- substituteInPlace configure --replace xDarwin noDarwinSpecialCasing
+ substituteInPlace configure --replace-fail xDarwin noDarwinSpecialCasing
''
+ (drv.postPatch or "");
patches = [
@@ -207,7 +212,7 @@ self: super:
# doesn't work with nixpkgs' SDL libraries
SDL-mixer = overrideCabal (drv: {
postPatch = ''
- substituteInPlace configure --replace xDarwin noDarwinSpecialCasing
+ substituteInPlace configure --replace-fail xDarwin noDarwinSpecialCasing
''
+ (drv.postPatch or "");
}) super.SDL-mixer;
@@ -313,7 +318,7 @@ self: super:
# Remove a problematic assert, the length is sometimes 1 instead of 2 on darwin
di-core = overrideCabal (drv: {
preConfigure = ''
- substituteInPlace test/Main.hs --replace \
+ substituteInPlace test/Main.hs --replace-fail \
"2 @=? List.length (List.nub (List.sort (map Di.log_time logs)))" ""
'';
}) super.di-core;
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 a204f4d41fb34..1454ea63b5147 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
@@ -1,18 +1,6 @@
-{
- config,
- pkgs,
- haskellLib,
-}:
-
-with haskellLib;
-
-let
- inherit (pkgs.stdenv.hostPlatform) isDarwin;
- inherit (pkgs) lib;
-in
+{ }:
self: super: {
-
# Disable GHC 9.0.x core libraries.
array = null;
base = null;
@@ -42,161 +30,11 @@ self: super: {
rts = null;
stm = 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
- doDistribute self.terminfo_0_4_1_7;
+ terminfo = null;
text = null;
time = null;
transformers = null;
unix = null;
- # GHC only bundles the xhtml library if haddock is enabled, check if this is
- # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463
- xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_4_0_0;
-
- # Need the Cabal-syntax-3.6.0.0 fake package for Cabal < 3.8 to allow callPackage and the constraint solver to work
- Cabal-syntax = self.Cabal-syntax_3_6_0_0;
- # These core package only exist for GHC >= 9.4. The best we can do is feign
- # 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.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;
- };
-
- # Needs base-orphans for GHC < 9.8 / base < 4.19
- some = addBuildDepend self.base-orphans super.some;
-
- # Jailbreaks & Version Updates
-
- # tar > 0.6 requires os-string which can't be built with bytestring < 0.11
- tar = doDistribute (doJailbreak self.tar_0_6_0_0);
- # text-metrics >= 0.3.3 requires GHC2021
- text-metrics = doDistribute self.text-metrics_0_3_2;
-
- # For GHC < 9.4, some packages need data-array-byte as an extra dependency
- primitive = addBuildDepends [ self.data-array-byte ] super.primitive;
- # 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
- ]
- # 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;
-
- hashable-time = doJailbreak super.hashable-time;
- tuple = addBuildDepend self.base-orphans super.tuple;
- vector-th-unbox = doJailbreak super.vector-th-unbox;
-
- ormolu = self.ormolu_0_5_2_0.override {
- Cabal-syntax = self.Cabal-syntax_3_8_1_0;
- };
-
- stylish-haskell = doJailbreak super.stylish-haskell_0_14_4_0;
-
- doctest = dontCheck super.doctest;
-
- haskell-language-server =
- lib.throwIf config.allowAliases
- "haskell-language-server has dropped support for ghc 9.0 in version 2.4.0.0, please use a newer ghc version or an older nixpkgs version"
- (markBroken super.haskell-language-server);
-
- # test suite depends on vcr since hpack >= 0.38.1 which requires GHC2021
- hpack = dontCheck super.hpack;
-
- # Needs to use ghc-lib due to incompatible GHC
- ghc-tags = doDistribute self.ghc-tags_1_5;
-
- # ghc-lib >= 9.6 and friends no longer build with GHC 9.0
- ghc-lib-parser = doDistribute self.ghc-lib-parser_9_2_8_20230729;
- ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_2_1_1;
- ghc-lib = doDistribute self.ghc-lib_9_2_8_20230729;
-
- # Test suite sometimes segfaults with GHC 9.0.1 and 9.0.2
- # https://github.com/ekmett/reflection/issues/51
- # https://gitlab.haskell.org/ghc/ghc/-/issues/21141
- reflection = dontCheck super.reflection;
-
- # Disable tests pending resolution of
- # https://github.com/Soostone/retry/issues/71
- retry = dontCheck super.retry;
-
- ghc-api-compat = unmarkBroken super.ghc-api-compat;
-
- # 2021-09-18: cabal2nix does not detect the need for ghc-api-compat.
- hiedb = overrideCabal (old: {
- libraryHaskellDepends = old.libraryHaskellDepends ++ [ self.ghc-api-compat ];
- }) super.hiedb;
-
- # https://github.com/lspitzner/butcher/issues/7
- butcher = doJailbreak super.butcher;
-
- # Tests require nothunks < 0.3 (conflicting with Stackage) for GHC < 9.8
- aeson = dontCheck super.aeson;
-
- # We use a GHC patch to support the fix for https://github.com/fpco/inline-c/issues/127
- # which means that the upstream cabal file isn't allowed to add the flag.
- inline-c-cpp =
- (if isDarwin then appendConfigureFlags [ "--ghc-option=-fcompact-unwind" ] else x: x)
- super.inline-c-cpp;
-
- # 2022-05-31: weeder 2.4.* requires GHC 9.2
- weeder = doDistribute self.weeder_2_3_1;
- # Unnecessarily strict upper bound on lens
- weeder_2_3_1 = doJailbreak (
- super.weeder_2_3_1.override {
- # weeder < 2.6 only supports algebraic-graphs < 0.7
- # We no longer have matching test deps for algebraic-graphs 0.6.1 in the set
- algebraic-graphs = dontCheck self.algebraic-graphs_0_6_1;
- }
- );
-
- # Later versions only support GHC >= 9.2
- ghc-exactprint = self.ghc-exactprint_0_6_4;
-
- retrie = dontCheck self.retrie_1_1_0_0;
-
- # Needs OneTuple for ghc < 9.2
- binary-orphans = addBuildDepends [ self.OneTuple ] super.binary-orphans;
-
- hspec-megaparsec = super.hspec-megaparsec_2_2_0;
-
- # No instance for (Show B.Builder) arising from a use of ‘print’
- http-types = dontCheck super.http-types;
-
- # Packages which need compat library for GHC < 9.6
- inherit (lib.mapAttrs (_: addBuildDepends [ self.foldable1-classes-compat ]) super)
- indexed-traversable
- these
- ;
- base-compat-batteries = addBuildDepends [
- self.foldable1-classes-compat
- self.OneTuple
- ] super.base-compat-batteries;
- OneTuple = addBuildDepends [
- self.foldable1-classes-compat
- self.base-orphans
- ] super.OneTuple;
+ xhtml = null;
+ Win32 = null;
}
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 9bf63d98ac6bb..7dc3919121549 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix
@@ -63,6 +63,7 @@ in
transformers = null;
unix = null;
xhtml = null;
+ Win32 = null;
# “Unfortunately we are unable to support GHC 9.10.”
apply-refact = dontDistribute (markBroken super.apply-refact);
@@ -88,7 +89,5 @@ in
# Test suite issues
#
call-stack = dontCheck super.call-stack; # https://github.com/sol/call-stack/issues/19
- 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
}
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 c0a06d50b4782..9b6a04bd8b821 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix
@@ -66,12 +66,13 @@ with haskellLib;
transformers = null;
unix = null;
xhtml = null;
+ Win32 = null;
#
# Hand pick versions that are compatible with ghc 9.12 and base 4.21
#
- extensions = doDistribute self.extensions_0_1_0_3;
+ extensions = doDistribute self.extensions_0_1_1_0;
ghc-exactprint = doDistribute self.ghc-exactprint_1_12_0_0;
#
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.16.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.16.x.nix
index 0ff76cae4892c..2a09d3f258c09 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.16.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.16.x.nix
@@ -51,4 +51,5 @@ self: super: {
transformers = null;
unix = null;
xhtml = null;
+ Win32 = 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
deleted file mode 100644
index 8bc8c6b6d2a93..0000000000000
--- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
+++ /dev/null
@@ -1,167 +0,0 @@
-{
- config,
- pkgs,
- haskellLib,
-}:
-
-with haskellLib;
-
-let
- inherit (pkgs.stdenv.hostPlatform) isDarwin;
- inherit (pkgs) lib;
-in
-
-self: super: {
-
- # Disable GHC 9.2.x core libraries.
- array = null;
- base = null;
- binary = null;
- bytestring = null;
- Cabal = null;
- containers = null;
- deepseq = null;
- directory = null;
- exceptions = null;
- filepath = null;
- ghc-bignum = null;
- ghc-boot = null;
- ghc-boot-th = null;
- ghc-compact = null;
- ghc-heap = null;
- ghc-prim = null;
- ghci = null;
- haskeline = null;
- hpc = null;
- integer-gmp = null;
- libiserv = null;
- mtl = null;
- parsec = null;
- pretty = null;
- process = null;
- rts = null;
- stm = 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
- doDistribute self.terminfo_0_4_1_7;
- text = null;
- time = null;
- transformers = null;
- unix = null;
- # GHC only bundles the xhtml library if haddock is enabled, check if this is
- # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463
- xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_4_0_0;
-
- # Need the Cabal-syntax-3.6.0.0 fake package for Cabal < 3.8 to allow callPackage and the constraint solver to work
- Cabal-syntax = self.Cabal-syntax_3_6_0_0;
- # These core package only exist for GHC >= 9.4. The best we can do is feign
- # 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.*
- weeder_2_4_1 = doJailbreak (
- super.weeder_2_4_1.override {
- # weeder < 2.6 only supports algebraic-graphs < 0.7
- # We no longer have matching test deps for algebraic-graphs 0.6.1 in the set
- algebraic-graphs = dontCheck self.algebraic-graphs_0_6_1;
- }
- );
-
- haskell-language-server =
- lib.throwIf config.allowAliases
- "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_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
- primitive-addr = doJailbreak super.primitive-addr;
-
- # Needs base-orphans for GHC < 9.8 / base < 4.19
- some = addBuildDepend self.base-orphans super.some;
-
- # Jailbreaks & Version Updates
- hashable-time = doJailbreak super.hashable-time;
-
- # Depends on utf8-light which isn't maintained / doesn't support base >= 4.16
- # https://github.com/haskell-infra/hackage-trustees/issues/347
- # https://mail.haskell.org/pipermail/haskell-cafe/2022-October/135613.html
- language-javascript_0_7_0_0 = dontCheck super.language-javascript_0_7_0_0;
-
- # Needs to match ghc-lib version
- ghc-tags = doDistribute (doJailbreak self.ghc-tags_1_7);
-
- # Needs to match ghc-lib
- hlint = doDistribute self.hlint_3_6_1;
-
- # ghc-lib >= 9.8 and friends no longer build with GHC 9.2 since they require semaphore-compat
- ghc-lib-parser = doDistribute (
- self.ghc-lib-parser_9_6_7_20250325.override {
- happy = self.happy_1_20_1_1; # wants happy < 1.21
- }
- );
- ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_6_0_2;
- ghc-lib = doDistribute (
- self.ghc-lib_9_6_7_20250325.override {
- happy = self.happy_1_20_1_1; # wants happy < 1.21
- }
- );
-
- # 0.2.2.3 requires Cabal >= 3.8
- shake-cabal = doDistribute self.shake-cabal_0_2_2_2;
-
- # Tests require nothunks < 0.3 (conflicting with Stackage) for GHC < 9.8
- aeson = dontCheck super.aeson;
-
- # https://github.com/NixOS/cabal2nix/issues/554
- # https://github.com/clash-lang/clash-compiler/blob/f0f6275e19b8c672f042026c478484c5fd45191d/README.md#ghc-compatibility
- clash-prelude = dontDistribute (markBroken super.clash-prelude);
-
- # Too strict upper bound on bytestring, relevant for GHC 9.2.6 specifically
- # https://github.com/protolude/protolude/issues/127#issuecomment-1428807874
- protolude = doJailbreak super.protolude;
-
- # https://github.com/fpco/inline-c/pull/131
- inline-c-cpp =
- (if isDarwin then appendConfigureFlags [ "--ghc-option=-fcompact-unwind" ] else x: x)
- super.inline-c-cpp;
-
- # A given major version of ghc-exactprint only supports one version of GHC.
- ghc-exactprint = super.ghc-exactprint_1_5_0;
-
- # only broken for >= 9.6
- calligraphy = doDistribute (unmarkBroken super.calligraphy);
-
- # Packages which need compat library for GHC < 9.6
- inherit (lib.mapAttrs (_: addBuildDepends [ self.foldable1-classes-compat ]) super)
- indexed-traversable
- OneTuple
- these
- ;
- base-compat-batteries = addBuildDepends [
- self.foldable1-classes-compat
- self.OneTuple
- ] super.base-compat-batteries;
-}
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 7673e54c2e74c..fe58bea65f886 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
@@ -50,6 +50,7 @@ self: super: {
# GHC only bundles the xhtml library if haddock is enabled, check if this is
# still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463
xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_4_0_0;
+ Win32 = null;
# Becomes a core package in GHC >= 9.8
semaphore-compat = doDistribute self.semaphore-compat_1_0_0;
@@ -98,6 +99,9 @@ self: super: {
# 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46
hiedb = dontCheck super.hiedb;
+ # Tests require skeletest which doesn't support GHC 9.4
+ toml-reader = dontCheck super.toml-reader;
+
# 2022-10-06: https://gitlab.haskell.org/ghc/ghc/-/issues/22260
ghc-check = dontHaddock super.ghc-check;
@@ -131,37 +135,12 @@ self: super: {
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 (
- 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
- hlint
- stylish-haskell
- ;
+
+ haskell-language-server =
+ lib.throwIf pkgs.config.allowAliases
+ "haskell-language-server has dropped support for ghc 9.4 in version 2.12.0.0, please use a newer ghc version or an older nixpkgs"
+ (markBroken super.haskell-language-server);
# directory-ospath-streaming requires the ospath API in core packages
# filepath, directory and unix.
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 ba8c067651f40..41b81b6ba15f0 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
@@ -58,6 +58,7 @@ in
transformers = null;
unix = null;
xhtml = null;
+ Win32 = null;
# Becomes a core package in GHC >= 9.8
semaphore-compat = doDistribute self.semaphore-compat_1_0_0;
@@ -148,6 +149,9 @@ in
# Tests require nothunks < 0.3 (conflicting with Stackage) for GHC < 9.8
aeson = dontCheck super.aeson;
+ # Tests require skeletest which no longer supports GHC 9.6
+ toml-reader = dontCheck super.toml-reader;
+
# Apply patch from PR with mtl-2.3 fix.
ConfigFile = overrideCabal (drv: {
editedCabalFile = null;
@@ -200,7 +204,6 @@ in
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
@@ -211,23 +214,29 @@ in
};
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);
+ apply-refact = addBuildDepend self.data-default-class super.apply-refact;
floskell = doJailbreak super.floskell;
+ fourmolu = dontCheck (doJailbreak self.fourmolu_0_15_0_0);
+ haskell-language-server = addBuildDepends [
+ self.retrie
+ self.floskell
+ self.markdown-unlit
+ ] super.haskell-language-server;
+ hls-plugin-api = super.hls-plugin-api;
+ hlint = self.hlint_3_8;
+ ormolu = self.ormolu_0_7_4_0;
+ retrie = doJailbreak (unmarkBroken super.retrie);
+ stylish-haskell = self.stylish-haskell_0_14_6_0;
}
)
- retrie
+ apply-refact
floskell
- haskell-language-server
fourmolu
- ormolu
+ haskell-language-server
+ hls-plugin-api
hlint
+ ormolu
+ retrie
stylish-haskell
;
}
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 f739c9ddea641..8b430b143451b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
@@ -61,6 +61,7 @@ in
transformers = null;
unix = null;
xhtml = null;
+ Win32 = null;
# Becomes a core package in GHC >= 9.10
os-string = doDistribute self.os-string_2_0_8;
@@ -105,7 +106,6 @@ in
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
@@ -114,27 +114,33 @@ in
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);
+ 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);
+ apply-refact = addBuildDepend self.data-default-class super.apply-refact;
floskell = doJailbreak super.floskell;
+ fourmolu = dontCheck (doJailbreak self.fourmolu_0_15_0_0);
+ haskell-language-server = addBuildDepends [
+ self.retrie
+ self.floskell
+ self.markdown-unlit
+ ] super.haskell-language-server;
+ hls-plugin-api = super.hls-plugin-api;
+ hlint = self.hlint_3_8;
+ ormolu = self.ormolu_0_7_4_0;
+ retrie = doJailbreak (unmarkBroken super.retrie);
+ stylish-haskell = self.stylish-haskell_0_14_6_0;
}
)
- retrie
+ apply-refact
floskell
- haskell-language-server
fourmolu
- ormolu
+ haskell-language-server
+ hls-plugin-api
hlint
+ ormolu
+ retrie
stylish-haskell
;
}
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix b/pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix
index 10a399e73063a..3d2268de643f1 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix
@@ -35,9 +35,16 @@ with haskellLib;
patch = haskellLib.disableParallelBuilding super.patch;
reflex-dom-core = haskellLib.disableParallelBuilding super.reflex-dom-core;
- reflex-dom = super.reflex-dom.override (drv: {
- jsaddle-webkit2gtk = null;
- });
+ # Marked as dontDistribute in -common because of jsaddle-webkit2gtk
+ # which requires an unmaintained version of libsoup. Since this dep
+ # is unnecessary for the JS backend, we can re-enable these jobs here.
+ reflex-dom = doDistribute (
+ super.reflex-dom.override (drv: {
+ jsaddle-webkit2gtk = null;
+ })
+ );
+ reflex-localize-dom = doDistribute super.reflex-localize-dom;
+ trasa-reflex = doDistribute super.trasa-reflex;
miso-examples = pkgs.lib.pipe super.miso-examples [
(addBuildDepends (
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index eda038782976d..1bab282810903 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -66,7 +66,6 @@ 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
@@ -76,7 +75,6 @@ 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
@@ -94,7 +92,6 @@ broken-packages:
- aeson-iproute # failure in job https://hydra.nixos.org/build/295091261 at 2025-04-22
- aeson-json-ast # failure in job https://hydra.nixos.org/build/233249406 at 2023-09-02
- aeson-lens # failure in job https://hydra.nixos.org/build/233235357 at 2023-09-02
- - aeson-match-qq # failure in job https://hydra.nixos.org/build/295091245 at 2025-04-22
- aeson-modern-tojson # failure in job https://hydra.nixos.org/build/233202149 at 2023-09-02
- aeson-options # failure in job https://hydra.nixos.org/build/233245051 at 2023-09-02
- aeson-parsec-picky # failure in job https://hydra.nixos.org/build/233222117 at 2023-09-02
@@ -147,6 +144,7 @@ broken-packages:
- alloy # failure in job https://hydra.nixos.org/build/252726555 at 2024-03-16
- ally-invest # failure in job https://hydra.nixos.org/build/233236224 at 2023-09-02
- alpaca-netcode # failure in job https://hydra.nixos.org/build/233239392 at 2023-09-02
+ - alpha # failure in job https://hydra.nixos.org/build/309811728 at 2025-10-15
- alphachar # failure in job https://hydra.nixos.org/build/252722667 at 2024-03-16
- alpino-tools # failure in job https://hydra.nixos.org/build/233236168 at 2023-09-02
- alsa # failure in job https://hydra.nixos.org/build/233250059 at 2023-09-02
@@ -303,6 +301,7 @@ broken-packages:
- ats-storable # failure in job https://hydra.nixos.org/build/233242765 at 2023-09-02
- attempt # failure in job https://hydra.nixos.org/build/233233073 at 2023-09-02
- attenuation # failure in job https://hydra.nixos.org/build/252721241 at 2024-03-16
+ - attic # failure in job https://hydra.nixos.org/build/311050775 at 2025-11-02
- attic-schedule # failure in job https://hydra.nixos.org/build/233249781 at 2023-09-02
- atto-lisp # failure in job https://hydra.nixos.org/build/233222679 at 2023-09-02
- AttoBencode # failure in job https://hydra.nixos.org/build/233198079 at 2023-09-02
@@ -330,7 +329,6 @@ broken-packages:
- autoproc # failure in job https://hydra.nixos.org/build/252730569 at 2024-03-16
- avatar-generator # failure in job https://hydra.nixos.org/build/233214253 at 2023-09-02
- 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
@@ -459,7 +457,6 @@ broken-packages:
- bindings-cctools # failure in job https://hydra.nixos.org/build/233216939 at 2023-09-02
- bindings-common # failure in job https://hydra.nixos.org/build/233217363 at 2023-09-02
- bindings-dc1394 # failure in job https://hydra.nixos.org/build/233200022 at 2023-09-02
- - bindings-directfb # failure in job https://hydra.nixos.org/build/295091945 at 2025-04-22
- bindings-eskit # failure in job https://hydra.nixos.org/build/233223517 at 2023-09-02
- bindings-EsounD # failure in job https://hydra.nixos.org/build/233245565 at 2023-09-02
- bindings-fann # failure in job https://hydra.nixos.org/build/233232900 at 2023-09-02
@@ -528,8 +525,8 @@ broken-packages:
- bliplib # failure in job https://hydra.nixos.org/build/233195751 at 2023-09-02
- blockchain # failure in job https://hydra.nixos.org/build/233245492 at 2023-09-02
- blockhash # failure in job https://hydra.nixos.org/build/233227049 at 2023-09-02
- - blockio-uring # failure in job https://hydra.nixos.org/build/302801498, https://github.com/well-typed/blockio-uring/issues/44 at 2025-07-27
- - blockio-uring # https://github.com/well-typed/blockio-uring/issues/44, added 2025-07-27
+ - blockio-uring # failure in job https://hydra.nixos.org/build/302801498, https://github.com/well-typed/blockio-uring/issues/47 at 2025-07-27
+ - blockio-uring # https://github.com/well-typed/blockio-uring/issues/47, added 2025-07-27
- Blogdown # failure in job https://hydra.nixos.org/build/233239841 at 2023-09-02
- BlogLiterately # failure in job https://hydra.nixos.org/build/233202164 at 2023-09-02
- bloodhound-amazonka-auth # failure building library in job https://hydra.nixos.org/build/237245625 at 2023-10-21
@@ -538,7 +535,6 @@ 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
@@ -607,7 +603,6 @@ broken-packages:
- 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
- builder # failure in job https://hydra.nixos.org/build/233207846 at 2023-09-02
- - bumper # failure in job https://hydra.nixos.org/build/233234378 at 2023-09-02
- bunz # failure in job https://hydra.nixos.org/build/233193945 at 2023-09-02
- bureaucromancy # failure in job https://hydra.nixos.org/build/295092112 at 2025-04-22
- burst-detection # failure in job https://hydra.nixos.org/build/233254074 at 2023-09-02
@@ -672,7 +667,7 @@ broken-packages:
- 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-matrix # failure in job https://hydra.nixos.org/build/311051176 at 2025-11-02
- 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
@@ -706,6 +701,7 @@ broken-packages:
- cake3 # failure in job https://hydra.nixos.org/build/233231662 at 2023-09-02
- cal-layout # failure in job https://hydra.nixos.org/build/233191194 at 2023-09-02
- cal3d # failure in job https://hydra.nixos.org/build/233200357 at 2023-09-02
+ - calamity # failure in job https://hydra.nixos.org/build/309812724 at 2025-10-15
- caledon # failure in job https://hydra.nixos.org/build/233209888 at 2023-09-02
- calenderweek # failure in job https://hydra.nixos.org/build/233209930 at 2023-09-02
- call-alloy # failure in job https://hydra.nixos.org/build/233249056 at 2023-09-02
@@ -828,6 +824,7 @@ broken-packages:
- cipher-des # failure in job https://hydra.nixos.org/build/233232112 at 2023-09-02
- circle # failure in job https://hydra.nixos.org/build/252722965 at 2024-03-16
- circlehs # failure in job https://hydra.nixos.org/build/233246591 at 2023-09-02
+ - circuit-notation # failure in job https://hydra.nixos.org/build/309812708 at 2025-10-15
- citeproc-hs # failure in job https://hydra.nixos.org/build/233254388 at 2023-09-02
- cj-token # failure in job https://hydra.nixos.org/build/233253928 at 2023-09-02
- cjk # failure in job https://hydra.nixos.org/build/233258734 at 2023-09-02
@@ -839,6 +836,7 @@ broken-packages:
- clarifai # failure in job https://hydra.nixos.org/build/233229480 at 2023-09-02
- CLASE # failure in job https://hydra.nixos.org/build/233234459 at 2023-09-02
- clash-finite # failure in job https://hydra.nixos.org/build/295092297 at 2025-04-22
+ - clash-lib # failure in job https://hydra.nixos.org/build/309812683 at 2025-10-15
- clash-lib-hedgehog # failure in job https://hydra.nixos.org/build/295122808 at 2025-04-22
- clash-multisignal # failure in job https://hydra.nixos.org/build/273463331 at 2024-10-01
- clash-prelude-quickcheck # failure in job https://hydra.nixos.org/build/273453747 at 2024-10-01
@@ -863,6 +861,7 @@ broken-packages:
- clexer # failure in job https://hydra.nixos.org/build/233229804 at 2023-09-02
- CLI # failure in job https://hydra.nixos.org/build/233191087 at 2023-09-02
- cli-builder # failure in job https://hydra.nixos.org/build/233209961 at 2023-09-02
+ - clickhouse-haskell # failure in job https://hydra.nixos.org/build/311051388 at 2025-11-02
- clif # failure in job https://hydra.nixos.org/build/233197110 at 2023-09-02
- clifm # failure in job https://hydra.nixos.org/build/233227426 at 2023-09-02
- clingo # failure in job https://hydra.nixos.org/build/233238084 at 2023-09-02
@@ -873,6 +872,7 @@ broken-packages:
- cloben # failure in job https://hydra.nixos.org/build/233194390 at 2023-09-02
- clock-extras # failure in job https://hydra.nixos.org/build/233190748 at 2023-09-02
- clocked # failure in job https://hydra.nixos.org/build/233241524 at 2023-09-02
+ - clod # failure in job https://hydra.nixos.org/build/309812703 at 2025-10-15
- clogparse # failure in job https://hydra.nixos.org/build/233220294 at 2023-09-02
- clone-all # failure in job https://hydra.nixos.org/build/233234063 at 2023-09-02
- closed-classes # failure in job https://hydra.nixos.org/build/233250965 at 2023-09-02
@@ -884,7 +884,9 @@ broken-packages:
- clr-typed # failure in job https://hydra.nixos.org/build/233212102 at 2023-09-02
- cltw # failure in job https://hydra.nixos.org/build/252735903 at 2024-03-16
- cluss # failure in job https://hydra.nixos.org/build/233245341 at 2023-09-02
+ - cmark-gfm-lens # failure in job https://hydra.nixos.org/build/311051270 at 2025-11-02
- cmark-highlight # failure in job https://hydra.nixos.org/build/233218534 at 2023-09-02
+ - cmark-lens # failure in job https://hydra.nixos.org/build/311051296 at 2025-11-02
- cmark-patterns # failure in job https://hydra.nixos.org/build/233192983 at 2023-09-02
- cmark-sections # failure in job https://hydra.nixos.org/build/233222829 at 2023-09-02
- cmath # failure in job https://hydra.nixos.org/build/233236588 at 2023-09-02
@@ -1058,6 +1060,7 @@ broken-packages:
- contstuff-monads-tf # failure in job https://hydra.nixos.org/build/233224064 at 2023-09-02
- 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
+ - convert-annotation # failure in job https://hydra.nixos.org/build/310117221 at 2025-10-15
- 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
@@ -1179,6 +1182,7 @@ broken-packages:
- daemonize-doublefork # failure in job https://hydra.nixos.org/build/252714429 at 2024-03-16
- dag # failure in job https://hydra.nixos.org/build/233220719 at 2023-09-02
- DAG-Tournament # failure in job https://hydra.nixos.org/build/233218747 at 2023-09-02
+ - dahdit # failure in job https://hydra.nixos.org/build/309813014 at 2025-10-15
- damnpacket # failure in job https://hydra.nixos.org/build/233235248 at 2023-09-02
- danibot # failure in job https://hydra.nixos.org/build/233197740 at 2023-09-02
- Dao # failure in job https://hydra.nixos.org/build/233207745 at 2023-09-02
@@ -1221,6 +1225,7 @@ 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-foldapp # failure in job https://hydra.nixos.org/build/309813054 at 2025-10-15
- 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
@@ -1228,6 +1233,7 @@ broken-packages:
- data-kiln # failure in job https://hydra.nixos.org/build/233220764 at 2023-09-02
- data-lens-fd # failure in job https://hydra.nixos.org/build/233252537 at 2023-09-02
- data-lens-template # failure in job https://hydra.nixos.org/build/233194446 at 2023-09-02
+ - data-list-zigzag # failure in job https://hydra.nixos.org/build/309813043 at 2025-10-15
- data-map-multikey # failure in job https://hydra.nixos.org/build/233223141 at 2023-09-02
- data-named # failure in job https://hydra.nixos.org/build/233196088 at 2023-09-02
- data-nat # failure in job https://hydra.nixos.org/build/233226801 at 2023-09-02
@@ -1331,6 +1337,7 @@ broken-packages:
- 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-topdown # failure in job https://hydra.nixos.org/build/309813202 at 2025-10-15
- 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
- deriving-openapi3 # failure in job https://hydra.nixos.org/build/252718489 at 2024-03-16
@@ -1501,6 +1508,7 @@ broken-packages:
- dtw # failure in job https://hydra.nixos.org/build/233198932 at 2023-09-02
- dual # failure in job https://hydra.nixos.org/build/252724683 at 2024-03-16
- dualizer # failure in job https://hydra.nixos.org/build/233237592 at 2023-09-02
+ - duckdb-ffi # failure in job https://hydra.nixos.org/build/311300709, https://github.com/Tritlo/duckdb-haskell/issues/2
- duckling # failure in job https://hydra.nixos.org/build/233247880 at 2023-09-02
- duet # failure in job https://hydra.nixos.org/build/233219004 at 2023-09-02
- dump-core # failure in job https://hydra.nixos.org/build/233244428 at 2023-09-02
@@ -1692,6 +1700,7 @@ broken-packages:
- eved # failure in job https://hydra.nixos.org/build/233194319 at 2023-09-02
- event # failure in job https://hydra.nixos.org/build/233209756 at 2023-09-02
- event-driven # failure in job https://hydra.nixos.org/build/233233946 at 2023-09-02
+ - eventlog-live-influxdb # failure in job https://hydra.nixos.org/build/311052040 at 2025-11-02
- eventloop # failure in job https://hydra.nixos.org/build/295093203 at 2025-04-22
- eventsource-api # failure in job https://hydra.nixos.org/build/233243220 at 2023-09-02
- eventsourced # failure in job https://hydra.nixos.org/build/233192731 at 2023-09-02
@@ -1780,6 +1789,7 @@ broken-packages:
- faster-megaparsec # failure in job https://hydra.nixos.org/build/252713238 at 2024-03-16
- fastly # failure in job https://hydra.nixos.org/build/233213136 at 2023-09-02
- fastmemo # failure in job https://hydra.nixos.org/build/252739389 at 2024-03-16
+ - fastparser # failure in job https://hydra.nixos.org/build/309813509 at 2025-10-15
- fastpbkdf2 # failure in job https://hydra.nixos.org/build/233218574 at 2023-09-02
- FastPush # failure in job https://hydra.nixos.org/build/233224507 at 2023-09-02
- fastsum # failure in job https://hydra.nixos.org/build/252716407 at 2024-03-16
@@ -1851,7 +1861,6 @@ broken-packages:
- fingertree-psqueue # failure in job https://hydra.nixos.org/build/233224766 at 2023-09-02
- fingertree-tf # failure in job https://hydra.nixos.org/build/233259910 at 2023-09-02
- finitary-optics # constraint issues https://hydra.nixos.org/build/295428386
- - finite # failure in job https://hydra.nixos.org/build/233226313 at 2023-09-02
- finite-field # failure in job https://hydra.nixos.org/build/295093309 at 2025-04-22
- finite-fields # failure in job https://hydra.nixos.org/build/233191530 at 2023-09-02
- FiniteCategoriesGraphViz # failure in job https://hydra.nixos.org/build/295090973 at 2025-04-22
@@ -1859,7 +1868,6 @@ broken-packages:
- firefly-example # failure in job https://hydra.nixos.org/build/233259350 at 2023-09-02
- firestore # failure in job https://hydra.nixos.org/build/295093356 at 2025-04-22
- first-and-last # failure in job https://hydra.nixos.org/build/233256888 at 2023-09-02
- - first-class-instances # failure in job https://hydra.nixos.org/build/233207181 at 2023-09-02
- first-class-patterns # failure in job https://hydra.nixos.org/build/252739352 at 2024-03-16
- FirstPrelude # failure in job https://hydra.nixos.org/build/233256065 at 2023-09-02
- fit # failure in job https://hydra.nixos.org/build/233239893 at 2023-09-02
@@ -2038,6 +2046,7 @@ broken-packages:
- 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
- fx # failure in job https://hydra.nixos.org/build/295093438 at 2025-04-22
+ - fxpak # failure in job https://hydra.nixos.org/build/309813706 at 2025-10-15
- g-npm # failure in job https://hydra.nixos.org/build/233215965 at 2023-09-02
- g4ip # failure in job https://hydra.nixos.org/build/233248315 at 2023-09-02
- gambler # failure in job https://hydra.nixos.org/build/252732701 at 2024-03-16
@@ -2115,9 +2124,11 @@ broken-packages:
- gf # failure in job https://hydra.nixos.org/build/233237752 at 2023-09-02
- GGg # failure in job https://hydra.nixos.org/build/233207289 at 2023-09-02
- ggtsTC # failure in job https://hydra.nixos.org/build/233229612 at 2023-09-02
+ - gh # failure in job https://hydra.nixos.org/build/311052387 at 2025-11-02
- gh-labeler # failure in job https://hydra.nixos.org/build/233233139 at 2023-09-02
- ghc-api-compat # failure in job https://hydra.nixos.org/build/233235008 at 2023-09-02
- ghc-clippy-plugin # failure in job https://hydra.nixos.org/build/233227499 at 2023-09-02
+ - ghc-compat # failure in job https://hydra.nixos.org/build/311052382 at 2025-11-02
- ghc-core-smallstep # failure in job https://hydra.nixos.org/build/233209763 at 2023-09-02
- ghc-corroborate # failure in job https://hydra.nixos.org/build/233223692 at 2023-09-02
- ghc-definitions-th # failure in job https://hydra.nixos.org/build/233254844 at 2023-09-02
@@ -2126,9 +2137,7 @@ broken-packages:
- ghc-dup # failure in job https://hydra.nixos.org/build/233203978 at 2023-09-02
- ghc-events-analyze # failure in job https://hydra.nixos.org/build/233207621 at 2023-09-02
- 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
@@ -2147,7 +2156,6 @@ broken-packages:
- 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
@@ -2169,11 +2177,11 @@ broken-packages:
- 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-notify # failure in job https://hydra.nixos.org/build/311052496 at 2025-11-02
- 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
@@ -2238,6 +2246,7 @@ broken-packages:
- 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
+ - gmap # failure in job https://hydra.nixos.org/build/309814029 at 2025-10-15
- 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
@@ -2283,6 +2292,7 @@ broken-packages:
- GPipe # failure in job https://hydra.nixos.org/build/233202480 at 2023-09-02
- GPipe-Core # failure in job https://hydra.nixos.org/build/233194426 at 2023-09-02
- gpmf # failure in job https://hydra.nixos.org/build/233245964 at 2023-09-02
+ - gpu-vulkan-middle # failure in job https://hydra.nixos.org/build/311052831 at 2025-11-02
- gpx-conduit # failure in job https://hydra.nixos.org/build/233245487 at 2023-09-02
- grab # failure in job https://hydra.nixos.org/build/252727759 at 2024-03-16
- graceful # failure in job https://hydra.nixos.org/build/233199650 at 2023-09-02
@@ -2290,7 +2300,6 @@ 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
@@ -2341,7 +2350,6 @@ broken-packages:
- 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
@@ -2358,6 +2366,7 @@ broken-packages:
- 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 # failure in job https://hydra.nixos.org/build/311050009 at 2025-11-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
- h-reversi # failure in job https://hydra.nixos.org/build/233235617 at 2023-09-02
@@ -2378,6 +2387,7 @@ broken-packages:
- hackage-mirror # failure in job https://hydra.nixos.org/build/233240852 at 2023-09-02
- hackage-processing # failure in job https://hydra.nixos.org/build/233243914 at 2023-09-02
- hackage-proxy # failure in job https://hydra.nixos.org/build/233221269 at 2023-09-02
+ - hackage-publish # failure in job https://hydra.nixos.org/build/311052802 at 2025-11-02
- hackage-server # failure in job https://hydra.nixos.org/build/233254343 at 2023-09-02
- hackage-whatsnew # failure in job https://hydra.nixos.org/build/233194915 at 2023-09-02
- hackage2hwn # failure in job https://hydra.nixos.org/build/233246308 at 2023-09-02
@@ -2393,7 +2403,6 @@ broken-packages:
- 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
- hafar # failure in job https://hydra.nixos.org/build/233231237 at 2023-09-02
- - haggle # failure in job https://hydra.nixos.org/build/233198660 at 2023-09-02
- Haggressive # failure in job https://hydra.nixos.org/build/233235332 at 2023-09-02
- HaGL # failure in job https://hydra.nixos.org/build/234457220 at 2023-09-13
- hahp # failure in job https://hydra.nixos.org/build/233250101 at 2023-09-02
@@ -2528,7 +2537,6 @@ broken-packages:
- haskell-go-checkers # failure in job https://hydra.nixos.org/build/234459896 at 2023-09-13
- haskell-halogen-core # failure in job https://hydra.nixos.org/build/299138362 at 2025-06-23
- haskell-holes-th # failure in job https://hydra.nixos.org/build/233238457 at 2023-09-02
- - haskell-igraph # failure in job https://hydra.nixos.org/build/233201209 at 2023-09-02
- haskell-import-graph # failure in job https://hydra.nixos.org/build/233225328 at 2023-09-02
- haskell-in-space # failure in job https://hydra.nixos.org/build/233207121 at 2023-09-02
- haskell-kubernetes # failure in job https://hydra.nixos.org/build/233214499 at 2023-09-02
@@ -2624,7 +2632,8 @@ broken-packages:
- haven # failure in job https://hydra.nixos.org/build/233216806 at 2023-09-02
- haverer # failure in job https://hydra.nixos.org/build/233210491 at 2023-09-02
- hax # failure in job https://hydra.nixos.org/build/233212147 at 2023-09-02
- - haxl # failure in job https://hydra.nixos.org/build/233243740 at 2023-09-02
+ - haxl-amazonka # failure in job https://hydra.nixos.org/build/310117233 at 2025-10-15
+ - haxl-facebook # failure in job https://hydra.nixos.org/build/310117231 at 2025-10-15
- haxparse # failure in job https://hydra.nixos.org/build/233205900 at 2023-09-02
- 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
@@ -2742,6 +2751,7 @@ broken-packages:
- hgearman # failure in job https://hydra.nixos.org/build/233231063 at 2023-09-02
- 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
+ - hgettext # failure in job https://hydra.nixos.org/build/309814473 at 2025-10-15
- 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
@@ -2786,6 +2796,7 @@ broken-packages:
- hinotify-conduit # failure in job https://hydra.nixos.org/build/252710760 at 2024-03-16
- hinquire # failure in job https://hydra.nixos.org/build/233235549 at 2023-09-02
- hinstaller # failure in job https://hydra.nixos.org/build/233244650 at 2023-09-02
+ - hint-nix # failure in job https://hydra.nixos.org/build/309814463 at 2025-10-15
- 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
@@ -2822,7 +2833,6 @@ broken-packages:
- hledger-api # failure in job https://hydra.nixos.org/build/295094278 at 2025-04-22
- hledger-chart # failure in job https://hydra.nixos.org/build/233205387 at 2023-09-02
- hledger-diff # failure in job https://hydra.nixos.org/build/233199639 at 2023-09-02
- - hledger-flow # failure in job https://hydra.nixos.org/build/233252169 at 2023-09-02
- hledger-irr # failure in job https://hydra.nixos.org/build/233230276 at 2023-09-02
- hledger-makeitso # failure in job https://hydra.nixos.org/build/233213046 at 2023-09-02
- hledger-vty # failure in job https://hydra.nixos.org/build/233191782 at 2023-09-02
@@ -2874,7 +2884,6 @@ 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
@@ -2981,7 +2990,16 @@ broken-packages:
- 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-exporter-handle # failure in job https://hydra.nixos.org/build/311053149 at 2025-11-02
+ - hs-opentelemetry-exporter-in-memory # failure in job https://hydra.nixos.org/build/311053165 at 2025-11-02
- hs-opentelemetry-instrumentation-auto # failure in job https://hydra.nixos.org/build/253678404 at 2024-03-31
+ - hs-opentelemetry-instrumentation-conduit # failure in job https://hydra.nixos.org/build/311053155 at 2025-11-02
+ - hs-opentelemetry-instrumentation-hspec # failure in job https://hydra.nixos.org/build/311053154 at 2025-11-02
+ - hs-opentelemetry-instrumentation-persistent # failure in job https://hydra.nixos.org/build/311053162 at 2025-11-02
+ - hs-opentelemetry-instrumentation-postgresql-simple # failure in job https://hydra.nixos.org/build/311053156 at 2025-11-02
+ - hs-opentelemetry-instrumentation-tasty # failure in job https://hydra.nixos.org/build/311053195 at 2025-11-02
+ - hs-opentelemetry-instrumentation-wai # failure in job https://hydra.nixos.org/build/311053157 at 2025-11-02
+ - hs-opentelemetry-utils-exceptions # failure in job https://hydra.nixos.org/build/311053185 at 2025-11-02
- hs-pattrans # failure in job https://hydra.nixos.org/build/233230577 at 2023-09-02
- hs-pgms # failure in job https://hydra.nixos.org/build/233237693 at 2023-09-02
- hs-pkg-config # failure in job https://hydra.nixos.org/build/233240839 at 2023-09-02
@@ -3154,7 +3172,6 @@ broken-packages:
- huck # failure in job https://hydra.nixos.org/build/233235354 at 2023-09-02
- HueAPI # failure in job https://hydra.nixos.org/build/233234528 at 2023-09-02
- huff # failure in job https://hydra.nixos.org/build/233194394 at 2023-09-02
- - huffman # failure in job https://hydra.nixos.org/build/233230189 at 2023-09-02
- HulkImport # failure in job https://hydra.nixos.org/build/233193212 at 2023-09-02
- hum # failure in job https://hydra.nixos.org/build/233203730 at 2023-09-02
- human-parse # failure in job https://hydra.nixos.org/build/233212317 at 2023-09-02
@@ -3212,7 +3229,6 @@ broken-packages:
- 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
@@ -3233,6 +3249,7 @@ broken-packages:
- ib-api # failure in job https://hydra.nixos.org/build/233223054 at 2023-09-02
- iban # failure in job https://hydra.nixos.org/build/233236424 at 2023-09-02
- ical # failure in job https://hydra.nixos.org/build/233200229 at 2023-09-02
+ - ice40-prim # failure in job https://hydra.nixos.org/build/309814812 at 2025-10-15
- icepeak # failure in job https://hydra.nixos.org/build/233242326 at 2023-09-02
- icfpc2020-galaxy # failure in job https://hydra.nixos.org/build/233208746 at 2023-09-02
- IcoGrid # failure in job https://hydra.nixos.org/build/233202038 at 2023-09-02
@@ -3260,7 +3277,6 @@ 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
@@ -3291,11 +3307,13 @@ broken-packages:
- indexed-extras # failure in job https://hydra.nixos.org/build/252739554 at 2024-03-16
- indextype # failure in job https://hydra.nixos.org/build/233230257 at 2023-09-02
- indices # failure in job https://hydra.nixos.org/build/233198223 at 2023-09-02
+ - indieweb-algorithms # failure in job https://hydra.nixos.org/build/311459982 at 2025-11-02
- inf-interval # failure in job https://hydra.nixos.org/build/233193217 at 2023-09-02
- infer-upstream # failure in job https://hydra.nixos.org/build/233191739 at 2023-09-02
- infernal # failure in job https://hydra.nixos.org/build/233228571 at 2023-09-02
- inferno-types # failure in job https://hydra.nixos.org/build/233225968 at 2023-09-02
- infernu # failure in job https://hydra.nixos.org/build/233238697 at 2023-09-02
+ - Infinitree # failure in job https://hydra.nixos.org/build/311049998 at 2025-11-02
- infix # failure in job https://hydra.nixos.org/build/233256976 at 2023-09-02
- inflist # failure in job https://hydra.nixos.org/build/233223710 at 2023-09-02
- informative # failure in job https://hydra.nixos.org/build/233215837 at 2023-09-02
@@ -3429,7 +3447,6 @@ broken-packages:
- joy-rewrite # failure in job https://hydra.nixos.org/build/233201002 at 2023-09-02
- jpeg # failure in job https://hydra.nixos.org/build/233204056 at 2023-09-02
- js-good-parts # failure in job https://hydra.nixos.org/build/233198958 at 2023-09-02
- - jsdom-extras # failure in job https://hydra.nixos.org/build/295094819 at 2025-04-22
- json-api # failure in job https://hydra.nixos.org/build/233198171 at 2023-09-02
- json-api-lib # failure in job https://hydra.nixos.org/build/233210901 at 2023-09-02
- json-assertions # failure in job https://hydra.nixos.org/build/233196774 at 2023-09-02
@@ -3462,6 +3479,7 @@ broken-packages:
- jsonnet # failure in job https://hydra.nixos.org/build/233254884 at 2023-09-02
- jsonresume # failure in job https://hydra.nixos.org/build/233202350 at 2023-09-02
- jsonrpc-tinyclient # failure in job https://hydra.nixos.org/build/233214174 at 2023-09-02
+ - jsonschema # failure in job https://hydra.nixos.org/build/311053632 at 2025-11-02
- jsonschema-gen # failure in job https://hydra.nixos.org/build/233225063 at 2023-09-02
- jsonsql # failure in job https://hydra.nixos.org/build/233255704 at 2023-09-02
- jsontsv # failure in job https://hydra.nixos.org/build/233234129 at 2023-09-02
@@ -3581,6 +3599,7 @@ broken-packages:
- Lambdaya # failure in job https://hydra.nixos.org/build/233227702 at 2023-09-02
- lame # failure in job https://hydra.nixos.org/build/233250932 at 2023-09-02
- laminar # failure in job https://hydra.nixos.org/build/241426331 at 2023-11-19
+ - langchain-hs # failure in job https://hydra.nixos.org/build/309815178 at 2025-10-15
- language-asn # failure in job https://hydra.nixos.org/build/233227929 at 2023-09-02
- language-c-comments # failure in job https://hydra.nixos.org/build/233234112 at 2023-09-02
- language-c-inline # failure in job https://hydra.nixos.org/build/233245990 at 2023-09-02
@@ -3616,7 +3635,6 @@ broken-packages:
- 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
- large-anon # base >=4.14 && <4.19, ghc >=8.10 && <9.7 https://hydra.nixos.org/build/295428414
- - large-records # failure in job https://hydra.nixos.org/build/295094961 at 2025-04-22
- LargeCardinalHierarchy # failure in job https://hydra.nixos.org/build/233250339 at 2023-09-02
- Lastik # failure in job https://hydra.nixos.org/build/233194460 at 2023-09-02
- latest-npm-version # failure in job https://hydra.nixos.org/build/233239108 at 2023-09-02
@@ -3738,6 +3756,7 @@ broken-packages:
- line-indexed-cursor # failure in job https://hydra.nixos.org/build/233210607 at 2023-09-02
- linear-accelerate # failure in job https://hydra.nixos.org/build/296049888 at 2025-05-02
- linear-algebra-cblas # failure in job https://hydra.nixos.org/build/233239710 at 2023-09-02
+ - linear-core-prototype # failure in job https://hydra.nixos.org/build/311053837 at 2025-11-02
- linear-maps # failure in job https://hydra.nixos.org/build/233258332 at 2023-09-02
- linear-socket # failure in job https://hydra.nixos.org/build/233192053 at 2023-09-02
- linear-vect # failure in job https://hydra.nixos.org/build/233252054 at 2023-09-02
@@ -3805,6 +3824,7 @@ broken-packages:
- located # failure in job https://hydra.nixos.org/build/233234945 at 2023-09-02
- located-monad-logger # failure in job https://hydra.nixos.org/build/233194551 at 2023-09-02
- loch # failure in job https://hydra.nixos.org/build/233248876 at 2023-09-02
+ - log # failure in job https://hydra.nixos.org/build/311053883 at 2025-11-02
- log-effect # failure in job https://hydra.nixos.org/build/233211329 at 2023-09-02
- log-warper # failure in job https://hydra.nixos.org/build/233220417 at 2023-09-02
- log2json # failure in job https://hydra.nixos.org/build/233211819 at 2023-09-02
@@ -3857,7 +3877,6 @@ broken-packages:
- lucid-aria # failure in job https://hydra.nixos.org/build/233231489 at 2023-09-02
- lucid-hyperscript # failure in job https://hydra.nixos.org/build/233191616 at 2023-09-02
- lucid2-htmx # failure in job https://hydra.nixos.org/build/233196674 at 2023-09-02
- - luhn # failure in job https://hydra.nixos.org/build/233237661 at 2023-09-02
- luis-client # failure in job https://hydra.nixos.org/build/233244540 at 2023-09-02
- luka # failure in job https://hydra.nixos.org/build/233235403 at 2023-09-02
- luminance # failure in job https://hydra.nixos.org/build/233233551 at 2023-09-02
@@ -4203,6 +4222,7 @@ broken-packages:
- multiwalk # failure in job https://hydra.nixos.org/build/295095540 at 2025-04-22
- Munkres # failure in job https://hydra.nixos.org/build/233237379 at 2023-09-02
- muon # failure in job https://hydra.nixos.org/build/233238364 at 2023-09-02
+ - murder # failure in job https://hydra.nixos.org/build/309815678 at 2025-10-15
- murmur # failure in job https://hydra.nixos.org/build/233244309 at 2023-09-02
- music-util # failure in job https://hydra.nixos.org/build/233234440 at 2023-09-02
- musicScroll # failure in job https://hydra.nixos.org/build/233197933 at 2023-09-02
@@ -4257,6 +4277,7 @@ broken-packages:
- NaturalLanguageAlphabets # failure in job https://hydra.nixos.org/build/245539294 at 2024-01-02
- NaturalSort # failure in job https://hydra.nixos.org/build/233213239 at 2023-09-02
- naver-translate # failure in job https://hydra.nixos.org/build/233225934 at 2023-09-02
+ - nbparts # failure in job https://hydra.nixos.org/build/309815729 at 2025-10-15
- nbt # failure in job https://hydra.nixos.org/build/233253509 at 2023-09-02
- ncurses # failure in job https://hydra.nixos.org/build/233238895 at 2023-09-02
- ndjson-conduit # failure in job https://hydra.nixos.org/build/295095605 at 2025-04-22
@@ -4396,7 +4417,6 @@ broken-packages:
- 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
- oauthenticated # failure in job https://hydra.nixos.org/build/233257682 at 2023-09-02
@@ -4418,6 +4438,7 @@ 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-holes-plugin # failure in job https://hydra.nixos.org/build/309815905 at 2025-10-15
- 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
@@ -4872,7 +4893,6 @@ broken-packages:
- 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
- polysemy-req # failure in job https://hydra.nixos.org/build/233224435 at 2023-09-02
- polysemy-several # failure in job https://hydra.nixos.org/build/233216921 at 2023-09-02
- polysemy-socket # failure in job https://hydra.nixos.org/build/233195754 at 2023-09-02
@@ -5091,7 +5111,6 @@ broken-packages:
- pushbullet-types # failure in job https://hydra.nixos.org/build/233242388 at 2023-09-02
- pusher-haskell # failure in job https://hydra.nixos.org/build/233201954 at 2023-09-02
- pusher-ws # failure in job https://hydra.nixos.org/build/233204133 at 2023-09-02
- - pushme # failure in job https://hydra.nixos.org/build/233212481 at 2023-09-02
- pushover # failure in job https://hydra.nixos.org/build/252739908 at 2024-03-16
- 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
@@ -5224,6 +5243,7 @@ broken-packages:
- reanimate-svg # failure in job https://hydra.nixos.org/build/233242271 at 2023-09-02
- reason-export # failure in job https://hydra.nixos.org/build/233212942 at 2023-09-02
- reasonable-lens # failure in job https://hydra.nixos.org/build/233233111 at 2023-09-02
+ - rebound # failure in job https://hydra.nixos.org/build/311055152 at 2025-11-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
@@ -5270,6 +5290,7 @@ broken-packages:
- 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-blaze # failure in job https://hydra.nixos.org/build/309816655 at 2025-10-15
- 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
@@ -5281,7 +5302,6 @@ broken-packages:
- 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
- regex-posix-unittest # failure in job https://hydra.nixos.org/build/233249685 at 2023-09-02
- regex-tdfa-pipes # failure in job https://hydra.nixos.org/build/233247416 at 2023-09-02
- regex-tdfa-quasiquoter # failure in job https://hydra.nixos.org/build/233234166 at 2023-09-02
@@ -5311,7 +5331,6 @@ broken-packages:
- relational-query-postgresql-pure # failure in job https://hydra.nixos.org/build/296063076 at 2025-05-02
- relevant-time # failure in job https://hydra.nixos.org/build/233190794 at 2023-09-02
- reload # failure in job https://hydra.nixos.org/build/233212925 at 2023-09-02
- - 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
@@ -5394,6 +5413,8 @@ broken-packages:
- 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
+ - robin-hood-profit # failure in job https://hydra.nixos.org/build/309816727 at 2025-10-15
+ - roboservant # failure in job https://hydra.nixos.org/build/309816799 at 2025-10-15
- 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
- roguestar # failure in job https://hydra.nixos.org/build/233233677 at 2023-09-02
@@ -5471,6 +5492,7 @@ broken-packages:
- sandwatch # failure in job https://hydra.nixos.org/build/295096742 at 2025-04-22
- 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
+ - sasha # failure in job https://hydra.nixos.org/build/309816856 at 2025-10-15
- 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
@@ -5499,6 +5521,7 @@ broken-packages:
- scotty-blaze # failure in job https://hydra.nixos.org/build/233190960 at 2023-09-02
- scotty-cookie # failure in job https://hydra.nixos.org/build/252738988 at 2024-03-16
- scotty-format # failure in job https://hydra.nixos.org/build/233249643 at 2023-09-02
+ - scotty-haxl # failure in job https://hydra.nixos.org/build/311055399 at 2025-11-02
- scotty-path-normalizer # failure in job https://hydra.nixos.org/build/252738625 at 2024-03-16
- scotty-resource # failure in job https://hydra.nixos.org/build/233258457 at 2023-09-02
- scotty-rest # failure in job https://hydra.nixos.org/build/233209040 at 2023-09-02
@@ -5586,6 +5609,7 @@ broken-packages:
- 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-haxl-client # failure in job https://hydra.nixos.org/build/311055508 at 2025-11-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
@@ -5684,7 +5708,6 @@ broken-packages:
- shoap # failure in job https://hydra.nixos.org/build/233207909 at 2023-09-02
- shopify # failure in job https://hydra.nixos.org/build/233221330 at 2023-09-02
- shortbytestring # failure in job https://hydra.nixos.org/build/233216026 at 2023-09-02
- - shortcut-links # failure in job https://hydra.nixos.org/build/233217442 at 2023-09-02
- shorten-strings # failure in job https://hydra.nixos.org/build/233247947 at 2023-09-02
- show-prettyprint # failure in job https://hydra.nixos.org/build/233213552 at 2023-09-02
- show-type # failure in job https://hydra.nixos.org/build/233225756 at 2023-09-02
@@ -5763,7 +5786,6 @@ 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
@@ -5850,7 +5872,6 @@ 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
@@ -5896,7 +5917,6 @@ broken-packages:
- 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
@@ -5926,6 +5946,7 @@ 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/309817187 at 2025-10-15
- 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
@@ -6038,6 +6059,7 @@ 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-filepath # failure in job https://hydra.nixos.org/build/309817285 at 2025-10-15
- 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
@@ -6153,6 +6175,7 @@ broken-packages:
- syntactic # failure in job https://hydra.nixos.org/build/233210123 at 2023-09-02
- syntax-trees # failure in job https://hydra.nixos.org/build/233209576 at 2023-09-02
- syntax-trees-fork-bairyn # failure in job https://hydra.nixos.org/build/233216989 at 2023-09-02
+ - SyntaxMacros # failure in job https://hydra.nixos.org/build/309811610 at 2025-10-15
- synthesizer # failure in job https://hydra.nixos.org/build/233259139 at 2023-09-02
- synthesizer-filter # failure in job https://hydra.nixos.org/build/252718079 at 2024-03-16
- synthesizer-llvm # failure in job https://hydra.nixos.org/build/266355681 at 2024-07-14
@@ -6254,6 +6277,7 @@ broken-packages:
- tempo # failure in job https://hydra.nixos.org/build/252731680 at 2024-03-16
- tempodb # failure in job https://hydra.nixos.org/build/233205994 at 2023-09-02
- temporal-csound # failure in job https://hydra.nixos.org/build/243818090 at 2024-01-01
+ - temporal-sdk-core # failure in job https://hydra.nixos.org/build/311056095 at 2025-11-02
- tempus # failure in job https://hydra.nixos.org/build/233245670 at 2023-09-02
- ten # failure in job https://hydra.nixos.org/build/233216705 at 2023-09-02
- tensor # failure in job https://hydra.nixos.org/build/233233707 at 2023-09-02
@@ -6312,7 +6336,6 @@ 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
@@ -6387,6 +6410,7 @@ broken-packages:
- timecalc # failure in job https://hydra.nixos.org/build/233207970 at 2023-09-02
- timemap # failure in job https://hydra.nixos.org/build/233250038 at 2023-09-02
- timeout # failure in job https://hydra.nixos.org/build/233193307 at 2023-09-02
+ - timeout-snooze # failure in job https://hydra.nixos.org/build/309817674 at 2025-10-15
- timeout-with-results # failure in job https://hydra.nixos.org/build/233212129 at 2023-09-02
- timeparsers # failure in job https://hydra.nixos.org/build/233250789 at 2023-09-02
- TimePiece # failure in job https://hydra.nixos.org/build/233213400 at 2023-09-02
@@ -6569,8 +6593,9 @@ 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-gui # failure in job https://hydra.nixos.org/build/309817848 at 2025-10-15
- 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-protocols-doc # failure in job https://hydra.nixos.org/build/311460024 at 2025-11-02
- 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
@@ -6641,7 +6666,6 @@ 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
@@ -6703,7 +6727,6 @@ 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
@@ -6846,6 +6869,7 @@ broken-packages:
- warc # failure in job https://hydra.nixos.org/build/233215734 at 2023-09-02
- warp-dynamic # failure in job https://hydra.nixos.org/build/233220479 at 2023-09-02
- warp-static # failure in job https://hydra.nixos.org/build/233239581 at 2023-09-02
+ - warp-tls-simple # failure in job https://hydra.nixos.org/build/309818122 at 2025-10-15
- warp-tls-uid # failure in job https://hydra.nixos.org/build/252725883 at 2024-03-16
- wasm # failure in job https://hydra.nixos.org/build/233249877 at 2023-09-02
- watcher # failure in job https://hydra.nixos.org/build/233245056 at 2023-09-02
@@ -6907,6 +6931,7 @@ broken-packages:
- 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
+ - winio # failure in job https://hydra.nixos.org/build/309818237 at 2025-10-15
- 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
@@ -6995,7 +7020,6 @@ 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
@@ -7021,7 +7045,6 @@ broken-packages:
- xmonad-vanessa # failure in job https://hydra.nixos.org/build/233214303 at 2023-09-02
- xmonad-wallpaper # failure in job https://hydra.nixos.org/build/233217165 at 2023-09-02
- xmonad-windownames # failure in job https://hydra.nixos.org/build/233258043 at 2023-09-02
- - xnobar # failure in job https://hydra.nixos.org/build/302807518 at 2025-07-27
- xorshift-plus # failure in job https://hydra.nixos.org/build/233255176 at 2023-09-02
- Xorshift128Plus # failure in job https://hydra.nixos.org/build/233225679 at 2023-09-02
- xsact # failure in job https://hydra.nixos.org/build/233221821 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 07a8abeb29639..8fa57f8401d92 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -27,8 +27,6 @@
default-package-overrides:
- 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
# 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
@@ -40,11 +38,15 @@ default-package-overrides:
# 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.*
+ # Needs to match microlens == 0.4.* in Stackage LTS 24
+ - microlens-pro < 0.2.0.4
+ # We currently use pandoc-crossref with a patch to revert it to pandoc == 3.7.*,
+ # this no longer works with later versions.
+ - pandoc-crossref == 0.3.21
# keep-sorted end
# keep-sorted start skip_lines=1 case=no numeric=yes
extra-packages:
- - algebraic-graphs < 0.7 # 2023-08-14: Needed for building weeder < 2.6.0
- 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.*
@@ -52,8 +54,6 @@ extra-packages:
- 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.*
- Cabal-syntax == 3.14.*
@@ -62,22 +62,17 @@ extra-packages:
- fourmolu == 0.14.0.0 # 2023-11-13: for ghc-lib-parser 9.6 compat
- 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
- ghc-exactprint == 1.6.* # 2023-03-30: needed for GHC == 9.4
- ghc-exactprint == 1.7.* # 2025-03-09: needed for GHC == 9.6
- ghc-exactprint == 1.8.* # 2024-05-20: needed for GHC == 9.8
- ghc-exactprint == 1.9.* # 2024-08-27: needed for GHC == 9.10
- - ghc-lib == 9.2.* # 2022-02-17: preserve for GHC 8.10, 9.0
- - ghc-lib == 9.6.* # 2022-02-17: preserve for GHC 9.2, 9.4
+ - ghc-exactprint == 1.12.* # 2025-10-15: needed for GHC == 9.12
+ - ghc-lib == 9.6.* # 2022-02-17: preserve for GHC 9.4
- 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.6.* # 2024-05-19: preserve for GHC 9.4
- 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.6.* # 2024-05-19: preserve for GHC 9.4
- 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
@@ -92,31 +87,21 @@ extra-packages:
- hlint == 3.6.* # 2025-04-14: needed for hls with ghc-lib-parser 9.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
- 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.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
- shake-cabal < 0.2.2.3 # 2023-07-01: last version to support Cabal 3.6.*
- ShellCheck == 0.9.0 # 2024-03-21: pinned by haskell-ci
- 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
- - 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
# keep-sorted start skip_lines=1 case=no
@@ -143,14 +128,12 @@ package-maintainers:
- generics-sop
- ghcjs-base
- ghcjs-dom
- - ghcjs-dom-hello
- ghcjs-dom-javascript
- ghcjs-dom-jsaddle
- haveibeenpwned
- jsaddle
- jsaddle-clib
- jsaddle-dom
- - jsaddle-hello
- jsaddle-warp
- jsaddle-wkwebview
- json-sop
@@ -380,6 +363,11 @@ package-maintainers:
- amazonka
- libssh2
- sitemap
+ - ihp-openai
+ - ihp
+ - ihp-ide
+ - ihp-migrate
+ - ihp-postgresql-simple-extra
ncfavier:
- Agda
- agda2hs
@@ -697,7 +685,6 @@ unsupported-platforms:
Codec-Image-DevIL: [ platforms.darwin ] # depends on mesa
coinor-clp: [ aarch64-linux ] # aarch64-linux is not supported by required system dependency clp
cut-the-crap: [ platforms.darwin ]
- emanote: [ x86_64-darwin ] # Depends on stork which is broken on macOS sdk < 10.14
essence-of-live-coding-PortMidi: [ platforms.darwin ]
Euterpea: [ platforms.darwin ]
follow-file: [ platforms.darwin ]
@@ -934,7 +921,9 @@ dont-distribute-packages:
- yices-painless
# These packages don’t build because they use deprecated libsoup 2.4 versions.
+ - jsaddle-hello
- jsaddle-webkit2gtk
+ - ghcjs-dom-hello
- gi-javascriptcore4
- gi-soup2
- gi-webkit2
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
index 8732dc0f3ce88..ae01db0b82d4a 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 24.10
+# Stackage LTS 24.16
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@@ -22,7 +22,7 @@ default-package-overrides:
- 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-combinators ==0.1.2.2
- aeson-diff ==1.1.0.13
- aeson-gadt-th ==0.2.5.4
- aeson-generic-compat ==0.0.2.0
@@ -102,7 +102,7 @@ default-package-overrides:
- async-refresh-tokens ==0.4.0.0
- atom-basic ==0.2.5
- atom-conduit ==0.9.0.2
- - atomic-counter ==0.1.2.3
+ - atomic-counter ==0.1.2.4
- atomic-primops ==0.8.8
- atomic-write ==0.2.1.1
- attoparsec ==0.14.4
@@ -198,7 +198,7 @@ default-package-overrides:
- binary-shared ==0.8.3
- binaryen ==0.0.6.0
- bindings-DSL ==1.0.25
- - bindings-GLFW ==3.3.9.2
+ - bindings-GLFW ==3.3.9.3
- bindings-libzip ==1.0.1
- bindings-uname ==0.1
- BiobaseNewick ==0.0.0.2
@@ -224,8 +224,8 @@ default-package-overrides:
- blaze-textual ==0.2.3.1
- bloodhound ==0.23.0.1
- bloomfilter ==2.0.1.2
- - bluefin ==0.0.16.0
- - bluefin-internal ==0.1.0.0
+ - bluefin ==0.0.17.1
+ - bluefin-internal ==0.1.1.0
- bm ==0.2.0.0
- bmp ==1.2.6.4
- bnb-staking-csvs ==0.2.2.0
@@ -316,7 +316,7 @@ default-package-overrides:
- cairo ==0.13.12.0
- cairo-image ==0.1.0.5
- calendar-recycling ==0.0.0.1
- - call-alloy ==0.6.0.2
+ - call-alloy ==0.6.0.3
- call-plantuml ==0.0.1.3
- call-stack ==0.4.0
- calligraphy ==0.1.8
@@ -324,8 +324,8 @@ default-package-overrides:
- capability ==0.5.0.1
- cardano-coin-selection ==1.0.1
- carray ==0.1.6.8
- - casa-client ==0.0.2
- - casa-types ==0.0.2
+ - casa-client ==0.0.3
+ - casa-types ==0.0.3
- case-insensitive ==1.2.1.0
- cased ==0.1.0.0
- cases ==0.1.4.4
@@ -357,7 +357,7 @@ default-package-overrides:
- Chart-cairo ==1.9.4.1
- Chart-diagrams ==1.9.5.1
- chart-svg ==0.8.2.1
- - ChasingBottoms ==1.3.1.16
+ - ChasingBottoms ==1.3.1.17
- check-email ==1.0.2
- checkers ==0.6.0
- checksum ==0.0.0.1
@@ -374,8 +374,8 @@ default-package-overrides:
- circle-packing ==0.1.0.6
- circular ==0.4.0.3
- citeproc ==0.9.0.1
- - clash-prelude ==1.8.2
- - clash-prelude-hedgehog ==1.8.2
+ - clash-prelude ==1.8.3
+ - clash-prelude-hedgehog ==1.8.3
- classy-prelude ==1.5.0.3
- classy-prelude-conduit ==1.5.0
- classy-prelude-yesod ==1.5.0
@@ -414,7 +414,7 @@ default-package-overrides:
- comfort-blas ==0.0.3.1
- comfort-fftw ==0.0.0.1
- comfort-glpk ==0.1
- - comfort-graph ==0.0.4
+ - comfort-graph ==0.0.4.1
- commonmark ==0.2.6.1
- commonmark-extensions ==0.2.6
- commonmark-pandoc ==0.2.3
@@ -489,7 +489,7 @@ default-package-overrides:
- countdown-numbers-game ==0.0.0.1
- country ==0.2.5.0
- covariance ==0.2.0.1
- - cpphs ==1.20.9.1
+ - cpphs ==1.20.10
- cpu ==0.1.2
- cpuinfo ==0.1.0.3
- cql ==4.0.4
@@ -513,7 +513,7 @@ default-package-overrides:
- cryptohash-md5 ==0.11.101.0
- cryptohash-sha1 ==0.11.101.0
- cryptohash-sha256 ==0.11.102.1
- - cryptohash-sha512 ==0.11.102.0
+ - cryptohash-sha512 ==0.11.103.0
- crypton ==1.0.4
- crypton-conduit ==0.2.3
- crypton-connection ==0.4.5
@@ -582,7 +582,6 @@ default-package-overrides:
- 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
@@ -609,7 +608,7 @@ default-package-overrides:
- depq ==0.4.2
- deque ==0.4.4.2
- derive-storable ==0.3.1.0
- - derive-topdown ==0.1.0.0
+ - derive-topdown ==0.1.1.0
- deriveJsonNoPrefix ==0.1.0.1
- deriving-aeson ==0.2.10
- deriving-compat ==0.6.7
@@ -640,7 +639,7 @@ default-package-overrides:
- Diff ==1.0.2
- diff-loc ==0.1.0.0
- digest ==0.0.2.1
- - digits ==0.3.1
+ - digits ==0.3.2
- digraph ==0.3.2
- dimensional ==1.6.1
- direct-sqlite ==2.3.29
@@ -666,7 +665,7 @@ default-package-overrides:
- distribution-opensuse ==1.1.4
- distributive ==0.6.2.1
- djinn-lib ==0.0.1.4
- - djot ==0.1.2.2
+ - djot ==0.1.2.3
- dl-fedora ==2.0.1
- dlist ==1.0
- dlist-instances ==0.1.1.1
@@ -694,7 +693,7 @@ default-package-overrides:
- dot ==0.3
- dotgen ==0.4.3
- dotnet-timespan ==0.0.1.0
- - dotparse ==0.1.2.3
+ - dotparse ==0.1.3.0
- double-conversion ==2.0.5.0
- download ==0.3.2.7
- download-curl ==0.1.4
@@ -853,7 +852,7 @@ default-package-overrides:
- FindBin ==0.0.5
- fingertree ==0.1.6.2
- finite-typelits ==0.2.1.0
- - first-class-families ==0.8.1.0
+ - first-class-families ==0.8.2.0
- fits-parse ==0.4.2
- fitspec ==0.4.10
- fix-whitespace ==0.1
@@ -866,7 +865,7 @@ default-package-overrides:
- flac-picture ==0.1.3
- flags-applicative ==0.1.0.3
- flat ==0.6
- - flatparse ==0.5.3.0
+ - flatparse ==0.5.3.1
- flay ==0.5
- flexible-defaults ==0.0.3
- FloatingHex ==0.5
@@ -1174,7 +1173,7 @@ default-package-overrides:
- greskell ==2.0.3.3
- greskell-core ==1.0.0.6
- greskell-websocket ==1.0.0.4
- - gridtables ==0.1.0.0
+ - gridtables ==0.1.1.0
- grisette ==0.13.0.1
- groom ==0.1.2.1
- group-by-date ==0.1.0.5
@@ -1203,7 +1202,7 @@ default-package-overrides:
- happy ==2.1.7
- happy-lib ==2.1.7
- happy-meta ==0.2.1.0
- - harpie ==0.1.3.0
+ - harpie ==0.1.3.1
- harpie-numhask ==0.1.0.2
- has-transformers ==0.1.0.4
- HasBigDecimal ==0.2.0.0
@@ -1233,7 +1232,7 @@ default-package-overrides:
- hasql-listen-notify ==0.1.0.1
- hasql-migration ==0.3.1
- hasql-optparse-applicative ==0.9
- - hasql-pool ==1.3.0.3
+ - hasql-pool ==1.3.0.4
- hasql-th ==0.4.0.23
- hasql-transaction ==1.2.1
- Hastructure ==0.50.4
@@ -1286,13 +1285,8 @@ default-package-overrides:
- hjsmin ==0.2.1
- hkd-default ==1.1.0.0
- hkgr ==0.4.8
- - hledger ==1.43.2
- - hledger-iadd ==1.3.21
- hledger-interest ==1.6.7
- - hledger-lib ==1.43.2
- hledger-stockquotes ==0.1.3.2
- - hledger-ui ==1.43.2
- - hledger-web ==1.43.2
- hlibcpuid ==0.2.0
- hlibgit2 ==0.18.0.16
- hlibsass ==0.1.10.1
@@ -1367,13 +1361,13 @@ default-package-overrides:
- hsndfile-vector ==0.5.2
- HsOpenSSL ==0.11.7.9
- HsOpenSSL-x509-system ==0.1.0.4
- - hspec ==2.11.12
- - hspec-api ==2.11.12
+ - hspec ==2.11.14
+ - hspec-api ==2.11.14
- hspec-attoparsec ==0.1.0.2
- hspec-checkers ==0.1.0.2
- hspec-contrib ==0.5.2
- - hspec-core ==2.11.12
- - hspec-discover ==2.11.12
+ - hspec-core ==2.11.14
+ - hspec-discover ==2.11.14
- hspec-expectations ==0.8.4
- hspec-expectations-json ==1.0.2.1
- hspec-expectations-lifted ==0.10.0
@@ -1384,7 +1378,7 @@ default-package-overrides:
- hspec-junit-formatter ==1.1.2.1
- hspec-leancheck ==0.0.6
- hspec-megaparsec ==2.2.1
- - hspec-meta ==2.11.12
+ - hspec-meta ==2.11.14
- hspec-need-env ==0.1.0.12
- hspec-parsec ==0
- hspec-smallcheck ==0.5.3
@@ -1408,7 +1402,7 @@ default-package-overrides:
- html-parse ==0.2.2.0
- HTTP ==4000.4.1
- http-api-data ==0.6.2
- - http-api-data-qq ==0.1.0.0
+ - http-api-data-qq ==0.1.0.1
- http-client ==0.7.19
- http-client-openssl ==0.3.3
- http-client-overrides ==0.1.1.0
@@ -1538,7 +1532,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
+ - iri ==0.5.1.2
- isbn ==1.1.0.5
- islink ==0.1.0.0
- iso3166-country-codes ==0.20140203.8
@@ -1826,7 +1820,7 @@ default-package-overrides:
- mmsyn7ukr-common ==0.3.1.0
- mnist-idx ==0.1.3.2
- mnist-idx-conduit ==0.4.0.0
- - mockcat ==0.5.2.0
+ - mockcat ==0.5.3.0
- mockery ==0.3.5
- mod ==0.2.1.0
- modern-uri ==0.3.6.1
@@ -2020,7 +2014,7 @@ default-package-overrides:
- ogma-spec ==1.7.0
- old-locale ==1.0.0.7
- old-time ==1.1.0.4
- - ollama-haskell ==0.2.0.0
+ - ollama-haskell ==0.2.1.0
- om-doh ==0.1.0.4
- om-elm ==2.0.1.1
- om-fail ==0.1.0.6
@@ -2195,7 +2189,7 @@ default-package-overrides:
- poly ==0.5.1.0
- poly-arity ==0.1.0
- polynomials-bernstein ==1.1.2
- - polyparse ==1.13
+ - polyparse ==1.13.1
- polysemy ==1.9.2.0
- polysemy-fs ==0.1.0.0
- polysemy-plugin ==0.4.5.3
@@ -2230,7 +2224,7 @@ default-package-overrides:
- pretty-hex ==1.1
- pretty-relative-time ==0.3.0.0
- pretty-show ==1.10
- - pretty-simple ==4.1.3.0
+ - pretty-simple ==4.1.4.0
- pretty-sop ==0.2.0.3
- pretty-terminal ==0.1.0.0
- prettychart ==0.3.0.2
@@ -2254,7 +2248,7 @@ default-package-overrides:
- primitive-unlifted ==2.2.0.0
- print-console-colors ==0.1.0.0
- probability ==0.2.8
- - probability-polynomial ==1.0.0.1
+ - probability-polynomial ==1.0.1.0
- process-extras ==0.7.4
- product-isomorphic ==0.0.3.4
- product-profunctors ==0.11.1.1
@@ -2397,9 +2391,9 @@ default-package-overrides:
- regex-pcre-builtin ==0.95.2.3.8.44
- regex-posix ==0.96.0.2
- regex-posix-clib ==2.7
- - regex-tdfa ==1.3.2.4
+ - regex-tdfa ==1.3.2.5
- regex-with-pcre ==1.1.0.2
- - registry ==0.6.3.2
+ - registry ==0.6.3.3
- registry-aeson ==0.3.1.2
- reinterpret-cast ==0.1.0
- relapse ==1.0.0.1
@@ -2441,7 +2435,7 @@ default-package-overrides:
- rhythmic-sequences ==0.8.0.0
- riak-protobuf ==0.25.0.0
- richenv ==0.1.0.3
- - rio ==0.1.22.0
+ - rio ==0.1.23.0
- rio-orphans ==0.1.2.0
- rio-prettyprint ==0.1.8.0
- rng-utils ==0.3.1
@@ -2597,7 +2591,7 @@ default-package-overrides:
- shellify ==0.14.0.2
- shellmet ==0.0.5.0
- shelltestrunner ==1.10
- - shellwords ==0.1.4.4
+ - shellwords ==0.1.4.6
- shelly ==1.12.1.1
- should-not-typecheck ==2.1.0
- show-combinators ==0.2.0.0
@@ -2783,7 +2777,7 @@ default-package-overrides:
- swizzle-modify ==0.1.0.0
- swizzle-set ==0.2.0.0
- syb ==0.7.2.4
- - sydtest ==0.20.0.0
+ - sydtest ==0.20.0.1
- sydtest-aeson ==0.2.0.1
- sydtest-amqp ==0.1.0.0
- sydtest-autodocodec ==0.0.0.0
@@ -2852,7 +2846,7 @@ default-package-overrides:
- tasty-inspection-testing ==0.2.1
- tasty-kat ==0.0.3
- tasty-leancheck ==0.0.2
- - tasty-lua ==1.1.1.1
+ - tasty-lua ==1.1.2
- tasty-papi ==0.1.2.0
- tasty-program ==1.1.0
- tasty-quickcheck ==0.11.1
@@ -3104,7 +3098,7 @@ default-package-overrides:
- unliftio-pool ==0.4.3.1
- unliftio-streams ==0.2.0.0
- unlit ==0.4.0.0
- - unordered-containers ==0.2.20
+ - unordered-containers ==0.2.20.1
- unsafe ==0.0
- uri-bytestring ==0.4.0.1
- uri-bytestring-aeson ==0.1.0.9
@@ -3240,7 +3234,7 @@ default-package-overrides:
- wherefrom-compat ==0.1.1.1
- which ==0.2.0.3
- wide-word ==0.1.8.1
- - wild-bind ==0.1.2.12
+ - wild-bind ==0.1.2.13
- wild-bind-x11 ==0.2.0.17
- Win32-notify ==0.3.0.3
- windns ==0.1.0.1
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
index eee71d4e91646..b03d66e0fbe48 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@@ -50,6 +50,7 @@ dont-distribute-packages:
- afv
- agda-server
- agda-snippets-hakyll
+ - age
- agentx
- aip
- airgql
@@ -224,7 +225,6 @@ dont-distribute-packages:
- bbi
- bdcs
- bdcs-api
- - beam-large-records
- beam-th
- beautifHOL
- bech32-th
@@ -458,6 +458,8 @@ dont-distribute-packages:
- claferIG
- claferwiki
- clash
+ - clash-ghc
+ - clash-shake
- classify-frog
- classy-effects
- classy-effects-th
@@ -478,7 +480,6 @@ dont-distribute-packages:
- cless
- cleveland
- click-clack
- - clickhouse-haskell
- clifford
- clippings
- cloud-haskell
@@ -605,6 +606,7 @@ dont-distribute-packages:
- cprng-aes
- cprng-aes-effect
- cql-io-tinylog
+ - cql_4_1_0_0
- cqrs-example
- cqrs-memory
- cqrs-postgresql
@@ -649,6 +651,7 @@ dont-distribute-packages:
- cypher
- dahdit-audio
- dahdit-midi
+ - dahdit-network
- dahdit-test
- daino
- Dangerous
@@ -676,7 +679,6 @@ dont-distribute-packages:
- datadog-tracing
- datafix
- dataflow
- - dataframe_0_3_0_4
- datasets
- date-conversions
- dbjava
@@ -768,7 +770,7 @@ dont-distribute-packages:
- distribution-plot
- dixi
- dl-fedora
- - dl-fedora_2_1
+ - dl-fedora_2_1_1
- dmenu-pkill
- dmenu-pmount
- dmenu-search
@@ -784,7 +786,6 @@ dont-distribute-packages:
- DocTest
- dojang
- DOM
- - dom-parser
- domaindriven
- dormouse-client
- dovetail
@@ -809,6 +810,7 @@ dont-distribute-packages:
- dsmc-tools
- DSTM
- dtd
+ - duckdb-simple
- Dust
- Dust-crypto
- Dust-tools
@@ -894,6 +896,7 @@ dont-distribute-packages:
- eventful-sql-common
- eventful-sqlite
- eventful-test-helpers
+ - eventlog-live-otelcol
- EventSocket
- eventsource-geteventstore-store
- eventsource-store-specs
@@ -907,6 +910,7 @@ dont-distribute-packages:
- exference
- exist
- exist-instances
+ - expand
- expat-enumerator
- expiring-containers
- explicit-iomodes-bytestring
@@ -1192,6 +1196,13 @@ dont-distribute-packages:
- GPipe-TextureLoad
- gps
- gps2htmlReport
+ - gpu-vulkan
+ - gpu-vulkan-khr-surface
+ - gpu-vulkan-khr-surface-glfw
+ - gpu-vulkan-khr-swapchain
+ - gpu-vulkan-middle-khr-surface
+ - gpu-vulkan-middle-khr-surface-glfw
+ - gpu-vulkan-middle-khr-swapchain
- GPX
- grab-form
- graflog
@@ -1246,7 +1257,6 @@ dont-distribute-packages:
- gtfs
- gtfs-realtime
- gtk-serialized-event
- - gtk-sni-tray
- gtk2hs-cast-glade
- gtk2hs-cast-gnomevfs
- gtk2hs-cast-gtk
@@ -1288,7 +1298,6 @@ dont-distribute-packages:
- hake
- hakyll-elm
- hakyll-ogmarkup
- - hakyll-shortcut-links
- halberd
- halide-arrayfire
- halide-JuicyPixels
@@ -1328,7 +1337,6 @@ dont-distribute-packages:
- HarmTrace
- haroonga-httpd
- has-th
- - hasbolt
- hascat
- hascat-lib
- hascat-setup
@@ -1348,7 +1356,6 @@ dont-distribute-packages:
- haskell-admin-managed-functions
- haskell-aliyun
- haskell-bitmex-client
- - haskell-debug-adapter
- haskell-debugger
- haskell-docs
- haskell-eigen-util
@@ -1437,8 +1444,6 @@ dont-distribute-packages:
- HaVSA
- hawitter
- Hawk
- - haxl-amazonka
- - haxl-facebook
- haxy
- Hayoo
- hback
@@ -1602,6 +1607,7 @@ dont-distribute-packages:
- hoppy-runtime
- hoppy-std
- horde-ad
+ - hotel-california
- hotswap
- hp2any-graph
- hp2any-manager
@@ -1643,6 +1649,9 @@ dont-distribute-packages:
- hs-functors
- hs-gen-iface
- hs-ix
+ - hs-opentelemetry-instrumentation-cloudflare
+ - hs-opentelemetry-instrumentation-http-client
+ - hs-opentelemetry-instrumentation-yesod
- hs-profunctors
- hs-sdl-term-emulator
- hs2ats
@@ -1683,6 +1692,9 @@ dont-distribute-packages:
- hsql-odbc
- hsql-postgresql
- hsql-sqlite3
+ - hsqml-datamodel-vinyl
+ - hsqml-demo-morris
+ - hsqml-morris
- hsreadability
- hssourceinfo
- hssqlppp-th
@@ -1769,6 +1781,7 @@ dont-distribute-packages:
- hylotab
- hyloutils
- hyperbole
+ - hyperbole_0_5_0
- hyperpublic
- ide-backend
- ide-backend-server
@@ -1808,7 +1821,6 @@ dont-distribute-packages:
- indentation-trifecta
- indexation
- IndexedList
- - indieweb-algorithms
- indigo
- inferno-core
- inferno-lsp
@@ -1933,6 +1945,7 @@ dont-distribute-packages:
- karakuri
- katip-rollbar
- keelung
+ - keera-hails-i18n
- keera-hails-mvc-environment-gtk
- keera-hails-mvc-model-lightmodel
- keera-hails-mvc-model-protectedmodel
@@ -2080,6 +2093,7 @@ dont-distribute-packages:
- linnet-conduit
- linux-ptrace
- lio-eci11
+ - lion
- liquid-base
- liquid-bytestring
- liquid-containers
@@ -2365,6 +2379,7 @@ dont-distribute-packages:
- music-suite
- musicbrainz-email
- musicxml2
+ - musig2
- mutable-iter
- MutationOrder
- mute-unmute
@@ -2476,10 +2491,10 @@ dont-distribute-packages:
- nyan-interpolation-simple
- nymphaea
- nyx-game
- - oalg-abg
- oath
- oauth2-jwt-bearer
- obdd
+ - oberon0
- obj
- objectid
- objective
@@ -2751,9 +2766,9 @@ dont-distribute-packages:
- prometheus-proc
- propane
- proplang
+ - PropRatt
- prosidyc
- proto-lens-descriptors
- - proto3-suite
- protobuf-native
- protocol-buffers-descriptor
- protocol-buffers-descriptor-fork
@@ -2878,7 +2893,6 @@ dont-distribute-packages:
- reddit
- redHandlers
- redis-io
- - rediscaching-haxl
- refh
- reflex-animation
- reflex-backend-wai
@@ -2902,10 +2916,6 @@ dont-distribute-packages:
- regions-monadsfd
- regions-monadstf
- regions-mtl
- - registry
- - registry-aeson
- - registry-hedgehog
- - registry-hedgehog-aeson
- regular-extras
- regular-web
- regular-xmlpickler
@@ -3036,7 +3046,7 @@ dont-distribute-packages:
- sandwich-contexts-kubernetes
- sandwich-contexts-minio
- sandwich-webdriver
- - sandwich-webdriver_0_4_0_1
+ - sandwich-webdriver_0_4_0_2
- sarsi
- sasl
- sat-micro-hs
@@ -3070,7 +3080,6 @@ dont-distribute-packages:
- scotty-fay
- scotty-form
- scotty-hastache
- - scotty-haxl
- scotty-params-parser
- scp-streams
- scrabble-bot
@@ -3129,7 +3138,6 @@ dont-distribute-packages:
- servant-db-postgresql
- servant-ede
- servant-examples
- - servant-haxl-client
- servant-js
- servant-matrix-param
- servant-oauth2
@@ -3424,7 +3432,6 @@ dont-distribute-packages:
- systemstats
- t3-client
- ta
- - taffybar
- tag-stream
- tagged-list
- tagged-th
@@ -3463,6 +3470,7 @@ dont-distribute-packages:
- techlab
- telegram-bot
- telegram-raw-api
+ - temporal-sdk
- ten-lens
- ten-unordered-containers
- terminal-text
@@ -3589,7 +3597,6 @@ dont-distribute-packages:
- type-sub-th
- TypeClass
- typed-encoding-encoding
- - typed-protocols-doc
- typed-streams
- typedflow
- TypeIlluminator
@@ -3661,7 +3668,6 @@ dont-distribute-packages:
- uu-cco-hut-parsing
- uu-cco-uu-parsinglib
- uu-options
- - uuagc
- uuid-crypto
- uvector-algorithms
- v4l2
@@ -3753,7 +3759,7 @@ dont-distribute-packages:
- WebCont
- webcrank-wai
- webdriver-w3c
- - webdriver_0_13_0_0
+ - webdriver_0_14_0_0
- webify
- webserver
- websnap
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 74c5f2a2b3c9b..526a96d59fc3b 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -286,6 +286,10 @@ builtins.intersectAttrs super {
}))
];
+ # Test suite requires access to an actual serial port
+ # https://github.com/jputcu/serialport/issues/25 krank:ignore-line
+ serialport = dontCheck super.serialport;
+
# Provides a library and an executable (pretty-derivation)
nix-derivation = enableSeparateBinOutput super.nix-derivation;
@@ -526,9 +530,21 @@ builtins.intersectAttrs super {
];
# Avoid compiling twice by providing executable as a separate output (with small closure size),
+ # add postgresqlTestHook to allow test executiion
postgres-websockets = lib.pipe super.postgres-websockets [
enableSeparateBinOutput
- (overrideCabal { passthru.tests = pkgs.nixosTests.postgres-websockets; })
+ (overrideCabal {
+ passthru.tests = pkgs.nixosTests.postgres-websockets;
+ preCheck = ''
+ export postgresqlEnableTCP=1
+ export PGDATABASE=postgres_ws_test
+ '';
+ })
+ (addTestToolDepends [
+ pkgs.postgresql
+ pkgs.postgresqlTestHook
+ ])
+ (dontCheckIf pkgs.postgresqlTestHook.meta.broken)
];
# Test suite requires a running postgresql server,
@@ -583,6 +599,8 @@ builtins.intersectAttrs super {
addExtraLibraries [ pkgs.libGLU pkgs.libGL ] (super.hsqml.override { qt5 = pkgs.qt5.qtbase; })
);
monomer = dontCheck super.monomer;
+ # GLFW init fails in sandbox https://github.com/bsl/GLFW-b/issues/50 krank:ignore-line
+ GLFW-b = dontCheck super.GLFW-b;
# Wants to check against a real DB, Needs freetds
odbc = dontCheck (addExtraLibraries [ pkgs.freetds ] super.odbc);
@@ -781,9 +799,6 @@ builtins.intersectAttrs super {
patches = drv.patches or [ ] ++ [
./patches/GLUT.patch
];
- prePatch = drv.prePatch or "" + ''
- ${lib.getBin pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal
- '';
}) super.GLUT;
libsystemd-journal = addExtraLibrary pkgs.systemd super.libsystemd-journal;
@@ -1273,6 +1288,7 @@ builtins.intersectAttrs super {
pkgs.postgresql
pkgs.postgresqlTestHook
];
+ doCheck = drv.doCheck or true && !(pkgs.postgresqlTestHook.meta.broken);
}) super.relocant;
# https://gitlab.iscpif.fr/gargantext/haskell-pgmq/blob/9a869df2842eccc86a0f31a69fb8dc5e5ca218a8/README.md#running-test-cases
@@ -1285,8 +1301,104 @@ builtins.intersectAttrs super {
(lib.getBin (pkgs.postgresql.withPackages (ps: [ ps.pgmq ])))
pkgs.postgresqlTestHook
];
+ doCheck = drv.doCheck or true && !(pkgs.postgresqlTestHook.meta.broken);
}) super.haskell-pgmq;
+ migrant-postgresql-simple = lib.pipe super.migrant-postgresql-simple [
+ (overrideCabal {
+ preCheck = ''
+ postgresqlTestUserOptions="LOGIN SUPERUSER"
+ '';
+ })
+ (addTestToolDepends [
+ pkgs.postgresql
+ pkgs.postgresqlTestHook
+ ])
+ (dontCheckIf pkgs.postgresqlTestHook.meta.broken)
+ ];
+
+ postgresql-simple-migration = overrideCabal (drv: {
+ preCheck = ''
+ PGUSER=test
+ PGDATABASE=test
+ '';
+ testToolDepends = drv.testToolDepends or [ ] ++ [
+ pkgs.postgresql
+ pkgs.postgresqlTestHook
+ ];
+ jailbreak = true;
+ doCheck = drv.doCheck or true && !(pkgs.postgresqlTestHook.meta.broken);
+ }) super.postgresql-simple-migration;
+
+ postgresql-simple = lib.pipe super.postgresql-simple [
+ (addTestToolDepends [
+ pkgs.postgresql
+ pkgs.postgresqlTestHook
+ ])
+ (dontCheckIf pkgs.postgresqlTestHook.meta.broken)
+ ];
+
+ beam-postgres = lib.pipe super.beam-postgres [
+ # Requires pg_ctl command during tests
+ (addTestToolDepends [ pkgs.postgresql ])
+ (dontCheckIf (!pkgs.postgresql.doInstallCheck || !self.testcontainers.doCheck))
+ ];
+
+ users-postgresql-simple = lib.pipe super.users-postgresql-simple [
+ (addTestToolDepends [
+ pkgs.postgresql
+ pkgs.postgresqlTestHook
+ ])
+ (dontCheckIf pkgs.postgresqlTestHook.meta.broken)
+ ];
+
+ esqueleto =
+ overrideCabal
+ (drv: {
+ postPatch = drv.postPatch or "" + ''
+ # patch out TCP usage: https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook-tcp
+ sed -i test/PostgreSQL/Test.hs \
+ -e s^host=localhost^^
+ '';
+ # Match the test suite defaults (or hardcoded values?)
+ preCheck = drv.preCheck or "" + ''
+ PGUSER=esqutest
+ PGDATABASE=esqutest
+ '';
+ testFlags = drv.testFlags or [ ] ++ [
+ # We don't have a MySQL test hook yet
+ "--skip=/Esqueleto/MySQL"
+ ];
+ testToolDepends = drv.testToolDepends or [ ] ++ [
+ pkgs.postgresql
+ pkgs.postgresqlTestHook
+ ];
+ })
+ # https://github.com/NixOS/nixpkgs/issues/198495
+ (dontCheckIf (pkgs.postgresqlTestHook.meta.broken) super.esqueleto);
+
+ persistent-postgresql =
+ # TODO: move this override to configuration-nix.nix
+ overrideCabal
+ (drv: {
+ postPatch = drv.postPath or "" + ''
+ # patch out TCP usage: https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook-tcp
+ # NOTE: upstream host variable takes only two values...
+ sed -i test/PgInit.hs \
+ -e s^'host=" <> host <> "'^^
+ '';
+ preCheck = drv.preCheck or "" + ''
+ PGDATABASE=test
+ PGUSER=test
+ '';
+ testToolDepends = drv.testToolDepends or [ ] ++ [
+ pkgs.postgresql
+ pkgs.postgresqlTestHook
+ ];
+ })
+ # https://github.com/NixOS/nixpkgs/issues/198495
+ (dontCheckIf (pkgs.postgresqlTestHook.meta.broken) super.persistent-postgresql);
+
# https://gitlab.iscpif.fr/gargantext/haskell-bee/blob/19c8775f0d960c669235bf91131053cb6f69a1c1/README.md#redis
haskell-bee-redis = overrideCabal (drv: {
testToolDepends = drv.testToolDepends or [ ] ++ [
@@ -1691,12 +1803,6 @@ builtins.intersectAttrs super {
# Additionally install documentation
jacinda = overrideCabal (drv: {
enableSeparateDocOutput = true;
- # Test suite is broken by DOS line endings inserted by Hackage revisions
- # https://github.com/vmchale/jacinda/issues/5
- postPatch = ''
- ${drv.postPatch or ""}
- ${pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal
- '';
postInstall = ''
${drv.postInstall or ""}
@@ -1788,8 +1894,6 @@ builtins.intersectAttrs super {
}))
super.tailwind;
- emanote = addBuildDepend pkgs.stork super.emanote;
-
keid-render-basic = addBuildTool pkgs.glslang super.keid-render-basic;
# Disable checks to break dependency loop with SCalendar
diff --git a/pkgs/development/haskell-modules/configuration-windows.nix b/pkgs/development/haskell-modules/configuration-windows.nix
new file mode 100644
index 0000000000000..bef866162481d
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-windows.nix
@@ -0,0 +1,23 @@
+{ pkgs, haskellLib }:
+
+let
+ inherit (pkgs) fetchpatch lib;
+in
+
+with haskellLib;
+
+(self: super: {
+ # cabal2nix doesn't properly add dependencies conditional on os(windows)
+ network =
+ if pkgs.stdenv.hostPlatform.isWindows then
+ addBuildDepends [ self.temporary ] super.network
+ else
+ super.network;
+
+ # https://github.com/fpco/streaming-commons/pull/84
+ streaming-commons = appendPatch (fetchpatch {
+ name = "fix-headers-case.patch";
+ url = "https://github.com/fpco/streaming-commons/commit/6da611f63e9e862523ce6ee53262ddbc9681ae24.patch";
+ sha256 = "sha256-giEQqXZfoiAvtCFohdgOoYna2Tnu5aSYAOUH8YVldi0=";
+ }) super.streaming-commons;
+})
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index b6936742d710f..08ee6219edff8 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -15,6 +15,7 @@
configurationNix ? import ./configuration-nix.nix,
configurationArm ? import ./configuration-arm.nix,
configurationDarwin ? import ./configuration-darwin.nix,
+ configurationWindows ? import ./configuration-windows.nix,
configurationJS ? import ./configuration-ghcjs-9.x.nix,
}:
@@ -42,6 +43,9 @@ let
++ lib.optionals stdenv.hostPlatform.isDarwin [
(configurationDarwin { inherit pkgs haskellLib; })
]
+ ++ lib.optionals stdenv.hostPlatform.isWindows [
+ (configurationWindows { inherit pkgs haskellLib; })
+ ]
++ lib.optionals stdenv.hostPlatform.isGhcjs [
(configurationJS { inherit pkgs haskellLib; })
];
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 9e8953079690c..5cebe4aec5d0d 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -96,14 +96,14 @@ in
libraryFrameworkDepends ? [ ],
executableFrameworkDepends ? [ ],
homepage ? "https://hackage.haskell.org/package/${pname}",
- platforms ? with lib.platforms; all, # GHC can cross-compile
+ platforms ? lib.platforms.all, # GHC can cross-compile
badPlatforms ? lib.platforms.none,
hydraPlatforms ? null,
hyperlinkSource ? true,
isExecutable ? false,
isLibrary ? !isExecutable,
jailbreak ? false,
- license,
+ license ? null,
enableParallelBuilding ? true,
maintainers ? null,
teams ? null,
@@ -184,6 +184,11 @@ in
# See https://nixos.org/manual/nixpkgs/unstable/#haskell-packaging-helpers
# or its source doc/languages-frameworks/haskell.section.md
disallowGhcReference ? false,
+ # By default we convert the `.cabal` file to Unix line endings to work around
+ # Hackage converting them to DOS line endings when revised, see
+ # .
+ # Pass `true` to disable this behavior.
+ dontConvertCabalFileToUnix ? false,
# Cabal 3.8 which is shipped by default for GHC >= 9.3 always calls
# `pkg-config --libs --static` as part of the configure step. This requires
# Requires.private dependencies of pkg-config dependencies to be present in
@@ -603,12 +608,18 @@ lib.fix (
echo "Replace Cabal file with edited version from ${newCabalFileUrl}."
cp ${newCabalFile} ${pname}.cabal
''
- + prePatch;
+ + prePatch
+ + "\n"
+ # cabal2nix-generated expressions run hpack not until prePatch to create
+ # the .cabal file (if necessary)
+ + lib.optionalString (!dontConvertCabalFileToUnix) ''
+ sed -i -e 's/\r$//' *.cabal
+ '';
postPatch =
optionalString jailbreak ''
echo "Run jailbreak-cabal to lift version restrictions on build inputs."
- ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal
+ ${jailbreak-cabal}/bin/jailbreak-cabal *.cabal
''
+ postPatch;
@@ -730,13 +741,7 @@ lib.fix (
# package specifies `hardeningDisable`.
hardeningDisable =
lib.optionals (args ? hardeningDisable) hardeningDisable
- ++ lib.optional (ghc.isHaLVM or false) "all"
- # Static libraries (ie. all of pkgsStatic.haskellPackages) fail to build
- # because by default Nix adds `-pie` to the linker flags: this
- # conflicts with the `-r` and `-no-pie` flags added by GHC (see
- # https://gitlab.haskell.org/ghc/ghc/-/issues/19580). hardeningDisable
- # changes the default Nix behavior regarding adding "hardening" flags.
- ++ lib.optional enableStaticLibraries "pie";
+ ++ lib.optional (ghc.isHaLVM or false) "all";
configurePhase = ''
runHook preConfigure
@@ -1031,10 +1036,11 @@ lib.fix (
};
meta = {
- inherit homepage license platforms;
+ inherit homepage platforms;
}
// optionalAttrs (args ? broken) { inherit broken; }
// optionalAttrs (args ? description) { inherit description; }
+ // optionalAttrs (args ? license) { inherit license; }
// optionalAttrs (args ? maintainers) { inherit maintainers; }
// optionalAttrs (args ? teams) { inherit teams; }
// optionalAttrs (args ? hydraPlatforms) { inherit hydraPlatforms; }
diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
index d2f6beb5260c6..47e0a40866749 100644
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation (
# Non-NixOS git needs cert
GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
- # Fixes https://github.com/commercialhaskell/stack/issues/2358
+ # Fixes https://github.com/commercialhaskell/stack/issues/2358 krank:ignore-line
LANG = "en_US.UTF-8";
preferLocalBuild = true;
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index be9f813fe4531..64d8e83a797e1 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -511,7 +511,7 @@ self: {
vector
];
description = "Efficient, high-level dynamic programming";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -1539,6 +1539,8 @@ self: {
pname = "Agda";
version = "2.8.0";
sha256 = "184vjq260zf5w9c8nz11nbhpsvq3a1yxp7mhaz7synlaww3ik146";
+ revision = "2";
+ editedCabalFile = "1a011g959hv8s5slz68a37ppmjyfa84l842g0wll83b5hmk1nfxp";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -1611,7 +1613,7 @@ self: {
];
executableToolDepends = [ emacs ];
description = "A dependently typed functional programming language and proof assistant";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
maintainers = [
lib.maintainers.iblech
lib.maintainers.ncfavier
@@ -1674,7 +1676,7 @@ self: {
tasty-hunit
];
description = "Aho-Corasick string matching algorithm";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -1925,7 +1927,7 @@ self: {
text
];
description = "Near-future Sci-Fi roguelike and tactical squad combat game";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
badPlatforms = lib.platforms.darwin;
mainProgram = "Allure";
}
@@ -2206,7 +2208,7 @@ self: {
requirements
];
description = "First-class Attribute Grammars implemented using type-level programming";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
}
) { };
@@ -2422,14 +2424,18 @@ self: {
}:
mkDerivation {
pname = "AvlTree";
- version = "4.2";
- sha256 = "0bw6856h75wks0mfvvqqm5i31sici1hacyl5zfj225jf9gn5q7dx";
+ version = "4.3";
+ sha256 = "1l4dg904lc4b659dc0flipbj73h6g8kh8g1yjgx077w992z4j8rr";
libraryHaskellDepends = [
base
COrdering
];
+ testHaskellDepends = [
+ base
+ COrdering
+ ];
description = "Balanced binary trees using the AVL algorithm";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -3022,7 +3028,7 @@ self: {
tasty-hunit
];
description = "Bessel J-function, Anger J-function, Weber E-function, and Anger-Weber function";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -3398,7 +3404,7 @@ self: {
vector-th-unbox
];
description = "European Nucleotide Archive data";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -3548,7 +3554,7 @@ self: {
text
];
description = "streaming FASTA parser";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "fastaextract";
}
@@ -4039,7 +4045,7 @@ self: {
vector-th-unbox
];
description = "Collection of types for bioinformatics";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -4218,7 +4224,7 @@ self: {
vector-th-unbox
];
description = "Efficient RNA/DNA/Protein Primary/Secondary Structure";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "SubOptDistance";
}
@@ -5819,7 +5825,7 @@ self: {
];
doCheck = false;
description = "A framework for packaging Haskell software";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -5870,7 +5876,7 @@ self: {
];
doCheck = false;
description = "A framework for packaging Haskell software";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -5923,7 +5929,7 @@ self: {
];
doCheck = false;
description = "A framework for packaging Haskell software";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -5974,7 +5980,7 @@ self: {
];
doCheck = false;
description = "A framework for packaging Haskell software";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -6000,7 +6006,7 @@ self: {
transformers
];
description = "API for the Hooks build-type";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -6074,68 +6080,6 @@ self: {
}
) { };
- Cabal-syntax_3_6_0_0 = callPackage (
- { mkDerivation, Cabal }:
- mkDerivation {
- pname = "Cabal-syntax";
- version = "3.6.0.0";
- sha256 = "0lcj4g55sj5iv727g7k57pscgyj0fx3smwapm1gmd5qkc3yfa9fa";
- libraryHaskellDepends = [ Cabal ];
- doHaddock = false;
- description = "A library for working with .cabal files";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- }
- ) { };
-
- Cabal-syntax_3_8_1_0 = callPackage (
- {
- mkDerivation,
- array,
- base,
- binary,
- bytestring,
- containers,
- deepseq,
- directory,
- filepath,
- mtl,
- parsec,
- pretty,
- text,
- time,
- transformers,
- unix,
- }:
- mkDerivation {
- pname = "Cabal-syntax";
- version = "3.8.1.0";
- sha256 = "03yfk3b2sjmqpxmvx3mj185nifiaqapvc8hmbx4825z0kyqxvs07";
- revision = "3";
- editedCabalFile = "14zm8h7sfawysr9g37in8by8aj1p87fywj83hmshp8n6lrxr6bgd";
- libraryHaskellDepends = [
- array
- base
- binary
- bytestring
- containers
- deepseq
- directory
- filepath
- mtl
- parsec
- pretty
- text
- time
- transformers
- unix
- ];
- description = "A library for working with .cabal files";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- }
- ) { };
-
Cabal-syntax_3_10_3_0 = callPackage (
{
mkDerivation,
@@ -6177,7 +6121,7 @@ self: {
unix
];
description = "A library for working with .cabal files";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -6223,7 +6167,7 @@ self: {
];
libraryToolDepends = [ alex ];
description = "A library for working with .cabal files";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -6269,7 +6213,7 @@ self: {
];
libraryToolDepends = [ alex ];
description = "A library for working with .cabal files";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -6315,7 +6259,7 @@ self: {
];
libraryToolDepends = [ alex ];
description = "A library for working with .cabal files";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -6795,7 +6739,7 @@ self: {
vector
];
description = "A backend for the Chart library for FLTKHS";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -7009,8 +6953,8 @@ self: {
}:
mkDerivation {
pname = "ChasingBottoms";
- version = "1.3.1.16";
- sha256 = "08zg018arf4qvp970dcnf0nyaqp7wkp5ba2dhck3v4l49k5cax9m";
+ version = "1.3.1.17";
+ sha256 = "0713mgd71dix9dq1i812ydahcacfpsxmciqxwhg4qj0migyc4ymg";
libraryHaskellDepends = [
base
containers
@@ -7292,7 +7236,7 @@ self: {
text
];
description = "Typified Tailwind for Rapid Development";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -7367,7 +7311,7 @@ self: {
wide-word
];
description = "ClickHouse driver";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -7576,6 +7520,60 @@ self: {
}
) { };
+ Color_0_4_1 = 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.4.1";
+ sha256 = "1h2y48dbmhw6arxmn02r1jg00dm61yppwxxzg4cidjhrzipn6k81";
+ 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;
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
Combinatorrent = callPackage (
{
mkDerivation,
@@ -8083,7 +8081,7 @@ self: {
text
];
description = "Simple CLI user input library";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -9215,7 +9213,7 @@ self: {
vector
];
description = "utilities for DP";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -11314,7 +11312,7 @@ self: {
text
];
description = "Environment Variable Parser";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -13342,7 +13340,7 @@ self: {
WeakSets
];
description = "Finite categories and usual categorical constructions on them";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -13393,7 +13391,7 @@ self: {
WeakSets
];
description = "Transform objects of the package FiniteCategories into graphs using GraphViz";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -13449,7 +13447,7 @@ self: {
sha256 = "00qv9h9i3yy7rh6wl8qs2r00z9hqpm56y9g717qh0skrl1fdk3yk";
libraryHaskellDepends = [ base ];
description = "A version of Prelude suitable for teaching";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -13801,7 +13799,7 @@ self: {
criterion
];
description = "Tree- and forest structures";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -13956,7 +13954,7 @@ self: {
vector
];
description = "(Context-free) grammars in formal language theory";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -14392,7 +14390,7 @@ self: {
vinyl
];
description = "Frames wrapper for map-reduce-folds and some extra folds helpers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -14507,7 +14505,7 @@ self: {
vinyl
];
description = "A streamly layer for Frames I/O";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "Demo";
broken = true;
@@ -15133,7 +15131,7 @@ self: {
utf8-string
];
description = "Bindings to the GOST R 34.11-2012 hashing implementation";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -15723,7 +15721,7 @@ self: {
random
];
description = "Automatic SMS message generator";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "GenSmsPdu";
broken = true;
@@ -17076,7 +17074,9 @@ self: {
];
description = "The Haskell/R mixed programming environment";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
mainProgram = "H";
+ broken = true;
}
) { };
@@ -19293,7 +19293,7 @@ self: {
unliftio
];
description = "A flexible mock framework for testing effectful code";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -19816,7 +19816,7 @@ self: {
gauge
];
description = "quantitative finance library";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
platforms = lib.platforms.x86;
hydraPlatforms = lib.platforms.none;
}
@@ -19856,7 +19856,7 @@ self: {
HROOT-tree
];
description = "Haskell binding to the ROOT data analysis framework";
- license = lib.licenses.lgpl21Plus;
+ license = lib.licensesSpdx."LGPL-2.1-or-later";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -19887,7 +19887,7 @@ self: {
template-haskell
];
description = "Haskell binding to ROOT Core modules";
- license = lib.licenses.lgpl21Plus;
+ license = lib.licensesSpdx."LGPL-2.1-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -19923,7 +19923,7 @@ self: {
template-haskell
];
description = "Haskell binding to ROOT Graf modules";
- license = lib.licenses.lgpl21Plus;
+ license = lib.licensesSpdx."LGPL-2.1-or-later";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -19956,7 +19956,7 @@ self: {
template-haskell
];
description = "Haskell binding to ROOT Hist modules";
- license = lib.licenses.lgpl21Plus;
+ license = lib.licensesSpdx."LGPL-2.1-or-later";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -19989,7 +19989,7 @@ self: {
template-haskell
];
description = "Haskell binding to ROOT IO modules";
- license = lib.licenses.lgpl21Plus;
+ license = lib.licensesSpdx."LGPL-2.1-or-later";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -20022,7 +20022,7 @@ self: {
template-haskell
];
description = "Haskell binding to ROOT Math modules";
- license = lib.licenses.lgpl21Plus;
+ license = lib.licensesSpdx."LGPL-2.1-or-later";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -20059,7 +20059,7 @@ self: {
];
librarySystemDepends = [ RHTTP ];
description = "Haskell binding to ROOT Net modules";
- license = lib.licenses.lgpl21Plus;
+ license = lib.licensesSpdx."LGPL-2.1-or-later";
hydraPlatforms = lib.platforms.none;
}
) { RHTTP = null; };
@@ -20092,7 +20092,7 @@ self: {
template-haskell
];
description = "Haskell binding to ROOT Tree modules";
- license = lib.licenses.lgpl21Plus;
+ license = lib.licensesSpdx."LGPL-2.1-or-later";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -20554,7 +20554,7 @@ self: {
containers
];
description = "Haskell Bindings for libsvm";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -20769,7 +20769,7 @@ self: {
strict
];
description = "Tableau based theorem prover for hybrid logics";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "htab";
}
@@ -21710,7 +21710,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base ];
description = "The classic game of Hangman";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "Hangman";
broken = true;
@@ -21931,8 +21931,8 @@ self: {
}:
mkDerivation {
pname = "HasCacBDD";
- version = "0.3.0.0";
- sha256 = "0066sip8362y1kvqcnrmamd42y7cwlkfashkpqnf675b8zrah7sz";
+ version = "0.3.0.1";
+ sha256 = "0vj02bnh14pv7slvj4mr8r9kbjp1ls1lv1jr6xqz1c187jgyv2bj";
setupHaskellDepends = [
base
Cabal
@@ -21940,6 +21940,7 @@ self: {
];
libraryHaskellDepends = [
base
+ directory
process
QuickCheck
];
@@ -22002,7 +22003,7 @@ self: {
transformers
];
description = "Functional choreographic programming in Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -22229,7 +22230,7 @@ self: {
random
];
description = "Combinatorics, group theory, commutative algebra, non-commutative algebra";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -22712,7 +22713,7 @@ self: {
yaml
];
description = "Cashflow modeling library for structured finance";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "Hastructure-exe";
}
) { };
@@ -24308,7 +24309,7 @@ self: {
vector
];
description = "JSON to YAML Adapter";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
}
) { };
@@ -24576,7 +24577,7 @@ self: {
MemoTrie
];
description = "A package for solving dynamic programming problems in Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -25014,6 +25015,53 @@ self: {
}
) { };
+ ImpSpec_0_2_0_0 = callPackage (
+ {
+ mkDerivation,
+ base,
+ bytestring,
+ deepseq,
+ hspec,
+ hspec-core,
+ hspec-expectations-lifted,
+ HUnit,
+ mtl,
+ prettyprinter,
+ prettyprinter-ansi-terminal,
+ QuickCheck,
+ quickcheck-transformer,
+ random,
+ text,
+ unliftio,
+ }:
+ mkDerivation {
+ pname = "ImpSpec";
+ version = "0.2.0.0";
+ sha256 = "1cjbq9vk488f5jnl478q892ykmjdh8kc3pmx9b2gr820zqsfrlp0";
+ libraryHaskellDepends = [
+ base
+ bytestring
+ deepseq
+ hspec
+ hspec-core
+ hspec-expectations-lifted
+ HUnit
+ mtl
+ prettyprinter
+ prettyprinter-ansi-terminal
+ QuickCheck
+ quickcheck-transformer
+ random
+ text
+ unliftio
+ ];
+ testHaskellDepends = [ base ];
+ description = "Imperative approach to testing stateful applications. ImpSpec is built on top of HSpec and QuickCheck.";
+ license = lib.licensesSpdx."Apache-2.0";
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
ImperativeHaskell = callPackage (
{
mkDerivation,
@@ -25076,6 +25124,47 @@ self: {
}
) { };
+ Infinitree = callPackage (
+ {
+ mkDerivation,
+ adjunctions,
+ base,
+ containers,
+ criterion,
+ distributive,
+ infinite-list,
+ random,
+ }:
+ mkDerivation {
+ pname = "Infinitree";
+ version = "0.1.0.0";
+ sha256 = "0hdhld98nfx64lg9sxvbdhqjqm0g5maycx27xmcgizgg4yzxwyh2";
+ revision = "1";
+ editedCabalFile = "1ks3rnbj8zbiaqdzjad8i1midqa1lakxqph15161zm1i6d1yaj95";
+ libraryHaskellDepends = [
+ adjunctions
+ base
+ containers
+ distributive
+ infinite-list
+ random
+ ];
+ benchmarkHaskellDepends = [
+ adjunctions
+ base
+ containers
+ criterion
+ distributive
+ infinite-list
+ random
+ ];
+ description = "Infinitely deep trees for lazy stateless memoization";
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }
+ ) { };
+
InfixApplicative = callPackage (
{
mkDerivation,
@@ -26133,7 +26222,7 @@ self: {
JuicyPixels
];
description = "Efficiently scale, crop, flip images with JuicyPixels";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -26171,7 +26260,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "JuicyPixels wrappers for libjpeg-turbo";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -26484,7 +26573,7 @@ self: {
mtl
];
description = "A simple parsing library and some additional utilities";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -26958,7 +27047,7 @@ self: {
text-short
];
description = "Lightweight Directory Access Protocol (LDAP) version 3";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -27007,6 +27096,49 @@ self: {
}
) { };
+ LPFP_1_2_1 = callPackage (
+ {
+ mkDerivation,
+ base,
+ containers,
+ diagrams-cairo,
+ diagrams-lib,
+ gloss,
+ gnuplot,
+ linear,
+ Vis,
+ }:
+ mkDerivation {
+ pname = "LPFP";
+ version = "1.2.1";
+ sha256 = "1d9hrkw14vi70aipd2a37261k4nhkz324jqk9ipihjfxdr79vrmf";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base
+ containers
+ diagrams-cairo
+ diagrams-lib
+ gloss
+ gnuplot
+ linear
+ Vis
+ ];
+ executableHaskellDepends = [
+ base
+ diagrams-cairo
+ diagrams-lib
+ gloss
+ gnuplot
+ linear
+ Vis
+ ];
+ description = "Code for the book Learn Physics with Functional Programming";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
LPFP-core = callPackage (
{
mkDerivation,
@@ -27418,7 +27550,7 @@ self: {
vector
];
description = "A game engine library for tactical squad ASCII roguelike dungeon crawlers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
badPlatforms = lib.platforms.darwin;
mainProgram = "LambdaHack";
}
@@ -27837,7 +27969,7 @@ self: {
sha256 = "1rj5n931370nxrnqj1728p38mcqbpswmxc73c5g1mlh66k0gqqk4";
libraryHaskellDepends = [ base ];
description = "European option implied vol calculation";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -28334,7 +28466,7 @@ self: {
testHaskellDepends = [ base ];
doHaddock = false;
description = "Converter to convert from .lhs to .md and vice versa.";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "lhsc";
broken = true;
@@ -29394,7 +29526,7 @@ self: {
hspec
];
description = "Reals in the interval [0,1), as machine words";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -29840,7 +29972,7 @@ self: {
process
];
description = "A partial Cabal replacement";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
mainProgram = "mcabal";
}
) { };
@@ -29883,7 +30015,7 @@ self: {
time
];
description = "A small compiler for Haskell";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
mainProgram = "mhs";
}
) { };
@@ -29973,7 +30105,7 @@ self: {
];
testToolDepends = [ goldplate ];
description = "A toy dependently typed programming language with type-based termination";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "miniagda";
broken = true;
@@ -30942,7 +31074,7 @@ self: {
warp
];
description = "Type-safe and efficient choreographies with location-set polymorphism";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -31975,7 +32107,7 @@ self: {
split
];
description = "Instances of NcStore for hypercuboids";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "Main";
}
@@ -32066,7 +32198,7 @@ self: {
vector
];
description = "Simple scoring schemes for word alignments";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -32993,7 +33125,7 @@ self: {
OGDF
];
description = "Haskell binding to OGDF";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -33133,8 +33265,8 @@ self: {
pname = "OTP";
version = "0.1.0.0";
sha256 = "1r7vpc0bv89d70j6pc3z3vam93gahl4j0y5w8smknxwjliwqxkcb";
- revision = "2";
- editedCabalFile = "012yi2pvjjlk6vri5zj8a7pipscsfc6rgkw7s5qldqmvvwvrk64s";
+ revision = "3";
+ editedCabalFile = "00xy1xqm9slrb6k4gyha18plp5l1mc1fhgsh2jlv0y8hfy03qjxg";
libraryHaskellDepends = [
base
bytestring
@@ -34114,7 +34246,7 @@ self: {
criterion
];
description = "Efficient ordered (by popcount) enumeration of bits";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
platforms = lib.platforms.x86;
}
) { };
@@ -35098,10 +35230,8 @@ self: {
}:
mkDerivation {
pname = "PenroseKiteDart";
- version = "1.5";
- sha256 = "0p0nf91vy5akgpnv8bb0i7bv92y0z774yh5xxynkf5f4rn7bcqjg";
- revision = "2";
- editedCabalFile = "1xdnbssmm0h9dvqpxivs2i037r5sj7cn5pnqzsm1h9cainj2w9g9";
+ version = "1.5.1";
+ sha256 = "0812x3ddlqflkypzjid3b5n3pdb2wwmp0b24yfmi9z15v5dbf2hm";
libraryHaskellDepends = [
base
containers
@@ -35757,7 +35887,7 @@ self: {
vector-th-unbox
];
description = "Efficient multidimensional arrays";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -35922,6 +36052,44 @@ self: {
}
) { };
+ PropRatt = callPackage (
+ {
+ mkDerivation,
+ AsyncRattus,
+ base,
+ containers,
+ QuickCheck,
+ }:
+ mkDerivation {
+ pname = "PropRatt";
+ version = "0.1.0.0";
+ sha256 = "0qs8g88hsak7w7qi5qmjzsir71mr5b214cr0h4ni145x6is5fa0j";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ AsyncRattus
+ base
+ containers
+ QuickCheck
+ ];
+ executableHaskellDepends = [
+ AsyncRattus
+ base
+ containers
+ QuickCheck
+ ];
+ testHaskellDepends = [
+ AsyncRattus
+ base
+ containers
+ QuickCheck
+ ];
+ description = "Property-based testing framework for testing asynchronous FRP programs";
+ license = lib.licensesSpdx."BSD-3-Clause";
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
PropaFP = callPackage (
{
mkDerivation,
@@ -36326,7 +36494,7 @@ self: {
time
];
description = "Quasiquotations for a python like interpolated string formatter";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -36581,22 +36749,24 @@ self: {
}
) { };
- QuickCheck_2_16_0_0 = callPackage (
+ QuickCheck_2_17_1_0 = callPackage (
{
mkDerivation,
base,
containers,
deepseq,
+ hint,
process,
random,
+ split,
splitmix,
template-haskell,
transformers,
}:
mkDerivation {
pname = "QuickCheck";
- version = "2.16.0.0";
- sha256 = "1h02m26hvhfcs82rrfmfznwh4vj799gn55kysmv3sr8ixak3ymhb";
+ version = "2.17.1.0";
+ sha256 = "0dvrgc666jik35x6linmzn03k6sgr5b9a1ai8wplv7b2ai7l6c08";
libraryHaskellDepends = [
base
containers
@@ -36610,7 +36780,11 @@ self: {
base
containers
deepseq
+ hint
process
+ split
+ template-haskell
+ transformers
];
description = "Automatic testing of Haskell programs";
license = lib.licenses.bsd3;
@@ -36639,7 +36813,7 @@ self: {
transformers
];
description = "A GenT monad transformer for QuickCheck library";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -37539,7 +37713,7 @@ self: {
time
];
description = "A puzzle game written in Haskell with a cat in lead role";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
badPlatforms = lib.platforms.darwin;
hydraPlatforms = lib.platforms.none;
mainProgram = "raincat";
@@ -38423,7 +38597,7 @@ self: {
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "rounding variants floor, ceil and truncate for floating point operations +-*/√…";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -38474,7 +38648,7 @@ self: {
vector
];
description = "Haskell wrapper for RtMidi, the lightweight, cross-platform MIDI I/O library";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -38548,7 +38722,7 @@ self: {
X
];
description = "Library for accessing S3 compatible storage services";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -39140,7 +39314,7 @@ self: {
time
];
description = "The Simple Javascript Wrench";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "sjw";
broken = true;
@@ -39832,7 +40006,7 @@ self: {
vector-th-unbox
];
description = "Base types and classes for statistics, sciences and humanities";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -40031,7 +40205,7 @@ self: {
bytestring
];
description = "simple static linked SHA3 using private symbols and the ref impl";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -40266,7 +40440,7 @@ self: {
util
];
description = "See README for more info";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -40660,7 +40834,7 @@ self: {
warp
];
description = "A programming model for declarative, high performance user interface";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -40705,7 +40879,7 @@ self: {
unliftio
];
description = "A Virtual Dom in pure Haskell, based on Html as an Alignable Functor";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -40745,7 +40919,7 @@ self: {
unliftio
];
description = "Use the high-performance Snabbdom virtual dom library written in JavaScript";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -40769,7 +40943,7 @@ self: {
text
];
description = "A backend for rendering Shpadoinkle as Text";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -40797,7 +40971,7 @@ self: {
unliftio
];
description = "Support for the native browser console";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -40883,7 +41057,7 @@ self: {
unliftio
];
description = "Chrome extension to aide in development";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "devtools";
}
@@ -40920,7 +41094,7 @@ self: {
unliftio
];
description = "Shpadoinkle as a static site";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -41066,7 +41240,7 @@ self: {
unliftio
];
description = "A typed, template generated Html DSL, and helpers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -41124,7 +41298,7 @@ self: {
warp
];
description = "Isreal Swan will make a snowman for you!";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "isreal";
broken = true;
@@ -41150,7 +41324,7 @@ self: {
text
];
description = "Lens combinators for Shpadoinkle applications";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -41218,7 +41392,7 @@ self: {
warp
];
description = "A single page application rounter for Shpadoinkle based on Servant";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -41244,7 +41418,7 @@ self: {
text
];
description = "Integration of the streaming library with Shpadoinkle continuations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -41291,7 +41465,7 @@ self: {
text
];
description = "Read standard file formats into Shpadoinkle with Template Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -41357,7 +41531,7 @@ self: {
quickcheck-classes-base
];
description = "A collection of common reusable types and components";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -43029,6 +43203,8 @@ self: {
pname = "StrictCheck";
version = "0.4.0";
sha256 = "0l7h39a7a1zc7xrsz6ggscn6406q3wi57n50w8hvdm4dd6qf333f";
+ revision = "1";
+ editedCabalFile = "1pklbr8r76mkg3sg9v6qj39d7cg2wswrgr3ymycw91g50l74c721";
libraryHaskellDepends = [
base
bifunctors
@@ -43133,7 +43309,7 @@ self: {
sha256 = "0nxk4a997sibj8nl1b1r6mcn0r7qbyz68jnirv29lq2yyh6lbja4";
doHaddock = false;
description = "Svg Icons and more";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -43196,7 +43372,7 @@ self: {
random
];
description = "Synapse is a machine learning library written in pure Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -43231,6 +43407,8 @@ self: {
];
description = "Syntax Macros in the form of an EDSL";
license = "LGPL";
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -43479,7 +43657,7 @@ self: {
template-haskell
];
description = "A \"noDSL\" approach to mixing shell scripting with Haskell programs using Template Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "thsh";
}
) { };
@@ -45204,6 +45382,8 @@ self: {
pname = "Unique";
version = "0.4.8.0";
sha256 = "1wv9dskvs2im5a97h3xm161sbqcbw81d7knk81y876ghqqf3hr56";
+ revision = "1";
+ editedCabalFile = "0cxifpgiq110618hzas1yz3g7ngcliw1skb9nahw3arsz3c3zifj";
libraryHaskellDepends = [
base
containers
@@ -45544,7 +45724,7 @@ self: {
parsec
];
description = "A Valve Value-keyvalue parser for Haskell made with Parsec";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -45964,7 +46144,7 @@ self: {
vulkan
];
description = "Bindings to the VulkanMemoryAllocator library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
badPlatforms = [
"i686-linux"
"armv7l-linux"
@@ -46333,7 +46513,7 @@ self: {
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "Simple set types. Useful to create sets of arbitrary types and nested sets.";
- license = lib.licenses.lgpl3Plus;
+ license = lib.licensesSpdx."LGPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -47434,8 +47614,8 @@ self: {
pname = "X";
version = "0.3.1.0";
sha256 = "10paczbaiwag50v8ay9pl0f6whqds6y0yy14z0h8s6j04p9zd50f";
- revision = "1";
- editedCabalFile = "1c24q6bh9zq1a9rm9wqi8kasfzcn3cvbzdcgya8clwh3k7xbsvmg";
+ revision = "2";
+ editedCabalFile = "00q4sl0c1yb1gi3ycz46c5h5yl8f8pg6q2wdxxlvpxsxpnxsjdqv";
libraryHaskellDepends = [
base
bytestring
@@ -47607,7 +47787,7 @@ self: {
];
libraryPkgconfigDepends = [ libXft ];
description = "Bindings to the Xft and some Xrender parts";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.slotThe ];
}
) { inherit (pkgs.xorg) libXft; };
@@ -48459,7 +48639,7 @@ self: {
Z-IO
];
description = "Crypto for Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -48530,7 +48710,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Array, vector and text";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -48593,7 +48773,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Simple and high performance IO toolkit for Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -48691,7 +48871,7 @@ self: {
Z-Data
];
description = "YAML tools";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -48817,7 +48997,7 @@ self: {
syz
];
description = "An implementation of Attribute Grammars using Functional Zippers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -48863,6 +49043,37 @@ self: {
}
) { };
+ Ztrategic = callPackage (
+ {
+ mkDerivation,
+ base,
+ monadplus,
+ mtl,
+ random,
+ syb,
+ syz,
+ transformers,
+ ZipperAG,
+ }:
+ mkDerivation {
+ pname = "Ztrategic";
+ version = "0.1.0";
+ sha256 = "0720gmpijd89sma3699cqc2mwj60bz6gidrgfsnm0zw67saqcq1f";
+ libraryHaskellDepends = [
+ base
+ monadplus
+ mtl
+ random
+ syb
+ syz
+ transformers
+ ZipperAG
+ ];
+ description = "Zipper-based library for strategic programming and attribute grammars";
+ license = lib.licenses.mit;
+ }
+ ) { };
+
Zwaluw = callPackage (
{ mkDerivation, base }:
mkDerivation {
@@ -48939,7 +49150,7 @@ self: {
text
];
description = "Convert distfix precedence grammars to unambiguous context-free grammars";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -49437,7 +49648,7 @@ self: {
wide-word
];
description = "Data structures and algorithms";
- license = lib.licenses.cc0;
+ license = lib.licensesSpdx."CC0-1.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "example-lazy-segtree";
broken = true;
@@ -49529,7 +49740,7 @@ self: {
rerebase
];
description = "Sequence optimized for monoidal construction and folding";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -51825,7 +52036,7 @@ self: {
wreq
];
description = "implements ACME clients (rfc-8555)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -52256,7 +52467,7 @@ self: {
text
];
description = "AcousticBrainz API client";
- license = lib.licenses.cc0;
+ license = lib.licensesSpdx."CC0-1.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -52279,7 +52490,7 @@ self: {
transformers
];
description = "Abstraction over management of resources";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -52545,7 +52756,7 @@ self: {
];
doHaddock = false;
description = "Semigroup actions and torsors";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -52651,7 +52862,7 @@ self: {
sha256 = "07zi06qqmrn14awz7vxn5rx1j62fc9xp2qx52s1j91kh9zy8pzxn";
libraryHaskellDepends = [ base ];
description = "Multidimensional integration";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
}
) { };
@@ -52729,8 +52940,8 @@ self: {
}:
mkDerivation {
pname = "adblock2privoxy";
- version = "2.3.0";
- sha256 = "0aaz9kxvsyiwn0infzf9qlvq7wlrsamg4brr11332aljg8phnsmx";
+ version = "2.3.1";
+ sha256 = "1gnh8w56qkp1bsrdiydsyig6s4vzhg5zgw68hnl4s9fq99016qca";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -52754,9 +52965,7 @@ self: {
];
description = "Convert adblock config files to privoxy format";
license = lib.licenses.gpl3Only;
- hydraPlatforms = lib.platforms.none;
mainProgram = "adblock2privoxy";
- broken = true;
}
) { };
@@ -52834,7 +53043,7 @@ self: {
validation-selective
];
description = "A full-featured library for parsing, validating, and rendering email addresses";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -52869,7 +53078,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Manage fine grained fixtures";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -52905,7 +53114,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Manage fine grained fixtures";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -53028,7 +53237,7 @@ self: {
hs-functors
];
description = "See README for more info";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -53555,6 +53764,37 @@ self: {
}
) { };
+ aes-gcm = callPackage (
+ {
+ mkDerivation,
+ base,
+ base16-bytestring,
+ bytestring,
+ openssl,
+ tasty,
+ tasty-hunit,
+ }:
+ mkDerivation {
+ pname = "aes-gcm";
+ version = "0.0.0.0";
+ sha256 = "1shzy466bqy4s15azn8b4ijqdy0drz0zi9f3rxxwdyc730mnikap";
+ libraryHaskellDepends = [
+ base
+ bytestring
+ ];
+ libraryPkgconfigDepends = [ openssl ];
+ testHaskellDepends = [
+ base
+ base16-bytestring
+ bytestring
+ tasty
+ tasty-hunit
+ ];
+ description = "AES Galois/Counter Mode (GCM) AEAD Cipher";
+ license = lib.licensesSpdx."GPL-2.0-or-later";
+ }
+ ) { inherit (pkgs) openssl; };
+
aeson = callPackage (
{
mkDerivation,
@@ -53689,7 +53929,7 @@ self: {
vector
];
description = "Fast JSON parsing and encoding";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -53897,8 +54137,8 @@ self: {
}:
mkDerivation {
pname = "aeson-combinators";
- version = "0.1.2.1";
- sha256 = "10r3k8hi0rcvpi2868m4282zrnn57q7gj25ldhkja7mvz199wddz";
+ version = "0.1.2.2";
+ sha256 = "1lpkkjq411xkccrnkfnvg297s46myfpzncm1i89lb213a1agn3br";
libraryHaskellDepends = [
aeson
attoparsec-aeson
@@ -53933,8 +54173,6 @@ self: {
];
description = "Aeson combinators for dead simple JSON decoding";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}
) { };
@@ -54095,7 +54333,7 @@ self: {
vector
];
description = "Easy functions for converting from Aeson.Value";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -54172,7 +54410,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "JSON encoding/decoding for dependent-sum";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -54662,7 +54900,7 @@ self: {
text
];
description = "Type-level default fields for aeson Generic FromJSON parser";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -54716,7 +54954,7 @@ self: {
time
];
description = "Generates TypeScript definitions that match Generic Aeson encodings";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "tests";
broken = true;
@@ -54944,6 +55182,7 @@ self: {
aeson,
aeson-qq,
attoparsec,
+ attoparsec-aeson,
base,
bytestring,
case-insensitive,
@@ -54951,6 +55190,7 @@ self: {
either,
haskell-src-meta,
hspec,
+ hspec-discover,
pretty,
scientific,
template-haskell,
@@ -54960,11 +55200,12 @@ self: {
}:
mkDerivation {
pname = "aeson-match-qq";
- version = "1.7.0";
- sha256 = "11cmqk6igrapi9ms211gbmfwkyczjrzpg900fxqypn18lj1k4y60";
+ version = "1.8.0";
+ sha256 = "1jzkxpy7qgln68sz5r9j5n963pnwxnclqav8qfc583yv9zszl0dp";
libraryHaskellDepends = [
aeson
attoparsec
+ attoparsec-aeson
base
bytestring
case-insensitive
@@ -54985,10 +55226,9 @@ self: {
hspec
unordered-containers
];
+ testToolDepends = [ hspec-discover ];
description = "Declarative JSON matchers";
license = lib.licenses.bsd2;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}
) { };
@@ -55218,7 +55458,7 @@ self: {
tasty-quickcheck-laws
];
description = "Possible values for aeson";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -55667,7 +55907,7 @@ self: {
];
testToolDepends = [ markdown-unlit ];
description = "Conveniently wrap a single value in a record when encoding to and from JSON";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -55799,7 +56039,7 @@ self: {
vector
];
description = "Aeson instances for the Tiled map editor";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -55916,7 +56156,7 @@ self: {
vector
];
description = "Aliases to \"aeson\" AST making it importable unqualified";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -55986,7 +56226,7 @@ self: {
vector
];
description = "API for parsing \"aeson\" JSON tree into Haskell types";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -56379,7 +56619,7 @@ self: {
uniqueness-periods-vector-stats
];
description = "An AFTOVolio implementation for creating texts with special phonetic / prosodic properties";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -56695,7 +56935,7 @@ self: {
text
];
description = "Check for unused code in an Agda project";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "agda-unused";
broken = true;
@@ -56748,7 +56988,7 @@ self: {
yaml
];
description = "Compiling Agda code to readable Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "agda2hs";
maintainers = [ lib.maintainers.ncfavier ];
}
@@ -56873,13 +57113,76 @@ self: {
];
doHaddock = false;
description = "Agda backend to generate training data for machine learning purposes";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "agda2train";
broken = true;
}
) { };
+ age = callPackage (
+ {
+ mkDerivation,
+ attoparsec,
+ base,
+ base16,
+ base64,
+ bech32,
+ binary,
+ bytestring,
+ conduit,
+ conduit-extra,
+ crypton,
+ directory,
+ hedgehog,
+ memory,
+ mmorph,
+ mono-traversable,
+ mtl,
+ text,
+ transformers,
+ }:
+ mkDerivation {
+ pname = "age";
+ version = "0.0.1.0";
+ sha256 = "0zlx7q72yzk9zjks7720w0qvkdgib810c70v13pyldkgq7qjgim2";
+ libraryHaskellDepends = [
+ attoparsec
+ base
+ base64
+ bech32
+ binary
+ bytestring
+ conduit
+ conduit-extra
+ crypton
+ memory
+ mono-traversable
+ mtl
+ text
+ transformers
+ ];
+ testHaskellDepends = [
+ attoparsec
+ base
+ base16
+ bytestring
+ conduit
+ conduit-extra
+ crypton
+ directory
+ hedgehog
+ memory
+ mmorph
+ mtl
+ text
+ ];
+ description = "Actually Good Encryption";
+ license = lib.licensesSpdx."MIT";
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
agentx = callPackage (
{
mkDerivation,
@@ -57411,7 +57714,7 @@ self: {
unordered-containers
];
description = "Automatically generate a GraphQL API for an SQLite database";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "airgql";
}
@@ -57566,8 +57869,8 @@ self: {
}:
mkDerivation {
pname = "aivika";
- version = "6.1.1";
- sha256 = "0g6f1048bxcyhp1kq7bjyrjfv96fawi5n0j5nvfjq544sc3s7b3m";
+ version = "6.2";
+ sha256 = "04pchpyq79zmsy8gvvd1d06ylq22ngcbdmydwk4x3bkh5qqw1hdl";
libraryHaskellDepends = [
array
base
@@ -58793,47 +59096,6 @@ self: {
}
) { };
- algebraic-graphs_0_6_1 = callPackage (
- {
- mkDerivation,
- array,
- base,
- containers,
- deepseq,
- extra,
- inspection-testing,
- QuickCheck,
- transformers,
- }:
- mkDerivation {
- pname = "algebraic-graphs";
- version = "0.6.1";
- sha256 = "168aqkm7mfd4is95qwpyf9k0k95qf5rfnkhq5ydbr74jj4jrhr1d";
- revision = "1";
- editedCabalFile = "1lnzgy3z51jyl1ail3wdd817np84gzi2bplccwzbm72glwbakc5h";
- libraryHaskellDepends = [
- array
- base
- containers
- deepseq
- transformers
- ];
- testHaskellDepends = [
- array
- base
- containers
- deepseq
- extra
- inspection-testing
- QuickCheck
- transformers
- ];
- description = "A library for algebraic graph construction and transformation";
- license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
- }
- ) { };
-
algebraic-graphs = callPackage (
{
mkDerivation,
@@ -58870,7 +59132,7 @@ self: {
transformers
];
description = "A library for algebraic graph construction and transformation";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -59372,7 +59634,7 @@ self: {
utility-ht
];
description = "Find relative time displacement of two recordings of the same music";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "align-audio";
maintainers = [ lib.maintainers.thielema ];
}
@@ -59408,7 +59670,7 @@ self: {
text
];
description = "Aligns text prefixes before '=' for consistent formatting";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "align-equal";
broken = true;
@@ -59826,7 +60088,9 @@ self: {
];
description = "A compiler for the Alpha language";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
mainProgram = "alpha";
+ broken = true;
}
) { };
@@ -60167,12 +60431,54 @@ self: {
];
libraryPkgconfigDepends = [ alsa-lib ];
description = "Binding to the ALSA Library API (MIDI sequencer)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.thielema ];
}
) { inherit (pkgs) alsa-lib; };
+ alsa-seq_0_6_0_10 = callPackage (
+ {
+ mkDerivation,
+ alsa-core,
+ alsa-lib,
+ array,
+ base,
+ bytestring,
+ data-accessor,
+ enumset,
+ extensible-exceptions,
+ poll,
+ transformers,
+ utility-ht,
+ }:
+ mkDerivation {
+ pname = "alsa-seq";
+ version = "0.6.0.10";
+ sha256 = "066sqfyz41km6qvgqqvaj9kmqxc48sdalbsv2449jdlw6z76md3w";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ alsa-core
+ array
+ base
+ bytestring
+ data-accessor
+ enumset
+ extensible-exceptions
+ poll
+ transformers
+ utility-ht
+ ];
+ libraryPkgconfigDepends = [ alsa-lib ];
+ description = "Binding to the ALSA Library API (MIDI sequencer)";
+ license = lib.licensesSpdx."BSD-3-Clause";
+ platforms = lib.platforms.linux;
+ hydraPlatforms = lib.platforms.none;
+ maintainers = [ lib.maintainers.thielema ];
+ }
+ ) { inherit (pkgs) alsa-lib; };
+
alsa-seq-tests = callPackage (
{
mkDerivation,
@@ -60456,7 +60762,7 @@ self: {
version = "0.1";
sha256 = "15fwq1pmb3d46cgsj59q3iz2qs0lgvq5b9d6gxfysnjlm3sp0ivw";
description = "provides a typeclass that is always satisfied";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -60647,7 +60953,7 @@ self: {
uuid
];
description = "Comprehensive Amazon Web Services SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
maintainers = [ lib.maintainers.mpscholten ];
}
) { };
@@ -60689,7 +60995,7 @@ self: {
unordered-containers
];
description = "Amazon Access Analyzer SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -60730,7 +61036,7 @@ self: {
unordered-containers
];
description = "Amazon Account SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -60771,7 +61077,7 @@ self: {
unordered-containers
];
description = "Amazon Alexa For Business SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -60812,7 +61118,7 @@ self: {
unordered-containers
];
description = "Amazon Prometheus Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -60853,7 +61159,7 @@ self: {
unordered-containers
];
description = "Amazon Amplify SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -60894,7 +61200,7 @@ self: {
unordered-containers
];
description = "Amazon AmplifyBackend SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -60935,7 +61241,7 @@ self: {
unordered-containers
];
description = "Amazon Amplify UI Builder SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -60976,7 +61282,7 @@ self: {
unordered-containers
];
description = "Amazon API Gateway SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -61017,7 +61323,7 @@ self: {
unordered-containers
];
description = "Amazon ApiGatewayManagementApi SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -61058,7 +61364,7 @@ self: {
unordered-containers
];
description = "Amazon ApiGatewayV2 SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -61099,7 +61405,7 @@ self: {
unordered-containers
];
description = "Amazon AppConfig SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -61140,7 +61446,7 @@ self: {
unordered-containers
];
description = "Amazon AppConfig Data SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -61181,7 +61487,7 @@ self: {
unordered-containers
];
description = "Amazon Appflow SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -61222,7 +61528,7 @@ self: {
unordered-containers
];
description = "Amazon AppIntegrations Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -61263,7 +61569,7 @@ self: {
unordered-containers
];
description = "Amazon Application Auto Scaling SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -61304,7 +61610,7 @@ self: {
unordered-containers
];
description = "Amazon CloudWatch Application Insights SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -61345,7 +61651,7 @@ self: {
unordered-containers
];
description = "Amazon Application Cost Profiler SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -61386,7 +61692,7 @@ self: {
unordered-containers
];
description = "Amazon App Mesh SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -61427,7 +61733,7 @@ self: {
unordered-containers
];
description = "Amazon App Runner SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -61468,7 +61774,7 @@ self: {
unordered-containers
];
description = "Amazon AppStream SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -61509,7 +61815,7 @@ self: {
unordered-containers
];
description = "Amazon AppSync SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -61550,7 +61856,7 @@ self: {
unordered-containers
];
description = "Amazon ARC - Zonal Shift SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -61591,7 +61897,7 @@ self: {
unordered-containers
];
description = "Amazon Athena SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -61632,7 +61938,7 @@ self: {
unordered-containers
];
description = "Amazon Audit Manager SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -61673,7 +61979,7 @@ self: {
unordered-containers
];
description = "Amazon Auto Scaling SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -61714,7 +62020,7 @@ self: {
unordered-containers
];
description = "Amazon Auto Scaling Plans SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -61755,7 +62061,7 @@ self: {
unordered-containers
];
description = "Amazon Backup SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -61796,7 +62102,7 @@ self: {
unordered-containers
];
description = "Amazon Backup Gateway SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -61837,7 +62143,7 @@ self: {
unordered-containers
];
description = "Amazon Backup Storage SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -61878,7 +62184,7 @@ self: {
unordered-containers
];
description = "Amazon Batch SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -61919,7 +62225,7 @@ self: {
unordered-containers
];
description = "Amazon BillingConductor SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -61960,7 +62266,7 @@ self: {
unordered-containers
];
description = "Amazon Braket SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -62001,7 +62307,7 @@ self: {
unordered-containers
];
description = "Amazon Budgets SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -62042,7 +62348,7 @@ self: {
unordered-containers
];
description = "Amazon Certificate Manager SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -62083,7 +62389,7 @@ self: {
unordered-containers
];
description = "Amazon Certificate Manager Private Certificate Authority SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -62124,7 +62430,7 @@ self: {
unordered-containers
];
description = "Amazon Chime SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -62165,7 +62471,7 @@ self: {
unordered-containers
];
description = "Amazon Chime SDK Identity SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -62206,7 +62512,7 @@ self: {
unordered-containers
];
description = "Amazon Chime SDK Media Pipelines SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -62247,7 +62553,7 @@ self: {
unordered-containers
];
description = "Amazon Chime SDK Meetings SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -62288,7 +62594,7 @@ self: {
unordered-containers
];
description = "Amazon Chime SDK Messaging SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -62329,7 +62635,7 @@ self: {
unordered-containers
];
description = "Amazon Chime SDK Voice SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -62370,7 +62676,7 @@ self: {
unordered-containers
];
description = "Amazon Cloud9 SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -62411,7 +62717,7 @@ self: {
unordered-containers
];
description = "Amazon Cloud Control API SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -62452,7 +62758,7 @@ self: {
unordered-containers
];
description = "Amazon CloudDirectory SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -62493,7 +62799,7 @@ self: {
unordered-containers
];
description = "Amazon CloudFormation SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -62534,7 +62840,7 @@ self: {
unordered-containers
];
description = "Amazon CloudFront SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -62575,7 +62881,7 @@ self: {
unordered-containers
];
description = "Amazon CloudHSM SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -62616,7 +62922,7 @@ self: {
unordered-containers
];
description = "Amazon CloudHSM V2 SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -62657,7 +62963,7 @@ self: {
unordered-containers
];
description = "Amazon CloudSearch SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -62698,7 +63004,7 @@ self: {
unordered-containers
];
description = "Amazon CloudSearch Domain SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -62739,7 +63045,7 @@ self: {
unordered-containers
];
description = "Amazon CloudTrail SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -62780,7 +63086,7 @@ self: {
unordered-containers
];
description = "Amazon CloudWatch SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -62821,7 +63127,7 @@ self: {
unordered-containers
];
description = "Amazon EventBridge SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -62862,7 +63168,7 @@ self: {
unordered-containers
];
description = "Amazon CloudWatch Logs SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -62903,7 +63209,7 @@ self: {
unordered-containers
];
description = "Amazon CodeArtifact SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -62944,7 +63250,7 @@ self: {
unordered-containers
];
description = "Amazon CodeBuild SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -62985,7 +63291,7 @@ self: {
unordered-containers
];
description = "Amazon CodeCommit SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -63026,7 +63332,7 @@ self: {
unordered-containers
];
description = "Amazon CodeDeploy SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -63067,7 +63373,7 @@ self: {
unordered-containers
];
description = "Amazon CodeGuru Reviewer SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -63108,7 +63414,7 @@ self: {
unordered-containers
];
description = "Amazon CodeGuru Profiler SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -63149,7 +63455,7 @@ self: {
unordered-containers
];
description = "Amazon CodePipeline SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -63190,7 +63496,7 @@ self: {
unordered-containers
];
description = "Amazon CodeStar SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -63231,7 +63537,7 @@ self: {
unordered-containers
];
description = "Amazon CodeStar connections SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -63272,7 +63578,7 @@ self: {
unordered-containers
];
description = "Amazon CodeStar Notifications SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -63313,7 +63619,7 @@ self: {
unordered-containers
];
description = "Amazon Cognito Identity SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -63354,7 +63660,7 @@ self: {
unordered-containers
];
description = "Amazon Cognito Identity Provider SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -63395,7 +63701,7 @@ self: {
unordered-containers
];
description = "Amazon Cognito Sync SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -63436,7 +63742,7 @@ self: {
unordered-containers
];
description = "Amazon Comprehend SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -63477,7 +63783,7 @@ self: {
unordered-containers
];
description = "Amazon Comprehend Medical SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -63518,7 +63824,7 @@ self: {
unordered-containers
];
description = "Amazon Compute Optimizer SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -63559,7 +63865,7 @@ self: {
unordered-containers
];
description = "Amazon Config SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -63600,7 +63906,7 @@ self: {
unordered-containers
];
description = "Amazon Connect Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -63641,7 +63947,7 @@ self: {
unordered-containers
];
description = "Amazon Connect Contact Lens SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -63682,7 +63988,7 @@ self: {
unordered-containers
];
description = "Amazon ConnectCampaignService SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -63723,7 +64029,7 @@ self: {
unordered-containers
];
description = "Amazon Connect Cases SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -63764,7 +64070,7 @@ self: {
unordered-containers
];
description = "Amazon Connect Participant Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -63806,7 +64112,7 @@ self: {
text
];
description = "A Haskell equivalent of \"aws rds generate-db-auth-token\"";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "generate-db-auth-token";
broken = true;
@@ -63850,7 +64156,7 @@ self: {
unordered-containers
];
description = "Amazon Control Tower SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -63942,7 +64248,7 @@ self: {
time
];
description = "Core data types and functionality for Amazonka libraries";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -63983,7 +64289,7 @@ self: {
unordered-containers
];
description = "Amazon Cost Explorer Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -64024,7 +64330,7 @@ self: {
unordered-containers
];
description = "Amazon Cost and Usage Report Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -64065,7 +64371,7 @@ self: {
unordered-containers
];
description = "Amazon Connect Customer Profiles SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -64106,7 +64412,7 @@ self: {
unordered-containers
];
description = "Amazon Glue DataBrew SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -64147,7 +64453,7 @@ self: {
unordered-containers
];
description = "Amazon Data Exchange SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -64188,7 +64494,7 @@ self: {
unordered-containers
];
description = "Amazon Data Pipeline SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -64229,7 +64535,7 @@ self: {
unordered-containers
];
description = "Amazon DataSync SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -64270,7 +64576,7 @@ self: {
unordered-containers
];
description = "Amazon Detective SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -64311,7 +64617,7 @@ self: {
unordered-containers
];
description = "Amazon Device Farm SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -64352,7 +64658,7 @@ self: {
unordered-containers
];
description = "Amazon DevOps Guru SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -64393,7 +64699,7 @@ self: {
unordered-containers
];
description = "Amazon Direct Connect SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -64434,7 +64740,7 @@ self: {
unordered-containers
];
description = "Amazon Application Discovery Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -64475,7 +64781,7 @@ self: {
unordered-containers
];
description = "Amazon Data Lifecycle Manager SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -64516,7 +64822,7 @@ self: {
unordered-containers
];
description = "Amazon Database Migration Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -64557,7 +64863,7 @@ self: {
unordered-containers
];
description = "Amazon DocumentDB with MongoDB compatibility SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -64598,7 +64904,7 @@ self: {
unordered-containers
];
description = "Amazon DocumentDB Elastic Clusters SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -64639,7 +64945,7 @@ self: {
unordered-containers
];
description = "Amazon Elastic Disaster Recovery Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -64680,7 +64986,7 @@ self: {
unordered-containers
];
description = "Amazon Directory Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -64730,7 +65036,7 @@ self: {
unordered-containers
];
description = "Amazon DynamoDB SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -64773,7 +65079,7 @@ self: {
unordered-containers
];
description = "Amazon DynamoDB Accelerator (DAX) SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -64823,7 +65129,7 @@ self: {
unordered-containers
];
description = "Amazon DynamoDB Streams SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -64866,7 +65172,7 @@ self: {
unordered-containers
];
description = "Amazon Elastic Block Store SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -64907,7 +65213,7 @@ self: {
unordered-containers
];
description = "Amazon Elastic Compute Cloud SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -64948,7 +65254,7 @@ self: {
unordered-containers
];
description = "Amazon EC2 Instance Connect SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -64989,7 +65295,7 @@ self: {
unordered-containers
];
description = "Amazon EC2 Container Registry SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -65030,7 +65336,7 @@ self: {
unordered-containers
];
description = "Amazon Elastic Container Registry Public SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -65071,7 +65377,7 @@ self: {
unordered-containers
];
description = "Amazon EC2 Container Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -65112,7 +65418,7 @@ self: {
unordered-containers
];
description = "Amazon Elastic File System SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -65153,7 +65459,7 @@ self: {
unordered-containers
];
description = "Amazon Elastic Kubernetes Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -65194,7 +65500,7 @@ self: {
unordered-containers
];
description = "Amazon Elastic Inference SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -65235,7 +65541,7 @@ self: {
unordered-containers
];
description = "Amazon ElastiCache SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -65276,7 +65582,7 @@ self: {
unordered-containers
];
description = "Amazon Elastic Beanstalk SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -65317,7 +65623,7 @@ self: {
unordered-containers
];
description = "Amazon Elasticsearch Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -65358,7 +65664,7 @@ self: {
unordered-containers
];
description = "Amazon Elastic Transcoder SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -65399,7 +65705,7 @@ self: {
unordered-containers
];
description = "Amazon Elastic Load Balancing SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -65440,7 +65746,7 @@ self: {
unordered-containers
];
description = "Amazon Elastic Load Balancing SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -65481,7 +65787,7 @@ self: {
unordered-containers
];
description = "Amazon EMR SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -65522,7 +65828,7 @@ self: {
unordered-containers
];
description = "Amazon EMR Containers SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -65563,7 +65869,7 @@ self: {
unordered-containers
];
description = "Amazon EMR Serverless SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -65604,7 +65910,7 @@ self: {
unordered-containers
];
description = "Amazon CloudWatch Evidently SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -65645,7 +65951,7 @@ self: {
unordered-containers
];
description = "Amazon FinSpace User Environment Management service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -65686,7 +65992,7 @@ self: {
unordered-containers
];
description = "Amazon FinSpace Public API SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -65727,7 +66033,7 @@ self: {
unordered-containers
];
description = "Amazon Fault Injection Simulator SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -65768,7 +66074,7 @@ self: {
unordered-containers
];
description = "Amazon Firewall Management Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -65809,7 +66115,7 @@ self: {
unordered-containers
];
description = "Amazon Forecast Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -65850,7 +66156,7 @@ self: {
unordered-containers
];
description = "Amazon Forecast Query Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -65891,7 +66197,7 @@ self: {
unordered-containers
];
description = "Amazon Fraud Detector SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -65932,7 +66238,7 @@ self: {
unordered-containers
];
description = "Amazon FSx SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -65973,7 +66279,7 @@ self: {
unordered-containers
];
description = "Amazon GameLift SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -66014,7 +66320,7 @@ self: {
unordered-containers
];
description = "Amazon GameSparks SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -66055,7 +66361,7 @@ self: {
unordered-containers
];
description = "Amazon Glacier SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -66096,7 +66402,7 @@ self: {
unordered-containers
];
description = "Amazon Global Accelerator SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -66137,7 +66443,7 @@ self: {
unordered-containers
];
description = "Amazon Glue SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -66178,7 +66484,7 @@ self: {
unordered-containers
];
description = "Amazon Managed Grafana SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -66219,7 +66525,7 @@ self: {
unordered-containers
];
description = "Amazon Greengrass SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -66260,7 +66566,7 @@ self: {
unordered-containers
];
description = "Amazon IoT Greengrass V2 SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -66301,7 +66607,7 @@ self: {
unordered-containers
];
description = "Amazon Ground Station SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -66342,7 +66648,7 @@ self: {
unordered-containers
];
description = "Amazon GuardDuty SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -66383,7 +66689,7 @@ self: {
unordered-containers
];
description = "Amazon Health APIs and Notifications SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -66424,7 +66730,7 @@ self: {
unordered-containers
];
description = "Amazon HealthLake SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -66465,7 +66771,7 @@ self: {
unordered-containers
];
description = "Amazon Honeycode SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -66506,7 +66812,7 @@ self: {
unordered-containers
];
description = "Amazon Identity and Access Management SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -66594,7 +66900,7 @@ self: {
unordered-containers
];
description = "Amazon SSO Identity Store SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -66635,7 +66941,7 @@ self: {
unordered-containers
];
description = "Amazon EC2 Image Builder SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -66676,7 +66982,7 @@ self: {
unordered-containers
];
description = "Amazon Import/Export SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -66717,7 +67023,7 @@ self: {
unordered-containers
];
description = "Amazon Inspector SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -66758,7 +67064,7 @@ self: {
unordered-containers
];
description = "Amazon Inspector2 SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -66799,7 +67105,7 @@ self: {
unordered-containers
];
description = "Amazon IoT SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -66840,7 +67146,7 @@ self: {
unordered-containers
];
description = "Amazon IoT Analytics SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -66881,7 +67187,7 @@ self: {
unordered-containers
];
description = "Amazon IoT Data Plane SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -66922,7 +67228,7 @@ self: {
unordered-containers
];
description = "Amazon IoT Jobs Data Plane SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -66963,7 +67269,7 @@ self: {
unordered-containers
];
description = "Amazon IoT RoboRunner SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -67004,7 +67310,7 @@ self: {
unordered-containers
];
description = "Amazon IoT 1-Click Devices Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -67045,7 +67351,7 @@ self: {
unordered-containers
];
description = "Amazon IoT 1-Click Projects Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -67086,7 +67392,7 @@ self: {
unordered-containers
];
description = "Amazon IoT Core Device Advisor SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -67127,7 +67433,7 @@ self: {
unordered-containers
];
description = "Amazon IoT Events SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -67168,7 +67474,7 @@ self: {
unordered-containers
];
description = "Amazon IoT Events Data SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -67209,7 +67515,7 @@ self: {
unordered-containers
];
description = "Amazon IoT Fleet Hub SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -67250,7 +67556,7 @@ self: {
unordered-containers
];
description = "Amazon IoT FleetWise SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -67291,7 +67597,7 @@ self: {
unordered-containers
];
description = "Amazon IoT Secure Tunneling SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -67332,7 +67638,7 @@ self: {
unordered-containers
];
description = "Amazon IoT SiteWise SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -67373,7 +67679,7 @@ self: {
unordered-containers
];
description = "Amazon IoT Things Graph SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -67414,7 +67720,7 @@ self: {
unordered-containers
];
description = "Amazon IoT TwinMaker SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -67455,7 +67761,7 @@ self: {
unordered-containers
];
description = "Amazon IoT Wireless SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -67496,7 +67802,7 @@ self: {
unordered-containers
];
description = "Amazon Interactive Video Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -67537,7 +67843,7 @@ self: {
unordered-containers
];
description = "Amazon Interactive Video Service Chat SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -67578,7 +67884,7 @@ self: {
unordered-containers
];
description = "Amazon Managed Streaming for Kafka SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -67619,7 +67925,7 @@ self: {
unordered-containers
];
description = "Amazon Managed Streaming for Kafka Connect SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -67660,7 +67966,7 @@ self: {
unordered-containers
];
description = "Amazon KendraFrontendService SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -67701,7 +68007,7 @@ self: {
unordered-containers
];
description = "Amazon Keyspaces SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -67742,7 +68048,7 @@ self: {
unordered-containers
];
description = "Amazon Kinesis SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -67783,7 +68089,7 @@ self: {
unordered-containers
];
description = "Amazon Kinesis Analytics SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -67824,7 +68130,7 @@ self: {
unordered-containers
];
description = "Amazon Kinesis Firehose SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -67865,7 +68171,7 @@ self: {
unordered-containers
];
description = "Amazon Kinesis Video Streams SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -67906,7 +68212,7 @@ self: {
unordered-containers
];
description = "Amazon Kinesis Video Streams Archived Media SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -67947,7 +68253,7 @@ self: {
unordered-containers
];
description = "Amazon Kinesis Video Streams Media SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -67988,7 +68294,7 @@ self: {
unordered-containers
];
description = "Amazon Kinesis Video Signaling Channels SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -68029,7 +68335,7 @@ self: {
unordered-containers
];
description = "Amazon Kinesis Video WebRTC Storage SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -68070,7 +68376,7 @@ self: {
unordered-containers
];
description = "Amazon Kinesis Analytics SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -68111,7 +68417,7 @@ self: {
unordered-containers
];
description = "Amazon Key Management Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -68152,7 +68458,7 @@ self: {
unordered-containers
];
description = "Amazon Lake Formation SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -68193,7 +68499,7 @@ self: {
unordered-containers
];
description = "Amazon Lambda SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -68234,7 +68540,7 @@ self: {
unordered-containers
];
description = "Amazon Lex Model Building Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -68275,7 +68581,7 @@ self: {
unordered-containers
];
description = "Amazon Lex Runtime Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -68316,7 +68622,7 @@ self: {
unordered-containers
];
description = "Amazon Lex Model Building V2 SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -68357,7 +68663,7 @@ self: {
unordered-containers
];
description = "Amazon License Manager SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -68398,7 +68704,7 @@ self: {
unordered-containers
];
description = "Amazon License Manager Linux Subscriptions SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -68439,7 +68745,7 @@ self: {
unordered-containers
];
description = "Amazon License Manager User Subscriptions SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -68480,7 +68786,7 @@ self: {
unordered-containers
];
description = "Amazon Lightsail SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -68521,7 +68827,7 @@ self: {
unordered-containers
];
description = "Amazon Location Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -68562,7 +68868,7 @@ self: {
unordered-containers
];
description = "Amazon Lookout for Equipment SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -68603,7 +68909,7 @@ self: {
unordered-containers
];
description = "Amazon Lookout for Metrics SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -68644,7 +68950,7 @@ self: {
unordered-containers
];
description = "Amazon Lookout for Vision SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -68685,7 +68991,7 @@ self: {
unordered-containers
];
description = "Amazon MainframeModernization SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -68726,7 +69032,7 @@ self: {
unordered-containers
];
description = "Amazon Macie SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -68767,7 +69073,7 @@ self: {
unordered-containers
];
description = "Amazon Macie 2 SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -68808,7 +69114,7 @@ self: {
unordered-containers
];
description = "Amazon Managed Blockchain SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -68849,7 +69155,7 @@ self: {
unordered-containers
];
description = "Amazon Marketplace Commerce Analytics SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -68890,7 +69196,7 @@ self: {
unordered-containers
];
description = "Amazon Marketplace Catalog Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -68931,7 +69237,7 @@ self: {
unordered-containers
];
description = "Amazon Marketplace Entitlement Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -68972,7 +69278,7 @@ self: {
unordered-containers
];
description = "Amazon Marketplace Metering SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -69013,7 +69319,7 @@ self: {
unordered-containers
];
description = "Amazon Mechanical Turk SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -69054,7 +69360,7 @@ self: {
unordered-containers
];
description = "Amazon MediaConnect SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -69095,7 +69401,7 @@ self: {
unordered-containers
];
description = "Amazon Elemental MediaConvert SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -69136,7 +69442,7 @@ self: {
unordered-containers
];
description = "Amazon Elemental MediaLive SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -69177,7 +69483,7 @@ self: {
unordered-containers
];
description = "Amazon Elemental MediaPackage SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -69218,7 +69524,7 @@ self: {
unordered-containers
];
description = "Amazon Elemental MediaPackage VOD SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -69259,7 +69565,7 @@ self: {
unordered-containers
];
description = "Amazon Elemental MediaStore SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -69300,7 +69606,7 @@ self: {
unordered-containers
];
description = "Amazon Elemental MediaStore Data Plane SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -69341,7 +69647,7 @@ self: {
unordered-containers
];
description = "Amazon MediaTailor SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -69382,7 +69688,7 @@ self: {
unordered-containers
];
description = "Amazon MemoryDB SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -69423,7 +69729,7 @@ self: {
unordered-containers
];
description = "Amazon Application Migration Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -69464,7 +69770,7 @@ self: {
unordered-containers
];
description = "Amazon Migration Hub Refactor Spaces SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -69505,7 +69811,7 @@ self: {
unordered-containers
];
description = "Amazon Migration Hub SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -69546,7 +69852,7 @@ self: {
unordered-containers
];
description = "Amazon Migration Hub Config SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -69587,7 +69893,7 @@ self: {
unordered-containers
];
description = "Amazon Migration Hub Orchestrator SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -69628,7 +69934,7 @@ self: {
unordered-containers
];
description = "Amazon Migration Hub Strategy Recommendations SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -69669,7 +69975,7 @@ self: {
unordered-containers
];
description = "Amazon Machine Learning SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -69710,7 +70016,7 @@ self: {
unordered-containers
];
description = "Amazon Mobile SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -69751,7 +70057,7 @@ self: {
unordered-containers
];
description = "Amazon MQ SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -69847,7 +70153,7 @@ self: {
unordered-containers
];
description = "Amazon MWAA SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -69888,7 +70194,7 @@ self: {
unordered-containers
];
description = "Amazon Neptune SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -69929,7 +70235,7 @@ self: {
unordered-containers
];
description = "Amazon Network Firewall SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -69970,7 +70276,7 @@ self: {
unordered-containers
];
description = "Amazon Network Manager SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -70011,7 +70317,7 @@ self: {
unordered-containers
];
description = "Amazon NimbleStudio SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -70052,7 +70358,7 @@ self: {
unordered-containers
];
description = "Amazon CloudWatch Observability Access Manager SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -70093,7 +70399,7 @@ self: {
unordered-containers
];
description = "Amazon Omics SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -70134,7 +70440,7 @@ self: {
unordered-containers
];
description = "Amazon OpenSearch Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -70175,7 +70481,7 @@ self: {
unordered-containers
];
description = "Amazon OpenSearch Service Serverless SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -70216,7 +70522,7 @@ self: {
unordered-containers
];
description = "Amazon OpsWorks SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -70257,7 +70563,7 @@ self: {
unordered-containers
];
description = "Amazon OpsWorks CM SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -70298,7 +70604,7 @@ self: {
unordered-containers
];
description = "Amazon Organizations SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -70339,7 +70645,7 @@ self: {
unordered-containers
];
description = "Amazon Outposts SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -70380,7 +70686,7 @@ self: {
unordered-containers
];
description = "Amazon Panorama SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -70421,7 +70727,7 @@ self: {
unordered-containers
];
description = "Amazon Personalize SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -70462,7 +70768,7 @@ self: {
unordered-containers
];
description = "Amazon Personalize Events SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -70503,7 +70809,7 @@ self: {
unordered-containers
];
description = "Amazon Personalize Runtime SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -70544,7 +70850,7 @@ self: {
unordered-containers
];
description = "Amazon Performance Insights SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -70585,7 +70891,7 @@ self: {
unordered-containers
];
description = "Amazon Pinpoint SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -70626,7 +70932,7 @@ self: {
unordered-containers
];
description = "Amazon Pinpoint Email Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -70667,7 +70973,7 @@ self: {
unordered-containers
];
description = "Amazon Pinpoint SMS and Voice Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -70708,7 +71014,7 @@ self: {
unordered-containers
];
description = "Amazon Pinpoint SMS Voice V2 SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -70749,7 +71055,7 @@ self: {
unordered-containers
];
description = "Amazon EventBridge Pipes SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -70790,7 +71096,7 @@ self: {
unordered-containers
];
description = "Amazon Polly SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -70831,7 +71137,7 @@ self: {
unordered-containers
];
description = "Amazon Price List Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -70872,7 +71178,7 @@ self: {
unordered-containers
];
description = "Amazon Private 5G SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -70913,7 +71219,7 @@ self: {
unordered-containers
];
description = "Amazon Proton SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -70954,7 +71260,7 @@ self: {
unordered-containers
];
description = "Amazon QLDB SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -70995,7 +71301,7 @@ self: {
unordered-containers
];
description = "Amazon QLDB Session SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -71036,7 +71342,7 @@ self: {
unordered-containers
];
description = "Amazon QuickSight SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -71077,7 +71383,7 @@ self: {
unordered-containers
];
description = "Amazon Resource Access Manager SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -71118,7 +71424,7 @@ self: {
unordered-containers
];
description = "Amazon Recycle Bin SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -71159,7 +71465,7 @@ self: {
unordered-containers
];
description = "Amazon Relational Database Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -71200,7 +71506,7 @@ self: {
unordered-containers
];
description = "Amazon RDS DataService SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -71241,7 +71547,7 @@ self: {
unordered-containers
];
description = "Amazon Redshift SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -71282,7 +71588,7 @@ self: {
unordered-containers
];
description = "Amazon Redshift Data API Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -71323,7 +71629,7 @@ self: {
unordered-containers
];
description = "Amazon Redshift Serverless SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -71364,7 +71670,7 @@ self: {
unordered-containers
];
description = "Amazon Rekognition SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -71405,7 +71711,7 @@ self: {
unordered-containers
];
description = "Amazon Resilience Hub SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -71446,7 +71752,7 @@ self: {
unordered-containers
];
description = "Amazon Resource Explorer SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -71487,7 +71793,7 @@ self: {
unordered-containers
];
description = "Amazon Resource Groups SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -71528,7 +71834,7 @@ self: {
unordered-containers
];
description = "Amazon Resource Groups Tagging API SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -71569,7 +71875,7 @@ self: {
unordered-containers
];
description = "Amazon RoboMaker SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -71610,7 +71916,7 @@ self: {
unordered-containers
];
description = "Amazon IAM Roles Anywhere SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -71652,7 +71958,7 @@ self: {
unordered-containers
];
description = "Amazon Route 53 SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -71693,7 +71999,7 @@ self: {
unordered-containers
];
description = "Amazon Cloud Map SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -71734,7 +72040,7 @@ self: {
unordered-containers
];
description = "Amazon Route 53 Domains SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -71775,7 +72081,7 @@ self: {
unordered-containers
];
description = "Amazon Route53 Recovery Cluster SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -71816,7 +72122,7 @@ self: {
unordered-containers
];
description = "Amazon Route53 Recovery Control Config SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -71857,7 +72163,7 @@ self: {
unordered-containers
];
description = "Amazon Route53 Recovery Readiness SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -71898,7 +72204,7 @@ self: {
unordered-containers
];
description = "Amazon Route 53 Resolver SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -71939,7 +72245,7 @@ self: {
unordered-containers
];
description = "Amazon CloudWatch RUM SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -71983,7 +72289,7 @@ self: {
unordered-containers
];
description = "Amazon Simple Storage Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -72058,7 +72364,7 @@ self: {
unordered-containers
];
description = "Amazon Simple Storage Service SDK - Client-Side Encryption";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -72144,7 +72450,7 @@ self: {
unordered-containers
];
description = "Amazon S3 on Outposts SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -72185,7 +72491,7 @@ self: {
unordered-containers
];
description = "Amazon SageMaker Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -72226,7 +72532,7 @@ self: {
unordered-containers
];
description = "Amazon Augmented AI Runtime SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -72267,7 +72573,7 @@ self: {
unordered-containers
];
description = "Amazon Sagemaker Edge Manager SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -72308,7 +72614,7 @@ self: {
unordered-containers
];
description = "Amazon SageMaker Feature Store Runtime SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -72349,7 +72655,7 @@ self: {
unordered-containers
];
description = "Amazon SageMaker geospatial capabilities SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -72390,7 +72696,7 @@ self: {
unordered-containers
];
description = "Amazon SageMaker Metrics Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -72431,7 +72737,7 @@ self: {
unordered-containers
];
description = "Amazon SageMaker Runtime SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -72472,7 +72778,7 @@ self: {
unordered-containers
];
description = "Amazon Savings Plans SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -72513,7 +72819,7 @@ self: {
unordered-containers
];
description = "Amazon EventBridge Scheduler SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -72554,7 +72860,7 @@ self: {
unordered-containers
];
description = "Amazon Schemas SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -72595,7 +72901,7 @@ self: {
unordered-containers
];
description = "Amazon SimpleDB SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -72636,7 +72942,7 @@ self: {
unordered-containers
];
description = "Amazon Secrets Manager SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -72677,7 +72983,7 @@ self: {
unordered-containers
];
description = "Amazon SecurityHub SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -72718,7 +73024,7 @@ self: {
unordered-containers
];
description = "Amazon Security Lake SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -72759,7 +73065,7 @@ self: {
unordered-containers
];
description = "Amazon ServerlessApplicationRepository SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -72800,7 +73106,7 @@ self: {
unordered-containers
];
description = "Amazon Quotas SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -72841,7 +73147,7 @@ self: {
unordered-containers
];
description = "Amazon Service Catalog SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -72882,7 +73188,7 @@ self: {
unordered-containers
];
description = "Amazon Service Catalog App Registry SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -72923,7 +73229,7 @@ self: {
unordered-containers
];
description = "Amazon Simple Email Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -72964,7 +73270,7 @@ self: {
unordered-containers
];
description = "Amazon Simple Email Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -73005,7 +73311,7 @@ self: {
unordered-containers
];
description = "Amazon Shield SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -73046,7 +73352,7 @@ self: {
unordered-containers
];
description = "Amazon Signer SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -73087,7 +73393,7 @@ self: {
unordered-containers
];
description = "Amazon SimSpace Weaver SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -73128,7 +73434,7 @@ self: {
unordered-containers
];
description = "Amazon Server Migration Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -73169,7 +73475,7 @@ self: {
unordered-containers
];
description = "Amazon Pinpoint SMS and Voice Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -73210,7 +73516,7 @@ self: {
unordered-containers
];
description = "Amazon Snow Device Management SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -73251,7 +73557,7 @@ self: {
unordered-containers
];
description = "Amazon Import/Export Snowball SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -73292,7 +73598,7 @@ self: {
unordered-containers
];
description = "Amazon Simple Notification Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -73333,7 +73639,7 @@ self: {
unordered-containers
];
description = "Amazon Simple Queue Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -73374,7 +73680,7 @@ self: {
unordered-containers
];
description = "Amazon Simple Systems Manager (SSM) SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -73415,7 +73721,7 @@ self: {
unordered-containers
];
description = "Amazon Systems Manager Incident Manager Contacts SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -73456,7 +73762,7 @@ self: {
unordered-containers
];
description = "Amazon Systems Manager Incident Manager SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -73497,7 +73803,7 @@ self: {
unordered-containers
];
description = "Amazon Systems Manager for SAP SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -73538,7 +73844,7 @@ self: {
unordered-containers
];
description = "Amazon Single Sign-On SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -73579,7 +73885,7 @@ self: {
unordered-containers
];
description = "Amazon Single Sign-On Admin SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -73620,7 +73926,7 @@ self: {
unordered-containers
];
description = "Amazon SSO OIDC SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -73661,7 +73967,7 @@ self: {
unordered-containers
];
description = "Amazon Step Functions SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -73702,7 +74008,7 @@ self: {
unordered-containers
];
description = "Amazon Storage Gateway SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -73743,7 +74049,7 @@ self: {
unordered-containers
];
description = "Amazon Security Token Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -73784,7 +74090,7 @@ self: {
unordered-containers
];
description = "Amazon Support SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -73825,7 +74131,7 @@ self: {
unordered-containers
];
description = "Amazon Support App SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -73866,7 +74172,7 @@ self: {
unordered-containers
];
description = "Amazon Simple Workflow Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -73907,7 +74213,7 @@ self: {
unordered-containers
];
description = "Amazon Synthetics SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -73964,7 +74270,7 @@ self: {
yaml
];
description = "Common functionality for Amazonka library test-suites";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -74005,7 +74311,7 @@ self: {
unordered-containers
];
description = "Amazon Textract SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -74046,7 +74352,7 @@ self: {
unordered-containers
];
description = "Amazon Timestream Query SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -74087,7 +74393,7 @@ self: {
unordered-containers
];
description = "Amazon Timestream Write SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -74128,7 +74434,7 @@ self: {
unordered-containers
];
description = "Amazon Transcribe Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -74169,7 +74475,7 @@ self: {
unordered-containers
];
description = "Amazon Transfer Family SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -74210,7 +74516,7 @@ self: {
unordered-containers
];
description = "Amazon Translate SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -74251,7 +74557,7 @@ self: {
unordered-containers
];
description = "Amazon Voice ID SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -74292,7 +74598,7 @@ self: {
unordered-containers
];
description = "Amazon WAF SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -74333,7 +74639,7 @@ self: {
unordered-containers
];
description = "Amazon WAF Regional SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -74374,7 +74680,7 @@ self: {
unordered-containers
];
description = "Amazon WAFV2 SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -74415,7 +74721,7 @@ self: {
unordered-containers
];
description = "Amazon Well-Architected Tool SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -74456,7 +74762,7 @@ self: {
unordered-containers
];
description = "Amazon Connect Wisdom Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -74497,7 +74803,7 @@ self: {
unordered-containers
];
description = "Amazon WorkDocs SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -74538,7 +74844,7 @@ self: {
unordered-containers
];
description = "Amazon WorkLink SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -74579,7 +74885,7 @@ self: {
unordered-containers
];
description = "Amazon WorkMail SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -74620,7 +74926,7 @@ self: {
unordered-containers
];
description = "Amazon WorkMail Message Flow SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -74661,7 +74967,7 @@ self: {
unordered-containers
];
description = "Amazon WorkSpaces SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -74702,7 +75008,7 @@ self: {
unordered-containers
];
description = "Amazon WorkSpaces Web SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -74743,7 +75049,7 @@ self: {
unordered-containers
];
description = "Amazon X-Ray SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -76572,8 +76878,8 @@ self: {
pname = "ansi-terminal-game";
version = "1.9.3.0";
sha256 = "1yy7hzdcawdmwl8wqzabbamzjdg260xbwryj0hdjn7b0n6qlqymk";
- revision = "3";
- editedCabalFile = "0m4df8a2p18j29zsgffnyf69hjkyam3rg3xc4zvmxafidj877ykk";
+ revision = "4";
+ editedCabalFile = "0ccd308nkvwihg81p14bjzliaapig5bw697afmvivsxy400yf4x3";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -76801,7 +77107,7 @@ self: {
HUnit
];
description = "Yet another alternative Prelude for Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -76985,7 +77291,7 @@ self: {
time
];
description = "Simple job/task/event scheduler/cronjob";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -77059,7 +77365,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Please see the README on Github at ";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -77088,7 +77394,7 @@ self: {
text
];
description = "Please see the README on Github at ";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -77163,7 +77469,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Please see the README on Github at ";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -77215,7 +77521,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Please see the README on Github at ";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -77260,7 +77566,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Please see the README on Github at ";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -77325,7 +77631,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Please see the README on Github at ";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -77370,7 +77676,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Please see the README on Github at ";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -77463,7 +77769,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Please see the README on Github at ";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -77553,7 +77859,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Please see the README on Github at ";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -77612,7 +77918,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Please see the README on Github at ";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -77690,7 +77996,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Please see the README on Github at ";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -77726,7 +78032,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Please see the README on Github at ";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -78001,7 +78307,7 @@ self: {
unordered-containers
];
description = "Utility functions commonly used while solving Advent of Code puzzles";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -78028,7 +78334,7 @@ self: {
ghc-prim
];
description = "prelude for Algebra of Programming";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -78331,7 +78637,7 @@ self: {
vector
];
description = "Adaptation of the apecs library for the effectful ecosystem";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -80399,7 +80705,7 @@ self: {
sha256 = "0bkcwrxz313825vvm0yspj7vw2zmky8g2vq1yb9s8wgxzm4b7m8n";
libraryHaskellDepends = [ base ];
description = "A class for things that can be applied";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -80464,7 +80770,7 @@ self: {
sha256 = "0jr81m0mksfxbvzjs3c73kilr09w4gh7zv1amdx9xcvq5zb96imd";
libraryHaskellDepends = [ base ];
description = "Generalized logic operations for Applicative and Alternative functors";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -80591,8 +80897,8 @@ self: {
pname = "apply-merge";
version = "0.1.1.0";
sha256 = "1snm9m35r3px9vgn64ygcqq37ay6jvwc5jsi3s62rxrh8biy8ir8";
- revision = "5";
- editedCabalFile = "1bcpcp6cg50bm4p7snbl8z9vrmps2qzfhzf3v8rk3xlcwfmhvjw0";
+ revision = "6";
+ editedCabalFile = "1b98vn8j14mm4hxxfd34h2mzjjmraxg199z234q7gdgafwwc19ix";
libraryHaskellDepends = [
base
containers
@@ -80623,7 +80929,7 @@ self: {
vector
];
description = "Lift a binary, non-decreasing function onto ordered lists and order the output";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -80720,7 +81026,7 @@ self: {
unix-compat
];
description = "Perform refactorings specified by the refact library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "refactor";
}
) { };
@@ -81277,7 +81583,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Datadog client for Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -81311,7 +81617,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "LRU cache based on STM";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -81362,7 +81668,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Counter library for submitting metrics to a backend such as datadog";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -81411,7 +81717,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Simple logging library";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "arbor-monad-logger-example";
broken = true;
@@ -81472,7 +81778,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Core metric library for publishing metrics";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -81544,7 +81850,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Metric library backend for datadog";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -81578,7 +81884,7 @@ self: {
text
];
description = "Convenience types and functions for postgresql-simple";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -81624,6 +81930,8 @@ self: {
pname = "arbtt";
version = "0.12.0.3";
sha256 = "1wgc17fwnsqff8amwvv6jymhwjqrw653simv6gyxx89s1cla954d";
+ revision = "1";
+ editedCabalFile = "1kbma0ssjg8pd1rk9vi2bi7gy0fkfqpd6syh9271z350avgiwhf9";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -81839,7 +82147,7 @@ self: {
text
];
description = "Distribute hackage packages to archlinux";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -81917,7 +82225,7 @@ self: {
time
];
description = "Arch Linux official and AUR web interface binding";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
maintainers = [ lib.maintainers.berberman ];
}
) { };
@@ -82484,7 +82792,7 @@ self: {
transformers
];
description = "Parse and render JSON";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "argo";
broken = true;
@@ -82885,7 +83193,7 @@ self: {
unix
];
description = "Run docker-compose with help from Nix/NixOS";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
mainProgram = "arion";
maintainers = [ lib.maintainers.roberth ];
}
@@ -83417,7 +83725,7 @@ self: {
tasty-hunit
];
description = "Builders for arrays";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -83452,7 +83760,7 @@ self: {
tasty-quickcheck
];
description = "Lists of chunks";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -83682,7 +83990,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Haskell bindings to the ArrayFire general-purpose GPU library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -83719,7 +84027,7 @@ self: {
tasty-smallcheck
];
description = "Memory-efficient ArrayList implementation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -83970,7 +84278,7 @@ self: {
text
];
description = "Basic types and instances for Valve's Artifact Card-set API";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -84216,7 +84524,7 @@ self: {
text
];
description = "The ASCII character set and encoding";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -84276,7 +84584,7 @@ self: {
hspec
];
description = "ASCII letter case";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -84306,7 +84614,7 @@ self: {
hspec
];
description = "ASCII character without an upper/lower case distinction";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -84334,7 +84642,7 @@ self: {
hspec
];
description = "A Char type representing an ASCII character";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -84410,7 +84718,7 @@ self: {
hspec
];
description = "ASCII character groups";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -84482,7 +84790,7 @@ self: {
text
];
description = "ASCII representations of numbers";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -84508,7 +84816,7 @@ self: {
hedgehog
];
description = "Various categorizations of ASCII characters";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -84634,7 +84942,7 @@ self: {
text
];
description = "Representing ASCII with refined supersets";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -84709,7 +85017,7 @@ self: {
text
];
description = "Template Haskell support for ASCII";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -85107,7 +85415,7 @@ self: {
hspec-discover
];
description = "Library for creating and querying segmented feeds";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "asif";
broken = true;
@@ -85246,7 +85554,7 @@ self: {
text-short
];
description = "ASN.1 BER Encode and Decode";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -85811,7 +86119,7 @@ self: {
weigh
];
description = "A solution to the assignment problem";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -85851,7 +86159,7 @@ self: {
editedCabalFile = "0pqq27nzpsabvklgbldqls37mcl2hzs19qy6balsqk7b3x6rpcqa";
libraryHaskellDepends = [ base ];
description = "swap and assoc: Symmetric and Semigroupy Bifunctors";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -85878,7 +86186,7 @@ self: {
hedgehog
];
description = "Association lists (lists of tuples)";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -85910,7 +86218,7 @@ self: {
ListLike
];
description = "Association lists (list-like collections of tuples)";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -87255,7 +87563,7 @@ self: {
xml-types
];
description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287).";
- license = lib.licenses.cc0;
+ license = lib.licensesSpdx."CC0-1.0";
}
) { };
@@ -87295,8 +87603,8 @@ self: {
}:
mkDerivation {
pname = "atomic-counter";
- version = "0.1.2.3";
- sha256 = "016gyi2nzgr0lyd3g99snjjh49i2hgs8kbrjprn4439w3cwn6jyf";
+ version = "0.1.2.4";
+ sha256 = "0bzccg6qcd4b544znwzrahpwnbawn3cqf8h22qd0bnk6vkgfh0di";
libraryHaskellDepends = [ base ];
testHaskellDepends = [
async
@@ -87316,7 +87624,7 @@ self: {
tasty-quickcheck
];
description = "Mutable counters that can be modified with atomic operatinos";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -87362,7 +87670,7 @@ self: {
text
];
description = "Type-safe, composable CSS utility functions. Inspired by Tailwindcss and Elm-UI";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -87430,7 +87738,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Generalizations of atomicModifyIORef";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -87453,7 +87761,7 @@ self: {
primitive
];
description = "A safe approach to CAS and other atomic ops in Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -87669,7 +87977,7 @@ self: {
text
];
description = "Interface to automated theorem provers";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -87778,7 +88086,7 @@ self: {
tasty-bench
];
description = "Faster integer division and modulus operations";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -88078,6 +88386,43 @@ self: {
}
) { };
+ attic = callPackage (
+ {
+ mkDerivation,
+ aeson,
+ base,
+ http-api-data,
+ process,
+ relude,
+ safecopy,
+ servant,
+ template-haskell,
+ text,
+ which,
+ }:
+ mkDerivation {
+ pname = "attic";
+ version = "0.1.0.0";
+ sha256 = "1hy7dyw4vks47awx210iq8vcjxxc1d9vkfqf3src7pvs9yqb4amx";
+ libraryHaskellDepends = [
+ aeson
+ base
+ http-api-data
+ process
+ relude
+ safecopy
+ servant
+ template-haskell
+ text
+ which
+ ];
+ description = "Haskell bindings for Nix attic cache";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }
+ ) { };
+
attic-schedule = callPackage (
{
mkDerivation,
@@ -88424,7 +88769,7 @@ self: {
vector
];
description = "Parsing of aeson's Value with attoparsec";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -88565,7 +88910,7 @@ self: {
uuid
];
description = "Parsers for the standard Haskell data types";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -88665,7 +89010,7 @@ self: {
text
];
description = "Use Attoparsec to parse framed protocol byte streams";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -88767,8 +89112,8 @@ self: {
}:
mkDerivation {
pname = "attoparsec-isotropic";
- version = "0.14.5";
- sha256 = "1bvxy2gydz3kv0fbhp77bwk75l73kz7qc4aa7wlldga90f8y3vhj";
+ version = "0.14.6";
+ sha256 = "0jaw0qqaqkgysaqppg0a89ydrv6cvci7c0synckpbjwbr222zvvm";
libraryHaskellDepends = [
array
base
@@ -88833,7 +89178,7 @@ self: {
];
doHaddock = false;
description = "right-to-left parser backward compatible with attoparsec";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -88962,7 +89307,7 @@ self: {
text
];
description = "Conveniently run Attoparsec parsers";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -89040,7 +89385,7 @@ self: {
time
];
description = "Attoparsec parsers of time";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -89418,7 +89763,7 @@ self: {
tasty-hunit
];
description = "Access metadata from the Arch Linux User Repository";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -89555,7 +89900,7 @@ self: {
versions
];
description = "A secure package manager for Arch Linux and the AUR";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
mainProgram = "aura";
}
@@ -89867,7 +90212,7 @@ self: {
tasty-hunit
];
description = "Case splitting plugin";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -90265,7 +90610,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "Automatically re-export modules";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "autoexporter";
}
) { };
@@ -90357,7 +90702,7 @@ self: {
tasty-quickcheck
];
description = "automata";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -90428,7 +90773,7 @@ self: {
transformers
];
description = "Effectful streams and automata in coalgebraic encoding";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -90625,7 +90970,7 @@ self: {
filepath
];
description = "Custom Setup to automate package modules discovery";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -91177,6 +91522,8 @@ self: {
pname = "avl-static";
version = "0.1.0.0";
sha256 = "13rl5wrpmbb4c0zsaymivi4d9qg2wl4lfw4nvkd81naqm3vskc10";
+ revision = "1";
+ editedCabalFile = "1rwf1m5v9hy3vrfy3ibgvahcl5zpip65d6pidmwg954lclrbm1gh";
libraryHaskellDepends = [ base ];
testHaskellDepends = [
base
@@ -91186,8 +91533,6 @@ self: {
];
description = "A compile-time balanced AVL tree";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}
) { };
@@ -91356,7 +91701,7 @@ self: {
vector
];
description = "Avro serialization support for Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -91443,7 +91788,7 @@ self: {
unordered-containers
];
description = "Tool for decoding avro";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "avro-decode";
broken = true;
@@ -91746,7 +92091,7 @@ self: {
vector
];
description = "Export grades from AWS Academy to different formats";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "aws-academy-grade-exporter";
broken = true;
@@ -91791,7 +92136,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Types and optics for manipulating Amazon Resource Names (ARNs)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -91848,7 +92193,7 @@ self: {
neat-interpolation
];
description = "Generate signed cookies for AWS CloudFront";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "aws-cloudfront-signed-cookies";
broken = true;
@@ -92829,7 +93174,7 @@ self: {
text
];
description = "Haskell on AWS Lambda Runtime API";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "example-lambda";
broken = true;
@@ -93271,7 +93616,7 @@ self: {
validation
];
description = "Fetch data from AWS Secrets Manager";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -93613,7 +93958,7 @@ self: {
text
];
description = "Extract recent daily AWS costs";
- license = lib.licenses.gpl2Only;
+ license = lib.licensesSpdx."GPL-2.0-only";
mainProgram = "aws-spend-summary";
maintainers = [ lib.maintainers.danielrolls ];
}
@@ -93871,7 +94216,7 @@ self: {
text
];
description = "Extract recent daily AWS costs";
- license = lib.licenses.gpl2Only;
+ license = lib.licensesSpdx."GPL-2.0-only";
hydraPlatforms = lib.platforms.none;
mainProgram = "awsspendsummary";
broken = true;
@@ -94199,7 +94544,7 @@ self: {
urbit-hob
];
description = "Interact with Azimuth from Haskell";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -94250,7 +94595,7 @@ self: {
sparse-set
];
description = "A modular game engine and Entity-Component-System (ECS) for Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -94275,7 +94620,7 @@ self: {
mtl
];
description = "A type-safe and friendly Entity-Component-System (ECS) for Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -94311,7 +94656,7 @@ self: {
QuickCheck
];
description = "A type-safe and friendly Entity-Component-System (ECS) for Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -94344,7 +94689,7 @@ self: {
text
];
description = "A type-safe and friendly Entity-Component-System (ECS) for Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -94381,7 +94726,7 @@ self: {
text
];
description = "A type-safe and friendly Entity-Component-System (ECS) for Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -94417,7 +94762,7 @@ self: {
text
];
description = "A type-safe and friendly Entity-Component-System (ECS) for Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -94443,7 +94788,7 @@ self: {
mtl
];
description = "A type-safe and friendly Entity-Component-System (ECS) for Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -94568,7 +94913,7 @@ self: {
wreq
];
description = "send email with microsoft azure";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -94643,7 +94988,7 @@ self: {
libraryToolDepends = [ proto-lens-protoc ];
testHaskellDepends = [ base ];
description = "Azure Functions Worker";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -95037,7 +95382,7 @@ self: {
yaml
];
description = "A tool and library for building virtual machine images";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "b9c";
}
@@ -95121,7 +95466,7 @@ self: {
tasty-hunit
];
description = "Library for generating parsers from ABNF";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -95355,7 +95700,7 @@ self: {
unix
];
description = "Backstop a target directory by source directories";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
mainProgram = "backstop";
broken = true;
@@ -95637,7 +95982,7 @@ self: {
testToolDepends = [ hspec-discover ];
doHaddock = false;
description = "Text layout engine built on top of HarfBuzz";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -96116,7 +96461,7 @@ self: {
time
];
description = "German bank holidays and public holidays";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -96286,7 +96631,7 @@ self: {
hspec-discover
];
description = "Barbies with layered clothes";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -96315,7 +96660,7 @@ self: {
base
];
description = "Create strippable HKD via TH";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -96643,7 +96988,7 @@ self: {
ghc-prim
];
description = "Core data structures and operations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -96709,7 +97054,7 @@ self: {
editedCabalFile = "03x7hrd4xv9xa0v72srn19v402nwws93n7jgakliabfshacd4pp3";
libraryHaskellDepends = [ base ];
description = "Backport of 'Foreign.C.ConstPtr'";
- license = lib.licenses.agpl3Only;
+ license = lib.licensesSpdx."AGPL-3.0-only";
}
) { };
@@ -96751,6 +97096,8 @@ self: {
pname = "base-encoding";
version = "0.3.0.0";
sha256 = "1lcqg4wpbry3x165j8rsjbpj1mzd7bl0917hjv0jhvmh5z3wnas8";
+ revision = "1";
+ editedCabalFile = "0m935gpy93dqf2vks0jx7g444p8a6abrkxnhsh3dv7ywkf2b9ns5";
libraryHaskellDepends = [
base
base16-bytestring
@@ -96760,7 +97107,7 @@ self: {
text
];
description = "RFC4648 Binary-to-text encodings (e.g. base64)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -96818,7 +97165,7 @@ self: {
libraryHaskellDepends = [ base ];
doHaddock = false;
description = "\"base\" package sans \"Prelude\" module";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -96858,7 +97205,7 @@ self: {
sha256 = "1lqxa8lhnhiyxkqcwq82a8g2sizhagy3l0z7x57xrmn9y81sy241";
libraryHaskellDepends = [ base ];
description = "Featureful preludes formed solely from the \"base\" package";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -96927,7 +97274,7 @@ self: {
text
];
description = "Fast RFC 4648-compliant Base16 encoding";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -97054,7 +97401,7 @@ self: {
text
];
description = "Fast RFC 4648-compliant Base32 encoding";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -97359,7 +97706,7 @@ self: {
wide-word
];
description = "Base62 encoding and decoding";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -97471,7 +97818,7 @@ self: {
random
];
description = "Base64 encoding of byte sequences";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -97700,7 +98047,7 @@ self: {
sha256 = "1s4nacp3ripdn895c863hmnpaqmbkiisjp3y45v1q28qdjy052qv";
libraryHaskellDepends = [ base ];
description = "alternative prelude";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -97972,7 +98319,7 @@ self: {
sha256 = "0dgckarxy6lyaq2m02yisv41k7q0k40xph7v039rxx71bgih196d";
libraryHaskellDepends = [ base ];
description = "Basic implementation of General Problem Solver algorithm";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -98095,7 +98442,7 @@ self: {
transformers
];
description = "Modules for primitive types";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -98948,7 +99295,7 @@ self: {
transformers
];
description = "Library for parsing, constructing, and printing BBCode";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -99738,8 +100085,8 @@ self: {
pname = "beam-core";
version = "0.10.4.0";
sha256 = "1zxqyxxyid186s86lfw0sq030jckh83j3rwj6ibx4wg3flslk515";
- revision = "1";
- editedCabalFile = "1zwvxqfrmwnvsdj959ir6pwy3bbssyzgngh23kz40965pazxg8g6";
+ revision = "2";
+ editedCabalFile = "0fmbypv1rpgfvfdpn1my8xvx3hwg67s1sijfm1xilra5f8b0xwrx";
libraryHaskellDepends = [
aeson
base
@@ -99783,6 +100130,7 @@ self: {
large-generics,
large-records,
microlens,
+ optics-core,
record-hasfield,
sqlite-simple,
tasty,
@@ -99792,8 +100140,8 @@ self: {
}:
mkDerivation {
pname = "beam-large-records";
- version = "0.1.2";
- sha256 = "193r7r9rnbqn3k8kq6s80dq8spvgbbnm9kn80xa7irp0qb2q25p6";
+ version = "0.1.3";
+ sha256 = "1bzxdzqh12m3l4q3whcpc3ig22z6jvqphfw28mscyam4vj9zwm21";
libraryHaskellDepends = [
base
beam-core
@@ -99807,7 +100155,7 @@ self: {
ghc-prim
large-generics
large-records
- microlens
+ optics-core
record-hasfield
sqlite-simple
tasty
@@ -99816,8 +100164,7 @@ self: {
time
];
description = "Integration of large-records with beam-core";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -99851,8 +100198,8 @@ self: {
pname = "beam-migrate";
version = "0.5.3.2";
sha256 = "05cz2gh9r00dr6knigq9v7zcdmpk2b19z0pg79wimkcxa2fblb5z";
- revision = "1";
- editedCabalFile = "0v1hx1pxwb7xxqdcdqyj8fv9liiz44ak2wmi7my267amxdx2n6h2";
+ revision = "4";
+ editedCabalFile = "1xafh4qb225w32ls2c89cdk13fvfjn69052ja9fm43vgvhxrjjbs";
libraryHaskellDepends = [
aeson
base
@@ -100066,8 +100413,8 @@ self: {
pname = "beam-sqlite";
version = "0.5.4.1";
sha256 = "1f5yjsx7zfbfbxs3xd64rwn2m3vjffrbdn5xadhm1axhghi6srki";
- revision = "1";
- editedCabalFile = "0igd6nzypnnpswpybn87j7vzgy2cbgb4l19phimjdacgdjsvb4nf";
+ revision = "2";
+ editedCabalFile = "03j11sgmsaz80qvpb1r4j6zqdwya9gyi4rmlbhjl13wn3dzsf420";
libraryHaskellDepends = [
aeson
attoparsec
@@ -100104,6 +100451,72 @@ self: {
}
) { };
+ beam-sqlite_0_5_5_0 = callPackage (
+ {
+ mkDerivation,
+ aeson,
+ attoparsec,
+ base,
+ beam-core,
+ beam-migrate,
+ bytestring,
+ direct-sqlite,
+ 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.5.0";
+ sha256 = "0shybfbix30mir99138frswlbd768s5yp6r29jsp6ndgc2k7s6sr";
+ libraryHaskellDepends = [
+ aeson
+ attoparsec
+ base
+ beam-core
+ beam-migrate
+ bytestring
+ direct-sqlite
+ 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;
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
beam-th = callPackage (
{
mkDerivation,
@@ -100247,7 +100660,7 @@ self: {
word8
];
description = "Low-level Haskell bindings to the BearLibTerminal graphics library";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "omni";
broken = true;
@@ -100372,7 +100785,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "bech32";
broken = true;
@@ -100407,7 +100820,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Template Haskell extensions to the Bech32 library";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -100755,7 +101168,7 @@ self: {
vector
];
description = "Bencode encoding and decoding library";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -101028,7 +101441,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Bencodex reader/writer for Haskell";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -101086,7 +101499,7 @@ self: {
ghc-prim
];
description = "A library for encoding and decoding of BEncode data";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -101227,7 +101640,7 @@ self: {
hspec
];
description = "Simplify tests where Either or Maybe types are returned from monadic code";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -101766,8 +102179,8 @@ self: {
pname = "bhoogle";
version = "0.1.4.4";
sha256 = "1z19h0jgnipj16rqbrflcjnqaslafq9bvwkyg8q0il76q7s4wyxa";
- revision = "2";
- editedCabalFile = "1kpzvlzydrfqjhmpjirb51xhnwircdcnmhbn82nvnvm5s4h0pajd";
+ revision = "4";
+ editedCabalFile = "05qw335svzyklx9pf70kv1vlgs4q4rr9d4jylbilay5279qmydc2";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -101983,7 +102396,7 @@ self: {
transformers
];
description = "Make instance constraints bidirectional";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -102614,7 +103027,7 @@ self: {
some
];
description = "Bin: binary natural numbers";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
}
) { };
@@ -102753,7 +103166,7 @@ self: {
zlib
];
description = "Binary serialisation for Haskell values using lazy ByteStrings";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -103168,7 +103581,7 @@ self: {
vector
];
description = "Orphan instances for binary";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -103337,7 +103750,7 @@ self: {
tasty-quickcheck
];
description = "An efficient but limited parser API specialised to bytestrings";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -103757,7 +104170,7 @@ self: {
unordered-containers
];
description = "Tagged binary serialisation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -103870,7 +104283,7 @@ self: {
binary
];
description = "VarInt encoding/decoding via Data.Binary";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -103896,7 +104309,7 @@ self: {
testHaskellDepends = [ base ];
doHaddock = false;
description = "Haskell bindings to binaryen";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -103977,7 +104390,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Variable binding for abstract syntax tree";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -104156,8 +104569,8 @@ self: {
}:
mkDerivation {
pname = "bindings-GLFW";
- version = "3.3.9.2";
- sha256 = "1ydlxnxgh2m9xlsizimchdf8iyr78w9dx8165ni0cwi1szw8955x";
+ version = "3.3.9.3";
+ sha256 = "098zb6j9p8zinr8pjwjyy5qq250rkvbvqb3adczncfcx5ypx0flv";
libraryHaskellDepends = [
base
bindings-DSL
@@ -104440,8 +104853,6 @@ self: {
description = "Low level bindings to DirectFB";
license = lib.licenses.bsd3;
badPlatforms = lib.platforms.darwin;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}
) { inherit (pkgs) directfb; };
@@ -104847,7 +105258,7 @@ self: {
bindings-DSL
];
description = "Low level bindings to libpci";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -105139,7 +105550,7 @@ self: {
];
libraryPkgconfigDepends = [ portaudio ];
description = "Low-level bindings to portaudio library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { inherit (pkgs) portaudio; };
@@ -106317,7 +106728,7 @@ self: {
tasty-hunit
];
description = "BIP-0032: Hierarchical Deterministic Wallets for Bitcoin and other cryptocurrencies";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -106489,7 +106900,7 @@ self: {
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "Birds of Paradise";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -106819,7 +107230,7 @@ self: {
toolshed
];
description = "Plays chess";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -107035,7 +107446,7 @@ self: {
tasty-hunit
];
description = "Bitcoin address generation and rendering. Parsing coming soon.";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -107244,7 +107655,7 @@ self: {
text
];
description = "BIP 158 compact block filters";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -107279,7 +107690,7 @@ self: {
time
];
description = "Bitcoin hash primitives";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -107387,7 +107798,7 @@ self: {
tasty-hunit
];
description = "Bitcoin keys";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -107677,7 +108088,7 @@ self: {
unordered-containers
];
description = "Resources for working with miniscript, and script descriptors";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -107829,7 +108240,7 @@ self: {
text
];
description = "A library for working with bitcoin-core regtest networks";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "bitcoind-rpc-explorer";
}
@@ -107878,7 +108289,7 @@ self: {
transformers
];
description = "A streamlined interface to bitcoin core using Haskoin types and Servant";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -107910,7 +108321,7 @@ self: {
];
testToolDepends = [ sydtest-discover ];
description = "Generic and easy to use haskell bitfields";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -108027,6 +108438,28 @@ self: {
}
) { };
+ bitmasks = callPackage (
+ {
+ mkDerivation,
+ base,
+ hspec,
+ QuickCheck,
+ }:
+ mkDerivation {
+ pname = "bitmasks";
+ version = "0";
+ sha256 = "0wanpwhi4d5lpsa6rrgw45i7hcy0xgrjlqbf3ij0vic601a19gny";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base
+ hspec
+ QuickCheck
+ ];
+ description = "Bitmasks for efficient storing of boolean flags";
+ license = lib.licensesSpdx."BSD-3-Clause";
+ }
+ ) { };
+
bits = callPackage (
{
mkDerivation,
@@ -108233,7 +108666,7 @@ self: {
vector
];
description = "Useful bitwise operations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -108275,7 +108708,7 @@ self: {
hspec
];
description = "Showing data as strings of 0 and 1";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -108470,7 +108903,7 @@ self: {
bytestring
];
description = "Lazy bit strings";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -108881,7 +109314,7 @@ self: {
text
];
description = "A lousy Prelude replacement by a lousy dude";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -108906,7 +109339,7 @@ self: {
text
];
description = "A lousy Prelude replacement by a lousy dude";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -109266,7 +109699,7 @@ self: {
criterion
];
description = "A library providing BLAKE2";
- license = lib.licenses.unlicense;
+ license = lib.licensesSpdx."Unlicense";
}
) { };
@@ -109293,7 +109726,7 @@ self: {
tasty-hunit
];
description = "BLAKE3 hashing algorithm";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
platforms = lib.platforms.x86;
}
) { };
@@ -109803,7 +110236,7 @@ self: {
text
];
description = "blaze-html backend for colonnade";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -110518,7 +110951,7 @@ self: {
text
];
description = "An HTML generator for Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -110657,7 +111090,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "API definitions for blockfrost.io";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -110711,7 +111144,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "blockfrost.io basic client";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
maintainers = [ lib.maintainers.sorki ];
}
) { };
@@ -110759,7 +111192,7 @@ self: {
text
];
description = "blockfrost.io common client definitions / instances";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -110792,7 +111225,7 @@ self: {
time
];
description = "blockfrost.io pretty-printing utilities";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -110909,7 +111342,7 @@ self: {
];
doHaddock = false;
description = "Perform batches of disk I/O operations";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -110933,8 +111366,8 @@ self: {
}:
mkDerivation {
pname = "blockio-uring";
- version = "0.1.0.1";
- sha256 = "1vhzi5ad162vdnn13444rf729302zqb2ikfmlb4i6k27pp0z1w58";
+ version = "0.1.0.2";
+ sha256 = "1kal4vrygj12a53m9bavdbffsyqmh7m73vr62z2rz3y0yq3wxj3z";
libraryHaskellDepends = [
base
primitive
@@ -110963,7 +111396,7 @@ self: {
];
benchmarkPkgconfigDepends = [ liburing ];
description = "Perform batches of asynchronous disk IO operations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -111116,11 +111549,11 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Elasticsearch client library for Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
- bloodhound_0_24_0_0 = callPackage (
+ bloodhound_0_26_0_0 = callPackage (
{
mkDerivation,
aeson,
@@ -111158,8 +111591,8 @@ self: {
}:
mkDerivation {
pname = "bloodhound";
- version = "0.24.0.0";
- sha256 = "0zzpf3y6ccc5bwlxbcw2lc2qlcrllqs5ymd8kd19mmhgjkab8ycz";
+ version = "0.26.0.0";
+ sha256 = "0sxs7r4h7j3mv9z2z5p2fryns0m759kgwbpc3p9qnb3vr3c8fq61";
libraryHaskellDepends = [
aeson
base
@@ -111211,7 +111644,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Elasticsearch client library for Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -111310,7 +111743,7 @@ self: {
hedgehog
];
description = "visual bloom filter for neotrellis m4 output";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "bloohm";
broken = true;
@@ -111348,7 +111781,7 @@ self: {
test-framework-quickcheck2
];
description = "Pure and impure Bloom Filter implementations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -111401,7 +111834,7 @@ self: {
];
doHaddock = false;
description = "Classic and block-style bloom filters";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -111775,27 +112208,11 @@ self: {
{ mkDerivation, bluefin-internal }:
mkDerivation {
pname = "bluefin";
- version = "0.0.16.0";
- sha256 = "12mvcawmm1b2n429lml86jqmnsha74nd6v45gd8sk288h9p4g3ks";
+ version = "0.0.17.1";
+ sha256 = "17vlgidjmz7dyqllfwc9q6r2xvmjhj7w6wwyxrc2xpgpg7jbklm2";
libraryHaskellDepends = [ bluefin-internal ];
description = "The Bluefin effect system";
- license = lib.licenses.mit;
- maintainers = [ lib.maintainers.maralorn ];
- }
- ) { };
-
- 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;
+ license = lib.licensesSpdx."MIT";
maintainers = [ lib.maintainers.maralorn ];
}
) { };
@@ -111812,8 +112229,8 @@ self: {
}:
mkDerivation {
pname = "bluefin-algae";
- version = "0.1.0.1";
- sha256 = "1mf7sfa6fj18sdbi78imxr7p90m4aqsi22c4pk1g7spb1wgp9aw5";
+ version = "0.1.0.2";
+ sha256 = "02g513vqn052qd41zm9brw8lf1ic4135mi8kr3s4w0721vm4nkhh";
libraryHaskellDepends = [
base
bluefin
@@ -111823,13 +112240,15 @@ self: {
base
bluefin
tasty
- tasty-bench
tasty-hunit
];
+ benchmarkHaskellDepends = [
+ base
+ bluefin
+ tasty-bench
+ ];
description = "Algebraic effects and named handlers in Bluefin";
- license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
- broken = true;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -111848,39 +112267,11 @@ self: {
bluefin
];
description = "The Bluefin effect system, user contributions";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
bluefin-internal = callPackage (
- {
- mkDerivation,
- async,
- base,
- monad-control,
- transformers,
- transformers-base,
- unliftio-core,
- }:
- mkDerivation {
- pname = "bluefin-internal";
- version = "0.1.0.0";
- sha256 = "1106fij37sq7xnmb1zrvls94frqs9ard2nggiphmc2lpkcg71whz";
- libraryHaskellDepends = [
- async
- base
- monad-control
- transformers
- transformers-base
- unliftio-core
- ];
- testHaskellDepends = [ base ];
- description = "The Bluefin effect system, internals";
- license = lib.licenses.mit;
- }
- ) { };
-
- bluefin-internal_0_1_1_0 = callPackage (
{
mkDerivation,
async,
@@ -111904,8 +112295,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "The Bluefin effect system, internals";
- license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -111926,7 +112316,7 @@ self: {
random
];
description = "The Bluefin effect system, random generators";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -112000,7 +112390,7 @@ self: {
text
];
description = "Tools for interacting with Bluesky / AT Protocol";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -112415,6 +112805,104 @@ self: {
}
) { };
+ board-games_0_4_0_1 = callPackage (
+ {
+ mkDerivation,
+ array,
+ base,
+ boxes,
+ cgi,
+ combinatorial,
+ containers,
+ criterion,
+ doctest-exitcode-stdio,
+ doctest-lib,
+ enummapset,
+ explicit-exception,
+ haha,
+ html,
+ httpd-shed,
+ network-uri,
+ non-empty,
+ parallel,
+ QuickCheck,
+ random,
+ semigroups,
+ shell-utility,
+ transformers,
+ utility-ht,
+ }:
+ mkDerivation {
+ pname = "board-games";
+ version = "0.4.0.1";
+ sha256 = "1zw5061m29kaz4hxn18hz9p7hvxb1ga8x2vqxkpk7iyd25yncd05";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ array
+ base
+ boxes
+ cgi
+ combinatorial
+ containers
+ enummapset
+ explicit-exception
+ haha
+ html
+ non-empty
+ QuickCheck
+ random
+ semigroups
+ transformers
+ utility-ht
+ ];
+ executableHaskellDepends = [
+ array
+ base
+ cgi
+ containers
+ html
+ httpd-shed
+ network-uri
+ non-empty
+ random
+ shell-utility
+ transformers
+ utility-ht
+ ];
+ testHaskellDepends = [
+ array
+ base
+ containers
+ doctest-exitcode-stdio
+ doctest-lib
+ enummapset
+ non-empty
+ QuickCheck
+ random
+ transformers
+ utility-ht
+ ];
+ benchmarkHaskellDepends = [
+ base
+ containers
+ criterion
+ enummapset
+ non-empty
+ parallel
+ QuickCheck
+ random
+ transformers
+ utility-ht
+ ];
+ description = "Three games for inclusion in a web server";
+ license = "GPL";
+ hydraPlatforms = lib.platforms.none;
+ mainProgram = "board-games";
+ maintainers = [ lib.maintainers.thielema ];
+ }
+ ) { };
+
boardgame = callPackage (
{
mkDerivation,
@@ -112617,7 +113105,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Generate Haskell boilerplate";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "boilerplate";
broken = true;
@@ -112673,7 +113161,7 @@ self: {
vector
];
description = "Bolt driver for Neo4j";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -114025,7 +114513,7 @@ self: {
transformers
];
description = "Boring and Absurd types";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -114135,7 +114623,7 @@ self: {
wide-word
];
description = "Implementation of BORSH serialisation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -114173,15 +114661,15 @@ self: {
}:
mkDerivation {
pname = "botan-bindings";
- version = "0.0.1.0";
- sha256 = "0svb55s3y93lj1nk1574dpvinzw1fcy306gl6dcxxszxfm9ndng9";
+ version = "0.1.0.0";
+ sha256 = "1lajqsnf6v03qh3xnksbxh2h2sz4hkrvqw2jy94swyy8abd8qbqs";
libraryHaskellDepends = [
base
bytestring
];
libraryPkgconfigDepends = [ botan ];
description = "Raw Botan bindings";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.mikatammi ];
}
) { botan = null; };
@@ -114201,8 +114689,8 @@ self: {
}:
mkDerivation {
pname = "botan-low";
- version = "0.0.1.0";
- sha256 = "0bm4dilvy1hdpf9flx7686djp0bjs2v7zi9iq937a6f20vqqwzvd";
+ version = "0.0.2.0";
+ sha256 = "16sha2cd03n7g3lykvcsfmxadyv3iyq9898sv9xjvcndfii3wg25";
libraryHaskellDepends = [
base
botan-bindings
@@ -114225,7 +114713,7 @@ self: {
tasty-bench
];
description = "Low-level Botan bindings";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.mikatammi ];
}
) { };
@@ -114323,7 +114811,7 @@ self: {
text
];
description = "Encoding and decoding for the Bottom spec";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "bottom";
broken = true;
@@ -114428,7 +114916,7 @@ self: {
utf8-string
];
description = "ScopeH and ScopeT extras for bound";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -114541,7 +115029,7 @@ self: {
tasty-hunit
];
description = "A strict, immutable, thread-safe, single-ended, bounded queue";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -114748,7 +115236,7 @@ self: {
doctest-parallel
];
description = "A profunctor effect system?";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -114773,7 +115261,7 @@ self: {
time
];
description = "CSV parsing in a box";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -114818,7 +115306,7 @@ self: {
doctest-parallel
];
description = "Box websockets";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "box-socket";
}
) { };
@@ -114914,7 +115402,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "A minimal typed unix path library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -115294,7 +115782,7 @@ self: {
tasty-hunit
];
description = "Set breakpoints using a GHC plugin";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -115426,6 +115914,8 @@ self: {
pname = "brick";
version = "2.9";
sha256 = "1jdhagw5ihp9g5pinmbb1mf3fjcbh4aim9qg9i4b1na9zn07s0f1";
+ revision = "1";
+ editedCabalFile = "09zn3n52dgp795idrxp6wrq8clyknwsgsqhfdvsc5jv70sx54b9x";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -115470,6 +115960,86 @@ self: {
}
) { };
+ brick_2_10 = callPackage (
+ {
+ mkDerivation,
+ base,
+ bimap,
+ bytestring,
+ config-ini,
+ containers,
+ data-clist,
+ deepseq,
+ directory,
+ exceptions,
+ filepath,
+ hashable,
+ microlens,
+ microlens-mtl,
+ microlens-th,
+ mtl,
+ QuickCheck,
+ stm,
+ template-haskell,
+ text,
+ text-zipper,
+ time,
+ unix-compat,
+ unordered-containers,
+ vector,
+ vty,
+ vty-crossplatform,
+ word-wrap,
+ }:
+ mkDerivation {
+ pname = "brick";
+ version = "2.10";
+ sha256 = "08byr2w0697bdlnpycnb73f33v2as6sy7q9w9r8a2nhilv49yhmq";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base
+ bimap
+ bytestring
+ config-ini
+ containers
+ data-clist
+ deepseq
+ directory
+ exceptions
+ filepath
+ hashable
+ microlens
+ microlens-mtl
+ microlens-th
+ mtl
+ stm
+ template-haskell
+ text
+ text-zipper
+ time
+ unix-compat
+ unordered-containers
+ 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;
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
brick-calendar = callPackage (
{
mkDerivation,
@@ -115515,7 +116085,7 @@ self: {
vty
];
description = "Calendar widget for the Brick TUI library";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -115629,7 +116199,7 @@ self: {
vector
];
description = "Search forward or backward for certain kinds of items in brick list";
- license = lib.licenses.bsd0;
+ license = lib.licensesSpdx."0BSD";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -115658,7 +116228,7 @@ self: {
vector
];
description = "Skip a certain kind of items when moving in brick list";
- license = lib.licenses.bsd0;
+ license = lib.licensesSpdx."0BSD";
}
) { };
@@ -115707,7 +116277,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Panes library for Brick providing composition and isolation for TUI apps";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
hydraPlatforms = lib.platforms.none;
mainProgram = "mywork-example";
broken = true;
@@ -115770,7 +116340,7 @@ self: {
vty
];
description = "Tabular list widgets for brick";
- license = lib.licenses.bsd0;
+ license = lib.licensesSpdx."0BSD";
}
) { };
@@ -116087,7 +116657,7 @@ self: {
OpenGL
];
description = "Painless 2D vector graphics, animations, and simulations powered by GLFW";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -116110,7 +116680,7 @@ self: {
ghc-prim
];
description = "Data structures and algorithms for working with 2D graphics";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -116151,7 +116721,7 @@ self: {
vector
];
description = "Examples using the Brillo library";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -116189,7 +116759,7 @@ self: {
vector
];
description = "Load any image supported by Juicy.Pixels in your brillo application";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "brillo-juicy-viewer";
}
) { };
@@ -116217,7 +116787,7 @@ self: {
vector
];
description = "Brillo picture data types and rendering functions";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -116356,7 +116926,7 @@ self: {
yaml
];
description = "Haskell source code formatter";
- license = lib.licenses.agpl3Only;
+ license = lib.licensesSpdx."AGPL-3.0-only";
hydraPlatforms = lib.platforms.none;
mainProgram = "brittany";
broken = true;
@@ -116429,7 +116999,7 @@ self: {
];
doHaddock = false;
description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -116442,7 +117012,7 @@ self: {
libraryHaskellDepends = [ broadcast-chan ];
doHaddock = false;
description = "Conduit-based parallel streaming code for broadcast-chan";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -116457,7 +117027,7 @@ self: {
libraryHaskellDepends = [ broadcast-chan ];
doHaddock = false;
description = "Pipes-based parallel streaming code for broadcast-chan";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -116515,7 +117085,7 @@ self: {
random
];
description = "Helpers for generating tests for broadcast-chan";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -118365,7 +118935,7 @@ self: {
transformers
];
description = "Build Systems à la Carte";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -118421,7 +118991,7 @@ self: {
text
];
description = "Compute, fetch and install Cabal build plans into a local environment";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "build-env";
broken = true;
@@ -118540,7 +119110,7 @@ self: {
primitive-unaligned
];
description = "bounded ByteArray builder type";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -118881,35 +119451,29 @@ self: {
base,
Cabal,
containers,
- fclabels,
+ lens,
process,
regex-compat,
split,
- strict,
}:
mkDerivation {
pname = "bumper";
- version = "0.6.0.3";
- sha256 = "1a6sqkdzq05az6yj3zmlcbx6bmhw4zjx2aijxfi481z3ifiy7z3w";
- revision = "3";
- editedCabalFile = "0r4fj5mxl452786jw6pr2nwhs5sszlxb9nwcrakr44jysm181lhw";
+ version = "0.7.0.0";
+ sha256 = "1mjrmlnm733yw2l9jq2cxlq4z9jz102bbh974v15mkry3vnq1k9b";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
base
Cabal
containers
- fclabels
+ lens
process
regex-compat
split
- strict
];
description = "Automatically bump package versions, also transitively";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "bumper";
- broken = true;
}
) { };
@@ -119010,7 +119574,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Parse webforms & render to interactive hypertext";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
mainProgram = "bureaucromancy";
broken = true;
@@ -119084,7 +119648,7 @@ self: {
text
];
description = "Parse and render URI templates";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -119626,7 +120190,7 @@ self: {
sha256 = "0afywcb7n2h2vycxg47myaqz49xrlnjpyq753smildjlkl79jx79";
libraryHaskellDepends = [ base ];
description = "Define embeddings of small bit vectors into larger ones";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -119698,7 +120262,7 @@ self: {
];
doHaddock = false;
description = "Efficient little-endian bit vector library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -119766,7 +120330,7 @@ self: {
parameterized-utils
];
description = "Well-typed lenses for bv-sized bitvectors";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -119803,7 +120367,7 @@ self: {
tasty-hunit
];
description = "Give aliases to record fields";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -119864,7 +120428,7 @@ self: {
text
];
description = "Library for creating command-line interfaces (colors, menus, etc.)";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -119921,7 +120485,7 @@ self: {
tasty-quickcheck
];
description = "Sets and maps with 8-bit words for keys";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -119957,7 +120521,7 @@ self: {
text
];
description = "Read strings describing a number of bytes like 2Kb and 0.5 MiB";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
maintainers = [ lib.maintainers.danielrolls ];
}
) { };
@@ -119986,7 +120550,7 @@ self: {
wide-word
];
description = "Portable big-endian and little-endian conversions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -120105,7 +120669,7 @@ self: {
text-short
];
description = "Build byte arrays";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -120188,7 +120752,7 @@ self: {
unordered-containers
];
description = "Universal hashing of bytes";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -120215,7 +120779,7 @@ self: {
primitive
];
description = "Fast logging";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
badPlatforms = lib.platforms.darwin;
}
) { };
@@ -120427,7 +120991,7 @@ self: {
random
];
description = "Calculate string metrics on Bytes efficiently";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -120456,7 +121020,7 @@ self: {
tasty-hunit
];
description = "Template haskell macro for casing on Bytes";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -120533,7 +121097,7 @@ self: {
gauge
];
description = "Slicing managed and unmanaged memory";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -120585,7 +121149,7 @@ self: {
primitive
];
description = "Nonresumable byte parser";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -120608,6 +121172,8 @@ self: {
pname = "bytestring";
version = "0.12.2.0";
sha256 = "18zvh1fpj8x4w35hrcp1l8cd9x7v401s17wn5l5vlbgwhdrimnif";
+ revision = "1";
+ editedCabalFile = "06av8jwxnclkzdvaj7l3mpz99yc84s9ql1sszk7d17sr8ihf34m4";
libraryHaskellDepends = [
base
deepseq
@@ -120631,7 +121197,7 @@ self: {
tasty-bench
];
description = "Fast, compact, strict and lazy byte strings with a list interface";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -120657,7 +121223,7 @@ self: {
text
];
description = "Aeson instances for ByteString, using base 64 encoding";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.alexfmpe ];
}
) { };
@@ -121047,7 +121613,7 @@ self: {
tasty-smallcheck
];
description = "Efficiently parse and produce common integral and fractional numbers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -121324,7 +121890,7 @@ self: {
rerebase
];
description = "An efficient strict bytestring builder";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -121347,7 +121913,7 @@ self: {
primitive
];
description = "break bytestrings up into substrings";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -121459,7 +122025,7 @@ self: {
criterion
];
description = "A very efficient ByteString builder implementation based on the binary tree";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -121509,7 +122075,7 @@ self: {
QuickCheck
];
description = "An efficient finite map from bytestrings to values";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -121652,7 +122218,7 @@ self: {
unpacked-maybe
];
description = "Tries with Bytes as keys";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -121797,7 +122363,7 @@ self: {
tasty-hunit
];
description = "High-level bindings to bz3";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
}
) { };
@@ -121832,7 +122398,7 @@ self: {
sha256 = "0iax0fq5y24lcjkjsk66khry9s6v9hhd3zfrwg8mvgs07waq2m59";
doHaddock = false;
description = "bzip2 C sources";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -122466,7 +123032,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Manipulate patterns in cellular automata, create and parse RLE files";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -122635,7 +123201,7 @@ self: {
temporary
];
description = "Extend Cabal build-depends from the command line";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "cabal-add";
}
@@ -122698,7 +123264,7 @@ self: {
temporary
];
description = "Extend Cabal build-depends from the command line";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "cabal-add";
}
) { };
@@ -122807,8 +123373,8 @@ self: {
}:
mkDerivation {
pname = "cabal-bounds";
- version = "2.6.0";
- sha256 = "0y4xj4irhppwsg3ljy6yzscfjdj7gh2prsiia51y8ma6gm87sjsy";
+ version = "2.7.0";
+ sha256 = "09xlw66h5k034gr9id4lj8i48r188k55cy8kml6f3q1a7cqcfsfd";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -122893,7 +123459,7 @@ self: {
time
];
description = "Bundling C/C++ projects in Cabal package made easy";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -123043,7 +123609,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "CI Assistant for Haskell projects";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "cabal-cache";
}
@@ -123070,8 +123636,8 @@ self: {
}:
mkDerivation {
pname = "cabal-cargs";
- version = "1.7.0";
- sha256 = "17q51lg7vhdzvy9s8f3zplxa4mij2bjclzxry5f9d2pgiq4290p9";
+ version = "1.8.0";
+ sha256 = "0nm20jw8hy9gfv4813jfy7m13i9sa3dcs0633hminsk5xl5a1ff2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -123310,7 +123876,7 @@ self: {
text
];
description = "Create a Debianization for a Cabal package";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "cabal-debian";
broken = true;
@@ -123364,7 +123930,7 @@ self: {
QuickCheck
];
description = "QuickCheck for Cabal tests";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -123514,7 +124080,7 @@ self: {
time
];
description = "Cabal utility";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "cabal-edit";
broken = true;
@@ -123668,7 +124234,7 @@ self: {
doctest-parallel
];
description = "Fix for cabal files";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "cabal-fix";
broken = true;
@@ -123728,7 +124294,7 @@ self: {
zlib
];
description = "Generate a FlatPak manifest from a Cabal package description";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "cabal-flatpak";
maintainers = [ lib.maintainers.thielema ];
}
@@ -123915,7 +124481,7 @@ self: {
transformers
];
description = "Formats package descriptions";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "cabal-gild";
maintainers = [ lib.maintainers.turion ];
}
@@ -124042,7 +124608,7 @@ self: {
];
doCheck = false;
description = "Give Haskell development tools access to Cabal project environment";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -124111,7 +124677,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "generate hoogle database for cabal project and dependencies";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "cabal-hoogle";
broken = true;
@@ -124216,6 +124782,8 @@ self: {
pname = "cabal-install";
version = "3.16.0.0";
sha256 = "06jndk7xcm837rsy4y9nhy8a0162ckravh8dlnif1vmywfgljai8";
+ revision = "2";
+ editedCabalFile = "1f8gi3v27hr4x2ydqa20ijqdcv3pm09lyykhqcaz8zy7dvz96xb0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -124295,7 +124863,7 @@ self: {
mv bash-completion $out/share/bash-completion/completions
'';
description = "The command-line interface for Cabal and Hackage";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "cabal";
maintainers = [ lib.maintainers.sternenseemann ];
@@ -124677,7 +125245,7 @@ self: {
tasty-quickcheck
];
description = "The solver component of cabal-install";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -124776,8 +125344,71 @@ self: {
];
description = "Cabal support for creating Mac OSX application bundles";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
mainProgram = "macosx-app";
+ }
+ ) { };
+
+ cabal-matrix = callPackage (
+ {
+ mkDerivation,
+ aeson,
+ base,
+ bytestring,
+ Cabal,
+ cabal-install,
+ cabal-install-solver,
+ Cabal-syntax,
+ containers,
+ directory,
+ filepath,
+ hashable,
+ optparse-applicative,
+ primitive,
+ process,
+ safe-exceptions,
+ split,
+ stm,
+ text,
+ transformers,
+ vty,
+ vty-crossplatform,
+ word-wrap,
+ }:
+ mkDerivation {
+ pname = "cabal-matrix";
+ version = "1.0.0.0";
+ sha256 = "1y5hc98w9c6amlzp0nvzgd331nrmnf4qgqr0n6nv80zqy9s80b65";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson
+ base
+ bytestring
+ Cabal
+ cabal-install
+ cabal-install-solver
+ Cabal-syntax
+ containers
+ directory
+ filepath
+ hashable
+ optparse-applicative
+ primitive
+ process
+ safe-exceptions
+ split
+ stm
+ text
+ transformers
+ vty
+ vty-crossplatform
+ word-wrap
+ ];
+ executableHaskellDepends = [ base ];
+ description = "Matrix builds for cabal";
+ license = lib.licensesSpdx."BSD-3-Clause";
+ hydraPlatforms = lib.platforms.none;
+ mainProgram = "cabal-matrix";
broken = true;
}
) { };
@@ -124915,7 +125546,7 @@ self: {
process
];
description = "Make Cabal aware of pkg-config package versions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.roberth ];
}
) { };
@@ -124983,7 +125614,7 @@ self: {
vector
];
description = "Library and utility for processing cabal's plan.json file";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
mainProgram = "cabal-plan";
}
) { };
@@ -125017,7 +125648,7 @@ self: {
text
];
description = "Derives cabal bounds from build plans";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
mainProgram = "cabal-plan-bounds";
maintainers = [ lib.maintainers.nomeata ];
}
@@ -125114,6 +125745,8 @@ self: {
pname = "cabal-rpm";
version = "2.3.0";
sha256 = "1scgf9npfjynj5b730zjk0yzyq74v2dghs0pwp2zg4kl0hxp6sw0";
+ revision = "1";
+ editedCabalFile = "1ji882k0kkpxzlw7c3f6b48k2wzzyy8yv5baadmy4j7npqxfsxqy";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -125232,7 +125865,7 @@ self: {
yaml
];
executableHaskellDepends = [ base ];
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "cabal-scaffold";
broken = true;
@@ -125356,7 +125989,7 @@ self: {
utility-ht
];
description = "Topologically sort cabal packages";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -125403,7 +126036,7 @@ self: {
utility-ht
];
description = "Topologically sort cabal packages";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -126516,7 +127149,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "A simple library to cache IO actions";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
mainProgram = "test-cachedIO";
}
) { };
@@ -126615,7 +127248,7 @@ self: {
transformers
];
description = "Cache combinators";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -126711,6 +127344,7 @@ self: {
nix,
nix-narinfo,
optparse-applicative,
+ pqueue,
pretty-terminal,
prettyprinter,
process,
@@ -126745,8 +127379,8 @@ self: {
}:
mkDerivation {
pname = "cachix";
- version = "1.8.0";
- sha256 = "0axi9g6v8h29fi4lvxjxqrk4215c41zzp860hl5avdka1l0cvv5q";
+ version = "1.9.1";
+ sha256 = "1jhimq7vjnbpggv1l97icwq6i4qhdazhx9gn23fxcf1xj9lz6q6l";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -126798,6 +127432,7 @@ self: {
network
nix-narinfo
optparse-applicative
+ pqueue
pretty-terminal
prettyprinter
process
@@ -126858,6 +127493,7 @@ self: {
hercules-ci-cnix-store
here
hspec
+ katip
protolude
retry
servant-auth-client
@@ -126865,11 +127501,12 @@ self: {
stm
temporary
time
+ unliftio
versions
];
testToolDepends = [ hspec-discover ];
description = "Command-line client for Nix binary cache hosting https://cachix.org";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
maintainers = [ lib.maintainers.domenkozar ];
}
) { inherit (pkgs) nix; };
@@ -126906,8 +127543,8 @@ self: {
}:
mkDerivation {
pname = "cachix-api";
- version = "1.8.0";
- sha256 = "02cj18aghnl8w4pr2azpgg52aha6z59lcxy6nqd6yvrzgg0lv97v";
+ version = "1.9.1";
+ sha256 = "1gr35qmx0lrbfqyyrl8xab9k0x38n771by3girlc8sdv0xjil25d";
libraryHaskellDepends = [
aeson
async
@@ -126943,7 +127580,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Servant HTTP API specification for https://cachix.org";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
maintainers = [ lib.maintainers.domenkozar ];
}
) { };
@@ -127042,7 +127679,7 @@ self: {
random
];
description = "That rabbit's got a vicious streak a mile wide!";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -127154,7 +127791,7 @@ self: {
];
libraryPkgconfigDepends = [ cairo ];
description = "Binding to the Cairo library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { inherit (pkgs) cairo; };
@@ -127669,6 +128306,8 @@ self: {
];
description = "A library for writing discord bots in haskell";
license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -127999,6 +128638,7 @@ self: {
file-embed,
filepath,
hspec,
+ pretty-show,
process,
split,
string-interpolate,
@@ -128008,8 +128648,8 @@ self: {
}:
mkDerivation {
pname = "call-alloy";
- version = "0.6.0.2";
- sha256 = "1b8xb2z3cjlqiz2jj75qbw4p0xhdybhnarq3xg2gdn2c953xyscq";
+ version = "0.6.0.3";
+ sha256 = "1bd9f6nfrrzlzw71gz0fkmiv78wfr4zmwzdisa6c6z2yf4cmf0vd";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
async
@@ -128037,6 +128677,7 @@ self: {
file-embed
filepath
hspec
+ pretty-show
process
split
string-interpolate
@@ -128196,7 +128837,7 @@ self: {
QuickCheck
];
description = "HIE-based Haskell call graph and source code visualizer";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "calligraphy";
}
) { };
@@ -128554,7 +129195,7 @@ self: {
time
];
description = "Canadian income tax calculation";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -129049,7 +129690,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Convert data to and from a natural number representation";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -129162,8 +129803,8 @@ self: {
pname = "capability";
version = "0.5.0.1";
sha256 = "0sksd42ywaq5av7a1h9y66pclsk1fd9qx46q38kgs3av88zhzqci";
- revision = "4";
- editedCabalFile = "00lkh7rnys52wji7301ca1nriypwqd8q7gslz3gvnwqmi6as0grv";
+ revision = "5";
+ editedCabalFile = "1gqrc6gql8jfgblx8v9v352a51lj5mnw41hk66cgq269ywsg8igs";
libraryHaskellDepends = [
base
constraints
@@ -129404,7 +130045,7 @@ self: {
vector
];
description = "Cap'n Proto for Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "capnpc-haskell";
}
@@ -130591,8 +131232,8 @@ self: {
}:
mkDerivation {
pname = "casa-client";
- version = "0.0.2";
- sha256 = "0nr6dz6igxkmr4841hppd5zz0vjycfvybr3abqylrssg6vg988p2";
+ version = "0.0.3";
+ sha256 = "0jsnb4a9wwsyxr7i177hsfkybd4qya39jbx2rgyi8l0aiv31vc25";
libraryHaskellDepends = [
aeson
attoparsec
@@ -130635,8 +131276,8 @@ self: {
}:
mkDerivation {
pname = "casa-types";
- version = "0.0.2";
- sha256 = "1c3qvph690pgnqmj132sn1zh878n3ljvmp913vvhwynfhyixs1v7";
+ version = "0.0.3";
+ sha256 = "00v3ydwnr57q40cp4i0x0y2hkm22x1619yvl6frl3j5j329s4slh";
libraryHaskellDepends = [
aeson
attoparsec
@@ -131061,7 +131702,7 @@ self: {
rerebase
];
description = "A converter for spinal, snake and camel cases";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -131868,7 +132509,7 @@ self: {
vector
];
description = "io-streams interface for the cassava CSV library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -131907,7 +132548,7 @@ self: {
vector
];
description = "`TemplateHaskell` helpers for `cassava`";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -132053,7 +132694,7 @@ self: {
text
];
description = "Portable CRC-32C";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -132591,7 +133232,7 @@ self: {
];
doHaddock = false;
description = "Dependency injection library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "cauldron-example-wiring";
}
) { };
@@ -133386,7 +134027,7 @@ self: {
websockets
];
description = "A library for the Chrome Devtools Protocol";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -134161,7 +134802,7 @@ self: {
unordered-containers
];
description = "Integration of \"cereal\" and \"unordered-containers\"";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -134335,6 +134976,7 @@ self: {
free,
hedgehog,
hspec,
+ hspec-api,
hspec-core,
hspec-discover,
hspec-expectations,
@@ -134347,8 +134989,8 @@ self: {
}:
mkDerivation {
pname = "cfg";
- version = "0.0.2.2";
- sha256 = "1v0k3gkwwifps4msd2888slaf4wdw5ppfpp0a0rzgmp14fbxz2sw";
+ version = "0.0.2.3";
+ sha256 = "1l6k0lxgjgnyqz08zwgg7nymglljxn6q7b9i5zbi2a6h8gm28h27";
libraryHaskellDepends = [
base
bytestring
@@ -134368,6 +135010,7 @@ self: {
free
hedgehog
hspec
+ hspec-api
hspec-core
hspec-discover
hspec-expectations
@@ -134378,7 +135021,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Type directed application configuration parsing and accessors";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -134556,7 +135199,7 @@ self: {
base-prelude
];
description = "A Future type that is easy to represent and handle in C/C++";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -134840,7 +135483,7 @@ self: {
yaml
];
description = "Command line tool";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
mainProgram = "cgrep";
}
) { };
@@ -134876,7 +135519,7 @@ self: {
path-io
];
description = "A container-/cgroup-aware substitute for the GHC RTS `-N` flag";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -135015,7 +135658,7 @@ self: {
time
];
description = "Mining Client for Kadena Chainweb";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "chainweb-mining-client";
}
@@ -135445,7 +136088,7 @@ self: {
witherable
];
description = "Stateful monad transformer based on monoidal actions";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -135480,7 +136123,7 @@ self: {
tasty-hunit
];
description = "Stateful monad transformer based on monoidal actions";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -135527,7 +136170,7 @@ self: {
tasty-hunit
];
description = "Stateful monad transformer based on monoidal actions";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -135557,7 +136200,7 @@ self: {
some
];
description = "Stateful monad transformer based on monoidal actions";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -135606,7 +136249,7 @@ self: {
vector
];
description = "A diagnostics library for Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -135721,7 +136364,7 @@ self: {
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "Pattern synonyms for ASCII characters for Word8, Word16 etc";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -135968,7 +136611,7 @@ self: {
doctest-parallel
];
description = "Charting library targetting SVGs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -136031,7 +136674,7 @@ self: {
numhask
];
description = "See readme.md";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "chart-svg-various";
}
@@ -136725,7 +137368,7 @@ self: {
QuickCheck
];
description = "Checks context free grammar for ambiguity using brute force up to given limit";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -137016,7 +137659,7 @@ self: {
transformers
];
description = "A simple and intuitive library for automated testing";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -137039,7 +137682,7 @@ self: {
HUnit
];
description = "HUnit support for Chell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -137064,7 +137707,7 @@ self: {
random
];
description = "QuickCheck support for Chell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -137339,7 +137982,7 @@ self: {
containers
];
description = "A Library for Chess Game Logic";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -137457,7 +138100,7 @@ self: {
text
];
description = "Parse and scrape recipe blogs";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "chez-grater";
broken = true;
@@ -137527,7 +138170,7 @@ self: {
uuid
];
description = "A tmux client for Polysemy";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -137599,7 +138242,7 @@ self: {
tasty-hedgehog
];
description = "Testing tools for chiasma";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -137658,7 +138301,7 @@ self: {
vector
];
description = "Lazy infinite streams with O(1) indexing and applications for memoization";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -138442,7 +139085,7 @@ self: {
time
];
description = "A high-performance time library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -138482,7 +139125,7 @@ self: {
];
benchmarkHaskellDepends = [ base ];
description = "Benchmarking tool with focus on comparing results";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "chronos";
broken = true;
@@ -138747,7 +139390,7 @@ self: {
sha256 = "018k9a014q4zprsla5k5hrdq1zwpp7hmckc0ldaj7nf6vg1hxas2";
libraryHaskellDepends = [ base ];
description = "Automatically convert Generic instances to and from church representations";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -138850,7 +139493,7 @@ self: {
unagi-chan
];
description = "Channel/Arrow based streaming computation library";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -138910,7 +139553,7 @@ self: {
uuid
];
description = "API bindings to IOHK's Cicero job scheduler";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "cicero-cli";
broken = true;
@@ -139739,6 +140382,8 @@ self: {
];
description = "A source plugin for manipulating circuits in clash with a arrow notation";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -139779,7 +140424,7 @@ self: {
vector
];
description = "Circular fixed-sized mutable vectors";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.dschrempf ];
}
) { };
@@ -139800,7 +140445,7 @@ self: {
hspec
];
description = "Make bounded enum types circular";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -140061,12 +140706,12 @@ self: {
transformers
];
description = "Generates citations and bibliography from CSL styles";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
maintainers = [ lib.maintainers.sternenseemann ];
}
) { };
- citeproc_0_10 = callPackage (
+ citeproc_0_11 = callPackage (
{
mkDerivation,
aeson,
@@ -140095,8 +140740,8 @@ self: {
}:
mkDerivation {
pname = "citeproc";
- version = "0.10";
- sha256 = "0snza31cf2agnpr80dl691insw6f8v1ii7f52q6dyl2cx56cawsh";
+ version = "0.11";
+ sha256 = "1msriz492kgnhljywbxys6jm3j3i41hm6scw9rx6g2mk2cz33z3m";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -140134,7 +140779,7 @@ self: {
transformers
];
description = "Generates citations and bibliography from CSL styles";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
hydraPlatforms = lib.platforms.none;
maintainers = [ lib.maintainers.sternenseemann ];
}
@@ -141011,7 +141656,7 @@ self: {
tasty-hunit
];
description = "A class for types with only finitely many inhabitants";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -141062,10 +141707,8 @@ self: {
}:
mkDerivation {
pname = "clash-ghc";
- version = "1.8.2";
- sha256 = "1pwbpk0f502jx37raq4n64c39jgcrzbya7nzzi6mq7wjm1xmxnsw";
- revision = "2";
- editedCabalFile = "1fr27hfpj31yaqn46k3jzb3kfba182wnqx7b4y7mi7qbm4pqqyr8";
+ version = "1.8.3";
+ sha256 = "1y2mrn4c8zcn7bjdza28k1p8716iqfc42vjggjalbcrn04zi0dsb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -141111,7 +141754,8 @@ self: {
];
executableHaskellDepends = [ base ];
description = "Clash: a functional hardware description language - GHC frontend";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
+ hydraPlatforms = lib.platforms.none;
}
) { };
@@ -141179,10 +141823,8 @@ self: {
}:
mkDerivation {
pname = "clash-lib";
- version = "1.8.2";
- sha256 = "02yzqkzaligkvd3830nsgnmnpswydf1a67hrhyhn6gg5crmb2jmg";
- revision = "2";
- editedCabalFile = "15h7vb7d0j9g9mnbgyn4sqdnffhvk7igchzyjpvan3h1p3r321wa";
+ version = "1.8.3";
+ sha256 = "114w3vag29famrdz934v42831hbcxvkd0jxhsm730rwni95ik78c";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -141278,8 +141920,10 @@ self: {
unordered-containers
];
description = "Clash: a functional hardware description language - As a library";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
+ hydraPlatforms = lib.platforms.none;
mainProgram = "v16-upgrade-primitives";
+ broken = true;
}
) { };
@@ -141305,8 +141949,8 @@ self: {
}:
mkDerivation {
pname = "clash-lib-hedgehog";
- version = "1.8.2";
- sha256 = "1z3252ac8gs05sp4p0yh73cxk4826hcwzyh7z8fddszhpk9iyhrl";
+ version = "1.8.3";
+ sha256 = "1cihj7m6n46v06np6hbd3z11zr74gy2b3alhfmx1x4hy3ycsr1x9";
libraryHaskellDepends = [
base
clash-lib
@@ -141326,7 +141970,7 @@ self: {
transformers
];
description = "Hedgehog Generators for clash-lib";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -141413,10 +142057,8 @@ self: {
}:
mkDerivation {
pname = "clash-prelude";
- version = "1.8.2";
- sha256 = "0pxzb0cj3wp2fjjj6wa2hnbqpvg7rrfza3fqr7m5c7l73yjmi2m3";
- revision = "3";
- editedCabalFile = "0b9rd93y48avji9fw6xfxsi3392php6j5qpvmyxjv32m5ljhp83d";
+ version = "1.8.3";
+ sha256 = "00fy0vgp2pj7vad50n53pz70hc6x1mvz3a28cl1xqdyi6mk82kfj";
libraryHaskellDepends = [
array
arrows
@@ -141483,7 +142125,7 @@ self: {
template-haskell
];
description = "Clash: a functional hardware description language - Prelude library";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -141499,10 +142141,8 @@ self: {
}:
mkDerivation {
pname = "clash-prelude-hedgehog";
- version = "1.8.2";
- sha256 = "0fn92r1zhdabqdanh3wqgcrmvqg886jap82r3h25gsldz6f8635m";
- revision = "1";
- editedCabalFile = "1hvclgpy4vl129qvm8px9w7hq2cv15m4zacdn2ay300sp0mbiwg3";
+ version = "1.8.3";
+ sha256 = "10mq2mpn6vnsb253p3hb665q94363vq5irmg8ns10p7kc2jc6l2l";
libraryHaskellDepends = [
base
clash-prelude
@@ -141512,7 +142152,7 @@ self: {
text
];
description = "Hedgehog Generators for clash-prelude";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -141576,6 +142216,7 @@ self: {
];
description = "Shake rules for building Clash programs";
license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
}
) { };
@@ -141900,7 +142541,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "An interface for a handler-independent, typeclass-based effect system";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -141929,7 +142570,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "An interface for a handler-independent, typeclass-based effect system";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -141970,7 +142611,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Automatic compliance with the classy-effects protocols";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -143889,6 +144530,7 @@ self: {
description = "A Haskell library as database client for Clickhouse";
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -144590,7 +145232,9 @@ self: {
unix
];
description = "Project file manager for Claude AI integrations";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -144731,7 +145375,7 @@ self: {
template-haskell
];
description = "Closed type class declarations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -144956,7 +145600,7 @@ self: {
time
];
description = "Unofficial Haskell SDK for the CloudEvents specification";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -145118,7 +145762,7 @@ self: {
template-haskell
];
description = "CLI tool to easily spin up and control compute instances in various cloud environments";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "cloudy";
maintainers = [ lib.maintainers.cdepillabout ];
}
@@ -145878,6 +146522,40 @@ self: {
}
) { };
+ cmark-gfm-lens = callPackage (
+ {
+ mkDerivation,
+ base,
+ cmark-gfm,
+ hspec,
+ lens,
+ profunctors,
+ text,
+ }:
+ mkDerivation {
+ pname = "cmark-gfm-lens";
+ version = "0.2.4";
+ sha256 = "1glp394f0c911h4p457c72rc9zhvash3fyzlf8n0f57ldyalvv16";
+ libraryHaskellDepends = [
+ base
+ cmark-gfm
+ profunctors
+ text
+ ];
+ testHaskellDepends = [
+ base
+ cmark-gfm
+ hspec
+ lens
+ text
+ ];
+ description = "Collection of Lens for cmark-gfm with minimal dependencies";
+ license = lib.licensesSpdx."BSD-3-Clause";
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }
+ ) { };
+
cmark-highlight = callPackage (
{
mkDerivation,
@@ -145907,6 +146585,40 @@ self: {
}
) { };
+ cmark-lens = callPackage (
+ {
+ mkDerivation,
+ base,
+ cmark,
+ hspec,
+ lens,
+ profunctors,
+ text,
+ }:
+ mkDerivation {
+ pname = "cmark-lens";
+ version = "0.2.3";
+ sha256 = "10303nnanf27a7maiw0krsla03rl7rmi88l1phjg4i8snfqip4lw";
+ libraryHaskellDepends = [
+ base
+ cmark
+ profunctors
+ text
+ ];
+ testHaskellDepends = [
+ base
+ cmark
+ hspec
+ lens
+ text
+ ];
+ description = "Collection of lens for CMark with minimal dependencies";
+ license = lib.licensesSpdx."BSD-3-Clause";
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }
+ ) { };
+
cmark-lucid = callPackage (
{
mkDerivation,
@@ -146263,7 +146975,7 @@ self: {
hedgehog
];
description = "(C)oncurrent (M)onoidal (F)olds";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -146750,7 +147462,7 @@ self: {
hedgehog
];
description = "Composable Contravariant Comonadic Logging Library";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -146773,7 +147485,7 @@ self: {
stm
];
description = "Asynchronous backend for co-log library";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -146795,7 +147507,7 @@ self: {
Glob
];
description = "Composable Contravariant Comonadic Logging Library";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -146847,7 +147559,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "effectful log effect using co-log-core";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -146878,7 +147590,7 @@ self: {
text
];
description = "Structured messages support in co-log ecosystem";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -146908,7 +147620,7 @@ self: {
polysemy
];
description = "Composable Contravariant Comonadic Logging Library";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
mainProgram = "play-colog-poly";
}
) { };
@@ -146954,7 +147666,7 @@ self: {
polysemy-plugin
];
description = "A Polysemy logging effect for high quality (unstructured) logs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "example";
broken = true;
@@ -146992,7 +147704,7 @@ self: {
co-log
];
description = "Simple enhancements for logging with co-log";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
mainProgram = "co-log-simple";
}
) { };
@@ -147157,7 +147869,7 @@ self: {
vector
];
description = "Computational biology toolkit to collaborate with researchers in constructive protein engineering";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -147842,7 +148554,7 @@ self: {
transformers
];
description = "CodeT";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -147883,7 +148595,7 @@ self: {
transformers
];
description = "GHC type-checker plugin for solving LiftT instances from codet";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -148117,7 +148829,7 @@ self: {
sha256 = "1g2a723xlbj2blpyfgcr6jg6a2yyca7pa5dgw9jnpip98hssmhsa";
libraryHaskellDepends = [ base ];
description = "Coercions with improved type inference";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -148129,7 +148841,7 @@ self: {
sha256 = "02xj06qdqy9i33hkp504qmgpb0qvhliyygib072s2k6z4wmwd1ar";
libraryHaskellDepends = [ base ];
description = "Coercible but only in one direction";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -148150,7 +148862,7 @@ self: {
profunctors
];
description = "Combine profunctors with coercible-subtypes";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -148781,7 +149493,7 @@ self: {
tasty-hunit
];
description = "Equivariant CSM classes of coincident root loci";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -148838,7 +149550,7 @@ self: {
utility-ht
];
description = "Linear Programming using COIN-OR/CLP and comfort-array";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
badPlatforms = [ "aarch64-linux" ];
maintainers = [ lib.maintainers.thielema ];
}
@@ -149510,7 +150222,7 @@ self: {
hashable
];
description = "Generate a color for a hashable object";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -149823,7 +150535,7 @@ self: {
text
];
description = "Print and parse colors";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -149857,7 +150569,7 @@ self: {
text
];
description = "Convenient interface for printing colourful messages";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -150441,7 +151153,7 @@ self: {
mtl
];
description = "Collection of combinators over standard typeclasses";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -150580,7 +151292,7 @@ self: {
];
doHaddock = false;
description = "Additional shape types for the comfort-array package";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -150635,7 +151347,7 @@ self: {
utility-ht
];
description = "Numerical Basic Linear Algebra using BLAS";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -150680,7 +151392,7 @@ self: {
storable-record
];
description = "High-level interface to FFTW (Fast Fourier Transform) based on comfort-array";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -150732,7 +151444,7 @@ self: {
utility-ht
];
description = "Linear Programming using GLPK and comfort-array";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { inherit (pkgs) glpk; };
@@ -150751,10 +151463,8 @@ self: {
}:
mkDerivation {
pname = "comfort-graph";
- version = "0.0.4";
- sha256 = "1v3acgdr8srvpddl2kvap556ag93b9yphjf3y1qy14sq6f7v46hc";
- revision = "2";
- editedCabalFile = "05fhxw5lb81iah3siqv7liljj07qls6l3zl9kgrx3a9n865vygvw";
+ version = "0.0.4.1";
+ sha256 = "0g3fbv0x0g8d5k09qcsahrys0igkn8hnjwa0281lwsy16inwqlxg";
libraryHaskellDepends = [
base
containers
@@ -151005,7 +151715,7 @@ self: {
unordered-containers
];
description = "A command line argument/option parser library";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "task-manager";
}
) { };
@@ -151031,7 +151741,7 @@ self: {
mtl
];
description = "A monad for commanders";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -151155,7 +151865,7 @@ self: {
text
];
description = "Pure Haskell commonmark parser";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -151281,7 +151991,7 @@ self: {
text
];
description = "An initial encoding of the CommonMark language";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -151345,7 +152055,7 @@ self: {
yaml
];
description = "Simple interface to commonmark-hs for parsing real-world Markdown";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -151399,7 +152109,7 @@ self: {
url-slug
];
description = "Obsidian-friendly commonmark wikilink parser";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -151523,7 +152233,7 @@ self: {
containers
];
description = "Commutative semigroups";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.alexfmpe ];
}
) { };
@@ -151767,7 +152477,7 @@ self: {
yaml
];
description = "Compatibility checker for OpenAPI";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -151950,7 +152660,7 @@ self: {
tasty-quickcheck
];
description = "Stacks, queues, and deques with compact representations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -154187,7 +154897,7 @@ self: {
sha256 = "0aprzrslrbsl3d7j49nmx0kxx71m39zi7xlfyw8wnazqpi8mfwwb";
libraryHaskellDepends = [ base ];
description = "Concurrent actions that may fail with a value";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -157788,7 +158498,7 @@ self: {
text
];
description = "Schema definitions for the config-value package";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -157854,7 +158564,7 @@ self: {
text
];
description = "Simple, layout-based value language similar to YAML or JSON";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -158059,7 +158769,7 @@ self: {
yaml
];
description = "Tools for specifying and parsing configurations";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "example";
}
) { };
@@ -158201,6 +158911,7 @@ self: {
{
mkDerivation,
base,
+ bytestring,
containers,
filepath,
HUnit,
@@ -158213,12 +158924,11 @@ self: {
}:
mkDerivation {
pname = "configurator-pg";
- version = "0.2.10";
- sha256 = "12a67pz6d2vpsa5qdaxm8lwl3jjg8f0idd5r3bjnqw22ji39cysj";
- revision = "3";
- editedCabalFile = "156p0hr14ggf2sfiivgndzrsayxfrmr22pr9hs6jban7m5r627ng";
+ version = "0.2.11";
+ sha256 = "0nrkp6w0wqh8ikp3iqz6xf0xd0xiws8nk2k0qqiiv8dn5g5z2nc1";
libraryHaskellDepends = [
base
+ bytestring
containers
megaparsec
protolude
@@ -158373,7 +159083,7 @@ self: {
text
];
description = "Tracable multi-source config management";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -158893,7 +159603,7 @@ self: {
doctest
];
description = "A safe interface for Const summarization";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -159145,7 +159855,7 @@ self: {
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "Existential type that can be constrained";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -159293,7 +160003,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Constraint manipulation";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -159675,7 +160385,7 @@ self: {
transformers-base
];
description = "Concurrent PostgreSQL data consumers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -159712,7 +160422,7 @@ self: {
transformers-base
];
description = "Prometheus metrics for the consumers library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -159794,7 +160504,7 @@ self: {
template-haskell
];
description = "Assorted concrete container types";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -160108,7 +160818,7 @@ self: {
text-show
];
description = "Generate art from context-free grammars";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "examples";
}
) { };
@@ -160362,7 +161072,7 @@ self: {
weigh
];
description = "Unified interface for primitive arrays";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -160717,7 +161427,7 @@ self: {
witherable
];
description = "Higher-order functions with their function arguments at the end, for channeling the full power of BlockArguments and LambdaCase";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -161401,7 +162111,9 @@ 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";
+ broken = true;
}
) { };
@@ -161436,7 +162148,7 @@ self: {
template-haskell
];
description = "Arithmetic and type checked conversions between units";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -161602,7 +162314,7 @@ self: {
];
doHaddock = false;
description = "A type-safe client generator for Convex for both Rust and Python";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "convex-schema-parser";
broken = true;
@@ -161636,7 +162348,7 @@ self: {
Unique
];
description = "Convex hull";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -161739,7 +162451,7 @@ self: {
time
];
description = "For serving cookies";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -161799,7 +162511,7 @@ self: {
megaparsec
];
description = "Parser for the Cook markup language";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "cooklang-hs";
broken = true;
@@ -162445,7 +163157,7 @@ self: {
];
doHaddock = false;
description = "System for verifying the correctness of generated Copilot programs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "verify-examples";
broken = true;
@@ -163248,7 +163960,7 @@ self: {
text
];
description = "Types for interaction with CoreNLP";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -163303,7 +164015,7 @@ self: {
transformers
];
description = "classy optical monadic state";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
}
) { };
@@ -163822,7 +164534,7 @@ self: {
tasty-hunit
];
description = "Countable, Searchable, Finite, Empty classes";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -163988,7 +164700,7 @@ self: {
text
];
description = "Country data type and functions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -164162,7 +164874,7 @@ self: {
tasty-hunit
];
description = "Well-conditioned estimation of large-dimensional covariance matrices";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
maintainers = [ lib.maintainers.dschrempf ];
}
) { };
@@ -164185,6 +164897,7 @@ self: {
QuickCheck,
quickcheck-instances,
quickcheck-transformer,
+ smash,
tasty,
tasty-expected-failure,
tasty-hunit,
@@ -164195,8 +164908,8 @@ self: {
}:
mkDerivation {
pname = "covenant";
- version = "1.1.0";
- sha256 = "0cgf0l1xsm6l1gqn4mdvlz7j4rh1nx5pkimp6y18x8lp5498bbkj";
+ version = "1.2.0";
+ sha256 = "0iml7gzlyjgy64852wvwmi9j08jzsdriniwjw5v71hy8yxjn1r05";
libraryHaskellDepends = [
acc
base
@@ -164213,6 +164926,7 @@ self: {
QuickCheck
quickcheck-instances
quickcheck-transformer
+ smash
tasty-hunit
text
transformers
@@ -164226,6 +164940,7 @@ self: {
optics-core
prettyprinter
QuickCheck
+ smash
tasty
tasty-expected-failure
tasty-hunit
@@ -164233,7 +164948,7 @@ self: {
vector
];
description = "Standalone IR for Cardano scripts";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -164286,7 +165001,7 @@ self: {
semirings
];
description = "Coya monoids";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -164321,7 +165036,7 @@ self: {
text
];
description = "Haskell bindings to the CozoDB C API";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -164637,7 +165352,7 @@ self: {
vector-algorithms
];
description = "Competitive programming problemsetting toolchain";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -164675,40 +165390,6 @@ self: {
) { };
cpphs = callPackage (
- {
- mkDerivation,
- base,
- directory,
- polyparse,
- time,
- }:
- mkDerivation {
- pname = "cpphs";
- version = "1.20.9.1";
- sha256 = "17wi7fma2qaqdm1hwgaam3fd140v9bpa8ky0wg708h1pqc5v2nbz";
- revision = "2";
- editedCabalFile = "0vxav36p0kplp4dpd17i4cfzrsl3r437d840xwv83lf1bqp7mrxc";
- 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";
- mainProgram = "cpphs";
- }
- ) { };
-
- cpphs_1_20_10 = callPackage (
{
mkDerivation,
base,
@@ -164736,7 +165417,6 @@ self: {
];
description = "A liberalised re-implementation of cpp, the C pre-processor";
license = "LGPL";
- hydraPlatforms = lib.platforms.none;
mainProgram = "cpphs";
}
) { };
@@ -164835,19 +165515,21 @@ self: {
mkDerivation,
base,
containers,
+ deepseq,
directory,
parallel,
}:
mkDerivation {
pname = "cpsa";
- version = "4.4.6";
- sha256 = "02x57fxwxcs16kn8dgr4pxjx0nrvvlwg3sm05hlipbycyaqwncmf";
+ version = "4.4.7";
+ sha256 = "131ri7wj5lsbsqm9rvcmrsdgb9mls24nf1rjcz9bylxxaizchm39";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
executableHaskellDepends = [
base
containers
+ deepseq
directory
parallel
];
@@ -164885,7 +165567,7 @@ self: {
executableHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "A library to detect CPU features";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "cpu-features-demo";
}
) { };
@@ -164909,7 +165591,7 @@ self: {
enumset
];
description = "Binding for the cpuid machine instruction on x86 compatible processors";
- license = lib.licenses.gpl2Only;
+ license = lib.licensesSpdx."GPL-2.0-only";
platforms = lib.platforms.x86;
}
) { };
@@ -165053,6 +165735,67 @@ self: {
}
) { };
+ cql_4_1_0_0 = callPackage (
+ {
+ mkDerivation,
+ base,
+ bytestring,
+ containers,
+ Decimal,
+ iproute,
+ network,
+ persist,
+ QuickCheck,
+ tasty,
+ tasty-hunit,
+ tasty-quickcheck,
+ template-haskell,
+ text,
+ time,
+ transformers,
+ uuid,
+ vector,
+ }:
+ mkDerivation {
+ pname = "cql";
+ version = "4.1.0.0";
+ sha256 = "1qvkbnchf56khzvabl1s00sf7p0qdpafb88jqvvgf9gn916pfz30";
+ libraryHaskellDepends = [
+ base
+ bytestring
+ containers
+ Decimal
+ iproute
+ network
+ persist
+ template-haskell
+ text
+ time
+ transformers
+ uuid
+ vector
+ ];
+ testHaskellDepends = [
+ base
+ bytestring
+ Decimal
+ iproute
+ network
+ persist
+ QuickCheck
+ tasty
+ tasty-hunit
+ tasty-quickcheck
+ text
+ time
+ uuid
+ ];
+ description = "Cassandra CQL binary protocol";
+ license = lib.licensesSpdx."0BSD";
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
cql-io = callPackage (
{
mkDerivation,
@@ -165144,6 +165887,113 @@ self: {
}
) { };
+ cql-io_2_0_0 = callPackage (
+ {
+ mkDerivation,
+ async,
+ attoparsec,
+ auto-update,
+ base,
+ bluefin,
+ bytestring,
+ containers,
+ cql,
+ crypton,
+ data-default-class,
+ Decimal,
+ exceptions,
+ formatting,
+ hashable,
+ HsOpenSSL,
+ iproute,
+ lens,
+ mtl,
+ mwc-random,
+ network,
+ persist,
+ primes,
+ QuickCheck,
+ random-shuffle,
+ raw-strings-qq,
+ retry,
+ semigroups,
+ semver,
+ stm,
+ tasty,
+ tasty-hunit,
+ tasty-quickcheck,
+ text,
+ time,
+ transformers,
+ unliftio-core,
+ unordered-containers,
+ uuid,
+ vector,
+ }:
+ mkDerivation {
+ pname = "cql-io";
+ version = "2.0.0";
+ sha256 = "1mzhyjn5apyivsq55knp4b4d4w5q16vzck660haf0r94rdfk6p8p";
+ libraryHaskellDepends = [
+ async
+ attoparsec
+ auto-update
+ base
+ bluefin
+ bytestring
+ containers
+ cql
+ crypton
+ data-default-class
+ exceptions
+ hashable
+ HsOpenSSL
+ iproute
+ lens
+ mtl
+ mwc-random
+ network
+ persist
+ random-shuffle
+ retry
+ semigroups
+ semver
+ stm
+ text
+ time
+ transformers
+ unliftio-core
+ unordered-containers
+ uuid
+ vector
+ ];
+ testHaskellDepends = [
+ async
+ base
+ containers
+ cql
+ Decimal
+ formatting
+ iproute
+ mtl
+ primes
+ QuickCheck
+ raw-strings-qq
+ tasty
+ tasty-hunit
+ tasty-quickcheck
+ text
+ time
+ uuid
+ ];
+ doHaddock = false;
+ description = "Cassandra CQL client";
+ license = lib.licenses.mpl20;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }
+ ) { };
+
cql-io-tinylog = callPackage (
{
mkDerivation,
@@ -165591,7 +166441,7 @@ self: {
tasty-golden
];
description = "Crack various integer and floating-point data formats";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "crackNum";
}
@@ -166100,7 +166950,7 @@ self: {
criterion
];
description = "crc32c";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
platforms = lib.platforms.x86;
}
) { };
@@ -166205,7 +167055,7 @@ self: {
transformers
];
description = "Garbage collected event folding CRDT";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -166278,7 +167128,7 @@ self: {
test-framework-quickcheck2
];
description = "Framework for artificial life experiments";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -166484,7 +167334,7 @@ self: {
unliftio
];
description = "Reasoning about amortized time complexity";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "creditmonad";
}
) { };
@@ -167020,7 +167870,7 @@ self: {
vector
];
description = "A simple tool for comparing in Criterion benchmark results";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "criterion-cmp";
broken = true;
@@ -167561,7 +168411,7 @@ self: {
unliftio
];
description = "Encryption and decryption";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -167600,7 +168450,7 @@ self: {
text
];
description = "Dead simple broken links checker on local HTML folders";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
mainProgram = "croque-mort";
}
) { };
@@ -167681,7 +168531,7 @@ self: {
what4
];
description = "Crucible is a library for language-agnostic symbolic simulation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -167746,7 +168596,7 @@ self: {
text
];
description = "An interactive debugger for Crucible programs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "crucible-debug";
broken = true;
@@ -167835,7 +168685,7 @@ self: {
what4
];
description = "Support for translating and executing LLVM code in Crucible";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -167902,7 +168752,7 @@ self: {
what4
];
description = "An implementation of symbolic I/O primitives for Crucible";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -167964,7 +168814,7 @@ self: {
what4
];
description = "A syntax for reading and writing Crucible control-flow graphs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -168121,7 +168971,7 @@ self: {
yaml
];
description = "Simple top-level library for Crucible Simulation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -168246,7 +169096,7 @@ self: {
what4
];
description = "A verification tool for C programs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -168498,7 +169348,7 @@ self: {
QuickCheck
];
description = "An educational tool for studying classical cryptography schemes";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -169013,7 +169863,7 @@ self: {
tasty-hunit
];
description = "Adaptation of the crypto-rng library for the effectful ecosystem";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -169557,10 +170407,8 @@ self: {
}:
mkDerivation {
pname = "cryptohash-sha512";
- version = "0.11.102.0";
- sha256 = "0b48qwgyn68rfbq4fh6fmsk1kc07n8qq95217n8gjnlzvsh2395z";
- revision = "5";
- editedCabalFile = "1nxnkm5j402rdzv6gigh6dn8y9xbn2b6ql548aswphgvfargj1hd";
+ version = "0.11.103.0";
+ sha256 = "1iwd6my8msqi2hyb10lzmq6w1xrh1pf91lfwdhrj1qwmz6v7zp30";
libraryHaskellDepends = [
base
bytestring
@@ -169580,7 +170428,7 @@ self: {
criterion
];
description = "Fast, pure and practical SHA-512 implementation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -169831,7 +170679,7 @@ self: {
];
doHaddock = false;
description = "Cryptol: The Language of Cryptography";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -170552,8 +171400,8 @@ self: {
}:
mkDerivation {
pname = "cryptostore";
- version = "0.3.1.0";
- sha256 = "0fqwzhk2zqfl6313sd77a9rkx98f5q8582ay0qkkjqx1ni719kvi";
+ version = "0.4.0.0";
+ sha256 = "0zkwbfxw6xb940ill8d9naxb7gjb9hxh0k01p4jrf36f56cpq6kd";
libraryHaskellDepends = [
asn1-encoding
asn1-types
@@ -171547,7 +172395,7 @@ self: {
transformers
];
description = "extracts data from a CSV file";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -172009,7 +172857,7 @@ self: {
];
doHaddock = false;
description = "Haskell Implementation of Cuckoo Filters";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -172249,7 +173097,7 @@ self: {
tree-diff
];
description = "CDDL Generator and test utilities";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "cuddle";
broken = true;
@@ -172300,7 +173148,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Support for construction, rendering, and parsing of CUE sheets";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -172562,7 +173410,7 @@ self: {
text
];
description = "Curly braces (brackets) expanding";
- license = lib.licenses.lgpl3Only;
+ license = lib.licensesSpdx."LGPL-3.0-only";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -172984,20 +173832,29 @@ self: {
curryer-rpc = callPackage (
{
mkDerivation,
+ asn1-types,
async,
base,
binary,
bytestring,
containers,
criterion,
+ crypton-x509,
+ crypton-x509-store,
+ crypton-x509-system,
+ data-default,
+ directory,
exceptions,
fast-builder,
+ filepath,
hashable,
network,
network-byte-order,
optparse-generic,
+ process,
stm,
stm-containers,
+ streaming-commons,
streamly,
streamly-bytestring,
streamly-core,
@@ -173005,21 +173862,27 @@ self: {
tasty-hunit,
text,
time,
+ tls,
uuid,
winery,
}:
mkDerivation {
pname = "curryer-rpc";
- version = "0.4.0";
- sha256 = "0a0jlnwc58zj2lyk0flpqw3ccgiwd75mlwlkcad56ilfi7mgrwd0";
+ version = "0.5.0";
+ sha256 = "1ksz7ixgaqhmxwf8kxixf4zm3d4mbrfd8wbpf0dbagv7870q565d";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
+ asn1-types
async
base
binary
bytestring
containers
+ crypton-x509
+ crypton-x509-store
+ crypton-x509-system
+ data-default
exceptions
fast-builder
hashable
@@ -173027,10 +173890,13 @@ self: {
network-byte-order
stm
stm-containers
+ streaming-commons
streamly
streamly-bytestring
streamly-core
+ text
time
+ tls
uuid
winery
];
@@ -173045,13 +173911,17 @@ self: {
async
base
bytestring
+ directory
+ filepath
network
+ process
stm
streamly-bytestring
streamly-core
tasty
tasty-hunit
text
+ tls
winery
];
benchmarkHaskellDepends = [
@@ -173511,7 +174381,7 @@ self: {
template-haskell
];
description = "Customizable string interpolation quasiquoters";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -173761,7 +174631,7 @@ self: {
text
];
description = "Common Vulnerability Scoring System";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -174074,7 +174944,7 @@ self: {
];
doHaddock = false;
description = "Digits 0-9";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -174337,6 +175207,8 @@ self: {
];
description = "Binary parsing and serialization with integrated size";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -174534,6 +175406,7 @@ self: {
];
description = "Network protocol helpers for Dahdit";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
}
) { };
@@ -174738,7 +175611,7 @@ self: {
];
doHaddock = false;
description = "Servant support for lucid2";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -174918,8 +175791,8 @@ self: {
}:
mkDerivation {
pname = "dap";
- version = "0.2.0.0";
- sha256 = "04qv9k6ci2mgw5l39ac6c2kb9d0lby7774zwzr53iqv2xp44hp9l";
+ version = "0.3.0.0";
+ sha256 = "1svn07322j8y77sdnlqsr4rq2w2790ypnvihk34ij86i5vs9jyhn";
libraryHaskellDepends = [
aeson
aeson-pretty
@@ -175188,7 +176061,7 @@ self: {
mv contrib/darcs_completion $out/share/bash-completion/completions/darcs
'';
description = "a distributed, interactive, smart revision control system";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
mainProgram = "darcs";
}
) { };
@@ -176563,7 +177436,7 @@ self: {
QuickCheck
];
description = "Simple functional ring type";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -176603,7 +177476,7 @@ self: {
constraints
];
description = "Define Backwards Compatibility Schemes for Arbitrary Data";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -176724,7 +177597,7 @@ self: {
];
doHaddock = false;
description = "Fast and safe implementation of common compiler machinery";
- license = lib.licenses.agpl3Only;
+ license = lib.licensesSpdx."AGPL-3.0-only";
}
) { };
@@ -176749,7 +177622,7 @@ self: {
mtl
];
description = "A class for types with a default value";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -176761,7 +177634,7 @@ self: {
sha256 = "1d6m12yv5vjciwbig484jrv9qpy7v762k51rpalcimhbzg231r8a";
libraryHaskellDepends = [ data-default ];
description = "A class for types with a default value (compatibility shim)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -176867,7 +177740,7 @@ self: {
data-default-class
];
description = "Default instances for types in base";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -176938,7 +177811,7 @@ self: {
data-default-class
];
description = "Default instances for types in containers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -176961,7 +177834,7 @@ self: {
dlist
];
description = "Default instances for types in dlist";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -177005,7 +177878,7 @@ self: {
old-locale
];
description = "Default instances for types in old-locale";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -177338,7 +178211,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "A basic framework for effect systems based on effects represented by GADTs";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -177376,7 +178249,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "A basic framework for effect systems based on effects represented by GADTs";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -177427,7 +178300,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Template Haskell utilities for the data-effects library";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -177453,7 +178326,7 @@ self: {
primitive
];
description = "Coerce between unlifted boxed and lifted types";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -177793,7 +178666,7 @@ self: {
hashable
];
description = "Fixpoint data types";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -177869,6 +178742,8 @@ self: {
];
description = "Fold function applications. Framework for variadic functions.";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -177898,7 +178773,7 @@ self: {
HUnit
];
description = "Specify that lifted values were forced to WHNF or NF";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -177920,7 +178795,7 @@ self: {
hspec
];
description = "A simple multi-way tree data structure";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -177988,7 +178863,7 @@ self: {
distributive
];
description = "Updatable analogue of Distributive functors";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -178390,6 +179265,8 @@ self: {
libraryHaskellDepends = [ base ];
description = "A list but with a balanced enumeration of Cartesian product";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -178760,7 +179637,7 @@ self: {
text
];
description = "Read PDF form fields";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "pdfreader";
broken = true;
@@ -178830,7 +179707,7 @@ self: {
raw-strings-qq
];
description = "Prometheus metrics text format";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -178884,7 +179761,7 @@ self: {
test-framework-quickcheck2
];
description = "R-Tree is a spatial data structure similar to Quadtrees or B-Trees";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -178909,7 +179786,7 @@ self: {
transformers
];
description = "Unify STRef and IORef in plain Haskell 98";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -179004,7 +179881,7 @@ self: {
unordered-containers
];
description = "Data.Reify for GADTs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "example-ast";
}
) { };
@@ -179619,7 +180496,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "SVD (System view description) file handling";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "pretty-svd";
}
) { };
@@ -179908,7 +180785,7 @@ self: {
vector
];
description = "Dynamic growable resizable mutable generic vector";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -180029,7 +180906,7 @@ self: {
sha256 = "1zq9xsiky6mf0b0n83za0y8w28fl4gf53h49d1zd220dqmxx057q";
libraryHaskellDepends = [ base ];
description = "Encryption library";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -180216,7 +181093,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Datadog tracing client and mock agent";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "datadog-agent";
}
@@ -180459,16 +181336,18 @@ self: {
attoparsec,
base,
bytestring,
+ bytestring-lexing,
containers,
criterion,
directory,
- filepath,
+ granite,
hashable,
HUnit,
+ process,
random,
random-shuffle,
- snappy,
- statistics,
+ snappy-hs,
+ template-haskell,
text,
time,
vector,
@@ -180477,8 +181356,8 @@ self: {
}:
mkDerivation {
pname = "dataframe";
- version = "0.2.0.2";
- sha256 = "0h4p5lbcka15zn5iqzvjsq2bwc3c1ivia5jf6p2gns8d0di9swbd";
+ version = "0.3.3.4";
+ sha256 = "0s2mjndzn5nly4fmrw6ada8px1mvh9ha18hfflidy3ky3ljbmiis";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -180486,12 +181365,15 @@ self: {
attoparsec
base
bytestring
+ bytestring-lexing
containers
directory
- filepath
+ granite
hashable
- snappy
- statistics
+ process
+ random
+ snappy-hs
+ template-haskell
text
time
vector
@@ -180499,20 +181381,10 @@ self: {
zstd
];
executableHaskellDepends = [
- array
- attoparsec
base
- bytestring
- containers
- directory
- hashable
- snappy
- statistics
- text
+ random
time
vector
- vector-algorithms
- zstd
];
testHaskellDepends = [
base
@@ -180526,124 +181398,35 @@ self: {
benchmarkHaskellDepends = [
base
criterion
- random
- text
- vector
+ process
];
- description = "An intuitive, dynamically-typed DataFrame library";
- license = lib.licenses.gpl3Plus;
+ description = "A fast, safe, and intuitive DataFrame library";
+ license = lib.licensesSpdx."GPL-3.0-or-later";
mainProgram = "dataframe";
}
) { };
- dataframe_0_3_0_4 = callPackage (
+ dataframe-hasktorch = 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,
+ dataframe,
+ hasktorch,
vector,
- vector-algorithms,
- zstd,
}:
mkDerivation {
- pname = "dataframe";
- version = "0.3.0.4";
- sha256 = "1s18jscs5x4m274v18zgbv0cx4m5x4jda1imacjd56jg7h0vd6sk";
- isLibrary = true;
- isExecutable = true;
+ pname = "dataframe-hasktorch";
+ version = "0.1.0.2";
+ sha256 = "1vm21jzfda3bx3xb60907dpr5a5rv99lcv7371p4xlq1j5njm76i";
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
+ dataframe
+ hasktorch
vector
];
- description = "A fast, safe, and intuitive DataFrame library";
- license = lib.licenses.gpl3Plus;
- hydraPlatforms = lib.platforms.none;
- mainProgram = "dataframe";
+ testHaskellDepends = [ base ];
+ description = "Converts between dataframes and hasktorch tensors";
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -181259,7 +182042,7 @@ self: {
criterion
];
description = "Generation and traversal of compressed directed acyclic dawg graphs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -181282,7 +182065,7 @@ self: {
kan-extensions
];
description = "A comonoid w.r.t. Day";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -182988,8 +183771,8 @@ self: {
}:
mkDerivation {
pname = "dear-imgui";
- version = "2.3.1";
- sha256 = "0pj973isqpnrg8zd4w5z50abd90cd4dnhdpy5i5ai8k24ak5mkp1";
+ version = "2.4.0";
+ sha256 = "1dzgcmz24yg3pird2gmxqhdnmwkydh54wym2x6lxq0r0dx3jphwz";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -183020,7 +183803,7 @@ self: {
];
doHaddock = false;
description = "Haskell bindings for Dear ImGui";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -183128,7 +183911,7 @@ self: {
text
];
description = "Modules for working with the Debian package system";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -183224,7 +184007,7 @@ self: {
tasty-quickcheck
];
description = "de Bruijn indices and levels";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -183247,7 +184030,7 @@ self: {
some
];
description = "de Bruijn indices and levels";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -183590,7 +184373,7 @@ self: {
tasty-golden
];
description = "Like Debug.Trace but writing to files.";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -183676,7 +184459,7 @@ self: {
optparse-applicative
];
description = "Utilities for making your applications more debuggable";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -184093,7 +184876,7 @@ self: {
witherable
];
description = "Deeply-nested, multiple key type maps";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -184418,7 +185201,7 @@ self: {
stm
];
description = "Candidate NFData Instances for Types in base";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -184531,7 +185314,7 @@ self: {
semigroupoids
];
description = "Applicative maps";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -184578,7 +185361,7 @@ self: {
tasty-quickcheck
];
description = "Abstractions over deferred folds";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -184874,7 +185657,7 @@ self: {
sop-core
];
description = "Defunctionalization helpers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -184896,7 +185679,7 @@ self: {
singleton-bool
];
description = "Defunctionalization helpers: booleans";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -184910,7 +185693,7 @@ self: {
sha256 = "0yy02va22bhxk1gl1m1k4c84sc788g891p5m81mr3bai5y7vq402";
libraryHaskellDepends = [ base ];
description = "Defunctionalization helpers: core definitions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -184931,7 +185714,7 @@ self: {
sop-core
];
description = "Defunctionalization helpers: lists";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -185135,7 +185918,7 @@ self: {
Unique
];
description = "Delaunay tessellation";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -185276,7 +186059,7 @@ self: {
base
];
description = "Parse bounce messages per RFC3464, RFC3463";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -185404,7 +186187,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Facilities for storing a Haskell value, using delta types";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -185437,7 +186220,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Delta types, also known as change actions";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -185450,6 +186233,8 @@ self: {
Chart,
criterion,
deepseq,
+ diagrams-lib,
+ diagrams-svg,
hspec,
hspec-discover,
hvega,
@@ -185462,14 +186247,16 @@ self: {
}:
mkDerivation {
pname = "deltaq";
- version = "1.0.0.0";
- sha256 = "00zpvwxar13rq84li7j21ycapdnyx128cs2yqvn6hwnrr8w25w9d";
+ version = "1.1.0.0";
+ sha256 = "06f71mikkmxpvpywl3ydss1knwy9pd3x9klbxfiz985v9q5nb4ja";
revision = "1";
- editedCabalFile = "1i4lkq6w34ik7csx6wpwy4by2vbdijilpynwjf9kr7dfn5ac2gz1";
+ editedCabalFile = "1g9l29msxa2w3yzv3xnvhhzgh1a2vc3s7g39g6rbx9rdx1xw68kc";
libraryHaskellDepends = [
base
Chart
deepseq
+ diagrams-lib
+ diagrams-svg
lattices
probability-polynomial
];
@@ -185492,7 +186279,7 @@ self: {
vector
];
description = "Framework for ∆Q System Development";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -185558,7 +186345,7 @@ self: {
transformers
];
description = "Demangler for C++ mangled names";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "demangle";
broken = true;
@@ -185825,7 +186612,7 @@ self: {
unliftio-core
];
description = "Dependency injection for records-of-functions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -185895,7 +186682,7 @@ self: {
unliftio-core
];
description = "Giving good advice to functions in records-of-functions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -185958,7 +186745,7 @@ self: {
unordered-containers
];
description = "A dynamic environment for dependency injection";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -186016,7 +186803,7 @@ self: {
unliftio-core
];
description = "Pair resources files with types within your program";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -186088,7 +186875,7 @@ self: {
some
];
description = "A generalisation of EnumMap to dependent types";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -186233,6 +187020,31 @@ self: {
}
) { };
+ dependent-map_0_4_0_1 = callPackage (
+ {
+ mkDerivation,
+ base,
+ constraints-extras,
+ containers,
+ dependent-sum,
+ }:
+ mkDerivation {
+ pname = "dependent-map";
+ version = "0.4.0.1";
+ sha256 = "1picb90vw5kp1j7dgzrrx0qhwh9vkkkwkfk42vkb3bx8awy2x8sd";
+ libraryHaskellDepends = [
+ base
+ constraints-extras
+ containers
+ dependent-sum
+ ];
+ description = "Dependent finite maps (partial dependent products)";
+ license = lib.licensesSpdx."BSD-3-Clause";
+ hydraPlatforms = lib.platforms.none;
+ maintainers = [ lib.maintainers.alexfmpe ];
+ }
+ ) { };
+
dependent-monoidal-map = callPackage (
{
mkDerivation,
@@ -186622,7 +187434,7 @@ self: {
tasty-quickcheck
];
description = "Double-ended queues";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -186876,7 +187688,7 @@ self: {
HUnit
];
description = "This package generates data constructor predicate functions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -186957,7 +187769,7 @@ self: {
primitive-unaligned
];
description = "Derive Prim and PrimUnaligned";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -187040,7 +187852,9 @@ self: {
mkDerivation,
base,
binary,
+ bytestring,
containers,
+ ghc,
haskell-src,
HUnit,
mtl,
@@ -187053,8 +187867,8 @@ self: {
}:
mkDerivation {
pname = "derive-topdown";
- version = "0.1.0.0";
- sha256 = "0pxv77r769wg61pp51ibvkd256f2cyrd9k5mrqz68dwi76xk54hr";
+ version = "0.1.1.0";
+ sha256 = "1ixgy4bmcmkp00cn28kikgkg9ln6pl5wyibrbk8hckf2wpamy0c3";
libraryHaskellDepends = [
base
containers
@@ -187069,7 +187883,9 @@ self: {
testHaskellDepends = [
base
binary
+ bytestring
containers
+ ghc
haskell-src
HUnit
mtl
@@ -187082,6 +187898,8 @@ self: {
];
description = "Derive type class instances";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -187167,7 +187985,7 @@ self: {
bytestring
];
description = "Type driven generic aeson instance customisation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -187269,7 +188087,7 @@ self: {
HUnit
];
description = "Derive a Show instance without field selector names";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -187310,7 +188128,7 @@ self: {
unliftio-core
];
description = "Derive instances for monad transformer stacks";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -187392,7 +188210,7 @@ self: {
HUnit
];
description = "Parse and render JSON simply";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "derulo";
broken = true;
@@ -187450,7 +188268,7 @@ self: {
transformers
];
description = "Combinators for describing binary data structures";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -187978,7 +188796,7 @@ self: {
text
];
description = "Conversion between Devanagari Unicode, Harvard-Kyoto, IAST and ISO15919";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -188195,7 +189013,7 @@ self: {
xmlbf
];
description = "Render and parse df1 logs as HTML";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -188327,7 +189145,7 @@ self: {
unordered-containers
];
description = "A generic data integrity layer";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "dfinity-radix-tree-example";
}
@@ -188762,7 +189580,7 @@ self: {
];
doCheck = false;
description = "A configuration language guaranteed to terminate";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "dhall";
maintainers = [ lib.maintainers.Gabriella439 ];
}
@@ -189512,7 +190330,7 @@ self: {
yasi
];
description = "Convert recursive ADTs from and to Dhall";
- license = lib.licenses.cc0;
+ license = lib.licensesSpdx."CC0-1.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -189591,7 +190409,7 @@ self: {
unordered-containers
];
description = "Encrypt Decrypt Dhall expressions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "dhall-secret";
}
@@ -189664,7 +190482,7 @@ self: {
text
];
description = "Render dhall text with shell commands as function arguments";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "dhall-text-shell";
broken = true;
@@ -189741,7 +190559,7 @@ self: {
text
];
description = "Compile Dhall expressions to Cabal files";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -190019,8 +190837,8 @@ self: {
}:
mkDerivation {
pname = "dhscanner-ast";
- version = "1.1.1";
- sha256 = "1bg93w9897ijh28gb13y41slwq5fxr6s9p3q13m8hzv9rva7zzhm";
+ version = "1.1.2";
+ sha256 = "0a98wz9b1d4qpl6d06s48djkgrccgriqd29sz8zk3fcrz0b24r5a";
libraryHaskellDepends = [
aeson
base
@@ -190032,7 +190850,7 @@ self: {
random
];
description = "abstract syntax tree for multiple programming languages";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -190050,8 +190868,8 @@ self: {
}:
mkDerivation {
pname = "dhscanner-bitcode";
- version = "1.0.7";
- sha256 = "0z0hqn3f3p5wyk1l93rc14992snbxm2jsda624ix9p2jqj4b104j";
+ version = "1.0.10";
+ sha256 = "0b9b7swrpdy09yj1sqg50xpbarjgh154r6j1ii4xl827x82gs3l3";
libraryHaskellDepends = [
aeson
base
@@ -190066,7 +190884,7 @@ self: {
random
];
description = "Intermediate language for static code analysis";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -190083,8 +190901,8 @@ self: {
}:
mkDerivation {
pname = "dhscanner-kbgen";
- version = "1.0.1";
- sha256 = "19iadc90zg2239h7kffkfgpy3kwdqac75f1r77adn5f9igyaj0pk";
+ version = "1.0.7";
+ sha256 = "1z7l1q9ijk2xzy94vpbkjsx74zccp2a1b3qbjfmhfh5gkpk3gyvv";
libraryHaskellDepends = [
aeson
base
@@ -190093,7 +190911,7 @@ self: {
dhscanner-bitcode
];
description = "knowledge base predicates for static code analysis";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -191334,6 +192152,8 @@ self: {
pname = "diagrams-pandoc";
version = "0.4.1";
sha256 = "1gil467zp3n6wymiw4d492izf1hhac01j4nafmahjh4ybvi840xr";
+ revision = "1";
+ editedCabalFile = "1pk9asxd89098hrqdvavk7hrqca9msmfvmk2ncs6kj6n5xifybgd";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -191377,7 +192197,7 @@ self: {
text
];
description = "A Pandoc filter to express diagrams inline using the Haskell EDSL _Diagrams_";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "diagrams-pandoc";
}
) { };
@@ -191444,16 +192264,13 @@ self: {
process,
split,
texrunner,
- time,
vector,
zlib,
}:
mkDerivation {
pname = "diagrams-pgf";
- version = "1.5";
- sha256 = "13zm00ayyk6gvlh4l2wdmrdqic386v69i3krylgvrajhdsd050al";
- revision = "1";
- editedCabalFile = "0vzi1dim76arwjrh9yqb9l2004ffsir8rws4vx26is5wzxsqf8y1";
+ version = "1.5.0.1";
+ sha256 = "0xx4zcqks3n67ffxvvq6vjw0iv2xnc5i2yjbvqmxjkkak4kxif2g";
libraryHaskellDepends = [
base
bytestring
@@ -191471,7 +192288,6 @@ self: {
process
split
texrunner
- time
vector
zlib
];
@@ -191875,7 +192691,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "A Dialogflow Fulfillment library for Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -191903,7 +192719,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "I/O in Haskell Report 1.2";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "examples";
}
) { };
@@ -191995,7 +192811,7 @@ self: {
random-fu
];
description = "Simplistic D&D style dice-rolling system";
- license = lib.licenses.unlicense;
+ license = lib.licensesSpdx."Unlicense";
mainProgram = "dice";
}
) { };
@@ -192333,7 +193149,7 @@ self: {
show-combinators
];
description = "Map file locations across diffs";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -192712,7 +193528,7 @@ self: {
];
libraryPkgconfigDepends = [ zlib ];
description = "CRC32 and Adler32 hashes for bytestrings";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { inherit (pkgs) zlib; };
@@ -193250,8 +194066,8 @@ self: {
}:
mkDerivation {
pname = "digits";
- version = "0.3.1";
- sha256 = "0b3arnnwqw53cb2xqmy4j66nw9y6wrazb545qkka9y6w8nbrqjd8";
+ version = "0.3.2";
+ sha256 = "0rvi00scga0ckgp9vhcw4924cmbikw036p1nqfpb7j0adagjvzg5";
libraryHaskellDepends = [
base
QuickCheck
@@ -193261,7 +194077,7 @@ self: {
QuickCheck
];
description = "Converts integers to lists of digits and back";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -193303,7 +194119,7 @@ self: {
QuickCheck
];
description = "Directed Graphs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -194234,7 +195050,7 @@ self: {
unix
];
description = "Platform-agnostic library for filesystem operations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -194401,6 +195217,8 @@ self: {
pname = "directory-ospath-streaming";
version = "0.2.2";
sha256 = "1xsfaps14pm68qfva4crqsmpqqcl8yjxrv514a6mxc9xw6z8zphs";
+ revision = "1";
+ editedCabalFile = "0gva9izvl69784297aazmhwm96sd85clwg1j69ksfhicw0nc8kmj";
libraryHaskellDepends = [
atomic-counter
base
@@ -194420,7 +195238,51 @@ self: {
unix
];
description = "Stream directory entries in constant memory in vanilla IO";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
+ }
+ ) { };
+
+ directory-ospath-streaming_0_3 = callPackage (
+ {
+ mkDerivation,
+ atomic-counter,
+ base,
+ deepseq,
+ directory,
+ filepath,
+ os-string,
+ random,
+ tasty,
+ tasty-hunit,
+ unix,
+ }:
+ mkDerivation {
+ pname = "directory-ospath-streaming";
+ version = "0.3";
+ sha256 = "0hhgy7slx1sbmg9d198r7q970f2n91224gpa8d4qzj8p9m7yx1ky";
+ revision = "1";
+ editedCabalFile = "160q5cz246zla09nkg91jgwbfi1a8pz6zandfndqwf2dx2nsxgvd";
+ libraryHaskellDepends = [
+ atomic-counter
+ base
+ deepseq
+ 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.licensesSpdx."Apache-2.0";
+ hydraPlatforms = lib.platforms.none;
}
) { };
@@ -194575,7 +195437,7 @@ self: {
vector
];
description = "Multivariate Dirichlet distribution";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.dschrempf ];
}
) { };
@@ -194799,7 +195661,7 @@ self: {
tasty-golden
];
description = "Functional programming language for teaching discrete math";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "disco";
broken = true;
@@ -195508,7 +196370,7 @@ self: {
tasty-quickcheck
];
description = "Disjoint containers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -195631,7 +196493,7 @@ self: {
text
];
description = "On-disk storage, but referentially transparent";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -196052,7 +196914,7 @@ self: {
network-transport-tcp
];
description = "Cloud Haskell: Erlang-style concurrency in Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -196092,7 +196954,7 @@ self: {
tasty-hunit
];
description = "Cloud Haskell Async API";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -196201,7 +197063,7 @@ self: {
tasty-hunit
];
description = "The Cloud Haskell Application Platform";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -196280,7 +197142,7 @@ self: {
tasty-hunit
];
description = "Execution Framework for The Cloud Haskell Application Platform";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -196335,7 +197197,7 @@ self: {
tasty-quickcheck
];
description = "Cloud Haskell Extras";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -196770,7 +197632,7 @@ self: {
tasty-hunit
];
description = "Simple zero-configuration backend for Cloud Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -196835,7 +197697,7 @@ self: {
tasty-hunit
];
description = "Supervisors for The Cloud Haskell Application Platform";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -196862,7 +197724,7 @@ self: {
stm
];
description = "Cloud Haskell Test Support";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -197004,7 +197866,7 @@ self: {
tasty
];
description = "Tests and test support tools for distributed-process";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -197098,7 +197960,7 @@ self: {
rank1dynamic
];
description = "Compositional, type-safe, polymorphic static values and closures";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -197366,7 +198228,7 @@ self: {
witherable
];
description = "Unifying Parsers, Printers & Grammars";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -197389,7 +198251,7 @@ self: {
text
];
description = "ditto is a type-safe HTML form generation and validation library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -197644,7 +198506,7 @@ self: {
pretty
];
description = "Generate Haskell code from a type";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "djinn";
}
) { };
@@ -197747,8 +198609,8 @@ self: {
}:
mkDerivation {
pname = "djot";
- version = "0.1.2.2";
- sha256 = "17fqnzacnnraij9lwca25761sn5gaxjd42vnpmd397fdzd5dm6fh";
+ version = "0.1.2.3";
+ sha256 = "0jcccq9y95byqxm13aghcz59sqbv1qai7488bw5ma57dz96kppdm";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -197786,7 +198648,7 @@ self: {
tasty-bench
];
description = "Parser and renderer for djot light markup syntax";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "djoths";
}
) { };
@@ -197857,7 +198719,7 @@ self: {
}
) { };
- dl-fedora_2_1 = callPackage (
+ dl-fedora_2_1_1 = callPackage (
{
mkDerivation,
base,
@@ -197883,8 +198745,8 @@ self: {
}:
mkDerivation {
pname = "dl-fedora";
- version = "2.1";
- sha256 = "1j0p9nz5nk7bgmsrzw1asaangcwchld9sy9v1wdbswxv31cja2n3";
+ version = "2.1.1";
+ sha256 = "1qj8k9di8v5m0n9fy1ysb7iwnq50bnh22gml50wgps0ycl8qcvh1";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -198400,7 +199262,7 @@ self: {
text
];
description = "DNS name parsing and pattern matching utilities";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -198655,7 +199517,7 @@ self: {
time
];
description = "DigitalOcean Spaces API bindings";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -199910,7 +200772,7 @@ self: {
transformers
];
description = "Run doctest's in a Cabal.Test.exitcode-stdio environment";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -199946,7 +200808,7 @@ self: {
utility-ht
];
description = "Alternative doctest implementation that extracts comments to modules";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "doctest-extract-0.1";
maintainers = [ lib.maintainers.thielema ];
}
@@ -199960,7 +200822,7 @@ self: {
sha256 = "1hb3zx1xzib3v41blnwcbhc2v0rzwdzq7gm4sajqndimwjkkxc67";
libraryHaskellDepends = [ base ];
description = "Parts of doctest exposed as library";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -200505,7 +201367,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "A cross-platform dotfiles manager";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "dojang";
}
@@ -200674,7 +201536,6 @@ self: {
];
description = "Simple monadic DOM parser";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}
) { };
@@ -200776,7 +201637,7 @@ self: {
th-orphans
];
description = "Codegen helping you define domain models";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -200821,7 +201682,7 @@ self: {
rerebase
];
description = "Integration of domain with aeson";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -200904,7 +201765,7 @@ self: {
rerebase
];
description = "Integration of domain with cereal";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -200929,7 +201790,7 @@ self: {
th-lift-instances
];
description = "Low-level API of \"domain\"";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -200964,7 +201825,7 @@ self: {
rerebase
];
description = "Integration of domain with optics";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -201375,7 +202236,7 @@ self: {
text
];
description = "Datatypes and encoding for graphviz dot files";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -201678,8 +202539,8 @@ self: {
}:
mkDerivation {
pname = "dotparse";
- version = "0.1.2.3";
- sha256 = "0r5dzf30shd2piisn8a1z0i8y31h0xlr55is4dyj7zg7l87i16g4";
+ version = "0.1.3.0";
+ sha256 = "1rhd4bd2796hl5w8p7hrqpwjaq76ma37k7578m4b1gzy4j6l0gqv";
libraryHaskellDepends = [
algebraic-graphs
base
@@ -201700,7 +202561,7 @@ self: {
doctest-parallel
];
description = "dot language parsing and printing";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -201738,7 +202599,7 @@ self: {
text
];
description = "Fast conversion between single and double precision floating point and text";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -202113,7 +202974,7 @@ self: {
vector-space
];
description = "Reverse mode automatic differentiation";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -202746,7 +203607,7 @@ self: {
relude
];
description = "See README for more info";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "dr-cabal";
broken = true;
@@ -202848,7 +203709,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "Actor library for Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -203127,7 +203988,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Deriving without spelling out \"deriving\"";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -203712,7 +204573,7 @@ self: {
QuickCheck
];
description = "Haskell Digital Signal Processing";
- license = lib.licenses.gpl2Only;
+ license = lib.licensesSpdx."GPL-2.0-only";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -203797,7 +204658,7 @@ self: {
vector
];
description = "DSV (delimiter-separated values)";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -204111,7 +204972,7 @@ self: {
doctest
];
description = "Automatically generate dual constructions";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
maintainers = [ lib.maintainers.sellout ];
broken = true;
@@ -204180,6 +205041,63 @@ self: {
}
) { };
+ duckdb-ffi = callPackage (
+ {
+ mkDerivation,
+ base,
+ bytestring,
+ Cabal,
+ containers,
+ directory,
+ duckdb,
+ exceptions,
+ filepath,
+ mtl,
+ process,
+ tasty,
+ tasty-expected-failure,
+ tasty-hunit,
+ text,
+ time,
+ transformers,
+ }:
+ mkDerivation {
+ pname = "duckdb-ffi";
+ version = "1.4.1.3";
+ sha256 = "1drn5raf1phaqbac3svkww0gs21h51sh1kpmwnvz0xxk5ksmp3lk";
+ setupHaskellDepends = [
+ base
+ Cabal
+ directory
+ filepath
+ process
+ ];
+ libraryHaskellDepends = [
+ base
+ bytestring
+ containers
+ exceptions
+ mtl
+ text
+ time
+ transformers
+ ];
+ librarySystemDepends = [ duckdb ];
+ testHaskellDepends = [
+ base
+ tasty
+ tasty-expected-failure
+ tasty-hunit
+ text
+ time
+ ];
+ description = "Haskell FFI bindings for DuckDB";
+ license = lib.licensesSpdx."MPL-2.0";
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }
+ ) { inherit (pkgs) duckdb; };
+
duckdb-haskell = callPackage (
{
mkDerivation,
@@ -204206,7 +205124,61 @@ self: {
vector
];
description = "Haskell bindings for duckdb";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
+ }
+ ) { };
+
+ duckdb-simple = callPackage (
+ {
+ mkDerivation,
+ array,
+ base,
+ bytestring,
+ containers,
+ duckdb-ffi,
+ QuickCheck,
+ tasty,
+ tasty-expected-failure,
+ tasty-hunit,
+ tasty-quickcheck,
+ text,
+ time,
+ transformers,
+ uuid,
+ }:
+ mkDerivation {
+ pname = "duckdb-simple";
+ version = "0.1.2.3";
+ sha256 = "07i67sm28c87jwm36x5y6v4m67jwdby3rjj4hap1k336ri6kcz2i";
+ libraryHaskellDepends = [
+ array
+ base
+ bytestring
+ containers
+ duckdb-ffi
+ text
+ time
+ transformers
+ uuid
+ ];
+ testHaskellDepends = [
+ array
+ base
+ bytestring
+ containers
+ duckdb-ffi
+ QuickCheck
+ tasty
+ tasty-expected-failure
+ tasty-hunit
+ tasty-quickcheck
+ text
+ time
+ uuid
+ ];
+ description = "Haskell FFI bindings for DuckDB";
+ license = lib.licensesSpdx."MPL-2.0";
+ hydraPlatforms = lib.platforms.none;
}
) { };
@@ -204296,7 +205268,7 @@ self: {
unordered-containers
];
description = "A Haskell library for parsing text into structured data";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -204600,7 +205572,7 @@ self: {
tasty-hunit
];
description = "Duplicate any closure";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -204744,7 +205716,7 @@ self: {
filepath
];
description = "durable/atomic file system writes (from rio package)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -205132,7 +206104,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "A minimal testing library";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -205258,7 +206230,7 @@ self: {
generics-sop
];
description = "Programatically identify space leaks in your program";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -205493,6 +206465,25 @@ self: {
}
) { };
+ dynamic-array = callPackage (
+ {
+ mkDerivation,
+ base,
+ primdata,
+ }:
+ mkDerivation {
+ pname = "dynamic-array";
+ version = "0.1.3";
+ sha256 = "1rd5yvj5hqvd24hwq2g7h3f6zkachkbk7zk0s03hrkim0i0839db";
+ libraryHaskellDepends = [
+ base
+ primdata
+ ];
+ description = "Minimum-overhead mutable dynamic arrays";
+ license = lib.licenses.mit;
+ }
+ ) { };
+
dynamic-cabal = callPackage (
{
mkDerivation,
@@ -206349,7 +207340,7 @@ self: {
vector
];
description = "Configure dzen2 bars in Dhall language";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "dzen-dhall";
broken = true;
@@ -206414,7 +207405,7 @@ self: {
transformers
];
description = "An event-oriented observability library";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -206458,7 +207449,7 @@ self: {
unordered-containers
];
description = "OpenTelemetry-based rendering for e11y";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -206592,7 +207583,7 @@ self: {
vector
];
description = "Binding to C++ earcut library";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -207081,7 +208072,7 @@ self: {
time
];
description = "A Haskell description of the eBird API";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -207123,7 +208114,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "A command-line utility for interacting with the eBird API";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "ebird-cli";
}
@@ -207156,7 +208147,7 @@ self: {
text
];
description = "Client functions for querying the eBird API";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -207537,6 +208528,31 @@ self: {
}
) { };
+ ecstatic = callPackage (
+ {
+ mkDerivation,
+ base,
+ directory,
+ process,
+ }:
+ mkDerivation {
+ pname = "ecstatic";
+ version = "0.1.0.0";
+ sha256 = "1l7qhn5lzh39w1lscdc4lm6r6rxniidns98s4943vc6vyafyrzmw";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base
+ directory
+ process
+ ];
+ executableHaskellDepends = [ base ];
+ description = "Build \"as static as possible\" executable on Linux";
+ license = lib.licensesSpdx."MIT";
+ mainProgram = "ecstatic";
+ }
+ ) { };
+
ecta = callPackage (
{
mkDerivation,
@@ -207672,7 +208688,7 @@ self: {
text
];
description = "Hole-Fit Synthesis using ECTAs";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -207888,7 +208904,7 @@ self: {
text
];
description = "Templating language with similar syntax and features to Liquid or Jinja2";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "ede";
broken = true;
@@ -208672,7 +209688,7 @@ self: {
unliftio
];
description = "An easy to use, performant extensible effects library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -208707,7 +209723,7 @@ self: {
unliftio-core
];
description = "An easy to use, performant extensible effects library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -208742,7 +209758,7 @@ self: {
text
];
description = "effectful support for high-level PostgreSQL operations via Opaleye";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -208768,7 +209784,7 @@ self: {
effectful-core
];
description = "A GHC plugin for improving disambiguation of effects";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -208793,7 +209809,7 @@ self: {
unliftio-pool
];
description = "effectful support for mid-level PostgreSQL operations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -208814,7 +209830,7 @@ self: {
primitive
];
description = "`ST`-style mutation for `effectful`";
- license = lib.licenses.cc0;
+ license = lib.licensesSpdx."CC0-1.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -208849,7 +209865,7 @@ self: {
effectful-core
];
description = "Template Haskell utilities for the effectful library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -208952,7 +209968,7 @@ self: {
testToolDepends = [ tasty-discover ];
doHaddock = false;
description = "Effectful effects for testing";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -209585,7 +210601,7 @@ self: {
transformers
];
description = "Minimalistic SMTP client for Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -209715,7 +210731,7 @@ self: {
executableHaskellDepends = [ base ];
executableToolDepends = [ markdown-unlit ];
description = "IO with Exceptions tracked on the type-level";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "readme";
broken = true;
@@ -209738,6 +210754,8 @@ self: {
pname = "either";
version = "5.0.3";
sha256 = "00a8h2jgrpqdlsi8vjrm2qa6rmw33ksirxv9s6i90nlmhhg6jrkd";
+ revision = "1";
+ editedCabalFile = "1kxv5srzblkva3ajiw8jrzj05jbjncwj499hcsk9zsyml9ig9if3";
libraryHaskellDepends = [
base
bifunctors
@@ -209802,7 +210820,7 @@ self: {
doctest
];
description = "Functions involving lists of Either";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -209839,7 +210857,7 @@ self: {
hspec-discover
];
description = "The simplest ‘MonadFail’ instance";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -209851,7 +210869,7 @@ self: {
sha256 = "0llfkcq1j7l09vhn38s1asin90ki2xzkpr9xxqpvx0jvpdppza7i";
libraryHaskellDepends = [ base ];
description = "Either with a stricter Semigroup instance";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -209921,7 +210939,7 @@ self: {
vector
];
description = "Binding to EJDB2 C library, an embedded JSON noSQL database";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -210524,7 +211542,7 @@ self: {
unpacked-maybe-text
];
description = "Serialization of Elasticsearch requests and responses";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -211769,7 +212787,7 @@ self: {
];
doHaddock = false;
description = "Crossing the road between Haskell and Elm";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -212068,7 +213086,7 @@ self: {
text
];
description = "Generate Elm datatype definitions, encoders and decoders from Haskell datatypes";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "generate-test-app-code";
}
) { };
@@ -212201,8 +213219,8 @@ self: {
}:
mkDerivation {
pname = "elsa";
- version = "0.2.2.0";
- sha256 = "0389g6i5jkwlh218ywlysvadm4qqsk1kz4manjsz7xwnmz3m7jlm";
+ version = "0.3.0.0";
+ sha256 = "1gxlcplbqxixahkgmvgrc1754svdmqp4ri1acx3sc4yxnqd1z7h9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -212263,7 +213281,7 @@ self: {
tlynx
];
description = "Validate and (optionally) redo ELynx analyses";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
mainProgram = "elynx";
maintainers = [ lib.maintainers.dschrempf ];
}
@@ -212296,7 +213314,7 @@ self: {
tlynx
];
description = "Validate and (optionally) redo ELynx analyses";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "elynx";
maintainers = [ lib.maintainers.dschrempf ];
@@ -212352,7 +213370,7 @@ self: {
];
benchmarkHaskellDepends = [ base ];
description = "Simulate molecular sequences along trees";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
maintainers = [ lib.maintainers.dschrempf ];
}
) { };
@@ -212406,7 +213424,7 @@ self: {
];
benchmarkHaskellDepends = [ base ];
description = "Simulate molecular sequences along trees";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
maintainers = [ lib.maintainers.dschrempf ];
}
@@ -212434,7 +213452,7 @@ self: {
hspec
];
description = "Import and export Nexus files";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
maintainers = [ lib.maintainers.dschrempf ];
}
) { };
@@ -212461,7 +213479,7 @@ self: {
hspec
];
description = "Import and export Nexus files";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
maintainers = [ lib.maintainers.dschrempf ];
}
@@ -212512,7 +213530,7 @@ self: {
vector
];
description = "Handle molecular sequences";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
maintainers = [ lib.maintainers.dschrempf ];
}
) { };
@@ -212562,7 +213580,7 @@ self: {
vector
];
description = "Handle molecular sequences";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
maintainers = [ lib.maintainers.dschrempf ];
}
@@ -212607,7 +213625,7 @@ self: {
zlib
];
description = "Tools for ELynx";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
maintainers = [ lib.maintainers.dschrempf ];
}
) { };
@@ -212651,7 +213669,7 @@ self: {
zlib
];
description = "Tools for ELynx";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
maintainers = [ lib.maintainers.dschrempf ];
}
@@ -212720,7 +213738,7 @@ self: {
random
];
description = "Handle phylogenetic trees";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
maintainers = [ lib.maintainers.dschrempf ];
}
) { };
@@ -212787,7 +213805,7 @@ self: {
random
];
description = "Handle phylogenetic trees";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
maintainers = [ lib.maintainers.dschrempf ];
}
@@ -212857,7 +213875,7 @@ self: {
websockets
];
description = "Static site generator library with hot reload";
- license = lib.licenses.agpl3Only;
+ license = lib.licensesSpdx."AGPL-3.0-only";
}
) { };
@@ -212908,7 +213926,7 @@ self: {
url-slug
];
description = "Useful route types for Ema";
- license = lib.licenses.agpl3Only;
+ license = lib.licensesSpdx."AGPL-3.0-only";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -212952,7 +213970,7 @@ self: {
url-slug
];
description = "Generic deriving for Ema routes";
- license = lib.licenses.agpl3Only;
+ license = lib.licensesSpdx."AGPL-3.0-only";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -213043,7 +214061,59 @@ self: {
void
];
description = "Utilities to write Emacs dynamic modules";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
+ }
+ ) { };
+
+ emacs-module_0_3 = callPackage (
+ {
+ mkDerivation,
+ base,
+ bytestring,
+ deepseq,
+ exceptions,
+ filepath,
+ monad-control,
+ monad-interleave,
+ mtl,
+ os-string,
+ prettyprinter,
+ prettyprinter-combinators,
+ primitive,
+ template-haskell,
+ text,
+ transformers-base,
+ tuples-homogenous-h98,
+ vector,
+ void,
+ }:
+ mkDerivation {
+ pname = "emacs-module";
+ version = "0.3";
+ sha256 = "0z00h71nyzijpvgalq12g1d1l2lw6d8jp9hhjdsy44la4yn2j4jk";
+ libraryHaskellDepends = [
+ base
+ bytestring
+ deepseq
+ exceptions
+ filepath
+ monad-control
+ monad-interleave
+ mtl
+ os-string
+ prettyprinter
+ prettyprinter-combinators
+ primitive
+ template-haskell
+ text
+ transformers-base
+ tuples-homogenous-h98
+ vector
+ void
+ ];
+ description = "Utilities to write Emacs dynamic modules";
+ license = lib.licensesSpdx."Apache-2.0";
+ hydraPlatforms = lib.platforms.none;
}
) { };
@@ -213232,7 +214302,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base ];
description = "Perform basic syntax and deliverability checks on email addresses";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
mainProgram = "email-validator";
}
) { };
@@ -213623,8 +214693,7 @@ self: {
yaml
];
description = "Emanate a structured view of your plain-text notes";
- license = lib.licenses.agpl3Only;
- badPlatforms = [ "x86_64-darwin" ];
+ license = lib.licensesSpdx."AGPL-3.0-only";
hydraPlatforms = lib.platforms.none;
mainProgram = "emanote";
broken = true;
@@ -213731,7 +214800,7 @@ self: {
chronos
];
description = "execute actions periodically while avoiding drift";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -213930,7 +214999,7 @@ self: {
transformers
];
description = "Embedded shell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -215188,7 +216257,7 @@ self: {
deepseq
];
description = "Enum wrappers for IntMap and IntSet";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -215258,7 +216327,7 @@ self: {
template-haskell
];
description = "TH-generated EnumSet/EnumMap wrappers around IntSet/IntMap";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -215331,7 +216400,7 @@ self: {
sha256 = "0xm9638nkikfy62abims10jmmr9y3rm2vb22aqh4qmjcj4r37ibq";
libraryHaskellDepends = [ base ];
description = "Conditionally running IO actions based on environment variables";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -215582,7 +216651,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Provides FromEnv in envy instance for Record of extensible";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -215875,7 +216944,7 @@ self: {
numhask
];
description = "See readme.md";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -216090,7 +217159,7 @@ self: {
zip-archive
];
description = "Library for parsing epub document metadata";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
mainProgram = "epub-metadata-example";
}
) { };
@@ -216142,7 +217211,7 @@ self: {
regex-compat
];
description = "Command line utilities for working with epub files";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -216253,7 +217322,7 @@ self: {
void
];
description = "Proof assistant for Haskell using DataKinds & PolyKinds";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -216322,7 +217391,7 @@ self: {
time
];
description = "Application level triggered, and edge triggered event multiqueues";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -216506,7 +217575,7 @@ self: {
websockets
];
description = "Decentralized messaging and synchronization";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "erebos";
broken = true;
@@ -216566,7 +217635,7 @@ self: {
unix
];
description = "Test framework with virtual network using Linux namespaces";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
platforms = lib.platforms.linux;
mainProgram = "erebos-tester";
}
@@ -216829,7 +217898,7 @@ self: {
time
];
description = "Generic API client library for ERPNext";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -216870,7 +217939,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Source code error pretty printing";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "errata-example";
}
) { };
@@ -216916,7 +217985,7 @@ self: {
doctest
];
description = "The canonical error type";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -216975,7 +218044,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Error code functions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -218209,7 +219278,7 @@ self: {
wkt-geom
];
description = "postgis bindings for esqueleto";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -218290,7 +219359,7 @@ self: {
transformers
];
description = "PostgreSQL full text search for Esqueleto";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -218367,7 +219436,7 @@ self: {
vector-sized
];
description = "General purpose live coding framework";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.turion ];
}
) { };
@@ -219484,7 +220553,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Mathematics utilities for Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -219680,7 +220749,7 @@ self: {
unix
];
description = "Bindings to libevdev";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
platforms = lib.platforms.linux;
}
) { inherit (pkgs) libevdev; };
@@ -219718,7 +220787,7 @@ self: {
unix
];
description = "Bridge for working with evdev and streamly";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
platforms = lib.platforms.linux;
hydraPlatforms = lib.platforms.none;
broken = true;
@@ -220372,6 +221441,146 @@ self: {
}
) { };
+ eventlog-live = callPackage (
+ {
+ mkDerivation,
+ ansi-terminal,
+ base,
+ bytestring,
+ dlist,
+ ghc-events,
+ hashable,
+ machines,
+ network,
+ optparse-applicative,
+ text,
+ unliftio-core,
+ unordered-containers,
+ }:
+ mkDerivation {
+ pname = "eventlog-live";
+ version = "0.3.0.0";
+ sha256 = "0m0wwjazqb03v9ppilp0kr75zd49kbjnbhdsl4v81gg8p2wn3xgn";
+ libraryHaskellDepends = [
+ ansi-terminal
+ base
+ bytestring
+ dlist
+ ghc-events
+ hashable
+ machines
+ network
+ optparse-applicative
+ text
+ unliftio-core
+ unordered-containers
+ ];
+ description = "Live processing of eventlog data";
+ license = lib.licensesSpdx."BSD-3-Clause";
+ }
+ ) { };
+
+ eventlog-live-influxdb = callPackage (
+ {
+ mkDerivation,
+ base,
+ clock,
+ containers,
+ dlist,
+ eventlog-live,
+ ghc-events,
+ influxdb,
+ lens-family,
+ machines,
+ optparse-applicative,
+ text,
+ }:
+ mkDerivation {
+ pname = "eventlog-live-influxdb";
+ version = "0.2.0.0";
+ sha256 = "03biydj51vfs0kh9c4i457ppk3qkr11lp5y7jbyfkg1nfd4cyf76";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base
+ clock
+ containers
+ dlist
+ eventlog-live
+ ghc-events
+ influxdb
+ lens-family
+ machines
+ optparse-applicative
+ text
+ ];
+ description = "Stream eventlog data into InfluxDB";
+ license = lib.licensesSpdx."BSD-3-Clause";
+ hydraPlatforms = lib.platforms.none;
+ mainProgram = "eventlog-live-influxdb";
+ broken = true;
+ }
+ ) { };
+
+ eventlog-live-otelcol = callPackage (
+ {
+ mkDerivation,
+ aeson,
+ base,
+ bytestring,
+ data-default,
+ dlist,
+ eventlog-live,
+ ghc-events,
+ grapesy,
+ hashable,
+ hs-opentelemetry-otlp,
+ lens-family,
+ machines,
+ optparse-applicative,
+ proto-lens,
+ random,
+ text,
+ unordered-containers,
+ vector,
+ yaml,
+ }:
+ mkDerivation {
+ pname = "eventlog-live-otelcol";
+ version = "0.3.0.0";
+ sha256 = "1jxh4n14sidygy6z64nsfv8jq1bgi60kf6lka4nfkscyvz0mgi31";
+ revision = "1";
+ editedCabalFile = "1kgfd7nszj9rpc2k0frwmpj52pkfyb6grnl7ig2p5hpzp2l6lwxl";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson
+ base
+ bytestring
+ data-default
+ dlist
+ eventlog-live
+ ghc-events
+ grapesy
+ hashable
+ hs-opentelemetry-otlp
+ lens-family
+ machines
+ optparse-applicative
+ proto-lens
+ random
+ text
+ unordered-containers
+ vector
+ yaml
+ ];
+ description = "Stream eventlog data to the OpenTelemetry Collector";
+ license = lib.licensesSpdx."BSD-3-Clause";
+ hydraPlatforms = lib.platforms.none;
+ mainProgram = "eventlog-live-otelcol";
+ }
+ ) { };
+
eventlog-socket = callPackage (
{ mkDerivation, base }:
mkDerivation {
@@ -220380,7 +221589,7 @@ self: {
sha256 = "0rlwasd1hamyhpn4h3kk3s5sfhxvc1j8sz4nkxnmch6xgcqcp4yl";
libraryHaskellDepends = [ base ];
description = "Stream GHC eventlog events to external processes";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -220453,7 +221662,7 @@ self: {
text
];
description = "Visualise an eventlog";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "eventlog2html";
maintainers = [ lib.maintainers.maralorn ];
}
@@ -220982,7 +222191,7 @@ self: {
unliftio-core
];
description = "An event-oriented observability library";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -221045,7 +222254,7 @@ self: {
warp
];
description = "Grab bag of eventuo11y-enriched functionality";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -221065,7 +222274,7 @@ self: {
template-haskell
];
description = "DSL for defining eventuo11y fields and selectors";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -221100,7 +222309,7 @@ self: {
uuid
];
description = "aeson-based rendering for eventuo11y";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -221124,7 +222333,7 @@ self: {
text
];
description = "OpenTelemetry-based rendering for eventuo11y";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -221148,7 +222357,7 @@ self: {
prometheus
];
description = "Prometheus backend for eventuo11y";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -221445,7 +222654,7 @@ self: {
tasty-hunit
];
description = "Exact Kantorovich distance between finite probability measures";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -221559,7 +222768,7 @@ self: {
libraryHaskellDepends = [ base ];
executableHaskellDepends = [ base ];
description = "Example Haskell Project";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "example-haskell-project";
}
) { };
@@ -221813,7 +223022,7 @@ self: {
}
) { };
- exceptions_0_10_10 = callPackage (
+ exceptions_0_10_11 = callPackage (
{
mkDerivation,
base,
@@ -221828,8 +223037,8 @@ self: {
}:
mkDerivation {
pname = "exceptions";
- version = "0.10.10";
- sha256 = "1cddmj2y5h2hqjgmk14c698g8hhq0x2rycdl5vgz8vvzzsg83zq8";
+ version = "0.10.11";
+ sha256 = "1v3gyzy3yjs4ph6jz97ivgddy0saa3rkmxsxfm9fdp7mzlb2z9ai";
libraryHaskellDepends = [
base
mtl
@@ -222260,7 +223469,7 @@ self: {
xml-optics
];
description = "A library for crawling exhentai";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -222403,7 +223612,7 @@ self: {
vector
];
description = "Haskell bindings to ExifTool";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -222995,6 +224204,8 @@ self: {
pname = "exon";
version = "1.7.2.0";
sha256 = "120cd6n7sqpakyk91izjblk92vc9bzr1a3bcskzkpky512mw47wm";
+ revision = "2";
+ editedCabalFile = "0kp3yymv09cjbcx4ljkkh370j9pcjz4gxv2kdmvwik1awgcjwix4";
libraryHaskellDepends = [
base
ghc
@@ -223016,7 +224227,7 @@ self: {
incipit-base
];
description = "Customizable quasiquote interpolation";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
}
) { };
@@ -223198,6 +224409,7 @@ self: {
];
description = "Extensible Pandoc";
license = "LGPL";
+ hydraPlatforms = lib.platforms.none;
}
) { };
@@ -223509,7 +224721,7 @@ self: {
hspec
];
description = "Predicates that can explain themselves";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -223578,7 +224790,7 @@ self: {
transformers
];
description = "Exceptions which are explicit in the type signature";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -224126,7 +225338,7 @@ self: {
HUnit
];
description = "Support for an 80-bit extended float";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -224314,7 +225526,7 @@ self: {
template-haskell
];
description = "Extensible, efficient, optics-friendly data types and effects";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -224502,7 +225714,7 @@ self: {
unliftio
];
description = "Message passing concurrency as extensible-effect";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -224555,7 +225767,7 @@ self: {
extensible
];
description = "Operational-based extensible effect library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -224672,7 +225884,7 @@ self: {
text
];
description = "Parse Haskell Language Extensions";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "extensions";
}
@@ -224735,17 +225947,17 @@ self: {
text
];
description = "Parse Haskell Language Extensions";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
mainProgram = "extensions";
}
) { };
- extensions_0_1_0_3 = callPackage (
+ extensions_0_1_1_0 = callPackage (
{
mkDerivation,
base,
bytestring,
- Cabal,
+ Cabal-syntax,
colourista,
containers,
directory,
@@ -224760,16 +225972,14 @@ self: {
}:
mkDerivation {
pname = "extensions";
- version = "0.1.0.3";
- sha256 = "1fks1yfdk0zjc1vccj3nr6li09j64cq6b6x9s5mi8qrsv5igbzlm";
- revision = "3";
- editedCabalFile = "06a2yis43q7z4a7hakl8j0hm6wwrylf0f6k2lal4b5lh45dncl1p";
+ version = "0.1.1.0";
+ sha256 = "1v8hikf03p81rzg6cpiadzpbjljfc6q8dj4q8yr09nwgxcjij3h7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base
bytestring
- Cabal
+ Cabal-syntax
containers
directory
filepath
@@ -224797,7 +226007,7 @@ self: {
text
];
description = "Parse Haskell Language Extensions";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "extensions";
}
@@ -224861,7 +226071,7 @@ self: {
HUnit
];
description = "Extism bindings";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -224886,7 +226096,7 @@ self: {
json
];
description = "Extism manifest bindings";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -224922,7 +226132,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "Extism Plugin Development Kit";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -225384,7 +226594,7 @@ self: {
toolshed
];
description = "Rational arithmetic in an irrational world";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "factory";
broken = true;
@@ -226023,7 +227233,7 @@ self: {
QuickCheck
];
description = "Extensible fake file system for testing";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -226053,7 +227263,7 @@ self: {
QuickCheck
];
description = "Monad to pull from fake stream-like objects";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -226315,7 +227525,7 @@ self: {
tasty-hunit
];
description = "Property-based testing with internal integrated shrinking";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.maralorn ];
}
) { };
@@ -227277,6 +228487,8 @@ self: {
];
description = "A fast, but bare bones, bytestring parser combinators library";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -227348,7 +228560,7 @@ self: {
template-haskell
];
description = "A fast open-union type suitable for 100+ contained alternatives";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -227837,7 +229049,7 @@ self: {
HUnit
];
description = "Stubs for dependencies of test code";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -228008,7 +229220,7 @@ self: {
vector
];
description = "Various utility libraries";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -228322,7 +229534,7 @@ self: {
fcf-family
];
description = "Family-of-families instances for base";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -228404,7 +229616,7 @@ self: {
text
];
description = "Data structures and algorithms for first-class-families";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -228433,7 +229645,7 @@ self: {
first-class-families
];
description = "Family of families: featherweight defunctionalization";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -228679,7 +229891,7 @@ self: {
text
];
description = "Admin API for Firebase Cloud Messaging";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "fcm-client";
broken = true;
@@ -228806,7 +230018,7 @@ self: {
];
executablePkgconfigDepends = [ ncurses ];
description = "A terminal broughlike game about manipulating vision";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "fearOfView";
broken = true;
@@ -228993,7 +230205,7 @@ self: {
random
];
description = "Forward error correction of ByteStrings";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "benchmark-zfec";
broken = true;
@@ -229313,6 +230525,62 @@ self: {
}
) { };
+ fedora-repoquery_0_8 = callPackage (
+ {
+ mkDerivation,
+ base,
+ case-insensitive,
+ curl,
+ directory,
+ extra,
+ fedora-releases,
+ filepath,
+ Glob,
+ optparse-applicative,
+ regex-compat,
+ safe,
+ simple-cmd,
+ simple-cmd-args,
+ text,
+ time,
+ xdg-basedir,
+ }:
+ mkDerivation {
+ pname = "fedora-repoquery";
+ version = "0.8";
+ sha256 = "0fzydnlaalbnhkmdcsizrbwm7h3i44g29g2l514fw0lvc1s8ln9z";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base
+ case-insensitive
+ curl
+ directory
+ extra
+ fedora-releases
+ filepath
+ Glob
+ optparse-applicative
+ regex-compat
+ safe
+ simple-cmd
+ simple-cmd-args
+ text
+ time
+ xdg-basedir
+ ];
+ testHaskellDepends = [
+ base
+ simple-cmd
+ ];
+ description = "Fedora release repos package query tool";
+ license = lib.licenses.gpl3Only;
+ hydraPlatforms = lib.platforms.none;
+ mainProgram = "fedora-repoquery";
+ broken = true;
+ }
+ ) { };
+
fee-estimate = callPackage (
{
mkDerivation,
@@ -229833,7 +231101,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "Declarative feedback loop manager";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -229891,7 +231159,7 @@ self: {
executableSystemDepends = [ mxnet ];
executableToolDepends = [ c2hs ];
description = "FFI to MXNet";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "mxnet-op-gen";
}
@@ -229969,7 +231237,7 @@ self: {
store
];
description = "Cocodataset with cocoapi";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "imageutils";
broken = true;
@@ -230119,7 +231387,7 @@ self: {
vector
];
description = "Some datasets";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -230171,7 +231439,7 @@ self: {
store
];
description = "fei examples";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -230211,7 +231479,7 @@ self: {
vector
];
description = "A collection of standard models";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -230273,7 +231541,7 @@ self: {
wl-pprint-text
];
description = "Train a neural network with MXNet in Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -230642,7 +231910,7 @@ self: {
];
libraryToolDepends = [ c2hs ];
description = "C bindings plus conveniences for the festival tts system";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -230870,7 +232138,7 @@ self: {
unordered-containers
];
description = "Automatic C++ binding generation";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -230891,7 +232159,7 @@ self: {
template-haskell
];
description = "Runtime for fficxx-generated library";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -231064,7 +232332,7 @@ self: {
fftwFloat
];
description = "Low-level interface to FFTW (Fast Fourier Transform)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
)
@@ -231134,7 +232402,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "FFunctor typeclass";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -231272,7 +232540,7 @@ self: {
semirings
];
description = "fibonacci algebra";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -231459,7 +232727,7 @@ self: {
tasty-hunit
];
description = "Codegen Haskell types to other languages";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -231734,7 +233002,7 @@ self: {
temporary
];
description = "Basic file IO operations via 'OsPath'";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -231914,7 +233182,7 @@ self: {
tasty-bench
];
description = "File URI parsing";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -232151,7 +233419,7 @@ self: {
tasty-bench
];
description = "Library for manipulating FilePaths in a cross platform way";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -232436,7 +233704,7 @@ self: {
semigroups
];
description = "A shared set of abstractions and types for representing filessytem data";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -232726,7 +233994,7 @@ self: {
tagged
];
description = "Nat and Fin: peano naturals and finite numbers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -233159,7 +234427,7 @@ self: {
vector-sized
];
description = "A better, more type-safe Enum";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
}
) { };
@@ -233217,7 +234485,7 @@ self: {
vector
];
description = "Flexible and easy deriving of type classes for finitary types";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -233253,7 +234521,7 @@ self: {
optics-core
];
description = "Prisms and Isos between finitary types";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -233290,8 +234558,6 @@ self: {
];
description = "Finite ranges via types";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}
) { };
@@ -233412,7 +234678,7 @@ self: {
HUnit
];
description = "Operations and classification for finite semigroups";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -233803,8 +235069,8 @@ self: {
{ mkDerivation, base }:
mkDerivation {
pname = "first-class-families";
- version = "0.8.1.0";
- sha256 = "1zynw2nvclx3rqjpd9g78mrmhll11x59s21hjppqsgv47zbf5vmk";
+ version = "0.8.2.0";
+ sha256 = "19qpg3vh3qqad395vcs1blidh1ykncy72fcqmwl5g8a7ci8s8g6y";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "First-class type families";
@@ -233839,9 +235105,7 @@ self: {
template-haskell
];
description = "First-class typeclass instances";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -233860,7 +235124,7 @@ self: {
transformers
];
description = "First class patterns and pattern matching, using type families";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -234288,7 +235552,7 @@ self: {
text
];
description = "Fixes whitespace issues";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "fix-whitespace";
}
) { };
@@ -234324,7 +235588,7 @@ self: {
ghc-internal
];
description = "Fixed-point number build on generic integral number";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -234351,7 +235615,7 @@ self: {
utility-ht
];
description = "Lists with statically known length based on non-empty package";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -234497,7 +235761,7 @@ self: {
time
];
description = "Pure Haskell library to repeat an action at a specific frequency";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -234534,7 +235798,7 @@ self: {
template-haskell
];
description = "Generic vectors with statically known size";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -235179,7 +236443,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Complete high-level binding to libFLAC";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { inherit (pkgs) flac; };
@@ -235217,7 +236481,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Support for writing pictures into FLAC metadata blocks with JuicyPixels";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -235683,7 +236947,7 @@ self: {
parsec
];
description = "flatten a latex multi-file latex document and remove all comments";
- license = lib.licenses.gpl2Only;
+ license = lib.licensesSpdx."GPL-2.0-only";
mainProgram = "flat-tex";
}
) { };
@@ -235852,7 +237116,7 @@ self: {
text
];
description = "Flatbuffers encoding based on a syntax tree";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -235897,7 +237161,7 @@ self: {
text
];
description = "Parse flatbuffers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -235924,8 +237188,8 @@ self: {
}:
mkDerivation {
pname = "flatparse";
- version = "0.5.3.0";
- sha256 = "0lgj4w77nkwblnswriq2wddy1c732wir5qd70gm3hz9slv35pnwx";
+ version = "0.5.3.1";
+ sha256 = "1ylmrq0ca5k5yzkg64f39nxcp7ahmpl2qgpz30rxnjf2rmymi2hh";
libraryHaskellDepends = [
base
bytestring
@@ -236048,7 +237312,7 @@ self: {
text
];
description = "Flexible numeric parsers for real-world programming languages";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -236366,7 +237630,7 @@ self: {
];
libraryToolDepends = [ proto-lens-protoc ];
description = "Flink stateful functions SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -236717,7 +237981,7 @@ self: {
HUnit
];
description = "Write more understandable Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -238105,7 +239369,7 @@ self: {
criterion
];
description = "fnmatch C wrapper";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -238132,7 +239396,7 @@ self: {
tasty-hunit
];
description = "A general abstraction for manipulating elements of container data structures";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -238434,7 +239698,7 @@ self: {
safe-exceptions
];
description = "Exception handling with FoldM";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -238620,7 +239884,7 @@ self: {
lens-family-core
];
description = "Transducers for foldl folds";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -239006,7 +240270,7 @@ self: {
];
doHaddock = false;
description = "The folly C++ library from Meta";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -239134,7 +240398,7 @@ self: {
text
];
description = "Queries your system (Linux/BSD/etc) font database";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "fontconfig-pure";
broken = true;
@@ -239368,7 +240632,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "A collection of helpers for ffi";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -239810,7 +241074,7 @@ self: {
QuickCheck
];
description = "Formatting of doubles";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -239906,7 +241170,7 @@ self: {
text
];
description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -240068,7 +241332,7 @@ self: {
text
];
description = "Parse and serialize FDF, the Forms Data Format";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -240898,7 +242162,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "A formatter for Haskell source code";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "fourmolu";
}
@@ -241006,7 +242270,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "A formatter for Haskell source code";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "fourmolu";
}
@@ -241052,8 +242316,8 @@ self: {
}:
mkDerivation {
pname = "fourmolu";
- version = "0.19.0.0";
- sha256 = "0sq9sxj99bzzmc5bdynh9c91yxsgrl2c4n9kdhnj78p7w9mkqfnb";
+ version = "0.19.0.1";
+ sha256 = "1xawjckgf1jsdkdscmfnlqazx0lidbpwy3qjf94by48ld3vpyywm";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -241116,7 +242380,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "A formatter for Haskell source code";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "fourmolu";
}
) { };
@@ -241157,7 +242421,7 @@ self: {
tasty-bench
];
description = "IEEE 754-2019 compliant operations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -241355,7 +242619,7 @@ self: {
libraryPkgconfigDepends = [ fplll ];
testHaskellDepends = [ base ];
description = "Haskell bindings to ";
- license = lib.licenses.lgpl21Plus;
+ license = lib.licensesSpdx."LGPL-2.1-or-later";
hydraPlatforms = lib.platforms.none;
}
) { inherit (pkgs) fplll; };
@@ -241628,7 +242892,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Reference implementation of FractalText";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -241661,7 +242925,7 @@ self: {
sha256 = "0y2rkbmpzhn0zz273i1lfxv7f270yv89nmacs9m17rhjcj9n7243";
libraryHaskellDepends = [ base ];
description = "Numbers in the range [0.005, 1] as a sum of 2, 3, 4 or 5 unit fractions of special types.";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -241950,7 +243214,7 @@ self: {
process
];
description = "CLI frecency history";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "frecently";
}
) { };
@@ -242551,8 +243815,8 @@ self: {
}:
mkDerivation {
pname = "freckle-prelude";
- version = "0.0.3.0";
- sha256 = "0xnxrh3cniwlcjdjlxg1acdhfd51lpx2q112qhgynnfar866zbdc";
+ version = "0.0.4.0";
+ sha256 = "11qhlk66435qw2qkdmansd6x416ibck4xhd5298jciy53snhbhz8";
libraryHaskellDepends = [
base
containers
@@ -242785,7 +244049,7 @@ self: {
transformers
];
description = "Free algebras";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -242813,7 +244077,7 @@ self: {
transformers
];
description = "Free Applicative Transformer";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -242863,7 +244127,7 @@ self: {
criterion
];
description = "efficient data types for free categories and arrows";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -243046,7 +244310,7 @@ self: {
void
];
description = "Create games for free";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -243110,7 +244374,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Lawful list and set monad transformers based on free monads";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -243714,7 +244978,7 @@ self: {
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "Freer par monad";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -243764,7 +245028,7 @@ self: {
mtl
];
description = "A friendly effect system for Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "freer-simple-examples";
broken = true;
@@ -244113,7 +245377,7 @@ self: {
happy
];
description = "A functional DSL for vertex-centric large-scale graph processing";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "fregel";
broken = true;
@@ -244179,7 +245443,7 @@ self: {
gauge
];
description = "Are you ready to get freaky?";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -244230,7 +245494,7 @@ self: {
text-replace
];
description = "Identifies and replaces frequent subsequences in long strings";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "frequent-substring-exe";
}
@@ -244307,8 +245571,8 @@ self: {
}:
mkDerivation {
pname = "fresnel";
- version = "0.1.0.1";
- sha256 = "02d8d4m4msx7hxmp337zig07cvq7sci31f9x429w19bj43sp9j7g";
+ version = "0.1.0.2";
+ sha256 = "09jy2m20h0dazw6fakqh7kfwm7rwxhs7vfqr7plkx4229j9n9phx";
libraryHaskellDepends = [
base
containers
@@ -244327,7 +245591,7 @@ self: {
template-haskell
];
description = "high-powered optics in a small package";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -244350,7 +245614,7 @@ self: {
fused-effects
];
description = "fresnel/fused-effects integration";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -244512,7 +245776,7 @@ self: {
optparse-applicative
];
description = "Attempt to pretty-print any input";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "friendly";
}
) { };
@@ -244570,7 +245834,7 @@ self: {
semigroups
];
description = "Linear time composable parser for PEG grammars";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -244598,7 +245862,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Provides a generic way to construct values from environment variables";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -245035,7 +246299,7 @@ self: {
text
];
description = "Abstract interface for the file system";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -245080,10 +246344,8 @@ self: {
}:
mkDerivation {
pname = "fs-sim";
- version = "0.4.0.0";
- sha256 = "0wirx3mk2dmjw13adbf4d9qpgx7b9kk0y5my7s3yx1lsm2z9m4pw";
- revision = "1";
- editedCabalFile = "1lz7jaq5qp1pdc8dvahc3nl8csgpp0qplriqfnmrryn22dyqfi4s";
+ version = "0.4.1.0";
+ sha256 = "13igdxy6dnqdbvav7a66narfrckz0gaqwyih9wxra3pyf4jzzs9g";
libraryHaskellDepends = [
base
base16-bytestring
@@ -245118,7 +246380,7 @@ self: {
text
];
description = "Simulated file systems";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -245491,7 +246753,7 @@ self: {
unix
];
description = "Watch a file/directory and run a command when it's modified";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "fswatcher";
broken = true;
@@ -245896,7 +247158,7 @@ self: {
vector
];
description = "In-memory full text search engine";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -246697,7 +247959,7 @@ self: {
transformers
];
description = "FFunctor: functors on (the usual) Functors";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -246796,7 +248058,7 @@ self: {
transformers
];
description = "Convert values from one type into another";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -247065,7 +248327,7 @@ self: {
time
];
description = "GLL parser with simple combinator interface";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -247225,7 +248487,7 @@ self: {
sha256 = "0jf8yhk45n06avl9avgmawvazsz585i7jppvcds6pjd8pqdb2qk4";
libraryHaskellDepends = [ base ];
description = "Type-level function utilities";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -247268,7 +248530,7 @@ self: {
transformers
];
description = "A fast, flexible, fused effect system";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.mangoiv ];
}
) { };
@@ -247301,7 +248563,7 @@ self: {
];
testToolDepends = [ markdown-unlit ];
description = "Handle exceptions thrown in IO with fused-effects";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -247331,7 +248593,7 @@ self: {
microlens
];
description = "Monadic lens combinators for fused-effects";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -247375,7 +248637,7 @@ self: {
gauge
];
description = "High-quality random number generation as an effect";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -247398,7 +248660,7 @@ self: {
optics-core
];
description = "Bridge between the optics and fused-effects ecosystems";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -247421,7 +248683,7 @@ self: {
transformers
];
description = "Random number generation for fused-effects";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -247451,7 +248713,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "A readline-like effect and carrier for fused-effects";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -247537,7 +248799,7 @@ self: {
template-haskell
];
description = "Template Haskell helpers for fused-effects";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -247608,7 +248870,7 @@ self: {
transformers
];
description = "GHC plugin to make stream fusion more predictable";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -247620,7 +248882,7 @@ self: {
sha256 = "14lzymjna6faiwj7bdm1jrz42jfj3w1wi2hv66mldjhadf45613d";
libraryHaskellDepends = [ base ];
description = "Types for the fusion-plugin package";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -247775,7 +249037,7 @@ self: {
];
doHaddock = false;
description = "An optimising compiler for a functional, array-oriented language";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
mainProgram = "futhark";
maintainers = [ lib.maintainers.athas ];
}
@@ -247832,7 +249094,7 @@ self: {
vector
];
description = "An implementation of the Futhark data format";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -247871,7 +249133,7 @@ self: {
text
];
description = "Definition and serialisation instances for Futhark manifests";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -247904,7 +249166,7 @@ self: {
text
];
description = "Client implementation of the Futhark server protocol";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -248173,7 +249435,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Tools for processing unstructured text data";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -248324,7 +249586,7 @@ self: {
tasty-hunit
];
description = "Library for constructing and manipulating fuzzy sets and fuzzy relations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -248366,7 +249628,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Fuzzy text matching";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "bench";
broken = true;
@@ -248451,7 +249713,7 @@ self: {
vector
];
description = "Fuzzy set data structure for approximate string matching";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -248647,6 +249909,8 @@ self: {
];
description = "Interface to the FXPak/FXPak Pro USB interface";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -249107,7 +250371,7 @@ self: {
hspec
];
description = "Composable, streaming, and efficient left folds";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -249403,7 +250667,7 @@ self: {
sha256 = "0r8wybcqn7g24q8abrw757h76r75l4jh4hjx91yh44h4c1r6k4yf";
doHaddock = false;
description = "TBA";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -249807,7 +251071,7 @@ self: {
yaml
];
description = "A library for downloading data from a Great Black Swamp server";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -250859,7 +252123,7 @@ self: {
x509
];
description = "a simple Gemini capsule (server)";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -250958,7 +252222,7 @@ self: {
transformers
];
description = "A simple Happstack-style Gemini router";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -250993,7 +252257,7 @@ self: {
utf8-string
];
description = "A lightweight server for the Gemini protocol";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -251040,7 +252304,7 @@ self: {
transformers
];
description = "A barebones textboard for the Gemini protocol";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "gemini-textboard";
}
) { };
@@ -251066,7 +252330,7 @@ self: {
text
];
description = "a tiny gemtext parser";
- license = lib.licenses.lgpl3Plus;
+ license = lib.licensesSpdx."LGPL-3.0-or-later";
}
) { };
@@ -251156,7 +252420,7 @@ self: {
unordered-containers
];
description = "yet another static gemlog generator + converter";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
}
) { };
@@ -251309,7 +252573,7 @@ self: {
text
];
description = "A library for interacting with various generative AI LLMs";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -251472,7 +252736,7 @@ self: {
transformers
];
description = "Exception-safe resource management in more monads";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -251747,7 +253011,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Generic case analysis";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -252007,7 +253271,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Generic structural diffs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -252049,7 +253313,7 @@ self: {
sha256 = "0f83fnvmmi4yvdn9i2r1vkpk6cy4lqpxgjv26f380akyf30av90p";
libraryHaskellDepends = [ base ];
description = "Generically derived enumerations";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -252122,7 +253386,7 @@ self: {
inspection-testing
];
description = "Generically extract and replace collections of record fields";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -252277,7 +253541,7 @@ self: {
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "Monomorphic field lens like with generic-lens";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -252290,7 +253554,7 @@ self: {
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "Derive Bounded and Enum for sum types and Enum for product types";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -252332,7 +253596,7 @@ self: {
generics-sop
];
description = "First class pattern matching";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -252510,7 +253774,7 @@ self: {
optics-core
];
description = "Monomorphic field opics like with generic-lens";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -255363,7 +256627,7 @@ self: {
QuickCheck
];
description = "Terrestrial coordinate systems and geodetic calculations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -255698,7 +256962,7 @@ self: {
];
testSystemDepends = [ geos ];
description = "Bindings for GEOS";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -255745,7 +257009,7 @@ self: {
time
];
description = "A gerrit client library";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -255892,7 +257156,7 @@ self: {
th-lift-instances
];
description = "gettext-th can internationalise a haskell program without runtime dependencies";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -255916,7 +257180,7 @@ self: {
HUnit
];
description = "The family of Extreme Value Distributions";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -256039,6 +257303,44 @@ self: {
}
) { };
+ gh = callPackage (
+ {
+ mkDerivation,
+ base,
+ hspec,
+ hspec-discover,
+ process,
+ relude,
+ which,
+ }:
+ mkDerivation {
+ pname = "gh";
+ version = "0.2.0.0";
+ sha256 = "1lj1wz2b1wxhvcs7zww5ljs87v41xic3pj12fa7j58s41a6q5gkg";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base
+ process
+ relude
+ which
+ ];
+ executableHaskellDepends = [
+ base
+ hspec
+ hspec-discover
+ process
+ relude
+ which
+ ];
+ description = "Haskell bindings for gh CLI";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ mainProgram = "gh-test";
+ broken = true;
+ }
+ ) { };
+
gh-labeler = callPackage (
{
mkDerivation,
@@ -256187,7 +257489,7 @@ self: {
happy
];
description = "The GHC API";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
)
@@ -256248,7 +257550,7 @@ self: {
ghc-bignum
];
description = "Backwards-compatible orphan instances for ghc-bignum";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -256290,7 +257592,7 @@ self: {
unix
];
description = "Shared functionality between GHC and its boot libraries";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -256320,7 +257622,7 @@ self: {
testHaskellDepends = [ base ];
doHaddock = false;
description = "\"GHC.ByteOrder\" API Compatibility Layer";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -256430,6 +257732,20 @@ self: {
}
) { };
+ ghc-compat = callPackage (
+ { mkDerivation, base }:
+ mkDerivation {
+ pname = "ghc-compat";
+ version = "0.1.0.1";
+ sha256 = "0vb55bx45cdcf4sfvpkc4wx8zgi7h6bzchp4s66ndmqr5p0br3ld";
+ libraryHaskellDepends = [ base ];
+ description = "GHC compatibility for MicroHs";
+ license = lib.licensesSpdx."Apache-2.0";
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }
+ ) { };
+
ghc-core = callPackage (
{
mkDerivation,
@@ -256617,7 +257933,7 @@ self: {
vty-crossplatform
];
description = "A simple TUI using ghc-debug";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "ghc-debug-brick";
maintainers = [ lib.maintainers.maralorn ];
}
@@ -256682,7 +257998,7 @@ self: {
vector
];
description = "Useful functions for writing heap analysis tools which use ghc-debug";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -256725,7 +258041,7 @@ self: {
unordered-containers
];
description = "Connect to a socket created by ghc-debug-stub and analyse the heap of the debuggee program";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -256746,7 +258062,7 @@ self: {
filepath
];
description = "Definitions needed by ghc-debug-stub and ghc-debug-common";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -256771,7 +258087,7 @@ self: {
ghc-prim
];
description = "Functions for instrumenting your application so the heap can be analysed with ghc-debug-common";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.maralorn ];
}
) { };
@@ -256840,7 +258156,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "A step-through machine-interface debugger for GHC Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "ghc-debug-adapter";
}
@@ -256865,7 +258181,7 @@ self: {
template-haskell
];
description = "Automatically generate GHC API counterparts to Haskell declarations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -256896,7 +258212,7 @@ self: {
text
];
description = "An AST and compiler plugin for dumping GHC's Core representation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -256999,7 +258315,7 @@ self: {
regex-tdfa
];
description = "Handy tools for working with ghc-dump dumps";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "ghc-dump";
}
@@ -257061,7 +258377,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Library and tool for parsing .eventlog files from GHC";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "ghc-events";
}
) { };
@@ -257122,7 +258438,7 @@ self: {
base
];
description = "Analyze and visualize event logs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "ghc-events-analyze";
broken = true;
@@ -257177,139 +258493,6 @@ self: {
}
) { };
- ghc-exactprint_0_6_4 = callPackage (
- {
- mkDerivation,
- base,
- bytestring,
- containers,
- Diff,
- directory,
- filemanip,
- filepath,
- free,
- ghc,
- ghc-boot,
- ghc-paths,
- HUnit,
- mtl,
- silently,
- syb,
- }:
- mkDerivation {
- pname = "ghc-exactprint";
- version = "0.6.4";
- sha256 = "0a6baza962d4pz2m02hxmh8234i47zkizmwhsy68namr05dmlgpw";
- revision = "1";
- editedCabalFile = "0qil5rlsvxhwrbciixha8mdaw8wfci797n4wcyxn41mr4a4783f5";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- base
- bytestring
- containers
- directory
- filepath
- free
- ghc
- ghc-boot
- ghc-paths
- mtl
- syb
- ];
- testHaskellDepends = [
- base
- bytestring
- containers
- Diff
- directory
- filemanip
- filepath
- ghc
- ghc-boot
- ghc-paths
- HUnit
- mtl
- silently
- syb
- ];
- description = "ExactPrint for GHC";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- }
- ) { };
-
- ghc-exactprint_1_5_0 = callPackage (
- {
- mkDerivation,
- base,
- bytestring,
- containers,
- data-default,
- Diff,
- directory,
- fail,
- filemanip,
- filepath,
- free,
- ghc,
- ghc-boot,
- ghc-paths,
- HUnit,
- mtl,
- ordered-containers,
- silently,
- syb,
- }:
- mkDerivation {
- pname = "ghc-exactprint";
- version = "1.5.0";
- sha256 = "07m4cg47knrrvpyimnbc0nq9176vkzwwa64b2iqfj6azn6q2hagp";
- revision = "1";
- editedCabalFile = "1v6my8bnhjhw7k3v2q9iwjpz9lj5g6ilvlzdq6svcabxahmzbr2c";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- base
- bytestring
- containers
- data-default
- directory
- fail
- filepath
- free
- ghc
- ghc-boot
- ghc-paths
- mtl
- ordered-containers
- syb
- ];
- testHaskellDepends = [
- base
- bytestring
- containers
- data-default
- Diff
- directory
- fail
- filemanip
- filepath
- ghc
- ghc-boot
- ghc-paths
- HUnit
- mtl
- ordered-containers
- silently
- syb
- ];
- description = "ExactPrint for GHC";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- }
- ) { };
-
ghc-exactprint_1_6_1_3 = callPackage (
{
mkDerivation,
@@ -257563,7 +258746,7 @@ self: {
syb
];
description = "ExactPrint for GHC";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -257614,7 +258797,7 @@ self: {
syb
];
description = "ExactPrint for GHC";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -257627,7 +258810,21 @@ self: {
isLibrary = true;
isExecutable = true;
description = "ExactPrint for GHC";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
+ ghc-exactprint_1_14_0_0 = callPackage (
+ { mkDerivation }:
+ mkDerivation {
+ pname = "ghc-exactprint";
+ version = "1.14.0.0";
+ sha256 = "1nw1ddmwxla9ck3x096zfg8gzncy8pwj99rhsvq1nzs9arrprzzf";
+ isLibrary = true;
+ isExecutable = true;
+ description = "ExactPrint for GHC";
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -257649,7 +258846,7 @@ self: {
ghc-prim
];
description = "Experimental features of GHC's standard library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -257664,6 +258861,8 @@ self: {
pname = "ghc-gc-hook";
version = "0.2.1.0";
sha256 = "0d98j3wyrwq6rgfdcky5ag3rxx1kzawvhnncr9nab058n2zksi7x";
+ revision = "1";
+ editedCabalFile = "1i3sz12zqcbqfps8wx3rwbdcjbvd654pixj92n2pl6h709xbcc2y";
libraryHaskellDepends = [
base
clock
@@ -257675,8 +258874,6 @@ self: {
description = "GHC garbage collection hook";
license = lib.licenses.bsd3;
badPlatforms = lib.platforms.darwin;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}
) { };
@@ -257742,6 +258939,8 @@ self: {
pname = "ghc-heap";
version = "9.12.1";
sha256 = "02g1r4hxz7w1a82mb9z7zzjad54hl9m4k1i59d1adsr8cc1cg75p";
+ revision = "1";
+ editedCabalFile = "0rk36kpkmlfyfh1lqbmg60c9wg96arx6fgqp2pgj80qlp9gkzasy";
libraryHaskellDepends = [
base
containers
@@ -257750,7 +258949,7 @@ self: {
rts
];
description = "Functions for walking GHC's heap";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -257818,8 +259017,8 @@ self: {
}:
mkDerivation {
pname = "ghc-hie";
- version = "0.0.2";
- sha256 = "1z51fbm0n9knqrp01gqd7xx0pkfwyr9kgaginvqmdw45gi8rqhm7";
+ version = "0.0.3";
+ sha256 = "06cxddv5mqfwahw0nxn1q01vgzgbrgw1g5g9qibxz8d1cpm14w4y";
libraryHaskellDepends = [
array
base
@@ -257851,8 +259050,6 @@ 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;
}
) { };
@@ -257911,7 +259108,7 @@ self: {
template-haskell
];
description = "Translate Haskell source to Template Haskell expression";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -258107,7 +259304,7 @@ self: {
rts
];
description = "Basic libraries";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -258141,67 +259338,6 @@ self: {
}
) { };
- ghc-lib_9_2_8_20230729 = callPackage (
- {
- mkDerivation,
- alex,
- array,
- base,
- binary,
- bytestring,
- containers,
- deepseq,
- directory,
- exceptions,
- filepath,
- ghc-lib-parser,
- ghc-prim,
- happy,
- hpc,
- parsec,
- pretty,
- process,
- rts,
- time,
- transformers,
- unix,
- }:
- mkDerivation {
- pname = "ghc-lib";
- version = "9.2.8.20230729";
- sha256 = "0jxfbzz7w28jcfpd6x5480ml7zp7pza20mr2zqdvzjdidnxqvlml";
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- array
- base
- binary
- bytestring
- containers
- deepseq
- directory
- exceptions
- filepath
- ghc-lib-parser
- ghc-prim
- hpc
- parsec
- pretty
- process
- rts
- time
- transformers
- unix
- ];
- libraryToolDepends = [
- alex
- happy
- ];
- description = "The GHC API, decoupled from GHC versions";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- }
- ) { };
-
ghc-lib_9_6_7_20250325 = callPackage (
{
mkDerivation,
@@ -258260,7 +259396,7 @@ self: {
happy
];
description = "The GHC API, decoupled from GHC versions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -258325,7 +259461,7 @@ self: {
happy
];
description = "The GHC API, decoupled from GHC versions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -258392,62 +259528,7 @@ self: {
happy
];
description = "The GHC API, decoupled from GHC versions";
- license = lib.licenses.bsd3;
- }
- ) { };
-
- ghc-lib-parser_9_2_8_20230729 = callPackage (
- {
- mkDerivation,
- alex,
- array,
- base,
- binary,
- bytestring,
- containers,
- deepseq,
- directory,
- exceptions,
- filepath,
- ghc-prim,
- happy,
- parsec,
- pretty,
- process,
- time,
- transformers,
- unix,
- }:
- mkDerivation {
- pname = "ghc-lib-parser";
- version = "9.2.8.20230729";
- sha256 = "0lk6s6ka0yhqph6wlijlyzgj47r5j7cw6mnn02vgvqdvlmrkwkkl";
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- array
- base
- binary
- bytestring
- containers
- deepseq
- directory
- exceptions
- filepath
- ghc-prim
- parsec
- pretty
- process
- time
- transformers
- unix
- ];
- libraryToolDepends = [
- alex
- happy
- ];
- description = "The GHC API, decoupled from GHC versions";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -258503,7 +259584,7 @@ self: {
happy
];
description = "The GHC API, decoupled from GHC versions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -258560,7 +259641,7 @@ self: {
happy
];
description = "The GHC API, decoupled from GHC versions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -258619,48 +259700,7 @@ self: {
happy
];
description = "The GHC API, decoupled from GHC versions";
- license = lib.licenses.bsd3;
- }
- ) { };
-
- ghc-lib-parser-ex_9_2_1_1 = callPackage (
- {
- mkDerivation,
- base,
- bytestring,
- containers,
- directory,
- extra,
- filepath,
- ghc-lib-parser,
- tasty,
- tasty-hunit,
- uniplate,
- }:
- 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;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -258796,7 +259836,7 @@ self: {
uniplate
];
description = "Programming with GHC parse trees";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "ghc-lib-parser-ex-build-tool";
}
) { };
@@ -259301,7 +260341,7 @@ self: {
hspec
];
description = "GHC Plugin for non-empty lists";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -259330,7 +260370,7 @@ self: {
testHaskellDepends = [ base ];
doHaddock = false;
description = "Type checker plugins without the type checking";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -259360,7 +260400,7 @@ self: {
libraryHaskellDepends = [ rts ];
librarySystemDepends = [ c ];
description = "GHC primitives";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { c = null; };
@@ -259408,7 +260448,7 @@ self: {
text
];
description = "Library for parsing GHC time and allocation profiling reports";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -259773,7 +260813,7 @@ self: {
text
];
description = "Symbol on term level";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -259805,64 +260845,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Syntax highlighter for Haskell using the lexer of GHC";
- license = lib.licenses.bsd3;
- }
- ) { };
-
- ghc-tags_1_5 = callPackage (
- {
- mkDerivation,
- aeson,
- async,
- attoparsec,
- base,
- bytestring,
- containers,
- deepseq,
- directory,
- filepath,
- ghc-lib,
- ghc-paths,
- optparse-applicative,
- process,
- stm,
- temporary,
- text,
- time,
- vector,
- yaml,
- }:
- mkDerivation {
- pname = "ghc-tags";
- version = "1.5";
- sha256 = "0hscl49qq3lx2a5g6g7g1wa4rl52piizqsykicy1kvi4di7qnyqk";
- isLibrary = false;
- isExecutable = true;
- executableHaskellDepends = [
- aeson
- async
- attoparsec
- base
- bytestring
- containers
- deepseq
- directory
- filepath
- ghc-lib
- ghc-paths
- optparse-applicative
- process
- stm
- temporary
- text
- time
- vector
- yaml
- ];
- description = "Utility for generating ctags and etags with GHC API";
- license = lib.licenses.mpl20;
- hydraPlatforms = lib.platforms.none;
- mainProgram = "ghc-tags";
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -259919,7 +260902,7 @@ self: {
yaml
];
description = "Utility for generating ctags and etags with GHC API";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "ghc-tags";
}
@@ -259978,7 +260961,7 @@ self: {
yaml
];
description = "Utility for generating ctags and etags with GHC API";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "ghc-tags";
}
@@ -260039,7 +261022,7 @@ self: {
yaml
];
description = "Utility for generating ctags and etags with GHC API";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
mainProgram = "ghc-tags";
}
) { };
@@ -260073,7 +261056,7 @@ self: {
text
];
description = "CTags and ETags from Haskell syntax tree";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -260108,7 +261091,7 @@ self: {
text
];
description = "Streaming interface for ghc-tags-core";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -260155,7 +261138,7 @@ self: {
text
];
description = "A compiler plugin which generates tags file from GHC parsed syntax tree";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -260171,8 +261154,8 @@ self: {
}:
mkDerivation {
pname = "ghc-tcplugin-api";
- version = "0.17.2.0";
- sha256 = "01p6x6jppap6q82x8m5jw3rbzn60gqmap23x6lxq9jbn6am44vhv";
+ version = "0.18.1.0";
+ sha256 = "0nqcbilwzlvphbf5v902y84xx1f0h15bw2qnbh6zpcw97pbrliz5";
libraryHaskellDepends = [
array
base
@@ -260182,7 +261165,7 @@ self: {
transformers
];
description = "An API for type-checker plugins";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -260306,7 +261289,7 @@ self: {
tasty-bench
];
description = "Faster traceEvent and traceMarker, and binary object logging for eventlog";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -260354,6 +261337,51 @@ self: {
}
) { };
+ ghc-typelits-extra_0_5_1 = callPackage (
+ {
+ mkDerivation,
+ base,
+ containers,
+ ghc,
+ ghc-bignum,
+ ghc-prim,
+ ghc-tcplugin-api,
+ ghc-typelits-knownnat,
+ ghc-typelits-natnormalise,
+ tasty,
+ tasty-hunit,
+ template-haskell,
+ transformers,
+ }:
+ mkDerivation {
+ pname = "ghc-typelits-extra";
+ version = "0.5.1";
+ sha256 = "0aikpiwcmsb71r2fbjik4pwyniks2rfikn6bgz0djnfbxmgy691k";
+ libraryHaskellDepends = [
+ base
+ containers
+ ghc
+ ghc-bignum
+ ghc-prim
+ ghc-tcplugin-api
+ ghc-typelits-knownnat
+ ghc-typelits-natnormalise
+ template-haskell
+ transformers
+ ];
+ testHaskellDepends = [
+ base
+ ghc-typelits-knownnat
+ ghc-typelits-natnormalise
+ tasty
+ tasty-hunit
+ ];
+ description = "Additional type-level operations on GHC.TypeLits.Nat";
+ license = lib.licensesSpdx."BSD-2-Clause";
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
ghc-typelits-knownnat = callPackage (
{
mkDerivation,
@@ -260393,7 +261421,7 @@ self: {
}
) { };
- ghc-typelits-knownnat_0_8_0 = callPackage (
+ ghc-typelits-knownnat_0_8_2 = callPackage (
{
mkDerivation,
base,
@@ -260401,6 +261429,7 @@ self: {
ghc-bignum,
ghc-tcplugin-api,
ghc-typelits-natnormalise,
+ QuickCheck,
tasty,
tasty-hunit,
tasty-quickcheck,
@@ -260409,8 +261438,8 @@ self: {
}:
mkDerivation {
pname = "ghc-typelits-knownnat";
- version = "0.8.0";
- sha256 = "009vfifi462dqp3z26b3czx1x22ayn3s8r1s4x967yw68mpwhpda";
+ version = "0.8.2";
+ sha256 = "0fljjj0n47wwxbg8kxpnn7kbf7vfdh91q3fhnk0jaq3nnlv05bdy";
libraryHaskellDepends = [
base
ghc
@@ -260423,12 +261452,13 @@ self: {
testHaskellDepends = [
base
ghc-typelits-natnormalise
+ QuickCheck
tasty
tasty-hunit
tasty-quickcheck
];
description = "Derive KnownNat constraints from other KnownNat constraints";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -260512,7 +261542,7 @@ self: {
}
) { };
- ghc-typelits-natnormalise_0_8_0 = callPackage (
+ ghc-typelits-natnormalise_0_9_1 = callPackage (
{
mkDerivation,
base,
@@ -260528,8 +261558,8 @@ self: {
}:
mkDerivation {
pname = "ghc-typelits-natnormalise";
- version = "0.8.0";
- sha256 = "1vdhj5pzx76aigim3a0ap3nhzhnhwl5cywz5rzzkplag8970rfdn";
+ version = "0.9.1";
+ sha256 = "190982vj945ppi83fd1j21y9snqrr4v8vbg2hnq5c0rgqch15g6k";
libraryHaskellDepends = [
base
containers
@@ -260546,7 +261576,7 @@ self: {
template-haskell
];
description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -260598,7 +261628,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Presburger Arithmetic Solver for GHC Type-level natural numbers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -260682,7 +261712,7 @@ self: {
xdot
];
description = "Live visualization of data structures in GHCi";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.dalpd ];
}
) { };
@@ -260706,7 +261736,7 @@ self: {
time
];
description = "Dump the ghc flags during compilation";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -260778,8 +261808,8 @@ self: {
}:
mkDerivation {
pname = "ghci-dap";
- version = "0.0.25.0";
- sha256 = "0za0m1s6hayzgv1j8brqlxylqsqx6cifml96a4rcjgi3g7i51ga8";
+ version = "0.0.26.0";
+ sha256 = "0gmidys4jd65f2fysf1zfnh42pkx5hyzrp7974j118lfk74c9n1i";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -260827,9 +261857,7 @@ self: {
];
description = "ghci-dap is a GHCi having DAP interface";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
mainProgram = "ghci-dap";
- broken = true;
}
) { };
@@ -261084,7 +262112,7 @@ self: {
websockets
];
description = "A websocket server that survives GHCi reloads";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -261145,7 +262173,7 @@ self: {
text
];
description = "A GHCi session in LaTeX";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "ghci4luatex";
}
) { };
@@ -261257,7 +262285,6 @@ self: {
haddock-library,
hashable,
hie-bios,
- hie-compat,
hiedb,
hls-graph,
hls-plugin-api,
@@ -261294,10 +262321,8 @@ self: {
}:
mkDerivation {
pname = "ghcide";
- version = "2.11.0.0";
- sha256 = "0d9rvh6xxw8y64f1pdivwdkmi9wqknl4m2n2h3x4rjmqj2al92vs";
- revision = "2";
- editedCabalFile = "0kqdzwf0fpzg69sawsrlhf3x0yv3ixi2x5ia6jb2zckaa5wl4ik2";
+ version = "2.12.0.0";
+ sha256 = "0m0a89ilkwcwpmjkp9jx4f40v3kn6cgjrmsws20blas6kcrjk68l";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -261333,7 +262358,6 @@ self: {
haddock-library
hashable
hie-bios
- hie-compat
hiedb
hls-graph
hls-plugin-api
@@ -261379,7 +262403,7 @@ self: {
optparse-applicative
];
description = "The core of an IDE";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
mainProgram = "ghcide";
}
) { };
@@ -261476,7 +262500,7 @@ self: {
];
testToolDepends = [ ghcide ];
description = "An LSP client for running performance experiments on HLS";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "ghcide-bench";
broken = true;
@@ -261524,7 +262548,7 @@ self: {
text
];
description = "Test utils for ghcide";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -261598,7 +262622,7 @@ self: {
];
doHaddock = false;
description = "A Terminal User Interface (TUI) for GHCi";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "ghcitui";
}
) { };
@@ -261635,7 +262659,7 @@ self: {
version = "0.8.0.4";
sha256 = "081w3234jramsmafnl86v37lwbckr2vc93gr9pdwc31yzni9kbml";
description = "base library for GHCJS";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
platforms = [ "javascript-ghcjs" ];
maintainers = [ lib.maintainers.alexfmpe ];
}
@@ -261676,7 +262700,7 @@ self: {
vector
];
description = "Allow GHCJS projects to compile under GHC and develop using intero";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -261718,7 +262742,7 @@ self: {
transformers
];
description = "DOM library that supports both GHCJS and GHC";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
maintainers = [ lib.maintainers.alexfmpe ];
}
) { };
@@ -261756,7 +262780,7 @@ self: {
];
description = "GHCJS DOM Hello World, an example package";
license = lib.licenses.mit;
- maintainers = [ lib.maintainers.alexfmpe ];
+ hydraPlatforms = lib.platforms.none;
}
) { };
@@ -261767,7 +262791,7 @@ self: {
version = "0.9.9.3";
sha256 = "1k62w5czg544ias8q2kvhp8qnlafzisgx1p0gq8d2kh662w99kcg";
description = "DOM library using JSFFI and GHCJS";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
platforms = [ "javascript-ghcjs" ];
maintainers = [ lib.maintainers.alexfmpe ];
}
@@ -261782,7 +262806,7 @@ self: {
libraryHaskellDepends = [ jsaddle-dom ];
doHaddock = false;
description = "DOM library that supports both GHCJS and GHC using jsaddle";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
maintainers = [ lib.maintainers.alexfmpe ];
}
) { };
@@ -261794,7 +262818,7 @@ self: {
version = "0.9.9.0";
sha256 = "0fhcs89x180kw75qgbfh28wjyn55frwdfj4rqlqa1smx0fwhzyy1";
description = "DOM library using JSFFI and GHCJS";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -262351,7 +263375,7 @@ self: {
testToolDepends = [ hspec-discover ];
doHaddock = false;
description = "ghc toolchain installer";
- license = lib.licenses.lgpl3Only;
+ license = lib.licensesSpdx."LGPL-3.0-only";
hydraPlatforms = lib.platforms.none;
mainProgram = "ghcup";
broken = true;
@@ -263663,7 +264687,7 @@ self: {
haskell-gi-base
];
description = "Haskell implementation of GListModel interface from gi-gio";
- license = lib.licenses.lgpl21Only;
+ license = lib.licensesSpdx."LGPL-2.1-only";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -264482,8 +265506,6 @@ 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;
}
) { };
@@ -265187,9 +266209,9 @@ self: {
haskell-gi,
haskell-gi-base,
haskell-gi-overloading,
+ javascriptcoregtk,
text,
transformers,
- webkitgtk_4_0,
}:
mkDerivation {
pname = "gi-javascriptcore4";
@@ -265214,12 +266236,12 @@ self: {
text
transformers
];
- libraryPkgconfigDepends = [ webkitgtk_4_0 ];
+ libraryPkgconfigDepends = [ javascriptcoregtk ];
description = "JavaScriptCore 4.x bindings";
license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none;
}
- ) { webkitgtk_4_0 = null; };
+ ) { javascriptcoregtk = null; };
gi-javascriptcore6 = callPackage (
{
@@ -265457,6 +266479,8 @@ self: {
libraryPkgconfigDepends = [ libnotify ];
description = "Libnotify bindings";
license = lib.licenses.lgpl21Only;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { inherit (pkgs) libnotify; };
@@ -266126,7 +267150,7 @@ self: {
haskell-gi-overloading,
text,
transformers,
- webkitgtk_4_0,
+ webkit2gtk,
}:
mkDerivation {
pname = "gi-webkit2";
@@ -266165,13 +267189,13 @@ self: {
text
transformers
];
- libraryPkgconfigDepends = [ webkitgtk_4_0 ];
+ libraryPkgconfigDepends = [ webkit2gtk ];
description = "WebKit2 bindings";
license = lib.licenses.lgpl21Only;
badPlatforms = lib.platforms.darwin;
hydraPlatforms = lib.platforms.none;
}
- ) { webkitgtk_4_0 = null; };
+ ) { webkit2gtk = null; };
gi-webkit2webextension = callPackage (
{
@@ -266191,7 +267215,7 @@ self: {
haskell-gi-overloading,
text,
transformers,
- webkitgtk_4_0,
+ webkit2gtk-web-extension,
}:
mkDerivation {
pname = "gi-webkit2webextension";
@@ -266224,14 +267248,14 @@ self: {
text
transformers
];
- libraryPkgconfigDepends = [ webkitgtk_4_0 ];
+ libraryPkgconfigDepends = [ webkit2gtk-web-extension ];
description = "WebKit2-WebExtension 4.x bindings";
license = lib.licenses.lgpl21Only;
badPlatforms = lib.platforms.darwin;
hydraPlatforms = lib.platforms.none;
broken = true;
}
- ) { webkitgtk_4_0 = null; };
+ ) { webkit2gtk-web-extension = null; };
gi-webkitwebprocessextension = callPackage (
{
@@ -266545,7 +267569,7 @@ self: {
];
doHaddock = false;
description = "Generate easy-to-remember, hard-to-guess passwords";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -266614,7 +267638,7 @@ self: {
gauge
];
description = "Refreshed parsec-style library for compatibility with Scala parsley";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -266729,7 +267753,7 @@ self: {
utf8-string
];
description = "An implementation of the Jinja2 template language in Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "ginger";
}
) { };
@@ -266819,7 +267843,7 @@ self: {
vector
];
description = "Jinja templates for Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "ginger2";
broken = true;
@@ -266974,7 +267998,7 @@ self: {
];
libraryPkgconfigDepends = [ system-glib ];
description = "Binding to GIO";
- license = lib.licenses.lgpl21Only;
+ license = lib.licensesSpdx."LGPL-2.1-only";
}
) { system-glib = pkgs.glib; };
@@ -267350,8 +268374,8 @@ self: {
}:
mkDerivation {
pname = "git-annex";
- version = "10.20250828";
- sha256 = "11riq7ni0sqpkks2xaiimb7hl76wrnyac1smjs182m2sscn9bym4";
+ version = "10.20250929";
+ sha256 = "1ff30f8ifp2a73d64q25mpzirnrm5q0amri9xcz7814wwynv24hj";
configureFlags = [
"-fassistant"
"-f-benchmark"
@@ -268165,7 +269189,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Recover Git repositories from disk recovery tool output (photorec)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "git-phoenix";
broken = true;
@@ -268258,7 +269282,7 @@ self: {
text
];
description = "Git remote helper to store git objects on IPFS";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "git-remote-ipfs";
}
@@ -268806,7 +269830,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Access to the GitHub API, v3";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -268870,7 +269894,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Github Actions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -269154,7 +270178,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "Upload files to GitHub releases";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "github-release";
}
) { };
@@ -269614,7 +270638,7 @@ self: {
tasty-smallcheck
];
description = "Heads up, and you see your GIT context";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -269894,7 +270918,7 @@ self: {
vector
];
description = "A Haskell library for the GitLab web API";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -270433,7 +271457,7 @@ self: {
text
];
description = "Compile git revision info into Haskell projects";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -270740,7 +271764,7 @@ self: {
sha256 = "14wm8wp4jxi4fq75bvr6sl4xmsxjfw30yq7011v28xqpm9015ns0";
libraryHaskellDepends = [ base ];
description = "Haskell bindings for the gl3w library";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -271556,7 +272580,7 @@ self: {
testPkgconfigDepends = [ gtest_main ];
doHaddock = false;
description = "A system for collecting, deriving and working with facts about source code";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
)
@@ -271601,7 +272625,7 @@ self: {
text
];
description = "GLFW package with window groups destroyed together";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -271689,7 +272713,7 @@ self: {
];
libraryPkgconfigDepends = [ glib ];
description = "Binding to the GLIB library for Gtk2Hs";
- license = lib.licenses.lgpl21Only;
+ license = lib.licensesSpdx."LGPL-2.1-only";
}
) { inherit (pkgs) glib; };
@@ -271920,7 +272944,7 @@ self: {
HUnit
];
description = "Console IRC client";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
mainProgram = "glirc";
}
) { };
@@ -272231,7 +273255,7 @@ self: {
text
];
description = "Globus Data Transfer";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -272659,7 +273683,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Massiv-based alternative for gloss-raster";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -272736,7 +273760,7 @@ self: {
hspec
];
description = "Low-level Haskell bindings to the GLPK library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { inherit (pkgs) glpk; };
@@ -273017,7 +274041,7 @@ self: {
tasty-hunit
];
description = "Attempts to fix your syntax erroring Lua files";
- license = lib.licenses.lgpl21Plus;
+ license = lib.licensesSpdx."LGPL-2.1-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "glualint";
broken = true;
@@ -273419,6 +274443,8 @@ self: {
];
description = "Composable maps and generic tries";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -273749,7 +274775,7 @@ self: {
utility-ht
];
description = "2D and 3D plots using gnuplot";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -273868,7 +274894,7 @@ self: {
mwc-random
];
description = "Common, non-geometric tools for use with Goal";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -273897,7 +274923,7 @@ self: {
indexed-list-literals
];
description = "The basic geometric type system of Goal";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -273953,7 +274979,7 @@ self: {
goal-probability
];
description = "Optimization of latent variable and dynamical models with Goal";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -274004,7 +275030,7 @@ self: {
goal-geometry
];
description = "Optimization on manifolds of probability distributions with Goal";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -274319,7 +275345,7 @@ self: {
text
];
description = "Megaparsec parser for Godot `tscn` and `gdextension` files";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "bench";
broken = true;
@@ -274515,7 +275541,7 @@ self: {
time
];
description = "Comprehensive Google Services SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274527,7 +275553,7 @@ self: {
sha256 = "0h6iwa2z863qgi1vixp28xgq8f2vk0dwlvs3ppbh1f4i9viqvr8b";
libraryHaskellDepends = [ gogol-core ];
description = "Google Abusive Experience Report SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274539,7 +275565,7 @@ self: {
sha256 = "1a1x97xgpmznjgqjrbgz63vfdlgdilzi6y7myxm8v6fin4pf1y2p";
libraryHaskellDepends = [ gogol-core ];
description = "Google Accelerated Mobile Pages (AMP) URL SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274551,7 +275577,7 @@ self: {
sha256 = "0cy8bwkrgwmz2lm1bqq1w3c895x5h6bfd27wlp6zihivj4kmky8j";
libraryHaskellDepends = [ gogol-core ];
description = "Google Access Approval SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274563,7 +275589,7 @@ self: {
sha256 = "1n0llmpcp8da4nzmz6350gnjaj0ir3wl1iqnx9y1wvq99jr1xb4s";
libraryHaskellDepends = [ gogol-core ];
description = "Google Access Context Manager SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274575,7 +275601,7 @@ self: {
sha256 = "1msm75jv2p73fxw9nffjyqyw8zyg0xpna1dhir08pzsmwwyysdx8";
libraryHaskellDepends = [ gogol-core ];
description = "Google Ad Exchange Buyer SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274587,7 +275613,7 @@ self: {
sha256 = "1k2is2alb7d5zdxpqbiv07kxbg86gzkc8zmlndva8p7zrrayanwd";
libraryHaskellDepends = [ gogol-core ];
description = "Google Ad Exchange Seller SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274599,7 +275625,7 @@ self: {
sha256 = "0k8fdnyyd20qis54nnarj7dk17ncfsn1br83mhjsgkp5x956zlzr";
libraryHaskellDepends = [ gogol-core ];
description = "Google Ad Exchange Buyer API II SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274611,7 +275637,7 @@ self: {
sha256 = "0hj5ic3mhigk524d760g9s2xlqfx5aj6rxqwyzfs9hrnvl88m79c";
libraryHaskellDepends = [ gogol-core ];
description = "Google Ad Experience Report SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274623,7 +275649,7 @@ self: {
sha256 = "068ib1s04y39q0llrnn64ha1l1q61jspfgkb3chcb056yiam3z7k";
libraryHaskellDepends = [ gogol-core ];
description = "Google Admin SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274635,7 +275661,7 @@ self: {
sha256 = "1aw1369bb5lqzc8z0aqpghjk4pzqk3747ciiwzjibxp5fw6gp8fb";
libraryHaskellDepends = [ gogol-core ];
description = "Google Admin SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274668,7 +275694,7 @@ self: {
sha256 = "189fx1ih296s26rn7m92rmay6csps1ihnyrm8wif1530xf6i7i9j";
libraryHaskellDepends = [ gogol-core ];
description = "Google Admin SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274680,7 +275706,7 @@ self: {
sha256 = "02qh6rqmbllfj27zi4ddgfy88ck7gayzr9ziw6r2brajwdd7rmcx";
libraryHaskellDepends = [ gogol-core ];
description = "Google AdSense Management SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274692,7 +275718,7 @@ self: {
sha256 = "1h0iv25rpv495qgn021dlxi0cy9v1yxhr6q1l42nb5sp3nfx8j4l";
libraryHaskellDepends = [ gogol-core ];
description = "Google AdSense Host SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274725,7 +275751,7 @@ self: {
sha256 = "0grqgrczqwa3f8ir7yx8rlw1y0alrqz8m4dhbx6268dz5y192421";
libraryHaskellDepends = [ gogol-core ];
description = "Google Workspace Alert Center SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274737,7 +275763,7 @@ self: {
sha256 = "1pqr20s11z75m8lzqq4kx86h8gf9hqmv0n45kbb1v99nmiyl6scq";
libraryHaskellDepends = [ gogol-core ];
description = "Google Analytics SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274749,7 +275775,7 @@ self: {
sha256 = "1ps7lln0z027g0lmg0b8bs14ycz3i607a6ja5kxh9xpqi2bcj1pq";
libraryHaskellDepends = [ gogol-core ];
description = "Google Analytics Reporting SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274761,7 +275787,7 @@ self: {
sha256 = "0l40nv4jfba6h7vpfca548k7y5yya54n237f11gksclyij5xzc5j";
libraryHaskellDepends = [ gogol-core ];
description = "Google Play EMM SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274773,7 +275799,7 @@ self: {
sha256 = "14knrvx11f97jb7z7vbmjmh8zrchds5wzacaaiz68g5pqh44sqqg";
libraryHaskellDepends = [ gogol-core ];
description = "Google Play Android Developer SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274785,7 +275811,7 @@ self: {
sha256 = "0vf3y14bjzs1yb6fsaizsgcjvpk8r3gxavbkkf9cdy3zz6mdfs6y";
libraryHaskellDepends = [ gogol-core ];
description = "Google Android Device Provisioning Partner SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274797,7 +275823,7 @@ self: {
sha256 = "0hcfjz9lz9j4sk5vxsq0a67gbrgi9cmrwblkyslzlc3jqd689grh";
libraryHaskellDepends = [ gogol-core ];
description = "Google Android Management SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274809,7 +275835,7 @@ self: {
sha256 = "1d6nsqd6lynk2cvrb53zd1h74w46f8grjrgawrdczkhn9sjplgg4";
libraryHaskellDepends = [ gogol-core ];
description = "Google App Engine Admin SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274821,7 +275847,7 @@ self: {
sha256 = "0ai1ip5hkqbk0shwhgkjrc81422f0as78spahvyp2b18h9ds3f12";
libraryHaskellDepends = [ gogol-core ];
description = "Google Drive Activity SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274833,7 +275859,7 @@ self: {
sha256 = "119gfvs7wfchf4l50r13pwwqilxfkxbpdsr1hxa0qshx7qs4hdn3";
libraryHaskellDepends = [ gogol-core ];
description = "Google Calendar SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274845,7 +275871,7 @@ self: {
sha256 = "13xr8d87xyv1nif1vm8hx92aqp7w2h68qqpci01jrlgvbwikwg0z";
libraryHaskellDepends = [ gogol-core ];
description = "Google Enterprise License Manager SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274857,7 +275883,7 @@ self: {
sha256 = "02as3zv92pmki03ylcjc999cfk4qwgp066ns5wmvhg71x66wcy97";
libraryHaskellDepends = [ gogol-core ];
description = "Google Workspace Reseller SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274869,7 +275895,7 @@ self: {
sha256 = "1imkjjq2l8j36anzn4rv51mcdr3j1w9wxk2z4ps8py9whz2yfqa3";
libraryHaskellDepends = [ gogol-core ];
description = "Google Tasks SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274881,7 +275907,7 @@ self: {
sha256 = "1ipa3a1d6in8kvk6qrbmpsfns30nci95dlsb2x3ds8jx9rwffsad";
libraryHaskellDepends = [ gogol-core ];
description = "Google App State SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274914,7 +275940,7 @@ self: {
sha256 = "0r19gn2i4bvbacvsaw371nwiif41zi3bqvkv1b92nfyzig9nnnpr";
libraryHaskellDepends = [ gogol-core ];
description = "Google BigQuery SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274926,7 +275952,7 @@ self: {
sha256 = "0vv8jhqk2z1ji8l2k83021ycsbqqf4mkzq13k6yra5k62f886hb0";
libraryHaskellDepends = [ gogol-core ];
description = "Google BigQuery Data Transfer SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274938,7 +275964,7 @@ self: {
sha256 = "1q30h5qgrxwi3vpk28iklmy220lhvpk1bc1cdl2wvj9g87vk3jyg";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Bigtable Admin SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274950,7 +275976,7 @@ self: {
sha256 = "0ws694ymsrlk4hw1jzqi4lpjjmjas8cdvxxz9dcmkbd3yhpsq16z";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Billing SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274962,7 +275988,7 @@ self: {
sha256 = "0m82qlih6dxijd83bsjfbw4dxrn1k1w8gnfdxdxxvccf58xxkb48";
libraryHaskellDepends = [ gogol-core ];
description = "Google Binary Authorization SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274974,7 +276000,7 @@ self: {
sha256 = "02qrqqkhy7v14jygqnwv99bkfmnjpkjbxx33avk3fzx5vfh04phh";
libraryHaskellDepends = [ gogol-core ];
description = "Google Blogger SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274986,7 +276012,7 @@ self: {
sha256 = "0b8r416cg9cy36adv4frndcc64vy1wcqmhpshbs4ba583yqxndw6";
libraryHaskellDepends = [ gogol-core ];
description = "Google Books SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -274998,7 +276024,7 @@ self: {
sha256 = "1m5ikfi8gl8xsi1kgv3ca7pfjd56gykw29s4x5mkm76a727sy454";
libraryHaskellDepends = [ gogol-core ];
description = "Google Chat SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275010,7 +276036,7 @@ self: {
sha256 = "1cg0xvxs8hkdzrsal7wn0gchscssvnwpfx2kzqqv3k539vjxb07w";
libraryHaskellDepends = [ gogol-core ];
description = "Google Civic Information SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275022,7 +276048,7 @@ self: {
sha256 = "0d32fmi65cmhallbiwifwzbwald508025crshh951g2l4sypdbsx";
libraryHaskellDepends = [ gogol-core ];
description = "Google Classroom SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275034,7 +276060,7 @@ self: {
sha256 = "1r2ijkzlqi2a34qq6978n8f3iqn2f14srw8cyglhy7if6f23ybp0";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Asset SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275046,7 +276072,7 @@ self: {
sha256 = "16scs0jzk0fbvhchf68f69b3pmipffdvi38ihfdn7495dipikpjp";
libraryHaskellDepends = [ gogol-core ];
description = "Google Error Reporting SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275058,7 +276084,7 @@ self: {
sha256 = "1w5cpsafgks7zhx08bri3sx9m30ad39wxraa296czhvzhlrz95qq";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Functions SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275070,7 +276096,7 @@ self: {
sha256 = "0ygdq4fvgbbjw1jzrvr7r02qjjvr21fjsyvjs5r781bsps9msr66";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Identity SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275082,7 +276108,7 @@ self: {
sha256 = "1dvgygzzyk038p6f5qwgiipiz1466zmm760yi1ci9sh7fl4i4ndp";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud IoT SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275094,7 +276120,7 @@ self: {
sha256 = "0wvk6ll7xmlly1bi1kwpj3vp4scg06cjsb1xnpd2rd6j2fhi2vmz";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Key Management Service (KMS) SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275127,7 +276153,7 @@ self: {
sha256 = "18siw287hdcfmcdp0sxd1r94pk4rri71987mi5mjgxgan90lhgxk";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Private Catalog SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275139,7 +276165,7 @@ self: {
sha256 = "12sf1rmiv52gfml3xcv76iza8mry9vhcpk4xzdb80yaw8343idj3";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Private Catalog Producer SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275151,7 +276177,7 @@ self: {
sha256 = "0hwby0sk3rxsii76425hgy9d7p4v5l0infsqj0qbs0197qhwh4zi";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Profiler SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275163,7 +276189,7 @@ self: {
sha256 = "14gbhgyy8g7kaarxpy8llpvgydapq49sr8gzda144gkfq68svabw";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Scheduler SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275175,7 +276201,7 @@ self: {
sha256 = "1nhqkvm5v2m4xbcdi29m8padjzmampcsy3l61vknwfc0n6f89rhf";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Search SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275187,7 +276213,7 @@ self: {
sha256 = "1zi69k64klas18kmq525z52nchc9gqdk7v15x8prdln6x46ic1dn";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Shell SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275199,7 +276225,7 @@ self: {
sha256 = "11ygaka332an20cyl5i9bj5jxkgddc36pfdl07mjab68b6500ggc";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Tasks SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275211,7 +276237,7 @@ self: {
sha256 = "0wnn3pfx28g7iqr8vwk2v5vqh06vwcmgjj0blwi9aznkm1g3qp1k";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Trace SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275223,7 +276249,7 @@ self: {
sha256 = "1vcwyv86a3mpis6d1rgldn61qzxfz8x2ncfv3r7rrpr79zclqhkj";
libraryHaskellDepends = [ gogol-core ];
description = "Google Perspective Comment Analyzer SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275235,7 +276261,7 @@ self: {
sha256 = "0j4kabhl6wlyhqjiiz6qw6hc8q9c8c0x0ylqxfiwxgr8j0m3x17h";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Composer SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275247,7 +276273,7 @@ self: {
sha256 = "094p7nms03jypq44snnsz05z485dz5ynawcnmjjlmwh387i59j4x";
libraryHaskellDepends = [ gogol-core ];
description = "Google Compute Engine SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275259,7 +276285,7 @@ self: {
sha256 = "01q4dmqxwdy8p9ix9dhj0dgqs71z7mmjznybv2r8jmfwxm4nxgka";
libraryHaskellDepends = [ gogol-core ];
description = "Google Consumer Surveys SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275271,7 +276297,7 @@ self: {
sha256 = "0ci3xdl0rb5nq54z6i748gh240ipgp9wa36pncq3yasf58pn9rvp";
libraryHaskellDepends = [ gogol-core ];
description = "Google Kubernetes Engine SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275283,7 +276309,7 @@ self: {
sha256 = "1vzmzbgr88qij6fgi2gsz3iavvbzdxnpjf864l656fkvr5xw83wl";
libraryHaskellDepends = [ gogol-core ];
description = "Google Container Analysis SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275295,7 +276321,7 @@ self: {
sha256 = "12mmiza1sd4fryy86kzy88adw8nkswxpf1r2sryndjkyk9a47knx";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Build SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275357,7 +276383,7 @@ self: {
tasty
];
description = "Core data types and functionality for Gogol libraries";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275369,7 +276395,7 @@ self: {
sha256 = "04yvwb12qpf57p82a7j5h7z0ckxmfircxzyl1a9h8qwmkf2h9g9n";
libraryHaskellDepends = [ gogol-core ];
description = "Google Custom Search SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275381,7 +276407,7 @@ self: {
sha256 = "0qi91p8x8jx3rnz4vpk7mkcms1hqjhwlmrvpjzxx489bazllsz66";
libraryHaskellDepends = [ gogol-core ];
description = "Google Dataflow SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275393,7 +276419,7 @@ self: {
sha256 = "0r28ccchciw067w1gsm9pcfhnmr6ggk0m5p27i3rhwz1v3mhspnf";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Data Fusion SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275405,7 +276431,7 @@ self: {
sha256 = "1gls8g771b7d90a57zz30cwpg0sr9vjmjwkb2sn1syr3q82vz8ba";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Dataproc SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275417,7 +276443,7 @@ self: {
sha256 = "0d727wn1yr4w5svvzsfyvn8ybl6l0ijr1mq86zwpz041709llbfg";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Datastore SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275429,7 +276455,7 @@ self: {
sha256 = "0m71pa6ilqy5s20vmn8q4gn1vikr2fjxvhz8h54qswn5sanjpiz8";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Debugger API (Deprecated) SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275441,7 +276467,7 @@ self: {
sha256 = "143k175i32i4nw54r1w7490wqj9g703a5787aw86r468xfagwmdy";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Deployment Manager V2 SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275453,7 +276479,7 @@ self: {
sha256 = "1vhc4fx78h26hcxhmgijfprsvshqgh8v6q9dialckh7rq226g0mn";
libraryHaskellDepends = [ gogol-core ];
description = "Google Campaign Manager 360 SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275465,7 +276491,7 @@ self: {
sha256 = "1gijb69hmba7dh493zifv5809zri33fmi7fi8wmf3973qaylp7g6";
libraryHaskellDepends = [ gogol-core ];
description = "Google Dialogflow SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275477,7 +276503,7 @@ self: {
sha256 = "1a6r481sxp50x5mpw8inp4904jm0a21m1rcya2wijwrj8xblynpp";
libraryHaskellDepends = [ gogol-core ];
description = "Google Digital Asset Links SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275489,7 +276515,7 @@ self: {
sha256 = "1gyh5fbiv98j74p3bkg0kv1clszdpy8ksb47k4bnpjg8livfgzf4";
libraryHaskellDepends = [ gogol-core ];
description = "Google API Discovery Service SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275501,7 +276527,7 @@ self: {
sha256 = "15q8fr1y21zacz30kjvpxsn2irnzqjl5r2xvhkd2mbcpplyvcbcz";
libraryHaskellDepends = [ gogol-core ];
description = "Google Sensitive Data Protection (DLP) SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275513,7 +276539,7 @@ self: {
sha256 = "1igqrn1w1jda0xplbslwib2mdv9mzhfb4dpqgymlmp5g1ps9qy28";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud DNS SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275525,7 +276551,7 @@ self: {
sha256 = "1chxs5a1wlql6vb9wqr9navijis7khbpndy0grwzfcdafcyz71jm";
libraryHaskellDepends = [ gogol-core ];
description = "Google Docs SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275537,7 +276563,7 @@ self: {
sha256 = "01955ainvq9fmmjvkwpgbarmnplw30ilf05shsnjskdhp6b1hqvc";
libraryHaskellDepends = [ gogol-core ];
description = "Google DoubleClick Bid Manager SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275549,7 +276575,7 @@ self: {
sha256 = "1l70nmx86wvixyr84zjhns69l58z1v65aiycmqi3i441c5hjrax2";
libraryHaskellDepends = [ gogol-core ];
description = "Google Search Ads 360 SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275561,7 +276587,7 @@ self: {
sha256 = "0alf3jahdmkjxjzqj2bs5wlrvx7d3414kbhpi1pvdcy8s3fm2b49";
libraryHaskellDepends = [ gogol-core ];
description = "Google Drive SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275573,7 +276599,7 @@ self: {
sha256 = "06lnmdz833wvkh9h2q8q73mnqyp2klmfhg132zabwpcpkywlinvl";
libraryHaskellDepends = [ gogol-core ];
description = "Google Drive Activity SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275585,7 +276611,7 @@ self: {
sha256 = "1v2s3696i71z4pqclqc2x53c51n4llv6wbpvms1mr666zgmchvxr";
libraryHaskellDepends = [ gogol-core ];
description = "Google Fact Check Tools SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275597,7 +276623,7 @@ self: {
sha256 = "0fd23xaqcqn6qq696i1dlrbdlk7yw15h8wq9jsy0l8sqa8f9ygn2";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Filestore SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275609,7 +276635,7 @@ self: {
sha256 = "18ywm1xzr0sqj4pp6lsjw8pbhydimapnxa5xylybc1ii69jqq3xj";
libraryHaskellDepends = [ gogol-core ];
description = "Google Firebase Dynamic Links SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275621,7 +276647,7 @@ self: {
sha256 = "1znwn8xl2yfxarbf6gcmwlhrm7mn4xan89bd2sh1sd520155yw4q";
libraryHaskellDepends = [ gogol-core ];
description = "Google Firebase Rules SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275633,7 +276659,7 @@ self: {
sha256 = "0v0jbgffkxgk17qn79qjbcp3rnnfihcikb9709kwkz5vf246rzs7";
libraryHaskellDepends = [ gogol-core ];
description = "Google Firebase Hosting SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275645,7 +276671,7 @@ self: {
sha256 = "09n8bfaa9spara3yh5awjcfyxdwcag5qi7w01vk9m9snfzdypfrg";
libraryHaskellDepends = [ gogol-core ];
description = "Google Firebase Remote Config SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275657,7 +276683,7 @@ self: {
sha256 = "0fillhmd5xdb45mfg62fr6vhki4gdc8mqvqzs56il3p70ykbrgby";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Firestore SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275669,7 +276695,7 @@ self: {
sha256 = "19a63kbgf8r268ybj1dyd7z4bzaw2dd6ygp3pk4swabjjj1pfrvx";
libraryHaskellDepends = [ gogol-core ];
description = "Google Fitness SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275681,7 +276707,7 @@ self: {
sha256 = "15dsq67qnpnmninklr9pm5yy1xn8a459pvgmhaabbp2x31ghqjiv";
libraryHaskellDepends = [ gogol-core ];
description = "Google Web Fonts Developer SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275714,7 +276740,7 @@ self: {
sha256 = "18scbflas6w5avgsm5ndnj1qyn277mlj3v2fl71mrfjwr6171l5c";
libraryHaskellDepends = [ gogol-core ];
description = "Google Fusion Tables SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275726,7 +276752,7 @@ self: {
sha256 = "0l73pqrsfnwxv3mbg6lxkzmbal1xb5gxcb3rnv16d60ng50xrpc3";
libraryHaskellDepends = [ gogol-core ];
description = "Google Play Game Services SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275738,7 +276764,7 @@ self: {
sha256 = "1qfag0mqyp5fk7p225qlc2551hdyzpmflnx0i59b24vm2yym1y4a";
libraryHaskellDepends = [ gogol-core ];
description = "Google Play Game Services Publishing SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275750,7 +276776,7 @@ self: {
sha256 = "0zy5bqi8lsb6r19bb5sd8fjcqx9v4g0lphxj60p20p94k5vw7wcd";
libraryHaskellDepends = [ gogol-core ];
description = "Google Play Game Management SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275762,7 +276788,7 @@ self: {
sha256 = "0ddyddxan844csb6mflrsq42ivvwrwcm6lhqy7wydysbf1wcfgmm";
libraryHaskellDepends = [ gogol-core ];
description = "Google Genomics SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275774,7 +276800,7 @@ self: {
sha256 = "045hqcyypvi8c2d9lh6szp1crz1xk9ll2ll93w5viyvzz2fzlpza";
libraryHaskellDepends = [ gogol-core ];
description = "Google Gmail SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275786,7 +276812,7 @@ self: {
sha256 = "0gskbydkk39zs6aa8ss4y3ibnsdb69zmm7jbi6ijr56y7qv11fgm";
libraryHaskellDepends = [ gogol-core ];
description = "Google Groups Migration SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275798,7 +276824,7 @@ self: {
sha256 = "0n0j1m01y9k2q07mkrdm5n9pp3ahs9byhl0kpi8na30y4zhscxr8";
libraryHaskellDepends = [ gogol-core ];
description = "Google Groups Settings SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275810,7 +276836,7 @@ self: {
sha256 = "1dskfbpm1mv2dax64izj8sarkssajnbkinc4pwkvgfgjhf9l9sq9";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Healthcare SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275822,7 +276848,7 @@ self: {
sha256 = "0ylryxz1wa8v246mwzpvqkqmggj2gbd9mxmgf5cbnkibmnbcwswg";
libraryHaskellDepends = [ gogol-core ];
description = "Google Identity and Access Management (IAM) SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275834,7 +276860,7 @@ self: {
sha256 = "1jzqijf08jmmavgc5f7vpvs1ixiw6h9k4x8y7q8kwiayp57gcgfh";
libraryHaskellDepends = [ gogol-core ];
description = "Google IAM Service Account Credentials SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275846,7 +276872,7 @@ self: {
sha256 = "0v7xm5qr5im2hcvq34s7c880f6yxnzwc4cax1cwm4f3zjq7galmb";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Identity-Aware Proxy SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275858,7 +276884,7 @@ self: {
sha256 = "1wdm8w4z4iicbla6139501v7ri9k9w6f0b131li0578dxqw411m0";
libraryHaskellDepends = [ gogol-core ];
description = "Google Identity Toolkit SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275870,7 +276896,7 @@ self: {
sha256 = "1hxk0gzk183vjljj57qkgyi5y4j1rigvjxkivxzvzlqyvpbirdrs";
libraryHaskellDepends = [ gogol-core ];
description = "Google Web Search Indexing SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275882,7 +276908,7 @@ self: {
sha256 = "0i9pi31vz2ngk8fpv16cizc2yjhs0pacnwf2c0fk9nylg9x4ms38";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Talent Solution SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275894,7 +276920,7 @@ self: {
sha256 = "02py8n5kk1lxmm7bkxag041rwzip4jxpdmldciq4vyq9fkkxvy57";
libraryHaskellDepends = [ gogol-core ];
description = "Google Knowledge Graph Search SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275906,7 +276932,7 @@ self: {
sha256 = "0y0r5c1kgzxmsply7zksh9dbzs2sd4fxwb4ps4w4lqzjkchdbj4x";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Natural Language SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275939,7 +276965,7 @@ self: {
sha256 = "14s5hw0qby8acqmf9f3kh068iaglmf9lp6p802vf3bg3qqx43857";
libraryHaskellDepends = [ gogol-core ];
description = "Google Library Agent SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275951,7 +276977,7 @@ self: {
sha256 = "1a2w6dyb0h3dy9fxzsrmq81d7vr3z2nk7xc0wkb4jhsdvn3nwkzk";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Logging SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -275963,7 +276989,7 @@ self: {
sha256 = "0ydxl3cxrw65bfp708im1mlqgf76bi8m0wl8x295mgzyyvi6q75g";
libraryHaskellDepends = [ gogol-core ];
description = "Google Manufacturer Center SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276017,7 +277043,7 @@ self: {
sha256 = "0si4kk7da0mxgqddjamxa8cmci75rlpl2bivjyqx99awff788376";
libraryHaskellDepends = [ gogol-core ];
description = "Google Mirror SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276029,7 +277055,7 @@ self: {
sha256 = "1vr7kv86b1cz364a5mbcl8w14k3f0rdkya4dqc99j46rqa89hcjs";
libraryHaskellDepends = [ gogol-core ];
description = "Google AI Platform Training & Prediction SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276041,7 +277067,7 @@ self: {
sha256 = "1psii00flwy8yh76ng1ixpzdix4i31gr9nlysvi20m962j2zb8x7";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Monitoring SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276053,7 +277079,7 @@ self: {
sha256 = "1yrzaa7wab67dw7yyz3kv78rka6vrmq4q53rrjda25y5mbzax08j";
libraryHaskellDepends = [ gogol-core ];
description = "Google OAuth2 SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276065,7 +277091,7 @@ self: {
sha256 = "0mwxzx6qqbcybanf8cvdrwi4q2y1rs9wlrs4ivsx5csjk07zrbpy";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud OS Login SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276077,7 +277103,7 @@ self: {
sha256 = "000p7lhs82fgw80x2g77bgk0ywhxcj22388a37xfdlvfwk7rxxhp";
libraryHaskellDepends = [ gogol-core ];
description = "Google PageSpeed Insights SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276089,7 +277115,7 @@ self: {
sha256 = "0jcqch35rw33fp3xc24x6063hfxfd6hkdhy8ns1b3ry0x59r42na";
libraryHaskellDepends = [ gogol-core ];
description = "Google Partners SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276101,7 +277127,7 @@ self: {
sha256 = "1qjr57q91kr6gf37y24z0hr4lwkqq5fk474mb53s6ipqiyqxsk1s";
libraryHaskellDepends = [ gogol-core ];
description = "Google People SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276134,7 +277160,7 @@ self: {
sha256 = "05nc0w5v5sgg2z1ldx8y6a06nqy81hsq1bln882gv5595mcz3134";
libraryHaskellDepends = [ gogol-core ];
description = "Google Play Movies Partner SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276146,7 +277172,7 @@ self: {
sha256 = "1mga3ppvlzjw133g8li20hjacp8k280qwpcsrfh1a9srmkflnqpi";
libraryHaskellDepends = [ gogol-core ];
description = "Google Play Custom App Publishing SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276158,7 +277184,7 @@ self: {
sha256 = "1jy99vdjqhlhvgir9h7hfc4w27nql44gqv9bn7g6w77xrh5qbbgg";
libraryHaskellDepends = [ gogol-core ];
description = "Google + SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276170,7 +277196,7 @@ self: {
sha256 = "00nyww46c4fxqvzm8jdl8wnmv0a7inm4hcyp56vl336l5fzw6wid";
libraryHaskellDepends = [ gogol-core ];
description = "Google + Domains SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276182,7 +277208,7 @@ self: {
sha256 = "0i87jzs5vrd7zwmrpkbf0jpw7yhq0y9hhiyay18kl78jkwh8gp9v";
libraryHaskellDepends = [ gogol-core ];
description = "Google Poly SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276215,7 +277241,7 @@ self: {
sha256 = "13yzm104viq54pddz321bh9fknr4i0pywsnmlayav82gy6q70fnn";
libraryHaskellDepends = [ gogol-core ];
description = "Google Proximity Beacon SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276227,7 +277253,7 @@ self: {
sha256 = "0ay6npsyzcq2m6dww8xdima8d19bqnrpi942hpmn5ny1rlxahvnj";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Pub/Sub SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276239,7 +277265,7 @@ self: {
sha256 = "1nvn2c936ia0jzkc6lljcrnxp69y7wj8yk4n95y4wqmibi7v1pc6";
libraryHaskellDepends = [ gogol-core ];
description = "Google QPX Express SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276251,7 +277277,7 @@ self: {
sha256 = "1xcgfz3d34iac66kld3fjszi6zn03hw6i51niyapnmgs7qwvw8xm";
libraryHaskellDepends = [ gogol-core ];
description = "Google reCAPTCHA Enterprise SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276263,7 +277289,7 @@ self: {
sha256 = "1fynpbfhnhpxki81wak3w6256rhb6yj2n6h605zpkmqb6zgdcraw";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Memorystore for Redis SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276275,7 +277301,7 @@ self: {
sha256 = "0316qcavy06s6lc77nd3kvkcivx99a29kybqk2v8gkm3d3hgnay6";
libraryHaskellDepends = [ gogol-core ];
description = "Google Remote Build Execution SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276287,7 +277313,7 @@ self: {
sha256 = "1nx55xgghprwzs81x4xvald37xvjzwrsfq5lrrarig5gsz3crb8h";
libraryHaskellDepends = [ gogol-core ];
description = "Google Replica Pool SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276299,7 +277325,7 @@ self: {
sha256 = "14cwrx4qw002464i913n6hxq7rw962w2kcrw3bzng74ndhaaswd2";
libraryHaskellDepends = [ gogol-core ];
description = "Google Compute Engine Instance Group Updater SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276311,7 +277337,7 @@ self: {
sha256 = "12mhxjw4x9cb5sgpy2z4sk9qkmarhwv8mb8q88qigx4d1abqj5gm";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Resource Manager SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276344,7 +277370,7 @@ self: {
sha256 = "07wqy2cp62d8gs4izqzqv50yaj7b37jfhq5qm67j9dr3s56kzz6q";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Run Admin SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276356,7 +277382,7 @@ self: {
sha256 = "0hrjl2vcbmk3hx38c0alh2lgz10xnsvb90lb5x9fkls2n6l0q3lm";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Runtime Configuration SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276368,7 +277394,7 @@ self: {
sha256 = "13yyab714dpd42j6683p4c6v97apc2qy4ihyhrsjr7yn6ysyc4jy";
libraryHaskellDepends = [ gogol-core ];
description = "Google Safe Browsing SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276380,7 +277406,7 @@ self: {
sha256 = "1a2ppyk9869bkwzfhaznqkja5pkdwjwal276k4mzn0ba7jrq47hs";
libraryHaskellDepends = [ gogol-core ];
description = "Google Apps Script SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276392,7 +277418,7 @@ self: {
sha256 = "0l5q9zj6scj72zg4sd1hkn5jwm4hh4q85wq6y5pm8s1sbqk3wsqz";
libraryHaskellDepends = [ gogol-core ];
description = "Google Search Console SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276404,7 +277430,7 @@ self: {
sha256 = "0vkipvyapjimizikzfgk4q2cdn0my5j85agnnz79hvlkqb412ggp";
libraryHaskellDepends = [ gogol-core ];
description = "Google Security Command Center SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276416,7 +277442,7 @@ self: {
sha256 = "0z5mfig3k7k90r5khcs8is4c278dsp9y6qa5fljfkljkd4bniyv4";
libraryHaskellDepends = [ gogol-core ];
description = "Google Service Broker SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276428,7 +277454,7 @@ self: {
sha256 = "17g49aqdgml3w16mj8qf3m0lz7wa6qhmvz1m7s5q2dly8i7klb9q";
libraryHaskellDepends = [ gogol-core ];
description = "Google Service Consumer Management SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276440,7 +277466,7 @@ self: {
sha256 = "0zw9a5q6nsyar5210ryh3svzv8jgjwjmn6mm1kpiqx32bi0gcb53";
libraryHaskellDepends = [ gogol-core ];
description = "Google Service Control SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276452,7 +277478,7 @@ self: {
sha256 = "0i3v8ryswaz84d27v867v5f3rpa6wa518k9y9sim87l4yvqdd72s";
libraryHaskellDepends = [ gogol-core ];
description = "Google Service Management SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276464,7 +277490,7 @@ self: {
sha256 = "0180yqdgrbsf7zazvdsbi1hwy671qc4m80chv458fgnhl6irqzsj";
libraryHaskellDepends = [ gogol-core ];
description = "Google Service Networking SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276476,7 +277502,7 @@ self: {
sha256 = "0mc44gczmh6acgfp3x0lhd7kv7agqdqskv91bvnrk9lmrhcqchr6";
libraryHaskellDepends = [ gogol-core ];
description = "Google Service Usage SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276488,7 +277514,7 @@ self: {
sha256 = "0gh7flld3vai2fwx9gqw3gcrjwwdk3nkahdxdzrixk96lrvfd2lb";
libraryHaskellDepends = [ gogol-core ];
description = "Google Service User SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276500,7 +277526,7 @@ self: {
sha256 = "0jx155xaa053mp7sdrrjng28vdvls51bqg374bp8015dqx8pq388";
libraryHaskellDepends = [ gogol-core ];
description = "Google Sheets SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276512,7 +277538,7 @@ self: {
sha256 = "09j3a7scawkxq81mghnypwhxi5jfx1w8nircmmhpm6a9543ikbgl";
libraryHaskellDepends = [ gogol-core ];
description = "Google Content API for Shopping SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276524,7 +277550,7 @@ self: {
sha256 = "04nn9382mwi4x83whhp66x99mml2djf97nlvpq0n5d6vs5nl65vf";
libraryHaskellDepends = [ gogol-core ];
description = "Google Site Verification SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276536,7 +277562,7 @@ self: {
sha256 = "06cc335zva6qdqr3mmhgsmhzyg09lipzmcsffwvngmbbk6adqfag";
libraryHaskellDepends = [ gogol-core ];
description = "Google Slides SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276548,7 +277574,7 @@ self: {
sha256 = "1v5wl66rl9kj7ckzvmy65a23s9d3ajfrxc4rsmpx6zzg3xmxjlw0";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Source Repositories SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276560,7 +277586,7 @@ self: {
sha256 = "0wbkqr2f2dha298n3sz007y9jg9c4yxn69m5ln7ffxa135yan6l8";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Spanner SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276572,7 +277598,7 @@ self: {
sha256 = "0z1la9nan5dfdksgkajh1a2smlj4vjqk3r2586cshyn4lf1iswsa";
libraryHaskellDepends = [ gogol-core ];
description = "Google Spectrum Database SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276584,7 +277610,7 @@ self: {
sha256 = "1bg6kqxjgwj5qrkrvl7gk9h9r60z41k9h7zf6y7a74arw1ycnfcs";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Speech-to-Text SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276596,7 +277622,7 @@ self: {
sha256 = "0aamc6i0l1ad9x4fnw1psq37fr8iq4pflmi7r9zpqpqh61225qic";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud SQL Admin SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276608,7 +277634,7 @@ self: {
sha256 = "1sdmnkaclgi1n9kip5v3791dbvl992sbf95kp967261cwdm00mw5";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Storage JSON SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276620,7 +277646,7 @@ self: {
sha256 = "14v3gk3pp3cn1r27dc9j6f0a8ska2mdpyarx54607x3y23bl1xc5";
libraryHaskellDepends = [ gogol-core ];
description = "Google Storage Transfer SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276632,7 +277658,7 @@ self: {
sha256 = "03zd6hk87fchc2v7wch7s2jjlp6kk2pdadd3vqapnfai5b4nmi0c";
libraryHaskellDepends = [ gogol-core ];
description = "Google Street View Publish SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276644,7 +277670,7 @@ self: {
sha256 = "1bpybiarlh030k825ikf4sc3wm54qn8jxn9wcycfchz311rahci1";
libraryHaskellDepends = [ gogol-core ];
description = "Google Surveys SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276656,7 +277682,7 @@ self: {
sha256 = "1lfadp570iampv44s8kjykimll2h3jrm7kmg696lc4gvr45ps9iz";
libraryHaskellDepends = [ gogol-core ];
description = "Google Tag Manager SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276689,7 +277715,7 @@ self: {
sha256 = "0spim4pb7l582ydp4p5fz24bdqdl2d3jl75sw90g39fkdhx8b36s";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Testing SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276701,7 +277727,7 @@ self: {
sha256 = "0dal449bcdlr04mllfam1m9n0qz8p3ddlv8vm1xpxzw52090jq3m";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Text-to-Speech SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276713,7 +277739,7 @@ self: {
sha256 = "108x732f9bxsqwj1wnmp3sb19v2hc0amjq3hjpw8f2iciyy4l5ia";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Tool Results SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276725,7 +277751,7 @@ self: {
sha256 = "09hbn03scg5axmfy15d29v5nmqxgsc8289x95rahcy00vjcx0aip";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud TPU SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276737,7 +277763,7 @@ self: {
sha256 = "0a98hq71pl3hiv8axaqibs7i5vx9h36zcp4lhj1ckca9mbqps87g";
libraryHaskellDepends = [ gogol-core ];
description = "Google Tracing SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276749,7 +277775,7 @@ self: {
sha256 = "15ai2f66bi5hvfpfqx3kpr7pb9nw5sw13p6igs9a2vmdaqf57mkg";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Translation SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276761,7 +277787,7 @@ self: {
sha256 = "0j846nnb5w2lki10wnvdslds4bi387hxcfrr3m8q156n0dvgzz5q";
libraryHaskellDepends = [ gogol-core ];
description = "Google URL Shortener SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276794,7 +277820,7 @@ self: {
sha256 = "08dyv38d0ga4dc6zlxz41dgba84ylxc336xv0c33jqxhrzdq6654";
libraryHaskellDepends = [ gogol-core ];
description = "Google Vault SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276806,7 +277832,7 @@ self: {
sha256 = "1303p25mdzvk79rhy942f1v27n476cqj1sclycq3mnflf661sbwa";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Video Intelligence SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276818,7 +277844,7 @@ self: {
sha256 = "13llhpsj0lzd4r6mbgzlcqgj8m14i0qk3il3pynxwhzvn1nccjps";
libraryHaskellDepends = [ gogol-core ];
description = "Google Cloud Vision SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276830,7 +277856,7 @@ self: {
sha256 = "1da7zap20g3s8n8pail5sh7wy4i7m718qr1h3dmqpd4413p9ybcn";
libraryHaskellDepends = [ gogol-core ];
description = "Google Search Console SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276842,7 +277868,7 @@ self: {
sha256 = "0asdbgv7n7vcc7z2qxr4aqva0w75wzxba2niyq10648ya1dxrx5d";
libraryHaskellDepends = [ gogol-core ];
description = "Google Web Security Scanner SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276854,7 +277880,7 @@ self: {
sha256 = "1zgfx51z3wxmjkyzg876kfmwb516n5dhaygg1bmjhqc6xwzzp2si";
libraryHaskellDepends = [ gogol-core ];
description = "Google YouTube Data API v3 SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276866,7 +277892,7 @@ self: {
sha256 = "01rcrcj83smzhz9bzdhwrnd799w2gg62ypvkffyd1n06frs6jlaf";
libraryHaskellDepends = [ gogol-core ];
description = "Google YouTube Analytics SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -276878,7 +277904,7 @@ self: {
sha256 = "14p05jzz2vpxhgr2gb8pp5i8ni46zy3j5vjhlq3gb2ri7cz76asz";
libraryHaskellDepends = [ gogol-core ];
description = "Google YouTube Reporting SDK";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -279057,6 +280083,7 @@ self: {
];
description = "Vulkan library";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
}
) { };
@@ -279116,7 +280143,7 @@ self: {
gpu-vulkan-core
];
description = "Thin wrapper for VK_KHR_surface extension of the Vulkan API";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -279145,7 +280172,7 @@ self: {
gpu-vulkan-core-khr-surface
];
description = "Thin wrapper for VK_KHR_swapchain extension of the Vulkan API";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -279183,7 +280210,8 @@ self: {
typelevel-tools-yj
];
description = "VK_KHR_surface extension of the Vulkan API";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
+ hydraPlatforms = lib.platforms.none;
}
) { };
@@ -279227,7 +280255,8 @@ self: {
typelevel-tools-yj
];
description = "GLFW surface for Vulkan";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
+ hydraPlatforms = lib.platforms.none;
}
) { };
@@ -279274,7 +280303,8 @@ self: {
typelevel-tools-yj
];
description = "VK_KHR_swapchain extension of the Vulkan API";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
+ hydraPlatforms = lib.platforms.none;
}
) { };
@@ -279359,6 +280389,8 @@ self: {
];
description = "Medium wrapper for Vulkan API";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -279399,7 +280431,8 @@ self: {
typelevel-tools-yj
];
description = "medium wrapper for VK_KHR_surface extension of the Vulkan API";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
+ hydraPlatforms = lib.platforms.none;
}
) { };
@@ -279431,7 +280464,8 @@ self: {
typelevel-tools-yj
];
description = "medium wrapper for GLFW surface for the Vulkan API";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
+ hydraPlatforms = lib.platforms.none;
}
) { };
@@ -279478,7 +280512,8 @@ self: {
typelevel-tools-yj
];
description = "medium wrapper for VK_KHR_swapchain extension of the Vulkan API";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
+ hydraPlatforms = lib.platforms.none;
}
) { };
@@ -279542,7 +280577,7 @@ self: {
criterion
];
description = "Applicative non-linear consumption";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -279575,7 +280610,7 @@ self: {
text
];
description = "Applicative parsers for form parameter lists";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -279655,7 +280690,7 @@ self: {
tasty-hunit
];
description = "API for creating grafana dashboards represented as json";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -279694,7 +280729,7 @@ self: {
unordered-containers
];
description = "Configure grafana dashboards from Dhall expression";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
mainProgram = "grafdhall";
}
) { };
@@ -279934,13 +280969,12 @@ self: {
hspec,
hspec-discover,
QuickCheck,
- random,
text,
}:
mkDerivation {
pname = "granite";
- version = "0.3.0.0";
- sha256 = "0dax05bqkvfa6wj2v7xdqrm3k6jr9qjyax93xasbybsh2zh352dr";
+ version = "0.3.0.4";
+ sha256 = "1h7pxas9zy5brss33402qf23w4wcjkh7gxmjw0l138hf3177sf09";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -279949,7 +280983,6 @@ self: {
];
executableHaskellDepends = [
base
- random
text
];
testHaskellDepends = [
@@ -279960,10 +280993,8 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Easy terminal plotting";
- license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
+ license = lib.licensesSpdx."MIT";
mainProgram = "granite";
- broken = true;
}
) { };
@@ -280174,8 +281205,8 @@ self: {
}:
mkDerivation {
pname = "grapesy";
- version = "1.1.0";
- sha256 = "1zr9x487l6aw872sdfdhcl7wl70nwfbdm8f3jrp7naayamxl2hzf";
+ version = "1.1.1";
+ sha256 = "0scxy26pfxcn26vrg2ynbx05lppc5iaz0b9aayharlgjmhf5k82l";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson
@@ -280260,7 +281291,7 @@ self: {
unordered-containers
];
description = "Native Haskell implementation of the gRPC framework";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -280284,7 +281315,7 @@ self: {
proto-lens-etcd
];
description = "grapesy-etcd - GRPC interface to etcd";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -280791,7 +281822,7 @@ self: {
transformers
];
description = "Trace the call graph of a program";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -280831,7 +281862,7 @@ self: {
directory
];
description = "Converts a graph-trace log into a DOT file for use with Graphviz";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "graph-trace-dot";
}
) { };
@@ -280861,7 +281892,7 @@ self: {
process
];
description = "Converts a graph-trace log into an HTML document";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "graph-trace-viz";
}
) { };
@@ -281534,7 +282565,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "GraphQL with batteries";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -281952,7 +282983,7 @@ self: {
];
testToolDepends = [ tasty-autocollect ];
description = "Monadic DOT graph builder DSL";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "example";
broken = true;
@@ -282143,7 +283174,7 @@ self: {
test-framework-quickcheck2
];
description = "Gray encoding schemes";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -282750,7 +283781,7 @@ self: {
tasty-bench
];
description = "Uniformly-random pre-factored numbers (Kalai)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "grfn-exe";
broken = true;
@@ -282781,7 +283812,7 @@ self: {
test-framework-quickcheck2
];
description = "Tools for working with regular grids (graphs, lattices)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -283040,10 +284071,8 @@ self: {
}:
mkDerivation {
pname = "gridtables";
- version = "0.1.0.0";
- sha256 = "1smhbb2jxysbqhxww5rikjfnhsdbf0gq3kgnn6ikjzcrqwdk9b6n";
- revision = "1";
- editedCabalFile = "0ay4ywi8w5kk4blf8jqxhivzprp1ivpdlw6racr1692psyizmxi0";
+ version = "0.1.1.0";
+ sha256 = "0r2cnlkbw9b6m1x2im1jxdi191f354p47k98hkna7qi9azgnm8g8";
libraryHaskellDepends = [
array
base
@@ -283061,7 +284090,7 @@ self: {
text
];
description = "Parser for reStructuredText-style grid tables";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -283861,7 +284890,7 @@ self: {
utility-ht
];
description = "Shell command for grouping files by dates into folders";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "group-by-date";
maintainers = [ lib.maintainers.thielema ];
}
@@ -284041,7 +285070,7 @@ self: {
sha256 = "0f5c8dg9b74glfw2sdvdcl9c8igs6knz1bayk4gvvzvypsl547nf";
libraryHaskellDepends = [ base ];
description = "Groups";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -284062,7 +285091,7 @@ self: {
groups
];
description = "Generically derive Group instances";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -284137,7 +285166,7 @@ self: {
vector
];
description = "A contiguous growable array type";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -284504,7 +285533,7 @@ self: {
tree-diff
];
description = "Implementation of the pure part of the gRPC spec";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -284614,7 +285643,7 @@ self: {
sha256 = "0if8kvwx51bwsdkwpk9ardmlm9l5v91vfy4g3bj2gmd3184nw6la";
libraryHaskellDepends = [ base ];
description = "Gruvbox colors for use in Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -284773,7 +285802,7 @@ self: {
X11
];
description = "A visual generic menu";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "gsmenu";
}
@@ -285054,7 +286083,7 @@ self: {
];
libraryPkgconfigDepends = [ gtk2 ];
description = "Binding to the Gtk+ graphical user interface library";
- license = lib.licenses.lgpl21Only;
+ license = lib.licensesSpdx."LGPL-2.1-only";
}
) { inherit (pkgs) gtk2; };
@@ -285253,10 +286282,10 @@ self: {
gi-cairo-connector,
gi-cairo-render,
gi-dbusmenugtk3,
- gi-gdk,
+ gi-gdk3,
gi-gdkpixbuf,
gi-glib,
- gi-gtk,
+ gi-gtk3,
gtk-strut,
gtk3,
haskell-gi,
@@ -285271,8 +286300,8 @@ self: {
}:
mkDerivation {
pname = "gtk-sni-tray";
- version = "0.1.8.1";
- sha256 = "0i131ks6m5akgcfahcbfqhg1i5dxz0y6rba3is4s3m5va6spp5yf";
+ version = "0.1.9.0";
+ sha256 = "082y2h267zynqqlpvbqn7pai2lj0izq1q629a3jsw0y89k3vagpi";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -285287,10 +286316,10 @@ self: {
gi-cairo-connector
gi-cairo-render
gi-dbusmenugtk3
- gi-gdk
+ gi-gdk3
gi-gdkpixbuf
gi-glib
- gi-gtk
+ gi-gtk3
gtk-strut
haskell-gi
haskell-gi-base
@@ -285306,8 +286335,8 @@ self: {
base
dbus
dbus-hslogger
- gi-gdk
- gi-gtk
+ gi-gdk3
+ gi-gtk3
gtk-strut
hslogger
optparse-applicative
@@ -285318,7 +286347,6 @@ 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; };
@@ -285328,29 +286356,27 @@ self: {
mkDerivation,
base,
data-default,
- gi-gdk,
- gi-gtk,
+ gi-gdk3,
+ gi-gtk3,
hslogger,
text,
transformers,
}:
mkDerivation {
pname = "gtk-strut";
- version = "0.1.3.2";
- sha256 = "0rymacvllin8ni2fd7yyfq43rbbyb921c4nm4z7aa2z82fsrkw3q";
+ version = "0.1.4.0";
+ sha256 = "0xc3c9mzfm7d7sncdzqyjlbkvmrv4b9v09q2yjysvs09hhw5lyva";
libraryHaskellDepends = [
base
data-default
- gi-gdk
- gi-gtk
+ gi-gdk3
+ gi-gtk3
hslogger
text
transformers
];
description = "Library for creating strut windows with gi-gtk";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}
) { };
@@ -285460,7 +286486,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "Tools to build the Gtk2Hs suite of User Interface libraries";
- license = lib.licenses.gpl2Only;
+ license = lib.licensesSpdx."GPL-2.0-only";
}
) { };
@@ -285744,7 +286770,7 @@ self: {
];
libraryPkgconfigDepends = [ gtk3 ];
description = "Binding to the Gtk+ 3 graphical user interface library";
- license = lib.licenses.lgpl21Only;
+ license = lib.licensesSpdx."LGPL-2.1-only";
}
) { inherit (pkgs) gtk3; };
@@ -286233,7 +287259,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "The border guardian for your package dependencies";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "guardian";
broken = true;
@@ -286386,7 +287412,7 @@ self: {
unix
];
description = "ghcWithPackages cmdline util";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "gw";
broken = true;
@@ -286666,8 +287692,8 @@ self: {
}:
mkDerivation {
pname = "h-raylib";
- version = "5.5.3.0";
- sha256 = "0r1fr1wisdahqysvj10yb8i1dk5wc980p03db7i8jgvx96m6afhw";
+ version = "5.5.3.1";
+ sha256 = "1977pd0aqb9jiply9fyz1f5rw0vh6wpv8v2dyvk0awk8v5lbsaa0";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -286691,7 +287717,7 @@ self: {
libXrandr
];
description = "Raylib bindings for Haskell";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
badPlatforms = lib.platforms.darwin;
}
)
@@ -286864,7 +287890,7 @@ self: {
test-framework-quickcheck2
];
description = "A Haskell binding for H3";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -286932,7 +287958,7 @@ self: {
time
];
description = "Control your Arduino board from Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -287623,7 +288649,7 @@ self: {
zlib
];
description = "native Haskell implementation of OpenPGP (RFC4880)";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -289188,7 +290214,7 @@ self: {
servant-client
];
description = "An API binding to Hackage API";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -289275,7 +290301,7 @@ self: {
];
doHaddock = false;
description = "CLI tool for Hackage";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
mainProgram = "hackage-cli";
}
) { };
@@ -289584,6 +290610,60 @@ self: {
}
) { };
+ hackage-publish = callPackage (
+ {
+ mkDerivation,
+ aeson,
+ async,
+ base,
+ data-default,
+ directory,
+ filepath,
+ mtl,
+ optics-core,
+ profunctors,
+ relude,
+ shh,
+ shower,
+ template-haskell,
+ temporary,
+ time,
+ which,
+ with-utf8,
+ }:
+ mkDerivation {
+ pname = "hackage-publish";
+ version = "0.1.0.0";
+ sha256 = "1zgsj9jfmapdx099wvgh31m13aknn7gkx42kzsk22s7wv5ldng7y";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ aeson
+ async
+ base
+ data-default
+ directory
+ filepath
+ mtl
+ optics-core
+ profunctors
+ relude
+ shh
+ shower
+ template-haskell
+ temporary
+ time
+ which
+ with-utf8
+ ];
+ description = "No frills releasing to Hackage";
+ license = lib.licensesSpdx."MIT";
+ hydraPlatforms = lib.platforms.none;
+ mainProgram = "hackage-publish";
+ broken = true;
+ }
+ ) { };
+
hackage-repo-tool = callPackage (
{
mkDerivation,
@@ -289678,7 +290758,7 @@ self: {
time
];
description = "List Hackage reverse dependencies";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -289730,7 +290810,7 @@ self: {
time
];
description = "List Hackage reverse dependencies";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -290447,7 +291527,7 @@ self: {
];
doHaddock = false;
description = "Hackage and Portage integration tool";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
mainProgram = "hackport";
}
) { };
@@ -290530,7 +291610,7 @@ self: {
haddock-test
];
description = "A documentation-generation tool for Haskell libraries";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "haddock";
}
@@ -290606,7 +291686,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "A documentation-generation tool for Haskell libraries";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -290620,7 +291700,7 @@ self: {
sha256 = "1nqq7k8ssl6h1d501d8ayzsdlihnbfrqy4l5z43msc6lr7ffvz2r";
libraryHaskellDepends = [ base ];
description = "A documentation-only package exemplifying haddock markup features";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -290708,7 +291788,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Library exposing some functionality of Haddock";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -290779,7 +291859,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Eliminate warnings for names referred in Haddock only";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -290860,7 +291940,6 @@ self: {
hspec-discover,
HsYAML,
HUnit,
- ilist,
language-docker,
megaparsec,
mtl,
@@ -290882,8 +291961,8 @@ self: {
}:
mkDerivation {
pname = "hadolint";
- version = "2.13.1";
- sha256 = "0c4wazp5xrnbhp8gxg8mjppdb9ys77zxywkqysw6h7vzd1rsk7bd";
+ version = "2.14.0";
+ sha256 = "1zsn381r71iysd85q1m6xngx0hs4a8nb9wwlx6g59dpx9aqs265g";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -290903,7 +291982,6 @@ self: {
foldl
gitrev
HsYAML
- ilist
language-docker
megaparsec
mtl
@@ -291093,7 +292171,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "A simple Hadoop streaming library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -291181,7 +292259,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base ];
description = "Confirm delegation of NS and MX records";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
mainProgram = "haeredes";
}
) { };
@@ -291343,8 +292421,6 @@ self: {
];
description = "A graph library offering mutable, immutable, and inductive graphs";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}
) { };
@@ -292315,6 +293391,8 @@ self: {
pname = "hakyll-alectryon";
version = "0.2.0.0";
sha256 = "0zcl7wyi922lfp1dp3sbacqjcy8yk7qs6az48x40x2g42grrzddl";
+ revision = "1";
+ editedCabalFile = "03z4g50cdxk9rslcizn10qxwpxnzsgd4cx234w33wyqyd6mc2910";
libraryHaskellDepends = [
aeson
base
@@ -292329,7 +293407,7 @@ self: {
text
];
description = "Hakyll extension for rendering Coq code using Alectryon";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -292864,7 +293942,7 @@ self: {
vector
];
description = "Hakyll utilities to work with images";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -293060,8 +294138,8 @@ self: {
}:
mkDerivation {
pname = "hakyll-shortcut-links";
- version = "0.1.0.2";
- sha256 = "06wwp9vwxvhizhj8jvz77p5zycaqyjpm2dbh1k6m90hdlpzi0vcz";
+ version = "0.1.1.0";
+ sha256 = "17vhiz3x75dir194jk8pibip8z91a0qghwnrq55141kk6b0vdccv";
libraryHaskellDepends = [
base
hakyll
@@ -293079,8 +294157,7 @@ self: {
text
];
description = "Use shortcut-links in markdown file for Hakyll";
- license = lib.licenses.mpl20;
- hydraPlatforms = lib.platforms.none;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -293357,6 +294434,8 @@ self: {
pname = "half";
version = "0.3.3";
sha256 = "00mb2xfz0q8sq8zxqpw3ycp1p8gjhlgc0wxh5xr7kzyn52b08xpl";
+ revision = "1";
+ editedCabalFile = "1l21z6a7h6qkfnk0mp4qg3mgqjzrx5a9ra0ymb45rr3svvw9w45m";
libraryHaskellDepends = [
base
binary
@@ -293473,7 +294552,7 @@ self: {
sha256 = "1y09vl853nsc6fx19bwmmmh9k7di825j4y7rsm06wyk35m911yv7";
libraryHaskellDepends = [ base ];
description = "A library to provide special kind of two-column output for Phladiprelio";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -293503,7 +294582,7 @@ self: {
JuicyPixels
];
description = "Integration between Halide and JuicyPixels";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
platforms = lib.platforms.linux;
hydraPlatforms = lib.platforms.none;
}
@@ -293533,7 +294612,7 @@ self: {
hspec
];
description = "Integration between Halide and ArrayFire";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -293594,7 +294673,7 @@ self: {
vector
];
description = "Haskell bindings to Halide";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
platforms = lib.platforms.linux;
hydraPlatforms = lib.platforms.none;
broken = true;
@@ -296569,7 +297648,7 @@ self: {
list-tries
];
description = "Support for static URL routing with overlap detection for Happstack";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -296871,7 +297950,7 @@ self: {
Chart-diagrams
];
description = "Generate simple okay-looking bar plots without much effort";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -296900,7 +297979,7 @@ self: {
];
doHaddock = false;
description = "Happy is a parser generator for Haskell implemented using this library";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -297357,7 +298436,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Haskell program configuration using higher kinded data";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -297565,8 +298644,8 @@ self: {
}:
mkDerivation {
pname = "harpie";
- version = "0.1.3.0";
- sha256 = "1agkp62rcgk705hp8hlppfiidv5vsz0ps6pq3pvlnn1g73vv5ivr";
+ version = "0.1.3.1";
+ sha256 = "1wdr4jqfaqiy089hkgimaxhmrqh82cb73ycg6sl5bx22k871fjyr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -297591,7 +298670,7 @@ self: {
doctest-parallel
];
description = "Haskell array programming";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "harpie-bug-issue1";
}
) { };
@@ -297624,7 +298703,7 @@ self: {
prettyprinter
];
description = "numhask shim for harpie";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -297777,7 +298856,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "This library 'Has' transformers";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
maintainers = [ lib.maintainers.turion ];
}
) { };
@@ -297789,33 +298868,30 @@ self: {
base64-bytestring,
binary,
bytestring,
- connection,
containers,
criterion,
+ crypton-connection,
data-binary-ieee754,
data-default,
deepseq,
- deepseq-generics,
hspec,
mtl,
network,
- QuickCheck,
text,
}:
mkDerivation {
pname = "hasbolt";
- version = "0.1.7.0";
- sha256 = "08df7wxybqyjmk13haq8g72f658s1cskf2vvp25hgly0gcqy57d4";
+ version = "0.1.7.1";
+ sha256 = "1pd7axnr48bc5lqw3zax0cs3722m39pgmgjrkhq8fd30alw3xm2s";
libraryHaskellDepends = [
base
binary
bytestring
- connection
containers
+ crypton-connection
data-binary-ieee754
data-default
deepseq
- deepseq-generics
mtl
network
text
@@ -297826,7 +298902,6 @@ self: {
bytestring
containers
hspec
- QuickCheck
text
];
benchmarkHaskellDepends = [
@@ -297836,11 +298911,9 @@ self: {
bytestring
criterion
data-default
- hspec
];
description = "Haskell driver for Neo4j 3+ (BOLT protocol)";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}
) { };
@@ -297950,7 +299023,7 @@ self: {
sha256 = "1vgbmlcd33vky1mf9sx6dkbh8yjp7nyr4528y6qz7xn7z1lxfyyx";
libraryHaskellDepends = [ base ];
description = "Haskell to and from Scalameta";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -298455,7 +299528,7 @@ self: {
temporary
];
description = "Hash-addressed file storage";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -298523,7 +299596,7 @@ self: {
unordered-containers
];
description = "Hash-addressed file storage app";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "hash-addressed";
}
@@ -298715,7 +299788,7 @@ self: {
unix
];
description = "A class for types that can be converted to a hash value";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -298775,7 +299848,7 @@ self: {
unix
];
description = "A class for types that can be converted to a hash value";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -298901,7 +299974,7 @@ self: {
time-compat
];
description = "Provides instances missing from Hashable";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -299075,7 +300148,7 @@ self: {
vector
];
description = "Hash digests for files and directories";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "hasherize";
broken = true;
@@ -299119,7 +300192,7 @@ self: {
];
benchmarkSystemDepends = [ openssl ];
description = "Hash functions";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { inherit (pkgs) openssl; };
@@ -299423,7 +300496,7 @@ self: {
vector
];
description = "Mutable hash tables in the ST monad";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -299938,7 +301011,7 @@ self: {
}
) { };
- haskeline_0_8_4_0 = callPackage (
+ haskeline_0_8_4_1 = callPackage (
{
mkDerivation,
base,
@@ -299957,8 +301030,8 @@ self: {
}:
mkDerivation {
pname = "haskeline";
- version = "0.8.4.0";
- sha256 = "1jky7h70f6k8qaxkh6f7pd5cam9sjqmibh18kksf8vr98dzh3xhp";
+ version = "0.8.4.1";
+ sha256 = "0kxdgy3s6pakb7yqk9jy747xv6n3plzwxnnzabqnyk83cs0d8n22";
configureFlags = [ "-fterminfo" ];
isLibrary = true;
isExecutable = true;
@@ -300522,7 +301595,7 @@ self: {
tasty-quickcheck
];
description = "A lightweight library for asynchronous job workers with multiple broker backends";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
}
) { };
@@ -300599,7 +301672,7 @@ self: {
text
];
description = "PostgreSQL/PGMQ broker implementation for haskell-bee";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "simple-worker";
broken = true;
@@ -300671,7 +301744,7 @@ self: {
unix-time
];
description = "Redis broker implementation for haskell-bee";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
}
) { };
@@ -300737,7 +301810,7 @@ self: {
unix-time
];
description = "STM broker implementation for haskell-bee";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
}
) { };
@@ -300776,7 +301849,7 @@ self: {
text
];
description = "Reusable test suite for any haskell-bee Broker implementation";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
}
) { };
@@ -301081,7 +302154,7 @@ self: {
];
doHaddock = false;
description = "Cabal package script generator for Travis-CI";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
mainProgram = "haskell-ci";
maintainers = [ lib.maintainers.sternenseemann ];
}
@@ -301389,7 +302462,6 @@ self: {
];
description = "Haskell Debug Adapter";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
mainProgram = "haskell-debug-adapter";
}
) { };
@@ -301398,6 +302470,7 @@ self: {
{
mkDerivation,
aeson,
+ aeson-pretty,
array,
async,
base,
@@ -301417,18 +302490,27 @@ self: {
hie-bios,
implicit-hie,
mtl,
+ network,
+ network-run,
optparse-applicative,
prettyprinter,
process,
+ random,
+ regex,
+ tasty,
+ tasty-golden,
+ tasty-hunit,
+ temporary,
text,
time,
transformers,
unix,
+ unordered-containers,
}:
mkDerivation {
pname = "haskell-debugger";
- version = "0.7.0.0";
- sha256 = "18hx1jb6w8yzxh410fsi2lv7xv37gm2k9i7yfchhiqccgbr5zp2j";
+ version = "0.9.0.0";
+ sha256 = "1fla0w681lv9v64aglyyg4i4s83fzcs836cm3xj4a4jviv9m3psg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -301470,16 +302552,39 @@ self: {
hie-bios
implicit-hie
mtl
+ network
+ network-run
optparse-applicative
prettyprinter
process
text
transformers
unix
+ unordered-containers
+ ];
+ testHaskellDepends = [
+ aeson
+ aeson-pretty
+ async
+ base
+ bytestring
+ containers
+ dap
+ filepath
+ network
+ network-run
+ process
+ random
+ regex
+ tasty
+ tasty-golden
+ tasty-hunit
+ temporary
+ text
+ unordered-containers
];
- testHaskellDepends = [ base ];
description = "A step-through machine-interface debugger for GHC Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "hdb";
}
@@ -301813,7 +302918,7 @@ self: {
hspec-expectations
];
description = "Haskell bindings for ffprobe";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -302254,7 +303359,7 @@ self: {
vector
];
description = "Auto-generated Gemini API Client for Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -302400,7 +303505,7 @@ self: {
uuid-types
];
description = "Haskell port of purescript-halogen library";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "halogen-core-prototype";
broken = true;
@@ -302484,9 +303589,7 @@ self: {
tasty-hunit
];
description = "Bindings to the igraph C library (v0.8.5).";
- license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
- broken = true;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -302634,12 +303737,14 @@ self: {
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,
@@ -302664,6 +303769,7 @@ self: {
process-extras,
QuickCheck,
random,
+ refact,
regex-applicative,
regex-tdfa,
row-types,
@@ -302675,6 +303781,7 @@ self: {
stan,
stm,
stm-containers,
+ string-interpolate,
stylish-haskell,
syb,
tasty,
@@ -302683,6 +303790,7 @@ self: {
tasty-quickcheck,
tasty-rerun,
template-haskell,
+ temporary,
text,
text-rope,
time,
@@ -302697,10 +303805,8 @@ self: {
}:
mkDerivation {
pname = "haskell-language-server";
- version = "2.11.0.0";
- sha256 = "1acd42sqa76nkrwkb6jcrimbf8va6ikkynv9ssbbamyy4vmx1aa4";
- revision = "1";
- editedCabalFile = "06ah5cdcg52azd0jx7n4n7xwrhphjc2k4k8gqda44m1kiv5z2v18";
+ version = "2.12.0.0";
+ sha256 = "1la7kmpapzchypjarvy8vwjggxr4smaqfjpc1wfrgh3y3anb6s8p";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -302728,12 +303834,14 @@ self: {
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
@@ -302753,6 +303861,7 @@ self: {
prettyprinter
process
process-extras
+ refact
regex-applicative
regex-tdfa
row-types
@@ -302766,6 +303875,7 @@ self: {
stylish-haskell
syb
template-haskell
+ temporary
text
text-rope
time
@@ -302838,6 +303948,7 @@ self: {
sqlite-simple
stm
stm-containers
+ string-interpolate
tasty
tasty-expected-failure
tasty-hunit
@@ -302874,7 +303985,7 @@ self: {
benchmarkToolDepends = [ eventlog2html ];
doHaddock = false;
description = "LSP server for GHC";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
maintainers = [ lib.maintainers.maralorn ];
}
) { };
@@ -302887,7 +303998,7 @@ self: {
sha256 = "0h8s19j2flby3qrvb93j1d2lpjl1jgin8lj6dqpb7c86h59f2xlx";
libraryHaskellDepends = [ base ];
description = "A fully compliant Haskell 98 lexer";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -303614,7 +304725,7 @@ self: {
text
];
description = "Haskell interface for Tembo's PGMQ PostgreSQL extension";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
}
) { };
@@ -304523,7 +305634,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "haskell-stack-trace-plugin";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "example";
broken = true;
@@ -304564,7 +305675,7 @@ self: {
time
];
description = "A simple throttling library, which drops messages from same group";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -305742,7 +306853,7 @@ self: {
process
];
description = "Rebuild Haskell dependencies in Gentoo";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
mainProgram = "haskell-updater";
}
) { };
@@ -305862,7 +306973,7 @@ self: {
base
];
description = "Haskell 2020[draft] Standard Library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -307295,7 +308406,7 @@ self: {
vector
];
description = "embedded DSL for defining epidemiologic cohorts";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -308854,8 +309965,8 @@ self: {
}:
mkDerivation {
pname = "hasktorch";
- version = "0.2.1.6";
- sha256 = "0zv1n54bjvisnr5himacq7mxanblldrdxnfvbszp0ahvlgjamm1z";
+ version = "0.2.1.7";
+ sha256 = "1ypzkgmwlf31mjqdrdq7fb7imniaqy7k8h4ii92dcpj7r2gdlb2x";
setupHaskellDepends = [
base
Cabal
@@ -308945,7 +310056,7 @@ self: {
weigh
];
description = "Haskell bindings to libtorch, supporting both typed and untyped tensors";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -309000,7 +310111,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Code generation tools for Hasktorch";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "ht-codegen";
broken = true;
@@ -309030,7 +310141,7 @@ self: {
text
];
description = "Testing library for Hasktorch's FFI bindings";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -309068,7 +310179,7 @@ self: {
text
];
description = "Bindings to Torch";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -309113,7 +310224,7 @@ self: {
text
];
description = "Bindings to Cutorch";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { ATen = null; };
@@ -309182,7 +310293,7 @@ self: {
];
doHaddock = false;
description = "Core Hasktorch abstractions wrapping FFI bindings";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -309222,7 +310333,7 @@ self: {
];
doHaddock = false;
description = "Backpack signatures for Tensor operations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -309244,7 +310355,7 @@ self: {
hasktorch-types-th
];
description = "Functions to partially satisfy tensor signatures";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -309268,7 +310379,7 @@ self: {
];
doHaddock = false;
description = "Signatures for support tensors in hasktorch";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -309292,7 +310403,7 @@ self: {
];
doHaddock = false;
description = "Core types for Hasktorch backpack signatures";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -309315,7 +310426,7 @@ self: {
];
libraryToolDepends = [ c2hs ];
description = "C-types for Torch";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -309338,7 +310449,7 @@ self: {
];
libraryToolDepends = [ c2hs ];
description = "C-types for Cutorch";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -309391,7 +310502,7 @@ self: {
vector
];
description = "Neural architectures in hasktorch";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -309448,7 +310559,7 @@ self: {
criterion
];
description = "Haskus binary format manipulation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -309612,7 +310723,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Haskus data utility modules";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -309632,7 +310743,7 @@ self: {
doctest
];
description = "Haskus types utility modules";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -309684,7 +310795,7 @@ self: {
QuickCheck
];
description = "Variant and EADT";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -309717,7 +310828,7 @@ self: {
text
];
description = "Haskus web";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -310029,7 +311140,7 @@ self: {
vector-sized
];
description = "A monad for interfacing with external SMT solvers";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
}
) { };
@@ -310210,7 +311321,7 @@ self: {
];
doHaddock = false;
description = "An efficient PostgreSQL driver with a flexible mapping API";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -310298,7 +311409,92 @@ self: {
];
doHaddock = false;
description = "Fast PostgreSQL driver with a flexible mapping API";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
+ }
+ ) { };
+
+ hasql_1_9_3_2 = callPackage (
+ {
+ mkDerivation,
+ aeson,
+ attoparsec,
+ base,
+ bytestring,
+ bytestring-strict-builder,
+ containers,
+ contravariant,
+ contravariant-extras,
+ criterion,
+ dlist,
+ hashable,
+ hspec,
+ hspec-discover,
+ iproute,
+ mtl,
+ postgresql-binary,
+ postgresql-libpq,
+ profunctors,
+ QuickCheck,
+ quickcheck-instances,
+ rerebase,
+ scientific,
+ testcontainers-postgresql,
+ text,
+ text-builder,
+ time,
+ transformers,
+ unordered-containers,
+ uuid,
+ vector,
+ witherable,
+ }:
+ mkDerivation {
+ pname = "hasql";
+ version = "1.9.3.2";
+ sha256 = "1qaiawgz9qrkw11p6z6spqsvwmcq6s4xjkl54cn3vpwqzyvfcacf";
+ libraryHaskellDepends = [
+ aeson
+ attoparsec
+ base
+ bytestring
+ bytestring-strict-builder
+ containers
+ contravariant
+ dlist
+ hashable
+ iproute
+ mtl
+ postgresql-binary
+ postgresql-libpq
+ profunctors
+ scientific
+ testcontainers-postgresql
+ text
+ text-builder
+ time
+ transformers
+ unordered-containers
+ uuid
+ vector
+ witherable
+ ];
+ testHaskellDepends = [
+ contravariant-extras
+ hspec
+ QuickCheck
+ quickcheck-instances
+ rerebase
+ testcontainers-postgresql
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [
+ criterion
+ rerebase
+ ];
+ doHaddock = false;
+ description = "Fast PostgreSQL driver with a flexible mapping API";
+ license = lib.licensesSpdx."MIT";
+ hydraPlatforms = lib.platforms.none;
}
) { };
@@ -310430,7 +311626,7 @@ self: {
tasty-hunit
];
description = "A declarative abstraction over PostgreSQL Cursor";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -310465,7 +311661,7 @@ self: {
transformers
];
description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -310546,7 +311742,7 @@ self: {
tasty-hunit
];
description = "Toolkit for constructing Hasql statements dynamically";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -310584,7 +311780,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Effectful bindings for hasql";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "hasql-effectful-example";
broken = true;
@@ -310624,7 +311820,7 @@ self: {
tasty-hunit
];
description = "Hasql queries testing interface";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -310708,7 +311904,7 @@ self: {
vector
];
description = "Implicit definitions for Hasql, such as default codecs for standard types";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -310746,7 +311942,7 @@ self: {
vector
];
description = "Implicit definitions for Hasql, such as default codecs for standard types";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -310809,7 +312005,7 @@ self: {
tmp-postgres
];
description = "QuasiQuoter that supports expression interpolation for hasql";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -310838,7 +312034,7 @@ self: {
text
];
description = "LISTEN/NOTIFY with hasql";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -310928,7 +312124,7 @@ self: {
transformers
];
description = "Hasql migrations library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -311050,7 +312246,7 @@ self: {
time
];
description = "\"optparse-applicative\" parsers for \"hasql\"";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -311119,7 +312315,7 @@ self: {
rerebase
];
description = "Pool of connections for Hasql";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -311132,17 +312328,21 @@ self: {
bytestring,
hasql,
hspec,
+ hspec-discover,
random,
rerebase,
stm,
+ testcontainers-postgresql,
text,
+ text-builder,
time,
+ tuple,
uuid,
}:
mkDerivation {
pname = "hasql-pool";
- version = "1.3.0.3";
- sha256 = "1r59bn50klalw3g9fal8xpbv86fzzw77nqbymhdvq11wslhpyrm3";
+ version = "1.3.0.4";
+ sha256 = "1spqdiba90sxsx9cwarxmxfq4d89nkdf76a83hpb3bklmcz9sg0w";
libraryHaskellDepends = [
base
bytestring
@@ -311158,9 +312358,13 @@ self: {
hspec
random
rerebase
+ testcontainers-postgresql
+ text-builder
+ tuple
];
+ testToolDepends = [ hspec-discover ];
description = "Pool of connections for Hasql";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -311436,7 +312640,7 @@ self: {
hspec
];
description = "A pool of connections for Hasql based on resource-pool";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -311500,7 +312704,7 @@ self: {
transformers
];
description = "Stream Hasql queries with Conduit";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -311523,7 +312727,7 @@ self: {
hasql-transaction-io
];
description = "Stream Hasql queries";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -311581,7 +312785,7 @@ self: {
unliftio-core
];
description = "An example program that shows how to use Hasql streams with Rel8";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "hasql-streaming";
}
@@ -311610,7 +312814,7 @@ self: {
transformers
];
description = "Stream Hasql queries with Pipes";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -311639,7 +312843,7 @@ self: {
transformers
];
description = "Stream Hasql queries with Streaming";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -311668,7 +312872,7 @@ self: {
transformers
];
description = "Stream Hasql queries with Streamly";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -311709,7 +312913,7 @@ self: {
vector
];
description = "Template Haskell utilities for Hasql";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -311785,7 +312989,7 @@ self: {
rerebase
];
description = "Composable abstraction over retryable transactions for Hasql";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -311820,7 +313024,7 @@ self: {
unliftio-core
];
description = "Perform IO actions during transactions for Hasql";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -311855,7 +313059,7 @@ self: {
tasty-quickcheck
];
description = "Parse PostgreSQL connection URI into Hasql.Connection Settings";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -312601,7 +313805,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base ];
description = "Manipulates network blocks in CIDR notation";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
mainProgram = "hath";
}
) { };
@@ -312773,7 +313977,7 @@ self: {
text
];
description = "Library for checking for weak/compromised passwords";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "readme";
maintainers = [ lib.maintainers.alexfmpe ];
}
@@ -313085,8 +314289,6 @@ self: {
];
description = "A Haskell library for efficient, concurrent, and concise data access";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}
) { };
@@ -313119,6 +314321,7 @@ self: {
description = "Haxl data source for accessing AWS services through amazonka";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -313183,6 +314386,7 @@ self: {
description = "An example Haxl data source for accessing the Facebook Graph API";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -313470,7 +314674,7 @@ self: {
mmap
];
description = "A command line tool to compute BLAKE3 hashes";
- license = lib.licenses.agpl3Only;
+ license = lib.licensesSpdx."AGPL-3.0-only";
platforms = lib.platforms.x86;
mainProgram = "hb3sum";
}
@@ -313939,7 +315143,7 @@ self: {
hspec
];
description = "Blosc (numerical compression library) bindings for Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -314269,7 +315473,7 @@ self: {
witherable
];
description = "2d Delaunay triangulation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -314776,7 +315980,7 @@ self: {
string-interpolate
];
description = "Haskell artifact name counts";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "hcount";
broken = true;
@@ -316129,7 +317333,7 @@ self: {
selective
];
description = "More informative parser";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -316259,7 +317463,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "License Header Manager";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "headroom";
}
) { };
@@ -316320,7 +317524,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "interactively inspect Haskell values at runtime";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -316905,11 +318109,11 @@ self: {
{ mkDerivation, base }:
mkDerivation {
pname = "heck";
- version = "0.2025.5.22";
- sha256 = "01lxh37sw8sjcmss34nh97im4l3vpdxy1wp7qxgdwynzgz6lf4s9";
+ version = "1.0.0.0";
+ sha256 = "1j318pv3afazvl7m65w2gbmhcddnyn3gxf25k36wkd6rlclzbnrh";
libraryHaskellDepends = [ base ];
description = "Abstract unit test interface";
- license = lib.licenses.bsd0;
+ license = lib.licensesSpdx."0BSD";
}
) { };
@@ -317059,7 +318263,7 @@ self: {
microlens
];
description = "Reddit API bindings";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -317145,7 +318349,7 @@ self: {
}
) { };
- hedgehog_1_6 = callPackage (
+ hedgehog_1_7 = callPackage (
{
mkDerivation,
ansi-terminal,
@@ -317178,8 +318382,8 @@ self: {
}:
mkDerivation {
pname = "hedgehog";
- version = "1.6";
- sha256 = "0lrwwlcp3rihs9z239lf6pd0m2fmi8ww4vvrwiphkrcba4c91bgf";
+ version = "1.7";
+ sha256 = "0kjn3dxyhk55ayjd9m8acr8kxhbzc70piszkiy2gbnwqyyhbrqh9";
libraryHaskellDepends = [
ansi-terminal
async
@@ -317333,7 +318537,7 @@ self: {
vector
];
description = "Hedgehog will eat your typeclass bugs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -317449,7 +318653,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Supplemental library for hedgehog";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -317533,7 +318737,7 @@ self: {
typerep-map
];
description = "Customizable Gen for ADT using Generics";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -317626,7 +318830,7 @@ self: {
hedgehog
];
description = "GHC Generics automatically derived hedgehog generators";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -317668,7 +318872,7 @@ self: {
hedgehog
];
description = "Golden testing capabilities for hedgehog using Aeson";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -317691,7 +318895,7 @@ self: {
lens
];
description = "Hedgehog properties for lens laws";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -317714,7 +318918,7 @@ self: {
optics-core
];
description = "Hedgehog properties for optics laws";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -317732,8 +318936,8 @@ self: {
pname = "hedgehog-quickcheck";
version = "0.1.1";
sha256 = "1z2ja63wqz83qhwzh0zs98k502v8fjdpnsnhqk3srypx2nw5vdlp";
- revision = "9";
- editedCabalFile = "1grw0vh1n3nbhpypb4v4rhmidm5n2hjbr4wiyvwj79bl12bd1x49";
+ revision = "10";
+ editedCabalFile = "18vclwp2i5w0acgs4zjjw82sy0s8sky9baa168qvyj2c1rdhs48q";
libraryHaskellDepends = [
base
hedgehog
@@ -317931,7 +319135,7 @@ self: {
hedis
];
description = "Adaptation of the hedis library for the effectful ecosystem";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -317955,7 +319159,7 @@ self: {
scientific
time
];
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -318281,7 +319485,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "higher-order algebraic effects done right";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -318383,7 +319587,7 @@ self: {
unliftio
];
description = "higher-order algebraic effects done right";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -318425,7 +319629,7 @@ self: {
tasty-quickcheck
];
description = "Fast equality saturation in Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -318674,7 +319878,7 @@ self: {
xmlhtml
];
description = "An Haskell template system supporting both HTML5 and XML";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -318918,7 +320122,7 @@ self: {
xmlhtml
];
description = "Extra heist functionality";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -319065,7 +320269,7 @@ self: {
zeugma
];
description = "Clipboard Manager";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
hydraPlatforms = lib.platforms.none;
mainProgram = "hel";
}
@@ -319926,7 +321130,7 @@ self: {
vector
];
description = "Really fast mutable sparse sets";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -319967,7 +321171,7 @@ self: {
uuid
];
description = "Generate UUIDv7 values";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -320052,7 +321256,7 @@ self: {
QuickCheck
];
description = "Accessible format for structured data serialization";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
mainProgram = "herb-format";
}
) { };
@@ -320345,7 +321549,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Runs Continuous Integration tasks on your machines";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
maintainers = [ lib.maintainers.roberth ];
}
)
@@ -320477,7 +321681,7 @@ self: {
vector
];
description = "Hercules CI API definition with Servant";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
mainProgram = "hercules-gen-swagger";
maintainers = [ lib.maintainers.roberth ];
}
@@ -320868,7 +322072,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Bindings for the Nix evaluator";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
maintainers = [ lib.maintainers.roberth ];
}
)
@@ -320941,7 +322145,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Haskell bindings for Nix's libstore";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
maintainers = [ lib.maintainers.roberth ];
}
)
@@ -321064,7 +322268,7 @@ self: {
text
];
description = "Heredocument on Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -321154,7 +322358,7 @@ self: {
vector
];
description = "Fast JSON decoding via simdjson C++ bindings";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -321749,7 +322953,7 @@ self: {
infinite-list
];
description = "Zip lists with Traversables";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -321822,7 +323026,7 @@ self: {
stm
];
description = "Comparison of distinctly typed values with evidence capture";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -321994,6 +323198,7 @@ self: {
mkDerivation,
aeson,
aeson-optics,
+ aeson-pretty,
async,
base,
base16,
@@ -322014,6 +323219,7 @@ self: {
gmp,
here,
hspec,
+ jsonl,
libff,
megaparsec,
memory,
@@ -322051,7 +323257,6 @@ self: {
transformers,
tree-view,
unliftio-core,
- unordered-containers,
utf8-string,
vector,
witch,
@@ -322060,13 +323265,14 @@ self: {
}:
mkDerivation {
pname = "hevm";
- version = "0.55.1";
- sha256 = "15yrqf0z0phjgvr4d91qkcxh5zzhvk12nlf723hdj2qda9d3cim9";
+ version = "0.56.0";
+ sha256 = "1axwzs066312s3ncr89rmm14ny8ibzhrcqn9f9gfibsgyw9w5z7d";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson
aeson-optics
+ aeson-pretty
async
base
base16
@@ -322083,7 +323289,6 @@ self: {
filemanip
filepath
filepattern
- here
megaparsec
memory
mtl
@@ -322115,7 +323320,6 @@ self: {
transformers
tree-view
unliftio-core
- unordered-containers
vector
witch
witherable
@@ -322133,6 +323337,8 @@ self: {
directory
filepath
githash
+ jsonl
+ mtl
optics-core
optparse-applicative
optparse-generic
@@ -322157,7 +323363,6 @@ self: {
here
hspec
mtl
- operational
optics-core
optics-extra
process
@@ -322193,7 +323398,7 @@ self: {
];
doHaddock = false;
description = "Symbolic EVM Evaluator";
- license = lib.licenses.agpl3Only;
+ license = lib.licensesSpdx."AGPL-3.0-only";
mainProgram = "hevm";
maintainers = [ lib.maintainers.arturcygan ];
}
@@ -322314,7 +323519,7 @@ self: {
text
];
description = "ByteString-Text hexidecimal conversions";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -322479,7 +323684,7 @@ self: {
wreq
];
description = "Lenses for the hexml package";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -322980,7 +324185,7 @@ self: {
text
];
description = "Streaming-friendly XML parsers";
- license = lib.licenses.cc0;
+ license = lib.licensesSpdx."CC0-1.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -323544,7 +324749,7 @@ self: {
text
];
description = "File/folder watching for OS X";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
platforms = lib.platforms.darwin;
}
) { };
@@ -323701,7 +324906,7 @@ self: {
];
libraryPkgconfigDepends = [ gdal ];
description = "Haskell binding to the GDAL library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { inherit (pkgs) gdal; };
@@ -323789,22 +324994,20 @@ self: {
{
mkDerivation,
base,
- directory,
- filepath,
+ cmdargs,
hylolib,
mtl,
random,
}:
mkDerivation {
pname = "hgen";
- version = "1.4.0";
- sha256 = "190zm0lkr2ymq91ka84a3v2lhxjv9yl43abqcyxj6c3cjqym9ib5";
+ version = "1.5.0";
+ sha256 = "0clvgakfb53w1zh061pa7d07768qwd2grwws7d4610x7qbi45dw5";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
base
- directory
- filepath
+ cmdargs
hylolib
mtl
random
@@ -323953,7 +325156,7 @@ self: {
vinyl
];
description = "Geometric Algorithms, Data structures, and Data types";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -324184,7 +325387,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Reading and Writing ipe7 files";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -324311,7 +325514,9 @@ self: {
];
description = "Bindings to libintl.h (gettext, bindtextdomain)";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
mainProgram = "hgettext";
+ broken = true;
}
) { };
@@ -324609,7 +325814,7 @@ self: {
network
];
description = "Haskell module to interact with the greetd daemon trough it's IPC protocol";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -325355,7 +326560,7 @@ self: {
yaml
];
description = "Set up a GHC API session";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "hie-bios";
}
) { };
@@ -325517,75 +326722,6 @@ self: {
) { };
hiedb = callPackage (
- {
- mkDerivation,
- algebraic-graphs,
- ansi-terminal,
- array,
- base,
- bytestring,
- containers,
- directory,
- extra,
- filepath,
- ghc,
- ghc-paths,
- hie-compat,
- hspec,
- lucid,
- mtl,
- optparse-applicative,
- process,
- sqlite-simple,
- temporary,
- terminal-size,
- text,
- }:
- mkDerivation {
- pname = "hiedb";
- version = "0.6.0.2";
- sha256 = "0sfxykvg5n44lpjj069j25pnff30ckby8k3n7yhp8ixajfnfrb5i";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- algebraic-graphs
- ansi-terminal
- array
- base
- bytestring
- containers
- directory
- extra
- filepath
- ghc
- hie-compat
- lucid
- mtl
- optparse-applicative
- sqlite-simple
- terminal-size
- text
- ];
- executableHaskellDepends = [
- base
- ghc-paths
- ];
- testHaskellDepends = [
- base
- directory
- filepath
- ghc-paths
- hspec
- process
- temporary
- ];
- description = "Generates a references DB from .hie files";
- license = lib.licenses.bsd3;
- mainProgram = "hiedb";
- }
- ) { };
-
- hiedb_0_7_0_0 = callPackage (
{
mkDerivation,
algebraic-graphs,
@@ -325650,8 +326786,7 @@ self: {
temporary
];
description = "Generates a references DB from .hie files";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "hiedb";
}
) { };
@@ -325818,7 +326953,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "hierarchical environments for dependency injection";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -326107,7 +327242,7 @@ self: {
];
testToolDepends = [ markdown-unlit ];
description = "Partial types as a type constructor";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -326631,7 +327766,7 @@ self: {
utility-ht
];
description = "Linear Programming using HiGHS and comfort-array";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { inherit (pkgs) highs; };
@@ -326670,7 +327805,7 @@ self: {
text
];
description = "Haskell wrapper for Pikchr, a PIC-like markup language for diagrams";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "hikchr";
broken = true;
@@ -327324,7 +328459,7 @@ self: {
quickcheck-text
];
description = "Generic project initialization tool";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "hi";
maintainers = [ lib.maintainers.poscat ];
}
@@ -327590,6 +328725,31 @@ self: {
}
) { };
+ hint-nix = callPackage (
+ {
+ mkDerivation,
+ base,
+ hint,
+ include-env,
+ relude,
+ }:
+ mkDerivation {
+ pname = "hint-nix";
+ version = "0.1.0.1";
+ sha256 = "1wdbv1s3abza4min2h9q70q8ndjwwvn5w1rlzvd8d6p402diszf4";
+ libraryHaskellDepends = [
+ base
+ hint
+ include-env
+ relude
+ ];
+ description = "Helper for using hint with Nix package databases";
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }
+ ) { };
+
hint-server = callPackage (
{
mkDerivation,
@@ -328808,7 +329968,7 @@ self: {
text
];
description = "Haskell Git Helper Tool";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "hit";
broken = true;
@@ -328924,7 +330084,7 @@ self: {
];
doHaddock = false;
description = "Haskell/Nix development build tools";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
hydraPlatforms = lib.platforms.none;
mainProgram = "hix";
broken = true;
@@ -329632,6 +330792,48 @@ self: {
}
) { };
+ hkgr_0_5 = callPackage (
+ {
+ mkDerivation,
+ base,
+ bytestring,
+ directory,
+ extra,
+ filepath,
+ simple-cabal,
+ simple-cmd,
+ simple-cmd-args,
+ simple-prompt,
+ typed-process,
+ xdg-basedir,
+ }:
+ mkDerivation {
+ pname = "hkgr";
+ version = "0.5";
+ sha256 = "070np9w0dafzlq7mkh11qkm8jr4k9dj927gbhz9vg8xn2p81fxb7";
+ isLibrary = false;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ executableHaskellDepends = [
+ base
+ bytestring
+ directory
+ extra
+ filepath
+ simple-cabal
+ simple-cmd
+ simple-cmd-args
+ simple-prompt
+ typed-process
+ xdg-basedir
+ ];
+ description = "Simple Hackage release workflow for package maintainers";
+ license = lib.licenses.gpl3Only;
+ hydraPlatforms = lib.platforms.none;
+ mainProgram = "hkgr";
+ }
+ ) { };
+
hkt = callPackage (
{
mkDerivation,
@@ -329872,194 +331074,8 @@ self: {
}:
mkDerivation {
pname = "hledger";
- version = "1.43.2";
- sha256 = "043gw3amc29fbjxlzyc4m97bw5i5462352lmk61adlxcd12l47i1";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson
- ansi-terminal
- base
- bytestring
- cmdargs
- containers
- data-default
- Decimal
- Diff
- directory
- extra
- filepath
- githash
- 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
- text
- text-ansi
- time
- timeit
- transformers
- unordered-containers
- utf8-string
- utility-ht
- wizards
- ];
- executableHaskellDepends = [
- aeson
- ansi-terminal
- base
- bytestring
- cmdargs
- containers
- data-default
- Decimal
- directory
- extra
- filepath
- githash
- haskeline
- hledger-lib
- http-client
- http-types
- math-functions
- megaparsec
- microlens
- mtl
- process
- regex-tdfa
- req
- safe
- shakespeare
- split
- tabular
- tasty
- temporary
- text
- text-ansi
- time
- timeit
- transformers
- unordered-containers
- utf8-string
- utility-ht
- wizards
- ];
- testHaskellDepends = [
- aeson
- ansi-terminal
- base
- bytestring
- cmdargs
- containers
- data-default
- Decimal
- directory
- extra
- filepath
- githash
- haskeline
- hledger-lib
- http-client
- http-types
- math-functions
- megaparsec
- microlens
- mtl
- process
- regex-tdfa
- req
- safe
- shakespeare
- split
- tabular
- tasty
- temporary
- text
- text-ansi
- time
- timeit
- transformers
- unordered-containers
- utf8-string
- utility-ht
- wizards
- ];
- description = "Command-line interface for the hledger accounting system";
- license = lib.licenses.gpl3Plus;
- mainProgram = "hledger";
- maintainers = [
- lib.maintainers.maralorn
- lib.maintainers.sternenseemann
- ];
- }
- ) { };
-
- hledger_1_50 = callPackage (
- {
- mkDerivation,
- aeson,
- ansi-terminal,
- base,
- bytestring,
- cmdargs,
- containers,
- data-default,
- Decimal,
- Diff,
- directory,
- extra,
- filepath,
- githash,
- 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,
- text,
- text-ansi,
- time,
- timeit,
- transformers,
- unordered-containers,
- utf8-string,
- utility-ht,
- wizards,
- }:
- mkDerivation {
- pname = "hledger";
- version = "1.50";
- sha256 = "140yg0nds681dk2g4lyldvjlwcb3v8lg2dd82vi7zp5i9af2v9k8";
+ version = "1.50.2";
+ sha256 = "04rc39c2vvs0pxsabk5fm5d7ldrgn1ahkbqqw296zra94mcc600w";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -330187,8 +331203,7 @@ self: {
wizards
];
description = "Command-line interface for the hledger accounting system";
- license = lib.licenses.gpl3Plus;
- hydraPlatforms = lib.platforms.none;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
mainProgram = "hledger";
maintainers = [
lib.maintainers.maralorn
@@ -330349,8 +331364,8 @@ self: {
}:
mkDerivation {
pname = "hledger-flow";
- version = "0.14.4";
- sha256 = "1qvh5vgnk6vrhhr1kjqsycz13acxa7ynpqnd1bmchfl4q3aga9gw";
+ version = "0.16.1";
+ sha256 = "0lf3ndx8p4f2mfq0d7hwansc2xvqazhn4ywr6q2z6ygki4jac99g";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -330387,9 +331402,7 @@ self: {
];
description = "An hledger workflow focusing on automated statement import and classification";
license = lib.licenses.gpl3Only;
- hydraPlatforms = lib.platforms.none;
mainProgram = "hledger-flow";
- broken = true;
}
) { };
@@ -330422,10 +331435,10 @@ self: {
}:
mkDerivation {
pname = "hledger-iadd";
- version = "1.3.21";
- sha256 = "00x0vbfp08kqs1nbknndk9h56hcidf6xnrk0ldz45dvjrmgcv3w2";
- revision = "10";
- editedCabalFile = "0138k01cba9xd3sab6kjh59rfxn96w2h21gjl579xqq76yvbibni";
+ version = "1.3.22";
+ sha256 = "077v7jgqhmpkg8m68bg4qi0jxl4zkg17aqk5n58ni3s2h71lkwlv";
+ revision = "1";
+ editedCabalFile = "16ac7v90dd0lwf9dwiylc8w0zq1al45ah2nlr177kvglfsxjvv12";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -330562,166 +331575,6 @@ self: {
) { };
hledger-lib = 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,
- time,
- timeit,
- transformers,
- uglymemo,
- unordered-containers,
- utf8-string,
- }:
- mkDerivation {
- pname = "hledger-lib";
- version = "1.43.2";
- sha256 = "18037qwz7d0h4i86ac0w3hkrvx22vdxf04fjbg0qjlizgb3dlazf";
- 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
- 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
- time
- timeit
- transformers
- uglymemo
- unordered-containers
- utf8-string
- ];
- description = "A library providing the core functionality of hledger";
- license = lib.licenses.gpl3Plus;
- }
- ) { };
-
- hledger-lib_1_50 = callPackage (
{
mkDerivation,
aeson,
@@ -330776,8 +331629,8 @@ self: {
}:
mkDerivation {
pname = "hledger-lib";
- version = "1.50";
- sha256 = "1fk579j56wbxxk3bz4m9hwfkdb02mz374y72bplbrf3y40cd2a48";
+ version = "1.50.2";
+ sha256 = "1x070rs92n1y0l07x4lvg77x5k5sclafm1iissfd17dbg5d84383";
libraryHaskellDepends = [
aeson
aeson-pretty
@@ -330880,8 +331733,7 @@ self: {
utf8-string
];
description = "A library providing the core functionality of hledger";
- license = lib.licenses.gpl3Plus;
- hydraPlatforms = lib.platforms.none;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
}
) { };
@@ -331032,6 +331884,7 @@ self: {
process,
safe,
split,
+ stm,
text,
text-zipper,
time,
@@ -331043,88 +331896,10 @@ self: {
}:
mkDerivation {
pname = "hledger-ui";
- version = "1.43.2";
- sha256 = "1xz5ndkg5mci689n82dnmwhhr8a08qw12czsf4b82ha7zlmbkmnv";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- ansi-terminal
- async
- base
- brick
- cmdargs
- containers
- data-default
- directory
- doclayout
- extra
- filepath
- fsnotify
- githash
- hledger
- hledger-lib
- megaparsec
- microlens
- microlens-platform
- mtl
- process
- safe
- split
- text
- text-zipper
- time
- transformers
- unix
- vector
- vty
- vty-crossplatform
- ];
- executableHaskellDepends = [ base ];
- description = "Terminal interface for the hledger accounting system";
- license = lib.licenses.gpl3Plus;
- mainProgram = "hledger-ui";
- maintainers = [ lib.maintainers.maralorn ];
- }
- ) { };
-
- hledger-ui_1_50 = callPackage (
- {
- mkDerivation,
- ansi-terminal,
- async,
- base,
- brick,
- cmdargs,
- containers,
- data-default,
- directory,
- doclayout,
- extra,
- filepath,
- fsnotify,
- githash,
- hledger,
- hledger-lib,
- megaparsec,
- microlens,
- microlens-platform,
- mtl,
- process,
- safe,
- split,
- text,
- text-zipper,
- time,
- transformers,
- unix,
- vector,
- vty,
- vty-crossplatform,
- }:
- mkDerivation {
- pname = "hledger-ui";
- version = "1.50";
- sha256 = "15kn2yy44jpn0ag6248z0cmp3rkbdcxbbr02am41jlg6igv9kqkq";
+ version = "1.50.2";
+ sha256 = "1g9ygyj99mzr8x3xh4zyrqpivv4c35cadybgg0ihjxpvmz7vlz4n";
+ revision = "1";
+ editedCabalFile = "0n32y9p0z5vvsgpv601vqqir8qm0fkhppvn7aqmhy2450xgzcdrh";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -331150,6 +331925,7 @@ self: {
process
safe
split
+ stm
text
text-zipper
time
@@ -331161,8 +331937,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "Terminal interface for the hledger accounting system";
- license = lib.licenses.gpl3Plus;
- hydraPlatforms = lib.platforms.none;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
mainProgram = "hledger-ui";
maintainers = [ lib.maintainers.maralorn ];
}
@@ -331259,8 +332034,8 @@ self: {
}:
mkDerivation {
pname = "hledger-web";
- version = "1.43.2";
- sha256 = "0d4sv9k3m7s0764lbq2l8w9p2p47cby177l0avl5w3fa9y8d0gyd";
+ version = "1.50.2";
+ sha256 = "1hmqcnpc2wdkp2aysdy1872vcmji00b1s2rpv08fk8pcqsa3892v";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -331317,127 +332092,7 @@ self: {
executableHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "Web user interface for the hledger accounting system";
- license = lib.licenses.gpl3Plus;
- mainProgram = "hledger-web";
- maintainers = [ lib.maintainers.maralorn ];
- }
- ) { };
-
- hledger-web_1_50 = callPackage (
- {
- mkDerivation,
- aeson,
- base,
- base64,
- blaze-html,
- blaze-markup,
- bytestring,
- case-insensitive,
- clientsession,
- cmdargs,
- conduit,
- conduit-extra,
- containers,
- data-default,
- Decimal,
- directory,
- extra,
- file-embed,
- filepath,
- githash,
- hjsmin,
- hledger,
- hledger-lib,
- hspec,
- http-client,
- http-conduit,
- http-types,
- megaparsec,
- mtl,
- network,
- safe,
- shakespeare,
- template-haskell,
- text,
- time,
- transformers,
- unix-compat,
- unordered-containers,
- utf8-string,
- wai,
- wai-cors,
- wai-extra,
- wai-handler-launch,
- warp,
- yaml,
- yesod,
- yesod-core,
- yesod-form,
- yesod-static,
- yesod-test,
- }:
- mkDerivation {
- pname = "hledger-web";
- version = "1.50";
- sha256 = "04zmvlyij95v31v6p9124jicpgv7mbz2141j60ci18ci17r48fd8";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson
- base
- base64
- blaze-html
- blaze-markup
- bytestring
- case-insensitive
- clientsession
- cmdargs
- conduit
- conduit-extra
- containers
- data-default
- Decimal
- directory
- extra
- file-embed
- filepath
- githash
- hjsmin
- hledger
- hledger-lib
- hspec
- http-client
- http-conduit
- http-types
- megaparsec
- mtl
- network
- safe
- shakespeare
- template-haskell
- text
- time
- transformers
- unix-compat
- unordered-containers
- utf8-string
- wai
- wai-cors
- wai-extra
- wai-handler-launch
- warp
- yaml
- yesod
- yesod-core
- yesod-form
- yesod-static
- yesod-test
- ];
- executableHaskellDepends = [ base ];
- testHaskellDepends = [ base ];
- description = "Web user interface for the hledger accounting system";
- license = lib.licenses.gpl3Plus;
- hydraPlatforms = lib.platforms.none;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
mainProgram = "hledger-web";
maintainers = [ lib.maintainers.maralorn ];
}
@@ -331859,7 +332514,7 @@ self: {
containers
];
description = "GHC plugin for hlint";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -332165,7 +332820,7 @@ self: {
text
];
description = "Provide Alternate Number Formats plugin for Haskell Language Server";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -332178,7 +332833,7 @@ self: {
version = "1.1.0.0";
sha256 = "11hnkbpg13zvnq69svm46zm5k55yshgz97kjjx1g3jcb9ah1brm1";
description = "Integration with the Brittany code formatter";
- license = lib.licenses.agpl3Only;
+ license = lib.licensesSpdx."AGPL-3.0-only";
}
) { };
@@ -332222,7 +332877,7 @@ self: {
hls-test-utils
];
description = "Integration with the cabal-fmt code formatter";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -332301,7 +332956,7 @@ self: {
transformers
];
description = "Cabal integration plugin with Haskell Language Server";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -332359,7 +333014,7 @@ self: {
text
];
description = "Call hierarchy plugin for Haskell Language Server";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -332408,7 +333063,7 @@ self: {
text
];
description = "Change a declarations type signature with a Code Action";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -332421,7 +333076,7 @@ self: {
version = "2.6.0.0";
sha256 = "0jib2y256fb5b8wgsi9rjsdb3ywwpcbcnbbxmg6q3gwnglrdb1lx";
description = "Class/instance management plugin for Haskell Language Server";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -332487,7 +333142,7 @@ self: {
vector
];
description = "HLS Plugin to support smart selection range and Folding range";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -332584,7 +333239,7 @@ self: {
text
];
description = "Eval plugin for Haskell Language Server";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -332623,7 +333278,7 @@ self: {
transformers
];
description = "Common utilities to interaction between ghc-exactprint and HLS plugins";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -332669,7 +333324,7 @@ self: {
text
];
description = "Show fixity explicitly while hovering";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -332729,7 +333384,7 @@ self: {
text
];
description = "Explicit imports plugin for Haskell Language Server";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -332784,7 +333439,7 @@ self: {
text
];
description = "Explicit record fields plugin for Haskell Language Server";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -332797,7 +333452,7 @@ self: {
version = "2.6.0.0";
sha256 = "1wyk88lynchhzriqj7m9ph0s2c2ivkqg1nmhgb1knkvp8ag27iik";
description = "Integration with the Floskell code formatter";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -332852,7 +333507,7 @@ self: {
];
testToolDepends = [ fourmolu ];
description = "Integration with the Fourmolu code formatter";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -332865,7 +333520,7 @@ self: {
version = "2.6.0.0";
sha256 = "0aa602m024s3ch23np2iixmkwv6474va20bjdgiwdgc8vahg4grg";
description = "Convert to GADT syntax plugin";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -332903,8 +333558,8 @@ self: {
}:
mkDerivation {
pname = "hls-graph";
- version = "2.11.0.0";
- sha256 = "1mpf9vfnvxd03xhsywzb77g8rkvzj012jn6mz0rfmgvcls7kbgiw";
+ version = "2.12.0.0";
+ sha256 = "1z43wbyy41knmipc3yq8wg18nzbhygphk715xpmlg36xhgcwa85l";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson
@@ -332943,7 +333598,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Haskell Language Server internal graph API";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -332954,7 +333609,7 @@ self: {
version = "2.2.0.0";
sha256 = "0wp8hk5hwl43z5mjcas332z92y3zv9g8wrc5zhzli8pa37ab6r8x";
description = "Haddock comments plugin for Haskell Language Server";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -332965,7 +333620,7 @@ self: {
version = "2.6.0.0";
sha256 = "0ix89wp8nq3iywh6d3w8j7lnfm2g3l9gks8sxkww0z0mfhfxvywc";
description = "Hlint integration plugin with Haskell Language Server";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -333008,7 +333663,7 @@ self: {
hls-test-utils
];
description = "Module name plugin for Haskell Language Server";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -333069,7 +333724,7 @@ self: {
];
testToolDepends = [ ormolu ];
description = "Integration with the Ormolu code formatter";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -333131,7 +333786,7 @@ self: {
text
];
description = "Overloaded record dot plugin for Haskell Language Server";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -333185,8 +333840,8 @@ self: {
}:
mkDerivation {
pname = "hls-plugin-api";
- version = "2.11.0.0";
- sha256 = "1jn75zq4nqaml6rzzilaszqy0z4nj6bz5y9svddpl276qw1mcbm8";
+ version = "2.12.0.0";
+ sha256 = "1s13cyvzndf2rlhxdw9kbhj2yrzjlxx2hq9b3gwdd1wrfn0ix1r1";
libraryHaskellDepends = [
aeson
base
@@ -333244,7 +333899,7 @@ self: {
random-fu
];
description = "Haskell Language Server API for plugin communication";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -333296,7 +333951,7 @@ self: {
text
];
description = "Pragmas plugin for Haskell Language Server";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -333349,7 +334004,7 @@ self: {
text
];
description = "A Haskell Language Server plugin that qualifies imported names";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -333362,7 +334017,7 @@ self: {
version = "2.6.0.0";
sha256 = "0lqy7c3vqn832gs9z86n4clsqb6g73rhnlrvn3sg3h8hkxasfzjf";
description = "Exactprint refactorings for Haskell Language Server";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -333409,7 +334064,7 @@ self: {
text
];
description = "Refine imports plugin for Haskell Language Server";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -333422,7 +334077,7 @@ self: {
version = "2.6.0.0";
sha256 = "15gjh7r9cc43yz1zp52q349fag4nxv25vhzn5pdma4ch366xyr4g";
description = "Rename plugin for Haskell Language Server";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -333433,7 +334088,7 @@ self: {
version = "2.6.0.0";
sha256 = "11cl4q79jxl73s62ccdarp1570k95picgn3q8lgnqznc6ywdv3zh";
description = "Retrie integration plugin for Haskell Language Server";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -333488,7 +334143,7 @@ self: {
text
];
description = "HLS Plugin to support smart selection range";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -333573,7 +334228,7 @@ self: {
text-rope
];
description = "Call hierarchy plugin for Haskell Language Server";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -333585,7 +334240,7 @@ self: {
version = "2.6.0.0";
sha256 = "00fx8rxdnmam0672vb0az2lw5inqyc22cjfrh8wiwx36i28r8zqj";
description = "HLS Plugin to expand TemplateHaskell Splices and QuasiQuotes";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -333596,7 +334251,7 @@ self: {
version = "2.6.0.0";
sha256 = "1zhw2ysf5ccsrz1vahff6hr683b581v4py2pyf9xfnjfay5gl0id";
description = "Stan integration plugin with Haskell Language Server";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -333607,7 +334262,7 @@ self: {
version = "2.6.0.0";
sha256 = "171068mmb7sdk14s5v794jc0n0mrrq8fkzp2z2wlrmk38mqi3773";
description = "Integration with the Stylish Haskell code formatter";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -333618,7 +334273,7 @@ self: {
version = "2.2.0.0";
sha256 = "05rgapkpr3giln245aswlcgwqpfglifsjq1n8sgwgi04bn2w6vng";
description = "Wingman plugin for Haskell Language Server";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -333640,8 +334295,8 @@ self: {
lsp,
lsp-test,
lsp-types,
- neat-interpolation,
safe-exceptions,
+ string-interpolate,
tasty,
tasty-expected-failure,
tasty-golden,
@@ -333653,8 +334308,8 @@ self: {
}:
mkDerivation {
pname = "hls-test-utils";
- version = "2.11.0.0";
- sha256 = "11rswiw1zlsgjjfs78hl73axrwr9lmd334iyla4k98ak6gxllqr6";
+ version = "2.12.0.0";
+ sha256 = "0wqabmas8wkif93ffqw0818v6iha80c1vlr2jqxd86vkbpnl55ig";
libraryHaskellDepends = [
aeson
async
@@ -333671,8 +334326,8 @@ self: {
lsp
lsp-test
lsp-types
- neat-interpolation
safe-exceptions
+ string-interpolate
tasty
tasty-expected-failure
tasty-golden
@@ -333683,7 +334338,7 @@ self: {
text-rope
];
description = "Utilities used in the tests of Haskell Language Server";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -334884,7 +335539,7 @@ self: {
];
doHaddock = false;
description = "Hidden Markov Models using LAPACK primitives";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -334956,8 +335611,8 @@ self: {
}:
mkDerivation {
pname = "hmp3-ng";
- version = "2.16.2";
- sha256 = "0n46rjl52vcwmliqaisi6jw9b4phwdcy5b60sq71k76zfhhffybn";
+ version = "2.17.0";
+ sha256 = "131mwn1vcyd2q73cj00vx8silhnacb9nbiba20c6i95kgsblnm0s";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -334978,7 +335633,7 @@ self: {
];
executableSystemDepends = [ ncurses ];
description = "A 2019 fork of an ncurses mp3 player written in Haskell";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
mainProgram = "hmp3";
}
) { inherit (pkgs) ncurses; };
@@ -334997,7 +335652,7 @@ self: {
libraryHaskellDepends = [ base ];
librarySystemDepends = [ mpfr ];
description = "Haskell binding to the MPFR library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { inherit (pkgs) mpfr; };
@@ -335059,7 +335714,7 @@ self: {
time
];
description = "Haskell Music Theory";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
}
) { };
@@ -335105,7 +335760,7 @@ self: {
time
];
description = "Haskell Music Theory Base";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
}
) { };
@@ -335448,7 +336103,7 @@ self: {
time
];
description = "Haskell implementation of the Nix language";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "hnix";
maintainers = [
lib.maintainers.Anton-Latukha
@@ -335550,7 +336205,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Core effects for interacting with the Nix store";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
maintainers = [
lib.maintainers.Anton-Latukha
lib.maintainers.sorki
@@ -335632,7 +336287,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Core types used for interacting with the Nix store";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
maintainers = [
lib.maintainers.Anton-Latukha
@@ -335663,8 +336318,8 @@ self: {
}:
mkDerivation {
pname = "hnix-store-db";
- version = "0.1.0.0";
- sha256 = "1g3wpmjnbzhllw5q85zp1ckkqhlhhmpbm9lq1bd8ax8vq8kzx97v";
+ version = "0.1.0.1";
+ sha256 = "1m6b601cs47rr0v2vbgskhb27i03fp90i914q1wiicf2jlwlk88j";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -335687,9 +336342,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Nix store database support";
- license = lib.licenses.asl20;
- hydraPlatforms = lib.platforms.none;
- broken = true;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -335731,7 +336384,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "JSON serialization for core types";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -335804,7 +336457,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "NAR file format";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -335848,7 +336501,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Read-only Nix store";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -335891,7 +336544,7 @@ self: {
unordered-containers
];
description = "Remote hnix store";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
maintainers = [
lib.maintainers.Anton-Latukha
lib.maintainers.sorki
@@ -335983,7 +336636,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Remote hnix store";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
maintainers = [
lib.maintainers.Anton-Latukha
@@ -336041,7 +336694,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Test utilities and instances";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -336310,7 +336963,7 @@ self: {
stm
];
description = "Simple tools for communicating sequential processes";
- license = lib.licenses.zlib;
+ license = lib.licensesSpdx."Zlib";
}
) { };
@@ -336416,7 +337069,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Haskell OAuth2 authentication client";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -336474,7 +337127,7 @@ self: {
warp
];
description = "hoauth2 demo application";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "hoauth2-demo";
broken = true;
@@ -336533,7 +337186,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "OAuth2 Identity Providers";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -336575,7 +337228,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "tutorial for hoauth2-providers module";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "hoauth2-providers-tutorial";
broken = true;
@@ -336617,7 +337270,7 @@ self: {
uri-bytestring
];
description = "Tutorial for using hoauth2";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -336813,7 +337466,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "OpenOCD Haskell interface";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "hocd-read-mem";
}
) { };
@@ -337554,8 +338207,8 @@ self: {
}:
mkDerivation {
pname = "holidays";
- version = "0.2.0.0";
- sha256 = "1nxhmpn54q58k4wldlbfnvniwdf914bxyz6bnqdsrnmdmhvrh8cf";
+ version = "0.3.0.0";
+ sha256 = "0av50g2j2ji42cg37lbnr7mwf99ml8sw4asxpd77ahwdscw9hflk";
libraryHaskellDepends = [
base
containers
@@ -337572,7 +338225,7 @@ self: {
time
];
description = "Library for country public holidays";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -337635,7 +338288,7 @@ self: {
tasty-discover
];
description = "Tools and combinators for solving constraint problems";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -337809,7 +338462,7 @@ self: {
text
];
description = "Client library for the Home Assistant API";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "ha-client";
}
) { };
@@ -337941,7 +338594,7 @@ self: {
single-tuple
];
description = "Homotuple, all whose elements are the same type";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -339038,7 +339691,7 @@ self: {
stm
];
description = "Abstraction over creating network connections with SOCKS5 and TLS";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -339360,7 +340013,7 @@ self: {
happy
];
description = "hOpenPGP-based command-line tools";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
}
) { };
@@ -339832,8 +340485,8 @@ self: {
}:
mkDerivation {
pname = "hora";
- version = "2.2.0";
- sha256 = "13i3z71xkyisgjms6g48hzgyva3dp83lk9m139ivysscgyr1a1pq";
+ version = "2.2.1";
+ sha256 = "0j6xbijmyv52i4051dp8zgjwlxvxdpmihjljzsf64s0zaxdamrlq";
libraryHaskellDepends = [
base
binary
@@ -339929,7 +340582,7 @@ self: {
];
doHaddock = false;
description = "Higher Order Reverse Derivatives Efficiently - Automatic Differentiation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -340011,7 +340664,7 @@ self: {
sydtest
];
description = "Generate nix expressions from horizon-spec definitions";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -340044,7 +340697,7 @@ self: {
th-lift
];
description = "Horizon Stable Package Set Type Definitions";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -340067,7 +340720,7 @@ self: {
lens
];
description = "Horizon Stable Package Set Lenses";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -340100,7 +340753,7 @@ self: {
text
];
description = "Horizon Stable Package Set Pretty Printer";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -340170,7 +340823,7 @@ self: {
unliftio
];
description = "horizontal rule for the terminal";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "hr";
}
) { };
@@ -340245,7 +340898,7 @@ self: {
transformers
];
description = "Haskell Open Sound Control";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
}
) { };
@@ -340368,7 +341021,7 @@ self: {
text
];
description = "Network Host Addresses";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -340528,6 +341181,7 @@ self: {
unordered-containers
];
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
mainProgram = "hotel";
}
) { };
@@ -341971,7 +342625,7 @@ self: {
time
];
description = "Code Coverage Library for Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -342311,7 +342965,7 @@ self: {
utf8-string
];
description = "A tool for looking through PDF file using Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "hpdft";
broken = true;
@@ -342691,7 +343345,7 @@ self: {
vector
];
description = "Haskell bindings to libpqtypes";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { inherit (pkgs) libpq; };
@@ -342728,7 +343382,7 @@ self: {
text
];
description = "Adaptation of the hpqtypes library for the effectful ecosystem";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -342790,7 +343444,7 @@ self: {
tasty-bench
];
description = "Extra utilities for hpqtypes library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -343352,7 +344006,7 @@ self: {
hspec-expectations
];
description = "Quantitative Library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { inherit (pkgs) gsl; };
@@ -343381,7 +344035,7 @@ self: {
random
];
description = "A library for simulating quantum circuits";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "hqcsim-exe";
broken = true;
@@ -343447,7 +344101,7 @@ self: {
test-framework-quickcheck2
];
description = "HQuantLib is a port of essencial parts of QuantLib to Haskell";
- license = lib.licenses.lgpl3Only;
+ license = lib.licensesSpdx."LGPL-3.0-only";
hydraPlatforms = lib.platforms.none;
mainProgram = "mctest";
broken = true;
@@ -343469,7 +344123,7 @@ self: {
time
];
description = "HQuantLib Time is a business calendar functions extracted from HQuantLib";
- license = lib.licenses.lgpl3Plus;
+ license = lib.licensesSpdx."LGPL-3.0-or-later";
}
) { };
@@ -344066,8 +344720,8 @@ self: {
}:
mkDerivation {
pname = "hs-asapo";
- version = "0.9.1";
- sha256 = "0rmmmxfpx2s69jca5rd7jnxb075qjx6b6s97vnsd1gvgcjwal2li";
+ version = "0.9.2";
+ sha256 = "1adggnrf6i0vm7gq343ja6cvcll1mz4cq0ljlhda1y1c9iqpwhc9";
setupHaskellDepends = [
base
cabal-doctest
@@ -344100,7 +344754,7 @@ self: {
time
];
description = "Haskell bindings for ASAP:O";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -344421,7 +345075,7 @@ self: {
void
];
description = "Conllu validating parser and utils";
- license = lib.licenses.lgpl3Only;
+ license = lib.licensesSpdx."LGPL-3.0-only";
hydraPlatforms = lib.platforms.none;
mainProgram = "hs-conllu";
broken = true;
@@ -344811,7 +345465,7 @@ self: {
hspec
];
description = "A tool to highlight terminal strings";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "test-exe";
}
) { };
@@ -345161,7 +345815,7 @@ self: {
];
libraryPkgconfigDepends = [ libonnxruntime ];
description = "Low-level bindings for ONNX Runtime";
- license = lib.licenses.agpl3Only;
+ license = lib.licensesSpdx."AGPL-3.0-only";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -345228,8 +345882,8 @@ self: {
}:
mkDerivation {
pname = "hs-opentelemetry-api";
- version = "0.2.0.0";
- sha256 = "0hz7qsdqxv63zaj8pihgm4d7bx665zzzlxihr671wbcfl29wik5n";
+ version = "0.3.0.0";
+ sha256 = "0iksazlv4v7shzkq55cnxbvg9ln1gyzjbmngkhnw1hympi7bg2cz";
libraryHaskellDepends = [
async
attoparsec
@@ -345339,6 +345993,8 @@ self: {
text
];
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -345361,6 +346017,8 @@ self: {
unagi-chan
];
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -345372,6 +346030,7 @@ self: {
case-insensitive,
hs-opentelemetry-api,
hs-opentelemetry-otlp,
+ hs-opentelemetry-propagator-w3c,
http-client,
http-conduit,
http-types,
@@ -345384,14 +346043,15 @@ self: {
}:
mkDerivation {
pname = "hs-opentelemetry-exporter-otlp";
- version = "0.1.0.0";
- sha256 = "0qzqr89amg1xvzbmfdnq7dmjd0gybdw668xnpkkj3ig4d96ir03i";
+ version = "0.1.0.1";
+ sha256 = "1l0ggy1xybshl663p43m1maxbljcyh19dshxbrzmacsqb6mc6pqa";
libraryHaskellDepends = [
base
bytestring
case-insensitive
hs-opentelemetry-api
hs-opentelemetry-otlp
+ hs-opentelemetry-propagator-w3c
http-client
http-conduit
http-types
@@ -345456,7 +346116,7 @@ self: {
unordered-containers
];
description = "Plugin for instrumenting an application";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -345487,6 +346147,7 @@ self: {
wai
];
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
}
) { };
@@ -345509,6 +346170,8 @@ self: {
text
];
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -345533,6 +346196,8 @@ self: {
text
];
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -345573,6 +346238,7 @@ self: {
unordered-containers
];
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
}
) { };
@@ -345607,6 +346273,8 @@ self: {
vault
];
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -345641,6 +346309,8 @@ self: {
unordered-containers
];
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -345679,6 +346349,8 @@ self: {
text
];
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -345712,6 +346384,8 @@ self: {
];
description = "WAI instrumentation middleware for OpenTelemetry";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -345747,6 +346421,7 @@ self: {
];
description = "Yesod middleware for providing OpenTelemetry instrumentation";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
}
) { };
@@ -345758,8 +346433,8 @@ self: {
}:
mkDerivation {
pname = "hs-opentelemetry-otlp";
- version = "0.1.0.0";
- sha256 = "1g9accvfcdn86m2y18imnmj4n73pbs1mncwg4s5jni1fzjg9f45r";
+ version = "0.1.1.0";
+ sha256 = "1qghv5j4br5lkrkndajljfvsmv9cbz38q3z72bmfpxp4n6jykj89";
libraryHaskellDepends = [
base
proto-lens-runtime
@@ -345781,8 +346456,8 @@ self: {
}:
mkDerivation {
pname = "hs-opentelemetry-propagator-b3";
- version = "0.0.1.2";
- sha256 = "1hb1ls0xykp1b2vnjwrfxj33plx24f794s7wp09693d6hwaqxx84";
+ version = "0.0.1.3";
+ sha256 = "0rbzfcg99gsqk3yxxnszkhsn8prcz1nffchgfr959qzjih5ljhj1";
libraryHaskellDepends = [
attoparsec
base
@@ -345814,8 +346489,8 @@ self: {
}:
mkDerivation {
pname = "hs-opentelemetry-propagator-datadog";
- version = "0.0.1.0";
- sha256 = "0sxfcswmwf4bnsyj0d67j32yi32gwhm4c6fs9mcl2wnax2vdwk7n";
+ version = "0.0.1.1";
+ sha256 = "1izsp6jw46i6999jnzgi189v62640rkfxi72m3sm3bs187fwgcw7";
libraryHaskellDepends = [
base
bytestring
@@ -345843,7 +346518,7 @@ self: {
primitive
];
description = "Datadog Propagator for OpenTelemetry";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -345854,19 +346529,35 @@ self: {
base,
bytestring,
hs-opentelemetry-api,
+ hspec,
+ hspec-discover,
http-types,
+ QuickCheck,
+ text,
}:
mkDerivation {
pname = "hs-opentelemetry-propagator-w3c";
- version = "0.0.1.4";
- sha256 = "0f0fagrsyxhpd2qsbgzkgxzx5hzasplly12c2qjdd8g2ylh8szw1";
+ version = "0.1.0.0";
+ sha256 = "1y4avgvp9fm4z9qrr51glhhks3np6ca33i2adjh09ilxczqlbsg3";
libraryHaskellDepends = [
attoparsec
base
bytestring
hs-opentelemetry-api
http-types
+ text
];
+ testHaskellDepends = [
+ attoparsec
+ base
+ bytestring
+ hs-opentelemetry-api
+ hspec
+ hspec-discover
+ QuickCheck
+ text
+ ];
+ testToolDepends = [ hspec-discover ];
description = "Trace propagation via HTTP headers following the w3c tracestate spec";
license = lib.licenses.bsd3;
}
@@ -345899,8 +346590,8 @@ self: {
}:
mkDerivation {
pname = "hs-opentelemetry-sdk";
- version = "0.1.0.0";
- sha256 = "08zjfvfnsgsxc73jlgjizr8m2w152hny0myns4m78sjzj53733x1";
+ version = "0.1.0.1";
+ sha256 = "0wdlj4gn0mq3naf0wvn81q97sifw774868wv4yyyy5diwd3hyxk5";
libraryHaskellDepends = [
async
base
@@ -345957,6 +346648,8 @@ self: {
];
testHaskellDepends = [ base ];
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -346417,7 +347110,7 @@ self: {
hspec
];
description = "Read and write SAM, BAM, and CRAM files";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -346524,7 +347217,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "Terminal Emulator written in Haskell, SDL2 Backend";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "hs-sdl-term-emulator";
}
@@ -346627,7 +347320,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "Convert an eventlog into the speedscope json format";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "hs-speedscope";
}
) { };
@@ -346734,7 +347427,7 @@ self: {
warp
];
description = "Bindings to the Tango Controls system";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -346784,7 +347477,7 @@ self: {
criterion
];
description = "Terminal Emulator written in 100% Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -346812,7 +347505,7 @@ self: {
];
doHaddock = false;
description = "High-level bindings for tree-sitter";
- license = lib.licenses.agpl3Only;
+ license = lib.licensesSpdx."AGPL-3.0-only";
}
) { };
@@ -346843,7 +347536,7 @@ self: {
tree-sitter-while
];
description = "Low-level bindings for tree-sitter";
- license = lib.licenses.agpl3Only;
+ license = lib.licensesSpdx."AGPL-3.0-only";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -347953,7 +348646,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Haskell bindings to BLST";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -348047,7 +348740,7 @@ self: {
vector
];
description = "Haskell SuperCollider";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
}
) { };
@@ -348959,7 +349652,7 @@ self: {
text
];
description = "Haskell bindings to the libcdio disc-reading library";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -349457,7 +350150,7 @@ self: {
time
];
description = "Haskell shell script templates";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -349936,7 +350629,7 @@ self: {
text
];
description = "Core package representing Haskell advisories";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -350008,7 +350701,7 @@ self: {
time
];
description = "Synchronize with the Haskell security advisory database";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "hsec-sync";
}
) { };
@@ -350141,7 +350834,7 @@ self: {
toml-parser
];
description = "Tools for working with the Haskell security advisory database";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "hsec-tools";
broken = true;
@@ -350240,7 +350933,7 @@ self: {
tls
];
description = "sendxmpp clone, sending XMPP messages via CLI";
- license = lib.licenses.agpl3Only;
+ license = lib.licensesSpdx."AGPL-3.0-only";
mainProgram = "hsendxmpp";
}
) { };
@@ -350591,7 +351284,7 @@ self: {
yaml
];
description = "A SFTP client tool for secure file transfer operations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "hsftp";
broken = true;
@@ -350921,7 +351614,7 @@ self: {
tasty-th
];
description = "ini configuration files";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -350967,7 +351660,7 @@ self: {
transformers
];
description = "Inspect Haskell source files";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "hsinspect";
broken = true;
@@ -351057,7 +351750,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "LSP interface over the hsinspect binary";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "hsinspect-lsp";
}
@@ -351105,12 +351798,12 @@ self: {
transformers
];
description = "Install Haskell software";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
mainProgram = "hsinstall";
}
) { };
- hsinstall_2_9 = callPackage (
+ hsinstall_2_10 = callPackage (
{
mkDerivation,
base,
@@ -351120,16 +351813,16 @@ self: {
filepath,
formatting,
heredoc,
- optparse-applicative,
- prettyprinter,
+ optparse-applicative-dex,
process,
safe-exceptions,
+ text,
transformers,
}:
mkDerivation {
pname = "hsinstall";
- version = "2.9";
- sha256 = "0lnby8681spli3qr43mybhcj6l2klfphfzja2gnapqwcm7d894r1";
+ version = "2.10";
+ sha256 = "088xdvjkbdazsfm3gvlpalyxqgy8kwa5rfz3m0f9m394c8kf2yvi";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -351145,14 +351838,14 @@ self: {
filepath
formatting
heredoc
- optparse-applicative
- prettyprinter
+ optparse-applicative-dex
process
safe-exceptions
+ text
transformers
];
description = "Install Haskell software";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
hydraPlatforms = lib.platforms.none;
mainProgram = "hsinstall";
}
@@ -351535,7 +352228,7 @@ self: {
text
];
description = "Bindings to Lua, an embeddable scripting language";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -351584,7 +352277,7 @@ self: {
text
];
description = "Bindings to Lua, an embeddable scripting language";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -351648,7 +352341,7 @@ self: {
vector
];
description = "Allow aeson data types to be used with Lua";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -351700,7 +352393,7 @@ self: {
text
];
description = "Type classes for HsLua";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -351733,7 +352426,7 @@ self: {
unix
];
description = "Command-line interface for Lua";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -351780,7 +352473,7 @@ self: {
text
];
description = "Bindings to Lua, an embeddable scripting language";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -351807,7 +352500,7 @@ self: {
text
];
description = "Examples of how to combine Haskell and Lua";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -351836,7 +352529,7 @@ self: {
tasty-lua
];
description = "Opinionated, but extensible Lua list type";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -351885,7 +352578,7 @@ self: {
text
];
description = "Marshalling of values between Haskell and Lua";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -351920,7 +352613,7 @@ self: {
text
];
description = "Lua module wrapping Text.DocLayout.";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -351961,7 +352654,7 @@ self: {
text
];
description = "Lua module to work with file paths";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -352006,7 +352699,7 @@ self: {
text
];
description = "Lua module wrapper around Haskell's System module";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -352033,6 +352726,8 @@ self: {
pname = "hslua-module-system";
version = "1.2.3";
sha256 = "125d50q90l9w35aqgwgbv2bdmj65zlvn7pxlwrg1nr2j4bnfmyjk";
+ revision = "1";
+ editedCabalFile = "19bv56i9xpsx5xfl7k411sbbnrl4sxp8hnm1a96iqpk22g3dqv5l";
libraryHaskellDepends = [
base
bytestring
@@ -352056,7 +352751,7 @@ self: {
tasty-lua
];
description = "Lua module wrapper around Haskell's System module";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -352094,7 +352789,7 @@ self: {
text
];
description = "Lua module for text";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -352135,7 +352830,7 @@ self: {
text
];
description = "Lua module to work with version specifiers";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -352160,6 +352855,8 @@ self: {
pname = "hslua-module-zip";
version = "1.1.4";
sha256 = "1ij2rmy8m4pw7k7w5vvb3g934kms60vhzhhp8kryknbi6bsg8lsy";
+ revision = "1";
+ editedCabalFile = "0i3cvy1g1byx3ajrc608ixz7crgbxmdngabwlrkyp899m6pmlv1i";
libraryHaskellDepends = [
base
hslua-core
@@ -352181,7 +352878,7 @@ self: {
tasty-lua
];
description = "Lua module to work with file zips";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -352239,7 +352936,7 @@ self: {
text
];
description = "Object orientation tools for HsLua";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -352278,7 +352975,7 @@ self: {
tasty-hslua
];
description = "Object orientation tools for HsLua";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -352327,7 +353024,7 @@ self: {
text
];
description = "Utilities to build Lua modules";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -352370,7 +353067,7 @@ self: {
text
];
description = "Utilities to build Lua modules";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -352400,7 +353097,7 @@ self: {
text
];
description = "Isocline-based Lua REPL";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -352442,7 +353139,7 @@ self: {
tasty-quickcheck
];
description = "Type specifiers for Lua";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -353235,8 +353932,8 @@ self: {
}:
mkDerivation {
pname = "hspec";
- version = "2.11.12";
- sha256 = "1zdgkn0gkcphcsfqcqwcfqiqvkz12ljks46v3czpaysndz8icfip";
+ version = "2.11.14";
+ sha256 = "13zzcrjc6537f848c7b39bn61iwlniiymzjsbn5kfrx6hhxlgb6i";
libraryHaskellDepends = [
base
hspec-core
@@ -353287,8 +353984,8 @@ self: {
}:
mkDerivation {
pname = "hspec-api";
- version = "2.11.12";
- sha256 = "1xn2b2hafyq6qm3zaia9nw27ir4cg8v2qn499bz2zwnp2vkjra07";
+ version = "2.11.14";
+ sha256 = "1cgbqnk2dayys12xm7klcxljivkrs6cv522vv7vdlpyslhhayw28";
libraryHaskellDepends = [
base
hspec-core
@@ -353449,10 +354146,10 @@ self: {
}:
mkDerivation {
pname = "hspec-core";
- version = "2.11.12";
- sha256 = "030400w95775jrivbi7n1nnx6j5z717rqd3986ggklb8h9hjalfc";
+ version = "2.11.14";
+ sha256 = "0hnbvcjkylims4xcmajhmwaicnalgi5a93ayk47gvc5z02pgs299";
revision = "1";
- editedCabalFile = "0yq9nnawcgbgxiz4ymfa8k66jrvgrhmv8j7g880x8k6q8q4ncqlq";
+ editedCabalFile = "0s41xy88mkbxhbf93gdxb23vxr4vaip58519j2c8slz6cmvs0mq5";
libraryHaskellDepends = [
ansi-terminal
array
@@ -353562,8 +354259,8 @@ self: {
}:
mkDerivation {
pname = "hspec-discover";
- version = "2.11.12";
- sha256 = "044vgsy45ff00h9z2k3jgn2m37npcjiacc4cifahrjlmwa7a7ylp";
+ version = "2.11.14";
+ sha256 = "1bj3nln0cblrhwy7rjnr9qk068mkmn5wzxkh5sr32vm20nr1frwd";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -353872,7 +354569,7 @@ self: {
hspec-core
];
description = "A Formatter for hspec that provides Github Actions Annotations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -353893,6 +354590,8 @@ self: {
pname = "hspec-golden";
version = "0.2.2.0";
sha256 = "1wpn9ll8x3gr0y86f5s9266x94jlc6hh778vc0npdynabipirwbs";
+ revision = "1";
+ editedCabalFile = "07n1fyqq1caaky2bn5d410srg6bfcmyxlcxr5vpsjhxcmbic1dca";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -354189,37 +354888,6 @@ self: {
}
) { };
- hspec-megaparsec_2_2_0 = callPackage (
- {
- mkDerivation,
- base,
- containers,
- hspec,
- hspec-expectations,
- megaparsec,
- }:
- mkDerivation {
- pname = "hspec-megaparsec";
- version = "2.2.0";
- sha256 = "0hyf06gzzqd6sqd76crwxycwgx804sd39z7i0c2vmv1qgsxv82gn";
- libraryHaskellDepends = [
- base
- containers
- hspec-expectations
- megaparsec
- ];
- testHaskellDepends = [
- base
- hspec
- hspec-expectations
- megaparsec
- ];
- description = "Utility functions for testing Megaparsec parsers with Hspec";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- }
- ) { };
-
hspec-megaparsec = callPackage (
{
mkDerivation,
@@ -354243,7 +354911,7 @@ self: {
megaparsec
];
description = "Utility functions for testing Megaparsec parsers with Hspec";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -354272,10 +354940,10 @@ self: {
}:
mkDerivation {
pname = "hspec-meta";
- version = "2.11.12";
- sha256 = "1612pg5gihqjxrzqqvbbgckaqiwq3rmz3rg07lrjhzklg975nj69";
+ version = "2.11.14";
+ sha256 = "1mi1sfmxqf01dxkw8c56ywiclnl1pk6m5g1cj53w3mq8j7mywqz5";
revision = "2";
- editedCabalFile = "1jrk14s51psb0zjici56220iyb98i3q06sd3rsyx594s3cddgn5d";
+ editedCabalFile = "0iylscmcm5052sqa3xaikiqrlfaqs9cn82r777g43l6wgbzzsxi4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -354837,7 +355505,7 @@ self: {
hspec-core
];
description = "Table-driven (by-example) HSpec tests";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -354944,7 +355612,7 @@ self: {
tmp-proc
];
description = "Simplify use of tmp-proc from hspec tests";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -355119,8 +355787,8 @@ self: {
}:
mkDerivation {
pname = "hspec-yesod";
- version = "0.1.0";
- sha256 = "1ixra4fdfrihlnigqs63xwyrl7ab4kwl7klmhv6xfvprs798g4mb";
+ version = "0.2.0.1";
+ sha256 = "1kil6gggr1q2wnngkgb5a47ay2drdqk9lz0fxa68lhiq814i7a8z";
libraryHaskellDepends = [
aeson
attoparsec
@@ -355445,7 +356113,7 @@ self: {
doctest
];
description = "My opinionated Haskell project formatter";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "hspretty";
broken = true;
@@ -355654,8 +356322,8 @@ self: {
}:
mkDerivation {
pname = "hsqml";
- version = "0.3.6.1";
- sha256 = "0wvnxc3kad9ja4s16n9nj6nqknckal93ifbprq6nwd0x5i6zvknm";
+ version = "0.3.7.0";
+ sha256 = "1r4mf15gnfghmjdpkxn33ibc1diyfpzdfj54i4h10sjfnx6xg895";
setupHaskellDepends = [
base
Cabal
@@ -355666,9 +356334,7 @@ self: {
base
bytestring
containers
- directory
filepath
- QuickCheck
tagged
text
transformers
@@ -355687,7 +356353,7 @@ self: {
text
];
description = "Haskell binding for Qt Quick";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
)
@@ -355990,7 +356656,7 @@ self: {
utf8-string
];
description = "RELP (Reliable Event Logging Protocol) server implementation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -356095,7 +356761,7 @@ self: {
unix
];
description = "Using Haskell for Unix shell scripting tasks";
- license = lib.licenses.lgpl3Plus;
+ license = lib.licensesSpdx."LGPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -357188,7 +357854,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Bindings to TagLib, audio meta-data library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { inherit (pkgs) taglib; };
@@ -357687,7 +358353,7 @@ self: {
unordered-containers
];
description = "A codec library for HTML-escaped text and HTML-entities";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -358154,7 +358820,7 @@ self: {
text
];
description = "Use htmx with various haskell libraries";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -358177,7 +358843,7 @@ self: {
text
];
description = "Use htmx with lucid";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -358204,7 +358870,7 @@ self: {
text
];
description = "Use htmx with servant";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -358428,7 +359094,7 @@ self: {
vector
];
description = "Parse TOML values produced by htoml-megaparsec package";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -358471,7 +359137,7 @@ self: {
th-compat
];
description = "a library to build and work with heterogeneous, type level indexed rose trees";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
maintainers = [ lib.maintainers.mangoiv ];
}
) { };
@@ -358801,17 +359467,15 @@ self: {
text
];
description = "Code for using the ip package with http-api-data";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
http-api-data-qq = callPackage (
{
mkDerivation,
- aeson,
base,
bytestring,
- containers,
http-api-data,
http-client,
tasty,
@@ -358822,10 +359486,8 @@ self: {
}:
mkDerivation {
pname = "http-api-data-qq";
- version = "0.1.0.0";
- sha256 = "1lvfdbprdwq09k1wkjfvvkpi79053dc4kzkv4g1cx94qb1flbd7a";
- revision = "6";
- editedCabalFile = "06bl99wxwb9g5rnkjqgbmb6187gjr821falc78daqc7c9vdp2nv5";
+ version = "0.1.0.1";
+ sha256 = "1dah5sgmqls4x17drs3x2sz7gxx8jlh86yjdsahkq5kjv2jshy1n";
libraryHaskellDepends = [
base
http-api-data
@@ -358833,10 +359495,8 @@ self: {
text
];
testHaskellDepends = [
- aeson
base
bytestring
- containers
http-api-data
http-client
tasty
@@ -358900,7 +359560,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "a library to make http requests without worrying much";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
maintainers = [ lib.maintainers.mangoiv ];
}
) { };
@@ -359374,7 +360034,7 @@ self: {
temporary
];
description = "http-client TLS backend using Rustls";
- license = lib.licenses.cc0;
+ license = lib.licensesSpdx."CC0-1.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -359537,7 +360197,7 @@ self: {
websockets
];
description = "Glue code for http-client and websockets";
- license = lib.licenses.cc0;
+ license = lib.licensesSpdx."CC0-1.0";
}
) { };
@@ -359794,7 +360454,7 @@ self: {
zlib
];
description = "HTTP downloader tailored for web-crawler needs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -360125,7 +360785,7 @@ self: {
];
doHaddock = false;
description = "Perform HTTP Requests";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -360173,7 +360833,7 @@ self: {
];
doHaddock = false;
description = "Instantiations of http-exchange";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -360196,7 +360856,7 @@ self: {
bytestring
];
description = "Attoparsec-based parsers for the RFC-2616 HTTP grammar rules";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -360242,7 +360902,7 @@ self: {
tasty-golden
];
description = "Types and serialization for HTTP";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -361144,7 +361804,7 @@ self: {
utf8-string
];
description = "HTTP senmatics libarry";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -361454,7 +362114,7 @@ self: {
text
];
description = "Generic HTTP types for Haskell (for both client and server code)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -361929,7 +362589,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "HTTP/3 library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -362512,17 +363172,15 @@ self: {
}:
mkDerivation {
pname = "huffman";
- version = "1.0.1";
- sha256 = "191llv4s64jrh8cma43r5z740avd5picja5fr45l4mi2gwmkx4s3";
+ version = "1.0.2";
+ sha256 = "1a3s9hrw4w0rcp0jqq7ww4mq8ay88lr0kk0fgl87lk3yb18fr7yp";
libraryHaskellDepends = [
base
containers
fingertree
];
description = "Pure Haskell implementation of the Huffman encoding algorithm";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -362606,7 +363264,7 @@ self: {
doctest-parallel
];
description = "uiua port";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -362792,7 +363450,7 @@ self: {
witherable
];
description = "A TUI MPD client, inspired by ncmpcpp";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "hum";
broken = true;
@@ -362891,7 +363549,7 @@ self: {
text
];
description = "Redefinition-free prelude alternative";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -364055,7 +364713,7 @@ self: {
hspec-discover
];
description = "Convenience functions for Aeson";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -364140,7 +364798,7 @@ self: {
hw-xml
];
description = "Demo library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -364270,7 +364928,7 @@ self: {
];
doHaddock = false;
description = "Balanced parentheses";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "hw-balancedparens";
}
@@ -364333,7 +364991,7 @@ self: {
vector
];
description = "Bit manipulation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -364370,7 +365028,7 @@ self: {
testToolDepends = [ hspec-discover ];
doHaddock = false;
description = "CI Assistant for Haskell projects";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "hw-ci-assist";
broken = true;
@@ -364435,7 +365093,7 @@ self: {
vector
];
description = "Conduits for tokenizing streams";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -364476,7 +365134,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Additional merges and joins for Conduit";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -364503,7 +365161,7 @@ self: {
];
testToolDepends = [ doctest-discover ];
description = "Diagnostics library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -364629,7 +365287,7 @@ self: {
vector
];
description = "Unbelievably fast streaming DSV file parser";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "hw-dsv";
broken = true;
@@ -364714,7 +365372,7 @@ self: {
vector
];
description = "File Dump";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "hw-dump";
broken = true;
@@ -364822,7 +365480,7 @@ self: {
vector
];
description = "Elias-Fano";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "hw-eliasfano";
}
@@ -364885,7 +365543,7 @@ self: {
vector
];
description = "Excess";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -364928,7 +365586,7 @@ self: {
hspec-discover
];
description = "Generic finger-tree structure, with example instances";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -364977,7 +365635,7 @@ self: {
hspec-discover
];
description = "Generic strict finger-tree structure";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -365010,7 +365668,7 @@ self: {
];
testToolDepends = [ doctest-discover ];
description = "Extra hedgehog functionality";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -365057,7 +365715,7 @@ self: {
hspec-discover
];
description = "Interoperability between hspec and hedgehog";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -365094,7 +365752,7 @@ self: {
hspec-discover
];
description = "Additional facilities for Integers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -365166,7 +365824,7 @@ self: {
];
doHaddock = false;
description = "Library for manipulating IP addresses and CIDR blocks";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "hw-ip";
}
@@ -365304,7 +365962,7 @@ self: {
];
doHaddock = false;
description = "Memory efficient JSON parser";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "hw-json";
}
@@ -365352,7 +366010,7 @@ self: {
];
doHaddock = false;
description = "Memory efficient JSON parser";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -365427,7 +366085,7 @@ self: {
lens
];
description = "Lens for hw-json";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -365480,7 +366138,7 @@ self: {
];
testToolDepends = [ doctest-discover ];
description = "SIMD-based JSON semi-indexer";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "hw-json-simd";
broken = true;
@@ -365575,7 +366233,7 @@ self: {
mmap
];
description = "Memory efficient JSON parser";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "hw-json";
}
@@ -365676,7 +366334,7 @@ self: {
mmap
];
description = "Memory efficient JSON parser";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "hw-json-standard-cursor";
}
@@ -365742,7 +366400,7 @@ self: {
hw-hspec-hedgehog
];
description = "Avro support for Kafka infrastructure";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -365793,7 +366451,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Kafka bindings for Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { inherit (pkgs) rdkafka; };
@@ -365852,7 +366510,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Conduit bindings for hw-kafka-client";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -365897,7 +366555,7 @@ self: {
hspec-discover
];
description = "Combinators for lazy IO";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -365945,7 +366603,7 @@ self: {
hspec-discover
];
description = "Monadic query DSL";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "hw-mquery-example";
}
) { };
@@ -366027,7 +366685,7 @@ self: {
vector
];
description = "Packed Vector";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "hw-packed-vector";
broken = true;
@@ -366075,7 +366733,7 @@ self: {
hspec-discover
];
description = "Simple parser support";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -366111,7 +366769,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Primitive functions and data types";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -366220,7 +366878,7 @@ self: {
testToolDepends = [ tasty-discover ];
doHaddock = false;
description = "Opinionated polysemy library";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -366267,7 +366925,7 @@ self: {
unliftio
];
description = "Opinionated prelude library";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -366337,7 +366995,7 @@ self: {
vector
];
description = "Primitive functions and data types";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -366384,7 +367042,7 @@ self: {
vector
];
description = "Primitive support for bit manipulation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
platforms = lib.platforms.x86;
hydraPlatforms = lib.platforms.none;
mainProgram = "hw-prim-bits-exe";
@@ -366492,7 +367150,7 @@ self: {
];
doHaddock = false;
description = "Rank-select";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "hw-rankselect";
}
@@ -366563,7 +367221,7 @@ self: {
vector
];
description = "Rank-select base";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -366659,7 +367317,7 @@ self: {
vector
];
description = "SIMD library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -366741,7 +367399,7 @@ self: {
];
testToolDepends = [ doctest-discover ];
description = "SIMD library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "hw-simd";
broken = true;
@@ -366822,7 +367480,7 @@ self: {
vector
];
description = "Primitive functions and data types";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -366860,7 +367518,7 @@ self: {
hspec-discover
];
description = "String parser";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -366941,7 +367599,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Library for creating and extracting tar archives";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "hw-tar";
broken = true;
@@ -367040,7 +367698,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Supports IO on URIs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "hw-uri";
}
@@ -367198,7 +367856,7 @@ self: {
vector
];
description = "XML parser based on succinct data structures";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "hw-xml";
broken = true;
@@ -368381,7 +369039,7 @@ self: {
random
];
description = "A Yahtzee game implementation in Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "hyahtzee";
}
) { };
@@ -369108,8 +369766,8 @@ self: {
}:
mkDerivation {
pname = "hylolib";
- version = "1.5.4";
- sha256 = "0vznqq8z4f42plidagmg2d099gvfk3pwv4xclar8d0gp6dsbks6v";
+ version = "1.5.5";
+ sha256 = "1qdmx5yp5ln0xnc25mfyn0axbpmhn4qkvjlvsh6q5zca9i1hf2xw";
libraryHaskellDepends = [
array
base
@@ -369190,10 +369848,8 @@ self: {
}:
mkDerivation {
pname = "hyper";
- version = "0.2.1.1";
- sha256 = "14p7r57g75ny8l9h4ilbm6mhdsfiysfs3rd56300dl0jkpgrh8r2";
- revision = "5";
- editedCabalFile = "0dzm6qrqrrmrsmn5y1nhncy2w7kmaa4ilkf1mpi32hs9mywnl5v9";
+ version = "0.2.1.2";
+ sha256 = "03v7pxpn84xhf1x8rcfczgpxgpkkjg3l94virmd4hdq2n6x81gs9";
libraryHaskellDepends = [
base
blaze-html
@@ -369201,7 +369857,7 @@ self: {
text
];
description = "Display class for the HyperHaskell graphical Haskell interpreter";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -369209,6 +369865,8 @@ self: {
{
mkDerivation,
base,
+ Chart,
+ Chart-diagrams,
diagrams-lib,
diagrams-svg,
hyper,
@@ -369218,12 +369876,12 @@ self: {
}:
mkDerivation {
pname = "hyper-extra";
- version = "0.2.0.1";
- sha256 = "13ipxwhxrndl505zzxcq7gz874l0r2g0ma1yhq14bihvlwh3qr8d";
- revision = "2";
- editedCabalFile = "1c3lp2wg8axcv20zyz58qcs79vcy8hzsr3gdd9d671yk9m8c7b6n";
+ version = "0.3.0.0";
+ sha256 = "1ra5vik2g1amg2brqcay4mzbhipwk6z023shlscghaxfwfzp5k1i";
libraryHaskellDepends = [
base
+ Chart
+ Chart-diagrams
diagrams-lib
diagrams-svg
hyper
@@ -369232,7 +369890,7 @@ self: {
text
];
description = "Display instances for the HyperHaskell graphical Haskell interpreter";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -369254,10 +369912,8 @@ self: {
}:
mkDerivation {
pname = "hyper-haskell-server";
- version = "0.2.3.1";
- sha256 = "0cz1dybzgk5q051r3inv72x154q3qmf5r0hci2cxrb89ncdcszsv";
- revision = "1";
- editedCabalFile = "1vk8q06z7q20hq3cs3nnw0ap3gsa983clvykb4zlxl4fspq7rviv";
+ version = "0.2.4.0";
+ sha256 = "0pfabv7faj8bvfq48qvjpvk8jwspsq5yvmhrwknvxv4kzk6692wa";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -369275,10 +369931,8 @@ self: {
transformers
];
description = "Server back-end for the HyperHaskell graphical Haskell interpreter";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "hyper-haskell-server";
- broken = true;
}
) { };
@@ -369357,7 +370011,112 @@ self: {
websockets
];
description = "Interactive HTML apps using type-safe serverside Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
+ hyperbole_0_5_0 = callPackage (
+ {
+ mkDerivation,
+ aeson,
+ atomic-css,
+ attoparsec,
+ attoparsec-aeson,
+ base,
+ bytestring,
+ casing,
+ containers,
+ cookie,
+ data-default,
+ effectful,
+ file-embed,
+ filepath,
+ http-api-data,
+ http-client,
+ http-client-tls,
+ http-types,
+ network,
+ network-uri,
+ random,
+ skeletest,
+ string-conversions,
+ string-interpolate,
+ text,
+ time,
+ wai,
+ wai-websockets,
+ warp,
+ websockets,
+ }:
+ mkDerivation {
+ pname = "hyperbole";
+ version = "0.5.0";
+ sha256 = "0b141p2yd50p4blqynxss8jjk5h1wa3rsq766i37zqfxldbmagd0";
+ libraryHaskellDepends = [
+ aeson
+ atomic-css
+ attoparsec
+ attoparsec-aeson
+ base
+ bytestring
+ casing
+ containers
+ cookie
+ data-default
+ effectful
+ file-embed
+ filepath
+ http-api-data
+ http-client
+ http-client-tls
+ http-types
+ network
+ network-uri
+ random
+ string-conversions
+ string-interpolate
+ text
+ time
+ wai
+ wai-websockets
+ warp
+ websockets
+ ];
+ testHaskellDepends = [
+ aeson
+ atomic-css
+ attoparsec
+ attoparsec-aeson
+ base
+ bytestring
+ casing
+ containers
+ cookie
+ data-default
+ effectful
+ file-embed
+ filepath
+ http-api-data
+ http-client
+ http-client-tls
+ http-types
+ network
+ network-uri
+ random
+ skeletest
+ string-conversions
+ string-interpolate
+ text
+ time
+ wai
+ wai-websockets
+ warp
+ websockets
+ ];
+ testToolDepends = [ skeletest ];
+ description = "Interactive HTML apps using type-safe serverside Haskell";
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -369451,7 +370210,7 @@ self: {
tasty-hunit
];
description = "Hypergeometric function of a matrix argument";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -370257,7 +371016,7 @@ self: {
tasty-hunit
];
description = "Haskell interval types. Bounds checking.";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -370434,7 +371193,7 @@ self: {
time
];
description = "iCalendar data types, parser, and printer";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -370664,6 +371423,8 @@ self: {
];
description = "Lattice iCE40 Primitive IP";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -371438,7 +372199,7 @@ self: {
tf-random
];
description = "Flexible generation of identicons";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -371839,7 +372600,7 @@ self: {
transformers
];
description = "Functional Programming Language with Dependent Types";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { inherit (pkgs) gmp; };
@@ -371990,7 +372751,7 @@ self: {
];
doHaddock = false;
description = "Branch on whether a constraint is satisfied";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -372045,7 +372806,7 @@ self: {
bytestring
];
description = "Constructing and dissecting IFF files";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -373085,8 +373846,8 @@ self: {
}:
mkDerivation {
pname = "ihp";
- version = "1.4.0";
- sha256 = "0k962vpcarq07a0wb5rlpah15q629xi39h2x8x0vb5i8nv7xg0c3";
+ version = "1.4.1";
+ sha256 = "0d5hj8c8qvjqmdjy7dxibhq41qzbfqmrcgmfw84s6gfss9jbanlq";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson
@@ -373177,7 +373938,8 @@ self: {
wreq
];
description = "Haskell Web Framework";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
+ maintainers = [ lib.maintainers.mpscholten ];
}
) { };
@@ -373235,7 +373997,7 @@ self: {
];
doHaddock = false;
description = "JSX-like but for Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
maintainers = [ lib.maintainers.mpscholten ];
}
) { };
@@ -373420,7 +374182,8 @@ self: {
wreq
];
description = "Dev tools for IHP";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
+ maintainers = [ lib.maintainers.mpscholten ];
}
) { };
@@ -373441,8 +374204,9 @@ self: {
with-utf8
];
description = "Provides the IHP migrate binary";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "migrate";
+ maintainers = [ lib.maintainers.mpscholten ];
}
) { };
@@ -373450,6 +374214,7 @@ self: {
{
mkDerivation,
aeson,
+ attoparsec-aeson,
base,
bytestring,
HsOpenSSL,
@@ -373457,23 +374222,26 @@ self: {
http-streams,
io-streams,
neat-interpolation,
+ network-uri,
retry,
+ safe-exceptions,
text,
}:
mkDerivation {
pname = "ihp-openai";
- version = "1.3.0";
- sha256 = "1736f8w1696d5db9shdhqxq1gdng1gh1mijn2rnynrh8lsnndwa4";
- revision = "1";
- editedCabalFile = "03g2mz1vfxcfv02675nh33643k4baw2chx1vc9ij6p76868l1nk7";
+ version = "1.4.0";
+ sha256 = "0npcnqdfmqv979gfn7iyl5p76hkggblc9n82z056wppj0i9q0i86";
libraryHaskellDepends = [
aeson
+ attoparsec-aeson
base
bytestring
HsOpenSSL
http-streams
io-streams
+ network-uri
retry
+ safe-exceptions
text
];
testHaskellDepends = [
@@ -373484,9 +374252,8 @@ self: {
text
];
description = "Call GPT4 from your Haskell apps";
- license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
- broken = true;
+ license = lib.licensesSpdx."MIT";
+ maintainers = [ lib.maintainers.mpscholten ];
}
) { };
@@ -373538,7 +374305,8 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Extra data types for postgresql-simple";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
+ maintainers = [ lib.maintainers.mpscholten ];
}
) { };
@@ -373634,7 +374402,7 @@ self: {
vector
];
description = "Optimised list functions for doing index-related things";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -374426,7 +375194,7 @@ self: {
xml-types
];
description = "Execute arbitrary actions for each item from RSS/Atom feeds";
- license = lib.licenses.cc0;
+ license = lib.licensesSpdx."CC0-1.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -374659,7 +375427,7 @@ self: {
wires
];
description = "Immutaball platformer game (prototype version)";
- license = lib.licenses.bsd0;
+ license = lib.licensesSpdx."0BSD";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -374694,7 +375462,7 @@ self: {
hspec
];
description = "A GHC plugin for automatically importing modules";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -374886,7 +375654,7 @@ self: {
];
doHaddock = false;
description = "Framework for defaulting superclasses";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -374976,7 +375744,7 @@ self: {
parsec
];
description = "A math-inspired programmatic 2D & 3D CAD system";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
maintainers = [ lib.maintainers.sorki ];
}
) { };
@@ -375069,7 +375837,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Auto generate hie-bios cradles";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -375144,7 +375912,7 @@ self: {
yaml
];
description = "Helps maintain consistency of imports";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -375748,7 +376516,7 @@ self: {
polysemy-time
];
description = "A Prelude for Polysemy";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
}
) { };
@@ -375775,7 +376543,7 @@ self: {
text
];
description = "A Prelude for Polysemy – Base Reexports";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
}
) { };
@@ -375796,7 +376564,7 @@ self: {
polysemy
];
description = "A Prelude for Polysemy";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
}
) { };
@@ -376418,7 +377186,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Simple, no-frills indexed lists";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -376529,7 +377297,7 @@ self: {
sha256 = "166329a5jmrs4q1ycb132gq7kbrdyzrvrxzzzwp5czmv00lvns9f";
libraryHaskellDepends = [ base ];
description = "Utilities for indexed profunctors";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -376577,7 +377345,7 @@ self: {
transformers
];
description = "Atkey indexed monad transformers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -376815,6 +377583,7 @@ self: {
description = "A collection of implementations of IndieWeb algorithms";
license = lib.licenses.publicDomain;
hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -376922,7 +377691,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Convenient imperative eDSL over Lorentz";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "indigo";
}
@@ -377199,7 +377968,7 @@ self: {
text
];
description = "A statically-typed functional scripting language";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -377478,7 +378247,7 @@ self: {
tasty-bench
];
description = "Infinite lists";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -377884,7 +378653,7 @@ self: {
sha256 = "0k3bl5adj512bzqysapnggvf6fmi0hs3mvxkymsh9af7gan8y504";
libraryHaskellDepends = [ base ];
description = "Initialization and Deinitialization of 'Storable' values";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -378006,7 +378775,7 @@ self: {
text
];
description = "Canonical categorical conversions (injections and projections)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -378174,7 +378943,7 @@ self: {
vector
];
description = "Lets you embed C++ code into Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
maintainers = [ lib.maintainers.roberth ];
}
) { };
@@ -378223,7 +378992,7 @@ self: {
vector
];
description = "Lets you embed CUDA code into Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -378254,7 +379023,7 @@ self: {
inline-c
];
description = "Lets you embed Objective-C code into Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -378412,7 +379181,7 @@ self: {
];
doHaddock = false;
description = "Python interpreter embedded into haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { inherit (pkgs) python3; };
@@ -378511,7 +379280,7 @@ self: {
template-haskell
];
description = "Seamlessly call R from Haskell and vice versa. No FFI required.";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { inherit (pkgs) R; };
@@ -378672,7 +379441,7 @@ self: {
unordered-containers
];
description = "Associative containers retaining insertion order for traversals";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -379466,7 +380235,7 @@ self: {
tasty-quickcheck
];
description = "Direct conversion functions between Ints and Words";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -379596,7 +380365,7 @@ self: {
editedCabalFile = "11gbra5328854mnjm5hvpvz1wccmki1fy6bkbqd6fpxaj5cffmbp";
libraryHaskellDepends = [ base ];
description = "A simple, efficient supply of integers using atomic fetch-and-add";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -379626,7 +380395,7 @@ self: {
primitive
];
description = "Advent of Code 2019 intcode interpreter";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -379671,7 +380440,7 @@ self: {
text
];
description = "Conversion from strings to Integer";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -379827,7 +380596,7 @@ self: {
quaalude
];
description = "Integer, Natural, and Positive";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -379992,7 +380761,7 @@ self: {
unix
];
description = "Poll modern Intel/AMD CPU power consumption on Linux via RAPL";
- license = lib.licenses.agpl3Only;
+ license = lib.licensesSpdx."AGPL-3.0-only";
mainProgram = "intel-powermon";
}
) { };
@@ -380074,7 +380843,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Type level prompt with openai";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -380116,7 +380885,7 @@ self: {
testHaskellDepends = [ base ];
doHaddock = false;
description = "A GHC Core plugin for intensional datatype refinement checking";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -380338,7 +381107,7 @@ self: {
sha256 = "1wf6g0a1pz6xiixqnkrdjlb2xr4ck2vab9vd0w6kp0pbhqc6qysp";
libraryHaskellDepends = [ base ];
description = "Some simple functions to deal with transformations from structures to other ones, basically lists";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -380792,7 +381561,7 @@ self: {
utility-ht
];
description = "piecewise linear and cubic Hermite interpolation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -380879,7 +381648,7 @@ self: {
typed-process
];
description = "Shared memory and control structures for IPC";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -381021,7 +381790,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "An implementation of Allen's interval algebra for temporal logic";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "tutorial";
broken = true;
@@ -381048,7 +381817,7 @@ self: {
hedgehog
];
description = "Intervals of functors";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -381106,7 +381875,7 @@ self: {
time-compat
];
description = "Intervals, and monoids thereof";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -381128,7 +381897,7 @@ self: {
QuickCheck
];
description = "Interval Tree Clocks";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -381249,7 +382018,7 @@ self: {
vector
];
description = "A game of competitive puzzle-design";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
badPlatforms = lib.platforms.darwin;
hydraPlatforms = lib.platforms.none;
mainProgram = "intricacy";
@@ -381698,7 +382467,7 @@ self: {
vector
];
description = "Automatically generate a function’s inverse";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -381990,7 +382759,7 @@ self: {
];
doHaddock = false;
description = "Type classes for concurrency with STM, ST and timing";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -382017,7 +382786,7 @@ self: {
si-timers
];
description = "Experimental MTL instances for io-classes";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -382047,7 +382816,7 @@ self: {
template-haskell
];
description = "Use Template Haskell to embed the result of an IO computation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -382218,7 +382987,7 @@ self: {
io-classes
];
description = "A pure simulator for monadic concurrency with STM";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -382643,7 +383412,7 @@ self: {
text
];
description = "Library for IP and MAC addresses";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -382732,8 +383501,8 @@ self: {
}:
mkDerivation {
pname = "ip2location-io";
- version = "1.3.0";
- sha256 = "1425ca51il1cairnv8qabxb1m242jndsi0m2m1lpvyk5jwj3k2cv";
+ version = "1.4.0";
+ sha256 = "0ipv4ifgm30hjlkgqbdiy6vl6mcd11fyf7kr5mqhhwb60mxwl6za";
libraryHaskellDepends = [
aeson
base
@@ -382837,7 +383606,7 @@ self: {
text
];
description = "Internal Phonetic Alphabet (IPA)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -383061,7 +383830,7 @@ self: {
text
];
description = "Auto-generated IPFS HTTP API";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -383106,7 +383875,7 @@ self: {
text
];
description = "IPLD Content-IDentifiers ";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -383659,7 +384428,7 @@ self: {
text
];
description = "IRC core library for glirc";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -384031,8 +384800,8 @@ self: {
}:
mkDerivation {
pname = "iri";
- version = "0.5.1.1";
- sha256 = "1xyndxzdqpbmwv8f86jlin22snddcm769m84d29sb9dkhyi6hncd";
+ version = "0.5.1.2";
+ sha256 = "1w09gkxndkzkx3387pzrv7bfckln1j90cahfjqz0vi56f2lc8vvf";
libraryHaskellDepends = [
attoparsec
base
@@ -384062,7 +384831,7 @@ self: {
];
doHaddock = false;
description = "RFC-compliant universal resource identifier library (URL, URI, IRI)";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -384232,7 +385001,7 @@ self: {
text
];
description = "Haskell CLI framework";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -384379,7 +385148,7 @@ self: {
text
];
description = "ISBN Validation and Manipulation";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -384927,7 +385696,7 @@ self: {
text
];
description = "Isomorphism typeclass as a lawful solution to the conversion problem";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -386759,7 +387528,7 @@ self: {
];
doHaddock = false;
description = "Functional, expression-oriented data processing language";
- license = lib.licenses.agpl3Only;
+ license = lib.licensesSpdx."AGPL-3.0-only";
mainProgram = "ja";
maintainers = [ lib.maintainers.sternenseemann ];
}
@@ -386802,7 +387571,7 @@ self: {
];
libraryPkgconfigDepends = [ libjack2 ];
description = "Bindings for the JACK Audio Connection Kit";
- license = lib.licenses.gpl2Only;
+ license = lib.licensesSpdx."GPL-2.0-only";
maintainers = [ lib.maintainers.thielema ];
}
) { inherit (pkgs) libjack2; };
@@ -387046,7 +387815,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Generate flamegraphs from Jaeger .json dumps.";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "jaeger-flamegraph";
broken = true;
@@ -387302,7 +388071,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Japanese holidays utility";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -387414,7 +388183,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Stack-based concatenative language embedded in Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -387922,7 +388691,7 @@ self: {
vector
];
description = "Labeled one-dimensional arrays";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "bench-report";
}
) { };
@@ -387969,7 +388738,7 @@ self: {
vector
];
description = "Type-safe data frames based on higher-kinded types";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -388014,7 +388783,7 @@ self: {
vector
];
description = "IO operations for the `javelin` package";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -388469,7 +389238,7 @@ self: {
time
];
description = "Yet another streaming library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -388564,7 +389333,7 @@ self: {
text
];
description = "Handle Jira wiki markup";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "jira-wiki-markup";
}
) { };
@@ -388982,7 +389751,7 @@ self: {
time
];
description = "Job queue";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -389342,7 +390111,7 @@ self: {
text
];
description = "JSON with Structure";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -389396,7 +390165,7 @@ self: {
text
];
description = "OpenAPI Definitions for Jordan, Automatically";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -389456,7 +390225,7 @@ self: {
transformers
];
description = "Servant Combinators for Jordan";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -389510,7 +390279,7 @@ self: {
transformers
];
description = "Servant Client Instances for Jordan Servant Types";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -389576,7 +390345,7 @@ self: {
transformers
];
description = "OpenAPI schemas for Jordan-Powered Servant APIs";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -389633,7 +390402,7 @@ self: {
wai
];
description = "Servers for Jordan-Based Servant Combinators";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -389735,7 +390504,7 @@ self: {
time
];
description = "JSON Object Signing and Encryption (JOSE) and JSON Web Token (JWT) library";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -389810,7 +390579,7 @@ self: {
time
];
description = "JSON Object Signing and Encryption (JOSE) and JSON Web Token (JWT) library";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -389980,7 +390749,7 @@ self: {
hspec
];
description = "Transform Joy code using conditional rewrite rules";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -390033,7 +390802,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "FFI bindings to libjpeg-turbo";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -390313,7 +391082,7 @@ self: {
transformers
];
description = "DOM library that uses jsaddle to support both GHCJS and GHC";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
maintainers = [ lib.maintainers.alexfmpe ];
}
) { };
@@ -390348,8 +391117,8 @@ self: {
text
];
description = "JSaddle Hello World, an example package";
- license = lib.licenses.mit;
- maintainers = [ lib.maintainers.alexfmpe ];
+ license = lib.licensesSpdx."MIT";
+ hydraPlatforms = lib.platforms.none;
}
) { };
@@ -390413,7 +391182,7 @@ self: {
websockets
];
description = "Interface for JavaScript that works with GHCJS and GHC";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
maintainers = [
lib.maintainers.alexfmpe
lib.maintainers.maralorn
@@ -390441,7 +391210,7 @@ self: {
];
doHaddock = false;
description = "Run JSaddle JSM with the GHC Wasm backend";
- license = lib.licenses.cc0;
+ license = lib.licensesSpdx."CC0-1.0";
}
) { };
@@ -390541,7 +391310,7 @@ self: {
version = "0.9.9.3";
sha256 = "1icj9cll7ifrharpngwhzgfyxixckd6viwk94f8wmqbf4yyyfsmv";
description = "Interface for JavaScript that works with GHCJS and GHC";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
platforms = lib.platforms.darwin;
maintainers = [ lib.maintainers.alexfmpe ];
}
@@ -390585,26 +391354,22 @@ self: {
aeson,
base,
jsaddle,
- jsaddle-dom,
lens,
text,
}:
mkDerivation {
pname = "jsdom-extras";
- version = "0.1.0.0";
- sha256 = "0mmvm1vdhfryf9fdbnyb2nz3vc4mdpzdbva3486r5vfkkxajrz5c";
+ version = "0.1.1.0";
+ sha256 = "0di31amvsc13n3306dkn7nbzr8l2lv6rr3km7aq1g47ci931rj85";
libraryHaskellDepends = [
aeson
base
jsaddle
- jsaddle-dom
lens
text
];
description = "Convenience utilities for JSDOM";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -390661,7 +391426,7 @@ self: {
text
];
description = "Support for serialising Haskell to and from JSON";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -391179,7 +391944,7 @@ self: {
text
];
description = "Load JSON from files in a directory structure";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "jsondir";
}
) { };
@@ -391319,7 +392084,7 @@ self: {
hspec
];
description = "JSON Feed";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -391744,7 +392509,7 @@ self: {
text
];
description = "Kitchen sink for querying JSON";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -392140,7 +392905,7 @@ self: {
vector
];
description = "Type-level JSON specification";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -392176,7 +392941,7 @@ self: {
text
];
description = "Elm code generate for `json-spec`";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -392252,7 +393017,7 @@ self: {
uuid
];
description = "Generated elm code for servant APIs";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -392294,7 +393059,7 @@ self: {
time
];
description = "json-spec-openapi";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -392459,7 +393224,7 @@ self: {
text
];
description = "High-performance JSON parser and encoder";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -392653,7 +393418,7 @@ self: {
vector
];
description = "Automatic type declaration for JSON input data";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "json-to-type";
broken = true;
@@ -392757,7 +393522,7 @@ self: {
text
];
description = "Tokenize JSON";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -393169,7 +393934,7 @@ self: {
text-builder
];
description = "Fast and simple JSON encoding toolkit";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -393256,7 +394021,7 @@ self: {
tasty-hunit
];
description = "JsonLogic Evaluation";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -393306,7 +394071,7 @@ self: {
tasty-hunit
];
description = "JsonLogic Aeson Support";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -393405,7 +394170,7 @@ self: {
text
];
description = "Jsonnet implementaton in pure Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "hs-jsonnet";
broken = true;
@@ -393716,6 +394481,47 @@ self: {
}
) { };
+ jsonschema = callPackage (
+ {
+ mkDerivation,
+ aeson,
+ base,
+ containers,
+ regex-tdfa,
+ scientific,
+ tasty,
+ tasty-hunit,
+ text,
+ vector,
+ }:
+ mkDerivation {
+ pname = "jsonschema";
+ version = "0.2.0.0";
+ sha256 = "1paqgmyl1q9nllw83vljckdzj5ir300a3qy866rlj24x4vhqk2df";
+ libraryHaskellDepends = [
+ aeson
+ base
+ containers
+ regex-tdfa
+ scientific
+ text
+ vector
+ ];
+ testHaskellDepends = [
+ aeson
+ base
+ tasty
+ tasty-hunit
+ text
+ vector
+ ];
+ description = "JSON Schema derivation and validation";
+ license = lib.licensesSpdx."MPL-2.0";
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }
+ ) { };
+
jsonschema-gen = callPackage (
{
mkDerivation,
@@ -394243,8 +395049,8 @@ self: {
}:
mkDerivation {
pname = "jukebox";
- version = "0.5.8";
- sha256 = "1pb7z95cmqaxbmba2grrbf8dm56821y40v12l4402milnahzl3k9";
+ version = "0.5.9";
+ sha256 = "0nnlqivvsp158wdmbz1xazl1bjyd2g3w41q43plmn8igsifnv6xa";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -394922,7 +395728,7 @@ self: {
text
];
description = "Application wrapper for the k8s environment";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -394989,7 +395795,7 @@ self: {
sha256 = "07x6dsc4d4f3vksi21fxd1vix9wqsydrl17f2xq8858m2ay0j28j";
doHaddock = false;
description = "TBA";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -395375,7 +396181,7 @@ self: {
wide-word
];
description = "Serialization for kafka wire protocol";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -395570,7 +396376,7 @@ self: {
text
];
description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -396207,7 +397013,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Katip integration for Effectful";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -396493,7 +397299,7 @@ self: {
unordered-containers
];
description = "Katip scribe for raven (https://sentry.io)";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -396662,7 +397468,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "WAI middleware for logging request and response info through katip";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -397543,6 +398349,7 @@ self: {
];
description = "Rapid Gtk Application Development - I18N";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
}
) { };
@@ -398618,7 +399425,7 @@ self: {
];
doHaddock = false;
description = "Kempe compiler";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "kc";
broken = true;
@@ -398872,12 +399679,12 @@ self: {
wreq
];
description = "Web application deployment manager, focusing on Haskell web frameworks. It mitigates downtime.";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "keter";
}
) { };
- keter_2_2_0 = callPackage (
+ keter_2_2_1 = callPackage (
{
mkDerivation,
aeson,
@@ -398936,8 +399743,8 @@ self: {
}:
mkDerivation {
pname = "keter";
- version = "2.2.0";
- sha256 = "0wxq5imn77si6aljhfqka782zwpvqapkaw1qyp2yhq05vy1v2hqq";
+ version = "2.2.1";
+ sha256 = "05mh9a5lvjyjzpfcgrbysn6yzzr20aplcrqk7ifknggy5lh4204l";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -399015,7 +399822,7 @@ self: {
wreq
];
description = "Web application deployment manager, focusing on Haskell web frameworks. It mitigates downtime.";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "keter";
}
@@ -399060,8 +399867,8 @@ self: {
}:
mkDerivation {
pname = "keter-rate-limiting-plugin";
- version = "0.2.0.0";
- sha256 = "0rswbhdg3ig0c028xdwgp8nb3h6jvf0z0137akrd4d7z8glyg00x";
+ version = "0.2.0.2";
+ sha256 = "1gj66aha6myc27fqdn25j4hvsvdkzp02vqm0msch3hba8djslzzq";
libraryHaskellDepends = [
aeson
base
@@ -399117,7 +399924,7 @@ self: {
wai-extra
];
description = "Simple Keter rate limiting plugin";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { inherit (pkgs) zlib; };
@@ -399243,7 +400050,7 @@ self: {
split
];
description = "CLI and library to generate QR codes";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "kewar";
}
) { };
@@ -399457,7 +400264,7 @@ self: {
text
];
description = "An abstract Handle for accessing collections in stores like Redis";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -399490,7 +400297,7 @@ self: {
text
];
description = "Validate a keyed-vals Handle";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -399526,7 +400333,7 @@ self: {
keyed-vals-hspec-tests
];
description = "Implements a keyed-vals Handle using in-process memory";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -399574,7 +400381,7 @@ self: {
tmp-proc-redis
];
description = "Access Redis using a keyed-vals Handle";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -400026,7 +400833,7 @@ self: {
tasty-hunit
];
description = "A lightweight structured concurrency library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -400058,7 +400865,7 @@ self: {
tasty-hunit
];
description = "Adaptation of the ki library for the effectful ecosystem";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -400083,7 +400890,7 @@ self: {
unliftio-core
];
description = "A lightweight structured concurrency library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -400279,7 +401086,7 @@ self: {
hspec-core
];
description = "Boolean strong typing";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -400404,7 +401211,7 @@ self: {
singletons-base
];
description = "Type-level integers. Like KnownNat, but for integers.";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -400433,7 +401240,7 @@ self: {
singletons-base
];
description = "Type-level rationals. Like KnownNat, but for rationals.";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -400465,7 +401272,7 @@ self: {
hspec
];
description = "A category polymorphic `Functor` typeclass";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -400803,7 +401610,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Advanced keyboard remapping utility";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "kmonad";
maintainers = [
lib.maintainers.auscyber
@@ -401092,7 +401899,7 @@ self: {
transformers
];
description = "Memory-backed handles";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -401390,7 +402197,7 @@ self: {
vector
];
description = "a concatenative not-quite-lisp for kittens";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "koneko";
broken = true;
@@ -401425,7 +402232,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Formalising the rules of Konnakol, an Indian percussional art form";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -401501,7 +402308,7 @@ self: {
transformers-base
];
description = "Utilities for working with many HStringTemplate templates from files";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -401776,7 +402583,7 @@ self: {
unordered-containers
];
description = "Krank checks issue tracker link status in your source code";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "krank";
broken = true;
@@ -402521,7 +403328,7 @@ self: {
executableHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "coverage driven random testing framework";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "kudzu";
broken = true;
@@ -402703,7 +403510,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Find the alpha emoji";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -403197,7 +404004,7 @@ self: {
text
];
description = "Generate Ruby clients from Servant APIs";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -403313,7 +404120,7 @@ self: {
text
];
description = "Interpreters for lambda calculus, calculus of constructions, and more";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "lambda";
broken = true;
@@ -403580,7 +404387,7 @@ self: {
read-bounded
];
description = "Declarative command-line parser with type-driven pattern matching";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -404239,7 +405046,7 @@ self: {
mtl
];
description = "Lambdabot for Telegram";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "telegram-lambdabot";
broken = true;
@@ -405004,7 +405811,7 @@ self: {
tasty-bench
];
description = "A libary for generating low-level sounds with high-level combinators";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -405229,7 +406036,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "A high-level binding to the LAME encoder";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -405297,7 +406104,7 @@ self: {
tasty-hunit
];
description = "Run dependent IO actions asynchronously";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -405357,7 +406164,7 @@ self: {
testToolDepends = [ markdown-unlit ];
doHaddock = false;
description = "Haskell bindings for the Linux Landlock API";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "landlocked";
}
@@ -405457,6 +406264,8 @@ self: {
];
description = "Haskell implementation of Langchain";
license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -405529,7 +406338,7 @@ self: {
text
];
description = "Parser, pretty-printer, and more for the Modula-2 programming language";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "parse";
}
@@ -405566,7 +406375,7 @@ self: {
vector
];
description = "ASN.1 encoding and decoding";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -405755,7 +406564,7 @@ self: {
tasty-quickcheck
];
description = "Parsing and pretty-printing Bash shell scripts";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -405883,7 +406692,7 @@ self: {
process
];
description = "Analysis and generation of C code";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -406386,7 +407195,65 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Dockerfile parser, pretty-printer and embedded DSL";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
+ }
+ ) { };
+
+ language-docker_15_0_0 = 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 = "15.0.0";
+ sha256 = "1l4pbadd65l4pk30p1xjgs9jmkslldcm8fbw8ck35mwql252kid2";
+ 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.licensesSpdx."GPL-3.0-or-later";
+ hydraPlatforms = lib.platforms.none;
}
) { };
@@ -406510,7 +407377,7 @@ self: {
pretty
];
description = "A library for the analysis and creation of Graphviz DOT files";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "ppdot";
}
) { };
@@ -406776,7 +407643,7 @@ self: {
text
];
description = "Datatypes and parsing/printing functions to represent the Gemini markup language";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -407173,7 +408040,7 @@ self: {
parsec
];
description = "javascript parser for es6 and es7";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -407283,7 +408150,7 @@ self: {
text
];
description = "Lua parser and pretty-printer";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -408700,7 +409567,7 @@ self: {
QuickCheck
];
description = "Matrix programming library";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -408792,7 +409659,7 @@ self: {
utility-ht
];
description = "Numerical Linear Algebra using LAPACK";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -408957,7 +409824,7 @@ self: {
vector
];
description = "Conversion of objects between 'lapack' and 'hmatrix'";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -409040,7 +409907,7 @@ self: {
validation-selective
];
description = "Scalable anonymous records";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -409089,7 +409956,7 @@ self: {
tasty-quickcheck
];
description = "Generic programming API for large-records and large-anon";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.alexfmpe ];
}
) { };
@@ -409196,12 +410063,13 @@ self: {
containers,
generic-deriving,
ghc,
- ghc-prim,
+ ghc-internal,
large-generics,
mtl,
newtype,
+ optics-core,
+ optics-th,
primitive,
- record-dot-preprocessor,
record-hasfield,
syb,
tasty,
@@ -409211,16 +410079,16 @@ self: {
}:
mkDerivation {
pname = "large-records";
- version = "0.4.3";
- sha256 = "0byhs4dr86l0shqhhj3nnwcfqb8a08363w212gjqnm3kbvh18nsy";
+ version = "0.4.4";
+ sha256 = "15mk1n86y6lx7ycjraz4lzwqn7rb52qikmgwqd68sq9znfq802rj";
libraryHaskellDepends = [
base
containers
ghc
large-generics
mtl
+ optics-core
primitive
- record-dot-preprocessor
record-hasfield
syb
template-haskell
@@ -409229,11 +410097,12 @@ self: {
testHaskellDepends = [
base
generic-deriving
- ghc-prim
+ ghc-internal
large-generics
mtl
newtype
- record-dot-preprocessor
+ optics-core
+ optics-th
record-hasfield
tasty
tasty-hunit
@@ -409241,10 +410110,8 @@ self: {
transformers
];
description = "Efficient compilation for large records, linear in the size of the record";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.alexfmpe ];
- broken = true;
}
) { };
@@ -409690,7 +410557,7 @@ self: {
pandoc-types
];
description = "Use actual LaTeX to render formulae inside Hakyll pages";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -409728,7 +410595,7 @@ self: {
transformers
];
description = "A library for rendering LaTeX formulae as SVG using an actual LaTeX";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -409766,7 +410633,7 @@ self: {
pandoc-types
];
description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "latex-svg-filter";
}
@@ -409800,7 +410667,7 @@ self: {
random
];
description = "Pure incremental byte parser";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -409831,7 +410698,7 @@ self: {
time
];
description = "lathe + time";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -410129,7 +410996,7 @@ self: {
transformers
];
description = "Hedgehog support for lawful-classes";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -410168,7 +411035,7 @@ self: {
transformers
];
description = "QuickCheck support for lawful-classes";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -410181,7 +411048,7 @@ self: {
sha256 = "0dza7qrq54k0p50bv7hj9y0c12kl3x51j6kh9k7aammfnl14hrri";
libraryHaskellDepends = [ base ];
description = "Types for lawful-classes";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -410236,7 +411103,7 @@ self: {
text
];
description = "Lawful typeclasses for bidirectional conversion between types";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -410289,7 +411156,7 @@ self: {
text
];
description = "Lawful typeclasses for bidirectional conversion between types";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -410629,6 +411496,50 @@ self: {
}
) { };
+ layoutz = callPackage (
+ {
+ mkDerivation,
+ base,
+ tasty,
+ tasty-hunit,
+ }:
+ mkDerivation {
+ pname = "layoutz";
+ version = "0.1.0.0";
+ sha256 = "0hmqi5ly418nqbz8zzj9r5mvcndmympwh5zkxqipf9gj3swppy9z";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base
+ tasty
+ tasty-hunit
+ ];
+ description = "Simple, beautiful CLI output for Haskell";
+ license = lib.licensesSpdx."Apache-2.0";
+ }
+ ) { };
+
+ layoutz-hs = callPackage (
+ {
+ mkDerivation,
+ base,
+ tasty,
+ tasty-hunit,
+ }:
+ mkDerivation {
+ pname = "layoutz-hs";
+ version = "0.1.0.0";
+ sha256 = "06ps4smmsb8q0ww40q6d3w72bcad4f24v7jfkkdpqj4bvyiri29a";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base
+ tasty
+ tasty-hunit
+ ];
+ description = "Simple, beautiful CLI output for Haskell";
+ license = lib.licensesSpdx."Apache-2.0";
+ }
+ ) { };
+
lazify = callPackage (
{
mkDerivation,
@@ -410718,7 +411629,7 @@ self: {
transformers-base
];
description = "Asynchronous actions that don't start right away";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -410749,7 +411660,7 @@ self: {
tasty-hunit
];
description = "A bracket with lazy resource allocation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -411008,7 +411919,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Alternative lazy ByteString and ST-like IO Handle";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -411124,7 +412035,7 @@ self: {
sha256 = "1p0qhdbcnmx17j069n3w89jv8wpxzari4ihylrjk2x78k4b3p1cb";
libraryHaskellDepends = [ base ];
description = "LazyIO applicative for asymptotic performance";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -411516,7 +412427,7 @@ self: {
yaml
];
description = "See README for synopsis";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "ldap-scim-bridge";
}
@@ -412210,7 +413121,7 @@ self: {
text
];
description = "Signed and unsigned LEB128 codec for binary library";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -412910,6 +413821,8 @@ self: {
pname = "lens";
version = "5.3.5";
sha256 = "1s0ziznj60l9z3z5dacq58kaq8cdfxcz0r75f5hwj25ivzrsrszg";
+ revision = "1";
+ editedCabalFile = "06asqa9n6grq6dpzd2m9ynhn28mxmyqpj79bnh95x8lynf4kchg0";
libraryHaskellDepends = [
array
assoc
@@ -413264,7 +414177,7 @@ self: {
lens-action
];
description = "Lens interface for your filesystem; still a bit experimental";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -413285,7 +414198,7 @@ self: {
lens
];
description = "Indexed version of Plated";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -413454,8 +414367,8 @@ self: {
pname = "lens-properties";
version = "4.11.1";
sha256 = "1caciyn75na3f25q9qxjl7ibjam22xlhl5k2pqfiak10lxsmnz2g";
- revision = "8";
- editedCabalFile = "0lp0nkbm38v2i361w79dmqq20v3gn95bh1xixbs20549k73cxxj3";
+ revision = "9";
+ editedCabalFile = "14hiqpw4n3f73s62qqaqzb5pl47bm35qnyiwcxi7gn3acmzycjls";
libraryHaskellDepends = [
base
lens
@@ -413620,7 +414533,7 @@ self: {
tell
];
description = "MonadTell-based lens combinators";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -413845,7 +414758,7 @@ self: {
witherable
];
description = "lens-compatible tools for working with witherable";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -414007,7 +414920,87 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "frugal issue tracker";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
+ mainProgram = "lentil";
+ maintainers = [ lib.maintainers.rvl ];
+ }
+ ) { };
+
+ lentil_1_5_9_1 = callPackage (
+ {
+ mkDerivation,
+ base,
+ bytestring,
+ csv,
+ deepseq,
+ directory,
+ dlist,
+ filemanip,
+ filepath,
+ hspec,
+ hspec-discover,
+ megaparsec,
+ mtl,
+ natural-sort,
+ optparse-applicative,
+ prettyprinter,
+ prettyprinter-ansi-terminal,
+ regex-tdfa,
+ semigroups,
+ terminal-progress-bar,
+ text,
+ }:
+ mkDerivation {
+ pname = "lentil";
+ version = "1.5.9.1";
+ sha256 = "0vw5myzycksjcl7r1yjkj1i771v5yqm68k17jj7dxg050dfsnwkc";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base
+ bytestring
+ csv
+ deepseq
+ directory
+ dlist
+ filemanip
+ filepath
+ megaparsec
+ mtl
+ natural-sort
+ optparse-applicative
+ prettyprinter
+ prettyprinter-ansi-terminal
+ regex-tdfa
+ semigroups
+ terminal-progress-bar
+ text
+ ];
+ testHaskellDepends = [
+ base
+ bytestring
+ csv
+ deepseq
+ directory
+ dlist
+ filemanip
+ filepath
+ hspec
+ megaparsec
+ mtl
+ natural-sort
+ optparse-applicative
+ prettyprinter
+ prettyprinter-ansi-terminal
+ regex-tdfa
+ semigroups
+ terminal-progress-bar
+ text
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "frugal issue tracker";
+ license = lib.licensesSpdx."GPL-3.0-only";
+ hydraPlatforms = lib.platforms.none;
mainProgram = "lentil";
maintainers = [ lib.maintainers.rvl ];
}
@@ -414431,7 +415424,7 @@ self: {
util
];
description = "See README for more info";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -414827,7 +415820,7 @@ self: {
tasty-hunit
];
description = "A binding to the libBF library";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -414937,7 +415930,7 @@ self: {
temporary
];
description = "Haskell interface to libarchive";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { inherit (pkgs) libarchive; };
@@ -415572,7 +416565,7 @@ self: {
uuid
];
description = "A Haskell implementation of JSON Web Token (JWT)";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -416059,7 +417052,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "An MPD client library";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -416322,7 +417315,7 @@ self: {
QuickCheck
];
description = "Parsing, formatting, and validating international phone numbers";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -416631,7 +417624,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Move/rename according a set of rules";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
hydraPlatforms = lib.platforms.none;
mainProgram = "librarian-exe";
}
@@ -416728,7 +417721,7 @@ self: {
sha256 = "09iyvp3271l5a1idklzxdcs3wxmjxqigkn1cjjv4vk8vww6zwzkb";
doHaddock = false;
description = "TBA";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -416789,7 +417782,7 @@ self: {
transformers
];
description = "libremidi bindings for haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "libremidi-exe";
broken = true;
@@ -416836,7 +417829,7 @@ self: {
libressl
];
description = "libtls bindings";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -416909,7 +417902,7 @@ self: {
];
doHaddock = false;
description = "A versatile, flexible and executable formal model for the RISC-V architecture";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "riscv-tiny";
broken = true;
@@ -417032,7 +418025,7 @@ self: {
testPkgconfigDepends = [ libsodium ];
testToolDepends = [ c2hs ];
description = "Low-level bindings to the libsodium C library";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -417051,7 +418044,7 @@ self: {
libraryHaskellDepends = [ base ];
librarySystemDepends = [ libsodium ];
description = "FFI bindings to libsodium";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.mangoiv ];
}
) { inherit (pkgs) libsodium; };
@@ -417266,7 +418259,7 @@ self: {
];
libraryPkgconfigDepends = [ systemd ];
description = "Haskell bindings to libsystemd-journal";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
badPlatforms = lib.platforms.darwin;
}
) { inherit (pkgs) systemd; };
@@ -417319,7 +418312,7 @@ self: {
];
libraryPkgconfigDepends = [ libtelnet ];
description = "Bindings to libtelnet";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
badPlatforms = lib.platforms.darwin;
hydraPlatforms = lib.platforms.none;
broken = true;
@@ -417357,8 +418350,8 @@ self: {
}:
mkDerivation {
pname = "libtorch-ffi";
- version = "2.0.1.8";
- sha256 = "0aghzvhjdnqb7hx75ga2fls0waw8xwsnqqizj8407iq9n915r0yy";
+ version = "2.0.1.9";
+ sha256 = "0i6l98wf2rg7zd2bvxwdfzwp61hxlhwjasg0q4i3b10k6x5i9wzz";
setupHaskellDepends = [
base
bytestring
@@ -417395,7 +418388,7 @@ self: {
safe-exceptions
];
description = "Haskell bindings for PyTorch";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
)
{
@@ -417419,7 +418412,7 @@ self: {
ghc
];
description = "Helpers for integrating libtorch-ffi with Hasktorch";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -417440,7 +418433,7 @@ self: {
];
libraryPkgconfigDepends = [ libversion ];
description = "Haskell binding to libversion";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { inherit (pkgs) libversion; };
@@ -417465,7 +418458,7 @@ self: {
libraryPkgconfigDepends = [ libvirt ];
libraryToolDepends = [ cpphs ];
description = "FFI bindings to libvirt virtualization API (http://libvirt.org)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
badPlatforms = lib.platforms.darwin;
hydraPlatforms = lib.platforms.none;
broken = true;
@@ -417691,7 +418684,7 @@ self: {
sha256 = "0jaif8y10ql8rmkfhm6nwfk65q8rnpk58a6j5cf4gksz9v2nnlh4";
doHaddock = false;
description = "libyaml clibs";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -417718,7 +418711,7 @@ self: {
];
libraryPkgconfigDepends = [ libyaml ];
description = "Low-level, streaming YAML interface via streamly";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { inherit (pkgs) libyaml; };
@@ -417813,7 +418806,7 @@ self: {
directory
];
description = "A license compatibility helper";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "licensor";
broken = true;
@@ -417926,7 +418919,7 @@ self: {
tomland
];
description = "Synchronize personal configs across multiple machines";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "life";
broken = true;
@@ -417971,7 +418964,7 @@ self: {
zenhack-prelude
];
description = "Flexible manual resource management";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -418439,7 +419432,7 @@ self: {
transformers
];
description = "LIFX LAN API";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -418649,7 +419642,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "LightStep OpenTracing client library";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "lightstep-haskell-stress-test";
}
@@ -419237,7 +420230,7 @@ self: {
random
];
description = "Line-indexed file reader";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -419515,7 +420508,7 @@ self: {
];
doHaddock = false;
description = "Standard library for linear types";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -419621,6 +420614,50 @@ self: {
}
) { };
+ linear-core-prototype = callPackage (
+ {
+ mkDerivation,
+ base,
+ bytestring,
+ containers,
+ ghc,
+ mtl,
+ tasty,
+ tasty-hunit,
+ template-haskell,
+ text,
+ }:
+ mkDerivation {
+ pname = "linear-core-prototype";
+ version = "0.1.0.0";
+ sha256 = "028hp67pzwrhqlzii74gjb8fi6iivcin84zlrf9cmr5xlxdapld7";
+ libraryHaskellDepends = [
+ base
+ bytestring
+ containers
+ ghc
+ mtl
+ template-haskell
+ text
+ ];
+ testHaskellDepends = [
+ base
+ bytestring
+ containers
+ ghc
+ mtl
+ tasty
+ tasty-hunit
+ template-haskell
+ text
+ ];
+ description = "Linear core validates optimizations wrt linearity";
+ license = lib.licensesSpdx."BSD-3-Clause";
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }
+ ) { };
+
linear-free = callPackage (
{
mkDerivation,
@@ -419646,7 +420683,7 @@ self: {
QuickCheck
];
description = "Linear free monads";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -419714,7 +420751,7 @@ self: {
reflection
];
description = "Geographic coordinates, built on the linear package";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -419830,7 +420867,7 @@ self: {
utility-ht
];
description = "Linear Programming basic definitions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -419857,7 +420894,7 @@ self: {
constraints
];
description = "Build SMC morphisms using linear types";
- license = lib.licenses.lgpl3Plus;
+ license = lib.licensesSpdx."LGPL-3.0-or-later";
}
) { };
@@ -420251,7 +421288,7 @@ self: {
hspec
];
description = "File extension based programming language detection";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "generate";
broken = true;
@@ -420849,7 +421886,7 @@ self: {
sha256 = "0j5q4ddsg3bmkhb82da39rj3h1knhxm74z3jknprzwhavz2wxcn6";
libraryHaskellDepends = [ base ];
description = "Linux capabilities Haskell data type";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -421376,7 +422413,8 @@ self: {
mtl
];
description = "RISC-V Core";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
+ hydraPlatforms = lib.platforms.none;
}
) { };
@@ -421684,7 +422722,7 @@ self: {
unordered-containers
];
description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "fixpoint";
maintainers = [ lib.maintainers.artem ];
}
@@ -421803,7 +422841,7 @@ self: {
unordered-containers
];
description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "fixpoint";
maintainers = [ lib.maintainers.artem ];
@@ -422001,7 +423039,7 @@ self: {
];
testSystemDepends = [ z3 ];
description = "Liquid Types for Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.artem ];
}
) { inherit (pkgs) z3; };
@@ -422035,7 +423073,7 @@ self: {
];
testSystemDepends = [ z3 ];
description = "Liquid Types for Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
maintainers = [ lib.maintainers.artem ];
}
@@ -422155,7 +423193,7 @@ self: {
unordered-containers
];
description = "Liquid Types for Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.artem ];
}
) { };
@@ -422274,7 +423312,7 @@ self: {
unordered-containers
];
description = "Liquid Types for Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
maintainers = [ lib.maintainers.artem ];
}
@@ -422538,7 +423576,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base ];
description = "List all remote forwards for mail accounts stored in a SQL database";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
mainProgram = "list-remote-forwards";
}
) { };
@@ -422557,8 +423595,8 @@ self: {
pname = "list-shuffle";
version = "1.0.0.1";
sha256 = "1qcgkkhwnbrl729va8zgv5k6b4lpfy15bbkqnnx0nqz0d91xiqcr";
- revision = "3";
- editedCabalFile = "0hk8js5b59xr23fq58f9zp179cjcysnwaadsagz05jk3877vqzsw";
+ revision = "4";
+ editedCabalFile = "14r8qf3nm81qm4ycfpxrh513j9i1x8q78brrclxfpixh3prb5bm2";
libraryHaskellDepends = [
base
primitive
@@ -422576,7 +423614,7 @@ self: {
tasty-bench
];
description = "List shuffling and sampling";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -422588,7 +423626,7 @@ self: {
sha256 = "1n1b1fk8zn9hz162lmy9d123icd2i6cnlvpkk2ypbphmnam0xr43";
libraryHaskellDepends = [ base ];
description = "Easily and clearly create lists with only one element in them";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -422630,7 +423668,7 @@ self: {
mtl-prelude
];
description = "ListT done right";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -422895,7 +423933,7 @@ self: {
test-framework-quickcheck2
];
description = "Tries and Patricia tries: finite sets and maps for list keys";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -422942,7 +423980,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "List-like operations for tuples";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -423057,7 +424095,7 @@ self: {
sha256 = "1kyl7gg0prq7cyr0radwqcwdmqj3d0w2rjs1406nkryjfibsxgkh";
libraryHaskellDepends = [ base ];
description = "Helpers for working with NonEmpty lists";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -423343,11 +424381,11 @@ self: {
{ mkDerivation, base }:
mkDerivation {
pname = "literally";
- version = "0.2025.9.10";
- sha256 = "14g4m2qkaq6aanan8wrxawd44c8b6br0kcmhwrwk6k531564bjng";
+ version = "1.0.0.0";
+ sha256 = "0ckprvl1f1iy3960d8wgal3pl54i5b47qlsimgr6i2r6vlqciv0y";
libraryHaskellDepends = [ base ];
description = "Type-safe conversion of type literals into runtime values";
- license = lib.licenses.bsd0;
+ license = lib.licensesSpdx."0BSD";
}
) { };
@@ -423413,7 +424451,7 @@ self: {
unliftio
];
description = "transform literate source code to Markdown";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "literatex";
}
) { };
@@ -423446,7 +424484,7 @@ self: {
tasty-hunit
];
description = "Simple implementation of Earley parsing";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -423753,7 +424791,7 @@ self: {
text
];
description = "Haskell bindings for the llama.cpp llama-server and a simple CLI";
- license = lib.licenses.agpl3Only;
+ license = lib.licensesSpdx."AGPL-3.0-only";
mainProgram = "llamacall";
}
) { };
@@ -424229,7 +425267,7 @@ self: {
transformers
];
description = "Support for writing an EDSL with LLVM-JIT as target";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -424268,7 +425306,7 @@ self: {
utility-ht
];
description = "Processor specific intrinsics for the llvm interface";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -424330,7 +425368,7 @@ self: {
];
doHaddock = false;
description = "Utility functions for the llvm interface";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -424353,7 +425391,7 @@ self: {
];
librarySystemDepends = [ LLVM ];
description = "FFI bindings to the LLVM compiler toolkit";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { LLVM = null; };
@@ -424814,7 +425852,7 @@ self: {
transformers
];
description = "General purpose LLVM bindings";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -424848,7 +425886,7 @@ self: {
utility-ht
];
description = "Generate Pkg-Config configuration file for LLVM";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "llvm-pkg-config";
}
) { };
@@ -424895,7 +425933,7 @@ self: {
text
];
description = "A pretty printing library inspired by the llvm binding";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -424999,7 +426037,7 @@ self: {
versions
];
description = "LLVM bitcode parsing library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "llvm-disasm";
}
) { };
@@ -425471,7 +426509,7 @@ self: {
text
];
description = "Support for developing against the LNURL protocol";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -425529,7 +426567,7 @@ self: {
optparse-applicative
];
description = "A command line tool to manage LNURL auth identities";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "lnurl-authenticator";
}
@@ -425663,7 +426701,7 @@ self: {
integer-types
];
description = "Line and column positions and ranges in text files";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -425687,7 +426725,7 @@ self: {
loc
];
description = "Hedgehog generators for loc";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -426172,6 +427210,8 @@ self: {
];
description = "Structured logging solution with multiple backends";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -426218,7 +427258,7 @@ self: {
unordered-containers
];
description = "Structured logging solution (base package)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -426361,7 +427401,7 @@ self: {
text
];
description = "Adaptation of the log library for the effectful ecosystem";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -426414,7 +427454,7 @@ self: {
vector
];
description = "Structured logging solution (Elasticsearch back end)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -426822,7 +427862,7 @@ self: {
base
];
description = "Log-domain floating point numbers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -427392,7 +428432,7 @@ self: {
sha256 = "1jw64bajnz1fizgkw9b01fpk7iyf5w7b8rd1zmhkqxg85npx3kql";
libraryHaskellDepends = [ base ];
description = "Simple logical constraints 'syntax-sugar' writing library";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -428539,7 +429579,7 @@ self: {
vector
];
description = "monadic loop dsl";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -429289,7 +430329,7 @@ self: {
tasty-hunit
];
description = "LPeg – Parsing Expression Grammars For Lua";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -429326,7 +430366,7 @@ self: {
groups
];
description = "Left and right actions, semidirect products and torsors";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -429769,7 +430809,7 @@ self: {
];
doHaddock = false;
description = "Log-structured merge-trees";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { inherit (pkgs) rocksdb; };
@@ -429853,7 +430893,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Haskell library for the Microsoft Language Server Protocol";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -429933,7 +430973,7 @@ self: {
unliftio
];
description = "Haskell library for Language Server Protocol clients";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -430033,7 +431073,7 @@ self: {
process
];
description = "Functional test framework for LSP servers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -430136,7 +431176,7 @@ self: {
testToolDepends = [ hspec-discover ];
doHaddock = false;
description = "Haskell library for the Microsoft Language Server Protocol, data types";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "generator";
}
) { };
@@ -430532,7 +431572,7 @@ self: {
tasty-hunit
];
description = "Lua, an embeddable scripting language";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { inherit (pkgs) lua5_4; };
@@ -430553,7 +431593,7 @@ self: {
QuickCheck
];
description = "Arbitrary instances for Lua types";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -430842,7 +431882,7 @@ self: {
lucid
];
description = "Provides ARIA attributes for Lucid templates";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -430888,7 +431928,7 @@ self: {
vector
];
description = "Helper functions for using lucid with colonnade";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -431228,17 +432268,19 @@ self: {
}:
mkDerivation {
pname = "luhn";
- version = "0.2";
- sha256 = "0ix7x28kmd3iarydl709vqd041h0qx6kv582c8ca54z8ag7lzynz";
+ version = "0.3";
+ sha256 = "1h5hh6kl5wh73lp6xxq36l9zvs49213k39ryc20kv6wmyrcn5qwx";
libraryHaskellDepends = [
base
digits
QuickCheck
];
+ testHaskellDepends = [
+ base
+ QuickCheck
+ ];
description = "An implementation of Luhn's check digit algorithm";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -431560,7 +432602,7 @@ self: {
stm
];
description = "TMVar that can be listened to";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -431975,7 +433017,7 @@ self: {
tasty-quickcheck
];
description = "Bindings to LZ4";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -432125,7 +433167,7 @@ self: {
temporary
];
description = "lz4 bindings for Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -432222,7 +433264,7 @@ self: {
tasty-quickcheck
];
description = "LZMA/XZ compression and decompression";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { inherit (pkgs) xz; };
@@ -432358,7 +433400,7 @@ self: {
tasty-quickcheck
];
description = "LZMA/XZ compression and decompression (static)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -432576,7 +433618,7 @@ self: {
transformers
];
description = "A toolkit for working with macaroons";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -432897,7 +433939,7 @@ self: {
text
];
description = "Parse machines streams with attoparsec parsers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -432998,7 +434040,7 @@ self: {
text
];
description = "Transcode encodings with machines";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -433810,7 +434852,7 @@ self: {
ghc-prim
];
description = "magma is an algebraic structure";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -433960,7 +435002,7 @@ self: {
optparse-applicative
];
description = "Preconfigured email connection pool on top of smtp";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "exe";
}
) { };
@@ -434008,7 +435050,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base ];
description = "Count mailboxes in a SQL database";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
mainProgram = "mailbox-count";
}
) { };
@@ -434150,7 +435192,7 @@ self: {
wreq
];
description = "API binding for Mailgun";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -435752,7 +436794,7 @@ self: {
HUnit
];
description = "Convert C++ type signatures to their mangled form";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "mangle";
}
@@ -435932,7 +436974,7 @@ self: {
utility-ht
];
description = "A parser for web documents according to the HTML5 specification";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -436214,7 +437256,7 @@ self: {
unordered-containers
];
description = "foldl wrappers for map-reduce";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -436302,7 +437344,7 @@ self: {
vector
];
description = "Efficient, polymorphic Map Algebra";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -436353,7 +437395,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Types which represent functions k -> v";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "view";
}
) { };
@@ -437064,7 +438106,7 @@ self: {
tasty-golden
];
description = "A markup parser";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -437632,7 +438674,7 @@ self: {
text
];
description = "Fast and extensible bytestring builder";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -438042,7 +439084,7 @@ self: {
executableHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "A micro web framework based on pattern matching";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "matcha-exe";
broken = true;
@@ -438191,7 +439233,7 @@ self: {
hedgehog
];
description = "A variety of mathematical utilities";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -438305,7 +439347,7 @@ self: {
sha256 = "0l8jv0zm1mar6848n5jyd6dzy02q0cvkgvgnry9db382i1r4g9bq";
libraryHaskellDepends = [ base ];
description = "Class for interpolation of values";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -438319,7 +439361,7 @@ self: {
sha256 = "092qbl1x0l6hcm9vn3nx3gyxnqcfx3z2kkfkqw5zmmmyn9zkjsgx";
libraryHaskellDepends = [ base ];
description = "Typeclass for metric spaces";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -438357,7 +439399,7 @@ self: {
text
];
description = "A library for formulating and solving math programs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -438397,7 +439439,7 @@ self: {
unliftio
];
description = "A GLPK backend to the math-programming library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -438435,7 +439477,7 @@ self: {
text
];
description = "Utility functions for testing implementations of the math-programming library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -438906,7 +439948,7 @@ self: {
criterion
];
description = "A native implementation of matrix operations";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -438974,6 +440016,8 @@ self: {
pname = "matrix-client";
version = "0.1.6.1";
sha256 = "0nr1nk6mxvrs0dspy315pviid7db7ry889y9gsg1i3a0pn3dna08";
+ revision = "1";
+ editedCabalFile = "1n6zv3chb8x5aya14qpcbyssr16labwypbbxfh0zp7kcfmy9acf8";
libraryHaskellDepends = [
aeson
aeson-casing
@@ -439017,7 +440061,7 @@ self: {
unordered-containers
];
description = "A matrix client library";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
maintainers = [ lib.maintainers.maralorn ];
}
) { };
@@ -439186,7 +440230,7 @@ self: {
vector
];
description = "Haskell matrix library with interface to C++ linear algebra libraries";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -439366,8 +440410,8 @@ self: {
}:
mkDerivation {
pname = "matterhorn";
- version = "90000.1.0";
- sha256 = "18miknhl4wk06845v2aqlis4z5br7zzz0fjg6ylc81abg38qnxrr";
+ version = "90000.1.1";
+ sha256 = "0hbkqimdm9bscrky5nr73bxhny7cina6dabpjnglspzwc4r3chvp";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -439485,8 +440529,8 @@ self: {
}:
mkDerivation {
pname = "mattermost-api";
- version = "90000.1.0";
- sha256 = "0mp2qch4amgiixmx7zv158fb3ld1dpfad17sb43gxwadrj9afxdh";
+ version = "90000.1.1";
+ sha256 = "0l6nqrn3sdikpi1h2hrx0p7c51qvq89ibqd3z9dzzg1riz4rirfr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -439548,8 +440592,8 @@ self: {
}:
mkDerivation {
pname = "mattermost-api-qc";
- version = "90000.1.0";
- sha256 = "08ifm97c80a8vp9cqlwk7jb7105y2q6w77zvy2p42vk1l1p6yq4m";
+ version = "90000.1.1";
+ sha256 = "0qm462rb9ddpgz5cwrsqpw6sda5g055ivadfdw2yj29i1vqwn8xb";
libraryHaskellDepends = [
base
containers
@@ -440336,7 +441380,7 @@ self: {
vector
];
description = "Sample from a posterior using Markov chain Monte Carlo";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
maintainers = [ lib.maintainers.dschrempf ];
}
) { };
@@ -440492,7 +441536,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "A Haskell implementation of the Model Context Protocol (MCP)";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -440552,7 +441596,7 @@ self: {
text
];
description = "Library for building Model Context Protocol (MCP) servers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -440614,7 +441658,7 @@ self: {
primitive
];
description = "MD5 Hash";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -440811,7 +441855,7 @@ self: {
uuid
];
description = "Manipulate FSMs and store them in PostgreSQL";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -440885,7 +441929,7 @@ self: {
doctest-parallel
];
description = "Mealy machines for processing time-series and ordered data";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "mealy-perf";
}
) { };
@@ -441093,7 +442137,7 @@ self: {
vector
];
description = "A schema language for JSON";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -441768,7 +442812,7 @@ self: {
weigh
];
description = "Monadic parser combinators";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -441794,8 +442838,8 @@ self: {
pname = "megaparsec-tests";
version = "9.7.0";
sha256 = "17jwz62f8lnrfmmfrsv1jcvn9wmpk4jlhmxjwk5qqx2iyijnrpb1";
- revision = "1";
- editedCabalFile = "108nv4c045xg3ks0v7c0figqrl7v90l87cahhmn5mc24vdpxhkrj";
+ revision = "2";
+ editedCabalFile = "08lkj731i0pvynw9kvx72xi7rph84syg0dxvcz2ssnqdg3q6jxqf";
libraryHaskellDepends = [
base
bytestring
@@ -441825,7 +442869,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Test utilities and the test suite of Megaparsec";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -442419,7 +443463,7 @@ self: {
unix
];
description = "Print the core memory usage of programs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "printmem";
}
) { };
@@ -442449,7 +443493,7 @@ self: {
th-lift
];
description = "Indices for type level lists";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -442479,7 +443523,7 @@ self: {
type-spec
];
description = "Type-safe memory units";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -442763,7 +443807,7 @@ self: {
transformers
];
description = "Open temporary anonymous Linux file handles";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
platforms = lib.platforms.linux;
hydraPlatforms = lib.platforms.none;
broken = true;
@@ -442990,7 +444034,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "A memoization library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -443308,6 +444352,71 @@ self: {
}
) { };
+ mempack_0_2_0_0 = callPackage (
+ {
+ mkDerivation,
+ avro,
+ base,
+ binary,
+ bytestring,
+ cereal,
+ criterion,
+ FailT,
+ flat,
+ hspec,
+ mtl,
+ primitive,
+ QuickCheck,
+ random,
+ serialise,
+ store,
+ text,
+ vector,
+ }:
+ mkDerivation {
+ pname = "mempack";
+ version = "0.2.0.0";
+ sha256 = "0prm0rl92j0pgwg0hkb28l846jnlf3fldwbknpx8inashijvqn6a";
+ libraryHaskellDepends = [
+ base
+ bytestring
+ FailT
+ mtl
+ primitive
+ text
+ vector
+ ];
+ testHaskellDepends = [
+ base
+ bytestring
+ FailT
+ hspec
+ mtl
+ primitive
+ QuickCheck
+ random
+ text
+ vector
+ ];
+ benchmarkHaskellDepends = [
+ avro
+ base
+ binary
+ bytestring
+ cereal
+ criterion
+ flat
+ primitive
+ serialise
+ store
+ vector
+ ];
+ description = "Short description";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
memscript = callPackage (
{
mkDerivation,
@@ -443354,7 +444463,7 @@ self: {
transformers
];
description = "Securely erase memory contents by writing zeros to it";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -443527,7 +444636,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "A functor for consistent merging of information";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -443816,7 +444925,7 @@ self: {
random-bytestring
];
description = "Merkle Tree Logs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -444015,7 +445124,7 @@ self: {
typed-process
];
description = "Temporary message-db for integration testing";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -444446,7 +445555,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "rebindable methods for improving testability";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -445237,7 +446346,7 @@ self: {
warp-tls
];
description = "a minimalistic DNS-authoritative server";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "microdns";
broken = true;
@@ -445402,6 +446511,19 @@ self: {
}
) { };
+ microlens_0_5_0_0 = callPackage (
+ { mkDerivation, base }:
+ mkDerivation {
+ pname = "microlens";
+ version = "0.5.0.0";
+ sha256 = "0rdz2jwbv82gj7gn8rq1x6z5iyjyvmg2wq4b47mr9bqj264qwq04";
+ libraryHaskellDepends = [ base ];
+ description = "A tiny lens library with no dependencies";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
microlens-aeson = callPackage (
{
mkDerivation,
@@ -445444,7 +446566,7 @@ self: {
vector
];
description = "Law-abiding lenses for Aeson, using microlens";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -445469,6 +446591,26 @@ self: {
}
) { };
+ microlens-contra_0_1_0_4 = callPackage (
+ {
+ mkDerivation,
+ base,
+ microlens,
+ }:
+ mkDerivation {
+ pname = "microlens-contra";
+ version = "0.1.0.4";
+ sha256 = "15rr6f9n91pnczx8pihlx6dcwfy8f0snkfxfb45b96fp633k95dj";
+ libraryHaskellDepends = [
+ base
+ microlens
+ ];
+ description = "True folds and getters for microlens";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
microlens-each = callPackage (
{
mkDerivation,
@@ -445517,6 +446659,34 @@ self: {
}
) { };
+ microlens-ghc_0_4_15_2 = callPackage (
+ {
+ mkDerivation,
+ array,
+ base,
+ bytestring,
+ containers,
+ microlens,
+ transformers,
+ }:
+ mkDerivation {
+ pname = "microlens-ghc";
+ version = "0.4.15.2";
+ sha256 = "1c1ndgzh532lsnwjag9w566fbcnjkw2lbd6fnnfriccyfxhdx93b";
+ libraryHaskellDepends = [
+ array
+ base
+ bytestring
+ containers
+ microlens
+ transformers
+ ];
+ description = "microlens + array, bytestring, containers, transformers";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
microlens-mtl = callPackage (
{
mkDerivation,
@@ -445542,6 +446712,32 @@ self: {
}
) { };
+ microlens-mtl_0_2_1_1 = callPackage (
+ {
+ mkDerivation,
+ base,
+ microlens,
+ mtl,
+ transformers,
+ transformers-compat,
+ }:
+ mkDerivation {
+ pname = "microlens-mtl";
+ version = "0.2.1.1";
+ sha256 = "1r9jvn4ka3lakqnwxfh72zy9yc145ll15l7cw7sqn062z74dxk0w";
+ libraryHaskellDepends = [
+ base
+ microlens
+ mtl
+ transformers
+ transformers-compat
+ ];
+ description = "microlens support for Reader/Writer/State from mtl";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
microlens-platform = callPackage (
{
mkDerivation,
@@ -445575,6 +446771,40 @@ self: {
}
) { };
+ microlens-platform_0_4_4_2 = callPackage (
+ {
+ mkDerivation,
+ base,
+ hashable,
+ microlens,
+ microlens-ghc,
+ microlens-mtl,
+ microlens-th,
+ text,
+ unordered-containers,
+ vector,
+ }:
+ mkDerivation {
+ pname = "microlens-platform";
+ version = "0.4.4.2";
+ sha256 = "08y0mlmlx9hm23bp95m5nzq3zj0bz9q9in237vh0hgris8aaiwv0";
+ 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;
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
microlens-pro = callPackage (
{
mkDerivation,
@@ -445595,8 +446825,8 @@ self: {
}:
mkDerivation {
pname = "microlens-pro";
- version = "0.2.0.4";
- sha256 = "099ynp1winji1jn08dqayywliwk9midccfsv13cakhrdnbps8zj3";
+ version = "0.2.0.3";
+ sha256 = "1mmj8y7rvfasas1kqpns8aj9mr52rgb8mm8fy5qwmv0ll8r3siik";
libraryHaskellDepends = [
base
containers
@@ -445618,6 +446848,50 @@ self: {
}
) { };
+ microlens-pro_0_2_0_5 = callPackage (
+ {
+ mkDerivation,
+ base,
+ containers,
+ microlens,
+ microlens-contra,
+ microlens-platform,
+ microlens-th,
+ mtl,
+ profunctors,
+ tagged,
+ template-haskell,
+ text,
+ th-abstraction,
+ unordered-containers,
+ vector,
+ }:
+ mkDerivation {
+ pname = "microlens-pro";
+ version = "0.2.0.5";
+ sha256 = "06fhqzw1g5253680i6q8kjy1h1b278bnrq9cdcqmab3zblzxh95g";
+ libraryHaskellDepends = [
+ base
+ containers
+ microlens
+ microlens-contra
+ microlens-platform
+ microlens-th
+ mtl
+ profunctors
+ tagged
+ template-haskell
+ text
+ th-abstraction
+ unordered-containers
+ vector
+ ];
+ description = "Prisms and isomorphisms for microlens";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
microlens-process = callPackage (
{
mkDerivation,
@@ -445692,6 +446966,40 @@ self: {
}
) { };
+ microlens-th_0_4_3_18 = callPackage (
+ {
+ mkDerivation,
+ base,
+ containers,
+ microlens,
+ tagged,
+ template-haskell,
+ th-abstraction,
+ transformers,
+ }:
+ mkDerivation {
+ pname = "microlens-th";
+ version = "0.4.3.18";
+ sha256 = "12zdn20v1jl3q2cr96bf9rcj8qmrfr1kd3q0pdkjmayf108g8zj1";
+ libraryHaskellDepends = [
+ base
+ containers
+ microlens
+ template-haskell
+ th-abstraction
+ transformers
+ ];
+ testHaskellDepends = [
+ base
+ microlens
+ tagged
+ ];
+ description = "Automatic generation of record lenses for microlens";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
micrologger = callPackage (
{
mkDerivation,
@@ -445848,7 +447156,7 @@ self: {
text
];
description = "Mustache templates for Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -446251,7 +447559,7 @@ self: {
wxcore
];
description = "A Memory-like (Concentration, Pairs, ...) game for tones";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "midimory";
}
@@ -446794,7 +448102,7 @@ self: {
text
];
description = "Semi-automatic database schema migrations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -446839,7 +448147,7 @@ self: {
text
];
description = "Semi-automatic database schema migrations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -446882,7 +448190,7 @@ self: {
text
];
description = "Semi-automatic database schema migrations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -446921,7 +448229,7 @@ self: {
text
];
description = "Semi-automatic database schema migrations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -447365,7 +448673,7 @@ self: {
random
];
description = "Double-ended priority queues";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -447379,7 +448687,7 @@ self: {
sha256 = "07h6hgq4k1wm4ldwb29fgmmbl9ygrlbq3qv3ymfvc25l5rvgss4h";
doHaddock = false;
description = "TBA";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -447516,7 +448824,7 @@ self: {
sha256 = "04gcdvygrk2xxhqafjfnvk7cpz8n4wbwhxjqhfcz65l4id0aslpc";
libraryHaskellDepends = [ base ];
description = "Minimal essentials";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -447638,7 +448946,7 @@ self: {
unix
];
description = "Minimalist CI framework to run checks on local machine";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
mainProgram = "minici";
}
) { };
@@ -447668,7 +448976,7 @@ self: {
HUnit
];
description = "Minimal bindings to libcurl";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -447844,7 +449152,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "A SDL2-based graphics library, batteries-included";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -447894,7 +449202,7 @@ self: {
mtl
];
description = "A binding library of minilight for Lua langauge";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "example";
}
@@ -448102,7 +449410,7 @@ self: {
xml-conduit
];
description = "A MinIO Haskell Library for Amazon S3 compatible cloud storage";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
maintainers = [ lib.maintainers.mpscholten ];
}
) { };
@@ -448157,7 +449465,7 @@ self: {
warp
];
description = "A Haskell introspectable web router";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -448195,7 +449503,7 @@ self: {
warp
];
description = "Minion conduit support";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "minion-conduit-example";
}
) { };
@@ -448221,7 +449529,7 @@ self: {
text
];
description = "Minion HTMX support";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -448265,7 +449573,7 @@ self: {
warp
];
description = "Minion JWT support";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "minion-jwt-example";
}
) { };
@@ -448315,7 +449623,7 @@ self: {
text
];
description = "Minion openapi3 support";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -448361,7 +449669,7 @@ self: {
warp
];
description = "Minion wrappers for wai-extra";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -448518,7 +449826,7 @@ self: {
system-cxx-std-lib
];
description = "A Haskell bundle of the Minisat SAT solver";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -448612,7 +449920,7 @@ self: {
];
benchmarkHaskellDepends = [ base ];
description = "Simple and lightweight benchmarking utilities";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -448954,7 +450262,7 @@ self: {
vector
];
description = "fortune-mod clone";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -449306,7 +450614,7 @@ self: {
transformers
];
description = "A tasty Haskell front-end web framework";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -449343,7 +450651,7 @@ self: {
isLibrary = false;
isExecutable = true;
description = "A tasty Haskell front-end web framework";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
platforms = [ "javascript-ghcjs" ];
}
) { };
@@ -449461,7 +450769,7 @@ self: {
unix
];
description = "A Haskell git implimentation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -449495,7 +450803,7 @@ self: {
posix-paths
];
description = "Useability extras built on top of miss";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -449587,7 +450895,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "A git wrapper with a streamlined UX";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "mit";
broken = true;
@@ -449654,7 +450962,7 @@ self: {
hspec
];
description = "Vim plugin manager written in Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "miv";
}
) { };
@@ -450051,8 +451359,8 @@ self: {
pname = "mmark";
version = "0.0.8.0";
sha256 = "05wzjyqh4605g2y3lhcqrjh4qzj4fv8xg5baf3xi0x6ararrwjgr";
- revision = "1";
- editedCabalFile = "13d46lpf5b1kj6b1g89gb1s91h87njz3k69mp39nsfhwq19ygibf";
+ revision = "2";
+ editedCabalFile = "0gy66sawj11za86rwkvmr791acd84f895ym568w7wnbks9p6gmmr";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson
@@ -450096,7 +451404,7 @@ self: {
weigh
];
description = "Strict markdown processor for writers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.mpscholten ];
}
) { };
@@ -450140,7 +451448,7 @@ self: {
text
];
description = "Command line interface to the MMark markdown processor";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "mmark";
}
) { };
@@ -450164,8 +451472,8 @@ self: {
pname = "mmark-ext";
version = "0.2.1.5";
sha256 = "1dy3xnzpbbnp03k3r04q8y10pcj2r708dk8bff0pxzkvypm75g88";
- revision = "4";
- editedCabalFile = "0girl659kn2nxzcayjzx8pflws43vp3mfw03g3ril8i49r1wkxkn";
+ revision = "5";
+ editedCabalFile = "1zhkihv0m7as1jxq14if7ksr8lwvbwpa4q7q87xs43n52fassdw9";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base
@@ -450188,7 +451496,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Commonly useful extensions for the MMark markdown processor";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.mpscholten ];
}
) { };
@@ -450205,6 +451513,8 @@ self: {
pname = "mmorph";
version = "1.2.1";
sha256 = "1rjclyxyr5ajnpmkrlwap77h5fmdwys8bpwfj0n87v33hh1dcn8f";
+ revision = "1";
+ editedCabalFile = "00pf88q7vpgf8inbk50023zpcwy64gvaarpj3w3ssxyk15zi6k7a";
libraryHaskellDepends = [
base
mtl
@@ -450764,8 +452074,8 @@ self: {
}:
mkDerivation {
pname = "mmzk-env";
- version = "0.1.0.0";
- sha256 = "1lrm2cp0xl5qbas91rij940c169jv29n2iyjv6nx2873yqa3ig37";
+ version = "0.1.1.1";
+ sha256 = "02bcv8767bjrbbhnl89kcl63b7c9ajadickd84sr93xxdhjx0jfk";
libraryHaskellDepends = [
base
containers
@@ -450778,7 +452088,7 @@ self: {
hspec
];
description = "Read environment variables into a user-defined data type";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -450838,7 +452148,7 @@ self: {
uuid-types
];
description = "A TypeID and UUIDv7 implementation for Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -450991,7 +452301,7 @@ self: {
yaml
];
description = "A HTTP server for testing HTTP clients";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "mock-httpd";
broken = true;
@@ -451096,37 +452406,88 @@ self: {
mockcat = callPackage (
{
mkDerivation,
+ async,
base,
hspec,
mtl,
template-haskell,
text,
transformers,
+ unliftio,
+ unliftio-core,
}:
mkDerivation {
pname = "mockcat";
- version = "0.5.2.0";
- sha256 = "0b3i5vswlijyf3142shwrw1z8vj152b4k466c0310ayih3mcc61p";
+ version = "0.5.3.0";
+ sha256 = "0vizr1ah8dhxq04chbzz8n48f5m6l86gyi27yi9z74w72g12f7f7";
libraryHaskellDepends = [
base
mtl
template-haskell
text
transformers
+ unliftio
+ unliftio-core
];
testHaskellDepends = [
+ async
base
hspec
mtl
template-haskell
text
transformers
+ unliftio
+ unliftio-core
];
description = "Mock library for test in Haskell";
license = lib.licenses.mit;
}
) { };
+ mockcat_0_5_4_0 = callPackage (
+ {
+ mkDerivation,
+ async,
+ base,
+ hspec,
+ mtl,
+ template-haskell,
+ text,
+ transformers,
+ unliftio,
+ unliftio-core,
+ }:
+ mkDerivation {
+ pname = "mockcat";
+ version = "0.5.4.0";
+ sha256 = "0nzrvavgrw04vz7hq0b55xq8163n8ml9wifscm0y577fq11ab827";
+ libraryHaskellDepends = [
+ base
+ mtl
+ template-haskell
+ text
+ transformers
+ unliftio
+ unliftio-core
+ ];
+ testHaskellDepends = [
+ async
+ base
+ hspec
+ mtl
+ template-haskell
+ text
+ transformers
+ unliftio
+ unliftio-core
+ ];
+ description = "Mock library for test in Haskell";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
mockery = callPackage (
{
mkDerivation,
@@ -451386,7 +452747,7 @@ self: {
weigh
];
description = "Modern library for working with URIs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -451518,7 +452879,7 @@ self: {
doctest
];
description = "A type for integers modulo some constant";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -451933,7 +453294,7 @@ self: {
type-set
];
description = "Monadic Functional Reactive Programming";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -451992,7 +453353,7 @@ self: {
unordered-containers
];
description = "Samples of moffy";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -452060,7 +453421,7 @@ self: {
union-color
];
description = "Events for sample codes of moffy";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -452088,7 +453449,7 @@ self: {
moffy-samples-gtk3-run
];
description = "Sample executables of moffy - GTK3 version";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "moffy_samples_gtk3";
}
@@ -452154,7 +453515,7 @@ self: {
union-color
];
description = "Package to run moffy samples - GTK3 version";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -452182,7 +453543,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Sample executables of moffy - GTK4 version";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "moffy_samples_gtk4";
}
@@ -452251,7 +453612,7 @@ self: {
union-color
];
description = "Package to run moffy samples - Gtk4 version";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -452317,7 +453678,7 @@ self: {
bytestring
];
description = "Modular Haskell Web Server";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "hws";
broken = true;
@@ -452620,8 +453981,8 @@ self: {
}:
mkDerivation {
pname = "monad-bayes";
- version = "1.3.0.4";
- sha256 = "0r7gmymd8vy8q0hgkm2s9qmlm3q93nss6yl7rahpl2lxb838qrfy";
+ version = "1.3.0.5";
+ sha256 = "0y6rxhc9bw4vf053vj74df5nqz21w69wrizipxwipxkm66bxa058";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -452777,7 +454138,7 @@ self: {
vty-unix
];
description = "A library for probabilistic programming";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "example";
maintainers = [ lib.maintainers.turion ];
}
@@ -453146,6 +454507,80 @@ self: {
}
) { };
+ monad-effect = callPackage (
+ {
+ mkDerivation,
+ async,
+ base,
+ containers,
+ criterion,
+ data-default,
+ data-effects,
+ deepseq,
+ effectful,
+ exceptions,
+ fused-effects,
+ haskell-src-meta,
+ heftia-effects,
+ logict,
+ monad-control,
+ mtl,
+ parsec,
+ polysemy,
+ resourcet,
+ stm,
+ tasty-bench,
+ template-haskell,
+ text,
+ transformers-base,
+ unix,
+ }:
+ mkDerivation {
+ pname = "monad-effect";
+ version = "0.2.0.0";
+ sha256 = "0p2karn70ha1bf325in4mwhyb09vb7scrbsji7sy1lbrizq6d428";
+ libraryHaskellDepends = [
+ async
+ base
+ data-default
+ deepseq
+ exceptions
+ haskell-src-meta
+ monad-control
+ mtl
+ parsec
+ resourcet
+ stm
+ template-haskell
+ text
+ transformers-base
+ ];
+ testHaskellDepends = [
+ base
+ containers
+ criterion
+ mtl
+ parsec
+ text
+ ];
+ benchmarkHaskellDepends = [
+ base
+ data-effects
+ effectful
+ fused-effects
+ heftia-effects
+ logict
+ mtl
+ polysemy
+ tasty-bench
+ text
+ unix
+ ];
+ description = "A fast and lightweight effect system";
+ license = lib.licensesSpdx."BSD-3-Clause";
+ }
+ ) { };
+
monad-exception = callPackage (
{
mkDerivation,
@@ -453375,7 +454810,7 @@ self: {
comonad
];
description = "Ideal Monads and coproduct of them";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -453387,7 +454822,7 @@ self: {
sha256 = "0ajn06f3q181nf6xa4kish04bv74crqmsmk7i1ny4kw1m9ag139d";
libraryHaskellDepends = [ base ];
description = "Monads with an unsaveInterleaveIO-like operation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -454640,7 +456075,7 @@ self: {
transformers
];
description = "A new, simple, composable concurrency abstraction";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
maintainers = [ lib.maintainers.turion ];
}
) { };
@@ -454653,7 +456088,7 @@ self: {
sha256 = "0hqlwimwdhxwcikmy41qlkzr09dxx7ibpzr2g4czlv07c6fwlm3q";
libraryHaskellDepends = [ base ];
description = "Monads of program skeleta";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -454910,7 +456345,7 @@ self: {
typed-process
];
description = "Functions to exit the program anywhere in MonadThrow monads";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -454961,7 +456396,7 @@ self: {
time
];
description = "Adaptation of the monad-time library for the effectful ecosystem";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -455178,7 +456613,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "A monad transformer for data validation";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -455253,7 +456688,7 @@ self: {
sha256 = "048xk3zr7237c0mzr6lfca3qsgh60icnp8vw3vg2pj12z8id62ka";
libraryHaskellDepends = [ base ];
description = "A collection of monad transformers";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -455293,7 +456728,7 @@ self: {
transformers
];
description = "The Acme and AcmeT monads";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -455427,7 +456862,7 @@ self: {
transformers
];
description = "GHC plugin to desugar ! into do-notation";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -455457,7 +456892,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Recursion Schemes for Monadic version";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -455729,7 +457164,7 @@ self: {
text
];
description = "The best ideas in monad-related classes and types";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -455787,7 +457222,7 @@ self: {
transformers
];
description = "Monad classes, using type families";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -456578,7 +458013,7 @@ self: {
witherable
];
description = "A monoidal map with the right group instance";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.alexfmpe ];
}
) { };
@@ -456818,7 +458253,7 @@ self: {
mtl
];
description = "Monoidal Functors Library";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "co-log";
}
) { };
@@ -456848,7 +458283,7 @@ self: {
nothunks
];
description = "Monoidal map type";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -456894,7 +458329,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "JSON support for monoidmap";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -456927,7 +458362,30 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Examples for monoidmap";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
+ }
+ ) { };
+
+ monoidmap-hashable = callPackage (
+ {
+ mkDerivation,
+ base,
+ containers,
+ hashable,
+ monoidmap,
+ }:
+ mkDerivation {
+ pname = "monoidmap-hashable";
+ version = "0.0.0.0";
+ sha256 = "0ifqn4998qgmvb7f7vanmrw7qvf6a5ycdxan8dpyp4z2vyslphrl";
+ libraryHaskellDepends = [
+ base
+ containers
+ hashable
+ monoidmap
+ ];
+ description = "Hashing support for monoidmap";
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -456987,7 +458445,7 @@ self: {
tasty-hunit
];
description = "Internal support for monoidmap";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -457012,7 +458470,7 @@ self: {
QuickCheck
];
description = "QuickCheck support for monoidmap";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -457554,7 +459012,7 @@ self: {
time-compat
];
description = "MonthName";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -457585,7 +459043,7 @@ self: {
tasty-smallcheck
];
description = "a 'Monus' is a commutative monoid that allows a notion of substraction";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -457790,7 +459248,7 @@ self: {
];
doHaddock = false;
description = "Invocation helpers for the ReaderT-record-of-functions style";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -458344,7 +459802,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Upgradeability infrastructure based on Morley";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "morley-ustore-reader";
}
@@ -459900,7 +461358,7 @@ self: {
optparse-applicative
];
description = "Print current MPD song and status as JSON";
- license = lib.licenses.unlicense;
+ license = lib.licensesSpdx."Unlicense";
mainProgram = "mpd-current-json";
}
) { };
@@ -460419,7 +461877,7 @@ self: {
text
];
description = "Datastructures to describe TCP and MPTCP connections";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -460526,7 +461984,7 @@ self: {
text
];
description = "A Multipath TCP path manager";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
badPlatforms = lib.platforms.darwin;
hydraPlatforms = lib.platforms.none;
mainProgram = "mptcp-pm";
@@ -460706,7 +462164,7 @@ self: {
QuickCheck
];
description = "A Multipath TCP analyzer";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
mainProgram = "mptcpanalyzer";
}
@@ -460886,7 +462344,7 @@ self: {
hspec
];
description = "A simple way to read environment variables in Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -462045,7 +463503,7 @@ self: {
transformers
];
description = "Monad classes for transformers, using functional dependencies";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -462158,7 +463616,7 @@ self: {
transformers
];
description = "Monad classes for transformers, using functional dependencies";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -462290,7 +463748,7 @@ self: {
mtl
];
description = "Lift substacks of monad transformer stacks";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -462399,7 +463857,7 @@ self: {
mtl
];
description = "Reified monad transformer stacks";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -463529,7 +464987,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "A few multimap variants";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -463557,7 +465015,7 @@ self: {
];
doHaddock = false;
description = "Multiple Exceptions";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -463577,7 +465035,7 @@ self: {
hedgehog
];
description = "Typeclasses augmented with a phantom type parameter";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -463740,7 +465198,7 @@ self: {
template-haskell
];
description = "Self-identifying base encodings, implementation of ";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -463766,7 +465224,7 @@ self: {
sop-core
];
description = "Uncurry functions with multiple arguments";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -463833,7 +465291,7 @@ self: {
toml-reader
];
description = "Simple tool for running commands in multiple directories";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "muld";
broken = true;
@@ -464029,7 +465487,7 @@ self: {
hedgehog
];
description = "Self-identifying hashes, implementation of ";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -464065,7 +465523,7 @@ self: {
serialise
];
description = "CBOR encoding of multihashes";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -464934,7 +466392,7 @@ self: {
haskeline
];
description = "A framework for multiverse debugging";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "multiverse-debugging-exe";
}
) { };
@@ -464978,7 +466436,7 @@ self: {
transformers
];
description = "Traverse data types via generics, acting on multiple types simultaneously";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -465057,6 +466515,8 @@ self: {
];
description = "MUtually Recursive Definitions Explicitly Represented";
license = "LGPL";
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -466034,6 +467494,64 @@ self: {
}
) { };
+ musig2 = callPackage (
+ {
+ mkDerivation,
+ base,
+ base16-bytestring,
+ binary,
+ bytestring,
+ containers,
+ criterion,
+ deepseq,
+ entropy,
+ ppad-secp256k1,
+ ppad-sha256,
+ tasty,
+ tasty-hunit,
+ tasty-quickcheck,
+ }:
+ mkDerivation {
+ pname = "musig2";
+ version = "0.1.0";
+ sha256 = "02398ib1jxb41ksxf1mxzqfbj53dz1gfz87a05fym3jywf2yf2ml";
+ libraryHaskellDepends = [
+ base
+ base16-bytestring
+ binary
+ bytestring
+ containers
+ entropy
+ ppad-secp256k1
+ ppad-sha256
+ ];
+ testHaskellDepends = [
+ base
+ base16-bytestring
+ binary
+ bytestring
+ containers
+ entropy
+ ppad-secp256k1
+ ppad-sha256
+ tasty
+ tasty-hunit
+ tasty-quickcheck
+ ];
+ benchmarkHaskellDepends = [
+ base
+ base16-bytestring
+ bytestring
+ criterion
+ deepseq
+ ppad-secp256k1
+ ];
+ description = "MuSig2 library";
+ license = lib.licensesSpdx."MIT";
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
mustache = callPackage (
{
mkDerivation,
@@ -466335,7 +467853,7 @@ self: {
vector
];
description = "Mutable Fenwick trees";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -466406,7 +467924,7 @@ self: {
primitive
];
description = "Interoperate mutable references with regular lens";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -466460,7 +467978,7 @@ self: {
safe-exceptions
];
description = "A trivial lock based on MVar";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -466696,7 +468214,7 @@ self: {
];
doCheck = false;
description = "Fast, high quality pseudo random number generation";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -467614,7 +469132,7 @@ self: {
vector
];
description = "pure haskell MySQL driver";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -467829,7 +469347,7 @@ self: {
vector
];
description = "pure haskell MySQL driver";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -468099,7 +469617,7 @@ self: {
vty
];
description = "Tool to keep track of what you have been working on and where";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
hydraPlatforms = lib.platforms.none;
mainProgram = "mywork";
}
@@ -468168,7 +469686,7 @@ self: {
text
];
description = "A Haskell client for the Myxine GUI server";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -468755,7 +470273,7 @@ self: {
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "Named parameters (keyword arguments) for Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -468795,7 +470313,7 @@ self: {
text
];
description = "NBT (named binary tag) serialization and deserialization";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -469031,7 +470549,7 @@ self: {
unordered-containers
];
description = "A parameterized named text type and associated functionality";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -469422,7 +470940,7 @@ self: {
transformers
];
description = "Create compilers using small passes and many intermediate representations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "dumb-nanopass-example";
broken = true;
@@ -469758,7 +471276,7 @@ self: {
text
];
description = "Refinement types for natural numbers with an optics interface";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -470108,7 +471626,7 @@ self: {
unlifted
];
description = "Arithmetic of natural numbers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -470288,6 +471806,104 @@ self: {
}
) { };
+ nbparts = callPackage (
+ {
+ mkDerivation,
+ aeson,
+ aeson-pretty,
+ base,
+ base64-bytestring,
+ bytestring,
+ commonmark,
+ containers,
+ crypton,
+ directory,
+ filepath,
+ hedgehog,
+ hspec,
+ hspec-discover,
+ hspec-hedgehog,
+ ipynb,
+ libyaml,
+ megaparsec,
+ memory,
+ mime-types,
+ mtl,
+ optparse-applicative,
+ parsec,
+ req,
+ scientific,
+ temporary,
+ text,
+ transformers,
+ vector,
+ yaml,
+ }:
+ mkDerivation {
+ pname = "nbparts";
+ version = "0.1.1.0";
+ sha256 = "18nmi2z41d1smxia0fyyii855phwmc3ac3bpd3hlixp8fnpr66g1";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson
+ aeson-pretty
+ base
+ base64-bytestring
+ bytestring
+ commonmark
+ containers
+ crypton
+ directory
+ filepath
+ ipynb
+ libyaml
+ megaparsec
+ memory
+ mime-types
+ mtl
+ parsec
+ text
+ transformers
+ yaml
+ ];
+ executableHaskellDepends = [
+ base
+ mtl
+ optparse-applicative
+ text
+ ];
+ testHaskellDepends = [
+ aeson
+ base
+ bytestring
+ commonmark
+ containers
+ directory
+ filepath
+ hedgehog
+ hspec
+ hspec-hedgehog
+ ipynb
+ mime-types
+ mtl
+ parsec
+ req
+ scientific
+ temporary
+ text
+ vector
+ yaml
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Unpack a Jupyter notebook into its sources, metadata and outputs";
+ license = lib.licensesSpdx."Apache-2.0";
+ hydraPlatforms = lib.platforms.none;
+ mainProgram = "nbparts";
+ broken = true;
+ }
+ ) { };
+
nbt = callPackage (
{
mkDerivation,
@@ -470493,7 +472109,7 @@ self: {
tasty-hunit
];
description = "Quasiquoter for neat and simple multiline text interpolation";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -470678,7 +472294,7 @@ self: {
sha256 = "08jk7hn5mp89vxfkh9cl7rj5b9sjjwil4lic5gpgsbwpvy8rd8a8";
libraryHaskellDepends = [ base ];
description = "The Neither datatype";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -470819,7 +472435,7 @@ self: {
random
];
description = "Unofficial nekos.best API wrapper";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -470943,7 +472559,7 @@ self: {
hedgehog
];
description = "NonEmpty lists that look [more, like, this]";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -471060,7 +472676,7 @@ self: {
vector
];
description = "Neptune Client";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "example-app";
broken = true;
@@ -471075,7 +472691,7 @@ self: {
sha256 = "0nbgb9lz0ibha72gyh0q86rbssik2fxphab6f1asm0r5kz5va3ly";
libraryHaskellDepends = [ base ];
description = "Nerd Font Icons for use in haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -471533,7 +473149,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "NestedText: A Human Friendly Data Format";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -472847,7 +474463,7 @@ self: {
unix
];
description = "Binding to C socket API operating on bytearrays";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -473300,7 +474916,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Arbitrary Instances for Network Types";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -473584,7 +475200,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "CAN bus networking";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -473744,7 +475360,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Library to control network protocols";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -473873,7 +475489,7 @@ self: {
network
];
description = "Adaptation of the network library for the effectful ecosystem";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -474429,7 +476045,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Types for working with Linux packet sockets";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -474739,7 +476355,7 @@ self: {
transformers
];
description = "Simple interface to TLS secured network sockets";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -474768,7 +476384,7 @@ self: {
websockets
];
description = "Simple interface to WebSockets";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -474797,7 +476413,7 @@ self: {
websockets
];
description = "Simple interface to TLS secured WebSockets";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -474933,7 +476549,7 @@ self: {
transformers
];
description = "Network abstraction layer";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -475047,7 +476663,7 @@ self: {
network-transport-tests
];
description = "In-memory instantiation of Network.Transport";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -475086,7 +476702,7 @@ self: {
network-transport-tests
];
description = "TCP instantiation of Network.Transport";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -475115,7 +476731,7 @@ self: {
random
];
description = "Unit tests for Network.Transport implementations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -475251,7 +476867,7 @@ self: {
stm
];
description = "Network functions that do not throw exceptions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
badPlatforms = lib.platforms.darwin;
}
) { };
@@ -476016,7 +477632,7 @@ self: {
];
doHaddock = false;
description = "Future-proof system for plain-text notes";
- license = lib.licenses.agpl3Only;
+ license = lib.licensesSpdx."AGPL-3.0-only";
hydraPlatforms = lib.platforms.none;
mainProgram = "neuron";
}
@@ -476155,7 +477771,7 @@ self: {
text
];
description = "newline specifications as values";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -476267,7 +477883,7 @@ self: {
warp
];
description = "A basic newsletter implimentation, using various backends";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "newsletter-server";
broken = true;
@@ -476303,7 +477919,7 @@ self: {
text
];
description = "A mailgun backend for the newsletter package";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -476529,7 +478145,7 @@ self: {
random
];
description = "Newtype Wrapper Zoo";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -477599,6 +479215,25 @@ self: {
}
) { };
+ nix = callPackage (
+ {
+ mkDerivation,
+ base,
+ relude,
+ }:
+ mkDerivation {
+ pname = "nix";
+ version = "0.1.0.0";
+ sha256 = "1crnwkdpr44m9ccx5x525llha6k4iy4n3i8y4g3qpj9zh8iy5pc5";
+ libraryHaskellDepends = [
+ base
+ relude
+ ];
+ description = "Haskell wrapper for the Nix CLI";
+ license = lib.licenses.mit;
+ }
+ ) { };
+
nix-delegate = callPackage (
{
mkDerivation,
@@ -477807,7 +479442,7 @@ self: {
typed-process
];
description = "Explain why two Nix derivations differ";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "nix-diff";
maintainers = [
lib.maintainers.Gabriella439
@@ -477910,7 +479545,7 @@ self: {
testToolDepends = [ tasty-discover ];
doHaddock = false;
description = "Convert a tree of files into fixed-output derivations";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "nix-freeze-tree";
broken = true;
@@ -477960,7 +479595,7 @@ self: {
optparse-applicative
];
description = "Reify the Nix build graph into a Haskell graph data structure";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "nix-graph";
}
) { };
@@ -478004,33 +479639,52 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Parse and render .narinfo files";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "pretty-narinfo";
maintainers = [ lib.maintainers.sorki ];
}
) { };
- nix-paths = callPackage (
- {
- mkDerivation,
- base,
- nix,
- process,
- }:
- mkDerivation {
- pname = "nix-paths";
- version = "1.0.1";
- sha256 = "1y09wl1ihxmc9p926g595f70pdcsx78r3q5n5rna23lpq8xicdxb";
- libraryHaskellDepends = [
- base
- process
- ];
- libraryToolDepends = [ nix ];
- description = "Knowledge of Nix's installation directories";
- license = lib.licenses.bsd3;
- maintainers = [ lib.maintainers.peti ];
- }
- ) { inherit (pkgs) nix; };
+ nix-paths =
+ callPackage
+ (
+ {
+ mkDerivation,
+ base,
+ nix-build,
+ nix-env,
+ nix-hash,
+ nix-instantiate,
+ nix-store,
+ process,
+ }:
+ mkDerivation {
+ pname = "nix-paths";
+ version = "1.0.1";
+ sha256 = "1y09wl1ihxmc9p926g595f70pdcsx78r3q5n5rna23lpq8xicdxb";
+ libraryHaskellDepends = [
+ base
+ process
+ ];
+ libraryToolDepends = [
+ nix-build
+ nix-env
+ nix-hash
+ nix-instantiate
+ nix-store
+ ];
+ description = "Knowledge of Nix's installation directories";
+ license = lib.licenses.bsd3;
+ maintainers = [ lib.maintainers.peti ];
+ }
+ )
+ {
+ nix-build = null;
+ nix-env = null;
+ nix-hash = null;
+ nix-instantiate = null;
+ nix-store = null;
+ };
nix-serve-ng = callPackage (
{
@@ -478096,7 +479750,7 @@ self: {
vector
];
description = "A drop-in replacement for nix-serve that's faster and more stable";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "nix-serve";
}
) { inherit (pkgs) nix; };
@@ -478311,15 +479965,13 @@ self: {
}:
mkDerivation {
pname = "nix-tree";
- version = "0.6.3";
- sha256 = "06dzf87vckd11yiq2ng6l80rd17p920lajykn1vy2azyhivkp59j";
- isLibrary = false;
+ version = "0.7.0";
+ sha256 = "1h7klpr5km134f6393gjwnfwgpppvar56w8n7ksjw8aawy7czi0c";
+ isLibrary = true;
isExecutable = true;
- executableHaskellDepends = [
+ libraryHaskellDepends = [
aeson
- async
base
- brick
bytestring
clock
containers
@@ -478330,21 +479982,33 @@ self: {
microlens
optparse-applicative
relude
- terminal-progress-bar
text
typed-process
unordered-containers
vty
];
- testHaskellDepends = [
- aeson
+ executableHaskellDepends = [
+ async
base
brick
- bytestring
clock
containers
directory
- dot
+ filepath
+ hrfsize
+ microlens
+ optparse-applicative
+ relude
+ terminal-progress-bar
+ text
+ typed-process
+ vty
+ ];
+ testHaskellDepends = [
+ base
+ clock
+ containers
+ directory
filepath
hedgehog
hrfsize
@@ -478353,11 +480017,10 @@ self: {
relude
text
typed-process
- unordered-containers
vty
];
description = "Interactively browse a Nix store paths dependencies";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "nix-tree";
maintainers = [ lib.maintainers.utdemir ];
}
@@ -478740,7 +480403,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Tool for semi-automatic updating of nixpkgs repository";
- license = lib.licenses.cc0;
+ license = lib.licensesSpdx."CC0-1.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "nixpkgs-update";
broken = true;
@@ -478784,7 +480447,7 @@ self: {
];
doHaddock = false;
description = "Nkeys ed25519 encoding for use with NATS";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -479102,7 +480765,7 @@ self: {
doctest
];
description = "A GHC plugin to remove support for recursion";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
maintainers = [ lib.maintainers.sellout ];
}
) { };
@@ -479861,7 +481524,7 @@ self: {
utility-ht
];
description = "List-like structures with static restrictions on the number of elements";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -480158,7 +481821,7 @@ self: {
hedgehog-classes
];
description = "nonempty structure";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -480193,7 +481856,7 @@ self: {
vector
];
description = "Non-empty vectors";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -480222,7 +481885,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Create NonEmpty version of any container";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -480257,7 +481920,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "aeson instances for 'NonEmpty'";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -480278,7 +481941,7 @@ self: {
QuickCheck
];
description = "QuickCheck instance for 'NonEmpty'";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -480301,7 +481964,7 @@ self: {
text
];
description = "'NonEmpty' wrappers for text";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -480783,7 +482446,7 @@ self: {
transformers
];
description = "An opinionated Prelude replacement library";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -480860,7 +482523,7 @@ self: {
tasty-hedgehog
];
description = "Examine values for unexpected thunks";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -480977,7 +482640,7 @@ self: {
];
libraryToolDepends = [ c2hs ];
description = "Haskell binding to Notmuch, the mail indexer";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
}
)
{
@@ -482051,7 +483714,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Efficient, infinite-precision 2D and 3D spatial containers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -482491,7 +484154,7 @@ self: {
tasty-bench
];
description = "Create number walls and save them as images";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -483012,7 +484675,7 @@ self: {
utility-ht
];
description = "An experimental alternative hierarchy of numeric type classes";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -483174,7 +484837,7 @@ self: {
vector
];
description = "core package for Numerical Haskell project";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -483194,7 +484857,7 @@ self: {
system-cxx-std-lib
];
description = "Numerical integration";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -483228,7 +484891,7 @@ self: {
QuickCheck
];
description = "A numeric class hierarchy";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -483253,7 +484916,7 @@ self: {
vector
];
description = "Multi-dimensional arrays";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -483288,7 +484951,7 @@ self: {
numhask
];
description = "numerical free algebras";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -483321,7 +484984,7 @@ self: {
numhask-prelude
];
description = "Laws and tests for numhask";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -483377,7 +485040,7 @@ self: {
];
testHaskellDepends = [ doctest ];
description = "A numeric prelude";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -483459,7 +485122,7 @@ self: {
doctest-parallel
];
description = "Numerical spaces";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -483666,6 +485329,8 @@ self: {
pname = "nvfetcher";
version = "0.7.0.0";
sha256 = "0idcca3g1rfm8rc7zy68pdbhv4s0npdzdb47ixj0hk2pr8rg51ak";
+ revision = "1";
+ editedCabalFile = "0pkcsb97x64fnrrs93l73k1yydrnswh8drwdab90c4ac9wjjxvk8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -483746,7 +485411,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Generate nix sources expr for the latest version of packages";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "nvfetcher";
maintainers = [ lib.maintainers.berberman ];
}
@@ -483840,7 +485505,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Haskell plugin backend for neovim";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -484325,7 +485990,7 @@ self: {
markdown-unlit
];
description = "Type-safe time library";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "play-o-clock";
broken = true;
@@ -484340,8 +486005,8 @@ self: {
}:
mkDerivation {
pname = "oalg-abg";
- version = "1.0.0.0";
- sha256 = "14qi1ypsrnngpc1j5vqn6l5nccc23k95h9cn9s9fpcmqcy8czlf0";
+ version = "2.0.0.0";
+ sha256 = "0rs1w1nxm1n6bplkz5krcjfs8jdp7k3fsgckwbg0332q939513mr";
libraryHaskellDepends = [
base
oalg-base
@@ -484352,7 +486017,6 @@ self: {
];
description = "Finitely generated abelian groups";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}
) { };
@@ -484367,8 +486031,8 @@ self: {
}:
mkDerivation {
pname = "oalg-base";
- version = "1.1.4.0";
- sha256 = "0i76n1pvak51bnkrq6m4nirzpnmqqclr6wk00vmws3c90w3dm6xm";
+ version = "3.0.0.0";
+ sha256 = "1hd1884i0qfld1vfpjq5sc7ss3wl2cimsvfxdhcg0y2v4zyxm4z1";
libraryHaskellDepends = [
array
base
@@ -484385,8 +486049,6 @@ self: {
];
description = "Algebraic structures on oriented entities and limits as a tool kit to solve algebraic problems";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}
) { };
@@ -484550,7 +486212,7 @@ self: {
tasty-bench
];
description = "Composable concurrent computation done right";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -484782,7 +486444,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Live in-memory sync of Obsidian Markdown notes";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -484876,7 +486538,7 @@ self: {
text
];
description = "Ordered Reduced Binary Decision Diagrams";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -484920,6 +486582,7 @@ self: {
doHaddock = false;
description = "Oberon0 Compiler";
license = "LGPL";
+ hydraPlatforms = lib.platforms.none;
}
) { };
@@ -485029,7 +486692,7 @@ self: {
witherable
];
description = "Composable objects";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -485214,7 +486877,7 @@ self: {
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "Object capability based IO";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -486074,7 +487737,7 @@ self: {
}
) { };
- ogma-cli_1_9_0 = callPackage (
+ ogma-cli_1_10_0 = callPackage (
{
mkDerivation,
aeson,
@@ -486091,8 +487754,8 @@ self: {
}:
mkDerivation {
pname = "ogma-cli";
- version = "1.9.0";
- sha256 = "0br6rv5bli12xhbr8igxgwrp3j4cbm8mxqhva6mxykg6s2s19wab";
+ version = "1.10.0";
+ sha256 = "1fli4xhdrzbzkwjidz5piif4hs0zscw4rs6z30d9gb2zf4kl5h4z";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -486112,7 +487775,7 @@ self: {
unix
];
description = "Ogma: Helper tool to interoperate between Copilot and other languages";
- license = "unknown";
+ license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
mainProgram = "ogma";
}
@@ -486190,7 +487853,7 @@ self: {
}
) { };
- ogma-core_1_9_0 = callPackage (
+ ogma-core_1_10_0 = callPackage (
{
mkDerivation,
aeson,
@@ -486222,8 +487885,8 @@ self: {
}:
mkDerivation {
pname = "ogma-core";
- version = "1.9.0";
- sha256 = "1nh0qnb84sy0qwks1fpyvz7i7sini5sqk1a7na82axw5jkhjdhrg";
+ version = "1.10.0";
+ sha256 = "010bdip18i0vkhkg2yp1yb4691przni612nwfjz8wrcdxgxvnpz0";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson
@@ -486258,7 +487921,7 @@ self: {
test-framework-quickcheck2
];
description = "Ogma: Helper tool to interoperate between Copilot and other languages";
- license = "unknown";
+ license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -486303,7 +487966,7 @@ self: {
}
) { };
- ogma-extra_1_9_0 = callPackage (
+ ogma-extra_1_10_0 = callPackage (
{
mkDerivation,
aeson,
@@ -486320,8 +487983,8 @@ self: {
}:
mkDerivation {
pname = "ogma-extra";
- version = "1.9.0";
- sha256 = "0cl4gfkkms75p1yl137dlpfivqqgc491dmh55iwagqszkgaix0lg";
+ version = "1.10.0";
+ sha256 = "0y2jmqnw1nfai225nl9x37klwynrwl2yz1352zix709cc0spma8i";
libraryHaskellDepends = [
aeson
base
@@ -486339,7 +488002,7 @@ self: {
test-framework-quickcheck2
];
description = "Ogma: Helper tool to interoperate between Copilot and other languages";
- license = "unknown";
+ license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -486387,7 +488050,7 @@ self: {
}
) { };
- ogma-language-c_1_9_0 = callPackage (
+ ogma-language-c_1_10_0 = callPackage (
{
mkDerivation,
alex,
@@ -486403,8 +488066,8 @@ self: {
}:
mkDerivation {
pname = "ogma-language-c";
- version = "1.9.0";
- sha256 = "1s6acmdbvqzhdjd67vlsc0y5ld4s7z0w5g35ka3d6sqk4sj0j795";
+ version = "1.10.0";
+ sha256 = "0gamqxl9ajw1fnywx9wkip86xh6b9pgc6l5f80lvkw486g1qp5qf";
setupHaskellDepends = [
base
Cabal
@@ -486426,7 +488089,7 @@ self: {
test-framework-quickcheck2
];
description = "Ogma: Runtime Monitor translator: C Language Frontend";
- license = "unknown";
+ license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -486482,15 +488145,15 @@ self: {
}
) { };
- ogma-language-copilot_1_9_0 = callPackage (
+ ogma-language-copilot_1_10_0 = callPackage (
{ mkDerivation, base }:
mkDerivation {
pname = "ogma-language-copilot";
- version = "1.9.0";
- sha256 = "0sl2n2m1nkllmzrb2av6s1q1iq7jz9zrjh5mxczriwk3c1jv7x2c";
+ version = "1.10.0";
+ sha256 = "14zx4n9xqd36rn8s6akv5f2rlpvamlg4704n0c0yg2zs6n95zxlw";
libraryHaskellDepends = [ base ];
description = "Ogma: Runtime Monitor translator: Copilot Language Endpoints";
- license = "unknown";
+ license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -486524,7 +488187,7 @@ self: {
}
) { };
- ogma-language-csv_1_9_0 = callPackage (
+ ogma-language-csv_1_10_0 = callPackage (
{
mkDerivation,
base,
@@ -486537,8 +488200,8 @@ self: {
}:
mkDerivation {
pname = "ogma-language-csv";
- version = "1.9.0";
- sha256 = "0mkkbgia5dvnpqy11pqxvikjvgck0zq7cx1alnsh6hi9j1qj75ad";
+ version = "1.10.0";
+ sha256 = "0j8w9r1618lqv922mdadvhgfyqjhmbh84giz8jwlx7dmqzk28a88";
libraryHaskellDepends = [
base
bytestring
@@ -486549,7 +488212,7 @@ self: {
vector
];
description = "Ogma: Runtime Monitor translator: CSV Frontend";
- license = "unknown";
+ license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -486659,7 +488322,7 @@ self: {
}
) { };
- ogma-language-jsonspec_1_9_0 = callPackage (
+ ogma-language-jsonspec_1_10_0 = callPackage (
{
mkDerivation,
aeson,
@@ -486673,8 +488336,8 @@ self: {
}:
mkDerivation {
pname = "ogma-language-jsonspec";
- version = "1.9.0";
- sha256 = "0wlkl13gg0jbi8fvszk4z1l0c4l7b0n68gnhnmn93srcn14iinkn";
+ version = "1.10.0";
+ sha256 = "1f9ha1jbg3pgyjhjwdf6xyiwsmca29pgpg0zk2gljmw9q7ry4b9i";
libraryHaskellDepends = [
aeson
base
@@ -486686,7 +488349,7 @@ self: {
text
];
description = "Ogma: Runtime Monitor translator: JSON Frontend";
- license = "unknown";
+ license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -486734,7 +488397,7 @@ self: {
}
) { };
- ogma-language-lustre_1_9_0 = callPackage (
+ ogma-language-lustre_1_10_0 = callPackage (
{
mkDerivation,
alex,
@@ -486750,8 +488413,8 @@ self: {
}:
mkDerivation {
pname = "ogma-language-lustre";
- version = "1.9.0";
- sha256 = "0rb22md683flgxkg08jzga4q7fynykzh25k1gcr6rsj0kaaxi4fj";
+ version = "1.10.0";
+ sha256 = "12s58r5g9q9c4jmwck97w8ff6567ncyh1kclvw0mcqpgk09cpvk2";
setupHaskellDepends = [
base
Cabal
@@ -486773,7 +488436,7 @@ self: {
test-framework-quickcheck2
];
description = "Ogma: Runtime Monitor translator: Lustre Language Frontend";
- license = "unknown";
+ license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -486821,7 +488484,7 @@ self: {
}
) { };
- ogma-language-smv_1_9_0 = callPackage (
+ ogma-language-smv_1_10_0 = callPackage (
{
mkDerivation,
alex,
@@ -486837,8 +488500,8 @@ self: {
}:
mkDerivation {
pname = "ogma-language-smv";
- version = "1.9.0";
- sha256 = "15dsh5j6iaapaxi6i05z44shvbxvs5945r93046d6shxvxz5q5gb";
+ version = "1.10.0";
+ sha256 = "0cq0kdipn79wvhpfx51w52c78djki7dn7c12dl93w585r6f0spzp";
setupHaskellDepends = [
base
Cabal
@@ -486860,7 +488523,7 @@ self: {
test-framework-quickcheck2
];
description = "Ogma: Runtime Monitor translator: SMV Language Frontend";
- license = "unknown";
+ license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -486890,7 +488553,7 @@ self: {
}
) { };
- ogma-language-xlsx_1_9_0 = callPackage (
+ ogma-language-xlsx_1_10_0 = callPackage (
{
mkDerivation,
base,
@@ -486901,8 +488564,8 @@ self: {
}:
mkDerivation {
pname = "ogma-language-xlsx";
- version = "1.9.0";
- sha256 = "191s4kc2gicgrdl3jzw9j31l0yncaradii2vz7h3gqg2rz63qfsv";
+ version = "1.10.0";
+ sha256 = "0n9i60kdm8blazgpq2swsdnpjryig6w7kykb9gws7hhlg5m16vkx";
libraryHaskellDepends = [
base
bytestring
@@ -486911,7 +488574,7 @@ self: {
xlsx
];
description = "Ogma: Runtime Monitor translator: XLSX Frontend";
- license = "unknown";
+ license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -486945,7 +488608,7 @@ self: {
}
) { };
- ogma-language-xmlspec_1_9_0 = callPackage (
+ ogma-language-xmlspec_1_10_0 = callPackage (
{
mkDerivation,
base,
@@ -486958,8 +488621,8 @@ self: {
}:
mkDerivation {
pname = "ogma-language-xmlspec";
- version = "1.9.0";
- sha256 = "07cp3d543pnbmb7qma8l9v1zfnh3nn41azl1clv8p9bsfgm5a86j";
+ version = "1.10.0";
+ sha256 = "091b8gp7z0hnmcfzx5id3sybp87598zzhbhjw1nmhkszphyd2y7z";
libraryHaskellDepends = [
base
hxt
@@ -486970,7 +488633,7 @@ self: {
pretty
];
description = "Ogma: Runtime Monitor translator: XML Frontend";
- license = "unknown";
+ license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -486987,15 +488650,15 @@ self: {
}
) { };
- ogma-spec_1_9_0 = callPackage (
+ ogma-spec_1_10_0 = callPackage (
{ mkDerivation, base }:
mkDerivation {
pname = "ogma-spec";
- version = "1.9.0";
- sha256 = "1vg67wg2px1lp89m29h1dyy4cqgpxq5yfsdq6kg63b0i8dlv71g8";
+ version = "1.10.0";
+ sha256 = "078npma0dkqlhwiqw75s9q6k3c4h2m6g4v1wpxgj1n9laz4bf1nn";
libraryHaskellDepends = [ base ];
description = "Ogma: Runtime Monitor translator: JSON Frontend";
- license = "unknown";
+ license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -487082,7 +488745,7 @@ self: {
xml-types
];
description = "An Entity-Component-Systems engine core";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -487414,8 +489077,8 @@ self: {
}:
mkDerivation {
pname = "ollama-haskell";
- version = "0.2.0.0";
- sha256 = "00vgffjzhyc060x59gxrqazzclkm3bspmvzva5kc2c2319l93wy8";
+ version = "0.2.1.0";
+ sha256 = "0xs28lq5x7bc5qf35n2g2vnchvy0fw88yg0qvv4fl7swf15wdr0i";
libraryHaskellDepends = [
aeson
base
@@ -487484,7 +489147,9 @@ self: {
text
];
description = "A typed-hole plugin that uses LLMs to generate valid hole-fits";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -487593,7 +489258,7 @@ self: {
text
];
description = "om-doh";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -487632,7 +489297,7 @@ self: {
wai
];
description = "Haskell utilities for building embedded Elm programs";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -487655,7 +489320,7 @@ self: {
transformers
];
description = "Monad transformer providing MonadFail";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -487696,7 +489361,7 @@ self: {
unliftio
];
description = "Concurrency utilities";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -487757,7 +489422,7 @@ self: {
warp
];
description = "Http utilities";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -487820,7 +489485,7 @@ self: {
warp
];
description = "Http utilities";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -487898,7 +489563,7 @@ self: {
x509-store
];
description = "om-kubernetes";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -487968,7 +489633,7 @@ self: {
uuid
];
description = "Legion Framework";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -488001,7 +489666,7 @@ self: {
time
];
description = "Opinionated logging utilities";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -488026,7 +489691,7 @@ self: {
time
];
description = "Plugin-based explicit import generation";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -488049,7 +489714,7 @@ self: {
text
];
description = "Utilities for showing string-like things";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -488113,7 +489778,7 @@ self: {
unliftio-core
];
description = "Socket utilities";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -488140,7 +489805,7 @@ self: {
transformers
];
description = "Misc. time utilites";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -488525,7 +490190,7 @@ self: {
text
];
description = "Pretty-printing short Aeson values as text";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -488657,7 +490322,7 @@ self: {
torsor
];
description = "HMAC-Based and Time-Based One-Time Passwords";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "one-time-password";
}
) { };
@@ -488743,7 +490408,7 @@ self: {
numhask
];
description = "See readme.md";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -488786,7 +490451,7 @@ self: {
numhask-prelude
];
description = "See readme.md";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -488915,7 +490580,7 @@ self: {
hspec-discover
];
description = "Combinators for handling errors of many types in a composable way";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -488944,7 +490609,7 @@ self: {
transformers
];
description = "Oops examples";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -488967,7 +490632,7 @@ self: {
doctest
];
description = "Common operators encouraging large-scale easy reading";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -489198,7 +490863,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Text search utilities for Opaleye";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -489339,7 +491004,7 @@ self: {
xml-parser
];
description = "OPC XML-DA Client";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -489658,7 +491323,7 @@ self: {
witness
];
description = "open witnesses";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -489673,6 +491338,7 @@ self: {
http-api-data,
http-client,
http-client-tls,
+ http-types,
servant,
servant-client,
servant-multipart-api,
@@ -489681,12 +491347,13 @@ self: {
tasty-hunit,
text,
time,
+ unordered-containers,
vector,
}:
mkDerivation {
pname = "openai";
- version = "1.1.1";
- sha256 = "18ny5r06nfs7px4bgr9k930w1v5ksbzc1vslx75y4bb1lndg3ipd";
+ version = "2.1.0";
+ sha256 = "07v6qwp32i6dmxavlcx1kg2jp4lcmp8ah4bf0q55ldbd4b1mc88q";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -489698,12 +491365,14 @@ self: {
http-api-data
http-client
http-client-tls
+ http-types
servant
servant-client
servant-multipart-api
servant-multipart-client
text
time
+ unordered-containers
vector
];
executableHaskellDepends = [
@@ -489724,7 +491393,7 @@ self: {
text
];
description = "Servant bindings to OpenAI";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -489925,7 +491594,7 @@ self: {
warp
];
description = "Auto-generated API bindings for openai";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -490342,7 +492011,7 @@ self: {
];
librarySystemDepends = [ opencascade-occt ];
description = "Thin Wrapper for the OpenCASCADE CAD Kernel";
- license = lib.licenses.lgpl21Only;
+ license = lib.licensesSpdx."LGPL-2.1-only";
}
) { inherit (pkgs) opencascade-occt; };
@@ -490376,7 +492045,7 @@ self: {
transformers
];
description = "OpenCC bindings";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -490683,7 +492352,7 @@ self: {
libraryPkgconfigDepends = [ opendht-c ];
libraryToolDepends = [ c2hs ];
description = "Haskell bindings for OpenDHT";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -491049,7 +492718,7 @@ self: {
unordered-containers
];
description = "An OpenID Connect library that does all the heavy lifting for you";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -491509,7 +493178,7 @@ self: {
ghc-trace-events
hashable
];
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -491625,7 +493294,7 @@ self: {
opentelemetry
tasty-bench
];
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -491651,7 +493320,7 @@ self: {
opentelemetry
text
];
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -491721,7 +493390,7 @@ self: {
typed-process
unordered-containers
];
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "eventlog-to-lightstep";
}
@@ -491764,7 +493433,7 @@ self: {
unordered-containers
];
description = "GHC plugin for open telemetry";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -491790,7 +493459,7 @@ self: {
text
wai
];
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -492319,7 +493988,7 @@ self: {
vinyl
];
description = "OpenTracing for Haskell";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -492346,7 +494015,7 @@ self: {
text
];
description = "OpenTracing instrumentation of http-client";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -492395,7 +494064,7 @@ self: {
vector-instances
];
description = "Jaeger backend for OpenTracing";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -492421,7 +494090,7 @@ self: {
wai
];
description = "Middleware adding OpenTracing tracing for WAI applications";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -492444,7 +494113,7 @@ self: {
text
];
description = "Zipkin OpenTracing Backend Commons";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -492491,7 +494160,7 @@ self: {
vector-instances
];
description = "Zipkin V1 backend for OpenTracing";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -492529,7 +494198,7 @@ self: {
text
];
description = "Zipkin V2 backend for OpenTracing";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -492800,7 +494469,7 @@ self: {
text-builder-linear
];
description = "Stack-based esoteric programming language";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
mainProgram = "oplang";
broken = true;
@@ -493000,6 +494669,58 @@ self: {
}
) { };
+ opt-env-conf_0_11_0_0 = 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.11.0.0";
+ sha256 = "0krkdybvd3lkjmb6f3x5nmkqh4n025wz5qwmxr34y95ynr36393j";
+ 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;
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
opt-env-conf-test = callPackage (
{
mkDerivation,
@@ -493129,7 +494850,7 @@ self: {
vector
];
description = "Optics as an abstract interface";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.maralorn ];
}
) { };
@@ -493159,7 +494880,7 @@ self: {
transformers
];
description = "Optics as an abstract interface: core definitions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -493202,7 +494923,7 @@ self: {
vector
];
description = "Extra utilities and instances for optics-core";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -493275,7 +494996,7 @@ self: {
tagged
];
description = "Optics construction using TemplateHaskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -493332,7 +495053,7 @@ self: {
rerebase
];
description = "Simple command line interface arguments parser";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -493361,7 +495082,7 @@ self: {
time
];
description = "Command-line arguments parsing for Hasql";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -493576,7 +495297,7 @@ self: {
];
doHaddock = false;
description = "Powerful and easy command-line option parser";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -493722,7 +495443,7 @@ self: {
text
];
description = "Extra functions for working with optparse-applicative";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -493775,7 +495496,7 @@ self: {
mtl
];
description = "Declarative command line option parser";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -493965,7 +495686,7 @@ self: {
text
];
description = "Like `optparse-generic`, but with `TemplateHaskell` for faster builds";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -494049,7 +495770,7 @@ self: {
microlens
];
description = "Bindings to libopus for the Opus audio codec";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -494363,7 +496084,7 @@ self: {
sha256 = "1fgzxlz2rynscnic1jawvrymhp70wxq04lpvp0ls84ky90zyzak8";
libraryHaskellDepends = [ base ];
description = "Axiomata & lemmata for easier use of Data.Type.Ord";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -494536,7 +496257,7 @@ self: {
sha256 = "1na61sq78r190lcn4lw437mj5wcdq9p53zn3vbz16w3b1vwdwfii";
libraryHaskellDepends = [ base ];
description = "Utilities for Orderings";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -494742,7 +496463,7 @@ self: {
time
];
description = "Parser for Emacs org-mode files";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -494771,7 +496492,7 @@ self: {
text
];
description = "Lucid integration for org-mode";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -494828,7 +496549,7 @@ self: {
time
];
description = "Parser for Org Mode documents";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -495261,94 +496982,6 @@ self: {
}
) { };
- ormolu_0_5_2_0 = callPackage (
- {
- mkDerivation,
- ansi-terminal,
- array,
- base,
- binary,
- bytestring,
- Cabal-syntax,
- containers,
- Diff,
- directory,
- dlist,
- file-embed,
- filepath,
- ghc-lib-parser,
- gitrev,
- hspec,
- hspec-discover,
- hspec-megaparsec,
- megaparsec,
- MemoTrie,
- mtl,
- optparse-applicative,
- path,
- path-io,
- QuickCheck,
- syb,
- temporary,
- text,
- }:
- mkDerivation {
- pname = "ormolu";
- version = "0.5.2.0";
- sha256 = "1ai2wza4drirvf9pb7qsf03kii5jiayqs49c19ir93jd0ak9pi96";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- ansi-terminal
- array
- base
- binary
- bytestring
- Cabal-syntax
- containers
- Diff
- directory
- dlist
- file-embed
- filepath
- ghc-lib-parser
- megaparsec
- MemoTrie
- mtl
- syb
- text
- ];
- executableHaskellDepends = [
- base
- containers
- filepath
- ghc-lib-parser
- gitrev
- optparse-applicative
- text
- ];
- testHaskellDepends = [
- base
- containers
- directory
- filepath
- ghc-lib-parser
- hspec
- hspec-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_7_2_0 = callPackage (
{
mkDerivation,
@@ -495435,7 +497068,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "A formatter for Haskell source code";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "ormolu";
}
@@ -495529,7 +497162,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "A formatter for Haskell source code";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "ormolu";
}
@@ -495569,8 +497202,8 @@ self: {
}:
mkDerivation {
pname = "ormolu";
- version = "0.8.0.1";
- sha256 = "12ix16zvz0i1i8yyhbfbv4r0735r2i2darkbz3jh7lfd1fgh6zs3";
+ version = "0.8.0.2";
+ sha256 = "1fh2m4sy8vzxvm1qm9413apzblqf4sla3454mx64ngkwx0pgi2ad";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -495624,7 +497257,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "A formatter for Haskell source code";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "ormolu";
}
) { };
@@ -495645,8 +497278,8 @@ self: {
}:
mkDerivation {
pname = "orthotope";
- version = "0.1.7.1";
- sha256 = "1g2hh8q035mnb7zwfhhsj2la8j96aab52lns6iqlj5ds6rmpvzrg";
+ version = "0.1.7.2";
+ sha256 = "0jj5wfbkgi8q28j9liaj1s52j71rd9nx8sh0vkiavaqcik7a81xs";
libraryHaskellDepends = [
base
deepseq
@@ -495896,7 +497529,7 @@ self: {
warp
];
description = "API bindings for Ory Kratos";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -495946,21 +497579,7 @@ self: {
text
];
description = "/etc/os-release helpers";
- license = lib.licenses.bsd3;
- }
- ) { };
-
- 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;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -496003,7 +497622,7 @@ self: {
tasty-bench
];
description = "Library for manipulating Operating system strings";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -496339,7 +497958,7 @@ self: {
tasty-hunit
];
description = "Open Source Vulnerability format";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -496562,7 +498181,7 @@ self: {
text
];
description = "A library to test programs that output text";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -496823,7 +498442,7 @@ self: {
];
doHaddock = false;
description = "Overloaded pragmas as a plugin";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -496980,7 +498599,7 @@ self: {
];
doHaddock = false;
description = "An efficient CPU-based multidimensional array (tensor) library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -497003,7 +498622,7 @@ self: {
pa-prelude
];
description = "Collect a tree of errors and pretty-print";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -497044,7 +498663,7 @@ self: {
time
];
description = "“Vertical” parsing of values";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -497093,7 +498712,7 @@ self: {
vector
];
description = "Our JSON parsers/encoders";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -497106,7 +498725,7 @@ self: {
sha256 = "03y2cn6yy06xcpnjs5zc8hd8iba4k44wrrncl7ksplg8j3iank1x";
libraryHaskellDepends = [ base ];
description = "Labels, and labelled tuples and enums (GHC >9.2)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -497155,7 +498774,7 @@ self: {
vector
];
description = "The Possehl Analytics Prelude";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -497186,7 +498805,7 @@ self: {
text
];
description = "Some pretty-printing helpers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -497213,7 +498832,7 @@ self: {
typed-process
];
description = "Helper functions for spawning subprocesses";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -497350,7 +498969,7 @@ self: {
text
];
description = "A package for retrieving a package's version number";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -497556,7 +499175,7 @@ self: {
split
vector
];
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "examples";
broken = true;
@@ -497956,7 +499575,7 @@ self: {
];
doHaddock = false;
description = "Time Library for Pact";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -498025,7 +499644,7 @@ self: {
time
];
description = "API to the Paddle payment processor";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -498638,7 +500257,7 @@ self: {
strict
];
description = "Finding palindromes in strings";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "palindromes";
}
) { };
@@ -498660,7 +500279,7 @@ self: {
librarySystemDepends = [ pam ];
libraryToolDepends = [ c2hs ];
description = "Haskell binding for C PAM API";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
badPlatforms = lib.platforms.darwin;
}
) { inherit (pkgs) pam; };
@@ -498743,7 +500362,7 @@ self: {
primitive
];
description = "Parse syslog traffic from PAN-OS";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "pan-os-syslog-to-avro";
broken = true;
@@ -499007,7 +500626,7 @@ self: {
];
doHaddock = false;
description = "Conversion between markup formats";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
maintainers = [
lib.maintainers.maralorn
lib.maintainers.sternenseemann
@@ -499015,7 +500634,7 @@ self: {
}
) { };
- pandoc_3_8 = callPackage (
+ pandoc_3_8_2_1 = callPackage (
{
mkDerivation,
aeson,
@@ -499101,8 +500720,8 @@ self: {
}:
mkDerivation {
pname = "pandoc";
- version = "3.8";
- sha256 = "1yj2v60acr1v0x82jqvikdw30qs216g1975kkdxr7hbcrazd7agn";
+ version = "3.8.2.1";
+ sha256 = "1vcdsg9d53bripgizwf2plaxiqlz3yslid78rdv5pn125m9qdhnf";
configureFlags = [ "-f-trypandoc" ];
enableSeparateDataOutput = true;
libraryHaskellDepends = [
@@ -499213,7 +500832,7 @@ self: {
];
doHaddock = false;
description = "Conversion between markup formats";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
hydraPlatforms = lib.platforms.none;
maintainers = [
lib.maintainers.maralorn
@@ -499243,7 +500862,7 @@ self: {
text
];
description = "A monadic DSL for building pandoc documents";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -499426,13 +501045,13 @@ self: {
warp
];
description = "Conversion between documentation formats";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
mainProgram = "pandoc";
maintainers = [ lib.maintainers.maralorn ];
}
) { };
- pandoc-cli_3_8 = callPackage (
+ pandoc-cli_3_8_2_1 = callPackage (
{
mkDerivation,
base,
@@ -499448,8 +501067,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-cli";
- version = "3.8";
- sha256 = "0zhlsbj3k1dgxy382gxsdjnzg6p34llfs8y9v3ahxvyxsgfv5hwq";
+ version = "3.8.2.1";
+ sha256 = "0c6bi9837mcarr7n888zl3hl0makx8ghw51r30v3isdjjvf3x2p3";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -499465,7 +501084,7 @@ self: {
warp
];
description = "Conversion between documentation formats";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "pandoc";
maintainers = [ lib.maintainers.maralorn ];
@@ -499495,7 +501114,7 @@ self: {
pandoc-types
];
description = "A pandoc filter that provides a Markdown extension for columns";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "pandoc-columns";
broken = true;
@@ -499534,6 +501153,8 @@ self: {
pname = "pandoc-crossref";
version = "0.3.21";
sha256 = "1srfkh987jx3ha8p5yrvy4pxkkypcajb4wvzbnf8sbd4wc2vichh";
+ revision = "2";
+ editedCabalFile = "1j9s9r6xmw8wq48y73q6w87v92wc5p9va38k5csy28hyix9xf32i";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -499596,6 +501217,101 @@ self: {
}
) { };
+ pandoc-crossref_0_3_22 = 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.22";
+ sha256 = "1vjypnw1w6a0m5yls7965xmi71g4fw0j7a0w1p7ygxf6anvcxi0i";
+ 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
+ microlens-mtl
+ 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;
+ hydraPlatforms = lib.platforms.none;
+ mainProgram = "pandoc-crossref";
+ }
+ ) { };
+
pandoc-csv2table = callPackage (
{
mkDerivation,
@@ -499991,7 +501707,7 @@ self: {
pandoc-types
];
description = "Pandoc filter to include files, with image path and heading level adjustment";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "pandoc-include-plus";
broken = true;
@@ -500092,7 +501808,7 @@ self: {
pandoc-types
];
description = "A pandoc filter that provides a Markdown extension to wrap text in table cells";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "pandoc-linear-table";
broken = true;
@@ -500120,7 +501836,7 @@ self: {
text
];
description = "Extract \"contextual links\" from Pandoc";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -500149,7 +501865,7 @@ self: {
pandoc-types
];
description = "A pandoc filter that provides a Markdown extension for logic proofs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "pandoc-logic-proof";
broken = true;
@@ -500241,11 +501957,11 @@ self: {
text
];
description = "Lua engine to power custom pandoc conversions";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
}
) { };
- pandoc-lua-engine_0_5 = callPackage (
+ pandoc-lua-engine_0_5_0_1 = callPackage (
{
mkDerivation,
aeson,
@@ -500282,8 +501998,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-lua-engine";
- version = "0.5";
- sha256 = "0za5xp1q996bpydkz73779gp5mxlq1a5spk4cz5rsckc18cf11xc";
+ version = "0.5.0.1";
+ sha256 = "1hcscazl4s2cm6wmimjjqax53rbwqij7cphs72f04sqry54802fn";
libraryHaskellDepends = [
aeson
base
@@ -500328,7 +502044,7 @@ self: {
text
];
description = "Lua engine to power custom pandoc conversions";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -500389,7 +502105,7 @@ self: {
text
];
description = "Use pandoc types in Lua";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -500635,7 +502351,7 @@ self: {
text
];
description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
mainProgram = "pandoc-plot";
}
) { };
@@ -500745,7 +502461,7 @@ self: {
text
];
description = "Pandoc filter to extract only the links";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -500770,7 +502486,7 @@ self: {
pandoc-types
];
description = "Pandoc filter to extract only the code blocks";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "pandoc-select-code";
broken = true;
@@ -500818,7 +502534,7 @@ self: {
wai-cors
];
description = "Pandoc document conversion as an HTTP servant-server";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
}
) { };
@@ -500863,7 +502579,7 @@ self: {
wai-cors
];
description = "Pandoc document conversion as an HTTP servant-server";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -501043,8 +502759,8 @@ self: {
pname = "pandoc-types";
version = "1.23.1";
sha256 = "1hd18l1c5yh7x24gsligkbraadq12hn7mim16xyjnicdsa1s03xd";
- revision = "3";
- editedCabalFile = "0w2n4vzxs3jasrivaq49clxdlccnfv2gh4mkp8s7krxa1arambrz";
+ revision = "4";
+ editedCabalFile = "1slrkh9q4vcpsw4dxs8lznh7gxbvp27a3xqpxpyvzahjrlaqm45q";
libraryHaskellDepends = [
aeson
base
@@ -501077,7 +502793,7 @@ self: {
text
];
description = "Types for representing a structured document";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -501288,7 +503004,7 @@ self: {
base
];
description = "Merge environment variables and command line options generically";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -501377,7 +503093,7 @@ self: {
];
libraryPkgconfigDepends = [ pango ];
description = "Binding to the Pango text rendering engine";
- license = lib.licenses.lgpl21Only;
+ license = lib.licensesSpdx."LGPL-2.1-only";
}
) { inherit (pkgs) pango; };
@@ -501807,7 +503523,7 @@ self: {
}
) { };
- pantry_0_11_1 = callPackage (
+ pantry_0_11_2 = callPackage (
{
mkDerivation,
aeson,
@@ -501868,8 +503584,8 @@ self: {
}:
mkDerivation {
pname = "pantry";
- version = "0.11.1";
- sha256 = "1qgmxfv74qqyn26x06gnx71ms8k0fiijlpz55k08yn8bcr05phzr";
+ version = "0.11.2";
+ sha256 = "0zlr88489c3gi00ck7yi3zxq1jp0niamgfk3d5b9qkv3zqdvx83z";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -503009,7 +504725,7 @@ self: {
validators
];
description = "ParDual class for Parallel <-> Sequential";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -503143,6 +504859,30 @@ self: {
}
) { };
+ parallel_3_3_0_0 = callPackage (
+ {
+ mkDerivation,
+ array,
+ base,
+ containers,
+ deepseq,
+ }:
+ mkDerivation {
+ pname = "parallel";
+ version = "3.3.0.0";
+ sha256 = "148pakbn546a16fhwrl8n7fzywcy307d6bx7g9jvz3lfimvixhj7";
+ libraryHaskellDepends = [
+ array
+ base
+ containers
+ deepseq
+ ];
+ description = "Parallel programming library";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
parallel-io = callPackage (
{
mkDerivation,
@@ -503347,7 +505087,7 @@ self: {
tasty-hunit
];
description = "Classes and data structures for working with data-kind indexed types";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -503366,7 +505106,7 @@ self: {
transformers
];
description = "A known-parametric Functor typeclass";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -503643,7 +505383,7 @@ self: {
happy
];
description = "Examples to accompany the book \"Parallel and Concurrent Programming in Haskell\"";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -503743,7 +505483,7 @@ self: {
text
];
description = "A quick-and-dirty, low-friction benchmark tool with immediate feedback";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -503794,7 +505534,7 @@ self: {
protolude
];
description = "Help Manage project specific documentation";
- license = lib.licenses.agpl3Only;
+ license = lib.licensesSpdx."AGPL-3.0-only";
hydraPlatforms = lib.platforms.none;
mainProgram = "parochial";
broken = true;
@@ -503920,7 +505660,7 @@ self: {
transformers
];
description = "Parsable and Printable classes";
- license = lib.licenses.agpl3Only;
+ license = lib.licensesSpdx."AGPL-3.0-only";
}
) { };
@@ -503951,7 +505691,7 @@ self: {
tasty-quickcheck
];
description = "Test functions for the parsable package";
- license = lib.licenses.agpl3Only;
+ license = lib.licensesSpdx."AGPL-3.0-only";
}
) { };
@@ -504042,7 +505782,7 @@ self: {
text
];
description = "Parse machine-readable GHC GC stats";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -504715,7 +506455,7 @@ self: {
text
];
description = "Regex based parsers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -504747,7 +506487,7 @@ self: {
regex-applicative
];
description = "Parsing library with unbiased choice and support for embedding arbitrary monad";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -505076,7 +506816,7 @@ self: {
];
testToolDepends = [ cpphs ];
description = "A fast parser combinator library backed by Typed Template Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -505139,7 +506879,7 @@ self: {
th-test-utils
];
description = "A fast parser combinator library backed by Typed Template Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -505398,7 +507138,7 @@ self: {
hedgehog
];
description = "A partial binary associative operator";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -505421,7 +507161,7 @@ self: {
partial-semigroup
];
description = "Property testing for partial semigroups using Hedgehog";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -505481,7 +507221,7 @@ self: {
hspec
];
description = "Data structure supporting partial orders";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -505594,7 +507334,7 @@ self: {
transformers-except
];
description = "Platform-Agnostic Security Tokens";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -505703,7 +507443,7 @@ self: {
random
];
description = "a simple password manager";
- license = lib.licenses.lgpl3Plus;
+ license = lib.licensesSpdx."LGPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "passman";
broken = true;
@@ -506118,7 +507858,7 @@ self: {
utf8-string
];
description = "Provides the Pasta curves: Pallas, Vesta and their field elements Fp and Fq";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "pasta-curves";
broken = true;
@@ -506217,6 +507957,8 @@ self: {
pname = "patat";
version = "0.15.2.0";
sha256 = "0r9bx8f7q1h56mf8bvz6jaqrgl9iczac9qffmaqqsnqlvzn85wfi";
+ revision = "1";
+ editedCabalFile = "0x0dkxnkpwghzpmw93b72zfy2gyl4vhnxa0h15dycvd80k54n37x";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -506553,7 +508295,7 @@ self: {
];
doHaddock = false;
description = "Support for well-typed paths";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -506725,7 +508467,7 @@ self: {
unix-compat
];
description = "Interface to ‘directory’ package for users of ‘path’";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -506799,7 +508541,7 @@ self: {
path
];
description = "A singleton wrapper for the `path` library";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -506843,7 +508585,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "A wrapper around the @path@ library, tagged with semantic name";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -506872,7 +508614,7 @@ self: {
text
];
description = "Read and write UTF-8 text files";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -506897,7 +508639,7 @@ self: {
relude
];
description = "`Data.Tree` for file paths";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -507076,7 +508818,7 @@ self: {
QuickCheck
];
description = "Type-safe replacement for System.FilePath etc";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -507179,7 +508921,7 @@ self: {
uuid
];
description = "Sentry SDK";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -507380,7 +509122,7 @@ self: {
vector
];
description = "Greatest convex majorants and least concave minorants";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
maintainers = [ lib.maintainers.dschrempf ];
}
) { };
@@ -508341,7 +510083,7 @@ self: {
tasty-hunit
];
description = "Integration over convex polytopes";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -508887,7 +510629,7 @@ self: {
hspec,
hspec-discover,
optparse-applicative,
- poppler-cpp,
+ poppler,
range,
text,
}:
@@ -508902,7 +510644,7 @@ self: {
bytestring
text
];
- libraryPkgconfigDepends = [ poppler-cpp ];
+ libraryPkgconfigDepends = [ poppler ];
executableHaskellDepends = [
aeson
ansi-wl-pprint
@@ -508922,7 +510664,7 @@ self: {
mainProgram = "pdftotext.hs";
maintainers = [ lib.maintainers.mpscholten ];
}
- ) { poppler-cpp = null; };
+ ) { inherit (pkgs) poppler; };
pdynload = callPackage (
{
@@ -509045,7 +510787,7 @@ self: {
];
testToolDepends = [ markdown-unlit ];
description = "Pear Trees: An indexed type using type-level binary numbers";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -510060,7 +511802,7 @@ self: {
transformers
];
description = "Database migration support for use in other libraries";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -510125,7 +511867,7 @@ self: {
];
benchmarkHaskellDepends = [ base ];
description = "Performance methods and monad";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "perf-explore";
}
) { };
@@ -510174,7 +511916,7 @@ self: {
vector
];
description = "analysis example using perf";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "perf-examples";
}
@@ -510299,7 +512041,7 @@ self: {
vector
];
description = "Library for performing vector shuffles";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "example";
broken = true;
@@ -510892,7 +512634,7 @@ self: {
text
];
description = "Minimal serialization library with focus on performance";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -512208,7 +513950,7 @@ self: {
unliftio-core
];
description = "A pure haskell backend for the persistent library using MySQL database server";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "persistent-mysql-pure-example";
broken = true;
@@ -513039,7 +514781,7 @@ self: {
temporary
];
description = "STM transactions involving persistent storage";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -513703,7 +515445,7 @@ self: {
unordered-containers
];
description = "CLI program for profiles management";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "pfile";
}
) { };
@@ -513776,7 +515518,7 @@ self: {
vector
];
description = "A pleasant PostgreSQL layer";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -513810,7 +515552,7 @@ self: {
text
];
description = "PostgreSQL database performance insights";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -513972,7 +515714,7 @@ self: {
proto-lens-protoc
];
description = "Parse PostgreSQL DDL and DML: Haskell bindings for libpg_query";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -514462,7 +516204,7 @@ self: {
postgresql-simple
];
description = "pgvector support for Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -514677,8 +516419,8 @@ self: {
}:
mkDerivation {
pname = "phino";
- version = "0.0.0.40";
- sha256 = "0hrnh8l6z9y1a096ddcpqhmcxxcql2al388z7chfvl0mj8w9g77m";
+ version = "0.0.0.45";
+ sha256 = "1m2rq48mkwfy8r29y67mlx4dr65yv9yxfw5j82sawgn4jwhzvc0n";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -514725,7 +516467,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Command-Line Manipulator of 𝜑-Calculus Expressions";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "phino";
broken = true;
@@ -514851,7 +516593,7 @@ self: {
phonetic-languages-phonetics-basics
];
description = "A shared by different general implementations of the PhLADiPreLiO functionality";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -514901,7 +516643,7 @@ self: {
rhythmic-sequences
];
description = "A generalized functionality of PhLADiPreLiO for different languages that uses hash algorithms";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -514914,7 +516656,7 @@ self: {
sha256 = "1ymsxi750bwah3x1cvq1qvjlgibnbvgkrfv1vkjxs4lb8xa20b3g";
libraryHaskellDepends = [ base ];
description = "Allows to estimate some kind of the rhythmicity properties for the text";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -514951,7 +516693,7 @@ self: {
ukrainian-phonetics-basic-array
];
description = "A shared by different Ukrainian implementations of the PhLADiPreLiO functionality";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -515028,7 +516770,7 @@ self: {
ukrainian-phonetics-basic-array
];
description = "A PhLADiPreLiO implementation for Ukrainian that uses hashes and asynchronous concurrency";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "phladiprelioUkr";
}
@@ -516318,7 +518060,7 @@ self: {
unix
];
description = "Rename photo image files based on EXIF shoot date";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
hydraPlatforms = lib.platforms.none;
mainProgram = "photoname";
broken = true;
@@ -516847,7 +518589,7 @@ self: {
text
];
description = "Instant StatsD in Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -517624,7 +519366,7 @@ self: {
text
];
description = "Functional 2D Game Framework";
- license = lib.licenses.zlib;
+ license = lib.licensesSpdx."Zlib";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -517681,7 +519423,7 @@ self: {
vector
];
description = "Servant bindings to Pinecone";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "pinecone-example";
}
) { };
@@ -517719,7 +519461,7 @@ self: {
transformers
];
description = "icmp echo requests";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -517840,7 +519582,7 @@ self: {
tasty-hunit
];
description = "Preserve warnings in a GHCi session";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -518156,7 +519898,7 @@ self: {
transformers
];
description = "Encode and decode JSON streams using Aeson and Pipes";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -518246,7 +519988,7 @@ self: {
transformers
];
description = "Attoparsec and Pipes integration";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -520000,7 +521742,7 @@ self: {
pulse-simple
];
description = "Pipes for pulse-simple audio";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -520268,7 +522010,7 @@ self: {
transformers
];
description = "properly streaming text";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -520713,7 +522455,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "A program for turning pixel art into 3D prints";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
mainProgram = "pixel-printer-exe";
broken = true;
@@ -520892,7 +522634,7 @@ self: {
http-client-tls
];
description = "Pixiv API binding based on servant-client";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -521184,7 +522926,7 @@ self: {
directory
];
description = "Bindings and wrappers for PL_SYNTH - no-deps sound effects synthesizer and tracker";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -521992,7 +523734,7 @@ self: {
word8
];
description = "Library and executable for working with playlist files";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "playlist";
}
) { };
@@ -522042,7 +523784,7 @@ self: {
sha256 = "1j7jblcmnvg2f5pdsakr9afqyssaspffbr4rdrixzayywbbrgbic";
libraryHaskellDepends = [ base ];
description = "A semi-cross-platform interface for pledge(2) and unveil(2)";
- license = lib.licenses.unlicense;
+ license = lib.licensesSpdx."Unlicense";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -522669,6 +524411,8 @@ self: {
pname = "plots";
version = "0.1.1.5";
sha256 = "0dgjg1idfhmnzdy7c2my1ri98psbm8jq67ssnb2iss4ay9fs13fw";
+ revision = "1";
+ editedCabalFile = "0fp1i55arir0p9gvxgadq29v06p4qkqbrf14qd4nnfjry5i8pgqg";
libraryHaskellDepends = [
adjunctions
base
@@ -523167,7 +524911,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "pms-application-service";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -523196,8 +524940,8 @@ self: {
}:
mkDerivation {
pname = "pms-domain-model";
- version = "0.1.0.0";
- sha256 = "0y6xi7mqrvl1fp87nxyrx7jfbh8rwmgm5wmcvw9am7mqc7kz2scy";
+ version = "0.1.2.0";
+ sha256 = "0zhc0bf5gbkqqhp6bvhpf2snaagx4v4qsydvbv18blrpkavvqrbk";
libraryHaskellDepends = [
aeson
async
@@ -523229,7 +524973,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "pms-domain-model";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -523303,7 +525047,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "pms-domain-service";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -523335,8 +525079,8 @@ self: {
}:
mkDerivation {
pname = "pms-infra-cmdrun";
- version = "0.0.7.0";
- sha256 = "1cmyxcvbx7637p96psklpm0vip1998kcl0v4mxvlbb2yjddrb1q2";
+ version = "0.0.8.0";
+ sha256 = "0q0780gl1jadq0qjh7dqknvv9i0g0229nsaxahv6f3n9brx9bf30";
libraryHaskellDepends = [
aeson
async
@@ -523371,7 +525115,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "pms-infra-cmdrun";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -523439,7 +525183,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "pms-infra-procspawn";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -523513,7 +525257,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "pms-infra-serial";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -523585,7 +525329,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "pms-infra-socket";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -523655,7 +525399,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "pms-infra-watch";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -523729,7 +525473,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "pms-infrastructure";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -523790,7 +525534,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "pms-ui-notification";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -523851,7 +525595,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "pms-ui-request";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -523912,7 +525656,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "pms-ui-response";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -524208,7 +525952,7 @@ self: {
text
];
description = "A container wrapper";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "podenv";
broken = true;
@@ -524718,7 +526462,7 @@ self: {
gauge
];
description = "Texas holdem hand evaluation and simulation";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "poker-exe";
}
@@ -525028,7 +526772,7 @@ self: {
text
];
description = "Haskell PVP version adviser";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "policeman";
broken = true;
@@ -525077,7 +526821,7 @@ self: {
utility-ht
];
description = "Bindings to poll.h";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -525148,7 +526892,7 @@ self: {
text
];
description = "Functionality to help examine Haddock information of a module";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -525549,7 +527293,7 @@ self: {
containers
];
description = "Multivariate polynomial rings";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -525574,29 +527318,6 @@ self: {
) { };
polyparse = callPackage (
- {
- mkDerivation,
- base,
- bytestring,
- text,
- }:
- mkDerivation {
- pname = "polyparse";
- version = "1.13";
- sha256 = "0yvhg718dlksiw3v27m2d8m1sn4r4f5s0p56zq3lynhy1sc74k0w";
- revision = "9";
- editedCabalFile = "0abzqic0askffn6nmh1f08d9rd9fykdlcdd9gj1c7p1ykp9zlq29";
- libraryHaskellDepends = [
- base
- bytestring
- text
- ];
- description = "A variety of alternative parser combinator libraries";
- license = "LGPL";
- }
- ) { };
-
- polyparse_1_13_1 = callPackage (
{
mkDerivation,
base,
@@ -525614,7 +527335,6 @@ self: {
];
description = "A variety of alternative parser combinator libraries";
license = "LGPL";
- hydraPlatforms = lib.platforms.none;
}
) { };
@@ -525774,7 +527494,7 @@ self: {
sqel
];
description = "Account management with Servant and Polysemy";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -525864,7 +527584,7 @@ self: {
zeugma
];
description = "Account management with Servant and Polysemy";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -525903,7 +527623,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Polysemy wrapper around the Blockfrost client";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -525979,7 +527699,7 @@ self: {
tasty
];
description = "A Polysemy effect for Chronos";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
}
) { };
@@ -526034,7 +527754,7 @@ self: {
torsor
];
description = "Polysemy effects for concurrency";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
}
) { };
@@ -526065,7 +527785,7 @@ self: {
uuid
];
description = "Polysemy effects for databases";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -526224,7 +527944,7 @@ self: {
zeugma
];
description = "Polysemy effects for databases";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -526288,7 +528008,7 @@ self: {
tasty
];
description = "Test utilities for polysemy-hasql";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -526351,7 +528071,7 @@ self: {
warp
];
description = "Polysemy effects for HTTP clients";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -526510,7 +528230,7 @@ self: {
polysemy-plugin
];
description = "Polysemy effects for logging";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
}
) { };
@@ -526560,7 +528280,7 @@ self: {
tasty
];
description = "Colog adapters for polysemy-log";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -526604,7 +528324,7 @@ self: {
tasty
];
description = "Di adapters for polysemy-log";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
}
) { };
@@ -526647,7 +528367,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Primitive functions and data types";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -526937,7 +528657,7 @@ self: {
unix
];
description = "Polysemy effects for system processes";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
}
) { };
@@ -526952,8 +528672,8 @@ self: {
}:
mkDerivation {
pname = "polysemy-readline";
- version = "0.2.0.0";
- sha256 = "0zkzlrwcbxkxiy2xmh3ms9saa379lmw49d9hfkmd487vi33q0isn";
+ version = "0.3.0.0";
+ sha256 = "0clbp7fipz8b8py6kmxm04vg2ln6jpq773v27wkdy0sb2blkj49f";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -526978,10 +528698,8 @@ self: {
polysemy-plugin
];
description = "Readline effect for polysemy";
- license = lib.licenses.bsd2;
- hydraPlatforms = lib.platforms.none;
+ license = lib.licensesSpdx."BSD-2-Clause";
mainProgram = "echo-repl";
- broken = true;
}
) { };
@@ -527004,7 +528722,7 @@ self: {
req
];
description = "Polysemy effect for req";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -527042,7 +528760,7 @@ self: {
tasty
];
description = "Polysemy error tracking";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
}
) { };
@@ -527092,7 +528810,7 @@ self: {
text
];
description = "Well-typed filesystem operation effects";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -527183,7 +528901,7 @@ self: {
tasty
];
description = "Polysemy effects for testing";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
}
) { };
@@ -527219,7 +528937,7 @@ self: {
time
];
description = "A Polysemy effect for time";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
}
) { };
@@ -527513,6 +529231,33 @@ self: {
}
) { };
+ polytree = callPackage (
+ {
+ mkDerivation,
+ base,
+ bifunctors,
+ containers,
+ free,
+ lens,
+ semigroupoids,
+ }:
+ mkDerivation {
+ pname = "polytree";
+ version = "0.0.9";
+ sha256 = "17ldq6vd8zfvcd5w5dxy41cyda0j91ikr5437jqxnzw4yv6pp79a";
+ libraryHaskellDepends = [
+ base
+ bifunctors
+ containers
+ free
+ lens
+ semigroupoids
+ ];
+ description = "A polymorphic rose-tree";
+ license = lib.licenses.bsd3;
+ }
+ ) { };
+
polytypeable = callPackage (
{ mkDerivation, base }:
mkDerivation {
@@ -527571,7 +529316,7 @@ self: {
tasty-quickcheck
];
description = "Alternative to `Dynamic` with type guarantees";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -528039,7 +529784,7 @@ self: {
xml-types
];
description = "An XMPP client library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -528194,7 +529939,7 @@ self: {
timeit
];
description = "Simple work queue for bounded concurrency";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -528227,7 +529972,7 @@ self: {
utility-ht
];
description = "Run jobs on a limited number of threads and support data dependencies";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -528327,7 +530072,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Static key-value storage backed by poppy";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -528773,7 +530518,7 @@ self: {
warp
];
description = "A minimalist HTTP server framework written on top of wai";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "porpoise-example";
broken = true;
@@ -528904,7 +530649,7 @@ self: {
];
doHaddock = false;
description = "Data structures and functions for interacting with the Portage package manager";
- license = lib.licenses.agpl3Only;
+ license = lib.licensesSpdx."AGPL-3.0-only";
}
) { };
@@ -529035,7 +530780,7 @@ self: {
PortMidi
];
description = "PortMidi utilities";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
badPlatforms = lib.platforms.darwin;
mainProgram = "portmidi-list-devices";
}
@@ -529358,7 +531103,7 @@ self: {
template-haskell
];
description = "A product-of-sums generics library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -529418,7 +531163,7 @@ self: {
uuid
];
description = "Simple extensible library to run SQL file against PostgreSQL database";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -529651,7 +531396,7 @@ self: {
tasty-hunit
];
description = "posix bindings";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
badPlatforms = lib.platforms.darwin;
}
) { };
@@ -530212,7 +531957,7 @@ self: {
websockets
];
description = "Middleware to map LISTEN/NOTIFY messages to Websockets";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "postgres-websockets";
maintainers = [ lib.maintainers.wolfgangwalther ];
}
@@ -530280,7 +532025,7 @@ self: {
rerebase
];
description = "Encoders and decoders for the PostgreSQL's binary format";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -530347,7 +532092,7 @@ self: {
rerebase
];
description = "Encoders and decoders for the PostgreSQL's binary format";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -530448,6 +532193,49 @@ self: {
}
) { };
+ postgresql-connection-string = callPackage (
+ {
+ mkDerivation,
+ base,
+ bytestring,
+ charset,
+ containers,
+ hashable,
+ hspec,
+ megaparsec,
+ QuickCheck,
+ quickcheck-classes,
+ text,
+ text-builder,
+ }:
+ mkDerivation {
+ pname = "postgresql-connection-string";
+ version = "0.1.0.3";
+ sha256 = "00kc7krgibxdq88wyr8lk6k7rini7rn6md4mlkpinrc0xmafgq47";
+ libraryHaskellDepends = [
+ base
+ bytestring
+ charset
+ containers
+ hashable
+ megaparsec
+ QuickCheck
+ text
+ text-builder
+ ];
+ testHaskellDepends = [
+ base
+ containers
+ hspec
+ QuickCheck
+ quickcheck-classes
+ text
+ ];
+ description = "PostgreSQL connection string type, parser and builder";
+ license = lib.licensesSpdx."MIT";
+ }
+ ) { };
+
postgresql-connector = callPackage (
{
mkDerivation,
@@ -530566,7 +532354,7 @@ self: {
tasty-hunit
];
description = "low-level binding to libpq";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -530579,7 +532367,7 @@ self: {
libraryHaskellDepends = [ base ];
doHaddock = false;
description = "low-level binding to libpq: configure based provider";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -530632,7 +532420,7 @@ self: {
libraryPkgconfigDepends = [ libpq ];
doHaddock = false;
description = "low-level binding to libpq: pkg-config based provider";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { inherit (pkgs) libpq; };
@@ -530752,7 +532540,7 @@ self: {
postgresql-simple
];
description = "PostgreSQL Schema Migrations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "migrate";
}
) { };
@@ -530784,7 +532572,7 @@ self: {
text
];
description = "A PostgreSQL persistent schema migration utility";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -530925,7 +532713,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Converter for question mark style and dollar sign style of PostgreSQL SQL";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -531067,7 +532855,7 @@ self: {
utf8-string
];
description = "pure Haskell PostgreSQL driver";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -531249,7 +533037,7 @@ self: {
postgresql-simple
];
description = "Automatic re-connection support for PostgreSQL";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -531459,13 +533247,14 @@ self: {
postgresql-libpq,
postgresql-simple,
scientific,
+ template-haskell,
text,
time,
}:
mkDerivation {
pname = "postgresql-simple-interval";
- version = "1.0.0.0";
- sha256 = "01d550bhmbpy3bsz37m21hpgpg9x2v72qhv6fa2p0m6p61p1hadx";
+ version = "1.0.1.0";
+ sha256 = "1qwcywyiw9y5bnvzb0ji32q3yh5fs5nxiw17gr4q4yk0wi01rw92";
libraryHaskellDepends = [
attoparsec
base
@@ -531473,6 +533262,7 @@ self: {
persistent
postgresql-simple
scientific
+ template-haskell
text
time
];
@@ -531486,7 +533276,7 @@ self: {
time
];
description = "A simple interval type for PostgreSQL";
- license = lib.licenses.bsd0;
+ license = lib.licensesSpdx."0BSD";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -531624,7 +533414,7 @@ self: {
transformers
];
description = "Implementation of named parameters for `postgresql-simple` library";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -531880,7 +533670,7 @@ self: {
tasty-hunit
];
description = "PostgreSQL AST parsing and rendering";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -533028,7 +534818,7 @@ self: {
tasty-hunit
];
description = "PowerDNS API bindings for api/v1";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -533300,7 +535090,7 @@ self: {
ppad-base16
];
description = "A pure AEAD-ChaCha20-Poly1305 construction";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -533344,7 +535134,7 @@ self: {
weigh
];
description = "Pure base16 encoding and decoding on bytestrings";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -533387,7 +535177,7 @@ self: {
criterion
];
description = "base58 and base58check encoding/decoding";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -533426,7 +535216,7 @@ self: {
deepseq
];
description = "bech32 and bech32m encoding/decoding, per BIPs 173 & 350";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -533478,7 +535268,7 @@ self: {
ppad-secp256k1
];
description = "BIP32 hierarchical deterministic wallets";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -533539,7 +535329,7 @@ self: {
deepseq
];
description = "BIP39 mnemonic codes";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -533581,7 +535371,7 @@ self: {
ppad-base16
];
description = "A pure ChaCha20 stream cipher";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -533626,7 +535416,7 @@ self: {
ppad-sha512
];
description = "A HMAC-based key derivation function";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -533672,7 +535462,7 @@ self: {
ppad-sha512
];
description = "HMAC-based deterministic random bit generator";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -533718,7 +535508,7 @@ self: {
ppad-sha512
];
description = "A password-based key derivation function";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -533757,7 +535547,7 @@ self: {
ppad-base16
];
description = "A pure Poly1305 MAC";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -533798,7 +535588,7 @@ self: {
SHA
];
description = "The RIPEMD-160 hashing algorithm";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -533844,7 +535634,7 @@ self: {
weigh
];
description = "Primitive Script support";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -533899,7 +535689,7 @@ self: {
weigh
];
description = "Schnorr signatures, ECDSA, and ECDH on the elliptic curve secp256k1";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -533941,7 +535731,7 @@ self: {
SHA
];
description = "The SHA-256 and HMAC-SHA256 algorithms";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -533984,7 +535774,7 @@ self: {
SHA
];
description = "The SHA-512 and HMAC-SHA512 algorithms";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -534145,6 +535935,45 @@ self: {
}
) { };
+ pqueue_1_6_0_0 = callPackage (
+ {
+ mkDerivation,
+ base,
+ deepseq,
+ indexed-traversable,
+ random,
+ tasty,
+ tasty-bench,
+ tasty-quickcheck,
+ }:
+ mkDerivation {
+ pname = "pqueue";
+ version = "1.6.0.0";
+ sha256 = "1bg9z0m062lggmzkrq29vz75d7mxxmx9ka1862j7qszj9gqmqnw6";
+ libraryHaskellDepends = [
+ base
+ deepseq
+ indexed-traversable
+ ];
+ testHaskellDepends = [
+ base
+ deepseq
+ indexed-traversable
+ tasty
+ tasty-quickcheck
+ ];
+ benchmarkHaskellDepends = [
+ base
+ deepseq
+ random
+ tasty-bench
+ ];
+ description = "Reliable, persistent, fast priority queues";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
pqueue-mtl = callPackage (
{
mkDerivation,
@@ -534247,7 +536076,7 @@ self: {
yaml
];
description = "Decentralized git pull request and code review flows";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -534724,7 +536553,7 @@ self: {
text
];
description = "A library for writing predicates and transformations over predicates in Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -535175,7 +537004,7 @@ self: {
template-haskell
];
description = "A Prelude";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
}
) { };
@@ -535868,7 +537697,7 @@ self: {
wl-pprint
];
description = "Pretty-printing library";
- license = lib.licenses.lgpl3Only;
+ license = lib.licensesSpdx."LGPL-3.0-only";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -536059,7 +537888,7 @@ self: {
];
doHaddock = false;
description = "Produce nice human-readable HTML";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -536226,8 +538055,8 @@ self: {
}:
mkDerivation {
pname = "pretty-simple";
- version = "4.1.3.0";
- sha256 = "03nhhavr66ikwmkma3mw2a7dz9w0mhaxj49dgf2cf76v3jq1vara";
+ version = "4.1.4.0";
+ sha256 = "07xf5nz14ra724c46ql1y5i7ifmwn8l4pcbmpk17kfkvk1fall9s";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -536431,7 +538260,7 @@ self: {
doctest-parallel
];
description = "Pretty print charts from ghci";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "prettychart-watch";
}
) { };
@@ -536480,7 +538309,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "API for prettyprinting custom syntax trees (extracted from elm-format)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -536628,7 +538457,7 @@ self: {
vector
];
description = "Some useful combinators for the prettyprinter package";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -536736,7 +538565,7 @@ self: {
text
];
description = "Configurable pretty-printing";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -536795,7 +538624,7 @@ self: {
text
];
description = "A prettyprinter backend for graphviz";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -536832,7 +538661,7 @@ self: {
text
];
description = "Efficient interpolation for Prettyprinter";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -536857,7 +538686,7 @@ self: {
text
];
description = "A prettyprinter backend for lucid";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -536922,7 +538751,7 @@ self: {
sha256 = "15igqxb77ycl9lfs1bl1l9x3cynsg4kqzkr54q46ly4l315bsrq4";
libraryHaskellDepends = [ ghc-prim ];
description = "An ergonomic but conservative interface to ghc-prim";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -536977,7 +538806,7 @@ self: {
quickcheck-classes
];
description = "Prim typeclass instances";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -537171,8 +539000,8 @@ self: {
}:
mkDerivation {
pname = "primdata";
- version = "0.1.2.2";
- sha256 = "0cjsjcm6d71d61idkmb9d8ia26hcwzrmx8k5w1afhzpla73zfia9";
+ version = "0.1.2.3";
+ sha256 = "015k5c0g1l6szvf267f0hdmcw5bms932fqfpqg00r4jjygylli3b";
libraryHaskellDepends = [
base
ghc-prim
@@ -537231,7 +539060,7 @@ self: {
tasty-bench
];
description = "Bindings to the primecount library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { inherit (pkgs) primecount; };
@@ -537376,7 +539205,7 @@ self: {
primitive
];
description = "Addresses to unmanaged memory";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -537402,7 +539231,7 @@ self: {
primitive-unlifted
];
description = "Wrappers for primops around atomic operations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -537421,7 +539250,7 @@ self: {
primitive
];
description = "primitive functions with bounds-checking";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -537501,7 +539330,7 @@ self: {
sha256 = "1xnyyw76kh42fy1b1wkc143bg3588gbp48990xdskcad1aj4fyan";
libraryHaskellDepends = [ primitive ];
description = "convenience class for PrimMonad m/PrimState m";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -537556,7 +539385,7 @@ self: {
tasty-quickcheck
];
description = "Extras for the \"primitive\" library";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -537581,7 +539410,7 @@ self: {
QuickCheck
];
description = "using the `Prim` interface for the FFI";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -537664,7 +539493,7 @@ self: {
primitive
];
description = "Types for offsets into unboxed arrays";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -537683,7 +539512,7 @@ self: {
primitive
];
description = "Unboxed variables for `Prim` values";
- license = lib.licenses.cc0;
+ license = lib.licensesSpdx."CC0-1.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -537706,7 +539535,7 @@ self: {
cpu
];
description = "Serialisation of primitive types";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -537762,7 +539591,7 @@ self: {
primitive-unlifted
];
description = "Slices of primitive arrays";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -537813,7 +539642,7 @@ self: {
random
];
description = "Sort primitive arrays";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -537832,7 +539661,7 @@ self: {
primitive
];
description = "primitive operations on StableNames";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -537859,39 +539688,7 @@ self: {
primitive
];
description = "Unaligned access to primitive arrays";
- license = lib.licenses.bsd3;
- }
- ) { };
-
- primitive-unlifted_0_1_3_1 = callPackage (
- {
- mkDerivation,
- base,
- bytestring,
- primitive,
- stm,
- text-short,
- }:
- mkDerivation {
- pname = "primitive-unlifted";
- version = "0.1.3.1";
- sha256 = "1gilzgclpvz200sybw86nmdm7084nrklscq48cs36qqlgcd0wcwb";
- revision = "1";
- editedCabalFile = "0y3zdwbs1fdzspj1k95jyjrhm7za38gb6ada031bp02ifxbvsvsf";
- libraryHaskellDepends = [
- base
- bytestring
- primitive
- text-short
- ];
- testHaskellDepends = [
- base
- primitive
- stm
- ];
- description = "Primitive GHC types with unlifted types inside";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -537930,7 +539727,7 @@ self: {
tasty-quickcheck
];
description = "Primitive GHC types with unlifted types inside";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -538492,7 +540289,7 @@ self: {
];
doHaddock = false;
description = "Abstract syntax for writing documents";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -538540,7 +540337,7 @@ self: {
vector
];
description = "Utilities for tracking source locations";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -538568,7 +540365,7 @@ self: {
hspec
];
description = "Discrete probability monad";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -538630,7 +540427,7 @@ self: {
lens
];
description = "A library for modular probabilistic modelling";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "prob-fx";
broken = true;
@@ -538679,10 +540476,10 @@ self: {
}:
mkDerivation {
pname = "probability-polynomial";
- version = "1.0.0.1";
- sha256 = "1f06x4d2cbd9j7rxgwdpxn8ff8w32xag96qk86mwggnzlw091gib";
- revision = "2";
- editedCabalFile = "039np4z6lzz81n90k1sqbr7n8bxfmh8v4xvbppzzpgk6kp5fxpfm";
+ version = "1.0.1.0";
+ sha256 = "0hyncg56b4jw9yjjl551ql8hinl2m6gjsfdjlsjws619iqxvpp42";
+ revision = "1";
+ editedCabalFile = "1gyx5547m3xkjrinm2pgpna18mzkk47ckmb0qjbn1z7zv4gjyspg";
libraryHaskellDepends = [
base
containers
@@ -538702,7 +540499,7 @@ self: {
deepseq
];
description = "Probability distributions via piecewise polynomials";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -538832,7 +540629,7 @@ self: {
unix
];
description = "Process libraries";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -539312,7 +541109,7 @@ self: {
process
];
description = "C bindings for the gnu-extension functions process_vm_readv and process_vm_writev";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -539363,6 +541160,8 @@ self: {
pname = "procex";
version = "0.3.3";
sha256 = "1r5rrdwzjvh2mdsv63hq2rv9qq04qwmvw83niri066ini60ns9ln";
+ revision = "1";
+ editedCabalFile = "1saj9mgscajshbk6hw975chvh2qlmxa0nlp86hx59iza75xq186r";
libraryHaskellDepends = [
async
base
@@ -539380,7 +541179,7 @@ self: {
unix
];
description = "Ergonomic process launching with extreme flexibility and speed";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -539780,7 +541579,7 @@ self: {
optparse-applicative
];
description = "Generate flamegraphs from ghc RTS .prof files";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "prof-flamegraph";
broken = true;
@@ -540354,7 +542153,7 @@ self: {
tasty-hunit
];
description = "A project initialization library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -540687,7 +542486,7 @@ self: {
winery
];
description = "Relational Algebra Engine";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -540858,7 +542657,7 @@ self: {
inspection-testing
];
description = "Profunctor-based lightweight implementation of optics";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -541439,7 +543238,7 @@ self: {
warp
];
description = "Instrument a wai application with various metrics";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "prometheus-wai-middleware-example";
broken = true;
@@ -541532,7 +543331,7 @@ self: {
text
];
description = "A user-friendly, dependently-typed library for asking your users questions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -541555,7 +543354,7 @@ self: {
text
];
description = "A user-friendly, dependently-typed library for asking your users questions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -541638,7 +543437,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "Telegram bot for proof assistants";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "proof-assistant-bot";
broken = true;
@@ -541743,7 +543542,7 @@ self: {
containers
];
description = "A Propagator Library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -541932,7 +543731,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "A library for tests, based on transforming and writing properties";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -542008,7 +543807,7 @@ self: {
tasty-quickcheck
];
description = "Proquints: Identifiers that are Readable, Spellable, and Pronounceable";
- license = "EUPL-1.2";
+ license = lib.licensesSpdx."EUPL-1.2";
}
) { };
@@ -542081,7 +543880,7 @@ self: {
text
];
description = "A simple language for writing documents";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -542118,7 +543917,7 @@ self: {
unordered-containers
];
description = "A DSL for processing Prosidy documents";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -542232,7 +544031,7 @@ self: {
];
libraryToolDepends = [ c2hs ];
description = "Simple audio library for Windows, Linux, OSX";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -542267,7 +544066,7 @@ self: {
libraryPkgconfigDepends = [ SDL2 ];
libraryToolDepends = [ c2hs ];
description = "Simple audio library for SDL";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -542354,7 +544153,7 @@ self: {
prelate
];
description = "Neovim Project Manager";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
hydraPlatforms = lib.platforms.none;
mainProgram = "proteome";
broken = true;
@@ -542551,7 +544350,7 @@ self: {
];
libraryToolDepends = [ proto-lens-protoc ];
description = "proto-lens-etcd - protobuffer lenses for etcd provided by protoc-lens-protoc";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -542584,7 +544383,7 @@ self: {
vector
];
description = "JSON protobuf encoding for proto-lens";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -542916,8 +544715,7 @@ self: {
vector
];
description = "A higher-level API to the proto3-wire library";
- license = lib.licenses.asl20;
- hydraPlatforms = lib.platforms.none;
+ license = lib.licensesSpdx."Apache-2.0";
maintainers = [ lib.maintainers.alexfmpe ];
}
) { };
@@ -542951,8 +544749,8 @@ self: {
}:
mkDerivation {
pname = "proto3-wire";
- version = "1.4.3";
- sha256 = "0gsb0qzxpgpy64jmx2fsbb7cjzixpfsqb2zjws62kg89sgkid8vz";
+ version = "1.4.4";
+ sha256 = "15r1irfld81j1mm3yr6lnbb74qlkskp2qcwxhicrdrj0w5nvb8vd";
libraryHaskellDepends = [
base
bytestring
@@ -543086,7 +544884,7 @@ self: {
zigzag
];
description = "Slow protobuf implementation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -543721,7 +545519,7 @@ self: {
vinyl
];
description = "Lightweight dependency injection / namespaced+typed implicit-ish arguments";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -543873,7 +545671,7 @@ self: {
yaml
];
description = "Prune unused Haskell dependencies";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "prune-juice";
broken = true;
@@ -544149,7 +545947,7 @@ self: {
vector
];
description = "PostgreSQL client";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -544297,7 +546095,7 @@ self: {
tasty-hunit
];
description = "Integrate libpsx with the GHC RTS";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -544551,7 +546349,7 @@ self: {
rerebase
];
description = "Experimental abstractions for operations on pointers";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -544601,7 +546399,7 @@ self: {
tasty-hunit
];
description = "High-performance composable binary data deserializers";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -544641,7 +546439,7 @@ self: {
rerebase
];
description = "Pointer poking action construction and composition toolkit";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -544678,8 +546476,8 @@ self: {
}:
mkDerivation {
pname = "pty-mcp-server";
- version = "0.1.2.0";
- sha256 = "17mczija7br6l2c4x8svjn60si6hxlv6iy5zwf1l42y2sv5y9hh9";
+ version = "0.1.4.0";
+ sha256 = "0jvchk9g1f0g77filmylqss5h4wx4fn8jssmdzfn358fh36i5710";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -544700,7 +546498,7 @@ self: {
safe-exceptions
];
description = "pty-mcp-server";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "pty-mcp-server";
}
@@ -545487,6 +547285,48 @@ self: {
}
) { };
+ pup = callPackage (
+ {
+ mkDerivation,
+ base,
+ comonad,
+ containers,
+ hedgehog,
+ megaparsec,
+ mtl,
+ prettyprinter,
+ stacked,
+ text,
+ }:
+ mkDerivation {
+ pname = "pup";
+ version = "0.1.0";
+ sha256 = "15jyl295frn3ylfwm01cx630hjllcsbmkm4pl2n1anayw6j9pm0r";
+ libraryHaskellDepends = [
+ base
+ comonad
+ containers
+ megaparsec
+ prettyprinter
+ stacked
+ text
+ ];
+ testHaskellDepends = [
+ base
+ comonad
+ containers
+ hedgehog
+ megaparsec
+ mtl
+ prettyprinter
+ stacked
+ text
+ ];
+ description = "Invertible format descriptors";
+ license = lib.licenses.mit;
+ }
+ ) { };
+
puppetresources = callPackage (
{
mkDerivation,
@@ -545610,6 +547450,7 @@ self: {
base,
deepseq,
mwc-random,
+ primitive,
tasty,
tasty-bench,
tasty-discover,
@@ -545619,31 +547460,32 @@ self: {
}:
mkDerivation {
pname = "pure-noise";
- version = "0.1.0.1";
- sha256 = "116w6scl7kranx567jhnrir9sh0ysjzs45gfhk970q0pzbkgnj1l";
+ version = "0.2.0.0";
+ sha256 = "05wp0nlvang8jfyzxi9b080d4dppn5fmj28dhwh5v65lrnh5fzzf";
libraryHaskellDepends = [
base
- vector
+ primitive
];
testHaskellDepends = [
base
+ primitive
tasty
tasty-discover
tasty-hunit
tasty-quickcheck
- vector
];
testToolDepends = [ tasty-discover ];
benchmarkHaskellDepends = [
base
deepseq
mwc-random
+ primitive
tasty
tasty-bench
vector
];
- description = "Performant, modern noise generation for Haskell with minimal dependencies. Based on FastNoiseLite.";
- license = lib.licenses.bsd3;
+ description = "High-performance composable noise generation (Perlin, Simplex, Cellular)";
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -545758,7 +547600,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Derive fromString/toString-like for pure sum types";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -545794,7 +547636,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Derive fromString/toString-like for pure sum types (aeson instances)";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -545975,7 +547817,7 @@ self: {
time
];
description = "types and parser for email messages (including MIME)";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
maintainers = [ lib.maintainers.maralorn ];
}
) { };
@@ -546016,7 +547858,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "Nix backend for PureScript. Transpile PureScript code to Nix.";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "purenix";
}
) { };
@@ -546061,7 +547903,7 @@ self: {
];
doHaddock = false;
description = "Pure Haskell SAT-solver";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -546388,7 +548230,7 @@ self: {
];
doCheck = false;
description = "PureScript Programming Language Compiler";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "purs";
}
) { };
@@ -546432,7 +548274,7 @@ self: {
vector
];
description = "PureScript Programming Language Abstract Syntax Tree";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -546559,7 +548401,7 @@ self: {
];
libraryToolDepends = [ happy ];
description = "PureScript Programming Language Concrete Syntax Tree";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -546747,7 +548589,7 @@ self: {
text
];
description = "Support for purl (mostly universal package url)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -547376,26 +549218,22 @@ self: {
base,
bytestring,
containers,
+ directory,
+ filepath,
foldl,
- io-storage,
lens,
logging,
monad-logger,
old-locale,
optparse-applicative,
parallel-io,
- pipes,
- pipes-group,
- pipes-safe,
- pipes-text,
+ pretty-show,
+ process,
regex-posix,
- safe,
- shelly,
system-fileio,
system-filepath,
temporary,
text,
- text-format,
time,
transformers,
unix,
@@ -547404,8 +549242,8 @@ self: {
}:
mkDerivation {
pname = "pushme";
- version = "2.1.3";
- sha256 = "13rc83fqbizcq1pvvmpd90cy5664p21hjg1aw5bjqw19l2g3c153";
+ version = "3.0.0";
+ sha256 = "0wv718mn9i8kvpmrqrq9s5wnsdndlrd1zmk6jbv87b0mkciiwkpj";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -547413,37 +549251,31 @@ self: {
base
bytestring
containers
+ directory
+ filepath
foldl
- io-storage
lens
logging
monad-logger
old-locale
optparse-applicative
parallel-io
- pipes
- pipes-group
- pipes-safe
- pipes-text
+ pretty-show
+ process
regex-posix
- safe
- shelly
system-fileio
system-filepath
temporary
text
- text-format
time
transformers
unix
unordered-containers
yaml
];
- description = "Tool to synchronize directories with rsync, zfs or git-annex";
+ description = "Synchronize multiple filesets across machines using rsync";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
mainProgram = "pushme";
- broken = true;
}
) { };
@@ -547786,7 +549618,7 @@ self: {
vector-stream
];
description = "Fast persistent vectors";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -548086,7 +549918,7 @@ self: {
test-framework-hunit
];
description = "Serialization/deserialization using Python Pickle format";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "pickle";
broken = true;
@@ -548175,7 +550007,7 @@ self: {
tasty-silver
];
description = "Types and prettyprinter for the IL of the QBE compiler backend";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -548376,7 +550208,7 @@ self: {
];
doHaddock = false;
description = "Command line tool qhs, SQL queries on CSV and TSV files";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "qhs";
}
@@ -548553,7 +550385,7 @@ self: {
template-haskell
];
description = "Typesafe library for linear algebra";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -548701,7 +550533,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "QuasiQuoter for byte sequence";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -549265,7 +551097,7 @@ self: {
editedCabalFile = "0pqi04fvyclnx4lfq8ifax6l4kayay6xbmwp0k0h7yjz14k252gn";
libraryHaskellDepends = [ base ];
description = "Extremely minimal prelude";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -549365,7 +551197,7 @@ self: {
text
];
description = "GHC plugin to automatically insert qualified imports";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -549477,7 +551309,7 @@ self: {
unordered-containers
];
description = "Rage against the quantification";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -549506,7 +551338,7 @@ self: {
vector
];
description = "Rage against the quantification - integration with Aeson";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -550160,8 +551992,8 @@ self: {
pname = "queue-sheet";
version = "0.8.0.1";
sha256 = "1s7j51542j4in10ihb47jflwkf6m4gsi1z1aq9mzs2ksj65n1yc9";
- revision = "1";
- editedCabalFile = "0bq0abf3qzlpcy6kxrhbzm9zg9fa2ps5fj27i9c67nyc5y520ana";
+ revision = "2";
+ editedCabalFile = "15m5ba4w79vjqj9fd1kw0y004pmrc1a8im0v0i5c90lgpv0fcr74";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -550191,7 +552023,7 @@ self: {
tasty-hunit
];
description = "queue sheet utility";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "queue-sheet";
}
) { };
@@ -550234,8 +552066,8 @@ self: {
pname = "queues";
version = "1.0.0";
sha256 = "0mnn6lgd7101lrmwqy4lf04ncq8ci2kfxydm1rlh879gjvzz3lsr";
- revision = "5";
- editedCabalFile = "00qbr5h2k6hkykfsw6qqqz8krfd06hvridpzijyvdskg97pggjv5";
+ revision = "6";
+ editedCabalFile = "0hbjkkcg8g4mfngpik5fz720k3nsqk7abykikslniqv3g348wh2q";
libraryHaskellDepends = [ base ];
testHaskellDepends = [
base
@@ -550248,7 +552080,7 @@ self: {
tasty-bench
];
description = "Queue data structures";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -550294,7 +552126,7 @@ self: {
tasty-hunit
];
description = "Convenient SQL query language for Haskell (but only for single tables)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -550550,7 +552382,7 @@ self: {
testToolDepends = [ tasty-discover ];
doHaddock = false;
description = "Run external processes verified at compilation/installation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -550839,7 +552671,7 @@ self: {
vector
];
description = "QuickCheck common typeclasses";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -550864,7 +552696,7 @@ self: {
transformers
];
description = "QuickCheck common typeclasses from `base`";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -550928,7 +552760,7 @@ self: {
tasty-quickcheck
];
description = "A library for stateful property-based testing";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -550987,7 +552819,7 @@ self: {
testToolDepends = [ hspec-discover ];
doHaddock = false;
description = "Testing group class instances with QuickCheck";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -551095,7 +552927,7 @@ self: {
QuickCheck
];
description = "Common quickcheck instances";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -551165,7 +552997,7 @@ self: {
temporary
];
description = "Library for lockstep-style testing with 'quickcheck-dynamic'";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -551214,7 +553046,7 @@ self: {
testToolDepends = [ hspec-discover ];
doHaddock = false;
description = "Testing monoid subclass instances with QuickCheck";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -551352,7 +553184,7 @@ self: {
testToolDepends = [ hspec-discover ];
doHaddock = false;
description = "Quasi-unique identifiers for QuickCheck";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -551662,7 +553494,7 @@ self: {
];
doHaddock = false;
description = "Test monadic programs using state machine based models";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -551811,7 +553643,7 @@ self: {
transformers
];
description = "A GenT monad transformer for QuickCheck library";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -553153,7 +554985,7 @@ self: {
th-compat
];
description = "Monad transformer for Quote from template-haskell";
- license = lib.licenses.cc0;
+ license = lib.licensesSpdx."CC0-1.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -553267,7 +555099,7 @@ self: {
weigh
];
description = "R-/R*-trees";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -554083,13 +555915,12 @@ self: {
QuickCheck,
random,
stm,
- tagged,
template-haskell,
}:
mkDerivation {
pname = "raketka";
- version = "1.1.3";
- sha256 = "0mz9639p3ndlq72gask5fdv7kqpkgs4wh0f86wfargyfd36179lw";
+ version = "1.2.0";
+ sha256 = "1f3mj7hq8gm2d8c06vys16bzc9gg18z4rfkifxri8nb83gz4ngdm";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -554107,7 +555938,6 @@ self: {
network-transport-tcp
random
stm
- tagged
template-haskell
];
executableHaskellDepends = [
@@ -554125,7 +555955,6 @@ self: {
network-transport-tcp
random
stm
- tagged
template-haskell
];
testHaskellDepends = [
@@ -554288,7 +556117,7 @@ self: {
vector
];
description = "Random access lists";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
}
) { };
@@ -554315,7 +556144,7 @@ self: {
ral
];
description = "Length-indexed random access lists: lens utilities";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
}
) { };
@@ -554342,7 +556171,7 @@ self: {
ral
];
description = "Length-indexed random access lists: optics utilities";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
}
) { };
@@ -554378,7 +556207,7 @@ self: {
deepseq
];
description = "Random access list with a list compatible interface";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -554450,7 +556279,7 @@ self: {
hspec
];
description = "Determine how intervals relate to each other";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -554886,7 +556715,7 @@ self: {
vector
];
description = "Uniform draws of partitions and cycle-partitions, with thinning";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -555112,8 +556941,8 @@ self: {
}:
mkDerivation {
pname = "random-mhs";
- version = "1.3.2";
- sha256 = "0kal37pcjh9a3j4mglysar00dz7n1vgyrq30z335v3fsjn0g31i5";
+ version = "1.3.2.1";
+ sha256 = "0i7xwdpghss1r5sd3nrsfwri6x624anfsn8c8pdqy7cd9kqq179y";
libraryHaskellDepends = [
base
bytestring
@@ -555531,7 +557360,7 @@ self: {
tasty-quickcheck
];
description = "Memory efficient sets with ranges of elements";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -555683,7 +557512,7 @@ self: {
random-shuffle
];
description = "Efficient sets for semi-contiguous data";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -555752,7 +557581,7 @@ self: {
tasty-hunit
];
description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -556477,7 +558306,7 @@ self: {
hspec
];
description = "Notify Honeybadger about exceptions";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -556506,7 +558335,7 @@ self: {
wai
];
description = "Notify Honeybadger about exceptions via a WAI middleware";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -556831,7 +558660,7 @@ self: {
filepath
];
description = "Parse and generate Rocket League replays";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "rattletrap";
broken = true;
@@ -557048,7 +558877,7 @@ self: {
tasty-quickcheck
];
description = "A writer-biased RAW lock";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -557139,7 +558968,7 @@ self: {
h-raylib
];
description = "Haskell bindings for rlImGui";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -557181,7 +559010,7 @@ self: {
random
];
description = "Ray tracing library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -557488,6 +559317,8 @@ self: {
pname = "rcu";
version = "0.2.7";
sha256 = "0iw1w2jch8a6ap2nrkis740vbi5sjgk7hdbv9d4m08j4c402q3c9";
+ revision = "1";
+ editedCabalFile = "0r56khfhyr29wbidvrdlzzayzniaa6pqmjf6kjymackmvy6kiszq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -557679,7 +559510,7 @@ self: {
text
];
description = "The ActivityStreams 2 RDF vocabulary for rdf4h";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -557807,7 +559638,7 @@ self: {
testToolDepends = [ tasty-discover ];
doHaddock = false;
description = "Codecs for use with AWS rds-data";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -557903,7 +559734,7 @@ self: {
tasty-discover
];
description = "Codecs for use with AWS rds-data";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "rds-data-codecs";
broken = true;
@@ -558036,7 +559867,7 @@ self: {
testToolDepends = [ tasty-discover ];
doHaddock = false;
description = "Codecs for use with AWS rds-data";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "rds-data";
}
@@ -558121,7 +559952,7 @@ self: {
text
];
description = "Create React components in Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -558437,8 +560268,8 @@ self: {
pname = "reactive-banana";
version = "1.3.2.0";
sha256 = "0mrsw3hkl0sgwcbay4m1lzs4bilss80g9p6njbbhapbfjyzsr36k";
- revision = "5";
- editedCabalFile = "0dydffvlxf6wlkaj1sf2argrpkfwswjcby2an1rcwrk8gs6dklkv";
+ revision = "6";
+ editedCabalFile = "1kjxyjwq8lzxyz42plb8i3d5awwr3vbk27dlqia9s0j1vp3skyw1";
libraryHaskellDepends = [
base
containers
@@ -558980,7 +560811,7 @@ self: {
sha256 = "0b2syhxan3fpf9h1zq3izpb8bgsl4qrk975afy3r2ji6dhjq81cl";
libraryHaskellDepends = [ base ];
description = "Class for reading bounded values";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -559335,7 +561166,7 @@ self: {
mtl
];
description = "Readline effect for in-other-words";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "echo-repl";
}
@@ -559409,7 +561240,7 @@ self: {
numhask
];
description = "Literate programming support";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "readme-lhs-example";
broken = true;
@@ -559535,7 +561366,7 @@ self: {
QuickCheck
];
description = "Random number generation based on physical media touched by humans";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "real-dice";
}
) { };
@@ -559780,7 +561611,7 @@ self: {
vector
];
description = "SVG file loader and serializer";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -559947,7 +561778,7 @@ self: {
void
];
description = "A more progressive alternative to the \"base\" package";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -559972,6 +561803,49 @@ self: {
}
) { };
+ rebound = callPackage (
+ {
+ mkDerivation,
+ base,
+ containers,
+ deepseq,
+ fin,
+ mtl,
+ QuickCheck,
+ tasty,
+ tasty-hunit,
+ tasty-quickcheck,
+ vec,
+ }:
+ mkDerivation {
+ pname = "rebound";
+ version = "0.1.1.0";
+ sha256 = "0qg2z0fj79iyygdvi0dy7bcbgkffvnxxvspfdq30hlwhjw3h5zxn";
+ libraryHaskellDepends = [
+ base
+ containers
+ deepseq
+ fin
+ mtl
+ QuickCheck
+ vec
+ ];
+ testHaskellDepends = [
+ base
+ containers
+ mtl
+ QuickCheck
+ tasty
+ tasty-hunit
+ tasty-quickcheck
+ ];
+ description = "A variable binding library based on well-scoped de Bruijn indices";
+ license = lib.licensesSpdx."MIT";
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }
+ ) { };
+
rec-def = callPackage (
{
mkDerivation,
@@ -560009,7 +561883,7 @@ self: {
template-haskell
];
description = "Recursively defined values";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
maintainers = [ lib.maintainers.nomeata ];
}
) { };
@@ -560109,7 +561983,7 @@ self: {
vector
];
description = "Recommendations using alternating least squares algorithm";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "movielens";
}
) { };
@@ -560619,7 +562493,7 @@ self: {
vector
];
description = "Recover run-time type information from the GHC heap";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -560943,7 +562817,7 @@ self: {
];
doHaddock = false;
description = "Extensible records and variants indexed by a type-level Red-Black tree";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -561078,7 +562952,7 @@ self: {
unliftio
];
description = "hide secret text on the terminal";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "redact";
}
) { };
@@ -561256,7 +563130,7 @@ self: {
QuickCheck
];
description = "Specify valid redis globs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -561522,7 +563396,6 @@ self: {
];
description = "Combine redis caching and haxl";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}
) { };
@@ -561691,6 +563564,80 @@ self: {
}
) { };
+ reduxwise = callPackage (
+ {
+ mkDerivation,
+ aeson,
+ async,
+ base,
+ bytestring,
+ containers,
+ directory,
+ filepath,
+ mtl,
+ optparse-applicative,
+ regex-tdfa,
+ text,
+ time,
+ yaml,
+ }:
+ mkDerivation {
+ pname = "reduxwise";
+ version = "0.1.0.0";
+ sha256 = "0sq8185siqbrdz4nrajrzrjswlmcpk03gxpqnrrad0cabwa64k99";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson
+ async
+ base
+ bytestring
+ containers
+ directory
+ filepath
+ mtl
+ optparse-applicative
+ regex-tdfa
+ text
+ time
+ yaml
+ ];
+ executableHaskellDepends = [
+ aeson
+ async
+ base
+ bytestring
+ containers
+ directory
+ filepath
+ mtl
+ optparse-applicative
+ regex-tdfa
+ text
+ time
+ yaml
+ ];
+ testHaskellDepends = [
+ aeson
+ async
+ base
+ bytestring
+ containers
+ directory
+ filepath
+ mtl
+ optparse-applicative
+ regex-tdfa
+ text
+ time
+ yaml
+ ];
+ description = "Static analysis tool for Rust embedded systems complexity";
+ license = lib.licensesSpdx."BSD-3-Clause";
+ mainProgram = "reduxwise-exe";
+ }
+ ) { };
+
reedsolomon = callPackage (
{
mkDerivation,
@@ -562025,7 +563972,7 @@ self: {
linear-base
];
description = "A reference counting library to alias linear resources";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -562160,7 +564107,7 @@ self: {
QuickCheck
];
description = "Refinement types with static and runtime checking";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
maintainers = [ lib.maintainers.raehik ];
}
) { };
@@ -562200,7 +564147,7 @@ self: {
unordered-containers
];
description = "Type-checked proof that a key exists in a container and can be safely indexed";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -562558,6 +564505,145 @@ self: {
}
) { };
+ reflex_0_9_4_0 = callPackage (
+ {
+ mkDerivation,
+ base,
+ bifunctors,
+ commutative-semigroups,
+ comonad,
+ constraints,
+ constraints-extras,
+ containers,
+ criterion,
+ data-default,
+ deepseq,
+ dependent-map,
+ dependent-sum,
+ exception-transformers,
+ exceptions,
+ haskell-src-exts,
+ haskell-src-meta,
+ hspec,
+ lens,
+ loch-th,
+ MemoTrie,
+ mmorph,
+ monad-control,
+ monoidal-containers,
+ mtl,
+ patch,
+ prim-uniq,
+ primitive,
+ process,
+ profunctors,
+ random,
+ ref-tf,
+ reflection,
+ semialign,
+ semigroupoids,
+ split,
+ stm,
+ syb,
+ template-haskell,
+ text,
+ these,
+ these-lens,
+ time,
+ transformers,
+ unbounded-delays,
+ witherable,
+ }:
+ mkDerivation {
+ pname = "reflex";
+ version = "0.9.4.0";
+ sha256 = "1ihknackgbms412ixp2mwwmrqd4sak4vm3654nb4dn08rs50fq4f";
+ libraryHaskellDepends = [
+ base
+ bifunctors
+ commutative-semigroups
+ comonad
+ constraints
+ constraints-extras
+ containers
+ data-default
+ dependent-map
+ dependent-sum
+ exception-transformers
+ exceptions
+ haskell-src-exts
+ haskell-src-meta
+ MemoTrie
+ mmorph
+ monad-control
+ monoidal-containers
+ mtl
+ patch
+ prim-uniq
+ primitive
+ profunctors
+ random
+ ref-tf
+ reflection
+ semialign
+ semigroupoids
+ stm
+ syb
+ template-haskell
+ these
+ time
+ transformers
+ unbounded-delays
+ witherable
+ ];
+ testHaskellDepends = [
+ base
+ bifunctors
+ commutative-semigroups
+ constraints
+ constraints-extras
+ containers
+ deepseq
+ dependent-map
+ dependent-sum
+ hspec
+ lens
+ monoidal-containers
+ mtl
+ patch
+ ref-tf
+ semialign
+ split
+ text
+ these
+ these-lens
+ transformers
+ witherable
+ ];
+ benchmarkHaskellDepends = [
+ base
+ containers
+ criterion
+ deepseq
+ dependent-map
+ dependent-sum
+ loch-th
+ mtl
+ primitive
+ process
+ ref-tf
+ split
+ stm
+ time
+ transformers
+ ];
+ description = "Higher-order Functional Reactive Programming";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ maintainers = [ lib.maintainers.alexfmpe ];
+ }
+ ) { };
+
reflex-animation = callPackage (
{
mkDerivation,
@@ -563137,7 +565223,7 @@ self: {
text
];
description = "Compatible highlevel Wigdets for some Ionic Input Components";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -563188,7 +565274,7 @@ self: {
time
];
description = "Render Pandoc documents to HTML using reflex-dom";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -563305,7 +565391,7 @@ self: {
tasty-hspec
];
description = "reflex-dom-th transpiles HTML templates to haskell code for reflex-dom";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -563477,6 +565563,61 @@ self: {
}
) { };
+ reflex-gadt-api_0_3_0_0 = callPackage (
+ {
+ mkDerivation,
+ aeson,
+ aeson-gadt-th,
+ base,
+ constraints-extras,
+ containers,
+ data-default,
+ dependent-sum,
+ jsaddle,
+ reflex,
+ reflex-dom-core,
+ some,
+ text,
+ time,
+ }:
+ mkDerivation {
+ pname = "reflex-gadt-api";
+ version = "0.3.0.0";
+ sha256 = "05v5477ycgyib7w3v4r9gsvl2n8ia9ic9c1jr66az9p6w353zzpf";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson
+ aeson-gadt-th
+ base
+ constraints-extras
+ containers
+ data-default
+ jsaddle
+ reflex
+ reflex-dom-core
+ some
+ text
+ time
+ ];
+ executableHaskellDepends = [
+ aeson
+ aeson-gadt-th
+ base
+ constraints-extras
+ dependent-sum
+ reflex-dom-core
+ text
+ time
+ ];
+ description = "Interact with a GADT API in your reflex-dom application";
+ license = lib.licensesSpdx."BSD-3-Clause";
+ hydraPlatforms = lib.platforms.none;
+ mainProgram = "readme";
+ maintainers = [ lib.maintainers.alexfmpe ];
+ }
+ ) { };
+
reflex-ghci = callPackage (
{
mkDerivation,
@@ -563547,7 +565688,7 @@ self: {
temporary
];
description = "A GHCi widget library for use in reflex applications";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "reflex-ghci";
}
@@ -563775,7 +565916,7 @@ self: {
reflex
];
description = "Reflex bindings for libtelnet";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
platforms = lib.platforms.linux;
hydraPlatforms = lib.platforms.none;
}
@@ -564186,8 +566327,8 @@ self: {
}:
mkDerivation {
pname = "reflex-vty";
- version = "0.6.1.1";
- sha256 = "0i1745p0kgc7y2zfzix1vfljmgi4aq8nqng9c3nsm420jkys3xz6";
+ version = "0.6.2.0";
+ sha256 = "0hl7dy5h6fjmlsxmk142rpp36d6gnhka0k7aa2jci8q7g7i1zs4f";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -564284,6 +566425,8 @@ self: {
];
description = "Add support for using blaze-html with Reform";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -564459,7 +566602,7 @@ self: {
transformers
];
description = "See README for more info";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -564688,7 +566831,7 @@ self: {
];
doHaddock = false;
description = "Register allocation by graph colorization";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -565380,8 +567523,6 @@ self: {
testPkgconfigDepends = [ pcre2 ];
description = "PCRE2 Backend for \"Text.Regex\" (regex-base)";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}
) { inherit (pkgs) pcre2; };
@@ -565543,8 +567684,8 @@ self: {
}:
mkDerivation {
pname = "regex-tdfa";
- version = "1.3.2.4";
- sha256 = "15x7pisdvi0afg7ybxpga8aa4q38x9pz9ml7nhz1f7s4nw9w72q7";
+ version = "1.3.2.5";
+ sha256 = "0y4a0bgyviad013jl67kqhkbwf8b0jqs3qmlsgvq912lk92gng9f";
libraryHaskellDepends = [
array
base
@@ -565559,13 +567700,10 @@ self: {
array
base
bytestring
- containers
directory
doctest-parallel
filepath
- mtl
regex-base
- text
utf8-string
];
description = "Pure Haskell Tagged DFA Backend for \"Text.Regex\" (regex-base)";
@@ -565866,7 +568004,7 @@ self: {
text
];
description = "Types that can only be constructed if they match a regular expression";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -566232,13 +568370,12 @@ self: {
template-haskell,
text,
transformers-base,
- universum,
unliftio,
}:
mkDerivation {
pname = "registry";
- version = "0.6.3.2";
- sha256 = "0av7jira1cvbc1cj570fp5d31vqxkb4w9s4hxlqj4hna5h9s5898";
+ version = "0.6.3.3";
+ sha256 = "1w7v2mrpkl6kqxyvavb6fdqj54fgpkwhh3q56sgkdy9z5ksbn2g8";
libraryHaskellDepends = [
base
containers
@@ -566283,13 +568420,11 @@ self: {
template-haskell
text
transformers-base
- universum
unliftio
];
testToolDepends = [ tasty-discover ];
description = "data structure for assembling components";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}
) { };
@@ -566350,7 +568485,6 @@ self: {
];
description = "Aeson encoders / decoders";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}
) { };
@@ -566417,7 +568551,6 @@ self: {
testToolDepends = [ tasty-discover ];
description = "utilities to work with Hedgehog generators and `registry`";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}
) { };
@@ -566495,7 +568628,6 @@ self: {
testToolDepends = [ tasty-discover ];
description = "Hedgehog generators for Aeson";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}
) { };
@@ -566677,7 +568809,7 @@ self: {
tasty-hunit
];
description = "Simple linear and quadratic regression";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -567181,7 +569313,7 @@ self: {
hspec-discover
];
description = "A data structure representing Relations on Sets";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -567558,7 +569690,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "Automation of Haskell package release process";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
mainProgram = "releaser";
}
) { };
@@ -567758,8 +569890,8 @@ self: {
}:
mkDerivation {
pname = "relocant";
- version = "1.0.0";
- sha256 = "1iazymf953msr6d7dn99slw12wmnivnx5nfzjbq8h4f84ybwmvr6";
+ version = "1.1.0";
+ sha256 = "0wfifgvaxpjygyc0bcrcasln2mmsc7x0avd0ia6jjwcd9cx9d6mh";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [
@@ -567797,9 +569929,7 @@ self: {
];
description = "A PostgreSQL migration CLI tool and library";
license = lib.licenses.bsd2;
- hydraPlatforms = lib.platforms.none;
mainProgram = "relocant";
- broken = true;
}
) { };
@@ -567829,7 +569959,7 @@ self: {
transformers
];
description = "Equiprobable draw from publicly verifiable random data";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
}
) { };
@@ -567856,6 +569986,8 @@ self: {
pname = "relude";
version = "1.2.2.2";
sha256 = "1865bladis4czglyvkcj05qh3fr2bvrm1w5dm5gz3wjs2cnsivci";
+ revision = "1";
+ editedCabalFile = "130ifkvrksr7p87sll4spgp9xp9cpgfcmy07ibp1j80xjw5wf7sy";
libraryHaskellDepends = [
base
bytestring
@@ -567884,7 +570016,7 @@ self: {
unordered-containers
];
description = "Safe, performant, user-friendly and lightweight Haskell Standard Library";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -568463,7 +570595,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Reorder expressions in a syntax tree according to operator fixities";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -569184,7 +571316,7 @@ self: {
text
];
description = "Find, replace, split string patterns with Megaparsec parsers (instead of regex)";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
maintainers = [ lib.maintainers.maralorn ];
}
) { };
@@ -569746,7 +571878,7 @@ self: {
testToolDepends = [ hspec-discover ];
doCheck = false;
description = "HTTP client library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.maralorn ];
}
) { };
@@ -569796,7 +571928,7 @@ self: {
weigh
];
description = "Conduit helpers for the req HTTP client library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -569951,8 +572083,8 @@ self: {
}:
mkDerivation {
pname = "request";
- version = "0.3.0.0";
- sha256 = "1cankhlqmqcs1qnrqf2k53vdwdp3x2dh7gqz37cynvi7ndxzxavd";
+ version = "0.3.1.0";
+ sha256 = "1w9l1imizdnksz2czpmf2l9plc9vkzk5ymvdhm79275acc2a5b9h";
libraryHaskellDepends = [
base
bytestring
@@ -570096,7 +572228,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Propagate HasCallStack with constraints";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -570134,6 +572266,8 @@ self: {
pname = "rere";
version = "0.2.0.2";
sha256 = "14lmqbihrhy9cdskxgk9l36ndr323vqiwxs8fry5s64gg00ahlyf";
+ revision = "1";
+ editedCabalFile = "018hk8ng0ca1z37wvm8vr1cfh13dmha300cq1l9mzxvkm7nkbp4m";
libraryHaskellDepends = [
base
containers
@@ -570161,7 +572295,7 @@ self: {
parsec
];
description = "Regular-expressions extended with fixpoints for context-free powers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -570173,7 +572307,7 @@ self: {
sha256 = "047wlwvffmgg70d70dsv6160wq6hfxp4frb0414np270grq0vk3p";
libraryHaskellDepends = [ rebase ];
description = "Reexports from \"base\" with a bunch of other standard libraries";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -570472,7 +572606,7 @@ self: {
semigroupoids
];
description = "High performance variable binders";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -570535,7 +572669,7 @@ self: {
tasty-hunit
];
description = "Domain Name Service (DNS) lookup via the libresolv standard library routines";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
}
) { };
@@ -570681,7 +572815,7 @@ self: {
stm
];
description = "A region-based resource effect for the effectful ecosystem";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -570732,7 +572866,7 @@ self: {
time
];
description = "A high-performance striped resource pooling implementation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -570759,7 +572893,7 @@ self: {
time
];
description = "A high-performance striped resource pooling implementation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -570897,7 +573031,7 @@ self: {
tree-diff
];
description = "Track allocated resources";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -570986,7 +573120,7 @@ self: {
resourcet
];
description = "Adaptation of the resourcet library for the effectful ecosystem";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -571013,7 +573147,7 @@ self: {
unliftio-core
];
description = "ResourceT extras";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -571072,7 +573206,7 @@ self: {
utf8-string
];
description = "A fast, non-backtracking parser for the redis RESP3 protocol";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -571964,7 +574098,7 @@ self: {
unix
];
description = "A tool that returns to a landmark parent directory";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "ret";
}
) { };
@@ -572183,97 +574317,6 @@ self: {
}
) { };
- retrie_1_1_0_0 = callPackage (
- {
- mkDerivation,
- ansi-terminal,
- async,
- base,
- bytestring,
- containers,
- data-default,
- deepseq,
- directory,
- filepath,
- ghc,
- ghc-exactprint,
- ghc-paths,
- haskell-src-exts,
- HUnit,
- list-t,
- mtl,
- optparse-applicative,
- process,
- random-shuffle,
- syb,
- tasty,
- tasty-hunit,
- temporary,
- text,
- transformers,
- unordered-containers,
- }:
- mkDerivation {
- pname = "retrie";
- version = "1.1.0.0";
- sha256 = "148d1pl52mac4mz4pl9qmmynjjbzygg4x6vlsyblb268drcjn3f8";
- revision = "1";
- editedCabalFile = "1v2x7n71vvhpybmzqlxg5bqg7ac5zqx1q4ji342xgmy2dfjq29d3";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- ansi-terminal
- async
- base
- bytestring
- containers
- data-default
- directory
- filepath
- ghc
- ghc-exactprint
- list-t
- mtl
- optparse-applicative
- process
- random-shuffle
- syb
- text
- transformers
- unordered-containers
- ];
- executableHaskellDepends = [
- base
- haskell-src-exts
- ];
- testHaskellDepends = [
- base
- containers
- data-default
- deepseq
- directory
- filepath
- ghc
- ghc-paths
- haskell-src-exts
- HUnit
- mtl
- optparse-applicative
- process
- syb
- tasty
- tasty-hunit
- temporary
- text
- unordered-containers
- ];
- description = "A powerful, easy-to-use codemodding tool for Haskell";
- license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
- broken = true;
- }
- ) { };
-
retrie = callPackage (
{
mkDerivation,
@@ -572544,7 +574587,7 @@ self: {
tasty-hunit
];
description = "Adaptation of the retry library for the effectful ecosystem";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -572584,7 +574627,7 @@ self: {
sha256 = "110hbw4b8gbkgszc7d77rw9qpiwsz4lvsfbsb4cpw9fwzrcpvwnh";
libraryHaskellDepends = [ base ];
description = "A library to provide special kind of big numbers writing";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -572706,7 +574749,7 @@ self: {
deepseq
];
description = "reversed lists/snoc lists";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -573583,7 +575626,7 @@ self: {
vector-sized
];
description = "Functional Reactive Programming with type-level clocks";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.turion ];
}
) { };
@@ -574053,7 +576096,7 @@ self: {
warp
];
description = "Static site generator based on Shake";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -574117,7 +576160,7 @@ self: {
warp
];
description = "Static site generator based on Shake";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -574207,7 +576250,7 @@ self: {
tasty
];
description = "Neovim plugin framework for Polysemy";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -574266,7 +576309,7 @@ self: {
tasty
];
description = "CLI for Ribosome";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
hydraPlatforms = lib.platforms.none;
mainProgram = "ribosome";
}
@@ -574349,7 +576392,7 @@ self: {
tasty
];
description = "Neovim plugin host for Polysemy";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -574383,7 +576426,7 @@ self: {
ribosome-host
];
description = "Test tools for Ribosome";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -574552,7 +576595,7 @@ self: {
tasty
];
description = "Test tools for Ribosome";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -574596,7 +576639,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Rich environment variable setup for Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -574966,7 +577009,7 @@ self: {
QuickCheck
];
description = "mutable ring buffers with atomic updates in GHC Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -575035,8 +577078,8 @@ self: {
}:
mkDerivation {
pname = "rio";
- version = "0.1.22.0";
- sha256 = "0rpc4f2yvw0y6mqz9ykm3778j6srya7ssww691kpf9nb8vddgjb6";
+ version = "0.1.23.0";
+ sha256 = "089bj6wqh872iy64ivk2wq9g4zb1748kj1wrgk2aa1j5pfbh1cic";
libraryHaskellDepends = [
base
bytestring
@@ -575293,7 +577336,7 @@ self: {
unliftio-messagebox
];
description = "A library for process pools coupled with asynchronous message queues";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "rio-process-pool-memleak-test";
}
@@ -575599,7 +577642,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "A DSL for Risk-oriented Object Detection Requirements";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -576072,7 +578115,7 @@ self: {
vector
];
description = "Reed-Muller Expansion normal form for Boolean Formulas";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -576103,7 +578146,7 @@ self: {
what4
];
description = "What4 adapter for the RME solver";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -576353,6 +578396,78 @@ self: {
}
) { };
+ robin-hood-profit = callPackage (
+ {
+ mkDerivation,
+ attoparsec-isotropic,
+ base,
+ bytestring,
+ containers,
+ Decimal,
+ directory,
+ exceptions,
+ filepath,
+ generic-lens,
+ lens,
+ mtl,
+ optparse-applicative,
+ relude,
+ semigroups,
+ tasty,
+ tasty-discover,
+ tasty-hunit,
+ tasty-quickcheck,
+ template-haskell,
+ text,
+ time,
+ trace-embrace,
+ }:
+ mkDerivation {
+ pname = "robin-hood-profit";
+ version = "0.0.2";
+ sha256 = "164qaimp3q6jbdzm4mfq1ynj5bhh5qpzgd04qqmhn4frd5vndi9x";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ attoparsec-isotropic
+ base
+ bytestring
+ containers
+ Decimal
+ directory
+ exceptions
+ filepath
+ generic-lens
+ lens
+ mtl
+ optparse-applicative
+ relude
+ semigroups
+ template-haskell
+ text
+ time
+ trace-embrace
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ attoparsec-isotropic
+ base
+ relude
+ tasty
+ tasty-discover
+ tasty-hunit
+ tasty-quickcheck
+ text
+ ];
+ testToolDepends = [ tasty-discover ];
+ description = "Calculate per instrument profit from Robin-Hood activity report";
+ license = lib.licensesSpdx."BSD-3-Clause";
+ hydraPlatforms = lib.platforms.none;
+ mainProgram = "rhprofit";
+ broken = true;
+ }
+ ) { };
+
roboservant = callPackage (
{
mkDerivation,
@@ -576388,8 +578503,8 @@ self: {
}:
mkDerivation {
pname = "roboservant";
- version = "0.1.0.3";
- sha256 = "1qcxhmppvpbibzq6mmqzz891pmi9c6cjjvxjyn8vlhvydgklh6x4";
+ version = "0.1.0.4";
+ sha256 = "06lna80a0y9bzbbqa32jjrjf7nkgwzdg68ilmr9gf9ss7a8yvljl";
libraryHaskellDepends = [
base
bytestring
@@ -576445,6 +578560,8 @@ self: {
testToolDepends = [ markdown-unlit ];
description = "Automatic session-aware servant testing";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -576483,6 +578600,7 @@ self: {
directory,
heredoc,
hspec,
+ hspec-discover,
old-locale,
QuickCheck,
time,
@@ -576490,8 +578608,8 @@ self: {
}:
mkDerivation {
pname = "robots-txt";
- version = "0.4.1.8";
- sha256 = "0f6s07zdzjjhx4vk2khrh6y2mhfgjxlg3y3l07riiy171qzp9gkd";
+ version = "0.4.1.9";
+ sha256 = "0fv6wfp3p6p31v6v18p75k7n7fsj11p0kir3f55c4zbcw20fmf1w";
libraryHaskellDepends = [
attoparsec
base
@@ -576509,6 +578627,7 @@ self: {
QuickCheck
transformers
];
+ testToolDepends = [ hspec-discover ];
description = "Parser for robots.txt";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
@@ -576607,7 +578726,7 @@ self: {
vector-sized
];
description = "Implementation of the ROC (Taiwan) National ID standard";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -577474,7 +579593,7 @@ self: {
integer-gmp
];
description = "RON";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -577581,7 +579700,7 @@ self: {
unordered-containers
];
description = "Replicated Data Types (RON-RDT)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -577621,7 +579740,7 @@ self: {
transformers
];
description = "RON-Schema";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -577667,7 +579786,7 @@ self: {
transformers
];
description = "RON Storage";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -577939,7 +580058,7 @@ self: {
quickcheck-classes
];
description = "rose trees";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -578548,7 +580667,7 @@ self: {
vector
];
description = "Directed rounding for built-in floating types";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -579608,7 +581727,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Let your mind know that your hands need a rest!";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -579739,7 +581858,7 @@ self: {
xml-types
];
description = "Streaming parser/renderer for the RSS standard";
- license = lib.licenses.cc0;
+ license = lib.licensesSpdx."CC0-1.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -579830,7 +581949,7 @@ self: {
ghc-prim
];
description = "stream-fusion framework from vector";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -579844,7 +581963,7 @@ self: {
sha256 = "18kpashzq6wnf1yc2xvz7l6c53v45yimzsahaavdf60pvw4zfhrx";
libraryHaskellDepends = [ base ];
description = "A more fine-grained version of state threads (ST)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -580459,7 +582578,7 @@ self: {
primitive-unlifted
];
description = "runST without boxing penalty";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -580557,7 +582676,7 @@ self: {
process
];
description = "Stack wrapper for single-file Haskell programs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "runhs";
broken = true;
@@ -580672,7 +582791,7 @@ self: {
type-reflection
];
description = "Look up class instances at runtime";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -580737,7 +582856,7 @@ self: {
transformers
];
description = "TLS bindings for Rustls";
- license = lib.licenses.cc0;
+ license = lib.licensesSpdx."CC0-1.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -581655,7 +583774,7 @@ self: {
QuickCheck
];
description = "Recursive Arbitrary instances without headaches";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -582058,7 +584177,7 @@ self: {
doctest
];
description = "Safe arithmetic operations";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -582178,7 +584297,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Use RecordWildCards safely";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -583032,7 +585151,7 @@ self: {
HUnit
];
description = "Semantic version numbers and constraints";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -583332,7 +585451,7 @@ self: {
storable-record
];
description = "Handling of samples in an (audio) signal";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -583354,7 +585473,7 @@ self: {
sample-frame
];
description = "Orphan instances for types from sample-frame and numericprelude";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -583414,7 +585533,7 @@ self: {
tasty-quickcheck
];
description = "A stable adaptive mergesort implementation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -583991,8 +586110,8 @@ self: {
}:
mkDerivation {
pname = "sandwich-contexts-kubernetes";
- version = "0.1.1.1";
- sha256 = "186xbfpx2fgvckzmagmxw3cyp6k1avk3jvdii9857i3xwccinc1s";
+ version = "0.1.2.0";
+ sha256 = "19nvallfy3cqwapdsgxp6pwnxrqycb10awlgac9hx5l6m3qmp7w5";
libraryHaskellDepends = [
aeson
base
@@ -584396,14 +586515,13 @@ self: {
}
) { };
- sandwich-webdriver_0_4_0_1 = callPackage (
+ sandwich-webdriver_0_4_0_2 = callPackage (
{
mkDerivation,
aeson,
base,
bytestring,
containers,
- data-default,
directory,
exceptions,
filepath,
@@ -584412,11 +586530,8 @@ self: {
http-conduit,
http-types,
microlens,
- microlens-aeson,
- monad-control,
monad-logger,
mtl,
- network,
process,
random,
regex-tdfa,
@@ -584433,19 +586548,17 @@ self: {
unliftio,
unliftio-core,
unordered-containers,
- vector,
webdriver,
}:
mkDerivation {
pname = "sandwich-webdriver";
- version = "0.4.0.1";
- sha256 = "1q2ipwvyn4l9zch5h6cgbvgcjbrywpc5zrz2y9bdlbhdpdk9a2iv";
+ version = "0.4.0.2";
+ sha256 = "1ixcq0vffy4awfv5dimkdq9yzkrbnjm046vsls6pvy1b5dlp9nb6";
libraryHaskellDepends = [
aeson
base
bytestring
containers
- data-default
directory
exceptions
filepath
@@ -584454,11 +586567,8 @@ self: {
http-conduit
http-types
microlens
- microlens-aeson
- monad-control
monad-logger
mtl
- network
process
random
regex-tdfa
@@ -584475,7 +586585,6 @@ self: {
unliftio
unliftio-core
unordered-containers
- vector
webdriver
];
testHaskellDepends = [
@@ -584483,7 +586592,6 @@ self: {
base
bytestring
containers
- data-default
directory
exceptions
filepath
@@ -584492,11 +586600,8 @@ self: {
http-conduit
http-types
microlens
- microlens-aeson
- monad-control
monad-logger
mtl
- network
process
random
regex-tdfa
@@ -584513,7 +586618,6 @@ self: {
unliftio
unliftio-core
unordered-containers
- vector
webdriver
];
description = "Sandwich integration with Selenium WebDriver";
@@ -584710,7 +586814,9 @@ self: {
];
testToolDepends = [ alex ];
description = "A staged lexer generator";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -584814,7 +586920,7 @@ self: {
containers
];
description = "A high-level wrapper over minisat";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -584865,7 +586971,7 @@ self: {
base
];
description = "SAT encoding monad";
- license = lib.licenses.gpl2Only;
+ license = lib.licensesSpdx."GPL-2.0-only";
}
) { };
@@ -585041,11 +587147,11 @@ self: {
];
doHaddock = false;
description = "Handle POSIX cron schedules";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
- saturn_1_1_0_0 = callPackage (
+ saturn_1_1_0_2 = callPackage (
{
mkDerivation,
base,
@@ -585060,8 +587166,8 @@ self: {
}:
mkDerivation {
pname = "saturn";
- version = "1.1.0.0";
- sha256 = "0qwv38aas0lv01bgbdrl60bikkpx7wm1zij7jyyb07y4615ssrjx";
+ version = "1.1.0.2";
+ sha256 = "0pixf0xb1y5l0r9hp1d9jvgxdqy8flmrrppaz294p1yjryavk6kq";
libraryHaskellDepends = [
base
containers
@@ -585079,7 +587185,7 @@ self: {
hspec-core
];
description = "Handle POSIX cron schedules";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -585182,7 +587288,7 @@ self: {
time
];
description = "The eye that watches everything you did on Twitter";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "sauron";
}
@@ -585370,7 +587476,7 @@ self: {
text
];
description = "Construction of context-adjusted pretty output";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -585448,6 +587554,81 @@ self: {
}
) { };
+ sbp_6_3_0 = callPackage (
+ {
+ mkDerivation,
+ aeson,
+ aeson-pretty,
+ array,
+ base,
+ base64-bytestring,
+ basic-prelude,
+ binary,
+ binary-conduit,
+ bytestring,
+ cmdargs,
+ conduit,
+ conduit-extra,
+ data-binary-ieee754,
+ lens,
+ lens-aeson,
+ monad-loops,
+ resourcet,
+ tasty,
+ tasty-hunit,
+ template-haskell,
+ text,
+ time,
+ yaml,
+ }:
+ mkDerivation {
+ pname = "sbp";
+ version = "6.3.0";
+ sha256 = "0s8v31ivnsxm0wnxzbx4s1c0z5hfndkpq91fnfg0zq6bmlwc504w";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson
+ array
+ base
+ base64-bytestring
+ basic-prelude
+ binary
+ bytestring
+ data-binary-ieee754
+ lens
+ lens-aeson
+ monad-loops
+ template-haskell
+ text
+ ];
+ executableHaskellDepends = [
+ aeson
+ aeson-pretty
+ base
+ basic-prelude
+ binary-conduit
+ bytestring
+ cmdargs
+ conduit
+ conduit-extra
+ lens
+ resourcet
+ time
+ yaml
+ ];
+ testHaskellDepends = [
+ base
+ basic-prelude
+ tasty
+ tasty-hunit
+ ];
+ description = "SwiftNav's SBP Library";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
sbp2udp = callPackage (
{
mkDerivation,
@@ -585583,7 +587764,7 @@ self: {
time
];
description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -585684,7 +587865,7 @@ self: {
time
];
description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -585758,7 +587939,7 @@ self: {
tasty-golden
];
description = "Formally prove properties of Haskell programs using SBV/SMT";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -586401,7 +588582,7 @@ self: {
unliftio-core
];
description = "Metadata types for Albedo Scanners";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -586794,7 +588975,7 @@ self: {
transformers
];
description = "Pure deterministic scheduled computations";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
}
) { };
@@ -587640,7 +589821,7 @@ self: {
x509-store
];
description = "Haskell query for SciDB via shim";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
mainProgram = "hquery";
broken = true;
@@ -587800,7 +589981,7 @@ self: {
scientific
];
description = "Scientific notation intended for tokenization";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -588180,7 +590361,7 @@ self: {
unliftio
];
description = "CPS resource allocation but as a Monad and completely safe";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
maintainers = [ lib.maintainers.mangoiv ];
}
) { };
@@ -588625,6 +590806,7 @@ self: {
description = "Combine scotty and haxl";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -589230,7 +591412,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "Take screenshot and copy it to the system clipboard";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "screenshot-to-clipboard";
broken = true;
@@ -590127,7 +592309,7 @@ self: {
executableSystemDepends = [ SDL2_mixer ];
executablePkgconfigDepends = [ SDL2_mixer ];
description = "Haskell bindings to SDL2_mixer";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
badPlatforms = lib.platforms.darwin;
hydraPlatforms = lib.platforms.none;
broken = true;
@@ -591602,7 +593784,7 @@ self: {
text-display
];
description = "Cryptography for the casual user";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.mangoiv ];
}
) { };
@@ -591624,6 +593806,8 @@ self: {
pname = "selda";
version = "0.5.2.0";
sha256 = "1n0zkd80a9z83q5nld0gyg2p25nfy4rjkihql88binhknhk3hkgk";
+ revision = "1";
+ editedCabalFile = "1vr4yzwvqp9wd7l6yxf7r6vc78bpy2b6n3mx81ximsr7mlpxwg86";
libraryHaskellDepends = [
base
bytestring
@@ -591782,7 +593966,7 @@ self: {
simple-prompt
];
description = "Select a subset of RPM packages";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -592031,7 +594215,7 @@ self: {
sha256 = "17vfwyjr3pxzjf35lhqqxid5bds52vk0gdqmnq4hvbjin3l07l98";
libraryHaskellDepends = [ base ];
description = "Framework and service for analyzing and diffing untrusted code";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -592076,7 +594260,7 @@ self: {
text
];
description = "Types and functionality for working with source code";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -592128,7 +594312,7 @@ self: {
unix
];
description = "Cross-platform abstraction for system semaphores";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -592451,7 +594635,7 @@ self: {
semigroupoids
];
description = "Support for QualifiedDo with semigroupoids classes";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -592550,8 +594734,8 @@ self: {
}:
mkDerivation {
pname = "semilattices";
- version = "0.0.0.8";
- sha256 = "05dmnszyxssbjzw6f7qwq3slzd913afn562f2rnc54q9719xyybn";
+ version = "0.0.0.9";
+ sha256 = "1q0sm7q4v7pwvrv1sak5vchwcsqsrglhxqsaaz0bqpjhirw90qk6";
libraryHaskellDepends = [
base
containers
@@ -592564,7 +594748,7 @@ self: {
quickcheck-instances
];
description = "Semilattices";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -593108,7 +595292,7 @@ self: {
wreq
];
description = "A tool to send command execution results to Sensu";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "sensu-run";
broken = true;
@@ -593772,7 +595956,7 @@ self: {
transformers
];
description = "Sequences and measured sequences";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -594029,7 +596213,7 @@ self: {
QuickCheck
];
description = "Grammar-based compression algorithms SEQUITUR";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -594118,7 +596302,7 @@ self: {
tasty-quickcheck
];
description = "`binary` backend for `serdoc`";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -594155,7 +596339,7 @@ self: {
tasty-quickcheck
];
description = "Generated documentation of serialization formats";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -594401,7 +596585,7 @@ self: {
uuid-types
];
description = "Encode and decode UUID values in CBOR using uuid-types, cborg and serialise";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -594437,20 +596621,30 @@ self: {
serialport = callPackage (
{
mkDerivation,
+ async,
base,
bytestring,
HUnit,
+ optparse-applicative,
unix,
}:
mkDerivation {
pname = "serialport";
- version = "0.5.6";
- sha256 = "00cymqx8jnlanv75kqgb00harhv8prgk23gwwvadqlzdfv119iql";
+ version = "0.6.0";
+ sha256 = "0npkywiq7gcprlsjq0hlf5zwq882bq8v7cvlqkq2dy7xfh75195h";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
base
bytestring
+ optparse-applicative
unix
];
+ executableHaskellDepends = [
+ async
+ base
+ optparse-applicative
+ ];
testHaskellDepends = [
base
bytestring
@@ -594458,6 +596652,7 @@ self: {
];
description = "Cross platform serial port library";
license = lib.licenses.bsd3;
+ mainProgram = "serialport";
}
) { };
@@ -594758,7 +596953,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "A family of combinators for defining webservices APIs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -594835,7 +597030,7 @@ self: {
text
];
description = "Servant endpoints compatible with Rails's ActiveResource";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -594916,7 +597111,7 @@ self: {
webdriver
];
description = "Generates a TypeScript client for Servant APIs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "tests";
}
@@ -595022,7 +597217,7 @@ self: {
unordered-containers
];
description = "Authentication combinators for servant";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -595085,7 +597280,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "servant-client/servant-auth compatibility";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -595227,7 +597422,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "servant-docs/servant-auth compatibility";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -595441,7 +597636,7 @@ self: {
markdown-unlit
];
description = "servant-server/servant-auth compatibility";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -595487,7 +597682,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "servant-swagger/servant-auth compatibility";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -596283,7 +598478,7 @@ self: {
markdown-unlit
];
description = "Automatic derivation of querying functions for servant";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -596353,7 +598548,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Core functionality and class for client function generation for servant APIs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -596402,7 +598597,7 @@ self: {
transformers-base
];
description = "A servant client for frontend JavaScript";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -596580,7 +598775,7 @@ self: {
warp
];
description = "Servant Stream support for conduit";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -596836,7 +599031,7 @@ self: {
transformers
];
description = "generate API docs for your servant webservice";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "greet-docs";
}
) { };
@@ -596877,7 +599072,7 @@ self: {
servant
];
description = "Generate endpoints overview for Servant API";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -597116,7 +599311,7 @@ self: {
];
testToolDepends = [ markdown-unlit ];
description = "Servant Errors wai-middlware";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -597351,7 +599546,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Helpers for generating clients for servant APIs in any programming language";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -597599,7 +599794,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "HATEOAS extension for servant";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -597685,6 +599880,7 @@ self: {
description = "automatical derivation of querying functions for servant webservices";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -597751,7 +599947,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Servant authentication with HMAC";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -597894,7 +600090,7 @@ self: {
markdown-unlit
];
description = "Automatic derivation of querying functions for servant";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -598112,7 +600308,7 @@ self: {
text
];
description = "JSON-RPC messages and endpoints";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -598137,7 +600333,7 @@ self: {
servant-jsonrpc
];
description = "Generate JSON-RPC servant clients";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -598164,7 +600360,7 @@ self: {
servant-server
];
description = "JSON-RPC servant servers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -598247,20 +600443,22 @@ self: {
containers,
safe-coloured-text,
servant,
+ servant-multipart,
servant-server,
sydtest,
text,
}:
mkDerivation {
pname = "servant-lint";
- version = "0.1.0.0";
- sha256 = "1y9fc8kp8mclxm0njpdn121k7qa4f4vnwkcxr658pd26g34daqqk";
+ version = "0.1.1.0";
+ sha256 = "0l7mv0f3s97jr5y1nsq98kmm6d8zjcrdfwq2alg9kxvw4g8klcyl";
libraryHaskellDepends = [
base
bytestring
containers
safe-coloured-text
servant
+ servant-multipart
servant-server
text
];
@@ -598270,12 +600468,13 @@ self: {
containers
safe-coloured-text
servant
+ servant-multipart
servant-server
sydtest
text
];
description = "Lint Servant Routes";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -598359,7 +600558,7 @@ self: {
warp
];
description = "Servant Stream support for machines";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -599147,7 +601346,7 @@ self: {
warp
];
description = "Servant Stream support for pipes";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -599214,7 +601413,7 @@ self: {
warp
];
description = "Utilities for using servant in a polysemy stack";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -599338,7 +601537,7 @@ self: {
warp
];
description = "Helpers for using prometheus with servant";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -599569,7 +601768,7 @@ self: {
servant-queryparam-core
];
description = "Client support for servant-queryparam-core";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -599590,7 +601789,7 @@ self: {
servant
];
description = "Use records for query parameters in servant APIs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -599615,7 +601814,7 @@ self: {
servant-queryparam-core
];
description = "Instances of classes from openapi3 for servant-queryparam-core";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -599640,7 +601839,7 @@ self: {
text
];
description = "Server support for servant-queryparam-core";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -599729,7 +601928,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "QuickCheck entire APIs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -600123,7 +602322,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Generate route descriptions from Servant APIs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -600171,7 +602370,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Golden test your Servant APIs using `servant-routes`";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -600517,7 +602716,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "A family of combinators for defining webservices APIs and serving them";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "greet";
}
) { };
@@ -601269,7 +603468,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API.";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -602134,7 +604333,7 @@ self: {
xmlbf-xeno
];
description = "Servant support for the XML Content-Type";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -602163,7 +604362,7 @@ self: {
xml-types
];
description = "Servant XML content-type with support for xml-conduit";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -603238,7 +605437,7 @@ self: {
utility-ht
];
description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -603456,8 +605655,8 @@ self: {
pname = "setlocale";
version = "1.0.0.10";
sha256 = "19rv89jkhq5ic7j5rzpygnmsbzim2mn8ip0m292za613q88gywir";
- revision = "6";
- editedCabalFile = "18i818q67cxfgz7q8zm6a0z032rh0yjhk375f99jwqh9da2h67fb";
+ revision = "7";
+ editedCabalFile = "0mmv245b6dxm4m6lhrnp1bccaklwd222086n952jhgi44hw2iq4a";
libraryHaskellDepends = [ base ];
description = "Haskell bindings to setlocale";
license = lib.licenses.bsd3;
@@ -604371,7 +606570,7 @@ self: {
vector
];
description = "Validation SHA Implementations";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -604404,7 +606603,7 @@ self: {
primitive
];
description = "SHA-1 Hash";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -604918,7 +607117,7 @@ self: {
text
];
description = "Build rules for historical benchmarking";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
maintainers = [ lib.maintainers.maralorn ];
}
) { };
@@ -605869,7 +608068,7 @@ self: {
}
) { };
- shakespeare_2_1_4 = callPackage (
+ shakespeare_2_1_7_1 = callPackage (
{
mkDerivation,
aeson,
@@ -605883,6 +608082,7 @@ self: {
file-embed,
ghc-prim,
hspec,
+ hspec-discover,
HUnit,
parsec,
process,
@@ -605897,8 +608097,8 @@ self: {
}:
mkDerivation {
pname = "shakespeare";
- version = "2.1.4";
- sha256 = "1c9lvb0aw00r0wibm061c614phlwsrf888amjn9nc168ix0cxv6x";
+ version = "2.1.7.1";
+ sha256 = "06fix8z3kjgl50k5srbixi100jx5rf050xbh9f564n4s5q2irbys";
libraryHaskellDepends = [
aeson
base
@@ -605940,6 +608140,7 @@ self: {
time
transformers
];
+ testToolDepends = [ hspec-discover ];
description = "A toolkit for making compile-time interpolated templates";
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
@@ -606104,7 +608305,7 @@ self: {
vector
];
description = "“Shuffle and merge overlapping chunks” lossless compression";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -606161,7 +608362,7 @@ self: {
QuickCheck
];
description = "Shannon-fano compression algorithm in Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "shannon-fano";
}
) { };
@@ -606612,7 +608813,7 @@ self: {
template-haskell
];
description = "Transform a shell script into a series of scripts with only shebang lines";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "shebanger";
}
) { };
@@ -606955,7 +609156,7 @@ self: {
text
];
description = "A tool for generating shell.nix files";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
mainProgram = "nix-shellify";
maintainers = [ lib.maintainers.danielrolls ];
}
@@ -607099,7 +609300,7 @@ self: {
Glob
];
description = "Out of the shell solution for scripting in Haskell";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
mainProgram = "readme";
}
) { };
@@ -607204,8 +609405,8 @@ self: {
}:
mkDerivation {
pname = "shellwords";
- version = "0.1.4.4";
- sha256 = "1609i2s68hx3h9zbjyfwdj286w1acrd8z9m7g7f9slbdk9ps3hn5";
+ version = "0.1.4.6";
+ sha256 = "00jadd023d3c03d9l69i2dif8zw7x9pdjfxwr2923sv7pc03pqd8";
libraryHaskellDepends = [
base
megaparsec
@@ -607645,7 +609846,7 @@ self: {
isLibrary = false;
isExecutable = true;
description = "Examples for the shine package";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -607957,7 +610158,7 @@ self: {
tasty-bench
];
description = "Additional ShortByteString API";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -607997,8 +610198,8 @@ self: {
}:
mkDerivation {
pname = "shortcut-links";
- version = "0.5.1.1";
- sha256 = "0567igvyl43fa06h7dq2lww0ing00n24xgmd25vhgx6kvnawnb90";
+ version = "0.5.2.0";
+ sha256 = "1gmw54vbk6glpa91jylnjw2k8mj2sz3w7xqpqzivrsjjxiq9xz9b";
libraryHaskellDepends = [
base
text
@@ -608008,9 +610209,7 @@ self: {
doctest
];
description = "Link shortcuts for use in text markup";
- license = lib.licenses.mpl20;
- hydraPlatforms = lib.platforms.none;
- broken = true;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -608460,7 +610659,7 @@ self: {
vector
];
description = "Generate swift types from haskell types";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -608528,7 +610727,7 @@ self: {
tasty-quickcheck
];
description = "timers using SI units (seconds)";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -609205,6 +611404,7 @@ self: {
case-insensitive,
crypton,
exceptions,
+ heck,
http-types,
memory,
tasty,
@@ -609215,14 +611415,15 @@ self: {
}:
mkDerivation {
pname = "signet";
- version = "0.2025.5.21";
- sha256 = "01rrc4l5a4vl2mmymckdl5shicgx7n909nzdqn8xnk8626whc93p";
+ version = "1.0.0.0";
+ sha256 = "1wpjsxknlbd2wxiv93mjypcw4s0cryyc4pavgl6dfygwrbb83z8r";
libraryHaskellDepends = [
base
bytestring
case-insensitive
crypton
exceptions
+ heck
http-types
memory
text
@@ -609230,12 +611431,13 @@ self: {
];
testHaskellDepends = [
base
+ heck
tasty
tasty-hunit
transformers
];
description = "Standard Webhooks";
- license = lib.licenses.bsd0;
+ license = lib.licensesSpdx."0BSD";
}
) { };
@@ -609281,7 +611483,7 @@ self: {
text
];
description = "Calculate expressions involving significant figures";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "significant-figures-cli";
broken = true;
@@ -609422,7 +611624,7 @@ self: {
prettyprinter
];
description = "Prettyprinting transformers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -609513,7 +611715,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "A Haskell interface to simdutf";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -609578,7 +611780,7 @@ self: {
text
];
description = "A library to fetch and parse financial data from the SimFin(+) API";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -609975,6 +612177,34 @@ self: {
}
) { };
+ simple-cabal_0_2_0 = callPackage (
+ {
+ mkDerivation,
+ base,
+ bytestring,
+ Cabal,
+ directory,
+ filepath,
+ safe,
+ }:
+ mkDerivation {
+ pname = "simple-cabal";
+ version = "0.2.0";
+ sha256 = "1mrsa53sacjji56xj3wkp2yd0skblrxnqzq7myy60a7nk6brb30g";
+ libraryHaskellDepends = [
+ base
+ bytestring
+ Cabal
+ directory
+ filepath
+ safe
+ ];
+ description = "Cabal compatibility wrapper library";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
simple-cairo = callPackage (
{
mkDerivation,
@@ -611493,7 +613723,7 @@ self: {
text
];
description = "A parser for SQL";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -612487,7 +614717,7 @@ self: {
hspec
];
description = "Simple pool";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -612638,7 +614868,7 @@ self: {
xext
];
description = "A programming language for simple GUIs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "sindre";
broken = true;
@@ -612680,7 +614910,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "a class for single tuple implementations";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -612714,7 +614944,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Like singletons, but much smaller";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -612743,7 +614973,7 @@ self: {
some
];
description = "Type level booleans";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -612930,7 +615160,7 @@ self: {
];
testToolDepends = [ singletons-base-code-generator ];
description = "A promoted and singled version of the base library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -612954,7 +615184,7 @@ self: {
filepath
];
description = "Code generator for the singletons-base test suite";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "singletons-base-code-generator";
broken = true;
@@ -612980,7 +615210,7 @@ self: {
singletons-base
];
description = "An optional type with type level default";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -613013,7 +615243,7 @@ self: {
transformers
];
description = "Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -613282,7 +615512,7 @@ self: {
vector
];
description = "Encode and decode CSV files";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -613702,7 +615932,7 @@ self: {
vector
];
description = "Sized sequence data-types";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -613861,7 +616091,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Create a Sized version of any container";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -613896,7 +616126,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "aeson instances for 'Sized'";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -613917,7 +616147,7 @@ self: {
sized-wrapper
];
description = "QuickCheck instance for 'Sized'";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -613940,7 +616170,7 @@ self: {
text
];
description = "'Sized' wrappers for text";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -613962,8 +616192,8 @@ self: {
}:
mkDerivation {
pname = "sizes";
- version = "2.4.0";
- sha256 = "1s888f14pnvm71sxpn7bgr5a5zijmf0g3px5bmy36q10rjylwp6b";
+ version = "2.4.1";
+ sha256 = "1hz9ix8rp6av2rknqra5y2wk26vs5mwzjzqa52ya30yk0jnq80m2";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -613982,9 +616212,7 @@ self: {
];
description = "Recursively show space (size and i-nodes) used in subdirectories";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
mainProgram = "sizes";
- broken = true;
}
) { };
@@ -614177,7 +616405,7 @@ self: {
unliftio
];
description = "Batteries-included, opinionated test framework";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "skeletest-preprocessor";
}
) { };
@@ -614405,7 +616633,7 @@ self: {
vector
];
description = "Random access lists: skew binary";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -615115,7 +617343,7 @@ self: {
text
];
description = "A programmable markup language to generate HTML";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
mainProgram = "slab";
}
) { };
@@ -615471,7 +617699,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Bindings for the Slack web API";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -615718,6 +617946,42 @@ self: {
}
) { };
+ slick_1_4_0_1 = callPackage (
+ {
+ mkDerivation,
+ aeson,
+ base,
+ bytestring,
+ directory,
+ extra,
+ mustache,
+ pandoc,
+ shake,
+ text,
+ unordered-containers,
+ }:
+ mkDerivation {
+ pname = "slick";
+ version = "1.4.0.1";
+ sha256 = "1rx555rsljcmqzk2xyk3d7jxnap1l5xpcpwvrf94p66iac654mi6";
+ libraryHaskellDepends = [
+ aeson
+ base
+ bytestring
+ directory
+ extra
+ mustache
+ pandoc
+ shake
+ text
+ unordered-containers
+ ];
+ description = "A quick & easy static site builder built with shake and pandoc";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
slidemews = callPackage (
{
mkDerivation,
@@ -615830,7 +618094,7 @@ self: {
text
];
description = "SLIP-0032: Extended serialization format for BIP-32 wallets";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -615865,7 +618129,7 @@ self: {
hspec-hedgehog
];
description = "Sized list";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -616119,7 +618383,7 @@ self: {
text-icu
];
description = "Clean URI slugs for Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "slugger";
}
) { };
@@ -616205,7 +618469,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "Handle molecular sequences";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
mainProgram = "slynx";
maintainers = [ lib.maintainers.dschrempf ];
}
@@ -616259,7 +618523,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "Handle molecular sequences";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "slynx";
maintainers = [ lib.maintainers.dschrempf ];
@@ -616284,7 +618548,7 @@ self: {
];
doHaddock = false;
description = "Serialize to bytes";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -616412,7 +618676,7 @@ self: {
gauge
];
description = "See README for more info";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -617212,7 +619476,7 @@ self: {
];
doHaddock = false;
description = "String manipulation tool written in haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "smh";
broken = true;
@@ -617269,7 +619533,7 @@ self: {
primitive
];
description = "Parse arrays of tokens";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -617998,21 +620262,27 @@ self: {
aeson,
base,
bytestring,
+ crypton-connection,
+ data-default,
http-conduit,
http-types,
text,
+ tls,
}:
mkDerivation {
pname = "smtpbz";
- version = "1.1.0";
- sha256 = "04fr5w139bvi3wdx7ynxkgmb5z34a7wpa4znrhh6vjq2hykxi4nk";
+ version = "1.2.0";
+ sha256 = "1dmp9nzvvx6shkicnxxy9lg6h63q8gaixv5fsg8j85v230kp69af";
libraryHaskellDepends = [
aeson
base
bytestring
+ crypton-connection
+ data-default
http-conduit
http-types
text
+ tls
];
description = "Unofficial API client for smtp.bz";
license = lib.licenses.bsd2;
@@ -618155,7 +620425,7 @@ self: {
typed-process
];
description = "GHC Source Plugin that helps to minimise imports and generate explicit exports";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -618191,7 +620461,7 @@ self: {
text
];
description = "Strict ByteString Parser Combinator";
- license = lib.licenses.cc0;
+ license = lib.licensesSpdx."CC0-1.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -618430,7 +620700,7 @@ self: {
xmlhtml
];
description = "Top-level package for the Snap Web Framework";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.maralorn ];
}
) { };
@@ -618698,7 +620968,7 @@ self: {
zlib
];
description = "Snap: A Haskell Web Framework (core interfaces and types)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -621294,7 +623564,7 @@ self: {
test-framework-quickcheck2
];
description = "Fast Haskell bindings to Google’s Snappy compression library";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { inherit (pkgs) snappy; };
@@ -621358,7 +623628,7 @@ self: {
zlib
];
description = "Bindings to Google's Snappy: A fast compression library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "snappy-cli";
}
) { inherit (pkgs) snappy; };
@@ -621422,8 +623692,8 @@ self: {
}:
mkDerivation {
pname = "snappy-hs";
- version = "0.1.0.3";
- sha256 = "1fbl5zw8ag379sacd735948qzaikzv01qzfczgn1lp0wy424q9hv";
+ version = "0.1.0.4";
+ sha256 = "0wxqyv955gvd1m1v9cmial2qxdrqm3gm69pl59jaiwmhq74bc56r";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -621437,10 +623707,8 @@ self: {
];
testHaskellDepends = [ base ];
description = "Snappy compression library";
- license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
+ license = lib.licensesSpdx."MIT";
mainProgram = "snappy-hs";
- broken = true;
}
) { };
@@ -621666,7 +623934,7 @@ self: {
yesod-form
];
description = "Import to snelstart";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "snelstart-import";
broken = true;
@@ -621802,7 +624070,7 @@ self: {
vector
];
description = "SNMP protocol library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -622515,7 +624783,7 @@ self: {
unix
];
description = "Unix domain sockets";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -622745,7 +625013,7 @@ self: {
];
doHaddock = false;
description = "High-level network sockets";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
badPlatforms = lib.platforms.darwin;
hydraPlatforms = lib.platforms.none;
broken = true;
@@ -622810,7 +625078,7 @@ self: {
];
doHaddock = false;
description = "Support for the Sockets and Pipes book";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -622965,7 +625233,7 @@ self: {
tls
];
description = "A SOCKS5 (RFC 1928) implementation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -623348,7 +625616,7 @@ self: {
test-framework-quickcheck2
];
description = "Self-Organising Maps";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -623493,7 +625761,7 @@ self: {
tasty-hunit
];
description = "Check satisfiability of expressions on natural numbers";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -623811,7 +626079,7 @@ self: {
type-errors-pretty
];
description = "Haskell EDSL for Souffle";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -623874,7 +626142,7 @@ self: {
vector
];
description = "Souffle Datalog bindings for Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -623913,7 +626181,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Apply sound changes to words";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -623966,7 +626234,7 @@ self: {
utility-ht
];
description = "Approximate a song from other pieces of sound";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "sound-collage";
maintainers = [ lib.maintainers.thielema ];
}
@@ -624258,7 +626526,7 @@ self: {
utility-ht
];
description = "Play, write, read, convert audio signals using Sox";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -624490,7 +626758,7 @@ self: {
tasty-hunit
];
description = "Gopher server library and daemon";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
mainProgram = "spacecookie";
maintainers = [ lib.maintainers.sternenseemann ];
}
@@ -624771,7 +627039,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "A simple programming and debugging environment";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
badPlatforms = lib.platforms.darwin;
hydraPlatforms = lib.platforms.none;
mainProgram = "spade";
@@ -625084,7 +627352,7 @@ self: {
containers
];
description = "A sparse set-based parsing library for Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -625343,7 +627611,7 @@ self: {
vector
];
description = "Sparse set data structure";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "sparse-set";
}
) { };
@@ -625433,7 +627701,7 @@ self: {
hspec
];
description = "Sparse vector data structures";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "sparse-vector";
}
) { };
@@ -625539,7 +627807,7 @@ self: {
X11
];
description = "A unix-style (read from stdin, write to stdout) global hotkey daemon";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "spartacon";
}
@@ -625700,7 +627968,7 @@ self: {
tasty-quickcheck
];
description = "SPDX license expression language, Extras";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -625736,7 +628004,7 @@ self: {
text
];
description = "SPDX license templates";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -625922,26 +628190,20 @@ self: {
multiset-comb,
np-extras,
numeric-prelude,
- template-haskell,
}:
mkDerivation {
pname = "species";
- version = "0.4.0.1";
- sha256 = "0d9vkplg2lrwb34i2ziaa9hc8dnpkjkmwd5b27kigcqfigck6ym2";
- revision = "5";
- editedCabalFile = "0r3h5gxldzd5kq11a233jd7v94s7r94r5vx0szmdi9q5kp8m4kaj";
+ version = "0.4.1";
+ sha256 = "0gwnggjixazl95hdbi3zgi6id2r2pxlnh08zql6y9aswqn3wf7w5";
libraryHaskellDepends = [
base
containers
multiset-comb
np-extras
numeric-prelude
- template-haskell
];
description = "Computational combinatorial species";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}
) { };
@@ -625995,7 +628257,7 @@ self: {
tasty-hedgehog
];
description = "Embedded specification language & model checker in Haskell";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -626154,7 +628416,7 @@ self: {
text
];
description = "Manage the application of templates to custom yaml";
- license = lib.licenses.gpl2Only;
+ license = lib.licensesSpdx."GPL-2.0-only";
mainProgram = "specup";
maintainers = [ lib.maintainers.danielrolls ];
}
@@ -626632,7 +628894,7 @@ self: {
doctest
];
description = "Spiros Boosalis's Custom Prelude";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -626646,7 +628908,7 @@ self: {
sha256 = "0sr39lxh4jrzinins8i0lv0y715sc11grp2yq47sa1jpzvaf246v";
libraryHaskellDepends = [ base ];
description = "SPIR-V enumerations generated from Khronos JSON";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -626671,7 +628933,7 @@ self: {
text
];
description = "Types and generator for SPIR-V JSON spec";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -626837,7 +629099,7 @@ self: {
isExecutable = true;
executableHaskellDepends = [ base ];
description = "Parallel implementation of the Sorokina/Zeilfelder spline scheme";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
mainProgram = "spline3";
}
) { };
@@ -626907,7 +629169,7 @@ self: {
stm
];
description = "HLint as a GHC source plugin";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -627004,7 +629266,7 @@ self: {
utility-ht
];
description = "Split a big audio file into pieces at positions of silence";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "split-record";
maintainers = [ lib.maintainers.thielema ];
}
@@ -627084,7 +629346,7 @@ self: {
tf-random
];
description = "Fast Splittable PRNG";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { testu01 = null; };
@@ -627241,7 +629503,7 @@ self: {
editedCabalFile = "0j9jsbn4f73fb1a5rp1qzw4jdh6n3mmlky16pvxw2gnz8kcficng";
libraryHaskellDepends = [ base ];
description = "Unified API for phantom typed newtypes and type aliases";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -627440,7 +629702,7 @@ self: {
];
doHaddock = false;
description = "Spotify Web API";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "examples";
broken = true;
@@ -627515,7 +629777,7 @@ self: {
QuickCheck
];
description = "Read and write spreadsheets from and to CSV files in a lazy way";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -628161,7 +630423,7 @@ self: {
stm
];
description = "High-level SQLite client";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -628245,7 +630507,7 @@ self: {
tasty-hedgehog
];
description = "Guided derivation for Hasql statements";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -628511,7 +630773,7 @@ self: {
testToolDepends = [ tasty-discover ];
doHaddock = false;
description = "Generate type-safe Haskell code from SQL via https://github.com/sqlc-dev/sqlc.";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "sqlc-hs";
}
@@ -628692,7 +630954,9 @@ self: {
deepseq
];
description = "A primitive yet easy to use sqlite library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -628803,7 +631067,7 @@ self: {
sqlite-simple
];
description = "Interpolated SQLite queries via quasiquotation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -629057,7 +631321,7 @@ self: {
with-utf8
];
description = "Squeal PostgreSQL Library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "example";
}
) { };
@@ -629089,7 +631353,7 @@ self: {
text
];
description = "LTree extension for Squeal";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -629102,6 +631366,7 @@ self: {
generics-sop,
hspec,
postgresql-syntax,
+ scientific,
squeal-postgresql,
template-haskell,
text,
@@ -629110,14 +631375,15 @@ self: {
}:
mkDerivation {
pname = "squeal-postgresql-qq";
- version = "0.1.3.0";
- sha256 = "04kfccn22ik76fgr9bhlk9rh0ldyk010icr1rbzqs6mj3iddyd3w";
+ version = "0.1.4.0";
+ sha256 = "11mzdng0828r5l00zxk7w9s24f3h666n5sin79rzhdraisqfv35j";
libraryHaskellDepends = [
aeson
base
bytestring
generics-sop
postgresql-syntax
+ scientific
squeal-postgresql
template-haskell
text
@@ -629131,6 +631397,7 @@ self: {
generics-sop
hspec
postgresql-syntax
+ scientific
squeal-postgresql
template-haskell
text
@@ -629138,7 +631405,7 @@ self: {
uuid
];
description = "QuasiQuoter transforming raw sql into Squeal expressions";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -629157,7 +631424,7 @@ self: {
squeal-postgresql
];
description = "UUID OSSP extension for Squeal";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -630236,7 +632503,7 @@ self: {
primitive
];
description = "shared heap regions between local mutable state threads";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -630329,7 +632596,7 @@ self: {
ghc-prim
];
description = "algorithms around stable marriage";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -630498,7 +632765,7 @@ self: {
text
];
description = "Mustache templates for Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "stache";
}
) { };
@@ -630809,7 +633076,7 @@ self: {
$exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack
'';
description = "The Haskell Tool Stack";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "stack";
maintainers = [ lib.maintainers.cdepillabout ];
}
@@ -630979,7 +633246,7 @@ self: {
turtle
];
description = "Console program used to fix Stack build errors automatically";
- license = lib.licenses.agpl3Only;
+ license = lib.licensesSpdx."AGPL-3.0-only";
hydraPlatforms = lib.platforms.none;
mainProgram = "stack-fix";
broken = true;
@@ -631612,7 +633879,7 @@ self: {
text
];
description = "Convert stack projects to cabal.project + cabal.project.freeze";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
mainProgram = "stack2cabal";
broken = true;
@@ -632370,7 +634637,7 @@ self: {
text
];
description = "Convert stack.yaml to cabal.project + cabal.project.freeze";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "stackage-to-hackage";
broken = true;
@@ -632631,7 +634898,7 @@ self: {
utf8-string
];
description = "Program to fold GHC prof files into flamegraph input";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
mainProgram = "stackcollapse-ghc";
broken = true;
@@ -632673,6 +634940,7 @@ self: {
monad-logger,
mtl,
optparse-applicative,
+ prettyprinter,
QuickCheck,
resourcet,
rio,
@@ -632690,8 +634958,8 @@ self: {
}:
mkDerivation {
pname = "stackctl";
- version = "1.7.3.5";
- sha256 = "1naf2n41d0vhhnkkc4bnkapzqdmap6kp8xh27dqjcg7kmv3hllhi";
+ version = "1.7.3.7";
+ sha256 = "102pc4lgnm78k0zwfha7vglnbflf21nvi8iyzjyclcv9d30ba22m";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -632723,6 +634991,7 @@ self: {
monad-logger
mtl
optparse-applicative
+ prettyprinter
QuickCheck
resourcet
rio
@@ -632769,6 +635038,25 @@ self: {
}
) { };
+ stacked = callPackage (
+ {
+ mkDerivation,
+ base,
+ comonad,
+ }:
+ mkDerivation {
+ pname = "stacked";
+ version = "0.1.0";
+ sha256 = "12wh22kh73khs6w0jlf2d011pr4cs7id0rjjl1wms5xph2bcswww";
+ libraryHaskellDepends = [
+ base
+ comonad
+ ];
+ description = "A modern indexed monad stack";
+ license = lib.licenses.mit;
+ }
+ ) { };
+
stacked-dag = callPackage (
{
mkDerivation,
@@ -632846,7 +635134,7 @@ self: {
th-lift
];
description = "GHC.Generics style staged generics";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -632960,7 +635248,7 @@ self: {
time
];
description = "Retries for humans";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
mainProgram = "readme";
}
) { };
@@ -633006,8 +635294,8 @@ self: {
pname = "stan";
version = "0.2.1.0";
sha256 = "1mf01bpy291131jfl4fcslv0jfn8i8jqwr29v1v48j6c6q49rias";
- revision = "2";
- editedCabalFile = "1ddjjy5sa22k6hbra3y4v1rlh01x5s5k39ihdwbrl4vr2q93q6c9";
+ revision = "3";
+ editedCabalFile = "1wrr3vpv8hvj2rgb9gqrnwnjwzyyz28c9x1914277qqk39gy8zqq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -633060,7 +635348,7 @@ self: {
];
doHaddock = false;
description = "Haskell STatic ANalyser";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
mainProgram = "stan";
}
) { };
@@ -633694,7 +635982,7 @@ self: {
transformers
];
description = "Type-safe and interoperable static values and closures";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -634187,7 +636475,7 @@ self: {
vector
];
description = "A library of statistical types, data, and functions";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -634396,7 +636684,7 @@ self: {
sha256 = "1cg0db7malqm75rlxxcmp2w00pvlf1kki4fz5p7lc86qy7241vzb";
libraryHaskellDepends = [ base ];
description = "A discrete probability monad with statistics";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -634911,7 +637199,7 @@ self: {
sha256 = "0ldn5yxpj99yhhp5x7zlxjmd9qgqyjg68avr19k7argwcf3nr9y9";
doHaddock = false;
description = "TBA";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -634957,7 +637245,7 @@ self: {
template-haskell
];
description = "Binding to Standard Template Library C++";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -635304,7 +637592,7 @@ self: {
QuickCheck
];
description = "Staircase functions or piecewise constant functions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -635549,7 +637837,7 @@ self: {
stm-queue
];
description = "A simplistic actor model based on STM";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -635589,7 +637877,7 @@ self: {
stm
];
description = "Additional types of channels for STM";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -635738,7 +638026,7 @@ self: {
tasty-quickcheck
];
description = "Containers for STM";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
maintainers = [ lib.maintainers.maralorn ];
}
) { };
@@ -635894,7 +638182,7 @@ self: {
rebase
];
description = "STM-specialised Hash Array Mapped Trie";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -635919,7 +638207,7 @@ self: {
stm
];
description = "A library for constructing incremental computations";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -636075,7 +638363,7 @@ self: {
time
];
description = "An implementation of a real-time concurrent queue";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -636704,7 +638992,7 @@ self: {
utility-ht
];
description = "Elegant definition of Storable instances for records";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -636753,7 +639041,7 @@ self: {
utility-ht
];
description = "Storable instance for pairs and triples";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -636806,7 +639094,7 @@ self: {
utility-ht
];
description = "Fast, packed, strict storable arrays with a list interface like ByteString";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -637705,7 +639993,7 @@ self: {
tasty-hunit
];
description = "Attoparsec integration for the streaming ecosystem";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -637799,7 +640087,7 @@ self: {
vector
];
description = "Measures and compares the performance of streaming libraries";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -638202,7 +640490,7 @@ self: {
wai-extra
];
description = "Client-side consumption of a ServerEvent";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -638431,7 +640719,7 @@ self: {
zlib
];
description = "A hand-written streaming byte parser for OpenStreetMap Protobuf data";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -638478,7 +640766,7 @@ self: {
tasty-hunit
];
description = "Stream packets via libpcap";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -638826,7 +641114,7 @@ self: {
unordered-containers
];
description = "Streaming, dataflow programming and declarative concurrency";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.maralorn ];
}
) { };
@@ -638857,6 +641145,8 @@ self: {
pname = "streamly";
version = "0.11.0";
sha256 = "1ha7rr6038k1hikfhg2bi0ican8b9yf1gcbaf82b4889wymy7xyc";
+ revision = "1";
+ editedCabalFile = "1h3vpy61p7ivc5cqjlpabz1z97vxf0c7npzkdwnk2jhabsl8wx2d";
libraryHaskellDepends = [
atomic-primops
base
@@ -638878,7 +641168,7 @@ self: {
unordered-containers
];
description = "Streaming data pipelines with declarative concurrency";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
maintainers = [ lib.maintainers.maralorn ];
}
@@ -638940,7 +641230,7 @@ self: {
];
testSystemDepends = [ archive ];
description = "Stream data from archives using the streamly library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
maintainers = [ lib.maintainers.shlok ];
broken = true;
@@ -639141,7 +641431,7 @@ self: {
unix
];
description = "Streaming, parsers, arrays, serialization and more";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -639178,7 +641468,7 @@ self: {
transformers
];
description = "Streaming, parsers, arrays, serialization and more";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -639232,7 +641522,34 @@ self: {
vector
];
description = "Examples for Streamly";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }
+ ) { };
+
+ streamly-filepath = callPackage (
+ {
+ mkDerivation,
+ base,
+ exceptions,
+ filepath,
+ os-string,
+ streamly-core,
+ }:
+ mkDerivation {
+ pname = "streamly-filepath";
+ version = "0.1.0";
+ sha256 = "1z5qrva7rk4223ai4rm9vn8d4mnrbxsl2gimcrbbxd5yv4l83sjr";
+ libraryHaskellDepends = [
+ base
+ exceptions
+ filepath
+ os-string
+ streamly-core
+ ];
+ description = "Streamly compatibility with filepath package";
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -639270,7 +641587,7 @@ self: {
temporary
];
description = "File system event notification API";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -639307,7 +641624,7 @@ self: {
time
];
description = "Folder watching as a Streamly stream";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -639375,7 +641692,7 @@ self: {
];
testSystemDepends = [ lmdb ];
description = "Stream data to or from LMDB databases using the streamly library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
maintainers = [ lib.maintainers.shlok ];
broken = true;
@@ -639419,7 +641736,7 @@ self: {
streamly
];
description = "Streamly combinators for LZ4 compression";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -639515,7 +641832,7 @@ self: {
tasty-bench
];
description = "Use OS processes as stream transformation functions";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -639560,7 +641877,7 @@ self: {
tasty-bench
];
description = "Use OS processes as stream transformation functions";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -639587,8 +641904,8 @@ self: {
}:
mkDerivation {
pname = "streamly-statistics";
- version = "0.1.0";
- sha256 = "0qm8g33abag2y9xq6cgmk3z8ilxjnz81c4qf7r8a31l89rrswx1z";
+ version = "0.2.0";
+ sha256 = "02px75d8hjgsc13dnfs3khfszd210xcjj96inlzs6zb1yc39pcfl";
libraryHaskellDepends = [
base
containers
@@ -639618,7 +641935,7 @@ self: {
tasty-bench
];
description = "Statistical measures for finite or infinite data streams";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -639654,7 +641971,7 @@ self: {
text
];
description = "Library for streamly and text interoperation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -639714,7 +642031,7 @@ self: {
];
testSystemDepends = [ zip ];
description = "Stream data from zip archives using the streamly library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -640032,7 +642349,7 @@ self: {
tasty-quickcheck
];
description = "Strict MVars and TVars with invariant checking for IO and IOSim";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -640123,7 +642440,7 @@ self: {
vector
];
description = "Strict containers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -640381,7 +642698,7 @@ self: {
tasty-quickcheck
];
description = "Strict linked list";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -640400,7 +642717,7 @@ self: {
deepseq
];
description = "Strict variants of mutable data types from base";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -640434,7 +642751,7 @@ self: {
tasty-quickcheck
];
description = "Strict MVars for IO and IOSim";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -640482,7 +642799,7 @@ self: {
stm
];
description = "Strict STM interface polymorphic over stm implementation";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -640510,7 +642827,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Strict tuples";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -640531,7 +642848,7 @@ self: {
strict-tuple
];
description = "Optics for the `strict-tuple` library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -640579,7 +642896,7 @@ self: {
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "Lightweight strict types";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -641602,7 +643919,7 @@ self: {
text
];
description = "Types for the Stripe API";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
maintainers = [ lib.maintainers.mpscholten ];
}
) { };
@@ -641853,7 +644170,7 @@ self: {
text
];
description = "Listen for Stripe webhook events with Scotty";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -641923,7 +644240,7 @@ self: {
text
];
description = "Verification of Stripe webhook signatures";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
maintainers = [ lib.maintainers.mpscholten ];
}
) { };
@@ -641995,7 +644312,7 @@ self: {
wreq
];
description = "Use the Stripe API via Wreq";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -642108,7 +644425,7 @@ self: {
transformers
];
description = "A client for the Strava V3 API";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -642145,7 +644462,7 @@ self: {
transformers
];
description = "A client for the Strava V3 API";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -642391,7 +644708,7 @@ self: {
utf8-string
];
description = "Inspect the padding and size of C data declarations and their fields";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "struct-inspector";
broken = true;
@@ -642555,7 +644872,7 @@ self: {
vector
];
description = "Structure (hash) of your data types";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -643033,113 +645350,6 @@ self: {
}
) { };
- stylish-haskell_0_14_4_0 = callPackage (
- {
- mkDerivation,
- aeson,
- base,
- bytestring,
- Cabal,
- containers,
- directory,
- file-embed,
- filepath,
- ghc,
- ghc-boot,
- ghc-boot-th,
- 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.4.0";
- sha256 = "0y0vfz5vkvw0wzcsw2ym3nix0v3pwjw2vas0qv3lrhdvn3ba9gb7";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson
- base
- bytestring
- Cabal
- containers
- directory
- file-embed
- filepath
- ghc
- ghc-boot
- ghc-boot-th
- ghc-lib-parser-ex
- HsYAML
- HsYAML-aeson
- mtl
- regex-tdfa
- syb
- text
- ];
- executableHaskellDepends = [
- aeson
- base
- bytestring
- Cabal
- containers
- directory
- file-embed
- filepath
- ghc
- ghc-boot
- ghc-boot-th
- 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
- ghc-boot
- ghc-boot-th
- 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_14_5_0 = callPackage (
{
mkDerivation,
@@ -643235,7 +645445,7 @@ self: {
text
];
description = "Haskell code prettifier";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "stylish-haskell";
}
@@ -643334,7 +645544,7 @@ self: {
text
];
description = "Haskell code prettifier";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "stylish-haskell";
}
@@ -643433,7 +645643,7 @@ self: {
text
];
description = "Haskell code prettifier";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "stylish-haskell";
}
@@ -643532,7 +645742,7 @@ self: {
text
];
description = "Haskell code prettifier";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "stylish-haskell";
}
) { };
@@ -643890,7 +646100,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Subcategories induced by class constraints";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -644494,7 +646704,7 @@ self: {
];
doHaddock = false;
description = "Memory efficient JSON parser";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -644532,7 +646742,7 @@ self: {
tasty-quickcheck
];
description = "Suffix arrays and friends";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -644955,7 +647165,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "An implementation of extensible products and sums";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -645030,7 +647240,7 @@ self: {
validation-selective
];
description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "summon";
broken = true;
@@ -645076,7 +647286,7 @@ self: {
relude
];
description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects using TUI";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "summon-tui";
}
@@ -645794,7 +648004,7 @@ self: {
text
];
description = "Apache Pulsar client for Haskell";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -645947,7 +648157,7 @@ self: {
hspec
];
description = "Monitor groups of threads with non-hierarchical lifetimes";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -646007,7 +648217,7 @@ self: {
supply-chain-core
];
description = "Composable request-response pipelines";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -646028,7 +648238,7 @@ self: {
hspec
];
description = "Composable request-response pipelines";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -646071,7 +648281,7 @@ self: {
transformers
];
description = "Supply-chain interface for basic streaming";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -646401,7 +648611,7 @@ self: {
happy
];
description = "SystemVerilog to Verilog conversion";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "sv2v";
}
) { };
@@ -646564,7 +648774,7 @@ self: {
text
];
description = "Svg Icons and more";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "svg-icons-exe";
}
) { };
@@ -646743,7 +648953,7 @@ self: {
text
];
description = "Optimise SVGs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "svgone";
}
@@ -646784,7 +648994,7 @@ self: {
xml
];
description = "A tool to prune unused symbols from icon SVG files";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "svgsym";
broken = true;
@@ -647556,7 +649766,7 @@ self: {
];
doHaddock = false;
description = "2D resource gathering game with programmable robots";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -647764,7 +649974,7 @@ self: {
time
];
description = "A semantic web toolkit";
- license = lib.licenses.lgpl21Plus;
+ license = lib.licensesSpdx."LGPL-2.1-or-later";
mainProgram = "Swish";
}
) { };
@@ -647941,7 +650151,7 @@ self: {
template-haskell
];
description = "Swizzle functions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -647970,7 +650180,7 @@ self: {
template-haskell
];
description = "Swizzle lens functions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -647999,7 +650209,7 @@ self: {
template-haskell
];
description = "Swizzle modify functions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -648022,7 +650232,7 @@ self: {
template-haskell
];
description = "Swizzle set functions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -648279,8 +650489,8 @@ self: {
}:
mkDerivation {
pname = "sydtest";
- version = "0.20.0.0";
- sha256 = "0f1ipp6wqykkyiibn1prx61ysvydf4bybiqg5mlzgi5h1cnqh22i";
+ version = "0.20.0.1";
+ sha256 = "1jnks9znjr4ar6x4a6965w6yijcd80ci6z5qwln4v98ls1a81x19";
libraryHaskellDepends = [
async
autodocodec
@@ -648314,7 +650524,7 @@ self: {
}
) { };
- sydtest_0_20_0_1 = callPackage (
+ sydtest_0_22_0_0 = callPackage (
{
mkDerivation,
async,
@@ -648346,8 +650556,8 @@ self: {
}:
mkDerivation {
pname = "sydtest";
- version = "0.20.0.1";
- sha256 = "1jnks9znjr4ar6x4a6965w6yijcd80ci6z5qwln4v98ls1a81x19";
+ version = "0.22.0.0";
+ sha256 = "1fvj90c6cmr03w3ac7xa4s1334w8md181gvd87bv0f07s9k9ki1q";
libraryHaskellDepends = [
async
autodocodec
@@ -649516,7 +651726,7 @@ self: {
unordered-containers
];
description = "Basic symantic combinators for Embedded Domain-Specific Languages (EDSL)";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
}
) { };
@@ -649581,7 +651791,7 @@ self: {
transformers
];
description = "Symantics combinators for generating documents";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
}
) { };
@@ -650100,7 +652310,7 @@ self: {
];
doHaddock = false;
description = "Parser combinators statically optimized and staged via typed meta-programming";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -650337,7 +652547,7 @@ self: {
unix
];
description = "Symlink functions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -650358,7 +652568,7 @@ self: {
youProbablyWantSymbolizeWithAZ
];
description = "You want Symbolize with a Z";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -650437,7 +652647,7 @@ self: {
vector-hashtables
];
description = "Efficient global Symbol table, with Garbage Collection";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -650654,6 +652864,39 @@ self: {
}
) { };
+ symparsec_2_0_0 = callPackage (
+ {
+ mkDerivation,
+ base,
+ defun-core,
+ singleraeh,
+ type-level-show,
+ type-spec,
+ }:
+ mkDerivation {
+ pname = "symparsec";
+ version = "2.0.0";
+ sha256 = "0w8y31jp3gq5fkf0i45ibim4lm3g8iq4nl5ganqgi457rmcvkisl";
+ libraryHaskellDepends = [
+ base
+ defun-core
+ singleraeh
+ type-level-show
+ ];
+ testHaskellDepends = [
+ base
+ defun-core
+ singleraeh
+ type-level-show
+ type-spec
+ ];
+ description = "Type level string parser combinators";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ maintainers = [ lib.maintainers.raehik ];
+ }
+ ) { };
+
symtegration = callPackage (
{
mkDerivation,
@@ -650727,7 +652970,7 @@ self: {
random
];
description = "Synapse is a machine learning library written in pure Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -651522,7 +653765,7 @@ self: {
utility-ht
];
description = "Control synthesizer effects via ALSA/MIDI";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
badPlatforms = lib.platforms.darwin;
maintainers = [ lib.maintainers.thielema ];
}
@@ -651817,7 +654060,7 @@ self: {
];
doHaddock = false;
description = "Efficient signal processing using runtime compilation";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -652017,7 +654260,7 @@ self: {
primitive
];
description = "Decode RFC 3164 and RFC 5424 syslog message formats";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -652353,8 +654596,8 @@ self: {
pname = "system-linux-proc";
version = "0.1.1.1";
sha256 = "12nvsvmchhsqs5f3x2075v8v68inb1xz8dbv1q5x48big1bf4vv5";
- revision = "3";
- editedCabalFile = "0mkjwv2yw130rpmxby32hqrj26q268wiyfv6f71q09wp1axl6qfc";
+ revision = "4";
+ editedCabalFile = "0q77ybg2x81k9vvmyiwxqgal4s3kai6b93gdirak7ypf5fbb62q5";
libraryHaskellDepends = [
attoparsec
base
@@ -652678,7 +654921,7 @@ self: {
];
librarySystemDepends = [ systemd ];
description = "systemd bindings";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
platforms = lib.platforms.linux;
}
) { inherit (pkgs) systemd; };
@@ -652712,7 +654955,7 @@ self: {
wreq
];
description = "Send notifications for systemd units to ntfy.sh";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
mainProgram = "systemd-ntfy";
broken = true;
@@ -652744,7 +654987,7 @@ self: {
unix
];
description = "Let systemd bind the server's socket for you";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -652844,7 +655087,7 @@ self: {
];
testToolDepends = [ tasty-autocollect ];
description = "Let you put anything in the system tray";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "systranything";
}
) { };
@@ -653466,8 +655709,8 @@ self: {
mkDerivation,
aeson,
ansi-terminal,
+ attoparsec,
base,
- broadcast-chan,
bytestring,
conduit,
containers,
@@ -653478,15 +655721,17 @@ self: {
dyre,
either,
enclosed-exceptions,
+ extra,
filepath,
+ fsnotify,
gi-cairo-connector,
gi-cairo-render,
- gi-gdk,
+ gi-gdk3,
gi-gdkpixbuf,
- gi-gdkx11,
+ gi-gdkx113,
gi-glib,
- gi-gtk,
gi-gtk-hs,
+ gi-gtk3,
gi-pango,
gtk-sni-tray,
gtk-strut,
@@ -653506,6 +655751,7 @@ self: {
optparse-applicative,
parsec,
process,
+ QuickCheck,
rate-limit,
regex-compat,
safe,
@@ -653514,14 +655760,16 @@ self: {
status-notifier-item,
stm,
template-haskell,
- temporary,
text,
time,
time-locale-compat,
time-units,
transformers,
tuple,
+ typed-process,
unix,
+ unliftio,
+ unliftio-core,
utf8-string,
X11,
xdg-basedir,
@@ -653532,16 +655780,16 @@ self: {
}:
mkDerivation {
pname = "taffybar";
- version = "4.0.3";
- sha256 = "107hajq6y3hb9n80zncc8qi74dn6qqp7mic4xagnmah82sk1k5x9";
+ version = "4.1.1";
+ sha256 = "1fbh2jgv0isl02w806grsb7xlyjyaj4x0qmx9j556kci172g70mm";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson
ansi-terminal
+ attoparsec
base
- broadcast-chan
bytestring
conduit
containers
@@ -653552,20 +655800,23 @@ self: {
dyre
either
enclosed-exceptions
+ extra
filepath
+ fsnotify
gi-cairo-connector
gi-cairo-render
- gi-gdk
+ gi-gdk3
gi-gdkpixbuf
- gi-gdkx11
+ gi-gdkx113
gi-glib
- gi-gtk
gi-gtk-hs
+ gi-gtk3
gi-pango
gtk-sni-tray
gtk-strut
haskell-gi-base
hslogger
+ hspec
HStringTemplate
http-client
http-client-tls
@@ -653574,6 +655825,7 @@ self: {
multimap
parsec
process
+ QuickCheck
rate-limit
regex-compat
safe
@@ -653588,7 +655840,10 @@ self: {
time-units
transformers
tuple
+ typed-process
unix
+ unliftio
+ unliftio-core
utf8-string
X11
xdg-basedir
@@ -653598,6 +655853,7 @@ self: {
xmonad
];
libraryPkgconfigDepends = [ gtk3 ];
+ libraryToolDepends = [ hspec-discover ];
executableHaskellDepends = [
base
data-default
@@ -653608,18 +655864,20 @@ self: {
executablePkgconfigDepends = [ gtk3 ];
testHaskellDepends = [
base
- directory
+ data-default
filepath
+ gi-gtk3
hspec
hspec-core
hspec-golden
- temporary
+ QuickCheck
+ transformers
];
testToolDepends = [ hspec-discover ];
+ doHaddock = false;
description = "A desktop bar similar to xmobar, but with more GUI";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
badPlatforms = lib.platforms.darwin;
- hydraPlatforms = lib.platforms.none;
mainProgram = "taffybar";
maintainers = [ lib.maintainers.rvl ];
}
@@ -653819,7 +656077,7 @@ self: {
transformers
];
description = "Trivial monad transformer that allows identical monad stacks to have different types";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -654401,7 +656659,7 @@ self: {
utf8-string
];
description = "Black magic tagsoup";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "tagstew";
}
) { };
@@ -654489,7 +656747,7 @@ self: {
text
];
description = "Hierarchical Tags & Tag Trees";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -654509,7 +656767,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Abstractions related to Tahoe-LAFS \"capabilities\"";
- license = lib.licenses.lgpl3Plus;
+ license = lib.licensesSpdx."LGPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -654667,7 +656925,7 @@ self: {
text
];
description = "Tahoe-LAFS directory-like abstraction for collections of data objects";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -654876,7 +657134,7 @@ self: {
yaml
];
description = "An implementation of the \"Great Black Swamp\" LAFS protocol";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -654922,7 +657180,7 @@ self: {
utility-ht
];
description = "An HSpec for Great Black Swamp storage backends";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -654956,7 +657214,7 @@ self: {
text
];
description = "Types related to implementation of a Tahoe-LAFS Great Black Swamp server";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -655040,7 +657298,7 @@ self: {
x509
];
description = "An implementation of the Tahoe-LAFS SSK cryptographic protocols";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -655308,7 +657566,7 @@ self: {
with-utf8
];
description = "Tailwind wrapped in Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "tailwind-run";
}
) { };
@@ -655585,7 +657843,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "Line oriented fast enough text search";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
mainProgram = "talash";
broken = true;
@@ -655912,7 +658170,7 @@ self: {
transformers
];
description = "Heterogenous memoisation monad";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -655982,78 +658240,12 @@ self: {
vector
];
description = "A tasty enhancement to cassava for easy csv exporting";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
) { };
- tar_0_6_0_0 = callPackage (
- {
- mkDerivation,
- array,
- base,
- bytestring,
- containers,
- deepseq,
- directory,
- file-embed,
- filepath,
- QuickCheck,
- tasty,
- tasty-bench,
- tasty-quickcheck,
- temporary,
- time,
- }:
- mkDerivation {
- pname = "tar";
- version = "0.6.0.0";
- sha256 = "11hr2p0lrdkklvn7yf85cqhyzq4ax2lxsfg0rljakkrpnn7s0n44";
- libraryHaskellDepends = [
- array
- base
- bytestring
- containers
- deepseq
- directory
- filepath
- time
- ];
- testHaskellDepends = [
- array
- base
- bytestring
- containers
- deepseq
- directory
- file-embed
- filepath
- QuickCheck
- tasty
- tasty-quickcheck
- temporary
- time
- ];
- benchmarkHaskellDepends = [
- array
- base
- bytestring
- containers
- deepseq
- directory
- filepath
- tasty-bench
- temporary
- time
- ];
- doHaddock = false;
- description = "Reading, writing and manipulating \".tar\" archive files.";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- }
- ) { };
-
tar_0_6_3_0 = callPackage (
{
mkDerivation,
@@ -656121,7 +658313,7 @@ self: {
];
doHaddock = false;
description = "Reading, writing and manipulating \".tar\" archive files.";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -656152,8 +658344,8 @@ self: {
pname = "tar";
version = "0.6.4.0";
sha256 = "1apkq11xg0rqbgs83hag85r4ibdw7v09n1qj0l0962d80h0aajbr";
- revision = "2";
- editedCabalFile = "074f5a4qcdl5vb7334i41azj4aj8i5ql03qrlr3hb5smxhvvk386";
+ revision = "4";
+ editedCabalFile = "1015pyr21l4apvkqdp08f7gnxawch4qpc1cdlqzcbfni9jvg4pqs";
libraryHaskellDepends = [
array
base
@@ -656198,7 +658390,7 @@ self: {
];
doHaddock = false;
description = "Reading, writing and manipulating \".tar\" archive files.";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -656228,6 +658420,8 @@ self: {
pname = "tar";
version = "0.7.0.0";
sha256 = "0dlhf8hhcgl5zvqqsykvg4vwi05b2cy0ml3p6yz4bngqxhnd2jkf";
+ revision = "2";
+ editedCabalFile = "0gx6fvmrgs42m3rkwswmfwmnlqyzsi35w7j7phlh092gwfwynp4b";
libraryHaskellDepends = [
array
base
@@ -656267,7 +658461,7 @@ self: {
];
doHaddock = false;
description = "Reading, writing and manipulating \".tar\" archive files.";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -656593,7 +658787,7 @@ self: {
QuickCheck
];
description = "Targeted generators for QuickCheck";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -656948,7 +659142,7 @@ self: {
temporary
];
description = "CLI task / todo list manager with SQLite backend";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "tasklite";
}
@@ -657086,7 +659280,7 @@ self: {
protolude
];
description = "CLI task / todo list manager with SQLite backend";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -657173,7 +659367,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Types and aeson instances for taskwarrior tasks";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
maintainers = [ lib.maintainers.maralorn ];
}
) { };
@@ -657541,7 +659735,7 @@ self: {
text
];
description = "Check multiple items during a tasty test";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -657570,7 +659764,7 @@ self: {
tasty
];
description = "Ingredient for tasty which generates per-test coverage reports";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -657651,7 +659845,7 @@ self: {
tasty-smallcheck
];
description = "Test discovery for the tasty framework";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "tasty-discover";
}
) { };
@@ -657684,6 +659878,8 @@ self: {
pname = "tasty-discover";
version = "5.1.0";
sha256 = "0y6py4l63idqvvr063cnkqcl3wbsglk3bpizmlgbwmq4gq9aprif";
+ revision = "1";
+ editedCabalFile = "1bac8ll0im08w7n5hj43fkjpilcax9bz0kbq0nr690lh49ws2353";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -657720,7 +659916,7 @@ self: {
temporary
];
description = "Test discovery for the tasty framework";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "tasty-discover";
}
@@ -657826,7 +660022,7 @@ self: {
tasty-hunit
];
description = "Handle flaky Tasty-based tests";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -657855,7 +660051,7 @@ self: {
tasty-hunit
];
description = "Simple focus mechanism for tasty";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -657932,10 +660128,8 @@ self: {
}:
mkDerivation {
pname = "tasty-golden-extra";
- version = "0.1.0.0";
- sha256 = "1bfd9ql3pws2vd37nbc5a8b49p7zbq3n48slxkrrwx1szaxkp8nj";
- revision = "4";
- editedCabalFile = "10bcysc2i1s1p0ih2i9nrqpi0839pgpzzl625iqcbjhv9hnx01kd";
+ version = "0.1.0.1";
+ sha256 = "1qfrskhw9qh6w594r9k6x1znz4xr2lma9v16zkdmmdii3wx9ipax";
libraryHaskellDepends = [
aeson
aeson-diff
@@ -657951,7 +660145,7 @@ self: {
yaml
];
description = "Additional golden test helpers for the tasty-golden package";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -657988,7 +660182,7 @@ self: {
text
];
description = "Grade your tasty-testsuite";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -658047,8 +660241,8 @@ self: {
pname = "tasty-hedgehog";
version = "1.4.0.2";
sha256 = "0lki03z0p38x0dkqx5cqga30zy5m31gxn1saqylja9bi6bbq8d25";
- revision = "6";
- editedCabalFile = "1rb8ncp6xyy7jr6v0hyls9m529ba0djndsxgxmkgr52rk3qq8lrc";
+ revision = "7";
+ editedCabalFile = "0xcg6qiw7fgl8hw50zfw8rayzynl4czhmvbgdkydq2a2ajipz06r";
libraryHaskellDepends = [
base
hedgehog
@@ -658133,7 +660327,7 @@ self: {
tasty-hunit
];
description = "Tasty helpers to test HsLua";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -658153,8 +660347,8 @@ self: {
pname = "tasty-hspec";
version = "1.2.0.4";
sha256 = "1hk1nkjvhp89xxgzj6dhbgw0fknnghpng6afq4i39hjkwv5p78ni";
- revision = "7";
- editedCabalFile = "0s1y34i8g7fva0z10ws3ipcy2jmlvqk0v4hdbx8rqnby5n0l5kay";
+ revision = "8";
+ editedCabalFile = "1jg5gjmcir11vwj5jp2h077xrb9f7y13zl9asl048nd0wg2qxym8";
libraryHaskellDepends = [
base
hspec
@@ -658166,7 +660360,7 @@ self: {
tasty-smallcheck
];
description = "Hspec support for the Tasty test framework";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -658302,8 +660496,8 @@ self: {
pname = "tasty-inspection-testing";
version = "0.2.1";
sha256 = "0wl2xlnbmqdkwhi4ic6a4q4lxf9qg433lidi8d0hlp3ykrjpbcay";
- revision = "2";
- editedCabalFile = "0z9al0hyq381fw146agbpz7rf24rwms1w91m7s0k1w3xbfw16l9n";
+ revision = "3";
+ editedCabalFile = "1gvwk8q20bbjny660qqp43y4ng5m56hk40mpvl8hi94wdw39pr6v";
libraryHaskellDepends = [
base
ghc
@@ -658471,7 +660665,7 @@ self: {
text
];
description = "JSON reporter for the tasty testing framework";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -658617,8 +660811,8 @@ self: {
}:
mkDerivation {
pname = "tasty-lua";
- version = "1.1.1.1";
- sha256 = "03b2n3gw2w70cnl57w3sh3cv5ka270sf07jlxpb4zs0z5gh83p1r";
+ version = "1.1.2";
+ sha256 = "1047zbg99n3fvsjkivsj4m18igb1k495ymhkypd11jjdfqwd34rn";
libraryHaskellDepends = [
base
bytestring
@@ -658641,7 +660835,7 @@ self: {
tasty-hunit
];
description = "Write tests in Lua, integrate into tasty";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -658756,7 +660950,7 @@ self: {
tasty-focus
];
description = "Unopinionated top-level entry point to tasty ecosystem";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -658866,8 +661060,8 @@ self: {
pname = "tasty-quickcheck";
version = "0.11.1";
sha256 = "0si4ccgqlv8h33d6310rrqba7f4pz3g8cinqfj42yd7damsdxm73";
- revision = "3";
- editedCabalFile = "1wzvha4xam8npx5mk33c056grmrqnjd6m38nnm6d7y99w2mn1a7w";
+ revision = "4";
+ editedCabalFile = "13sn5bwvw04d7l3xv6mkj8mf6wyvhqqhabdqnb4xchzcc48akdxz";
libraryHaskellDepends = [
base
optparse-applicative
@@ -658953,7 +661147,7 @@ self: {
transformers
];
description = "Rerun only tests which failed in a previous test run";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -659240,7 +661434,7 @@ self: {
tasty
];
description = "Test vector support for tasty";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -659431,7 +661625,7 @@ self: {
profunctors
];
description = "Types and combinators for taxes";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
}
) { };
@@ -659456,7 +661650,7 @@ self: {
time
];
description = "Tax types and computations for Australia";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
}
) { };
@@ -659873,7 +662067,7 @@ self: {
vector-algorithms
];
description = "On-line accumulation of rank-based statistics";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -660517,7 +662711,7 @@ self: {
webgear-core
];
description = "Easily define multiple interrelated data types";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "tedious-web-exe";
broken = true;
@@ -660559,7 +662753,7 @@ self: {
prettyprinter-ansi-terminal
];
description = "Prettier error";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -661040,7 +663234,7 @@ self: {
in-other-words
];
description = "Binding to the telegraph API";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -661230,7 +663424,7 @@ self: {
transformers
];
description = "The MonadTell class and related monad transformers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -661448,7 +663642,26 @@ self: {
template-haskell
];
description = "Backward-compatibility layer for Template Haskell newer than 2.8";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
+ }
+ ) { };
+
+ template-haskell-lift = callPackage (
+ {
+ mkDerivation,
+ base,
+ template-haskell,
+ }:
+ mkDerivation {
+ pname = "template-haskell-lift";
+ version = "0.1.0.0";
+ sha256 = "09zilw0nbjmn1k688l058183rwa3br0fvh3x8jxqygjh3011w8ps";
+ libraryHaskellDepends = [
+ base
+ template-haskell
+ ];
+ description = "The 'Lift' typeclass";
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -661479,6 +663692,25 @@ self: {
}
) { };
+ template-haskell-quasiquoter = callPackage (
+ {
+ mkDerivation,
+ base,
+ template-haskell,
+ }:
+ mkDerivation {
+ pname = "template-haskell-quasiquoter";
+ version = "0.1.0.0";
+ sha256 = "06zm27d72faad2ln7xn7d3kmvy04hq663a1q75cp7yyyca7fgjhf";
+ libraryHaskellDepends = [
+ base
+ template-haskell
+ ];
+ description = "The 'QuasiQuoter' interface";
+ license = lib.licensesSpdx."BSD-2-Clause";
+ }
+ ) { };
+
template-haskell-util = callPackage (
{
mkDerivation,
@@ -661793,7 +664025,7 @@ self: {
];
doHaddock = false;
description = "You can use template.hs to create a new Haskell GitHub repository.";
- license = lib.licenses.unlicense;
+ license = lib.licensesSpdx."Unlicense";
hydraPlatforms = lib.platforms.none;
mainProgram = "initialise";
broken = true;
@@ -661896,6 +664128,26 @@ self: {
}
) { };
+ temporal-api-protos = callPackage (
+ {
+ mkDerivation,
+ base,
+ proto-lens-protobuf-types,
+ proto-lens-runtime,
+ }:
+ mkDerivation {
+ pname = "temporal-api-protos";
+ version = "2025.10.1.0";
+ sha256 = "0304jkgf2fmkkpi4xyzdn7m3pcwpwb5cgdh9z3xpxhx85f0zhs23";
+ libraryHaskellDepends = [
+ base
+ proto-lens-protobuf-types
+ proto-lens-runtime
+ ];
+ license = lib.licensesSpdx."BSD-3-Clause";
+ }
+ ) { };
+
temporal-csound = callPackage (
{
mkDerivation,
@@ -662011,6 +664263,229 @@ self: {
}
) { };
+ temporal-sdk = callPackage (
+ {
+ mkDerivation,
+ aeson,
+ annotated-exception,
+ async,
+ base,
+ base64,
+ bytestring,
+ conduit,
+ containers,
+ directory,
+ discover-instances,
+ exceptions,
+ first-class-families,
+ ghc,
+ hashable,
+ hedgehog,
+ hs-opentelemetry-api,
+ hs-opentelemetry-propagator-w3c,
+ hs-opentelemetry-sdk,
+ hspec,
+ hspec-api,
+ hspec-discover,
+ hspec-hedgehog,
+ lens-family,
+ monad-logger,
+ mtl,
+ network,
+ proto-lens,
+ proto-lens-protobuf-types,
+ random,
+ require-callstack,
+ resourcet,
+ scientific,
+ split,
+ stm,
+ template-haskell,
+ temporal-api-protos,
+ temporal-sdk-core,
+ text,
+ th-lift-instances,
+ these,
+ time,
+ transformers,
+ unliftio,
+ unordered-containers,
+ uuid,
+ uuid-types,
+ validation-selective,
+ vault,
+ vector,
+ zlib,
+ }:
+ mkDerivation {
+ pname = "temporal-sdk";
+ version = "2025.10.1.0";
+ sha256 = "1zck8cm7w6rzap8nmjnyjvlf6xlgywkhk99qb62l4jmr6xmrq8y1";
+ libraryHaskellDepends = [
+ aeson
+ annotated-exception
+ async
+ base
+ base64
+ bytestring
+ conduit
+ containers
+ discover-instances
+ exceptions
+ first-class-families
+ ghc
+ hashable
+ hs-opentelemetry-api
+ hs-opentelemetry-propagator-w3c
+ lens-family
+ monad-logger
+ mtl
+ network
+ proto-lens
+ proto-lens-protobuf-types
+ random
+ require-callstack
+ scientific
+ split
+ stm
+ template-haskell
+ temporal-api-protos
+ temporal-sdk-core
+ text
+ th-lift-instances
+ these
+ time
+ transformers
+ unliftio
+ unordered-containers
+ uuid
+ uuid-types
+ validation-selective
+ vault
+ vector
+ zlib
+ ];
+ testHaskellDepends = [
+ aeson
+ annotated-exception
+ async
+ base
+ base64
+ bytestring
+ conduit
+ containers
+ directory
+ discover-instances
+ exceptions
+ first-class-families
+ ghc
+ hashable
+ hedgehog
+ hs-opentelemetry-api
+ hs-opentelemetry-propagator-w3c
+ hs-opentelemetry-sdk
+ hspec
+ hspec-api
+ hspec-hedgehog
+ lens-family
+ monad-logger
+ mtl
+ network
+ proto-lens
+ proto-lens-protobuf-types
+ random
+ require-callstack
+ resourcet
+ scientific
+ split
+ stm
+ template-haskell
+ temporal-api-protos
+ temporal-sdk-core
+ text
+ th-lift-instances
+ these
+ time
+ transformers
+ unliftio
+ unordered-containers
+ uuid
+ uuid-types
+ validation-selective
+ vault
+ vector
+ zlib
+ ];
+ testToolDepends = [ hspec-discover ];
+ license = lib.licensesSpdx."BSD-3-Clause";
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
+ temporal-sdk-core = callPackage (
+ {
+ mkDerivation,
+ aeson,
+ async,
+ base,
+ bytestring,
+ Cabal,
+ containers,
+ directory,
+ filepath,
+ lens-family,
+ monad-logger,
+ mtl,
+ network-bsd,
+ proto-lens,
+ stm,
+ temporal-api-protos,
+ temporal_bridge,
+ text,
+ unix,
+ unliftio,
+ unordered-containers,
+ uuid,
+ vector,
+ }:
+ mkDerivation {
+ pname = "temporal-sdk-core";
+ version = "2025.10.1.0";
+ sha256 = "1gz4nrp0ja8s4wawbjzf5v8mbsz2n0gll70bfyfwzjd0izi95j9i";
+ setupHaskellDepends = [
+ base
+ Cabal
+ directory
+ filepath
+ unix
+ ];
+ libraryHaskellDepends = [
+ aeson
+ async
+ base
+ bytestring
+ containers
+ lens-family
+ monad-logger
+ mtl
+ network-bsd
+ proto-lens
+ stm
+ temporal-api-protos
+ text
+ unix
+ unliftio
+ unordered-containers
+ uuid
+ vector
+ ];
+ librarySystemDepends = [ temporal_bridge ];
+ license = lib.licensesSpdx."BSD-3-Clause";
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }
+ ) { temporal_bridge = null; };
+
temporary = callPackage (
{
mkDerivation,
@@ -663013,7 +665488,7 @@ self: {
QuickCheck
];
description = "Tunable sorting for responsive robustness and beyond";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "tensort";
}
) { };
@@ -663074,7 +665549,7 @@ self: {
termbox-bindings-hs
];
description = "termbox";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -663097,7 +665572,7 @@ self: {
termbox
];
description = "termbox + reactive-banana";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -663132,7 +665607,7 @@ self: {
sha256 = "1n1z66xwnvrmvb3qd5wx8rwf2v54zvy3bzqrqcwp43jjii4mjqkh";
libraryHaskellDepends = [ base ];
description = "termbox bindings";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -663151,7 +665626,7 @@ self: {
termbox-bindings-c
];
description = "termbox bindings";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -663174,7 +665649,7 @@ self: {
termbox
];
description = "termbox + The Elm Architecture";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -663884,7 +666359,7 @@ self: {
tls
];
description = "create temporary SSL certificates in tests";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -664518,7 +666993,7 @@ self: {
simple-get-opt
];
description = "A library to make a quick test-runner script";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
hydraPlatforms = lib.platforms.none;
mainProgram = "test-runner";
broken = true;
@@ -665064,15 +667539,15 @@ self: {
}:
mkDerivation {
pname = "testcontainers-postgresql";
- version = "0.0.1.1";
- sha256 = "0zycclxn0wnnj0qhhxixlljl0jirsfd00wihhlx6azpy0h6qc8lw";
+ version = "0.0.4";
+ sha256 = "09pa6w7kksxn0dpg99m2f3lhplm1316g782i8gfjxwig84r7z0av";
libraryHaskellDepends = [
base
testcontainers
text
];
description = "Testcontainers integration for PostgreSQL";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -665136,7 +667611,7 @@ self: {
vec
];
description = "Pure implementation of tensors, for use in tests";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -665484,7 +667959,7 @@ self: {
}
) { };
- texmath_0_13 = callPackage (
+ texmath_0_13_0_1 = callPackage (
{
mkDerivation,
base,
@@ -665507,8 +667982,8 @@ self: {
}:
mkDerivation {
pname = "texmath";
- version = "0.13";
- sha256 = "1cap5mgh7ca0b7sk1k68wpxa1alhyvzgayj65llzyw94j9pbb23x";
+ version = "0.13.0.1";
+ sha256 = "1m08i83z1llm3swyjxk56pnyaw2gma4qyq3pmxr3xqzlr6x286x3";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -665655,7 +668130,7 @@ self: {
];
doCheck = false;
description = "An efficient packed Unicode text type";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -665737,7 +668212,7 @@ self: {
text-builder-linear
];
description = "Text styling for ANSI terminals";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -665774,7 +668249,7 @@ self: {
text
];
description = "ASCII string and character processing";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -665835,7 +668310,7 @@ self: {
rerebase
];
description = "Efficient strict text builder";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -665886,7 +668361,7 @@ self: {
text-builder-linear
];
description = "Efficient and flexible strict text builder";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -665928,7 +668403,7 @@ self: {
text-builder-linear
];
description = "Internals of \"text-builder\"";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -665986,7 +668461,7 @@ self: {
rerebase
];
description = "Edge of developments for \"text-builder\"";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -666033,7 +668508,7 @@ self: {
time
];
description = "Edge of developments for \"text-builder\"";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -666070,7 +668545,7 @@ self: {
text-builder
];
description = "Orphan instances of \"lawful-conversions\" for \"text-builder\"";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -666113,7 +668588,7 @@ self: {
text
];
description = "Builder for Text and ByteString based on linear types";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -666134,7 +668609,7 @@ self: {
time
];
description = "Various formats for \"time\" in terms of \"text-builder\"";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -666161,7 +668636,7 @@ self: {
text
];
description = "A text compression library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -666248,7 +668723,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Safe conversions between textual types";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -666278,7 +668753,7 @@ self: {
text
];
description = "Convert between various textual representations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -666346,7 +668821,7 @@ self: {
text-builder-linear
];
description = "A typeclass for user-facing output";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
maintainers = [ lib.maintainers.mangoiv ];
}
) { };
@@ -666401,7 +668876,7 @@ self: {
];
doHaddock = false;
description = "Classes and newtypes for deriving uniform textual encodings";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -666995,7 +669470,7 @@ self: {
text
];
description = "Case conversion, word boundary manipulation, and textual subjugation";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -667035,50 +669510,6 @@ self: {
}
) { };
- text-metrics_0_3_2 = callPackage (
- {
- mkDerivation,
- base,
- containers,
- criterion,
- deepseq,
- hspec,
- QuickCheck,
- text,
- vector,
- weigh,
- }:
- mkDerivation {
- pname = "text-metrics";
- version = "0.3.2";
- sha256 = "0vl3vnm7xhy2zwcx1m293gp64q5sxfa3vmzdaqnqmjgby6l31mxx";
- revision = "4";
- editedCabalFile = "1blvnlylfs5s91q4n48la7pcl2sz5gajmjdx9jagcml5nmsnirqq";
- libraryHaskellDepends = [
- base
- containers
- text
- vector
- ];
- testHaskellDepends = [
- base
- hspec
- QuickCheck
- text
- ];
- benchmarkHaskellDepends = [
- base
- criterion
- deepseq
- text
- weigh
- ];
- description = "Calculate various string metrics efficiently";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- }
- ) { };
-
text-metrics = callPackage (
{
mkDerivation,
@@ -667118,7 +669549,7 @@ self: {
weigh
];
description = "Calculate various string metrics efficiently";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -667512,7 +669943,7 @@ self: {
text
];
description = "Simple text replacements from a list of search/replace pairs";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "text-replace";
broken = true;
@@ -667573,6 +670004,8 @@ self: {
pname = "text-rope-zipper";
version = "0.1.1.0";
sha256 = "04hxmpgid7x1b566vsdi8sp18w62k5wlw4s08vchv4y4564hc8vm";
+ revision = "1";
+ editedCabalFile = "0xb3l96vkmnbqh06ppb9l0nfhfdqqw4lpmpgpicy1b6prgsf5wcj";
libraryHaskellDepends = [
base
text
@@ -667586,9 +670019,7 @@ self: {
text-rope
];
description = "2D text zipper based on text-rope";
- license = lib.licenses.asl20;
- hydraPlatforms = lib.platforms.none;
- broken = true;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -668866,7 +671297,7 @@ self: {
unordered-containers
];
description = "Check that datatypes are deep strict using Template Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -669331,7 +671762,7 @@ self: {
template-haskell
];
description = "Template Haskell construction utilities";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -669360,7 +671791,7 @@ self: {
transformers
];
description = "Implicit (recursive) let insertion";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -669461,7 +671892,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Serialize compilation of modules with TH code modifing shared state";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -670027,7 +672458,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Give your dependencies stars on GitHub!";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "thank-you-stars";
broken = true;
@@ -670103,7 +672534,7 @@ self: {
unagi-chan
];
description = "Minimalistic actor library";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -670140,7 +672571,7 @@ self: {
rerebase
];
description = "Minimalistic actor library experiments";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -670201,7 +672632,7 @@ self: {
time
];
description = "Haskell API bindings for http://themoviedb.org";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "tmdb";
broken = true;
@@ -671446,7 +673877,7 @@ self: {
text
];
description = "A compiler from the Thrift Interface Definition Language (IDL) to Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "thrift-compiler";
}
@@ -671481,7 +673912,7 @@ self: {
unordered-containers
];
description = "Support for using Haxl with Thrift services";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -671569,7 +674000,7 @@ self: {
];
doHaddock = false;
description = "Support for Thrift-over-HTTP server and client";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -671671,7 +674102,7 @@ self: {
testToolDepends = [ thrift-compiler ];
doHaddock = false;
description = "Libraries for Haskell Thrift";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -671974,7 +674405,7 @@ self: {
text
];
description = "Image thumbnail creation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -672098,7 +674529,7 @@ self: {
unordered-containers,
utf8-string,
vector,
- webkitgtk_4_0,
+ webkit2gtk,
xdg-basedir,
xmonad,
xmonad-contrib,
@@ -672151,7 +674582,7 @@ self: {
];
executablePkgconfigDepends = [
gtk3
- webkitgtk_4_0
+ webkit2gtk
];
testHaskellDepends = [
aeson
@@ -672194,7 +674625,7 @@ self: {
)
{
inherit (pkgs) gtk3;
- webkitgtk_4_0 = null;
+ webkit2gtk = null;
};
tibetan-utils = callPackage (
@@ -672331,7 +674762,7 @@ self: {
text
];
description = "A basic implementation of a personal ticket management system";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "ticket-manager";
broken = true;
@@ -672538,7 +674969,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "Ableton Link integration for Tidal";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
mainProgram = "tidal-linktest";
}
) { };
@@ -672821,7 +675252,7 @@ self: {
];
testSystemDepends = [ tb_client ];
description = "A Haskell client library for Tigerbeetle database";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "tigerbeetle-hs";
broken = true;
@@ -672970,7 +675401,7 @@ self: {
tasty-bench
];
description = "Haskell implementation of tiktoken";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -673127,7 +675558,7 @@ self: {
deepseq
];
description = "A time library";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -673222,7 +675653,7 @@ self: {
time
];
description = "A library for time domains and durations";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
maintainers = [ lib.maintainers.turion ];
}
) { };
@@ -674225,8 +676656,8 @@ self: {
pname = "timeline";
version = "0.1.1.0";
sha256 = "15npn5wfhdg2mcvr92n7c9k7jj1jcifm6rcpmyi64mcfsb2g1ry6";
- revision = "2";
- editedCabalFile = "1qqhf50g4b89fa5wjhhgjsvyx3gqrdmpswsyjwkwbrbh6m795xja";
+ revision = "3";
+ editedCabalFile = "12x91d8cijq5ifij08piwjjbv72h0q2bn0dxfjqkl6l791n4mqr4";
libraryHaskellDepends = [
base
containers
@@ -674254,7 +676685,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Data type representing a piecewise-constant function over time";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -674388,6 +676819,39 @@ self: {
}
) { };
+ timeout-snooze = callPackage (
+ {
+ mkDerivation,
+ base,
+ hspec,
+ stm,
+ stm-delay,
+ unliftio,
+ }:
+ mkDerivation {
+ pname = "timeout-snooze";
+ version = "0.1.0.0";
+ sha256 = "0xnci3sn0kn864lik3w7lvhqrczyn103z7gzz2zcgih113ky7sn6";
+ libraryHaskellDepends = [
+ base
+ stm
+ stm-delay
+ unliftio
+ ];
+ testHaskellDepends = [
+ base
+ hspec
+ stm
+ stm-delay
+ unliftio
+ ];
+ description = "Efficient timeout with reset";
+ license = lib.licensesSpdx."BSD-3-Clause";
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }
+ ) { };
+
timeout-with-results = callPackage (
{
mkDerivation,
@@ -674550,7 +677014,7 @@ self: {
tasty-bench
];
description = "A timer wheel";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -674836,7 +677300,7 @@ self: {
text
];
description = "A library for profiling time in Haskell applications";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -675324,7 +677788,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Library to build tiny apps in Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -675368,7 +677832,7 @@ self: {
entropy
];
description = "A secure URL-friendly string ID generator";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -676511,7 +678975,7 @@ self: {
}
) { };
- tls_2_1_11 = callPackage (
+ tls_2_1_12 = callPackage (
{
mkDerivation,
asn1-encoding,
@@ -676522,6 +678986,7 @@ self: {
base64-bytestring,
bytestring,
cereal,
+ containers,
crypton,
crypton-x509,
crypton-x509-store,
@@ -676535,17 +679000,19 @@ self: {
memory,
mtl,
network,
+ network-run,
QuickCheck,
random,
serialise,
+ tasty-bench,
transformers,
unix-time,
zlib,
}:
mkDerivation {
pname = "tls";
- version = "2.1.11";
- sha256 = "1qw4yvvxv10gh7as8lhg4z1q4l547gikwm1krz6h6kshk0rig6h5";
+ version = "2.1.12";
+ sha256 = "1lhv1c93qaj3mg5mdifjfzddcw6y5j0nzbyy22pqyad1j41lbm2g";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -676587,6 +679054,27 @@ self: {
serialise
];
testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [
+ asn1-types
+ async
+ base
+ base64-bytestring
+ bytestring
+ containers
+ crypton
+ crypton-x509
+ crypton-x509-store
+ crypton-x509-validation
+ data-default
+ ech-config
+ hourglass
+ hspec
+ network
+ network-run
+ QuickCheck
+ serialise
+ tasty-bench
+ ];
description = "TLS protocol native implementation";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
@@ -676742,7 +679230,7 @@ self: {
tls
];
description = "SSLKEYLOGFILE support for Haskell";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -676796,7 +679284,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "Handle phylogenetic trees";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
mainProgram = "tlynx";
maintainers = [ lib.maintainers.dschrempf ];
}
@@ -676852,7 +679340,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "Handle phylogenetic trees";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "tlynx";
maintainers = [ lib.maintainers.dschrempf ];
@@ -677097,7 +679585,7 @@ self: {
warp-tls
];
description = "Run 'tmp' processes in integration tests";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -677170,7 +679658,7 @@ self: {
hspec
];
description = "Test a simple service with backends running on docker using tmp-proc";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -677208,7 +679696,7 @@ self: {
tmp-proc
];
description = "Launch a PostgreSQL database in docker using tmp-proc";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -677244,7 +679732,7 @@ self: {
tmp-proc
];
description = "Launch RabbitMQ in docker using tmp-proc";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -677280,7 +679768,7 @@ self: {
tmp-proc
];
description = "Launch Redis in docker using tmp-proc";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -677317,7 +679805,7 @@ self: {
tmp-proc
];
description = "Launch ZipKin in docker using tmp-proc";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -677777,7 +680265,7 @@ self: {
text
];
description = "Fast rate limiting using the token bucket algorithm (BSD)";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "token-limiter-extended-tests";
broken = true;
@@ -677960,7 +680448,7 @@ self: {
transformers
];
description = "Check uniqueness and tokenize safely";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -678297,7 +680785,7 @@ self: {
markdown-unlit
];
description = "TOML 1.0.0 parser";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -678395,7 +680883,7 @@ self: {
toml-reader
];
description = "Alternative parser for TOML values produced by the toml-reader package";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -678428,7 +680916,7 @@ self: {
toml-parser
];
description = "toml-parser test drivers";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -678493,7 +680981,7 @@ self: {
unordered-containers
];
description = "Bidirectional TOML serialization";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -679212,7 +681700,7 @@ self: {
template-haskell
time
];
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -679255,7 +681743,7 @@ self: {
text
];
description = "Tribial tools";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -679393,7 +681881,7 @@ self: {
vector
];
description = "Extensible records library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -679495,7 +681983,7 @@ self: {
vector
];
description = "Directed acyclic graphs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -679561,7 +682049,7 @@ self: {
sha256 = "0ljcxlv019qfbs3wvp03j8l261i1p6vv3vycabcd0hpy0dbq80d9";
libraryHaskellDepends = [ base ];
description = "Torsor Typeclass";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -680153,7 +682641,7 @@ self: {
vector
];
description = "Assorted decision procedures for SAT, SMT, Max-SAT, PB, MIP, etc";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -680390,7 +682878,7 @@ self: {
text
];
description = "Data Type for Rewriting Systems";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
}
) { };
@@ -680434,7 +682922,7 @@ self: {
text
];
description = "Parser and pretty printer for the TPTP language";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -680572,7 +683060,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Smart version of Debug.Trace module";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -681749,7 +684237,7 @@ self: {
transformers
];
description = "An Either monad transformer";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -681774,7 +684262,7 @@ self: {
transformers
];
description = "An Except monad transformer with";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -681841,7 +684329,7 @@ self: {
writer-cps-transformers
];
description = "Ad-hoc type classes for lifting";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -682224,7 +684712,7 @@ self: {
doctest
];
description = "Type Safe Web Routing";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -682261,7 +684749,7 @@ self: {
trasa
];
description = "Type safe http requests";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -682420,7 +684908,7 @@ self: {
wai
];
description = "Type safe web server";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -682450,7 +684938,7 @@ self: {
trasa
];
description = "Template Haskell to generate trasa routes";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -682486,7 +684974,7 @@ self: {
util
];
description = "See README for more info";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -682527,7 +685015,7 @@ self: {
template-haskell
];
description = "General data structure lifting for Template Haskell";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -682780,7 +685268,7 @@ self: {
hspec-core
];
description = "Efficient implementation of the implicit treap data structure";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -682871,7 +685359,7 @@ self: {
Diff
];
description = "Diffing of (expression) trees";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
}
) { };
@@ -682916,7 +685404,7 @@ self: {
vector
];
description = "Tree Edit Distance to determine the similarity between two trees";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "tree-edit-distance-exe";
}
) { };
@@ -682975,7 +685463,7 @@ self: {
mtl
];
description = "Configurable text rendering of trees";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -683013,7 +685501,7 @@ self: {
hedgehog
];
description = "Unstable bindings for the tree-sitter parsing library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -683033,7 +685521,7 @@ self: {
tree-sitter
];
description = "Tree-sitter grammar/parser for C#";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -683053,7 +685541,7 @@ self: {
tree-sitter
];
description = "Tree-sitter grammar/parser for Go";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -683074,7 +685562,7 @@ self: {
tree-sitter
];
description = "Tree-sitter grammar/parser for Haskell (with GHC extensions)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -683094,7 +685582,7 @@ self: {
tree-sitter
];
description = "Tree-sitter grammar/parser for Java";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -683114,7 +685602,7 @@ self: {
tree-sitter
];
description = "Tree-sitter grammar/parser for JSON";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -683134,7 +685622,7 @@ self: {
tree-sitter
];
description = "Tree-sitter grammar/parser for OCaml";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -683154,7 +685642,7 @@ self: {
tree-sitter
];
description = "Tree-sitter grammar/parser for PHP";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -683174,7 +685662,7 @@ self: {
tree-sitter
];
description = "Tree-sitter grammar/parser for Python";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -683194,7 +685682,7 @@ self: {
tree-sitter
];
description = "Tree-sitter grammar/parser for QL";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -683214,7 +685702,7 @@ self: {
tree-sitter
];
description = "Tree-sitter grammar/parser for Ruby";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -683234,7 +685722,7 @@ self: {
tree-sitter
];
description = "Tree-sitter grammar/parser for Rust";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -683254,7 +685742,7 @@ self: {
tree-sitter
];
description = "Tree-sitter grammar/parser for TSX";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -683274,7 +685762,7 @@ self: {
tree-sitter
];
description = "Tree-sitter grammar/parser for TypeScript";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -683301,7 +685789,7 @@ self: {
mtl
];
description = "Functions and newtype wrappers for traversing Trees";
- license = lib.licenses.cc0;
+ license = lib.licensesSpdx."CC0-1.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -683848,7 +686336,7 @@ self: {
];
doHaddock = false;
description = "Bindings to the TREXIO library for wave function data";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { inherit (pkgs) trexio; };
@@ -683898,7 +686386,7 @@ self: {
splitmix
];
description = "Trial Data Structure";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -683921,7 +686409,7 @@ self: {
trial
];
description = "Trial helper functions for optparse-applicative";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -683946,7 +686434,7 @@ self: {
trial
];
description = "Trial helper functions for tomland";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -684280,7 +686768,7 @@ self: {
hspec
];
description = "A command-line tool for trimming whitespace";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "trim";
broken = true;
@@ -684551,7 +687039,7 @@ self: {
time
];
description = "Template Haskell hack to violate module abstractions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -684676,7 +687164,7 @@ self: {
text
];
description = "An implementation of a trust chain";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -684702,7 +687190,7 @@ self: {
sha256 = "164jxd8cyjb4qkmwqchzcpvd5fh7d124gbpryi26y8cbabmhfm8z";
libraryHaskellDepends = [ base ];
description = "Generalized booleans and truthy values";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -685265,7 +687753,7 @@ self: {
text-short
];
description = "Textual Type Classes";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -685765,7 +688253,7 @@ self: {
tasty-hunit
];
description = "Access tuple fields using record dot syntax";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "gen-source";
broken = true;
@@ -686020,7 +688508,7 @@ self: {
tasty-quickcheck
];
description = "Small monomorphic tuples";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -686502,7 +688990,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Tiny web application framework for WAI";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -687447,7 +689935,7 @@ self: {
vector
];
description = "Simple 2D Game Engine";
- license = lib.licenses.zlib;
+ license = lib.licensesSpdx."Zlib";
badPlatforms = lib.platforms.darwin;
hydraPlatforms = lib.platforms.none;
mainProgram = "example";
@@ -687500,7 +689988,7 @@ self: {
wai
];
description = "Haskell twirp foundations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -688477,7 +690965,7 @@ self: {
Glob
];
description = "Combinators for writing pretty type errors easily";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -689033,7 +691521,7 @@ self: {
template-haskell
];
description = "Type-level functions for record types";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "vector-example";
}
) { };
@@ -689118,7 +691606,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Type-level natural and proofs of their properties";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -689324,7 +691812,7 @@ self: {
tasty-hunit
];
description = "Support functions to work with type representations";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -689345,7 +691833,7 @@ self: {
invariant
];
description = "Classes for the rig (sums and products) of types";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -689359,7 +691847,7 @@ self: {
editedCabalFile = "0xcamv7cy7saywzx2vj7d0l1hpjqkz8jzkdy8hdabz7q9zlynshg";
libraryHaskellDepends = [ base ];
description = "Type safe BST and AVL trees";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -689387,7 +691875,7 @@ self: {
template-haskell
];
description = "Type set";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -689796,7 +692284,7 @@ self: {
unordered-containers
];
description = "An implementation of LangChain in Haskell";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "typechain-exe";
broken = true;
@@ -690114,7 +692602,7 @@ self: {
singletons-base
];
description = "A framework for strongly typed FSM";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -690142,7 +692630,9 @@ self: {
];
testHaskellDepends = [ base ];
description = "GUI framework based on typed-fsm";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
) { };
@@ -690207,8 +692697,8 @@ self: {
}:
mkDerivation {
pname = "typed-process-effectful";
- version = "1.0.0.3";
- sha256 = "07vsi991x9aflbk5pza1y20y9pg3zpnqjdj9c7brwv75m9yjasw5";
+ version = "1.0.0.4";
+ sha256 = "1p19zisid3i4wrwa2gfzbad233dcbd6jbryfc3bk0hrcikcvl14y";
libraryHaskellDepends = [
base
bytestring
@@ -690222,7 +692712,7 @@ self: {
tasty-hunit
];
description = "A binding of the typed-process library for the effectful effect system";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -690247,8 +692737,8 @@ self: {
}:
mkDerivation {
pname = "typed-protocols";
- version = "1.1.0.0";
- sha256 = "0zxm7440985vlir9g7qn61g8k31afx33ca5s6jn5yi3j9q5vny5y";
+ version = "1.1.0.1";
+ sha256 = "1sfcdhvb99yzmzsh63qdvghbjhd5r1g3bi6yyb432pdqnw9i4s9g";
libraryHaskellDepends = [
base
bytestring
@@ -690274,9 +692764,7 @@ self: {
];
doHaddock = false;
description = "A framework for strongly typed protocols";
- license = lib.licenses.asl20;
- hydraPlatforms = lib.platforms.none;
- broken = true;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -690353,9 +692841,10 @@ self: {
typed-protocols
];
description = "Derive documentation from typed-protocols source code";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "typed-protocols-doc-demo";
+ broken = true;
}
) { };
@@ -690394,7 +692883,7 @@ self: {
test-framework-quickcheck2
];
description = "An efficient and versatile typed range library";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -690433,7 +692922,7 @@ self: {
template-haskell
];
description = "typed session framework";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -690467,7 +692956,7 @@ self: {
raw-strings-qq
];
description = "Automatically generate status for typed-session";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -690839,7 +693328,7 @@ self: {
tasty-quickcheck
];
description = "Plugin to faciliate type-level let";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -691147,7 +693636,7 @@ self: {
];
doHaddock = false;
description = "Efficient implementation of a dependent map with types as keys";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
maintainers = [ lib.maintainers.mpscholten ];
}
) { };
@@ -691200,8 +693689,8 @@ self: {
}:
mkDerivation {
pname = "typesafe-precure";
- version = "0.12.0.1";
- sha256 = "1cl6dq9mdm3caw3zzwpw7vcyv41apk0d0fxrxrm7d0vp4wvjckff";
+ version = "0.12.1.1";
+ sha256 = "0gba5l5l4cixyfpxkiy4hyz4zbrq7rxf2cfsj1123ycsa7j4j0ph";
libraryHaskellDepends = [
aeson
aeson-pretty
@@ -691223,7 +693712,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Type-safe transformations and purifications of PreCures (Japanese Battle Heroine)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -691315,7 +693804,7 @@ self: {
text-show
];
description = "Typelevel printf";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -691671,7 +694160,7 @@ self: {
time
];
description = "Parsing and evaluating typst syntax";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -691690,7 +694179,7 @@ self: {
text
];
description = "Symbol and emoji lookup for typst language";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -692342,7 +694831,7 @@ self: {
gauge
];
description = "Unicode Character Database — Predicates on characters specified by Unicode";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -692374,7 +694863,7 @@ self: {
containers
];
description = "Datatype and parser for the Universal Configuration Language (UCL) using libucl";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -692846,7 +695335,7 @@ self: {
];
executableHaskellDepends = [ base ];
description = "Minimalistic console UI (getLine), arrow key support (edit, browse cmd history)";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
mainProgram = "example";
}
) { };
@@ -693096,7 +695585,7 @@ self: {
time
];
description = "Implementation of ULID - Universally Unique Lexicographically Sortable Identifier";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "ulid-exe";
}
) { };
@@ -693144,7 +695633,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Another ULID implementation with tight memory representation";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -693200,7 +695689,7 @@ self: {
hspec
];
description = "Bindings for libunac(3)";
- license = lib.licenses.unlicense;
+ license = lib.licensesSpdx."Unlicense";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -693512,7 +696001,7 @@ self: {
unbound-generics
];
description = "Unification based on unbound-generics";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -693669,7 +696158,7 @@ self: {
vector
];
description = "A library for reference cells backed by unboxed-vectors";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "example";
broken = true;
@@ -693778,7 +696267,7 @@ self: {
libraryHaskellDepends = [ base ];
executableHaskellDepends = [ base ];
description = "Customize uncaught exception handling";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
mainProgram = "uncaught-exception-demo";
}
) { };
@@ -693865,7 +696354,7 @@ self: {
unliftio
];
description = "a library which implements easy, concurrent and pretty logging";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
mainProgram = "unclogging";
maintainers = [ lib.maintainers.mangoiv ];
}
@@ -693888,7 +696377,7 @@ self: {
int-supply
];
description = "Unconditional jumps";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -694064,7 +696553,7 @@ self: {
stm
];
description = "Make any action thread safe";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -694410,7 +696899,7 @@ self: {
text-icu
];
description = "Haskell implementation of the Unicode Collation Algorithm";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -694441,11 +696930,11 @@ self: {
tasty-bench
];
description = "Access Unicode Character Database (UCD)";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
- unicode-data_0_7_0 = callPackage (
+ unicode-data_0_8_0 = callPackage (
{
mkDerivation,
base,
@@ -694456,8 +696945,8 @@ self: {
}:
mkDerivation {
pname = "unicode-data";
- version = "0.7.0";
- sha256 = "1l21qmhg9pgfnfxi8bsdvbb5zq9izz23caz44s32r9xmd7mdxqc0";
+ version = "0.8.0";
+ sha256 = "02qgvnv6izs3nq8a14nw86pbgazqvjj22rsvvzklck56rmm7paby";
libraryHaskellDepends = [ base ];
testHaskellDepends = [
base
@@ -694470,7 +696959,7 @@ self: {
tasty-bench
];
description = "Access Unicode Character Database (UCD)";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -694487,8 +696976,8 @@ self: {
}:
mkDerivation {
pname = "unicode-data-names";
- version = "0.5.0";
- sha256 = "0hyx4lwz9y2nzk2jmrjcway02wbgam8yrsgggn28p8aabn452kp4";
+ version = "0.6.0";
+ sha256 = "0dr2wb100km8v683aw8ylwc2npj4bl7adsmknrdb0z3nz7xi0j0k";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -694508,7 +696997,7 @@ self: {
unicode-data
];
description = "Unicode characters names and aliases";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -694529,7 +697018,7 @@ self: {
bytestring
];
description = "Parsers for Unicode Character Database (UCD) files";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -694544,8 +697033,8 @@ self: {
}:
mkDerivation {
pname = "unicode-data-scripts";
- version = "0.5.0";
- sha256 = "0s01wjps018i67xgrkrvzw6ncmvsa3hpbl7qs75pvfskhjh9bjvq";
+ version = "0.6.0";
+ sha256 = "0g6a7smdzjp6rxqv86nvh9bp7qihg5a9a9agw14jhg6zvs8kpgy0";
libraryHaskellDepends = [ base ];
testHaskellDepends = [
base
@@ -694558,7 +697047,7 @@ self: {
tasty-bench
];
description = "Unicode characters scripts";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -694574,8 +697063,8 @@ self: {
}:
mkDerivation {
pname = "unicode-data-security";
- version = "0.5.0";
- sha256 = "199gk9444wbr1balpl1nzl0ivbpx5md9qhd9gf4jrjkb2nkk1hi6";
+ version = "0.6.0";
+ sha256 = "16kkvmjqigzgwhw7x0kx9p38m1m9bhm0nc47rm8564czx2bxw7lh";
libraryHaskellDepends = [
base
unicode-data
@@ -694591,7 +697080,7 @@ self: {
tasty-bench
];
description = "Unicode security mechanisms database";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -694789,8 +697278,8 @@ self: {
pname = "unicode-transforms";
version = "0.4.0.1";
sha256 = "1z29jvli2rqkynfxni1gibl81458j7h8lrb8fg6lpnj8svhy2y1j";
- revision = "7";
- editedCabalFile = "1lsb6788m8ibpddfx0ah3v5c09q9i0d1ik92bpgsx5ygx1xcnsj4";
+ revision = "8";
+ editedCabalFile = "0m2frv6g0hnsjif4acxy6dgfzzxhk7g82s57fcwc3zqsr2sr1i0z";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -694820,7 +697309,7 @@ self: {
text
];
description = "Unicode normalization";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -694953,7 +697442,7 @@ self: {
mtl
];
description = "Simple generic unification algorithms";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -694976,7 +697465,7 @@ self: {
test-invariant
];
description = "Pointless functions and a simplistic zero and monoid";
- license = lib.licenses.gpl2Only;
+ license = lib.licensesSpdx."GPL-2.0-only";
}
) { };
@@ -695033,7 +697522,7 @@ self: {
uniform-strings
];
description = "Handling errors in the uniform framework";
- license = lib.licenses.gpl2Only;
+ license = lib.licensesSpdx."GPL-2.0-only";
}
) { };
@@ -695113,7 +697602,7 @@ self: {
zlib
];
description = "Uniform file handling operations";
- license = lib.licenses.gpl2Only;
+ license = lib.licensesSpdx."GPL-2.0-only";
}
) { };
@@ -695413,7 +697902,7 @@ self: {
uniform-algebras
];
description = "Manipulate and convert strings of characters uniformly and consistently";
- license = lib.licenses.gpl2Only;
+ license = lib.licensesSpdx."GPL-2.0-only";
}
) { };
@@ -695442,7 +697931,7 @@ self: {
uniform-strings
];
description = "Time in the uniform framework";
- license = lib.licenses.gpl2Only;
+ license = lib.licensesSpdx."GPL-2.0-only";
}
) { };
@@ -695520,7 +698009,7 @@ self: {
uniform-time
];
description = "A uniform base to build apps on";
- license = lib.licenses.gpl2Only;
+ license = lib.licensesSpdx."GPL-2.0-only";
}
) { };
@@ -695588,7 +698077,7 @@ self: {
lens
];
description = "Extensible type-safe unions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -695759,7 +698248,7 @@ self: {
with-utf8
];
description = "Union mount filesystem paths into Haskell datastructures";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -695904,7 +698393,7 @@ self: {
transformers
];
description = "Esoteric programming language where each number can only appear once";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "unique";
broken = true;
@@ -695941,7 +698430,7 @@ self: {
utility-ht
];
description = "Solve simple simultaneous equations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -695979,7 +698468,7 @@ self: {
utility-ht
];
description = "Solve simple simultaneous equations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -696662,7 +699151,7 @@ self: {
universe-some
];
description = "A class for finite and recursively enumerable types";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.alexfmpe ];
}
) { };
@@ -696694,7 +699183,7 @@ self: {
QuickCheck
];
description = "A class for finite and recursively enumerable types";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -696715,7 +699204,7 @@ self: {
universe-some
];
description = "Universe instances for types from dependent-sum";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -696765,7 +699254,7 @@ self: {
universe-base
];
description = "Universe instances for types from selected extra packages";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -696811,7 +699300,7 @@ self: {
universe-base
];
description = "Instances of standard classes that are made possible by enumerations";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -696846,7 +699335,7 @@ self: {
universe-base
];
description = "Universe instances for Some from some";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.alexfmpe ];
}
) { };
@@ -696929,8 +699418,8 @@ self: {
}:
mkDerivation {
pname = "universum";
- version = "1.8.2.2";
- sha256 = "0h8ckr60gm5wxly5zyij9avzmlzljp21njd1k9j13nj5z23i1idp";
+ version = "1.8.3";
+ sha256 = "0j1zkhj4x10iycww6qc768sfr9jrxr1awhgv9f7f2npkcynssdkb";
libraryHaskellDepends = [
base
bytestring
@@ -696959,13 +699448,11 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Custom prelude used in Serokell";
- license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
- broken = true;
+ license = lib.licensesSpdx."MIT";
}
) { };
- unix_2_8_7_0 = callPackage (
+ unix_2_8_8_0 = callPackage (
{
mkDerivation,
base,
@@ -696978,10 +699465,8 @@ self: {
}:
mkDerivation {
pname = "unix";
- version = "2.8.7.0";
- sha256 = "10zv2vcq82vv56hll5mpvfwfsx6ymp2f75fwxvp5a1xgbafqgpfb";
- revision = "2";
- editedCabalFile = "0xbk68mf4j22kw1a4q732b5n6j8v5yqc55kxdk3hcwgcm0a12wys";
+ version = "2.8.8.0";
+ sha256 = "0gjsg9w6psn1gqzkc8akv5a2343fc3x7dlr25xb1lwzbpyixwa51";
libraryHaskellDepends = [
base
bytestring
@@ -697017,7 +699502,7 @@ self: {
bytestring
];
description = "Unix/Posix-specific functions for ByteStrings";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -697269,7 +699754,7 @@ self: {
zenhack-prelude
];
description = "Straightforward bindings to the posix API";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -697453,7 +699938,7 @@ self: {
unliftio
];
description = "Unleash feature toggle client";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "example";
}
@@ -697501,7 +699986,7 @@ self: {
text
];
description = "Unleash feature toggle client core";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -697526,7 +700011,7 @@ self: {
transformers-base
];
description = "Typeclass for monads that can be unlifted to arbitrary base monads";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -697553,7 +700038,7 @@ self: {
unliftio-core
];
description = "(un)lifted classes and functions for the STM monad";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -697576,7 +700061,7 @@ self: {
text-short
];
description = "Unlifted and levity-polymorphic types";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -697784,7 +700269,7 @@ self: {
unliftio
];
description = "Fast and robust message queues for concurrent processes";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "unliftio-messagebox-memleak-test";
broken = true;
@@ -697860,7 +700345,7 @@ self: {
unliftio-core
];
description = "Use MonadUnliftIO on servant APIs";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -697996,10 +700481,8 @@ self: {
}:
mkDerivation {
pname = "unordered-containers";
- version = "0.2.20";
- sha256 = "07gij1y9zhqg2dq8wy815j7s0zk2k65sqg4wvhwjsn80ry3v5kyr";
- revision = "4";
- editedCabalFile = "08p4xp43mlqyl8ayh7k22p0q0kxlby9y071rpcr8jsf2lvfvqg13";
+ version = "0.2.20.1";
+ sha256 = "1as6abrhpdn34wm4fhsvkf43lw5g0rhli6hbnq4ix9kd7m8n12kh";
libraryHaskellDepends = [
base
deepseq
@@ -698272,7 +700755,7 @@ self: {
quickcheck-classes
];
description = "maybes of numeric values with fewer indirections";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -698293,7 +700776,7 @@ self: {
text-short
];
description = "optional text that unpacks well";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -698509,7 +700992,7 @@ self: {
ghc
];
description = "Unsatisfiable type class";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -698713,7 +701196,7 @@ self: {
bifunctors
];
description = "Unzip functions for general Traversable containers";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -698780,7 +701263,7 @@ self: {
split
];
description = "Command-line tool to generate paths for moving upward in a file system";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "up";
}
@@ -699890,7 +702373,7 @@ self: {
uri-encode
];
description = "Encoding and decoding of URL slugs";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -700682,7 +703165,7 @@ self: {
gauge
];
description = "UTF-8";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -700772,7 +703255,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Unicode";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -700940,7 +703423,7 @@ self: {
logict
];
description = "See README for more info";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -701094,7 +703577,7 @@ self: {
QuickCheck
];
description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -701118,7 +703601,7 @@ self: {
proto-lens-runtime
];
description = "Generated code for a gRPC interface for UTxO Blockchains";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -701196,7 +703679,7 @@ self: {
uuid
];
description = "An SDK for clients of the UTxO RPC specification";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -701277,7 +703760,7 @@ self: {
warp-grpc
];
description = "An SDK for UTxO RPC services";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "server-example";
}
@@ -701501,7 +703984,7 @@ self: {
text
];
description = "utilities for parse errors";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -701524,8 +704007,8 @@ self: {
}:
mkDerivation {
pname = "uuagc";
- version = "0.9.56";
- sha256 = "0m9svb17ppsfbmrkq94cr5fvdwaly056j4xmg69rrb16ar38mz3l";
+ version = "0.9.57";
+ sha256 = "1blwi40g3vzcqvn7xgal7gxs34r4h88ibwhbp73igabb4i1ibdh5";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [
@@ -701553,7 +704036,6 @@ self: {
];
description = "Attribute Grammar System of Universiteit Utrecht";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
mainProgram = "uuagc";
}
) { };
@@ -701621,8 +704103,8 @@ self: {
}:
mkDerivation {
pname = "uuagc-cabal";
- version = "1.3.1.0";
- sha256 = "1xq7hxa8lk0b251vd3vqvyj7kz66qwn3hww49f14yx9rn4bz8vr9";
+ version = "1.4.0";
+ sha256 = "1rwfrfc5srj2pmk93swhn0abgxzbv00mf2nxbh4pl5370sw07akk";
libraryHaskellDepends = [
base
Cabal
@@ -701635,8 +704117,6 @@ self: {
];
description = "Cabal plugin for UUAGC";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}
) { };
@@ -702007,7 +704487,7 @@ self: {
text
];
description = "Tweak .cabal files";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
maintainers = [ lib.maintainers.berberman ];
broken = true;
@@ -702438,7 +704918,7 @@ self: {
text
];
description = "Runs commands on remote machines using ssh";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -702755,7 +705235,7 @@ self: {
text
];
description = "Lighweight pure data validation based on Applicative and Selective functors";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -703288,7 +705768,7 @@ self: {
testToolDepends = [ hspec-discover ];
doHaddock = false;
description = "Simple and powerful data validation";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -703415,7 +705895,7 @@ self: {
stm
];
description = "The VarMonad typeclass, generalizing types of references";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -703456,6 +705936,19 @@ self: {
}
) { };
+ varargs = callPackage (
+ { mkDerivation, base }:
+ mkDerivation {
+ pname = "varargs";
+ version = "0.1.0.1";
+ sha256 = "1yxcj287m5jgg80qazw1mlik78vm61jybam7v3pljf9i7a2p2z5m";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base ];
+ description = "Utilities for working with variadic functions using type-level lists";
+ license = lib.licensesSpdx."BSD-3-Clause";
+ }
+ ) { };
+
variable-media-field = callPackage (
{
mkDerivation,
@@ -703684,7 +706177,7 @@ self: {
QuickCheck
];
description = "Variant and EADT";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -703743,7 +706236,7 @@ self: {
QuickCheck
];
description = "integer arithmetic codes";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -704343,7 +706836,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Library for handling files ignored by VCS systems";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "ignore";
}
) { };
@@ -704545,7 +707038,7 @@ self: {
vector
];
description = "Vec: length-indexed (sized) list";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -704570,7 +707063,7 @@ self: {
vec
];
description = "Vec: length-indexed (sized) list: lens support";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -704595,7 +707088,7 @@ self: {
vec
];
description = "Vec: length-indexed (sized) list: optics support";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -704741,7 +707234,7 @@ self: {
];
doHaddock = false;
description = "Efficient Arrays";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -704845,7 +707338,7 @@ self: {
vector
];
description = "Instances of Data.Binary for vector";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -705005,7 +707498,7 @@ self: {
hedgehog-classes
];
description = "circular vectors";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -705138,7 +707631,7 @@ self: {
];
doHaddock = false;
description = "Storable vectors with cpu-independent representation";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -705159,7 +707652,7 @@ self: {
vector
];
description = "Utilities for the \"vector\" library";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -705470,7 +707963,7 @@ self: {
];
doHaddock = false;
description = "Fast and flexible quicksort implementation for mutable vectors";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -705605,7 +708098,7 @@ self: {
vector
];
description = "Size tagged vectors";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -705937,7 +708430,7 @@ self: {
vector
];
description = "GIS Vector Tiles, as defined by Mapbox";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -706082,7 +708575,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "ASCII platform-adventure game";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
mainProgram = "venzone";
}
@@ -706231,10 +708724,8 @@ self: {
}:
mkDerivation {
pname = "verifiable-expressions";
- version = "0.6.2";
- sha256 = "1nrlcbimng6qf4g7h4hxg3j05kd0hlihkhp8hj5js44n29vg89qk";
- revision = "1";
- editedCabalFile = "15h6zdzqvfkh480y5yp1sfjw79pkc6iv5b8mz785p3bgrspdlvn9";
+ version = "0.6.3";
+ sha256 = "101k93m4q32gvsywfahsjm5asakwa0pkliddk6pd21yffgr20329";
libraryHaskellDepends = [
base
containers
@@ -706474,7 +708965,7 @@ self: {
uuid
];
description = "Small alternative prelude";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -706634,7 +709125,7 @@ self: {
text
];
description = "Types and parsers for software version numbers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -706668,7 +709159,7 @@ self: {
tasty-hunit
];
description = "Vertex enumeration";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -706775,7 +709266,7 @@ self: {
];
doHaddock = false;
description = "Array library monomorphized with backpack";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -706821,7 +709312,7 @@ self: {
text
];
description = "types for ingesting vflow data with aeson";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -707564,7 +710055,7 @@ self: {
yaml
];
description = "Frontend for video metadata tagging tools";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "vimeta";
}
@@ -707907,7 +710398,7 @@ self: {
vinyl
];
description = "Syntax sugar for vinyl records using overloaded labels";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -708333,7 +710824,7 @@ self: {
profunctors
];
description = "Profunctor optics via the profunctor representation theorem";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -709177,6 +711668,8 @@ self: {
pname = "vty";
version = "6.4";
sha256 = "0iha15inmig2j2f4kljwb2jhbqa8vsh2aa8l7y5fsanjiciscrbi";
+ revision = "2";
+ editedCabalFile = "1dcnkfghflgn3qv72pdpa6npfdrrjqhil3wnxd75rbd4mf7812hf";
libraryHaskellDepends = [
base
binary
@@ -709199,6 +711692,52 @@ self: {
}
) { };
+ vty_6_5 = 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.5";
+ sha256 = "03cla811zc1lhgclrd294brp4zkjs8sb0szxmndfckqzv9vmqyd8";
+ 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;
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
vty-crossplatform = callPackage (
{
mkDerivation,
@@ -709218,7 +711757,7 @@ self: {
vty-unix
];
description = "Cross-platform support for Vty";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -709440,7 +711979,7 @@ self: {
vty
];
description = "Unix backend for Vty";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "vty-unix-build-width-table";
}
) { };
@@ -709492,7 +712031,7 @@ self: {
Win32
];
description = "Windows backend for Vty";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
platforms = lib.platforms.windows;
}
) { };
@@ -709544,7 +712083,7 @@ self: {
Win32
];
description = "Windows backend for Vty";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
platforms = lib.platforms.windows;
hydraPlatforms = lib.platforms.none;
}
@@ -709586,7 +712125,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Bindings to the Vulkan graphics API";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
badPlatforms = [
"i686-linux"
"armv7l-linux"
@@ -710379,53 +712918,92 @@ self: {
mkDerivation,
aeson,
base,
- binary,
bytestring,
+ case-insensitive,
cookie,
crypton,
directory,
filepath,
http-types,
memory,
- random,
- stm,
text,
time,
wai,
+ wai-csrf,
wai-extra,
}:
mkDerivation {
pname = "wai-cryptocookie";
- version = "0.2";
- sha256 = "1y97641w1ms0hzzw34v67h60hy4mjwnanvb8511qp033rpyqqh53";
+ version = "0.3";
+ sha256 = "1g2i1fjdpca0zq7pib6szh8zadrqb93sw1bqi12il5fhd805swh9";
libraryHaskellDepends = [
aeson
base
- binary
bytestring
+ case-insensitive
cookie
crypton
http-types
memory
- stm
text
time
wai
+ wai-csrf
];
testHaskellDepends = [
- aeson
base
- binary
+ bytestring
+ cookie
directory
filepath
http-types
- random
- stm
wai
wai-extra
];
description = "Encrypted cookies for WAI";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
+ }
+ ) { };
+
+ wai-csrf = callPackage (
+ {
+ mkDerivation,
+ base,
+ bytestring,
+ case-insensitive,
+ cookie,
+ crypton,
+ http-types,
+ memory,
+ time,
+ wai,
+ wai-extra,
+ }:
+ mkDerivation {
+ pname = "wai-csrf";
+ version = "0.1";
+ sha256 = "0i6bwp6libbbv1q0gcrn5cgk66v4ll84gsycxcw18r3nmh3qdawa";
+ libraryHaskellDepends = [
+ base
+ bytestring
+ case-insensitive
+ cookie
+ crypton
+ http-types
+ memory
+ time
+ wai
+ ];
+ testHaskellDepends = [
+ base
+ bytestring
+ cookie
+ http-types
+ wai
+ wai-extra
+ ];
+ description = "Cross-site request forgery protection for WAI";
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -711050,7 +713628,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Wrap WAI applications to run on AWS Lambda";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -712480,7 +715058,7 @@ self: {
warp-tls
];
description = "WAI middleware that delegates handling of requests";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -713442,7 +716020,7 @@ self: {
wai
];
description = "Problem details middleware for WAI";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -713518,7 +716096,7 @@ self: {
warp
];
description = "See README for more info";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -714080,7 +716658,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "WAI middleware to automatically encrypt and sign cookies";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "waicookie-genkey";
broken = true;
@@ -714605,7 +717183,7 @@ self: {
criterion
];
description = "A request rate limiting middleware using token buckets";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
}
) { };
@@ -715100,6 +717678,44 @@ self: {
}
) { };
+ warlock = callPackage (
+ {
+ mkDerivation,
+ barbies,
+ base,
+ containers,
+ hspec,
+ hspec-discover,
+ template-haskell,
+ text,
+ witch,
+ }:
+ mkDerivation {
+ pname = "warlock";
+ version = "0.1.0.1";
+ sha256 = "169g7bdcgn0dxqgyxi6p9j486i3f6da4h92qjvz45n1p27i9vykh";
+ libraryHaskellDepends = [
+ barbies
+ base
+ template-haskell
+ witch
+ ];
+ testHaskellDepends = [
+ barbies
+ base
+ containers
+ hspec
+ hspec-discover
+ template-haskell
+ text
+ witch
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Automatic type-safe conversion between Haskell data types using Template Haskell";
+ license = lib.licensesSpdx."BSD-3-Clause";
+ }
+ ) { };
+
warp = callPackage (
{
mkDerivation,
@@ -715413,7 +718029,7 @@ self: {
warp
];
description = "Socket activation and other systemd integration for the Warp web server (WAI)";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "warp-systemd-example";
maintainers = [ lib.maintainers.mpscholten ];
}
@@ -715452,6 +718068,41 @@ self: {
}
) { };
+ warp-tls-simple = callPackage (
+ {
+ mkDerivation,
+ base,
+ directory,
+ filepath,
+ optparse-applicative,
+ process,
+ wai,
+ warp,
+ warp-tls,
+ which,
+ }:
+ mkDerivation {
+ pname = "warp-tls-simple";
+ version = "0.1.1.0";
+ sha256 = "1xrzkhcc1qdgccf5dncchv81ms944sz9yi9kz0badw8wjrz6kg4p";
+ libraryHaskellDepends = [
+ base
+ directory
+ filepath
+ optparse-applicative
+ process
+ wai
+ warp
+ warp-tls
+ which
+ ];
+ description = "Simple TLS configuration for Warp";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }
+ ) { };
+
warp-tls-uid = callPackage (
{
mkDerivation,
@@ -715603,7 +718254,7 @@ self: {
text
];
description = "WebAssembly Language Toolkit and Interpreter";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -715912,7 +718563,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Work with WAVE and RF64 files";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -716096,7 +718747,7 @@ self: {
process
];
description = "Run a command on a specified directory";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
mainProgram = "wd";
}
) { };
@@ -716222,7 +718873,7 @@ self: {
xml
];
description = "Weather and related data info command-line tool";
- license = lib.licenses.gpl3Plus;
+ license = lib.licensesSpdx."GPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
mainProgram = "weatherhs";
}
@@ -716252,7 +718903,7 @@ self: {
];
doHaddock = false;
description = "Compositional breadth-first walks";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -716272,7 +718923,7 @@ self: {
some
];
description = "Core definitions for weave";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -716333,7 +718984,7 @@ self: {
time
];
description = "Parsing/printing of persistent web cookies";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -716749,7 +719400,7 @@ self: {
doctest-parallel
];
description = "representations of a web page";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "web-rep-example";
}
) { };
@@ -717151,7 +719802,7 @@ self: {
text
];
description = "Type-safe HTML and CSS";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -717202,7 +719853,7 @@ self: {
text
];
description = "Type-safe HTML and CSS with intuitive layouts and composable styles";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -717239,7 +719890,7 @@ self: {
web-view
];
description = "Build HTML tables using web-view and colonnade";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -717966,7 +720617,7 @@ self: {
validation
];
description = "Relying party (server) implementation of the WebAuthn 2 specification";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -718038,7 +720689,7 @@ self: {
wai
];
description = "A super-simple web server framework";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -718076,6 +720727,28 @@ self: {
}
) { };
+ webcolor-labels = callPackage (
+ {
+ mkDerivation,
+ base,
+ tasty,
+ tasty-hunit,
+ }:
+ mkDerivation {
+ pname = "webcolor-labels";
+ version = "0.1.0.0";
+ sha256 = "0s4l8w1fba2fk3ym112j2d9x6z86qhkfbcb75kjvwl0qndr69y32";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base
+ tasty
+ tasty-hunit
+ ];
+ description = "Plug-n-play #hex-syntax for your colors";
+ license = lib.licensesSpdx."MPL-2.0";
+ }
+ ) { };
+
webcrank = callPackage (
{
mkDerivation,
@@ -718286,7 +720959,7 @@ self: {
}
) { };
- webdriver_0_13_0_0 = callPackage (
+ webdriver_0_14_0_0 = callPackage (
{
mkDerivation,
aeson,
@@ -718328,8 +721001,10 @@ self: {
}:
mkDerivation {
pname = "webdriver";
- version = "0.13.0.0";
- sha256 = "192dm2bwhdfrmfkimblm43gvh3vnnk6p68kw5cfpar00mli08mbi";
+ version = "0.14.0.0";
+ sha256 = "0sqphl21ma7n6fk40wyh8b79xrz1aznpnpmgds6277ini1lvn3q8";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
aeson
attoparsec
@@ -718345,6 +721020,7 @@ self: {
http-types
microlens-th
monad-logger
+ mtl
network
network-uri
random
@@ -718361,6 +721037,20 @@ self: {
websockets
zip-archive
];
+ executableHaskellDepends = [
+ aeson
+ base
+ bytestring
+ exceptions
+ http-client
+ http-types
+ monad-logger
+ mtl
+ string-interpolate
+ text
+ unliftio
+ unliftio-core
+ ];
testHaskellDepends = [
aeson
base
@@ -718391,6 +721081,7 @@ self: {
description = "a Haskell client for the Selenium WebDriver protocol";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
+ mainProgram = "demo";
}
) { };
@@ -718488,7 +721179,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "A typed wrapper for W3C WebDriver protocol. A base for other libraries.";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -718737,7 +721428,7 @@ self: {
zlib
];
description = "Wrapper around the webdriver package that automatically manages Selenium";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -719033,7 +721724,7 @@ self: {
wai-extra
];
description = "Composable, type-safe library to build HTTP APIs";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -719082,7 +721773,7 @@ self: {
wai-extra
];
description = "Composable, type-safe library to build HTTP APIs";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -719118,7 +721809,7 @@ self: {
webgear-core
];
description = "Composable, type-safe library to build HTTP API servers";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -719153,7 +721844,7 @@ self: {
webgear-core
];
description = "Composable, type-safe library to build HTTP API servers";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -719226,7 +721917,7 @@ self: {
webgear-core
];
description = "Composable, type-safe library to build HTTP API servers";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -719298,7 +721989,7 @@ self: {
webgear-core
];
description = "Composable, type-safe library to build HTTP API servers";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -719332,7 +722023,7 @@ self: {
webgear-core
];
description = "Composable, type-safe library to build HTTP API servers";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -719365,7 +722056,7 @@ self: {
webgear-core
];
description = "Composable, type-safe library to build HTTP API servers";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -719395,7 +722086,7 @@ self: {
webgear-core
];
description = "Host swagger UI based on WebGear API specifications";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
}
) { };
@@ -719424,7 +722115,7 @@ self: {
webgear-core
];
description = "Host swagger UI based on WebGear API specifications";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -719597,7 +722288,7 @@ self: {
base,
Cabal,
gtk2hs-buildtools,
- webkitgtk_4_0,
+ webkit2gtk,
}:
mkDerivation {
pname = "webkit2gtk3-javascriptcore";
@@ -719609,13 +722300,13 @@ self: {
gtk2hs-buildtools
];
libraryHaskellDepends = [ base ];
- libraryPkgconfigDepends = [ webkitgtk_4_0 ];
+ libraryPkgconfigDepends = [ webkit2gtk ];
description = "JavaScriptCore FFI from webkitgtk";
license = lib.licenses.bsd3;
badPlatforms = lib.platforms.darwin;
hydraPlatforms = lib.platforms.none;
}
- ) { webkitgtk_4_0 = null; };
+ ) { webkit2gtk = null; };
webkitgtk3 = callPackage (
{
@@ -720358,126 +723049,6 @@ self: {
}
) { };
- weeder_2_3_1 = callPackage (
- {
- mkDerivation,
- algebraic-graphs,
- base,
- bytestring,
- containers,
- dhall,
- directory,
- filepath,
- generic-lens,
- ghc,
- lens,
- mtl,
- optparse-applicative,
- regex-tdfa,
- text,
- transformers,
- }:
- mkDerivation {
- pname = "weeder";
- version = "2.3.1";
- sha256 = "16hgfhchmnp32wvcx9r464azycvdq1gsjmnjmnw995y9cp27ayy1";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- algebraic-graphs
- base
- bytestring
- containers
- dhall
- directory
- filepath
- generic-lens
- ghc
- lens
- mtl
- optparse-applicative
- regex-tdfa
- text
- transformers
- ];
- executableHaskellDepends = [
- base
- bytestring
- containers
- directory
- filepath
- ghc
- optparse-applicative
- transformers
- ];
- description = "Detect dead code";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- mainProgram = "weeder";
- maintainers = [ lib.maintainers.maralorn ];
- }
- ) { };
-
- weeder_2_4_1 = callPackage (
- {
- mkDerivation,
- algebraic-graphs,
- base,
- bytestring,
- containers,
- dhall,
- directory,
- filepath,
- generic-lens,
- ghc,
- lens,
- mtl,
- optparse-applicative,
- regex-tdfa,
- text,
- transformers,
- }:
- mkDerivation {
- pname = "weeder";
- version = "2.4.1";
- sha256 = "1z17w8q0s1pgqrxx7f1zijy1j4fwl8x2f5r9y11i0vcsqlx12pi9";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- algebraic-graphs
- base
- bytestring
- containers
- dhall
- directory
- filepath
- generic-lens
- ghc
- lens
- mtl
- optparse-applicative
- regex-tdfa
- text
- transformers
- ];
- executableHaskellDepends = [
- base
- bytestring
- containers
- directory
- filepath
- ghc
- optparse-applicative
- transformers
- ];
- description = "Detect dead code";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- mainProgram = "weeder";
- maintainers = [ lib.maintainers.maralorn ];
- }
- ) { };
-
weeder = callPackage (
{
mkDerivation,
@@ -720553,7 +723124,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Detect dead code";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "weeder";
maintainers = [ lib.maintainers.maralorn ];
}
@@ -721058,7 +723629,7 @@ self: {
];
doHaddock = false;
description = "WGPU";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -721084,7 +723655,7 @@ self: {
];
libraryPkgconfigDepends = [ SDL2 ];
description = "WGPU Raw";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -721243,7 +723814,7 @@ self: {
versions
];
description = "Solver-agnostic symbolic values support for issuing queries";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "quickstart";
}
) { };
@@ -721411,7 +723982,7 @@ self: {
versions
];
description = "Solver-agnostic symbolic values support for issuing queries";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -721518,7 +724089,7 @@ self: {
tasty-hunit
];
description = "A compatibility layer for GHC's 'wherefrom' function";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -721546,7 +724117,7 @@ self: {
tasty-hunit
];
description = "A compatibility layer for GHC's 'wherefrom' function";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -721816,6 +724387,8 @@ self: {
pname = "wide-word";
version = "0.1.8.1";
sha256 = "0jisg5y3rxcqwd3kgdvcmz5awwcgzdhdkl768llhh388kp64mjcy";
+ revision = "1";
+ editedCabalFile = "164049ll7rxddxsw5ly8jcbhfmb7gywwrspw63cfwng20hsfqc0y";
libraryHaskellDepends = [
base
binary
@@ -721856,7 +724429,7 @@ self: {
wide-word
];
description = "Instances for wide-word";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -722384,8 +724957,8 @@ self: {
}:
mkDerivation {
pname = "wild-bind";
- version = "0.1.2.12";
- sha256 = "1bjm2vxa6xg7j6wl28rg8djxabpjss22z1w1ymlm2lw5fb148frn";
+ version = "0.1.2.13";
+ sha256 = "03r1a233d6vq6z5pd6lsxf738kna4r369301xr5blyjnj46h0dp1";
libraryHaskellDepends = [
base
containers
@@ -722573,7 +725146,7 @@ self: {
unordered-containers
];
description = "An implementation of the web Document Object Model, and its rendering";
- license = lib.licenses.mpl20;
+ license = lib.licensesSpdx."MPL-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -722682,7 +725255,7 @@ self: {
X11
];
description = "OS window icon/name utilities";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -722876,6 +725449,8 @@ self: {
];
description = "I/O library for Windows";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}
)
{
@@ -723102,7 +725677,7 @@ self: {
transformers
];
description = "Convert values from one type into another";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
maintainers = [ lib.maintainers.maralorn ];
}
) { };
@@ -723282,7 +725857,7 @@ self: {
vector
];
description = "filterable traversable";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -723301,7 +725876,7 @@ self: {
witherable
];
description = "Witherable = Traversable + Filterable";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -723355,7 +725930,7 @@ self: {
countable
];
description = "values that witness types";
- license = lib.licenses.bsd2;
+ license = lib.licensesSpdx."BSD-2-Clause";
}
) { };
@@ -723564,7 +726139,7 @@ self: {
text
];
description = "A library for working with .wkt files.";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -723852,7 +726427,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Convenient interface for interacting with WLED devices";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -723969,7 +726544,7 @@ self: {
sha256 = "0f0pa2vlp56j35llhzq1qqkwkfpm7r96av8jw22jngd0kcpc185b";
libraryHaskellDepends = [ base ];
description = "Convenient typeclass for defining arbitrary-index enums";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -724200,7 +726775,7 @@ self: {
weigh
];
description = "treat integral types as arrays of smaller integral types";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -724220,7 +726795,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Compatibility shim for the Int/Word internal change in GHC 9.2";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -724247,7 +726822,7 @@ self: {
typed-process
];
description = "SoX for algorithmic composition with groups of notes liken to words";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -724259,7 +726834,7 @@ self: {
sha256 = "0kpw4gmy4yvpmcvz1sk0nfr21f7zvv3fnd2k59zx1amx8n4c5s7n";
libraryHaskellDepends = [ base ];
description = "General datatypes for music creation for one instrument";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -724553,7 +727128,7 @@ self: {
tasty-quickcheck
];
description = "Word8 set";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -724788,7 +727363,7 @@ self: {
vector
];
description = "Command-line tool to get random words";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "wordlist";
broken = true;
@@ -725367,7 +727942,7 @@ self: {
transformers
];
description = "LOGO-like Turtle graphics with a monadic interface";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -725511,7 +728086,7 @@ self: {
xml-basic
];
description = "Lazy wrapper to HaXML, HXT, TagSoup via custom XML tree structure";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
}
) { };
@@ -725859,7 +728434,7 @@ self: {
vector
];
description = "An easy-to-use HTTP client library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -725885,7 +728460,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Adaptation of the wreq library for the effectful ecosystem";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -726968,7 +729543,7 @@ self: {
yaml
];
description = "Unimportant Unix adminstration tool";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "pao";
}
@@ -727166,7 +729741,7 @@ self: {
websockets
];
description = "Secure WebSocket (WSS) clients";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -727782,7 +730357,7 @@ self: {
pem
];
description = "Basic X509 OCSP implementation";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -728118,8 +730693,8 @@ self: {
}:
mkDerivation {
pname = "xcffib";
- version = "1.10.0";
- sha256 = "1pz36rx9shsq16amni0d9xzwvvzhbf2ysm8xzgvgx9irmz4imxv0";
+ version = "1.11.2";
+ sha256 = "0lg9x33ifkr166qkdq7w37dhngb6y1nd987sa6dg4pr3dkg9hrm9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -728159,7 +730734,7 @@ self: {
xcb-types
];
description = "A cffi-based python binding for X";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "xcffibgen";
broken = true;
@@ -728191,7 +730766,7 @@ self: {
temporary
];
description = "Cabal hooks for producing an XCFramework from a Haskell library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -728446,7 +731021,7 @@ self: {
unix
];
description = "Parse files conforming to the xdg desktop entry spec";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -729427,6 +732002,128 @@ self: {
}
) { };
+ xlsx_1_2_0 = callPackage (
+ {
+ mkDerivation,
+ attoparsec,
+ base,
+ base64-bytestring,
+ binary-search,
+ bytestring,
+ conduit,
+ containers,
+ criterion,
+ data-default,
+ deepseq,
+ Diff,
+ directory,
+ dlist,
+ errors,
+ exceptions,
+ extra,
+ filepath,
+ groom,
+ hexpat,
+ lens,
+ monad-control,
+ mtl,
+ network-uri,
+ old-locale,
+ raw-strings-qq,
+ safe,
+ smallcheck,
+ tasty,
+ tasty-hunit,
+ tasty-smallcheck,
+ text,
+ time,
+ transformers,
+ transformers-base,
+ vector,
+ xeno,
+ xml-conduit,
+ xml-types,
+ zip,
+ zip-archive,
+ zip-stream,
+ zlib,
+ }:
+ mkDerivation {
+ pname = "xlsx";
+ version = "1.2.0";
+ sha256 = "0sd9y6xqd17qxlf5hgaws39xfzhaxxj4yxbnh296lfk2pampyrvl";
+ libraryHaskellDepends = [
+ attoparsec
+ base
+ base64-bytestring
+ binary-search
+ bytestring
+ conduit
+ containers
+ data-default
+ deepseq
+ dlist
+ errors
+ exceptions
+ extra
+ filepath
+ hexpat
+ lens
+ monad-control
+ mtl
+ network-uri
+ old-locale
+ safe
+ text
+ time
+ transformers
+ transformers-base
+ vector
+ xeno
+ xml-conduit
+ xml-types
+ zip
+ zip-archive
+ zip-stream
+ zlib
+ ];
+ testHaskellDepends = [
+ base
+ bytestring
+ conduit
+ containers
+ deepseq
+ Diff
+ directory
+ filepath
+ groom
+ lens
+ mtl
+ raw-strings-qq
+ smallcheck
+ tasty
+ tasty-hunit
+ tasty-smallcheck
+ text
+ time
+ vector
+ xml-conduit
+ zip
+ ];
+ benchmarkHaskellDepends = [
+ base
+ bytestring
+ conduit
+ criterion
+ deepseq
+ lens
+ ];
+ description = "Simple and incomplete Excel file parser/writer";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ }
+ ) { };
+
xlsx-tabular = callPackage (
{
mkDerivation,
@@ -729549,7 +732246,7 @@ self: {
utility-ht
];
description = "Basics for XML/HTML representation and processing";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
maintainers = [ lib.maintainers.thielema ];
}
) { };
@@ -729866,8 +732563,8 @@ self: {
}:
mkDerivation {
pname = "xml-conduit-writer";
- version = "0.1.1.5";
- sha256 = "1ma25a6kknrhm8n3ldj5bq203dmg52nshhmvi7zf3lz56psjf1f1";
+ version = "0.1.1.6";
+ sha256 = "16zkfivpljkmn5qyyrx1q4wb2p4b9m8f61nl3l3qkngdqb9y9qgy";
libraryHaskellDepends = [
base
containers
@@ -729883,9 +732580,7 @@ self: {
text
];
description = "Warm and fuzzy creation of XML documents";
- license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
- broken = true;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -730279,7 +732974,7 @@ self: {
xml-conduit
];
description = "Lenses, traversals, and prisms for xml-conduit";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -730330,7 +733025,7 @@ self: {
xml-conduit
];
description = "Optics for xml-conduit";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -730401,7 +733096,7 @@ self: {
xml-conduit
];
description = "XML parser with informative error-reporting and simple API";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -730546,7 +733241,7 @@ self: {
protolude
];
description = "XML pretty printer";
- license = lib.licenses.gpl2Only;
+ license = lib.licensesSpdx."GPL-2.0-only";
hydraPlatforms = lib.platforms.none;
mainProgram = "xml-prettify";
broken = true;
@@ -730750,7 +733445,7 @@ self: {
tasty-hunit
];
description = "Parse XML from bytes";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -730964,7 +733659,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Utilities for dealing with Content-values of \"xml-types\"";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -730997,7 +733692,7 @@ self: {
];
libraryPkgconfigDepends = [ xmlsec1 ];
description = "Verifying XML signatures";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -731374,7 +734069,7 @@ self: {
unordered-containers
];
description = "XML parser and renderer with HTML 5 quirks mode";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -732315,10 +735010,12 @@ self: {
}:
mkDerivation {
pname = "xnobar";
- version = "0.0.0.1";
- sha256 = "15j9drn1igv5s1z7p5v71vy2i2a2f4gsaz5z6my1vkm097rbz51z";
- revision = "3";
- editedCabalFile = "122chc3px07ij5kk69bsbzrppkxxqd29cxma9zp48pjjakibwp3n";
+ version = "0.0.0.2";
+ sha256 = "1cs9kp2h07dx39rzykmylv5fvmdyynwmyj7mlxy6n95bawz4z1f4";
+ revision = "1";
+ editedCabalFile = "1b34ifw8rnb19gjgksljxcxb54y0qskjwwka5ly8bq84ll756v6n";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
async
base
@@ -732332,6 +735029,10 @@ self: {
transformers
xmobar
];
+ executableHaskellDepends = [
+ base
+ xmobar
+ ];
testHaskellDepends = [
base
extra
@@ -732339,10 +735040,9 @@ self: {
];
doHaddock = false;
description = "Text-based notification server for XMobar";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
badPlatforms = lib.platforms.darwin;
- hydraPlatforms = lib.platforms.none;
- broken = true;
+ mainProgram = "Echo";
}
) { };
@@ -732385,7 +735085,7 @@ self: {
ghc-byteorder
];
description = "Efficient XOR masking";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
}
) { };
@@ -732447,7 +735147,7 @@ self: {
Xorshift128Plus
];
description = "Simple implementation of xorshift+ PRNG";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -733103,7 +735803,7 @@ self: {
hedgehog
];
description = "XTEA (eXtended Tiny Encryption Algorithm)";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -733254,7 +735954,7 @@ self: {
tasty-bench
];
description = "Bindings and high-level helpers for xxHash";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { inherit (pkgs) xxHash; };
@@ -733291,7 +735991,7 @@ self: {
tasty-quickcheck
];
description = "LZMA/XZ compression and decompression";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -733305,7 +736005,7 @@ self: {
sha256 = "0cycldc04ffkm5kvhb9x9mjgcw9vhzlbh34idpapv9bin9b594ic";
doHaddock = false;
description = "LZMA/XZ clibs";
- license = lib.licenses.bsd0;
+ license = lib.licensesSpdx."0BSD";
}
) { };
@@ -734902,7 +737602,7 @@ self: {
versions
];
description = "Support for parsing and rendering YAML documents";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -735039,7 +737739,7 @@ self: {
tasty-hunit
];
description = "Flexible declarative YAML parsing toolkit";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -735177,8 +737877,8 @@ self: {
}:
mkDerivation {
pname = "yamlscript";
- version = "0.2.3.0";
- sha256 = "09ccfdmhpi0ycsmrxnjcr4rgz4b13sgw76ys6979syfqjqmznr5b";
+ version = "0.2.7.0";
+ sha256 = "1j5m98abj23rakhcq3v1gy4j58aq3z0mn5zvw531p26x6fsqgbkv";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -735205,7 +737905,7 @@ self: {
vector
];
description = "Haskell bindings for YAMLScript";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "yamlscript-test";
broken = true;
@@ -735643,7 +738343,7 @@ self: {
deepseq
];
description = "Yet another records libraries";
- license = lib.licenses.isc;
+ license = lib.licensesSpdx."ISC";
}
) { };
@@ -735909,7 +738609,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
description = "Yet another string interpolator";
- license = lib.licenses.cc0;
+ license = lib.licensesSpdx."CC0-1.0";
}
) { };
@@ -736041,7 +738741,7 @@ self: {
doctest
];
description = "Total recursion schemes";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
maintainers = [ lib.maintainers.sellout ];
}
) { };
@@ -736075,7 +738775,7 @@ self: {
doctest
];
description = "Pattern functors and instances for types in the containers package";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
maintainers = [ lib.maintainers.sellout ];
}
) { };
@@ -736114,7 +738814,7 @@ self: {
yaya
];
description = "Hedgehog testing support for the Yaya recursion scheme library";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
maintainers = [ lib.maintainers.sellout ];
}
) { };
@@ -736148,7 +738848,7 @@ self: {
doctest
];
description = "QuickCheck testing support for the Yaya recursion scheme library";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
maintainers = [ lib.maintainers.sellout ];
}
) { };
@@ -736176,7 +738876,7 @@ self: {
yaya-hedgehog
];
description = "Test suites for `yaya`";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -736220,7 +738920,7 @@ self: {
yaya-hedgehog
];
description = "Non-total extensions to the Yaya recursion scheme library";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
maintainers = [ lib.maintainers.sellout ];
}
) { };
@@ -736248,7 +738948,7 @@ self: {
yaya-unsafe
];
description = "Test suites for `yaya-unsafe`";
- license = lib.licenses.agpl3Plus;
+ license = lib.licensesSpdx."AGPL-3.0-or-later";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -737906,7 +740606,7 @@ self: {
yesod-form
];
description = "A yesod-auth plugin for multi-tenant SSO via OpenID Connect";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -738074,7 +740774,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Traditional email/pass auth for Yesod";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
platforms = lib.platforms.x86;
hydraPlatforms = lib.platforms.none;
mainProgram = "yesod-auth-simple-test";
@@ -738344,7 +741044,7 @@ self: {
yesod-elements
];
description = "Helper functions for using yesod with colonnade";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -741635,7 +744335,7 @@ self: {
yesod-static
];
description = "A streamly-based library providing performance-focused alternatives for functionality found in yesod-static";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -742283,7 +744983,7 @@ self: {
void
];
description = "Yet Another Logger";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
mainProgram = "example";
}
) { };
@@ -743562,7 +746262,7 @@ self: {
yaml
];
testToolDepends = [ hspec-discover ];
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
mainProgram = "yiyd";
}
) { };
@@ -743593,7 +746293,7 @@ self: {
template-haskell
];
description = "try hackage";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "yj-sandbox-exe";
}
) { };
@@ -743792,7 +746492,7 @@ self: {
];
testToolDepends = [ hspec-discover ];
description = "Bindings to Facebook's Yoga layout library";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -743903,7 +746603,7 @@ self: {
text
];
description = "Yosys RTL Intermediate Language";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -744062,7 +746762,7 @@ self: {
yaml
];
description = "Builds a static website from templates and data in YAML or CSV files";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
mainProgram = "yst";
}
) { };
@@ -745029,7 +747729,7 @@ self: {
editedCabalFile = "0sj45k2v33x3312yz1bdbck2bcv5q64mh7v7xy35ghp72ynw1z8z";
libraryHaskellDepends = [ base ];
description = "@zenhack's personal custom prelude";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
}
) { };
@@ -745134,7 +747834,7 @@ self: {
];
doHaddock = false;
description = "Zeolite is a statically-typed, general-purpose programming language";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -745779,7 +748479,7 @@ self: {
];
testHaskellDepends = [ base ];
description = "Command-line utility for working with zettelkast files";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
mainProgram = "zettelkast";
broken = true;
@@ -745819,7 +748519,7 @@ self: {
tasty-hedgehog
];
description = "Polysemy effects for testing";
- license = "BSD-2-Clause-Patent";
+ license = lib.licensesSpdx."BSD-2-Clause-Patent";
}
) { };
@@ -746143,7 +748843,7 @@ self: {
tasty-quickcheck
];
description = "Zigzag encoding of integers into unsigned integers";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -746234,7 +748934,7 @@ self: {
tasty-quickcheck
];
description = "Typed templates with jinja like syntax";
- license = lib.licenses.gpl2Plus;
+ license = lib.licensesSpdx."GPL-2.0-or-later";
}
) { };
@@ -746350,7 +749050,7 @@ self: {
time
];
description = "Operations on zip archives";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
mainProgram = "haskell-zip-app";
maintainers = [ lib.maintainers.mpscholten ];
}
@@ -746938,7 +749638,7 @@ self: {
tasty-quickcheck
];
description = "zlib compression bindings";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
}
) { };
@@ -746950,7 +749650,7 @@ self: {
sha256 = "153aldw8vqy6wzz7knbzyfkxsr3gsv5hjf4y84s12ifx2fi8zfkn";
doHaddock = false;
description = "zlib C library bits";
- license = lib.licenses.zlib;
+ license = lib.licensesSpdx."Zlib";
}
) { };
@@ -747496,7 +750196,7 @@ self: {
Z-Data
];
description = "A haskell binding to Apache Zookeeper C library(mt) using Haskell Z project";
- license = lib.licenses.bsd3;
+ license = lib.licensesSpdx."BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { inherit (pkgs) zookeeper_mt; };
@@ -748020,7 +750720,7 @@ self: {
tasty-hunit
];
description = "A zuul client library";
- license = lib.licenses.asl20;
+ license = lib.licensesSpdx."Apache-2.0";
hydraPlatforms = lib.platforms.none;
mainProgram = "zuul-cli";
broken = true;
@@ -748072,7 +750772,7 @@ self: {
happy
];
description = "a live coding language for playing with nested functions of time";
- license = lib.licenses.gpl3Only;
+ license = lib.licensesSpdx."GPL-3.0-only";
hydraPlatforms = lib.platforms.none;
}
) { };
@@ -748172,7 +750872,7 @@ self: {
zxcvbn-hs
];
description = "Password strength estimation based on zxcvbn";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -748282,7 +750982,7 @@ self: {
zlib
];
description = "Password strength estimation based on zxcvbn";
- license = lib.licenses.mit;
+ license = lib.licensesSpdx."MIT";
hydraPlatforms = lib.platforms.none;
mainProgram = "zxcvbn-example";
broken = true;
diff --git a/pkgs/development/haskell-modules/lib/compose.nix b/pkgs/development/haskell-modules/lib/compose.nix
index 220cb49f3d918..055e6c40c784d 100644
--- a/pkgs/development/haskell-modules/lib/compose.nix
+++ b/pkgs/development/haskell-modules/lib/compose.nix
@@ -114,7 +114,8 @@ rec {
Note that jailbreaking at this time, doesn't lift bounds on
conditional branches.
- https://github.com/peti/jailbreak-cabal/issues/7 has further details.
+ https://github.com/peti/jailbreak-cabal/issues/7 (krank:ignore-line)
+ has further details.
*/
doJailbreak = overrideCabal (drv: {
jailbreak = true;
diff --git a/pkgs/development/haskell-modules/lib/default.nix b/pkgs/development/haskell-modules/lib/default.nix
index 306176d32fc7c..665d8429631df 100644
--- a/pkgs/development/haskell-modules/lib/default.nix
+++ b/pkgs/development/haskell-modules/lib/default.nix
@@ -94,7 +94,8 @@ rec {
Note that jailbreaking at this time, doesn't lift bounds on
conditional branches.
- https://github.com/peti/jailbreak-cabal/issues/7 has further details.
+ https://github.com/peti/jailbreak-cabal/issues/7 (krank:ignore-line)
+ has further details.
*/
doJailbreak = compose.doJailbreak;
diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix
index e5ec0f1d053e6..e0cd3a7ac2e9a 100644
--- a/pkgs/development/haskell-modules/non-hackage-packages.nix
+++ b/pkgs/development/haskell-modules/non-hackage-packages.nix
@@ -41,11 +41,12 @@ self: super:
ghc-settings-edit = self.callPackage ../tools/haskell/ghc-settings-edit { };
- # https://github.com/channable/vaultenv/issues/1
+ # Upstream won't upload vaultenv to Hackage:
+ # https://github.com/channable/vaultenv/issues/1 krank:ignore-line
vaultenv = self.callPackage ../tools/haskell/vaultenv { };
- # spago-legacy is not released to Hackage.
- # https://github.com/spacchetti/spago/issues/512
+ # spago-legacy won't be released to Hackage:
+ # https://github.com/spacchetti/spago/issues/512 krank:ignore-line
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
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
deleted file mode 100644
index b4d7c553baffd..0000000000000
--- a/pkgs/development/haskell-modules/patches/cabal-install-3.16-lift-unix-bound.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/cryptonite-remove-argon2.patch b/pkgs/development/haskell-modules/patches/cryptonite-remove-argon2.patch
index 1d571b61e532e..8b281cd1f6987 100644
--- a/pkgs/development/haskell-modules/patches/cryptonite-remove-argon2.patch
+++ b/pkgs/development/haskell-modules/patches/cryptonite-remove-argon2.patch
@@ -23,7 +23,7 @@ index 044ba00..31dc6f1 100644
hash :: (ByteArrayAccess password, ByteArrayAccess salt, ByteArray out)
- => Options
-+ => [Proxy "cryptonite:Crypto.KDF.Argon2.hash is known to be broken on this architecture. See https://github.com/haskell-crypto/cryptonite/issues/360"]
++ => [Proxy "cryptonite:Crypto.KDF.Argon2.hash is known to be broken on this architecture. See https://github.com/haskell-crypto/cryptonite/issues/360"] -- abandoned project, krank:ignore-line
-> password
-> salt
-> Int
@@ -50,7 +50,7 @@ index 044ba00..31dc6f1 100644
- where
- saltLen = B.length salt
- passwordLen = B.length password
-+hash options password salt outLen = error "cryptonite:Crypto.KDF.Argon2.hash is known to be broken on this architecture. See https://github.com/haskell-crypto/cryptonite/issues/360"
++hash options password salt outLen = error "cryptonite:Crypto.KDF.Argon2.hash is known to be broken on this architecture. See https://github.com/haskell-crypto/cryptonite/issues/360" -- abandoned project, krank:ignore-line
data Pass
data Salt
diff --git a/pkgs/development/haskell-modules/patches/encoding-Cabal-2.0.patch b/pkgs/development/haskell-modules/patches/encoding-Cabal-2.0.patch
deleted file mode 100644
index 510e450945b89..0000000000000
--- a/pkgs/development/haskell-modules/patches/encoding-Cabal-2.0.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 67bb87ceff53f0178c988dd4e15eeb2daee92b84 Mon Sep 17 00:00:00 2001
-From: Gregor Kleen
-Date: Tue, 20 Feb 2018 17:46:24 +0100
-Subject: [PATCH] Relax upper version bounds on dependencies
-
----
- Setup.hs | 20 ++++++++++++++++----
- encoding.cabal | 4 ++--
- stack.yaml | 4 ++--
- 3 files changed, 20 insertions(+), 8 deletions(-)
-
-diff --git a/Setup.hs b/Setup.hs
-index de719e6..fe5b84c 100644
---- a/Setup.hs
-+++ b/Setup.hs
-@@ -1,13 +1,25 @@
-+{-# LANGUAGE CPP #-}
-+
- module Main where
-
- import Distribution.Simple
- import Data.Encoding.Preprocessor.Mapping
- import Data.Encoding.Preprocessor.XMLMappingBuilder
-
-+#if MIN_VERSION_Cabal(2,0,0)
-+main = defaultMainWithHooks (simpleUserHooks
-+ {hookedPreProcessors = ( ("mapping" , \_ _ _ -> mappingPreprocessor)
-+ : ("mapping2", \_ _ _ -> mappingPreprocessor)
-+ : ("xml" , \_ _ _ -> xmlPreprocessor)
-+ : (hookedPreProcessors simpleUserHooks)
-+ )
-+ })
-+#else
- main = defaultMainWithHooks (simpleUserHooks
-- {hookedPreProcessors = (("mapping",\_ _ -> mappingPreprocessor)
-- :("mapping2",\_ _ -> mappingPreprocessor)
-- :("xml",\_ _ -> xmlPreprocessor)
-- :(hookedPreProcessors simpleUserHooks)
-+ {hookedPreProcessors = ( ("mapping" , \_ _ -> mappingPreprocessor)
-+ : ("mapping2", \_ _ -> mappingPreprocessor)
-+ : ("xml" , \_ _ -> xmlPreprocessor)
-+ : (hookedPreProcessors simpleUserHooks)
- )
- })
-+#endif
-diff --git a/encoding.cabal b/encoding.cabal
-index ec20617..f221715 100644
---- a/encoding.cabal
-+++ b/encoding.cabal
-@@ -36,7 +36,7 @@ Source-Repository this
-
- Custom-Setup
- Setup-Depends: base >=3 && <5,
-- Cabal >=1.24 && <1.25,
-+ Cabal >=1.24 && <2.1,
- containers,
- filepath,
- ghc-prim,
-@@ -51,7 +51,7 @@ Library
- extensible-exceptions >=0.1 && <0.2,
- ghc-prim >=0.3 && <0.6,
- mtl >=2.0 && <2.3,
-- regex-compat >=0.71 && <0.95
-+ regex-compat >=0.71 && <0.96
-
- Extensions: CPP
-
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index f95ca4b2e717b..9968ea3553630 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -124,7 +124,8 @@ else
fi
done
- # haddock was referring to the base ghc, https://github.com/NixOS/nixpkgs/issues/36976
+ # haddock needs to be wrapped like GHC, see
+ # https://github.com/NixOS/nixpkgs/issues/36976 krank:ignore-line
if [[ -x "${ghc}/bin/haddock" ]]; then
rm -f $out/bin/haddock
makeWrapper ${ghc}/bin/haddock $out/bin/haddock \
@@ -171,7 +172,7 @@ else
# ghc-pkg is now trying to open the file. These file are symlink
# to another nix derivation, so they are not writable. Removing
# them allow the correct behavior of ghc-pkg recache
- # See: https://github.com/NixOS/nixpkgs/issues/79441
+ # See: https://github.com/NixOS/nixpkgs/issues/79441 krank:ignore-line
rm ${packageCfgDir}/package.cache.lock
rm ${packageCfgDir}/package.cache
@@ -182,7 +183,7 @@ else
+ postBuild;
preferLocalBuild = true;
passthru = {
- inherit (ghc) version targetPrefix;
+ inherit (ghc) version meta targetPrefix;
hoogle = hoogleWithPackages';
@@ -203,9 +204,4 @@ else
Also note that withLLVM has been renamed to useLLVM for consistency with
the GHC Nix expressions.'';
};
- pos = __curPos;
- meta = ghc.meta // {
- # To be fixed by .
- broken = useLLVM;
- };
}
diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix
index 7b2ef292fc42f..1a09cdef78950 100644
--- a/pkgs/development/interpreters/clisp/default.nix
+++ b/pkgs/development/interpreters/clisp/default.nix
@@ -122,11 +122,6 @@ stdenv.mkDerivation {
cd builddir
'';
- # ;; Loading file ../src/defmacro.lisp ...
- # *** - handle_fault error2 ! address = 0x8 not in [0x1000000c0000,0x1000000c0000) !
- # SIGSEGV cannot be cured. Fault address = 0x8.
- hardeningDisable = [ "pie" ];
-
doCheck = true;
postInstall = lib.optionalString (withModules != [ ]) ''
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 51f9a544146cb..2c754ba43fc70 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -584,9 +584,6 @@ stdenv.mkDerivation (finalAttrs: {
export CFLAGS_NODIST="-fno-semantic-interposition"
'';
- # Our aarch64-linux bootstrap files lack Scrt1.o, which fails the config test
- hardeningEnable = lib.optionals (!withMinimalDeps && !stdenv.hostPlatform.isAarch64) [ "pie" ];
-
setupHook = python-setup-hook sitePackages;
postInstall =
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 8dd797dc5f43f..a59a3cff42aa3 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -20,10 +20,10 @@
sourceVersion = {
major = "3";
minor = "13";
- patch = "8";
+ patch = "9";
suffix = "";
};
- hash = "sha256-uZEHMFJrKYKZtGs1WVztkFVyLfYMBq1jAfak4scoolI=";
+ hash = "sha256-7V7zTNo2z6Lzo0DwfKx+eBT5HH88QR9tNWIyOoZsXGY=";
};
};
@@ -71,10 +71,10 @@
sourceVersion = {
major = "3";
minor = "12";
- patch = "11";
+ patch = "12";
suffix = "";
};
- hash = "sha256-wwuyS38emhmxG1WlRkNPdOc5u0wnGj46gP9DgNSfets=";
+ hash = "sha256-+4WhNBSwKMSboYu9UjwtBVowtWsYuSzkVOosUe3GVsQ=";
inherit passthruFun;
};
diff --git a/pkgs/development/interpreters/python/tests/test_environments/test_python.py b/pkgs/development/interpreters/python/tests/test_environments/test_python.py
index 80713418a046e..0302ae1a6f0bf 100644
--- a/pkgs/development/interpreters/python/tests/test_environments/test_python.py
+++ b/pkgs/development/interpreters/python/tests/test_environments/test_python.py
@@ -8,6 +8,7 @@
import platform
import sys
+import sysconfig
import unittest
import site
@@ -38,10 +39,14 @@ def test_site_prefix(self):
@unittest.skipIf(IS_PYPY or sys.version_info.major==2, "Python 2 does not have base_prefix")
def test_base_prefix(self):
- if IS_VENV or IS_NIXENV or IS_VIRTUALENV:
+ if IS_VENV or IS_VIRTUALENV:
self.assertNotEqual(sys.prefix, sys.base_prefix)
else:
self.assertEqual(sys.prefix, sys.base_prefix)
+ if IS_NIXENV:
+ self.assertNotEqual(sys.base_prefix, sysconfig.get_config_var('prefix'))
+ else:
+ self.assertEqual(sys.base_prefix, sysconfig.get_config_var('prefix'))
@unittest.skipIf(sys.version_info.major==3, "sys.real_prefix is only set by virtualenv in case of Python 2.")
def test_real_prefix(self):
diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
index 6b6f97b74f3dd..55e86a8b9c369 100644
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/pkgs/development/interpreters/python/wrapper.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
buildEnv,
+ runCommand,
makeBinaryWrapper,
# manually pased
@@ -22,7 +23,11 @@
let
env =
let
- paths = requiredPythonModules (extraLibs ++ [ python ]);
+ paths = requiredPythonModules (extraLibs ++ [ python ]) ++ [
+ (runCommand "bin" { } ''
+ mkdir -p $out/bin
+ '')
+ ];
pythonPath = "${placeholder "out"}/${python.sitePackages}";
pythonExecutable = "${placeholder "out"}/bin/${python.executable}";
in
@@ -36,21 +41,26 @@ let
nativeBuildInputs = [ makeBinaryWrapper ];
postBuild = ''
- if [ -L "$out/bin" ]; then
- unlink "$out/bin"
- fi
- mkdir -p "$out/bin"
-
for path in ${lib.concatStringsSep " " paths}; do
if [ -d "$path/bin" ]; then
cd "$path/bin"
for prg in *; do
- if [ -f "$prg" ]; then
+ if [ -f "$prg" ] && [ -x "$prg" ]; then
rm -f "$out/bin/$prg"
- if [ -x "$prg" ]; then
- makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONPREFIX "$out" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${pythonPath} ${
- lib.optionalString (!permitUserSite) ''--set PYTHONNOUSERSITE "true"''
- } ${lib.concatStringsSep " " makeWrapperArgs}
+ if [ "$prg" = "${python.executable}" ]; then
+ makeWrapper "${python.interpreter}" "$out/bin/$prg" \
+ --inherit-argv0 \
+ ${lib.optionalString (!permitUserSite) ''--set PYTHONNOUSERSITE "true"''} \
+ ${lib.concatStringsSep " " makeWrapperArgs}
+ elif [ "$(readlink "$prg")" = "${python.executable}" ]; then
+ ln -s "${python.executable}" "$out/bin/$prg"
+ else
+ makeWrapper "$path/bin/$prg" "$out/bin/$prg" \
+ --set NIX_PYTHONPREFIX "$out" \
+ --set NIX_PYTHONEXECUTABLE ${pythonExecutable} \
+ --set NIX_PYTHONPATH ${pythonPath} \
+ ${lib.optionalString (!permitUserSite) ''--set PYTHONNOUSERSITE "true"''} \
+ ${lib.concatStringsSep " " makeWrapperArgs}
fi
fi
done
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 3da85518af646..33eaaf90ede21 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -196,15 +196,6 @@ let
# anything and fixes cross compilation.
./dont-refer-to-build-dir.patch
]
- # TODO: drop the isClang condition
- ++ ops (lib.versionOlder ver.majMin "3.4" && stdenv.cc.isClang) [
- (fetchpatch {
- name = "ruby-3.3-fix-llvm-21.patch";
- url = "https://github.com/ruby/ruby/commit/5a8d7642168f4ea0d9331fded3033c225bbc36c5.patch";
- excludes = [ "version.h" ];
- hash = "sha256-dV98gXXTSKM2ZezTvhVXNaKaXJxiWKEeUbqqL360cWw=";
- })
- ]
++ ops (lib.versionAtLeast ver.majMin "3.4" && lib.versionOlder ver.majMin "3.5") [
(fetchpatch {
name = "ruby-3.4-fix-gcc-15-llvm-21-1.patch";
@@ -421,8 +412,8 @@ in
mkRuby = generic;
ruby_3_3 = generic {
- version = rubyVersion "3" "3" "9" "";
- hash = "sha256-0ZkWkKThcjPsazx4RMHhJFwK3OPgDXE1UdBFhGe3J7E=";
+ version = rubyVersion "3" "3" "10" "";
+ hash = "sha256-tVW6pGejBs/I5sbtJNDSeyfpob7R2R2VUJhZ6saw6Sg=";
cargoHash = "sha256-xE7Cv+NVmOHOlXa/Mg72CTSaZRb72lOja98JBvxPvSs=";
};
diff --git a/pkgs/development/interpreters/spidermonkey/140-relax-apple-sdk.patch b/pkgs/development/interpreters/spidermonkey/140-relax-apple-sdk.patch
deleted file mode 100644
index c6e28f11be2f1..0000000000000
--- a/pkgs/development/interpreters/spidermonkey/140-relax-apple-sdk.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
-index 37c00230c853..dd89bea24392 100644
---- a/build/moz.configure/toolchain.configure
-+++ b/build/moz.configure/toolchain.configure
-@@ -233,7 +233,7 @@ with only_when(host_is_osx | target_is_osx):
- )
-
- def mac_sdk_min_version():
-- return "15.5"
-+ return "15.2"
-
- @depends(
- "--with-macos-sdk",
diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix
index d2e542899540c..4462bb0854721 100644
--- a/pkgs/development/interpreters/spidermonkey/common.nix
+++ b/pkgs/development/interpreters/spidermonkey/common.nix
@@ -68,8 +68,6 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://src.fedoraproject.org/rpms/mozjs140/raw/49492baa47bc1d7b7d5bc738c4c81b4661302f27/f/9aa8b4b051dd539e0fbd5e08040870b3c712a846.patch";
hash = "sha256-SsyO5g7wlrxE7y2+VTHfmUDamofeZVqge8fv2y0ZhuU=";
})
- # SDK 15.5 is not available in nixpkgs yet
- ./140-relax-apple-sdk.patch
];
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index cc0332510307b..fb761f6f7c7cf 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -21,13 +21,13 @@ let
};
v6 = {
- version = "6.1.2";
- hash = "sha256-h/N56iKkAR5kH+PRQceWZvHe3k+70KWMDEP5iVq/YFQ=";
+ version = "6.1.3";
+ hash = "sha256-NQnPOfiNmurY+L9/B7eVQc2JpOi0jhv5g9kVWsTzpis=";
};
v7 = {
- version = "7.1.1";
- hash = "sha256-GyS8imOqfOUPxXrzCiQtzCQIIH6bvWmQAB0fKUcRsW4=";
+ version = "7.1.2";
+ hash = "sha256-MF/0oSOhxGWuOu6Yat7O68iOvgZ+wKjpQ8zSkwpWXqQ=";
};
v8 = {
version = "8.0";
@@ -65,7 +65,7 @@ rec {
# unversioned aliases to allow for quicker migration to new releases,
# but can pin one of the versioned variants if they do not work with
# the current default version.
- ffmpeg = ffmpeg_7;
- ffmpeg-headless = ffmpeg_7-headless;
- ffmpeg-full = ffmpeg_7-full;
+ ffmpeg = ffmpeg_8;
+ ffmpeg-headless = ffmpeg_8-headless;
+ ffmpeg-full = ffmpeg_8-full;
}
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 0a3b41ceb3833..2c072a48d742d 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -9,7 +9,6 @@
perl,
texinfo,
texinfo6,
- yasm,
nasm,
# You can fetch any upstream version using this derivation by specifying version and hash
@@ -461,36 +460,6 @@ stdenv.mkDerivation (
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/cb049d377f54f6b747667a93e4b719380c3e9475";
hash = "sha256-sxRXKKgUak5vsQTiV7ge8vp+N22CdTIvuczNgVRP72c=";
})
- (fetchpatch2 {
- name = "CVE-2024-31582.patch";
- url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/99debe5f823f45a482e1dc08de35879aa9c74bd2";
- hash = "sha256-+CQ9FXR6Vr/AmsbXFiCUXZcxKj1s8nInEdke/Oc/kUA=";
- })
- (fetchpatch2 {
- name = "CVE-2024-31578.patch";
- url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/3bb00c0a420c3ce83c6fafee30270d69622ccad7";
- hash = "sha256-oZMZysBA+/gwaGEM1yvI+8wCadXWE7qLRL6Emap3b8Q=";
- })
- (fetchpatch2 {
- name = "CVE-2023-49501.patch";
- url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/4adb93dff05dd947878c67784d98c9a4e13b57a7";
- hash = "sha256-7cwktto3fPMDGvCZCVtB01X8Q9S/4V4bDLUICSNfGgw=";
- })
- (fetchpatch2 {
- name = "CVE-2023-49502.patch";
- url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/737ede405b11a37fdd61d19cf25df296a0cb0b75";
- hash = "sha256-mpSJwR9TX5ENjjCKvzuM/9e1Aj/AOiQW0+72oOMl9v8=";
- })
- (fetchpatch2 {
- name = "CVE-2023-50007.patch";
- url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/b1942734c7cbcdc9034034373abcc9ecb9644c47";
- hash = "sha256-v0hNcqBtm8GCGAU9UbRUCE0slodOjZCHrkS8e4TrVcQ=";
- })
- (fetchpatch2 {
- name = "CVE-2023-50008.patch";
- url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/5f87a68cf70dafeab2fb89b42e41a4c29053b89b";
- hash = "sha256-sqUUSOPTPLwu2h8GbAw4SfEf+0oWioz52BcpW1n4v3Y=";
- })
]
++ optionals (lib.versionOlder version "7.1.1") [
(fetchpatch2 {
@@ -521,7 +490,7 @@ stdenv.mkDerivation (
hash = "sha256-Ixkf1xzuDGk5t8J/apXKtghY0X9cfqSj/q987zrUuLQ=";
})
]
- ++ optionals (lib.versionOlder version "7.2") [
+ ++ optionals (lib.versionOlder version "7.1.2") [
(fetchpatch2 {
name = "unbreak-svt-av1-3.0.0.patch";
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/d1ed5c06e3edc5f2b5f3664c80121fa55b0baa95";
@@ -854,8 +823,7 @@ stdenv.mkDerivation (
perl
pkg-config
]
- # 8.0 is only compatible with nasm, and we don't want to rebuild all older ffmpeg builds at this moment.
- ++ (if versionOlder version "8.0" then [ yasm ] else [ nasm ])
+ ++ optionals stdenv.hostPlatform.isx86 [ nasm ]
# Texinfo version 7.1 introduced breaking changes, which older versions of ffmpeg do not handle.
++ (if versionOlder version "5" then [ texinfo6 ] else [ texinfo ])
++ optionals withCudaLLVM [ clang ]
diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix
index 7756fd79422ef..d9d48f3edd8bb 100644
--- a/pkgs/development/libraries/flatbuffers/default.nix
+++ b/pkgs/development/libraries/flatbuffers/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "flatbuffers";
- version = "25.2.10";
+ version = "25.9.23";
src = fetchFromGitHub {
owner = "google";
repo = "flatbuffers";
rev = "v${version}";
- hash = "sha256-u5AVjbep3iWwGNXLrkPJUnF8SbmIXlHOYoy3NIlUl/E=";
+ hash = "sha256-A9nWfgcuVW3x9MDFeviCUK/oGcWJQwadI8LqNR8BlQw=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix
index 1085e9b301f6c..022b766d90976 100644
--- a/pkgs/development/libraries/gcc/libgcc/default.nix
+++ b/pkgs/development/libraries/gcc/libgcc/default.nix
@@ -48,8 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
sourceRoot=$(readlink -e "./libgcc")
'';
- hardeningDisable = [ "pie" ];
-
preConfigure = ''
# Drop in libiberty, as external builds are not expected
cd "$buildRoot"
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index d1bebbdbbb3c2..9ae7a4c31133c 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -28,7 +28,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gdk-pixbuf";
- version = "2.42.12";
+ version = "2.44.3";
outputs = [
"out"
@@ -44,14 +44,12 @@ stdenv.mkDerivation (finalAttrs: {
in
fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- hash = "sha256-uVBbNEW5p+SM7TR2DDvLc+lm3zrJTJWhSMtmmrdI48c=";
+ hash = "sha256-QKktzCN/+UtjqAwVmj9vIs1Z9vtJYfIBx4eZ+iyKwKY=";
};
patches = [
# Move installed tests to a separate output
./installed-tests-path.patch
-
- ./static-deps.patch
];
# gdk-pixbuf-thumbnailer is not wrapped therefore strictDeps will work
@@ -90,7 +88,9 @@ stdenv.mkDerivation (finalAttrs: {
mesonFlags = [
"-Dgio_sniffing=false"
- (lib.mesonBool "gtk_doc" withIntrospection)
+ "-Dandroid=disabled"
+ "-Dglycin=disabled"
+ (lib.mesonBool "documentation" withIntrospection)
(lib.mesonEnable "introspection" withIntrospection)
(lib.mesonEnable "others" true)
]
@@ -108,8 +108,8 @@ stdenv.mkDerivation (finalAttrs: {
# it should be a build-time dep for build
# TODO: send upstream
substituteInPlace docs/meson.build \
- --replace "dependency('gi-docgen'," "dependency('gi-docgen', native:true," \
- --replace "'gi-docgen', req" "'gi-docgen', native:true, req"
+ --replace-fail "dependency('gi-docgen'," "dependency('gi-docgen', native:true," \
+ --replace-fail "'gi-docgen', req" "'gi-docgen', native:true, req"
# Remove 'ani' loader until proper fix for CVE-2022-48622
substituteInPlace meson.build --replace-fail "'ani'," ""
diff --git a/pkgs/development/libraries/gdk-pixbuf/static-deps.patch b/pkgs/development/libraries/gdk-pixbuf/static-deps.patch
deleted file mode 100644
index da52e432b4e77..0000000000000
--- a/pkgs/development/libraries/gdk-pixbuf/static-deps.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1b7cac1cbdb7078f575a3222be451a9bf1ac35ec Mon Sep 17 00:00:00 2001
-From: Alyssa Ross
-Date: Wed, 31 Jan 2024 15:33:02 +0100
-Subject: [PATCH] build: add missing dependency to gdkpixbuf_dep
-
-This should match the dependencies passed to the library() call that
-creates gdkpixbuf. Otherwise, linking the gdkpixbuf_bin executables
-will fail if -Ddefault_library=static, because static libraries don't
-carry dependency information themselves.
----
-Link: https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/161
-
- gdk-pixbuf/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
-index a11926eee..450484d68 100644
---- a/gdk-pixbuf/meson.build
-+++ b/gdk-pixbuf/meson.build
-@@ -269,7 +269,7 @@ endif
- gdkpixbuf_dep = declare_dependency(
- link_with: gdkpixbuf,
- include_directories: root_inc,
-- dependencies: gdk_pixbuf_deps,
-+ dependencies: [ gdk_pixbuf_deps, included_loaders_deps ],
- sources: [ gdkpixbuf_enum_h, built_girs ],
- )
- meson.override_dependency('gdk-pixbuf-2.0', gdkpixbuf_dep)
---
-GitLab
-
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index bb876ba2ee1f8..68ea0b1f0fb9f 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -58,12 +58,11 @@ in
makeFlagsArray+=("bindir=$bin/bin" "sbindir=$bin/sbin" "rootsbindir=$bin/sbin")
'';
- # The pie, stackprotector and fortify hardening flags are autodetected by
+ # The stackprotector and fortify hardening flags are autodetected by
# glibc and enabled by default if supported. Setting it for every gcc
# invocation does not work.
hardeningDisable = [
"fortify"
- "pie"
"stackprotector"
"strictflexarrays3"
];
diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/development/libraries/glibmm/2.68.nix
index 3211986f87c1b..955a946cdf2f3 100644
--- a/pkgs/development/libraries/glibmm/2.68.nix
+++ b/pkgs/development/libraries/glibmm/2.68.nix
@@ -13,7 +13,7 @@
stdenv.mkDerivation rec {
pname = "glibmm";
- version = "2.84.0";
+ version = "2.86.0";
outputs = [
"out"
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/glibmm/${lib.versions.majorMinor version}/glibmm-${version}.tar.xz";
- hash = "sha256-Vu5fUcis/Ar99GlZMW5MhVTLUO0ra8XOOJ2XnLtkJQk=";
+ hash = "sha256-OcDp9toEbWeTkHdO/bmtVkQ2I2c23C94JeYUstQIeCY=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gobject-introspection/0001-scanner-Prefer-some-getters-over-others.patch b/pkgs/development/libraries/gobject-introspection/0001-scanner-Prefer-some-getters-over-others.patch
deleted file mode 100644
index 437e4cd0a7a40..0000000000000
--- a/pkgs/development/libraries/gobject-introspection/0001-scanner-Prefer-some-getters-over-others.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 7b2d3699ad117199bc316c7007cc5984c3b09368 Mon Sep 17 00:00:00 2001
-From: Maximiliano Sandoval
-Date: Thu, 20 Mar 2025 22:52:54 +0100
-Subject: [PATCH] scanner: Prefer some getters over others
-
-At the moment the current set of heuristics to determine a getter for a
-property is good for finding *a* getter. However, if there are multiple
-candidates we might declare the wrong method as a getter.
-
-We introduce a priority system to determine which getter candidate is
-the most appropriate as the getter. The weight were chosen with gaps in
-between so that new and better heuristics have space to thrive.
-
-For a property named `p`, these are the possible getter candidates:
-
- - A method declared via the `(getter p)` annotation
- - The method `get_p`
- - The method `is_p`
- - The method `p`
-
-we declare the getter to be the first candidate in the list for which a
-method of the same name is available.
-
-See https://gitlab.gnome.org/GNOME/gjs/-/issues/681.
----
- giscanner/maintransformer.py | 22 +++++++++++++++-------
- 1 file changed, 15 insertions(+), 7 deletions(-)
-
-diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py
-index a81b1777..9aaf2578 100644
---- a/giscanner/maintransformer.py
-+++ b/giscanner/maintransformer.py
-@@ -1612,7 +1612,10 @@ method or constructor of some type."""
- if not prop.introspectable:
- continue
- setter = None
-- getter = []
-+ # They keys are method names of candidates for getters. The values
-+ # are priority weights that measure how tasteful was the heuristic
-+ # used to propose their candidate.
-+ getter = {}
- if prop.setter is None:
- if prop.writable and not prop.construct_only:
- setter = 'set_' + normalized_name
-@@ -1620,17 +1623,17 @@ method or constructor of some type."""
- setter = prop.setter
- if prop.getter is None:
- if prop.readable:
-- getter = ['get_' + normalized_name]
-+ getter[f"get_{normalized_name}"] = 50
- # Heuristic: boolean properties can have getters that are
- # prefixed by is_property_name, like: gtk_window_is_maximized()
- if prop.type.is_equiv(ast.TYPE_BOOLEAN) and not normalized_name.startswith("is_"):
-- getter.append(f"is_{normalized_name}")
-+ getter[f"is_{normalized_name}"] = 25
- # Heuristic: read-only properties can have getters that are
- # just the property name, like: gtk_widget_has_focus()
- if not prop.writable and prop.type.is_equiv(ast.TYPE_BOOLEAN):
-- getter.append(normalized_name)
-+ getter[normalized_name] = 10
- else:
-- getter = [prop.getter]
-+ getter[prop.getter] = 99
- for method in node.methods:
- if not method.introspectable:
- continue
-@@ -1645,7 +1648,7 @@ method or constructor of some type."""
- method.set_property = prop.name
- prop.setter = method.name
- continue
-- if getter is not [] and method.name in getter:
-+ if getter is not {} and method.name in getter:
- if method.get_property is None:
- method.get_property = prop.name
- elif method.get_property != prop.name:
-@@ -1654,7 +1657,12 @@ method or constructor of some type."""
- "mismatched '(get-property %s)' annotation" %
- (method.symbol, prop.name, method.get_property))
- method.get_property = prop.name
-- prop.getter = method.name
-+ # Check the priority of the last matching getter
-+ current_priority = -1
-+ if current_getter := prop.getter:
-+ current_priority = getter.get(current_getter, -1)
-+ if getter[method.name] >= current_priority:
-+ prop.getter = method.name
- continue
-
- def _pass_member_numeric_name(self, node):
---
-2.48.1
-
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index d461983e8d069..f5463c9bd8bc3 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -43,7 +43,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gobject-introspection";
- version = "1.84.0";
+ version = "1.86.0";
# outputs TODO: share/gobject-introspection-1.0/tests is needed during build
# by pygobject3 (and maybe others), but it's only searched in $out
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/gobject-introspection/${lib.versions.majorMinor finalAttrs.version}/gobject-introspection-${finalAttrs.version}.tar.xz";
- hash = "sha256-lFtX2n7CYuXCZrieCR0UvoAMxCQnfYKgKHK315SoR3k=";
+ hash = "sha256-kg0aP87ercMqz/lcLiA7MZA53UtKCN0aLf0oPRnAua4=";
};
patches = [
@@ -67,10 +67,6 @@ stdenv.mkDerivation (finalAttrs: {
(replaceVars ./absolute_shlib_path.patch {
inherit nixStoreDir;
})
-
- # Fix getter heuristics regression
- # https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/529
- ./0001-scanner-Prefer-some-getters-over-others.patch
]
++ lib.optionals x11Support [
# Hardcode the cairo shared library path in the Cairo gir shipped with this package.
diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix
index 111897349641f..a4c669eebe9fe 100644
--- a/pkgs/development/libraries/gssdp/default.nix
+++ b/pkgs/development/libraries/gssdp/default.nix
@@ -104,7 +104,6 @@ stdenv.mkDerivation rec {
description = "GObject-based API for handling resource discovery and announcement over SSDP";
homepage = "http://www.gupnp.org/";
license = licenses.lgpl2Plus;
- teams = [ teams.gnome ];
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
index 760ec0610deed..a33b23e182752 100644
--- a/pkgs/development/libraries/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/default.nix
@@ -4,11 +4,11 @@
callPackage,
ipu6ep-camera-hal,
ipu6epmtl-camera-hal,
- apple-sdk_13,
+ apple-sdk,
}:
let
- apple-sdk_gstreamer = apple-sdk_13;
+ apple-sdk_gstreamer = apple-sdk;
in
{
inherit apple-sdk_gstreamer;
diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix
index e37a40923d1a3..01c29e9da0247 100644
--- a/pkgs/development/libraries/gtk/3.x.nix
+++ b/pkgs/development/libraries/gtk/3.x.nix
@@ -62,7 +62,7 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "gtk+3";
- version = "3.24.49";
+ version = "3.24.51";
outputs = [
"out"
@@ -82,12 +82,18 @@ stdenv.mkDerivation (finalAttrs: {
in
fetchurl {
url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz";
- hash = "sha256-XqUsaijw5ezy6aPC+suzDQQLc4cfzV8zzRMX6QGKFG4=";
+ hash = "sha256-ABOHfGvSPC2+Qq18cKBT0ORJvmZzZXTjeGfEnF+QWk8=";
};
patches = [
./patches/3.0-immodules.cache.patch
./patches/3.0-Xft-setting-fallback-compute-DPI-properly.patch
+ # Backport of MR 5531 to fix sincos detection with clang
+ # Adds proper headers and -D_GNU_SOURCE to function checks
+ # MR 5531 was only merged into GTK 4, never backported to gtk-3-24
+ # See: https://github.com/NixOS/nixpkgs/pull/449689
+ # Upstream: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5531
+ ./patches/3.0-mr5531-backport.patch
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# X11 module requires which is not installed on Darwin
diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix
index a9217ba92d149..9b5a9daaa063f 100644
--- a/pkgs/development/libraries/gtk/4.x.nix
+++ b/pkgs/development/libraries/gtk/4.x.nix
@@ -28,6 +28,7 @@
libxkbcommon,
libpng,
libtiff,
+ librsvg,
libjpeg,
libxml2,
gnome,
@@ -68,7 +69,7 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "gtk4";
- version = "4.18.6";
+ version = "4.20.2";
outputs = [
"out"
@@ -84,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor finalAttrs.version}/gtk-${finalAttrs.version}.tar.xz";
- hash = "sha256-4YF8ZQ3cMmH5qDRbOyKial2ArxVGMN7cA8x77O//0Po=";
+ hash = "sha256-XoJA7eyvr/K4uvRmO9zqpmjvEKIHvuTX+Q4BDhC93Fw=";
};
depsBuildBuild = [
@@ -119,6 +120,7 @@ stdenv.mkDerivation (finalAttrs: {
libxkbcommon
libpng
libtiff
+ librsvg
libjpeg
(libepoxy.override { inherit x11Support; })
isocodes
diff --git a/pkgs/development/libraries/gtk/patches/3.0-mr5531-backport.patch b/pkgs/development/libraries/gtk/patches/3.0-mr5531-backport.patch
new file mode 100644
index 0000000000000..afbfb1f95eb6c
--- /dev/null
+++ b/pkgs/development/libraries/gtk/patches/3.0-mr5531-backport.patch
@@ -0,0 +1,93 @@
+From f1fb82c739aebc6b37090f8ebf74d856129116d3 Mon Sep 17 00:00:00 2001
+From: Matteo Pacini
+Date: Tue, 14 Oct 2025 22:03:27 +0100
+Subject: [PATCH] Backport MR 5531: Fix sincos detection with clang
+
+Add proper headers and -D_GNU_SOURCE to function checks to ensure
+functions like sincos are properly detected, especially with clang.
+
+Also fix gtkgears.c to avoid issues when sincos is in headers but
+not detected by the build system.
+
+Backport of https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5531
+adapted for GTK 3.24.49.
+---
+ meson.build | 10 +++++++++-
+ tests/gtkgears.c | 22 ++++++++++++----------
+ 2 files changed, 21 insertions(+), 11 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 08337ec..92d7781 100644
+--- a/meson.build
++++ b/meson.build
+@@ -255,7 +255,15 @@ check_functions = [
+ ]
+
+ foreach func : check_functions
+- if cc.has_function(func, dependencies: libm)
++ if cc.has_function(func,
++ args: '-D_GNU_SOURCE',
++ prefix:
++ '#include \n' +
++ '#include \n' +
++ '#include \n' +
++ '#include \n' +
++ '#include ',
++ dependencies: libm)
+ cdata.set('HAVE_' + func.underscorify().to_upper(), 1)
+ endif
+ endforeach
+diff --git a/tests/gtkgears.c b/tests/gtkgears.c
+index 062b611..ba7e196 100644
+--- a/tests/gtkgears.c
++++ b/tests/gtkgears.c
+@@ -48,14 +48,16 @@
+ #define VERTICES_PER_TOOTH 34
+ #define GEAR_VERTEX_STRIDE 6
+
+-#ifndef HAVE_SINCOS
+-static void
+-sincos (double x, double *_sin, double *_cos)
++static inline void
++_sincos (double x, double *_sin, double *_cos)
+ {
++#ifdef HAVE_SINCOS
++ sincos (x, _sin, _cos);
++#else
+ *_sin = sin (x);
+ *_cos = cos (x);
+-}
+ #endif
++}
+
+ /**
+ * Struct describing the vertices in triangle strip
+@@ -306,11 +308,11 @@ create_gear (GLfloat inner_radius,
+ struct point p[7];
+
+ /* Calculate needed sin/cos for varius angles */
+- sincos(i * 2.0 * G_PI / teeth + da * 0, &s[0], &c[0]);
+- sincos(i * 2.0 * M_PI / teeth + da * 1, &s[1], &c[1]);
+- sincos(i * 2.0 * M_PI / teeth + da * 2, &s[2], &c[2]);
+- sincos(i * 2.0 * M_PI / teeth + da * 3, &s[3], &c[3]);
+- sincos(i * 2.0 * M_PI / teeth + da * 4, &s[4], &c[4]);
++ _sincos(i * 2.0 * G_PI / teeth + da * 0, &s[0], &c[0]);
++ _sincos(i * 2.0 * M_PI / teeth + da * 1, &s[1], &c[1]);
++ _sincos(i * 2.0 * M_PI / teeth + da * 2, &s[2], &c[2]);
++ _sincos(i * 2.0 * M_PI / teeth + da * 3, &s[3], &c[3]);
++ _sincos(i * 2.0 * M_PI / teeth + da * 4, &s[4], &c[4]);
+
+ GEAR_POINT(p[0], r2, 1);
+ GEAR_POINT(p[1], r2, 2);
+@@ -519,7 +521,7 @@ void perspective(GLfloat *m, GLfloat fovy, GLfloat aspect, GLfloat zNear, GLfloa
+ identity(tmp);
+
+ deltaZ = zFar - zNear;
+- sincos(radians, &sine, &cosine);
++ _sincos(radians, &sine, &cosine);
+
+ if ((deltaZ == 0) || (sine == 0) || (aspect == 0))
+ return;
+--
+2.50.1 (Apple Git-155)
+
diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix
index 69db33598e17d..4025bee7d92b9 100644
--- a/pkgs/development/libraries/gtkmm/4.x.nix
+++ b/pkgs/development/libraries/gtkmm/4.x.nix
@@ -19,7 +19,7 @@
stdenv.mkDerivation rec {
pname = "gtkmm";
- version = "4.18.0";
+ version = "4.20.0";
outputs = [
"out"
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtkmm/${lib.versions.majorMinor version}/gtkmm-${version}.tar.xz";
- hash = "sha256-LuMcFUefxNjpWLA8i1+7yOF7wSLCovVESXtOBWGeM+w=";
+ hash = "sha256-2q2b+bcPkJdfkXgfx6ZWySOpE3QmH1dsiDzTrr1ZyDM=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix
index 433dca535864a..986a9d6ab7b3b 100644
--- a/pkgs/development/libraries/gtksourceview/5.x.nix
+++ b/pkgs/development/libraries/gtksourceview/5.x.nix
@@ -25,7 +25,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gtksourceview";
- version = "5.16.0";
+ version = "5.18.0";
outputs = [
"out"
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/gtksourceview/${lib.versions.majorMinor finalAttrs.version}/gtksourceview-${finalAttrs.version}.tar.xz";
- hash = "sha256-qzXUIBAvPosFXdO4ZC06SCCfiIGJ5iVND/tLan6MNWY=";
+ hash = "sha256-BRp4/jj3kzKAR+W81thVxkJcC0gMINlDIXnjVnQsasA=";
};
patches = [
diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index 02f93a256c549..dbabceb5230fc 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -27,6 +27,9 @@ stdenv.mkDerivation (finalAttrs: {
# cgit) that are needed here should be included directly in Nixpkgs as
# files.
patches = [
+ # Threading tests need to be linked against pthread
+ # See: https://github.com/libffi/libffi/pull/944
+ ./freebsd-tsan-pthread.patch
];
strictDeps = true;
diff --git a/pkgs/development/libraries/libffi/freebsd-tsan-pthread.patch b/pkgs/development/libraries/libffi/freebsd-tsan-pthread.patch
new file mode 100644
index 0000000000000..05c278bdbc838
--- /dev/null
+++ b/pkgs/development/libraries/libffi/freebsd-tsan-pthread.patch
@@ -0,0 +1,24 @@
+From e52a0790a9b80492cba2907c27d0a9e4248b6608 Mon Sep 17 00:00:00 2001
+From: Jon Hermansen
+Date: Tue, 28 Oct 2025 18:02:39 -0400
+Subject: [PATCH] fix tsan tests on FreeBSD by linking to pthread
+
+---
+ testsuite/lib/libffi.exp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/testsuite/lib/libffi.exp b/testsuite/lib/libffi.exp
+index 81eff7752..308db6f8d 100644
+--- a/testsuite/lib/libffi.exp
++++ b/testsuite/lib/libffi.exp
+@@ -407,6 +407,10 @@ proc libffi_target_compile { source dest type options } {
+ lappend options "libs= -lpthread"
+ }
+
++ if { [string match "*-*-freebsd*" $target_triplet] } {
++ lappend options "libs= -lpthread"
++ }
++
+ lappend options "libs= -lffi"
+
+ if { [string match "aarch64*-*-linux*" $target_triplet] } {
diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix
index c466646c93587..8a166dfe0ea9b 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "libiconv";
- version = "1.17";
+ version = "1.18";
src = fetchurl {
url = "mirror://gnu/libiconv/${pname}-${version}.tar.gz";
- sha256 = "sha256-j3QhO1YjjIWlClMp934GGYdx5w3Zpzl3n0wC9l2XExM=";
+ sha256 = "sha256-Owj19Pm064LxUacEC/1v5sb7ki7+SxZZxm6pMydpZeg=";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 1a00fab8d27b1..868bb2745691f 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -9,6 +9,7 @@
libevdev,
mtdev,
udev,
+ wacomSupport ? true,
libwacom,
documentationSupport ? false,
doxygen,
@@ -50,7 +51,7 @@ in
stdenv.mkDerivation rec {
pname = "libinput";
- version = "1.29.1";
+ version = "1.29.2";
outputs = [
"bin"
@@ -63,7 +64,7 @@ stdenv.mkDerivation rec {
owner = "libinput";
repo = "libinput";
rev = version;
- hash = "sha256-wNiI6QPwuK0gUJRadSJx+FOx84kpVC4bXhuQ3ybewoY=";
+ hash = "sha256-oxDGUbZebxAmBd2j51qV9Jn8SXBjUX2NPRgkxbDz7Dk=";
};
patches = [
@@ -85,7 +86,6 @@ stdenv.mkDerivation rec {
buildInputs = [
libevdev
mtdev
- libwacom
(python3.withPackages (
pp: with pp; [
pp.libevdev # already in scope
@@ -95,6 +95,9 @@ stdenv.mkDerivation rec {
]
))
]
+ ++ lib.optionals wacomSupport [
+ libwacom
+ ]
++ lib.optionals eventGUISupport [
# GUI event viewer
cairo
@@ -116,6 +119,7 @@ stdenv.mkDerivation rec {
(mkFlag documentationSupport "documentation")
(mkFlag eventGUISupport "debug-gui")
(mkFlag testsSupport "tests")
+ (mkFlag wacomSupport "libwacom")
"--sysconfdir=/etc"
"--libexecdir=${placeholder "bin"}/libexec"
];
diff --git a/pkgs/development/libraries/libpeas/2.x.nix b/pkgs/development/libraries/libpeas/2.x.nix
index 5ea842c86ce1f..2fc9b559723da 100644
--- a/pkgs/development/libraries/libpeas/2.x.nix
+++ b/pkgs/development/libraries/libpeas/2.x.nix
@@ -15,7 +15,7 @@
glib,
lua5_1,
python3,
- spidermonkey_128,
+ spidermonkey_140,
gnome,
}:
@@ -24,7 +24,7 @@ let
in
stdenv.mkDerivation rec {
pname = "libpeas";
- version = "2.0.7";
+ version = "2.2.0";
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-HpqdaXYdIQnv9bfBHYyWtIZ8z6yiuSHt7UlAEZJ2nsk=";
+ hash = "sha256-wohyM/CEpp+r/H+gFA1BBJGGPXBQr7KGd/mlU7JYCtk=";
};
patches = [
@@ -65,12 +65,12 @@ stdenv.mkDerivation rec {
luaEnv
python3
python3.pkgs.pygobject3
- spidermonkey_128
+ spidermonkey_140
];
propagatedBuildInputs = [
# Required by libpeas-2.pc
- gobject-introspection
+ glib
];
mesonFlags = [
diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix
index 4e83219019bae..74fc27b7d7d2d 100644
--- a/pkgs/development/libraries/libpeas/default.nix
+++ b/pkgs/development/libraries/libpeas/default.nix
@@ -2,6 +2,7 @@
stdenv,
lib,
fetchurl,
+ fetchpatch,
replaceVars,
meson,
ninja,
@@ -39,6 +40,18 @@ stdenv.mkDerivation rec {
python3.pkgs.pygobject3
];
})
+
+ # girepository: port libpeas ABI to girepository
+ # https://gitlab.gnome.org/GNOME/libpeas/-/issues/58
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/libpeas/-/commit/73e25b6059d2fdc090a3feb8341ff902c3ec0d16.patch";
+ hash = "sha256-xNp/DbLV2mdMiUALdEWE4ssyD3krWmzmJIwgStsNShM=";
+ })
+ # build: handle depending on development releases of GLib
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/libpeas/-/commit/4613accc2e22395bb77bdf612fcdf90bf65f230f.patch";
+ hash = "sha256-VGPLDswH3St/SzS19iHr5dA/ywzDsXhd7FMUg4rII9U=";
+ })
];
depsBuildBuild = [
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 7a9bb46c76d44..d8710b19efb72 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -134,7 +134,7 @@ stdenv.mkDerivation rec {
description = "HTTP client/server library for GNOME";
homepage = "https://gitlab.gnome.org/GNOME/libsoup";
license = lib.licenses.lgpl2Plus;
- inherit (glib.meta) maintainers platforms teams;
+ platforms = lib.platforms.unix ++ lib.platforms.windows;
pkgConfigModules = [
"libsoup-2.4"
"libsoup-gnome-2.4"
diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index 43db16eb28f60..5e74e9ec0e9b8 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -22,11 +22,11 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "libunistring";
- version = "1.4";
+ version = "1.4.1";
src = fetchurl {
url = "mirror://gnu/libunistring/libunistring-${finalAttrs.version}.tar.gz";
- hash = "sha256-9+Od3soYhY7N0Cxg0dU3T83LvNtraKOR+El8scss8/c=";
+ hash = "sha256-ElQq12GUcO/ZWmIxdNzUs2TySDyvcIxr7oN8tTpUy50=";
};
outputs = [
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 8c4c1c6530922..41d2b1f953f0d 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -50,23 +50,14 @@ let
};
};
libxml2 = callPackage ./common.nix {
- version = "2.15.0";
+ version = "2.15.1";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "libxml2";
tag = "v${packages.libxml2.version}";
- hash = "sha256-jumHSiIMDzqG2hvPUdcBP8LsszcU+loOY+vqEh/0Yqo=";
+ hash = "sha256-FUfYMq5xT2i88JdIw9OtSofraUL3yjsyOVund+mfJKQ=";
};
- extraPatches = [
- # Fixes a regression in attribute normalization.
- # Also see https://www.postgresql.org/message-id/flat/0756AC61-FBA3-46E2-B3C2-19B58B65EBDC%2540yesql.se
- # To be removed with 2.15.1.
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/da45a190f718e8e2f0e3d2a6325ffa23abc8b90c.patch";
- hash = "sha256-wqmFszr7w1Lte12YR6Ug7Ng7fXABzizwUsJU1EhylgU=";
- })
- ];
extraMeta = {
maintainers = with lib.maintainers; [
jtojnar
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index f3a264cf2644e..ef861e8ee153e 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -58,7 +58,7 @@
enableVtk ? false,
vtk,
enableFfmpeg ? true,
- ffmpeg,
+ ffmpeg_7,
enableGStreamer ? true,
elfutils,
gst_all_1,
@@ -365,7 +365,7 @@ effectiveStdenv.mkDerivation {
openjpeg
]
++ optionals enableFfmpeg [
- ffmpeg
+ ffmpeg_7
]
++ optionals (enableGStreamer && effectiveStdenv.hostPlatform.isLinux) [
elfutils
diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/development/libraries/openexr/3.nix
index b07b4ccb711e7..6729fb07a69dc 100644
--- a/pkgs/development/libraries/openexr/3.nix
+++ b/pkgs/development/libraries/openexr/3.nix
@@ -3,6 +3,7 @@
stdenv,
fetchFromGitHub,
cmake,
+ ctestCheckHook,
imath,
libdeflate,
pkg-config,
@@ -50,6 +51,9 @@ stdenv.mkDerivation rec {
imath
libdeflate
];
+ nativeCheckInputs = [
+ ctestCheckHook
+ ];
# Without 'sse' enforcement tests fail on i686 as due to excessive precision as:
# error reading back channel B pixel 21,-76 got -nan expected -nan
@@ -58,6 +62,24 @@ stdenv.mkDerivation rec {
# https://github.com/AcademySoftwareFoundation/openexr/issues/1400
doCheck = !stdenv.hostPlatform.isAarch32;
+ disabledTests = lib.optionals stdenv.hostPlatform.isBigEndian [
+ # https://github.com/AcademySoftwareFoundation/openexr/issues/1175
+ # Not sure if these issues are specific to the tests, or if openexr in general is borked on big-endian.
+ # Optimistically assuming the former here.
+ "OpenEXRCore.testReadDeep"
+ "OpenEXRCore.testDWATable"
+ "OpenEXRCore.testDWAACompression"
+ "OpenEXRCore.testDWABCompression"
+ "OpenEXR.testAttributes"
+ "OpenEXR.testCompression"
+ "OpenEXR.testRgba"
+ "OpenEXR.testCRgba"
+ "OpenEXR.testRgbaThreading"
+ "OpenEXR.testSampleImages"
+ "OpenEXR.testSharedFrameBuffer"
+ "OpenEXR.testTiledRgba"
+ ];
+
passthru.tests = {
inherit libjxl;
musl = pkgsCross.musl64.openexr;
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index aee19324bcba2..c0d299f6b7e27 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -260,6 +260,8 @@ let
patchShebangs util
'';
+ __darwinAllowLocalNetworking = true;
+
postInstall =
(
if static then
diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 14e1fbef6863a..4573e7c8ba408 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -65,13 +65,6 @@ let
./qtdeclarative-default-disable-qmlcache.patch
# add version specific QML import path
./qtdeclarative-qml-paths.patch
- # 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-5/5.15/srcs-generated.json b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json
index 47b8a3495b702..fd5fcefbff345 100644
--- a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json
+++ b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json
@@ -1,202 +1,202 @@
{
"qt3d": {
"url": "https://invent.kde.org/qt/qt/qt3d.git",
- "rev": "73c1dda553f338c5a3b9ebbfd0e7de114f0c93dc",
- "sha256": "0szrqm745b541bamwsbbnl7w6yx0hcaj6jsb3v7kxhvb8kfb1jbm"
+ "rev": "208f5835e6c2415c9dc5cbe92bba83aa28bab7ea",
+ "sha256": "0zqvdq5y25b1w7agx5wlr16p1wrx54086r0xcdfg9wx8dayhh1md"
},
"qtactiveqt": {
"url": "https://invent.kde.org/qt/qt/qtactiveqt.git",
- "rev": "df401a62879521f3fd47097205a440d5b173b524",
- "sha256": "1zv5a2ywgvv4k3mgz2bbp5696751azf20pxk3xd1dr4dicr2lxf6"
+ "rev": "e4c93bc7cac45bac6bccda3310947e8fe026a9ed",
+ "sha256": "1qq6jvqkl4ff7sw20pi1mawh5pypv7vxmj56d38z6p06r1azkvls"
},
"qtandroidextras": {
"url": "https://invent.kde.org/qt/qt/qtandroidextras.git",
- "rev": "484bbac0978eccc9031cbf1bf804a81a6bfb1247",
- "sha256": "0h3x582q3m8cpll5f54h2cqngyd7j1mx0j1jqrjcf4mbg5n9y0i5"
+ "rev": "4928bd58dbc1cdcf44a7e454e3d4654c3c2016f1",
+ "sha256": "02rsh60lyl6bn2jhx0ajn43safbi904nhwvdpikanrmdbg0z6dpp"
},
"qtbase": {
"url": "https://invent.kde.org/qt/qt/qtbase.git",
- "rev": "128a1d2861ca5693e43e8b79fbd4278dcd451fbc",
- "sha256": "1jd2my6az2a9l7d1v6f03ygv5m16dij2mmb73jchgrz20h1an7nz"
+ "rev": "bebdfd54917e25d1c100e6bd9f5dd53c2e645fd8",
+ "sha256": "0bg36lxngkq2k11bhqdyfvbc1qyqaghwsi446zfn67vxvyxya3hx"
},
"qtcharts": {
"url": "https://invent.kde.org/qt/qt/qtcharts.git",
- "rev": "aaf04515611203a32cef866cce9bfeaa4cef20b6",
- "sha256": "0q0qglksgl50kjq5pqigfvww4rks3ig8xwcz72d0h58ga1i3kgid"
+ "rev": "1093fb53ced126100d14af30a8adffd29b7ef855",
+ "sha256": "0cnlg59l743milkki8mjbrfd4cx5ycbqw73apcrnrsag9dqdbw41"
},
"qtconnectivity": {
"url": "https://invent.kde.org/qt/qt/qtconnectivity.git",
- "rev": "15961348aa26b73248432a0a274b332c36cd0054",
- "sha256": "020vh62m098zn8fl43xnd5hhvixfr0q21ziq30jqml0j3slx4adx"
+ "rev": "f1be05c8efeb65b77a8bfd21763ab55bb5c04906",
+ "sha256": "1vl7wfw9sd8qfl8ixzl5wz4v5km5zdf9bii53q3pw4f2lplsralq"
},
"qtdatavis3d": {
"url": "https://invent.kde.org/qt/qt/qtdatavis3d.git",
- "rev": "a57e633b675d7886c3e5c64441f50ffe831f2de8",
- "sha256": "0w0cv80sa9w42wgw3yji228wyhwc3c8lz9r3296crq136aykyy87"
+ "rev": "d9b988d3c5f9f34b97f3a9ac1347bfb55464cd60",
+ "sha256": "09jk32kw7wgcrd117a9lsm5w7jszsdhdslk10qn631wz203zbs4i"
},
"qtdeclarative": {
"url": "https://invent.kde.org/qt/qt/qtdeclarative.git",
- "rev": "11ea94fc8ea95d0ba95745a021a1b139283b8b36",
- "sha256": "0xw15d7syqw0z6xjnkgckh53rhg7n20j67dm1bhf429ma1cqawqm"
+ "rev": "1189557a50f11e7bc5716467a149cd09987a9f88",
+ "sha256": "0cd89d8i8chy1j1yanp1cq5s7467qr24b9c7cx9qw0nb0rf6f8qr"
},
"qtdoc": {
"url": "https://invent.kde.org/qt/qt/qtdoc.git",
- "rev": "36ae30d632c978b795bf40aa1c50abaae7c8ac4d",
- "sha256": "10vwkk2b4ysx6i9nyqnl1g7q7rckp5xppwdawd6avlkxhfjayan7"
+ "rev": "ddb2afda6f713259fc8d95fb22a1c96bb448c36a",
+ "sha256": "0nk2vwl0ppix794xzj8nqrhsc333v8v4vr1rmwddymwlrdqlqd5d"
},
"qtgamepad": {
"url": "https://invent.kde.org/qt/qt/qtgamepad.git",
- "rev": "fb2191db07738c9a954a77c2fb15dcb925a4c361",
- "sha256": "1061ad1350bi0jr2vzpsmk6cgwyhv63d67nb8np1nr2j1iy2ncp7"
+ "rev": "269fc0731f6838a1c02877a83c0ada23659c69fc",
+ "sha256": "06jhby671yzbj753yb0lnk4bv2r0nxxibq7fq1yljxdms0rc72iz"
},
"qtgraphicaleffects": {
"url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git",
- "rev": "fed60f95ddb75103f83cf67bf2c9f471e49576fe",
- "sha256": "0ja113vz261farf6c1bilxww4ypzzsnkz7xl37xr1pmxy9hx7lw8"
+ "rev": "dfb2e7b2c98a9b7185c300d0b92b4048f5d89ba5",
+ "sha256": "1sn46lmq0y56mw0q11sgaijr2vg1wpp6lj237finp6vr3bji2816"
},
"qtimageformats": {
"url": "https://invent.kde.org/qt/qt/qtimageformats.git",
- "rev": "f86afca95741b9c06202fd13c2b8c01d922a0e24",
- "sha256": "1qql5zc2691iazx94s7arnkmk46y8f4p20is0asjfycs30x5cmp5"
+ "rev": "c91e4c63c1eaf1e23806d9df10e3d5a9ae353c1d",
+ "sha256": "0q0vcymiqfyz8sfs9wdkhhwff55acj2rsmrb8w6yikmwcmcxp2a3"
},
"qtlocation": {
"url": "https://invent.kde.org/qt/qt/qtlocation.git",
- "rev": "c6e6c63e8566fc75551cb901c3b5939b39e7a25c",
- "sha256": "1n7wmsmy33v0fihivs18cafrh51bl0sa6gai6mlid0lx4izbs44f"
+ "rev": "ba48a8b5cedd157d972c08d371ac2581db166bf7",
+ "sha256": "00kwv405qq9q8fcwar33s2wvs1dm10fb8plxbz1q0jqcjs2ips6x"
},
"qtlottie": {
"url": "https://invent.kde.org/qt/qt/qtlottie.git",
- "rev": "76bc48eedf60c5f98ff9eb378fc8ce16b053bc32",
- "sha256": "00ps9rl4yykbqqqhgnph8090rbq816kj90fb7nyrlr76f6zkjwnh"
+ "rev": "27ed5a3c95a0810a96fac2a8661ea94d8ea3c44e",
+ "sha256": "04ivyxnn8d3pkjsbx0gwyj3f5if4m4cih6wyavm8bd2m2kkszx35"
},
"qtmacextras": {
"url": "https://invent.kde.org/qt/qt/qtmacextras.git",
- "rev": "4ebefe8d375054d2244ad7197868cb004c5f99d5",
- "sha256": "0006gajlv8mn3gfp83jiy7pg9am86fa2yncn4fqrlv7q4ikqym3b"
+ "rev": "fc7e9f41d9cec2df05c1d38d6e55d3a0d501dd25",
+ "sha256": "07q1arvdjwmbrayp2b213b8gqm4psczhx9z1m83invwmbs8iqj07"
},
"qtmultimedia": {
"url": "https://invent.kde.org/qt/qt/qtmultimedia.git",
- "rev": "d342547886448dacf38d2933cd40322c7435ee86",
- "sha256": "1fyrwbcn9dh6hsqk4z48g4f00aizankjr63ah7nvnzv8y8wcz62p"
+ "rev": "ff83d119c75cd8406f73ccc08958fe36747e7390",
+ "sha256": "09jadnvphilcxxy85dlsr8a6x5w32r1c2hrbh93qbvvf9zlg60ld"
},
"qtnetworkauth": {
"url": "https://invent.kde.org/qt/qt/qtnetworkauth.git",
- "rev": "2653044915b3fb1941aa0f8b25af50343efcbff7",
- "sha256": "183cbrwxnp2c7shdqlbjmx4vvb097m67mh3m1mqb0d4xc8fggwa4"
+ "rev": "510687fa4fdee84dd3d6d166e8f080c484016199",
+ "sha256": "0a8abmql94wxpfvdj5a1rnh3xsd49c5z8x93hm311sgjkd0aajx7"
},
"qtpurchasing": {
"url": "https://invent.kde.org/qt/qt/qtpurchasing.git",
- "rev": "062778d6f80df1ba45b8697720eb781bd477c292",
- "sha256": "1hakq5aam1x9fpnnj8wavmr4f3bdm0q2kflix0ap9197hj7bvzhy"
+ "rev": "8e9a5ec9f68639162c85c198b28e072e7150883c",
+ "sha256": "04pmwqnw907dg0hpas0pdrh2fxcqn2mvqz82b1vkviksg8ny3saw"
},
"qtquick3d": {
"url": "https://invent.kde.org/qt/qt/qtquick3d.git",
- "rev": "de6e8026c116a47029f4307fd8a62b5f630f33bf",
- "sha256": "0w4i0ii7an8z6xiqg1v0i5dm6rp3mi08mhg99mys10996r8f67yr"
+ "rev": "47a325358078b72016081a86be628411df2728a9",
+ "sha256": "18h309g6ni6y4bcss930g04z8ymhl2nfm3sv5s4h2fz3dl0xsqwr"
},
"qtquickcontrols": {
"url": "https://invent.kde.org/qt/qt/qtquickcontrols.git",
- "rev": "37ee5e07e82296e24cc02c8bf6f31cb6bd8846b1",
- "sha256": "1xq1a9ci7qvlp5f0ydfx86yw1pk14zdm9262nw65bc1z4nx3qfhw"
+ "rev": "0c3c18bf8bdac1ef1afdb8aade903edb5c2bc041",
+ "sha256": "0h8bhrbgfcf7nbfppah8lxnhvygc09983qrvp935r5sw7251km4d"
},
"qtquickcontrols2": {
"url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git",
- "rev": "9bdcebd1c093b6f0886e3a739711470cc37b1adb",
- "sha256": "0ihwjw70cb59qvzbdyz9462n7d8f8mcnidkaph3qyqyblnx5rc6b"
+ "rev": "e464888c53a641ee44a34ff2350cfb156c8ed59f",
+ "sha256": "08lnqz6v48j1hi6dpll7a052p6r5qfb32md16fppqzn6g5jg9ir2"
},
"qtquicktimeline": {
"url": "https://invent.kde.org/qt/qt/qtquicktimeline.git",
- "rev": "c4f13dd78d6cf2df83335ad0328b892ce4b2ef70",
- "sha256": "075q6z6dd1aazpyf03bjmxn6j7lr5g8gjx02jgg2h077h9bdkw9j"
+ "rev": "43130f2681b76a8d743a04704465b716b6b2faee",
+ "sha256": "1z1avxxq9d9nzqyxy5pq5maj73cf6dvsn5k83p3sf5kq3x0y75cj"
},
"qtremoteobjects": {
"url": "https://invent.kde.org/qt/qt/qtremoteobjects.git",
- "rev": "e060a0990380134c054bde675d47db048fd3192f",
- "sha256": "0qsgixxy6rk8zv8kssfa19asg742y9syl9hc9dkqw0shywi6rm4k"
+ "rev": "b2740a7c7f5b6ac810240404a947ca5cff9de5f7",
+ "sha256": "1jxlwc2y165fxdalcr4iqq55gsg5x4nxqd8wdq3dc1824yfnzm6i"
},
"qtscxml": {
"url": "https://invent.kde.org/qt/qt/qtscxml.git",
- "rev": "2b7b19239671784fbf79d6dbc0e985da044ff9dd",
- "sha256": "1a67ihj2z4fc6r3y3z18244wswvhf5hshw72z7z9lmmcznls7921"
+ "rev": "57491f554bc53bd020978b5744437b7ac7e56a27",
+ "sha256": "00mvwgb3xr116nl7649zq7ai2074clzw760c140sy91zqgqkjsx4"
},
"qtsensors": {
"url": "https://invent.kde.org/qt/qt/qtsensors.git",
- "rev": "79ed5db98f36b8ca70b077edef46fc793debb3ab",
- "sha256": "1dzbcqsrl5wlc1r54jgz63i516iaj73g2g4476m8va6ip4zrxxnp"
+ "rev": "50a61b360877e7c1300df76b5aabf8d75554a398",
+ "sha256": "0giqwn4grg9999y31avh7ajsv9gkcfzf0xndx8bvv79si0wp59g6"
},
"qtserialbus": {
"url": "https://invent.kde.org/qt/qt/qtserialbus.git",
- "rev": "971adee604b772d79686126fe8b1e333824f67dc",
- "sha256": "0fdr81xj9mhyy7il3x2h87gv5qbjjy5rlps372s5qz97z8jdazy6"
+ "rev": "c23069351ec31563c9ea9fcdce42ccdba95ea518",
+ "sha256": "1qgxlgnl53gabrfqihxwygdbdiqjvn2hfajmwb3h44srpq0srk33"
},
"qtserialport": {
"url": "https://invent.kde.org/qt/qt/qtserialport.git",
- "rev": "9bb2b66259413ac4eda1ddf64209ef44412aa55d",
- "sha256": "1kpqjmipa2giv1rv1kg25knir9299pnh6gh8l87immnakwnp7q3n"
+ "rev": "b64a7eeda9b6a65b5ed01b1b40b07177f0aa4c0f",
+ "sha256": "134mn0njfvmzgrf325bikazkiq4xdn5wjhj56kxh1hhaz3q25hyp"
},
"qtspeech": {
"url": "https://invent.kde.org/qt/qt/qtspeech.git",
- "rev": "088b86a0e53ebb714c1276d041ab2c06fee58e6e",
- "sha256": "0qjpr91wlxq25n72yp5026hdwy560g35xk5419r7hz1snggbly4s"
+ "rev": "aa2376f9b1302222edcd16b4641bbd7004318c00",
+ "sha256": "0vcxgkymzhaw01f26zlny4bka9k829rwzkwk95rr3dfq7wlyxshz"
},
"qtsvg": {
"url": "https://invent.kde.org/qt/qt/qtsvg.git",
- "rev": "9c149213f46b844607cf7db8f800d906db3a682f",
- "sha256": "14ww7c66fs224gfkawjbb8gfrjfcj1ww90887c01504k7ipvlbwb"
+ "rev": "b74f7291f343dcbcb487b020868f042d8fe83098",
+ "sha256": "1n0sjn8h5k2sh8p2a85cxdpqbnd63gz4rf9wwbshhd13w623f9s8"
},
"qttools": {
"url": "https://invent.kde.org/qt/qt/qttools.git",
- "rev": "e02ce0dfa692913bd5dcc50917f7e21f5a41cd2b",
- "sha256": "0dmv4y2lzdkzj9in3w1cchn0hb637280zl17vnzzgcpj4jmyxm3b"
+ "rev": "fa40a2d3373b89be0cd0a43fe0c1d047e3d34058",
+ "sha256": "06kr88gmwc7xh1whdbcg84y1naak5rv99jkscjbhzyz3z91xy7hl"
},
"qttranslations": {
"url": "https://invent.kde.org/qt/qt/qttranslations.git",
- "rev": "fd567a42c1b566f22f339db758d29925fd2a8c60",
- "sha256": "14cxna8ql87b68wriqkda9bdrympv827cpng7pazjzglgk4lp97y"
+ "rev": "3cbcceb8e3e2e63a4022f1be946c7118c527a83e",
+ "sha256": "15lw5snqfkwwcsazh02lhiia39gy08nfijdpkzvll2qvg4b58zkn"
},
"qtvirtualkeyboard": {
"url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git",
- "rev": "0d229d587e578fb4a5144594b926d5d3138c407e",
- "sha256": "0q7xv7cg4i5aliwaydw7xshwcv1a1icbg58rlwv77vzla7vsyyga"
+ "rev": "859d2a6ee329cc08414410b2ef8c0af77a6853d3",
+ "sha256": "06sdpcanzp1a71d99rjivrbjp780mvwssc4w1sap2gskcmmgkwbs"
},
"qtwayland": {
"url": "https://invent.kde.org/qt/qt/qtwayland.git",
- "rev": "c1ac089f3f37ab172d8010b0fabf4007d62d1812",
- "sha256": "16wy4xml5k7bg48ai8777h95clny436lkr9vfcjzsbdlw17mgylw"
+ "rev": "df49b9f3badce793a0a9ea850cf1a02cc5bafef6",
+ "sha256": "01xm2r1pv7kxb4aj72ldfzmax6d799h6bj4h2xhpcii812wf5lda"
},
"qtwebchannel": {
"url": "https://invent.kde.org/qt/qt/qtwebchannel.git",
- "rev": "85ba097de9759efe5563156e43de1ad8473d5d54",
- "sha256": "0wkd2fvnwi3hpqpy95mjhkj0msi447302srrfxr9j4xp435dpp9p"
+ "rev": "2a157921861e651f43456cb7941b250c89feb736",
+ "sha256": "1w58b602f20mppd0zfr9yvfdn1xwfkfclnjs0p5mgymq6d946dyk"
},
"qtwebglplugin": {
"url": "https://invent.kde.org/qt/qt/qtwebglplugin.git",
- "rev": "adb24841f9fc2eea94f1d2636070411fcb6254b4",
- "sha256": "0ra0906g3cqavkl18qp79jghy5n9avwqwf4vqn9jsci5may1bmv5"
+ "rev": "b9aaac72d0853ba48f6bfd710a43df94d83d4701",
+ "sha256": "07zx55f52jgk31bm6c68iydknrih245ndnvz714l6kxw66fv4rjq"
},
"qtwebsockets": {
"url": "https://invent.kde.org/qt/qt/qtwebsockets.git",
- "rev": "db9cb84499229143506a9692fc65d3cb223b3978",
- "sha256": "1kp6gmzh00b07cdpsm062npgf10540aasyhmdqjh4zv9ggnf6dm6"
+ "rev": "0f910acb737cefc889ce1088fc60d15bc18efe9c",
+ "sha256": "1ba9ll28hznd6qpjjiqvc2z6gaz2qgq7105dd0w810xpbaiixy0a"
},
"qtwebview": {
"url": "https://invent.kde.org/qt/qt/qtwebview.git",
- "rev": "f16dadb6d147c46565537ede46518a352cdd87c9",
- "sha256": "0jm0wxblrlab3yizyrcip1s9n56mavpygfjivj27nmqwsycs8sfp"
+ "rev": "34342073a59f3a27ef3de02f6b21337c4f8db6cf",
+ "sha256": "1h6n7dkd6mjclxllyw2brz8wv4d68dx2ykckbwb3bkxyd6rmg1f6"
},
"qtwinextras": {
"url": "https://invent.kde.org/qt/qt/qtwinextras.git",
- "rev": "03d72f7b7df7892024f7a5a380305ad0347c1141",
- "sha256": "164q0d4dhpb3w1qks26qc79ph3y3h4diihcgc41d4kgmc7gi75s6"
+ "rev": "5e5ae2b77078dbe51fb798743de606e6f9a5e19d",
+ "sha256": "04x8ax197z0dr01nxrb6bh4q8c077ny5n812fx5mq56l54v2m1ks"
},
"qtx11extras": {
"url": "https://invent.kde.org/qt/qt/qtx11extras.git",
- "rev": "e6e7633bbd0efcc56035fef77f3f45efccf03a64",
- "sha256": "1h02f17cn6x19d4z37w9pvfivqm2c6qflrhm5n0fqydr1wwb6g3l"
+ "rev": "c44c4fa86fa0794c25baef4ee1f6272aca8c511a",
+ "sha256": "0287cvs9wqlzz6gnj81gi8rp50s2rdnigcmld3fgddsg8f3v7hdj"
},
"qtxmlpatterns": {
"url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git",
- "rev": "e645537910450ba8bf5ecfbb735f69acdeeef046",
- "sha256": "08lnchs0svgrv45zc3jwinkqzvd4crzzpipm9g1ql426clcdyq8n"
+ "rev": "0b644263abca66503db1ce8a4e126cf358a34685",
+ "sha256": "1b1zzglvcdp7wvlpgk1gj8gmyy2r21yi6p8xiyvbccq5bbjpn0hw"
}
}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix
index b3f1e58e14b4b..07b617c7b97dd 100644
--- a/pkgs/development/libraries/qt-5/5.15/srcs.nix
+++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix
@@ -5,7 +5,7 @@
}:
let
- version = "5.15.17";
+ version = "5.15.18";
mk = name: args: {
inherit version;
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 57f77518ed550..4974937053ca6 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -17,7 +17,6 @@
python3,
which,
# darwin support
- apple-sdk_14,
xcbuild,
dbus,
@@ -86,11 +85,6 @@ let
"linux-generic-g++"
else
throw "Please add a qtPlatformCross entry for ${plat.config}";
-
- # Per https://doc.qt.io/qt-5/macos.html#supported-versions: build SDK = 13.x or 14.x.
- darwinVersionInputs = [
- apple-sdk_14
- ];
in
stdenv.mkDerivation (
@@ -153,7 +147,6 @@ stdenv.mkDerivation (
++ lib.optionals (!stdenv.hostPlatform.isDarwin) (
lib.optional withLibinput libinput ++ lib.optional withGtk3 gtk3
)
- ++ lib.optional stdenv.hostPlatform.isDarwin darwinVersionInputs
++ lib.optional developerBuild gdb
++ lib.optional (cups != null) cups
++ lib.optional mysqlSupport libmysqlclient
diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix
index 165b4271c077b..fa21bb05c8647 100644
--- a/pkgs/development/libraries/qt-5/qtModule.nix
+++ b/pkgs/development/libraries/qt-5/qtModule.nix
@@ -3,7 +3,6 @@
stdenv,
buildPackages,
mkDerivation,
- apple-sdk_14,
perl,
qmake,
patches,
@@ -29,12 +28,7 @@ mkDerivation (
inherit pname version src;
patches = (args.patches or [ ]) ++ (patches.${pname} or [ ]);
- buildInputs =
- args.buildInputs or [ ]
- # Per https://doc.qt.io/qt-5/macos.html#supported-versions
- ++ lib.optionals stdenv.hostPlatform.isDarwin [
- apple-sdk_14
- ];
+ buildInputs = args.buildInputs or [ ];
nativeBuildInputs =
(args.nativeBuildInputs or [ ])
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
index b16805ed09c2b..ab35d1906f733 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
@@ -292,9 +292,6 @@ stdenv.mkDerivation rec {
# When this variable is not set, cmake tries to execute xcodebuild
# to query the version.
"-DQT_INTERNAL_XCODE_VERSION=0.1"
- # This should be removed once https://github.com/NixOS/nixpkgs/pull/455592 makes it to master
- # as it will become redundant.
- "-DCMAKE_FIND_FRAMEWORK=FIRST"
]
++ lib.optionals isCrossBuild [
"-DQT_HOST_PATH=${pkgsBuildBuild.qt6.qtbase}"
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 7f359ebacbdbe..b01d34047673a 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
+ fetchpatch,
perl,
which,
# Most packages depending on openblas expect integer width to match
@@ -198,6 +199,13 @@ stdenv.mkDerivation rec {
# Remove this once https://github.com/OpenMathLib/OpenBLAS/issues/5414 is
# resolved.
./disable-sme-sgemm-kernel.patch
+
+ # https://github.com/OpenMathLib/OpenBLAS/issues/5460
+ (fetchpatch {
+ name = "0001-openblas-Use-generic-kernels-for-SCAL-on-POWER4-5.patch";
+ url = "https://github.com/OpenMathLib/OpenBLAS/commit/14c9dcaac70d9382de00ba4418643d9587f4950e.patch";
+ hash = "sha256-mIOqRc7tE1rV/krrAu630JwApZHdeHCdVmO5j6eDC8U=";
+ })
];
postPatch = ''
diff --git a/pkgs/development/libraries/spandsp/3.nix b/pkgs/development/libraries/spandsp/3.nix
index 77126a7c4ceef..5a7f0005a407d 100644
--- a/pkgs/development/libraries/spandsp/3.nix
+++ b/pkgs/development/libraries/spandsp/3.nix
@@ -4,16 +4,19 @@
libjpeg,
}:
-(callPackage ./common.nix { }).overrideAttrs (previousAttrs: {
+((callPackage ./common.nix { }) {
version = "3.0.0";
src = fetchFromGitHub {
owner = "freeswitch";
- repo = previousAttrs.pname;
+ repo = "spandsp";
rev = "6ec23e5a7e411a22d59e5678d12c4d2942c4a4b6"; # upstream does not seem to believe in tags
sha256 = "03w0s99y3zibi5fnvn8lk92dggfgrr0mz5255745jfbz28b2d5y7";
};
-
- propagatedBuildInputs = previousAttrs.propagatedBuildInputs or [ ] ++ [
- libjpeg
- ];
-})
+}).overrideAttrs
+ (
+ finalAttrs: previousAttrs: {
+ propagatedBuildInputs = previousAttrs.propagatedBuildInputs or [ ] ++ [
+ libjpeg
+ ];
+ }
+ )
diff --git a/pkgs/development/libraries/spandsp/Check-for-feenableexcept-explicitly.patch b/pkgs/development/libraries/spandsp/Check-for-feenableexcept-explicitly.patch
new file mode 100644
index 0000000000000..a336732b9000d
--- /dev/null
+++ b/pkgs/development/libraries/spandsp/Check-for-feenableexcept-explicitly.patch
@@ -0,0 +1,132 @@
+From c0caa79a2aa6ac5b358f30719ff80ee2c6db51f7 Mon Sep 17 00:00:00 2001
+From: Alyssa Ross
+Date: Mon, 3 Nov 2025 12:06:15 +0100
+Subject: [PATCH] Check for feenableexcept() explicitly
+
+musl provides , but not the non-standard feenableexcept()
+function, so using feenableexcept() whenever was present
+caused build failures on musl. Instead, explicitly check for the
+non-standard function we want to use.
+---
+ configure.ac | 2 +-
+ tests/v17_tests.c | 6 +++---
+ tests/v27ter_tests.c | 6 +++---
+ tests/v29_tests.c | 6 +++---
+ 4 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index fa87245..a8864d8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -186,6 +186,7 @@ AC_CHECK_FUNCS([strstr])
+ AC_CHECK_FUNCS([strtol])
+ AC_CHECK_FUNCS([gettimeofday])
+ AC_CHECK_FUNCS([drand48])
++AC_CHECK_FUNCS([feenableexcept])
+
+ AC_HEADER_SYS_WAIT
+
+@@ -209,7 +210,6 @@ AC_CHECK_HEADERS([sys/select.h])
+ AC_CHECK_HEADERS([sys/ioctl.h])
+ AC_CHECK_HEADERS([sys/fcntl.h])
+ AC_CHECK_HEADERS([sndfile.h])
+-AC_CHECK_HEADERS([fenv.h])
+ AC_CHECK_HEADERS([fftw3.h], , [AC_CHECK_HEADERS([fftw.h])])
+ AC_CHECK_HEADERS([pcap.h])
+ AC_CHECK_HEADERS([pthread.h])
+diff --git a/tests/v17_tests.c b/tests/v17_tests.c
+index 17c7fcb..411396c 100644
+--- a/tests/v17_tests.c
++++ b/tests/v17_tests.c
+@@ -59,7 +59,7 @@ display of modem status is maintained.
+ #include
+ #include
+ #include
+-#if defined(HAVE_FENV_H)
++#if defined(HAVE_FEENABLEEXCEPT)
+ #define __USE_GNU
+ #include
+ #endif
+@@ -263,7 +263,7 @@ static void qam_report(void *user_data, const complexf_t *constel, const complex
+ }
+ /*- End of function --------------------------------------------------------*/
+
+-#if defined(HAVE_FENV_H)
++#if defined(HAVE_FEENABLEEXCEPT)
+ static void sigfpe_handler(int sig_num, siginfo_t *info, void *data)
+ {
+ switch (sig_num)
+@@ -425,7 +425,7 @@ int main(int argc, char *argv[])
+ inhandle = NULL;
+ outhandle = NULL;
+
+-#if defined(HAVE_FENV_H)
++#if defined(HAVE_FEENABLEEXCEPT)
+ fpe_trap_setup();
+ #endif
+
+diff --git a/tests/v27ter_tests.c b/tests/v27ter_tests.c
+index 14b06f8..f0559a4 100644
+--- a/tests/v27ter_tests.c
++++ b/tests/v27ter_tests.c
+@@ -58,7 +58,7 @@ display of modem status is maintained.
+ #include
+ #include
+ #include
+-#if defined(HAVE_FENV_H)
++#if defined(HAVE_FEENABLEEXCEPT)
+ #define __USE_GNU
+ #include
+ #endif
+@@ -286,7 +286,7 @@ static void qam_report(void *user_data, const complexf_t *constel, const complex
+ }
+ /*- End of function --------------------------------------------------------*/
+
+-#if defined(HAVE_FENV_H)
++#if defined(HAVE_FEENABLEEXCEPT)
+ static void sigfpe_handler(int sig_num, siginfo_t *info, void *data)
+ {
+ switch (sig_num)
+@@ -440,7 +440,7 @@ int main(int argc, char *argv[])
+ inhandle = NULL;
+ outhandle = NULL;
+
+-#if defined(HAVE_FENV_H)
++#if defined(HAVE_FEENABLEEXCEPT)
+ fpe_trap_setup();
+ #endif
+
+diff --git a/tests/v29_tests.c b/tests/v29_tests.c
+index 390663f..7a43797 100644
+--- a/tests/v29_tests.c
++++ b/tests/v29_tests.c
+@@ -58,7 +58,7 @@ display of modem status is maintained.
+ #include
+ #include
+ #include
+-#if defined(HAVE_FENV_H)
++#if defined(HAVE_FEENABLEEXCEPT)
+ #define __USE_GNU
+ #include
+ #endif
+@@ -257,7 +257,7 @@ static void qam_report(void *user_data, const complexf_t *constel, const complex
+ }
+ /*- End of function --------------------------------------------------------*/
+
+-#if defined(HAVE_FENV_H)
++#if defined(HAVE_FEENABLEEXCEPT)
+ static void sigfpe_handler(int sig_num, siginfo_t *info, void *data)
+ {
+ switch (sig_num)
+@@ -410,7 +410,7 @@ int main(int argc, char *argv[])
+ inhandle = NULL;
+ outhandle = NULL;
+
+-#if defined(HAVE_FENV_H)
++#if defined(HAVE_FEENABLEEXCEPT)
+ fpe_trap_setup();
+ #endif
+
+--
+2.51.0
+
diff --git a/pkgs/development/libraries/spandsp/Fix-tests-pcap_parse-build-on-musl.patch b/pkgs/development/libraries/spandsp/Fix-tests-pcap_parse-build-on-musl.patch
new file mode 100644
index 0000000000000..a7498ab1a63ea
--- /dev/null
+++ b/pkgs/development/libraries/spandsp/Fix-tests-pcap_parse-build-on-musl.patch
@@ -0,0 +1,28 @@
+From 5007684cd46fec39d3c8f67a222f2d34d48fd4b4 Mon Sep 17 00:00:00 2001
+From: Alyssa Ross
+Date: Mon, 3 Nov 2025 12:07:48 +0100
+Subject: [PATCH] Fix tests/pcap_parse build on musl
+
+musl only defines the Linux-style struct udphdr member names if
+_GNU_SOURCE is defined, so do that, like certain other tests already
+do.
+---
+ tests/pcap_parse.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tests/pcap_parse.c b/tests/pcap_parse.c
+index 4e79743..a8a69a3 100644
+--- a/tests/pcap_parse.c
++++ b/tests/pcap_parse.c
+@@ -31,6 +31,8 @@
+ #include "config.h"
+ #endif
+
++#define _GNU_SOURCE
++
+ #include
+ #include
+ #include
+--
+2.51.0
+
diff --git a/pkgs/development/libraries/spandsp/common.nix b/pkgs/development/libraries/spandsp/common.nix
index 7abfee0668c5d..317e5494f7902 100644
--- a/pkgs/development/libraries/spandsp/common.nix
+++ b/pkgs/development/libraries/spandsp/common.nix
@@ -5,11 +5,28 @@
libtiff,
buildPackages,
fetchpatch,
- autoreconfHook,
+ autoconf,
+ automake,
+ fftw,
+ libpcap,
+ libsndfile,
+ libtool,
+ libxml2,
+ netpbm,
+ sox,
+ util-linux,
+ which,
+}:
+
+{
+ version,
+ src,
+ patches ? [ ],
}:
stdenv.mkDerivation (finalAttrs: {
pname = "spandsp";
+ inherit version src;
patches = [
# submitted upstream: https://github.com/freeswitch/spandsp/pull/47
@@ -17,41 +34,185 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://github.com/freeswitch/spandsp/commit/1f810894804d3fa61ab3fc2f3feb0599145a3436.patch";
hash = "sha256-Cf8aaoriAvchh5cMb75yP2gsZbZaOLha/j5mq3xlkVA=";
})
- ];
+
+ # https://github.com/freeswitch/spandsp/pull/110
+ ./Check-for-feenableexcept-explicitly.patch
+
+ # https://github.com/freeswitch/spandsp/pull/111
+ ./Fix-tests-pcap_parse-build-on-musl.patch
+ ]
+ ++ patches;
+
+ postPatch = ''
+ patchShebangs autogen.sh
+
+ # pkg-config? What's that?
+ # Actually *check* the value given for --{en,dis}able-tests, not just whether the option was passed
+ substituteInPlace configure.ac \
+ --replace-fail '$xml2_include_dir /usr/include /usr/local/include /usr/include/libxml2 /usr/local/include/libxml2' '$xml2_include_dir ${lib.getDev libxml2}/include ${lib.getDev libxml2}/include/libxml2 /usr/local/include/libxml2' \
+ --replace-fail 'if test -n "$enable_tests" ; then' 'if test "$enable_tests" = "yes" ; then'
+ '';
outputs = [
"out"
"dev"
];
- nativeBuildInputs = [ autoreconfHook ];
+ strictDeps = true;
+
+ nativeBuildInputs = [
+ autoconf
+ automake
+ libtool
+ util-linux
+ which
+ ];
+
depsBuildBuild = [ buildPackages.stdenv.cc ];
+
propagatedBuildInputs = [
audiofile
libtiff
];
+ nativeCheckInputs = [
+ libtiff
+ netpbm
+ sox
+ ];
+
+ checkInputs = [
+ fftw
+ libpcap
+ libsndfile
+ libxml2
+ ];
+
+ preConfigure = ''
+ ./autogen.sh
+ '';
+
configureFlags = [
+ (lib.strings.enableFeature finalAttrs.finalPackage.doCheck "tests")
+
# This flag is required to prevent linking error in the cross-compilation case.
# I think it's fair to assume that realloc(NULL, size) will return a valid memory
# block for most libc implementation, so let's just assume that and hope for the best.
"ac_cv_func_malloc_0_nonnull=yes"
];
- enableParallelBuilding = true;
+ # Issues with test asset generation under heavy parallelism
+ enableParallelBuilding = false;
makeFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
"CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/cc"
];
- strictDeps = true;
+ env.NIX_CFLAGS_COMPILE = toString [
+ # Missing const conversion on some calls
+ "-Wno-error=incompatible-pointer-types"
+ ];
+
+ hardeningDisable = lib.optionals (lib.strings.versionOlder finalAttrs.version "3.0.0") [
+ "format"
+ ];
+
+ doCheck =
+ stdenv.buildPlatform.canExecute stdenv.hostPlatform
+ # Compat with i.e. Clang improved by 0446f4e0c72553f3ea9b50c5333ece6ac980e58d, too big to apply
+ && stdenv.cc.isGNU;
+
+ disabledTests = [
+ # Need proprietary recordings that aren't included
+ "ademco_contactid_tests"
+ "dtmf_rx_tests"
+ "g722_tests"
+ "g726_tests"
+ "gsm0610_tests"
+ "modem_connect_tones_tests"
+ "sig_tone_tests"
+ "t42_tests"
+ "t43_tests"
+ "v42bis_tests"
+
+ # Fails to initialise modem.
+ "data_modems_tests"
+
+ # ERROR PTY Fatal error: failed to create /dev/spandsp/0 symbolic link
+ "dummy_modems_tests" # needs extra setup, but eventually runs into the above error
+ "pseudo_terminal_tests"
+
+ # Hangs. Maybe needs setup / some interaction
+ "fax_tests"
+
+ # Needs an input file, unsure what's suitable
+ "playout_tests"
+
+ # Borked in the packaged versions due to missing audio file - copy-pasting mistake
+ # Maybe fixed after 5394b2cae6c482ccb835335b769469977e6802ae, but too big to apply
+ "super_tone_rx_tests"
+
+ # Stuck
+ "t31_pseudo_terminal_tests"
+
+ # Generated signal has more than the expected maximum samples - 441 vs 422
+ "time_scale_tests"
+
+ # Test failed - -16dBm0 of noise, signal is 9056.993164 (11440.279297)
+ "tone_detect_tests"
+
+ # Fails due to result different from reference
+ "v18_tests"
+
+ # Seemingly runs forever, with tons of output
+ "v22bis_tests"
+ ];
+
+ checkPhase = ''
+ runHook preCheck
+
+ pushd tests
+
+ for test in *_tests; do
+ testArgs=()
+ case "$test" in
+ # Skipped tests
+ ${lib.strings.concatStringsSep "|" finalAttrs.disabledTests})
+ echo "Skipping $test"
+ continue
+ ;;
+
+ # Needs list of subtests to run
+ echo_tests)
+ testArgs+=(
+ sanity 2a 2b 2ca 3a 3ba 3bb 3c 4 5 6 7 8 9 10a 10b 10c 11 12 13 14 15
+ )
+ # Fallthough for running the test
+ ;;&
+
+ *)
+ echo "Running $test"
+ if ! ./"$test" "''${testArgs[@]}" >"$test".log 2>&1; then
+ echo "$test failed! Output:"
+ cat "$test".log
+ exit 1
+ fi
+ ;;
+ esac
+ done
+
+ popd
+
+ runHook postCheck
+ '';
meta = {
description = "Portable and modular SIP User-Agent with audio and video support";
homepage = "https://github.com/freeswitch/spandsp";
platforms = with lib.platforms; unix;
maintainers = with lib.maintainers; [ misuzu ];
+ teams = [ lib.teams.ngi ];
license = lib.licenses.gpl2;
downloadPage = "http://www.soft-switch.org/downloads/spandsp/";
};
diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix
index 991b9cd8ba17c..87996abdeeb0a 100644
--- a/pkgs/development/libraries/spandsp/default.nix
+++ b/pkgs/development/libraries/spandsp/default.nix
@@ -1,12 +1,46 @@
{
fetchurl,
+ fetchpatch,
callPackage,
+ lib,
+ stdenv,
}:
-(callPackage ./common.nix { }).overrideAttrs (_: rec {
+(callPackage ./common.nix { }) rec {
version = "0.0.6";
src = fetchurl {
url = "https://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz";
sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc";
};
-})
+ patches = [
+ # FIXME: clean up rebuild avoidance on staging.
+ (
+ if
+ lib.elem stdenv.hostPlatform.config [
+ "arm64-apple-darwin"
+ "aarch64-unknown-linux-gnu"
+ "x86_64-apple-darwin"
+ "x86_64-unknown-linux-gnu"
+ ]
+ then
+ fetchpatch {
+ url = "https://github.com/freeswitch/spandsp/commit/f7b96b08db148763039cf3459d0e00da9636eb92.patch";
+ includes = [ "spandsp-sim/g1050.c" ];
+ hash = "sha256-TwMhWJXQG/UaWddWgice0klp1uATyHMiE6DcsCebXYQ=";
+ }
+ else
+ fetchpatch {
+ url = "https://github.com/freeswitch/spandsp/commit/f7b96b08db148763039cf3459d0e00da9636eb92.patch";
+ includes = [
+ "spandsp-sim/g1050.c"
+ "spandsp-sim/test_utils.c"
+ ];
+ hash = "sha256-2MmVgyMUK0Zn+mL7IX57Y7brYpgmt4GVlis5/NstuNM=";
+ }
+ )
+ (fetchpatch {
+ url = "https://github.com/freeswitch/spandsp/commit/f47bcdc301fbddad44e918939eed1b361882f740.patch";
+ hash = "sha256-O+lIC3V92GVFoiHsUQOXkoTN2hJ7v5+LQP7RrAhvwlY=";
+ })
+ ];
+}
diff --git a/pkgs/development/ocaml-modules/b0/default.nix b/pkgs/development/ocaml-modules/b0/default.nix
index a6c0bb4327d84..f18002ccfc133 100644
--- a/pkgs/development/ocaml-modules/b0/default.nix
+++ b/pkgs/development/ocaml-modules/b0/default.nix
@@ -9,57 +9,51 @@
cmdliner,
}:
-let
-
-in
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
- "b0 is not available for OCaml ${ocaml.version}"
-
- stdenv.mkDerivation
- rec {
-
- pname = "ocaml${ocaml.version}-b0";
- version = "0.0.5";
-
- src = fetchurl {
- url = "${meta.homepage}/releases/b0-${version}.tbz";
- sha256 = "sha256-ty04JQcP4RCme/VQw0ko2IBebWWX5cBU6nRTTeV1I/I=";
- };
-
- strictDeps = true;
-
- nativeBuildInputs = [
- ocaml
- findlib
- ocamlbuild
- topkg
- ];
- buildInputs = [
- topkg
- cmdliner
- ];
-
- inherit (topkg) buildPhase installPhase;
-
- meta = with lib; {
- description = "Software construction and deployment kit";
- longDescription = ''
- WARNING this package is unstable and work in progress, do not depend on
- it.
- B0 describes software construction and deployments using modular and
- customizable definitions written in OCaml. B0 describes:
- * Build environments.
- * Software configuration, build and testing.
- * Source and binary deployments.
- * Software life-cycle procedures.
- B0 also provides the B00 build library which provides abitrary build
- abstraction with reliable and efficient incremental rebuilds. The B00
- library can be – and has been – used on its own to devise domain specific
- build systems.
- '';
- homepage = "https://erratique.ch/software/b0";
- inherit (ocaml.meta) platforms;
- license = licenses.isc;
- maintainers = [ maintainers.Julow ];
- };
- }
+stdenv.mkDerivation rec {
+
+ pname = "ocaml${ocaml.version}-b0";
+ version = "0.0.5";
+
+ src = fetchurl {
+ url = "${meta.homepage}/releases/b0-${version}.tbz";
+ sha256 = "sha256-ty04JQcP4RCme/VQw0ko2IBebWWX5cBU6nRTTeV1I/I=";
+ };
+
+ strictDeps = true;
+
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ocamlbuild
+ topkg
+ ];
+ buildInputs = [
+ topkg
+ cmdliner
+ ];
+
+ inherit (topkg) buildPhase installPhase;
+
+ meta = with lib; {
+ description = "Software construction and deployment kit";
+ longDescription = ''
+ WARNING this package is unstable and work in progress, do not depend on
+ it.
+ B0 describes software construction and deployments using modular and
+ customizable definitions written in OCaml. B0 describes:
+ * Build environments.
+ * Software configuration, build and testing.
+ * Source and binary deployments.
+ * Software life-cycle procedures.
+ B0 also provides the B00 build library which provides abitrary build
+ abstraction with reliable and efficient incremental rebuilds. The B00
+ library can be – and has been – used on its own to devise domain specific
+ build systems.
+ '';
+ homepage = "https://erratique.ch/software/b0";
+ inherit (ocaml.meta) platforms;
+ license = licenses.isc;
+ maintainers = [ maintainers.Julow ];
+ broken = !(lib.versionAtLeast ocaml.version "4.08");
+ };
+}
diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix
index 4120f81a1a020..57fc0f2085890 100644
--- a/pkgs/development/ocaml-modules/bap/default.nix
+++ b/pkgs/development/ocaml-modules/bap/default.nix
@@ -42,111 +42,108 @@
z3,
}:
-if lib.versionOlder ocaml.version "4.08" then
- throw "BAP is not available for OCaml ${ocaml.version}"
-else
+stdenv.mkDerivation rec {
+ pname = "ocaml${ocaml.version}-bap";
+ version = "2.5.0+pr1621";
+ src = fetchFromGitHub {
+ owner = "BinaryAnalysisPlatform";
+ repo = "bap";
+ rev = "65c282d94e8b7028e8a986c637db3a2378a753f6";
+ hash = "sha256-LUZZOgG1T8xa5jLA/fDft8ofYb/Yf6QjTrl6AlLY7H0=";
+ };
- stdenv.mkDerivation rec {
- pname = "ocaml${ocaml.version}-bap";
- version = "2.5.0+pr1621";
- src = fetchFromGitHub {
- owner = "BinaryAnalysisPlatform";
- repo = "bap";
- rev = "65c282d94e8b7028e8a986c637db3a2378a753f6";
- hash = "sha256-LUZZOgG1T8xa5jLA/fDft8ofYb/Yf6QjTrl6AlLY7H0=";
- };
+ sigs = fetchurl {
+ url = "https://github.com/BinaryAnalysisPlatform/bap/releases/download/v${version}/sigs.zip";
+ sha256 = "0d69jd28z4g64mglq94kj5imhmk5f6sgcsh9q2nij3b0arpcliwk";
+ };
- sigs = fetchurl {
- url = "https://github.com/BinaryAnalysisPlatform/bap/releases/download/v${version}/sigs.zip";
- sha256 = "0d69jd28z4g64mglq94kj5imhmk5f6sgcsh9q2nij3b0arpcliwk";
- };
+ createFindlibDestdir = true;
- createFindlibDestdir = true;
+ setupHook = writeText "setupHook.sh" ''
+ export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/ocaml${ocaml.version}-bap-${version}/"
+ export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/ocaml${ocaml.version}-bap-${version}-llvm-plugins/"
+ '';
- setupHook = writeText "setupHook.sh" ''
- export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/ocaml${ocaml.version}-bap-${version}/"
- export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/ocaml${ocaml.version}-bap-${version}-llvm-plugins/"
- '';
+ nativeBuildInputs = [
+ which
+ makeWrapper
+ ocaml
+ findlib
+ ocamlbuild
+ ocaml_oasis
+ ];
- nativeBuildInputs = [
- which
- makeWrapper
- ocaml
- findlib
- ocamlbuild
- ocaml_oasis
- ];
+ buildInputs = [
+ ocamlbuild
+ linenoise
+ ounit
+ ppx_bitstring
+ z3
+ utop
+ libxml2
+ ncurses
+ ];
- buildInputs = [
- ocamlbuild
- linenoise
- ounit
- ppx_bitstring
- z3
- utop
- libxml2
- ncurses
- ];
+ propagatedBuildInputs = [
+ bitstring
+ camlzip
+ cmdliner
+ ppx_bap
+ core_kernel
+ ezjsonm
+ fileutils
+ jane_rope
+ mmap
+ lwt
+ ocamlgraph
+ ocurl
+ re
+ uri
+ zarith
+ piqi
+ parsexp
+ piqi-ocaml
+ uuidm
+ frontc
+ yojson
+ ];
- propagatedBuildInputs = [
- bitstring
- camlzip
- cmdliner
- ppx_bap
- core_kernel
- ezjsonm
- fileutils
- jane_rope
- mmap
- lwt
- ocamlgraph
- ocurl
- re
- uri
- zarith
- piqi
- parsexp
- piqi-ocaml
- uuidm
- frontc
- yojson
- ];
+ installPhase = ''
+ runHook preInstall
+ export OCAMLPATH=$OCAMLPATH:$OCAMLFIND_DESTDIR;
+ export PATH=$PATH:$out/bin
+ export CAML_LD_LIBRARY_PATH=''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}$OCAMLFIND_DESTDIR/bap-plugin-llvm/:$OCAMLFIND_DESTDIR/bap/
+ mkdir -p $out/lib/bap
+ make install
+ rm $out/bin/baptop
+ makeWrapper ${utop}/bin/utop $out/bin/baptop --prefix OCAMLPATH : $OCAMLPATH --prefix PATH : $PATH --add-flags "-ppx ppx-bap -short-paths -require \"bap.top\""
+ wrapProgram $out/bin/bapbuild --prefix OCAMLPATH : $OCAMLPATH --prefix PATH : $PATH
+ ln -s $sigs $out/share/bap/sigs.zip
+ runHook postInstall
+ '';
- installPhase = ''
- runHook preInstall
- export OCAMLPATH=$OCAMLPATH:$OCAMLFIND_DESTDIR;
- export PATH=$PATH:$out/bin
- export CAML_LD_LIBRARY_PATH=''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}$OCAMLFIND_DESTDIR/bap-plugin-llvm/:$OCAMLFIND_DESTDIR/bap/
- mkdir -p $out/lib/bap
- make install
- rm $out/bin/baptop
- makeWrapper ${utop}/bin/utop $out/bin/baptop --prefix OCAMLPATH : $OCAMLPATH --prefix PATH : $PATH --add-flags "-ppx ppx-bap -short-paths -require \"bap.top\""
- wrapProgram $out/bin/bapbuild --prefix OCAMLPATH : $OCAMLPATH --prefix PATH : $PATH
- ln -s $sigs $out/share/bap/sigs.zip
- runHook postInstall
- '';
+ disableIda = "--disable-ida";
+ disableGhidra = "--disable-ghidra";
- disableIda = "--disable-ida";
- disableGhidra = "--disable-ghidra";
+ patches = [
+ ./curses_is_ncurses.patch
+ ];
- patches = [
- ./curses_is_ncurses.patch
- ];
+ preConfigure = ''
+ substituteInPlace oasis/monads --replace-warn core_kernel.rope jane_rope
+ '';
- preConfigure = ''
- substituteInPlace oasis/monads --replace-warn core_kernel.rope jane_rope
- '';
+ configureFlags = [
+ "--enable-everything ${disableIda} ${disableGhidra}"
+ "--with-llvm-config=${llvm.dev}/bin/llvm-config"
+ ];
- configureFlags = [
- "--enable-everything ${disableIda} ${disableGhidra}"
- "--with-llvm-config=${llvm.dev}/bin/llvm-config"
- ];
-
- meta = with lib; {
- description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages";
- homepage = "https://github.com/BinaryAnalysisPlatform/bap/";
- license = licenses.mit;
- maintainers = [ maintainers.maurer ];
- mainProgram = "bap";
- };
- }
+ meta = with lib; {
+ description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages";
+ homepage = "https://github.com/BinaryAnalysisPlatform/bap/";
+ license = licenses.mit;
+ maintainers = [ maintainers.maurer ];
+ mainProgram = "bap";
+ broken = lib.versionOlder ocaml.version "4.08";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/bitstring/ppx.nix b/pkgs/development/ocaml-modules/bitstring/ppx.nix
index 18055887c8c66..9215c8293d280 100644
--- a/pkgs/development/ocaml-modules/bitstring/ppx.nix
+++ b/pkgs/development/ocaml-modules/bitstring/ppx.nix
@@ -8,28 +8,25 @@
ounit,
}:
-if lib.versionOlder ppxlib.version "0.18.0" then
- throw "ppx_bitstring is not available with ppxlib-${ppxlib.version}"
-else
+buildDunePackage {
+ pname = "ppx_bitstring";
+ inherit (bitstring) version src;
- buildDunePackage {
- pname = "ppx_bitstring";
- inherit (bitstring) version src;
+ patches = lib.optional (lib.versionAtLeast ppxlib.version "0.36") (fetchpatch {
+ url = "https://github.com/xguerin/bitstring/commit/b42d4924cbb5ec5fd5309e6807852b63f456f35d.patch";
+ hash = "sha256-wtpSnGOzIUTmB3LhyHGopecy7F/5SYFOwaR6eReV+6g=";
+ });
- patches = lib.optional (lib.versionAtLeast ppxlib.version "0.36") (fetchpatch {
- url = "https://github.com/xguerin/bitstring/commit/b42d4924cbb5ec5fd5309e6807852b63f456f35d.patch";
- hash = "sha256-wtpSnGOzIUTmB3LhyHGopecy7F/5SYFOwaR6eReV+6g=";
- });
+ buildInputs = [
+ bitstring
+ ppxlib
+ ];
- buildInputs = [
- bitstring
- ppxlib
- ];
+ doCheck = lib.versionAtLeast ocaml.version "4.08";
+ checkInputs = [ ounit ];
- doCheck = lib.versionAtLeast ocaml.version "4.08";
- checkInputs = [ ounit ];
-
- meta = bitstring.meta // {
- description = "Bitstrings and bitstring matching for OCaml - PPX extension";
- };
- }
+ meta = bitstring.meta // {
+ description = "Bitstrings and bitstring matching for OCaml - PPX extension";
+ broken = lib.versionOlder ppxlib.version "0.18.0";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/brisk-reconciler/default.nix b/pkgs/development/ocaml-modules/brisk-reconciler/default.nix
index d99e050d76427..aa918ae4d6747 100644
--- a/pkgs/development/ocaml-modules/brisk-reconciler/default.nix
+++ b/pkgs/development/ocaml-modules/brisk-reconciler/default.nix
@@ -8,11 +8,7 @@
}:
let
- version =
- if lib.versionAtLeast ocaml.version "5.3" then
- throw "brisk-reconciler is not available for OCaml ${ocaml.version}"
- else
- "1.0.0-alpha1";
+ version = "1.0.0-alpha1";
in
buildDunePackage {
@@ -42,5 +38,6 @@ buildDunePackage {
homepage = "https://github.com/briskml/brisk-reconciler";
maintainers = with lib.maintainers; [ momeemt ];
license = lib.licenses.mit;
+ broken = lib.versionAtLeast ocaml.version "5.3";
};
}
diff --git a/pkgs/development/ocaml-modules/bz2/default.nix b/pkgs/development/ocaml-modules/bz2/default.nix
index 4fabc34188858..3d096571e86e9 100644
--- a/pkgs/development/ocaml-modules/bz2/default.nix
+++ b/pkgs/development/ocaml-modules/bz2/default.nix
@@ -8,44 +8,41 @@
autoreconfHook,
}:
-if lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "5.0" then
- throw "bz2 is not available for OCaml ${ocaml.version}"
-else
-
- stdenv.mkDerivation rec {
- pname = "ocaml${ocaml.version}-bz2";
- version = "0.7.0";
-
- src = fetchFromGitLab {
- owner = "irill";
- repo = "camlbz2";
- rev = version;
- sha256 = "sha256-jBFEkLN2fbC3LxTu7C0iuhvNg64duuckBHWZoBxrV/U=";
- };
-
- autoreconfFlags = [
- "-I"
- "."
- ];
-
- nativeBuildInputs = [
- autoreconfHook
- ocaml
- findlib
- ];
-
- propagatedBuildInputs = [
- bzip2
- ];
-
- strictDeps = true;
-
- preInstall = "mkdir -p $OCAMLFIND_DESTDIR/stublibs";
-
- meta = with lib; {
- description = "OCaml bindings for the libbz2 (AKA, bzip2) (de)compression library";
- downloadPage = "https://gitlab.com/irill/camlbz2";
- license = licenses.lgpl21;
- maintainers = [ ];
- };
- }
+stdenv.mkDerivation rec {
+ pname = "ocaml${ocaml.version}-bz2";
+ version = "0.7.0";
+
+ src = fetchFromGitLab {
+ owner = "irill";
+ repo = "camlbz2";
+ rev = version;
+ sha256 = "sha256-jBFEkLN2fbC3LxTu7C0iuhvNg64duuckBHWZoBxrV/U=";
+ };
+
+ autoreconfFlags = [
+ "-I"
+ "."
+ ];
+
+ nativeBuildInputs = [
+ autoreconfHook
+ ocaml
+ findlib
+ ];
+
+ propagatedBuildInputs = [
+ bzip2
+ ];
+
+ strictDeps = true;
+
+ preInstall = "mkdir -p $OCAMLFIND_DESTDIR/stublibs";
+
+ meta = with lib; {
+ description = "OCaml bindings for the libbz2 (AKA, bzip2) (de)compression library";
+ downloadPage = "https://gitlab.com/irill/camlbz2";
+ license = licenses.lgpl21;
+ broken = lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "5.0";
+ maintainers = [ ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix
index 3bd8856bf1ce4..65eafc11744d0 100644
--- a/pkgs/development/ocaml-modules/camlpdf/default.nix
+++ b/pkgs/development/ocaml-modules/camlpdf/default.nix
@@ -6,36 +6,33 @@
findlib,
}:
-if lib.versionOlder ocaml.version "4.10" then
- throw "camlpdf is not available for OCaml ${ocaml.version}"
-else
+stdenv.mkDerivation rec {
+ version = "2.8";
+ pname = "ocaml${ocaml.version}-camlpdf";
- stdenv.mkDerivation rec {
- version = "2.8";
- pname = "ocaml${ocaml.version}-camlpdf";
+ src = fetchFromGitHub {
+ owner = "johnwhitington";
+ repo = "camlpdf";
+ rev = "v${version}";
+ hash = "sha256-+SFuFqlrP0nwm199y0QFWYvlwD+Cbh0PHA5bmXIWdNk=";
+ };
- src = fetchFromGitHub {
- owner = "johnwhitington";
- repo = "camlpdf";
- rev = "v${version}";
- hash = "sha256-+SFuFqlrP0nwm199y0QFWYvlwD+Cbh0PHA5bmXIWdNk=";
- };
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ];
- nativeBuildInputs = [
- ocaml
- findlib
- ];
+ strictDeps = true;
- strictDeps = true;
+ preInstall = ''
+ mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs
+ '';
- preInstall = ''
- mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs
- '';
-
- meta = with lib; {
- description = "OCaml library for reading, writing and modifying PDF files";
- homepage = "https://github.com/johnwhitington/camlpdf";
- license = licenses.lgpl21Plus;
- maintainers = with maintainers; [ vbgl ];
- };
- }
+ meta = with lib; {
+ description = "OCaml library for reading, writing and modifying PDF files";
+ homepage = "https://github.com/johnwhitington/camlpdf";
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ vbgl ];
+ broken = lib.versionOlder ocaml.version "4.10";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/cil/default.nix b/pkgs/development/ocaml-modules/cil/default.nix
index da1c0aa10c2b7..a0b36953bf47a 100644
--- a/pkgs/development/ocaml-modules/cil/default.nix
+++ b/pkgs/development/ocaml-modules/cil/default.nix
@@ -8,41 +8,38 @@
ocamlbuild,
}:
-if lib.versionAtLeast ocaml.version "4.06" then
- throw "cil is not available for OCaml ${ocaml.version}"
-else
-
- stdenv.mkDerivation rec {
- pname = "ocaml-cil";
- version = "1.7.3";
-
- src = fetchurl {
- url = "mirror://sourceforge/cil/cil-${version}.tar.gz";
- sha256 = "05739da0b0msx6kmdavr3y2bwi92jbh3szc35d7d8pdisa8g5dv9";
- };
-
- nativeBuildInputs = [
- perl
- ocaml
- findlib
- ocamlbuild
- ];
-
- strictDeps = true;
-
- createFindlibDestdir = true;
-
- preConfigure = ''
- substituteInPlace Makefile.in --replace 'MACHDEPCC=gcc' 'MACHDEPCC=$(CC)'
- export FORCE_PERL_PREFIX=1
- '';
- prefixKey = "-prefix=";
-
- meta = with lib; {
- homepage = "https://sourceforge.net/projects/cil/";
- description = "Front-end for the C programming language that facilitates program analysis and transformation";
- license = licenses.bsd3;
- maintainers = [ maintainers.vbgl ];
- platforms = ocaml.meta.platforms or [ ];
- };
- }
+stdenv.mkDerivation rec {
+ pname = "ocaml-cil";
+ version = "1.7.3";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/cil/cil-${version}.tar.gz";
+ sha256 = "05739da0b0msx6kmdavr3y2bwi92jbh3szc35d7d8pdisa8g5dv9";
+ };
+
+ nativeBuildInputs = [
+ perl
+ ocaml
+ findlib
+ ocamlbuild
+ ];
+
+ strictDeps = true;
+
+ createFindlibDestdir = true;
+
+ preConfigure = ''
+ substituteInPlace Makefile.in --replace 'MACHDEPCC=gcc' 'MACHDEPCC=$(CC)'
+ export FORCE_PERL_PREFIX=1
+ '';
+ prefixKey = "-prefix=";
+
+ meta = with lib; {
+ homepage = "https://sourceforge.net/projects/cil/";
+ description = "Front-end for the C programming language that facilitates program analysis and transformation";
+ license = licenses.bsd3;
+ maintainers = [ maintainers.vbgl ];
+ broken = lib.versionAtLeast ocaml.version "4.06";
+ platforms = ocaml.meta.platforms or [ ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/cmarkit/default.nix b/pkgs/development/ocaml-modules/cmarkit/default.nix
index 7589b9dd9a7f3..b4828756f5cdc 100644
--- a/pkgs/development/ocaml-modules/cmarkit/default.nix
+++ b/pkgs/development/ocaml-modules/cmarkit/default.nix
@@ -9,41 +9,38 @@
topkg,
}:
-if lib.versionOlder ocaml.version "4.14.0" then
- throw "cmarkit is not available for OCaml ${ocaml.version}"
-else
-
- stdenv.mkDerivation rec {
- pname = "cmarkit";
- version = "0.3.0";
-
- src = fetchurl {
- url = "https://erratique.ch/software/cmarkit/releases/cmarkit-${version}.tbz";
- hash = "sha256-RouM5iU7VeTT0+4yhBgdEmxROeP/X31iqDjd1VI7z5c=";
- };
-
- nativeBuildInputs = [
- ocaml
- findlib
- ocamlbuild
- topkg
- ];
-
- buildInputs = [
- topkg
- cmdliner
- ];
-
- strictDeps = true;
-
- inherit (topkg) buildPhase installPhase;
-
- meta = with lib; {
- description = "CommonMark parser and renderer for OCaml";
- homepage = "https://erratique.ch/software/cmarkit";
- changelog = "https://github.com/dbuenzli/cmarkit/blob/v${version}/CHANGES.md";
- license = licenses.isc;
- maintainers = [ ];
- inherit (ocaml.meta) platforms;
- };
- }
+stdenv.mkDerivation rec {
+ pname = "cmarkit";
+ version = "0.3.0";
+
+ src = fetchurl {
+ url = "https://erratique.ch/software/cmarkit/releases/cmarkit-${version}.tbz";
+ hash = "sha256-RouM5iU7VeTT0+4yhBgdEmxROeP/X31iqDjd1VI7z5c=";
+ };
+
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ocamlbuild
+ topkg
+ ];
+
+ buildInputs = [
+ topkg
+ cmdliner
+ ];
+
+ strictDeps = true;
+
+ inherit (topkg) buildPhase installPhase;
+
+ meta = with lib; {
+ description = "CommonMark parser and renderer for OCaml";
+ homepage = "https://erratique.ch/software/cmarkit";
+ changelog = "https://github.com/dbuenzli/cmarkit/blob/v${version}/CHANGES.md";
+ license = licenses.isc;
+ maintainers = [ ];
+ inherit (ocaml.meta) platforms;
+ broken = lib.versionOlder ocaml.version "4.14.0";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/cmdliner/1_0.nix b/pkgs/development/ocaml-modules/cmdliner/1_0.nix
index ee57846783f9c..32dbdff6a8fc2 100644
--- a/pkgs/development/ocaml-modules/cmdliner/1_0.nix
+++ b/pkgs/development/ocaml-modules/cmdliner/1_0.nix
@@ -5,8 +5,6 @@
ocaml,
}:
-assert (lib.versionAtLeast ocaml.version "4.03");
-
stdenv.mkDerivation rec {
pname = "cmdliner";
version = "1.0.4";
@@ -34,5 +32,6 @@ stdenv.mkDerivation rec {
license = licenses.isc;
inherit (ocaml.meta) platforms;
maintainers = [ maintainers.vbgl ];
+ broken = !(lib.versionAtLeast ocaml.version "4.03");
};
}
diff --git a/pkgs/development/ocaml-modules/cmdliner/1_1.nix b/pkgs/development/ocaml-modules/cmdliner/1_1.nix
index 31ec0e69ef2fe..521b9b53168c8 100644
--- a/pkgs/development/ocaml-modules/cmdliner/1_1.nix
+++ b/pkgs/development/ocaml-modules/cmdliner/1_1.nix
@@ -5,36 +5,33 @@
ocaml,
}:
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
- "cmdliner 1.1 is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+ pname = "cmdliner";
+ version = "1.3.0";
- stdenv.mkDerivation
- rec {
- pname = "cmdliner";
- version = "1.3.0";
+ src = fetchurl {
+ url = "https://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz";
+ sha256 = "sha256-joGA9XO0QPanqMII2rLK5KgjhP7HMtInhNG7bmQWjLs=";
+ };
- src = fetchurl {
- url = "https://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz";
- sha256 = "sha256-joGA9XO0QPanqMII2rLK5KgjhP7HMtInhNG7bmQWjLs=";
- };
+ nativeBuildInputs = [ ocaml ];
- nativeBuildInputs = [ ocaml ];
+ makeFlags = [ "PREFIX=$(out)" ];
+ installTargets = "install install-doc";
+ installFlags = [
+ "LIBDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/${pname}"
+ "DOCDIR=$(out)/share/doc/${pname}"
+ ];
+ postInstall = ''
+ mv $out/lib/ocaml/${ocaml.version}/site-lib/${pname}/{opam,${pname}.opam}
+ '';
- makeFlags = [ "PREFIX=$(out)" ];
- installTargets = "install install-doc";
- installFlags = [
- "LIBDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/${pname}"
- "DOCDIR=$(out)/share/doc/${pname}"
- ];
- postInstall = ''
- mv $out/lib/ocaml/${ocaml.version}/site-lib/${pname}/{opam,${pname}.opam}
- '';
-
- meta = with lib; {
- homepage = "https://erratique.ch/software/cmdliner";
- description = "OCaml module for the declarative definition of command line interfaces";
- license = licenses.isc;
- inherit (ocaml.meta) platforms;
- maintainers = [ maintainers.vbgl ];
- };
- }
+ meta = with lib; {
+ homepage = "https://erratique.ch/software/cmdliner";
+ description = "OCaml module for the declarative definition of command line interfaces";
+ license = licenses.isc;
+ inherit (ocaml.meta) platforms;
+ maintainers = [ maintainers.vbgl ];
+ broken = !(lib.versionAtLeast ocaml.version "4.08");
+ };
+}
diff --git a/pkgs/development/ocaml-modules/config-file/default.nix b/pkgs/development/ocaml-modules/config-file/default.nix
index 4bb913d544bf4..149425301a6d4 100644
--- a/pkgs/development/ocaml-modules/config-file/default.nix
+++ b/pkgs/development/ocaml-modules/config-file/default.nix
@@ -7,34 +7,31 @@
camlp4,
}:
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
- "config-file is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+ pname = "ocaml-config-file";
+ version = "1.2";
- stdenv.mkDerivation
- rec {
- pname = "ocaml-config-file";
- version = "1.2";
+ src = fetchurl {
+ url = "https://forge.ocamlcore.org/frs/download.php/1387/config-file-${version}.tar.gz";
+ sha256 = "1b02yxcnsjhr05ssh2br2ka4hxsjpdw34ldl3nk33wfnkwk7g67q";
+ };
- src = fetchurl {
- url = "https://forge.ocamlcore.org/frs/download.php/1387/config-file-${version}.tar.gz";
- sha256 = "1b02yxcnsjhr05ssh2br2ka4hxsjpdw34ldl3nk33wfnkwk7g67q";
- };
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ camlp4
+ ];
- nativeBuildInputs = [
- ocaml
- findlib
- camlp4
- ];
+ strictDeps = true;
- strictDeps = true;
+ createFindlibDestdir = true;
- createFindlibDestdir = true;
-
- meta = {
- homepage = "http://config-file.forge.ocamlcore.org/";
- platforms = ocaml.meta.platforms or [ ];
- description = "OCaml library used to manage the configuration file(s) of an application";
- license = lib.licenses.lgpl2Plus;
- maintainers = with lib.maintainers; [ vbgl ];
- };
- }
+ meta = {
+ homepage = "http://config-file.forge.ocamlcore.org/";
+ platforms = ocaml.meta.platforms or [ ];
+ description = "OCaml library used to manage the configuration file(s) of an application";
+ license = lib.licenses.lgpl2Plus;
+ broken = lib.versionAtLeast ocaml.version "5.0";
+ maintainers = with lib.maintainers; [ vbgl ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix
index 66823ce21fa18..8dff973a92e1e 100644
--- a/pkgs/development/ocaml-modules/cpdf/default.nix
+++ b/pkgs/development/ocaml-modules/cpdf/default.nix
@@ -7,44 +7,41 @@
camlpdf,
}:
-if lib.versionOlder ocaml.version "4.10" then
- throw "cpdf is not available for OCaml ${ocaml.version}"
-else
+stdenv.mkDerivation rec {
+ pname = "ocaml${ocaml.version}-cpdf";
+ version = "2.8";
- stdenv.mkDerivation rec {
- pname = "ocaml${ocaml.version}-cpdf";
- version = "2.8";
+ src = fetchFromGitHub {
+ owner = "johnwhitington";
+ repo = "cpdf-source";
+ rev = "v${version}";
+ hash = "sha256-DvTY5EQcvnL76RlQTcVqBiycqbCdGQCXzarSMH2P/pg=";
+ };
- src = fetchFromGitHub {
- owner = "johnwhitington";
- repo = "cpdf-source";
- rev = "v${version}";
- hash = "sha256-DvTY5EQcvnL76RlQTcVqBiycqbCdGQCXzarSMH2P/pg=";
- };
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ];
+ propagatedBuildInputs = [ camlpdf ];
- nativeBuildInputs = [
- ocaml
- findlib
- ];
- propagatedBuildInputs = [ camlpdf ];
+ strictDeps = true;
- strictDeps = true;
+ preInstall = ''
+ mkdir -p $OCAMLFIND_DESTDIR
+ mkdir -p $out/bin
+ cp cpdf $out/bin
+ mkdir -p $out/share/
+ cp -r doc $out/share
+ cp cpdfmanual.pdf $out/share/doc/cpdf/
+ '';
- preInstall = ''
- mkdir -p $OCAMLFIND_DESTDIR
- mkdir -p $out/bin
- cp cpdf $out/bin
- mkdir -p $out/share/
- cp -r doc $out/share
- cp cpdfmanual.pdf $out/share/doc/cpdf/
- '';
-
- meta = with lib; {
- description = "PDF Command Line Tools";
- homepage = "https://www.coherentpdf.com/";
- license = licenses.agpl3Only;
- maintainers = [ maintainers.vbgl ];
- mainProgram = "cpdf";
- inherit (ocaml.meta) platforms;
- };
- }
+ meta = with lib; {
+ description = "PDF Command Line Tools";
+ homepage = "https://www.coherentpdf.com/";
+ license = licenses.agpl3Only;
+ maintainers = [ maintainers.vbgl ];
+ mainProgram = "cpdf";
+ inherit (ocaml.meta) platforms;
+ broken = lib.versionOlder ocaml.version "4.10";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix
index 0876f4d987075..fe9bb02426456 100644
--- a/pkgs/development/ocaml-modules/cryptgps/default.nix
+++ b/pkgs/development/ocaml-modules/cryptgps/default.nix
@@ -6,40 +6,37 @@
findlib,
}:
-if lib.versionAtLeast ocaml.version "4.06" then
- throw "cryptgps is not available for OCaml ${ocaml.version}"
-else
-
- stdenv.mkDerivation {
- pname = "ocaml-cryptgps";
- version = "0.2.1";
-
- src = fetchurl {
- url = "http://download.camlcity.org/download/cryptgps-0.2.1.tar.gz";
- sha256 = "1mp7i42cm9w9grmcsa69m3h1ycpn6a48p43y4xj8rsc12x9nav3s";
- };
-
- nativeBuildInputs = [
- ocaml
- findlib
- ];
-
- strictDeps = true;
-
- dontConfigure = true; # Skip configure phase
-
- createFindlibDestdir = true;
-
- meta = {
- homepage = "http://projects.camlcity.org/projects/cryptgps.html";
- description = "Cryptographic functions for OCaml";
- longDescription = ''
- This library implements the symmetric cryptographic algorithms
- Blowfish, DES, and 3DES. The algorithms are written in O'Caml,
- i.e. this is not a binding to some C library, but the implementation
- itself.
- '';
- license = lib.licenses.mit;
- inherit (ocaml.meta) platforms;
- };
- }
+stdenv.mkDerivation {
+ pname = "ocaml-cryptgps";
+ version = "0.2.1";
+
+ src = fetchurl {
+ url = "http://download.camlcity.org/download/cryptgps-0.2.1.tar.gz";
+ sha256 = "1mp7i42cm9w9grmcsa69m3h1ycpn6a48p43y4xj8rsc12x9nav3s";
+ };
+
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ];
+
+ strictDeps = true;
+
+ dontConfigure = true; # Skip configure phase
+
+ createFindlibDestdir = true;
+
+ meta = {
+ homepage = "http://projects.camlcity.org/projects/cryptgps.html";
+ description = "Cryptographic functions for OCaml";
+ longDescription = ''
+ This library implements the symmetric cryptographic algorithms
+ Blowfish, DES, and 3DES. The algorithms are written in O'Caml,
+ i.e. this is not a binding to some C library, but the implementation
+ itself.
+ '';
+ license = lib.licenses.mit;
+ broken = lib.versionAtLeast ocaml.version "4.06";
+ inherit (ocaml.meta) platforms;
+ };
+}
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index 001656d6c65ad..38f02a0be2565 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -17,63 +17,59 @@
ocsipersist,
}:
-lib.throwIf (lib.versionAtLeast ocaml.version "5.3")
- "eliom is not available for OCaml ${ocaml.version}"
+buildDunePackage rec {
+ pname = "eliom";
+ version = "11.1.1";
- buildDunePackage
- rec {
- pname = "eliom";
- version = "11.1.1";
+ src = fetchFromGitHub {
+ owner = "ocsigen";
+ repo = "eliom";
+ rev = version;
+ hash = "sha256-ALuoyO6axNQEeBteBVIFwdoSrbLxxcaSTObAcLPGIvo=";
+ };
- src = fetchFromGitHub {
- owner = "ocsigen";
- repo = "eliom";
- rev = version;
- hash = "sha256-ALuoyO6axNQEeBteBVIFwdoSrbLxxcaSTObAcLPGIvo=";
- };
+ nativeBuildInputs = [
+ which
+ ];
+ buildInputs = [
+ js_of_ocaml-ocamlbuild
+ js_of_ocaml-ppx_deriving_json
+ ppx_optcomp
+ ];
- nativeBuildInputs = [
- which
- ];
- buildInputs = [
- js_of_ocaml-ocamlbuild
- js_of_ocaml-ppx_deriving_json
- ppx_optcomp
- ];
+ propagatedBuildInputs = [
+ js_of_ocaml-lwt
+ js_of_ocaml-ppx
+ js_of_ocaml-tyxml
+ lwt_ppx
+ lwt_react
+ ocsigen_server
+ ocsipersist
+ ppx_deriving
+ ];
- propagatedBuildInputs = [
- js_of_ocaml-lwt
- js_of_ocaml-ppx
- js_of_ocaml-tyxml
- lwt_ppx
- lwt_react
- ocsigen_server
- ocsipersist
- ppx_deriving
- ];
+ strictDeps = true;
- strictDeps = true;
+ setupHook = [ ./setup-hook.sh ];
- setupHook = [ ./setup-hook.sh ];
+ meta = {
+ homepage = "http://ocsigen.org/eliom/";
+ description = "OCaml Framework for programming Web sites and client/server Web applications";
- meta = {
- homepage = "http://ocsigen.org/eliom/";
- description = "OCaml Framework for programming Web sites and client/server Web applications";
+ longDescription = ''
+ Eliom is a framework for programming Web sites
+ and client/server Web applications. It introduces new concepts to
+ simplify programming common behaviours and uses advanced static
+ typing features of OCaml to check many properties of the Web site
+ at compile time. If you want to write a Web application, Eliom
+ makes possible to write the whole application as a single program
+ (client and server parts). A syntax extension is used to
+ distinguish both parts and the client side is compiled to JS using
+ Ocsigen Js_of_ocaml.
+ '';
- longDescription = ''
- Eliom is a framework for programming Web sites
- and client/server Web applications. It introduces new concepts to
- simplify programming common behaviours and uses advanced static
- typing features of OCaml to check many properties of the Web site
- at compile time. If you want to write a Web application, Eliom
- makes possible to write the whole application as a single program
- (client and server parts). A syntax extension is used to
- distinguish both parts and the client side is compiled to JS using
- Ocsigen Js_of_ocaml.
- '';
-
- license = lib.licenses.lgpl21;
-
- maintainers = [ lib.maintainers.gal_bolle ];
- };
- }
+ license = lib.licenses.lgpl21;
+ broken = lib.versionAtLeast ocaml.version "5.3";
+ maintainers = [ lib.maintainers.gal_bolle ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/erm_xml/default.nix b/pkgs/development/ocaml-modules/erm_xml/default.nix
index de1e15115e7bc..a68c56a495e2c 100644
--- a/pkgs/development/ocaml-modules/erm_xml/default.nix
+++ b/pkgs/development/ocaml-modules/erm_xml/default.nix
@@ -7,36 +7,33 @@
ocamlbuild,
}:
-if lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "5.0" then
- throw "erm_xml is not available for OCaml ${ocaml.version}"
-else
+stdenv.mkDerivation {
+ pname = "ocaml${ocaml.version}-erm_xml";
+ version = "0.3+20180112";
- stdenv.mkDerivation {
- pname = "ocaml${ocaml.version}-erm_xml";
- version = "0.3+20180112";
+ src = fetchFromGitHub {
+ owner = "hannesm";
+ repo = "xml";
+ rev = "bbabdade807d8281fc48806da054b70dfe482479";
+ sha256 = "sha256-OQdLTq9tJZc6XlcuPv2gxzYiQAUGd6AiBzfSi169XL0=";
+ };
- src = fetchFromGitHub {
- owner = "hannesm";
- repo = "xml";
- rev = "bbabdade807d8281fc48806da054b70dfe482479";
- sha256 = "sha256-OQdLTq9tJZc6XlcuPv2gxzYiQAUGd6AiBzfSi169XL0=";
- };
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ocamlbuild
+ ];
- nativeBuildInputs = [
- ocaml
- findlib
- ocamlbuild
- ];
+ strictDeps = true;
- strictDeps = true;
+ createFindlibDestdir = true;
- createFindlibDestdir = true;
-
- meta = {
- homepage = "https://github.com/hannesm/xml";
- description = "XML Parser for discrete data";
- platforms = ocaml.meta.platforms or [ ];
- license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ vbgl ];
- };
- }
+ meta = {
+ homepage = "https://github.com/hannesm/xml";
+ description = "XML Parser for discrete data";
+ platforms = ocaml.meta.platforms or [ ];
+ license = lib.licenses.bsd3;
+ broken = lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "5.0";
+ maintainers = with lib.maintainers; [ vbgl ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix
index 17bc6e628c5d2..f62fef29a4e6c 100644
--- a/pkgs/development/ocaml-modules/expat/default.nix
+++ b/pkgs/development/ocaml-modules/expat/default.nix
@@ -8,44 +8,41 @@
ounit,
}:
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02")
- "ocaml_expat is not available for OCaml ${ocaml.version}"
-
- stdenv.mkDerivation
- rec {
- pname = "ocaml${ocaml.version}-expat";
- version = "1.3.0";
-
- src = fetchFromGitHub {
- owner = "whitequark";
- repo = "ocaml-expat";
- rev = "v${version}";
- hash = "sha256-eDA6MUcztaI+fpunWBdanNnPo9Y5gvbj/ViVcxYYEBg=";
- };
-
- prePatch = ''
- substituteInPlace Makefile --replace "gcc" "\$(CC)"
- '';
-
- nativeBuildInputs = [
- ocaml
- findlib
- ];
- buildInputs = [ expat ];
-
- strictDeps = true;
-
- doCheck = lib.versionAtLeast ocaml.version "4.08";
- checkTarget = "testall";
- checkInputs = [ ounit ];
-
- createFindlibDestdir = true;
-
- meta = {
- description = "OCaml wrapper for the Expat XML parsing library";
- license = lib.licenses.mit;
- maintainers = [ lib.maintainers.vbgl ];
- inherit (src.meta) homepage;
- inherit (ocaml.meta) platforms;
- };
- }
+stdenv.mkDerivation rec {
+ pname = "ocaml${ocaml.version}-expat";
+ version = "1.3.0";
+
+ src = fetchFromGitHub {
+ owner = "whitequark";
+ repo = "ocaml-expat";
+ rev = "v${version}";
+ hash = "sha256-eDA6MUcztaI+fpunWBdanNnPo9Y5gvbj/ViVcxYYEBg=";
+ };
+
+ prePatch = ''
+ substituteInPlace Makefile --replace "gcc" "\$(CC)"
+ '';
+
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ];
+ buildInputs = [ expat ];
+
+ strictDeps = true;
+
+ doCheck = lib.versionAtLeast ocaml.version "4.08";
+ checkTarget = "testall";
+ checkInputs = [ ounit ];
+
+ createFindlibDestdir = true;
+
+ meta = {
+ description = "OCaml wrapper for the Expat XML parsing library";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.vbgl ];
+ inherit (src.meta) homepage;
+ inherit (ocaml.meta) platforms;
+ broken = !(lib.versionAtLeast ocaml.version "4.02");
+ };
+}
diff --git a/pkgs/development/ocaml-modules/facile/default.nix b/pkgs/development/ocaml-modules/facile/default.nix
index da56409b46c44..d6c3873f82061 100644
--- a/pkgs/development/ocaml-modules/facile/default.nix
+++ b/pkgs/development/ocaml-modules/facile/default.nix
@@ -3,8 +3,8 @@
fetchurl,
fetchpatch,
buildDunePackage,
+ ocaml,
stdlib-shims,
-
}:
buildDunePackage (finalAttrs: {
@@ -30,5 +30,6 @@ buildDunePackage (finalAttrs: {
homepage = "http://opti.recherche.enac.fr/facile/";
license = lib.licenses.lgpl21Plus;
description = "Functional Constraint Library";
+ broken = lib.versionAtLeast ocaml.version "5.0";
};
})
diff --git a/pkgs/development/ocaml-modules/farfadet/default.nix b/pkgs/development/ocaml-modules/farfadet/default.nix
index ddc73697d8ef0..83395d161a7a0 100644
--- a/pkgs/development/ocaml-modules/farfadet/default.nix
+++ b/pkgs/development/ocaml-modules/farfadet/default.nix
@@ -9,38 +9,35 @@
faraday,
}:
-if lib.versionOlder ocaml.version "4.3" then
- throw "farfadet is not available for OCaml ${ocaml.version}"
-else
-
- stdenv.mkDerivation rec {
- pname = "ocaml${ocaml.version}-farfadet";
- version = "0.3";
-
- src = fetchurl {
- url = "https://github.com/oklm-wsh/Farfadet/releases/download/v${version}/farfadet-${version}.tbz";
- sha256 = "0nlafnp0pwx0n4aszpsk6nvcvqi9im306p4jhx70si7k3xprlr2j";
- };
-
- nativeBuildInputs = [
- ocaml
- findlib
- ocamlbuild
- topkg
- ];
- buildInputs = [ topkg ];
-
- propagatedBuildInputs = [ faraday ];
-
- strictDeps = true;
-
- inherit (topkg) buildPhase installPhase;
-
- meta = {
- description = "Printf-like for Faraday library";
- homepage = "https://github.com/oklm-wsh/Farfadet";
- license = lib.licenses.mit;
- maintainers = [ lib.maintainers.vbgl ];
- inherit (ocaml.meta) platforms;
- };
- }
+stdenv.mkDerivation rec {
+ pname = "ocaml${ocaml.version}-farfadet";
+ version = "0.3";
+
+ src = fetchurl {
+ url = "https://github.com/oklm-wsh/Farfadet/releases/download/v${version}/farfadet-${version}.tbz";
+ sha256 = "0nlafnp0pwx0n4aszpsk6nvcvqi9im306p4jhx70si7k3xprlr2j";
+ };
+
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ocamlbuild
+ topkg
+ ];
+ buildInputs = [ topkg ];
+
+ propagatedBuildInputs = [ faraday ];
+
+ strictDeps = true;
+
+ inherit (topkg) buildPhase installPhase;
+
+ meta = {
+ description = "Printf-like for Faraday library";
+ homepage = "https://github.com/oklm-wsh/Farfadet";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.vbgl ];
+ inherit (ocaml.meta) platforms;
+ broken = lib.versionOlder ocaml.version "4.3";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix
index d33e709f731aa..254ca3f51c5c4 100644
--- a/pkgs/development/ocaml-modules/fmt/default.nix
+++ b/pkgs/development/ocaml-modules/fmt/default.nix
@@ -9,39 +9,36 @@
cmdliner,
}:
-if lib.versionOlder ocaml.version "4.08" then
- throw "fmt is not available for OCaml ${ocaml.version}"
-else
+stdenv.mkDerivation rec {
+ version = "0.11.0";
+ pname = "ocaml${ocaml.version}-fmt";
- stdenv.mkDerivation rec {
- version = "0.11.0";
- pname = "ocaml${ocaml.version}-fmt";
+ src = fetchurl {
+ url = "https://erratique.ch/software/fmt/releases/fmt-${version}.tbz";
+ sha256 = "sha256-hXz9R6VLUkKc2bPiZl5EFzzRvTtDW+znFy+YStU3ahs=";
+ };
- src = fetchurl {
- url = "https://erratique.ch/software/fmt/releases/fmt-${version}.tbz";
- sha256 = "sha256-hXz9R6VLUkKc2bPiZl5EFzzRvTtDW+znFy+YStU3ahs=";
- };
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ocamlbuild
+ topkg
+ ];
+ buildInputs = [
+ cmdliner
+ topkg
+ ];
- nativeBuildInputs = [
- ocaml
- findlib
- ocamlbuild
- topkg
- ];
- buildInputs = [
- cmdliner
- topkg
- ];
+ strictDeps = true;
- strictDeps = true;
+ inherit (topkg) buildPhase installPhase;
- inherit (topkg) buildPhase installPhase;
-
- meta = with lib; {
- homepage = "https://erratique.ch/software/fmt";
- license = licenses.isc;
- description = "OCaml Format pretty-printer combinators";
- inherit (ocaml.meta) platforms;
- maintainers = [ maintainers.vbgl ];
- };
- }
+ meta = with lib; {
+ homepage = "https://erratique.ch/software/fmt";
+ license = licenses.isc;
+ description = "OCaml Format pretty-printer combinators";
+ inherit (ocaml.meta) platforms;
+ maintainers = [ maintainers.vbgl ];
+ broken = lib.versionOlder ocaml.version "4.08";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/fpath/default.nix b/pkgs/development/ocaml-modules/fpath/default.nix
index 861b91901e559..b0bfbe507f6cb 100644
--- a/pkgs/development/ocaml-modules/fpath/default.nix
+++ b/pkgs/development/ocaml-modules/fpath/default.nix
@@ -9,38 +9,35 @@
astring,
}:
-if lib.versionOlder ocaml.version "4.03" then
- throw "fpath is not available for OCaml ${ocaml.version}"
-else
-
- stdenv.mkDerivation rec {
- pname = "ocaml${ocaml.version}-fpath";
- version = "0.7.3";
-
- src = fetchurl {
- url = "https://erratique.ch/software/fpath/releases/fpath-${version}.tbz";
- sha256 = "03z7mj0sqdz465rc4drj1gr88l9q3nfs374yssvdjdyhjbqqzc0j";
- };
-
- nativeBuildInputs = [
- ocaml
- findlib
- ocamlbuild
- topkg
- ];
- buildInputs = [ topkg ];
-
- propagatedBuildInputs = [ astring ];
-
- strictDeps = true;
-
- inherit (topkg) buildPhase installPhase;
-
- meta = {
- description = "OCaml module for handling file system paths with POSIX and Windows conventions";
- homepage = "https://erratique.ch/software/fpath";
- license = lib.licenses.isc;
- maintainers = [ lib.maintainers.vbgl ];
- inherit (ocaml.meta) platforms;
- };
- }
+stdenv.mkDerivation rec {
+ pname = "ocaml${ocaml.version}-fpath";
+ version = "0.7.3";
+
+ src = fetchurl {
+ url = "https://erratique.ch/software/fpath/releases/fpath-${version}.tbz";
+ sha256 = "03z7mj0sqdz465rc4drj1gr88l9q3nfs374yssvdjdyhjbqqzc0j";
+ };
+
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ocamlbuild
+ topkg
+ ];
+ buildInputs = [ topkg ];
+
+ propagatedBuildInputs = [ astring ];
+
+ strictDeps = true;
+
+ inherit (topkg) buildPhase installPhase;
+
+ meta = {
+ description = "OCaml module for handling file system paths with POSIX and Windows conventions";
+ homepage = "https://erratique.ch/software/fpath";
+ license = lib.licenses.isc;
+ maintainers = [ lib.maintainers.vbgl ];
+ inherit (ocaml.meta) platforms;
+ broken = lib.versionOlder ocaml.version "4.03";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/functory/default.nix b/pkgs/development/ocaml-modules/functory/default.nix
index 84b16d678de89..44b7adfa6ffff 100644
--- a/pkgs/development/ocaml-modules/functory/default.nix
+++ b/pkgs/development/ocaml-modules/functory/default.nix
@@ -20,35 +20,32 @@ let
};
in
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
- "functory is not available for OCaml ${ocaml.version}"
-
- stdenv.mkDerivation
- {
- pname = "ocaml${ocaml.version}-functory";
- inherit (param) version;
-
- src = fetchurl {
- url = "https://www.lri.fr/~filliatr/functory/download/functory-${param.version}.tar.gz";
- inherit (param) sha256;
- };
-
- nativeBuildInputs = [
- ocaml
- findlib
- ];
-
- strictDeps = true;
-
- installTargets = [ "ocamlfind-install" ];
-
- createFindlibDestdir = true;
-
- meta = with lib; {
- homepage = "https://www.lri.fr/~filliatr/functory/";
- description = "Distributed computing library for Objective Caml which facilitates distributed execution of parallelizable computations in a seamless fashion";
- license = licenses.lgpl21;
- maintainers = [ maintainers.vbgl ];
- inherit (ocaml.meta) platforms;
- };
- }
+stdenv.mkDerivation {
+ pname = "ocaml${ocaml.version}-functory";
+ inherit (param) version;
+
+ src = fetchurl {
+ url = "https://www.lri.fr/~filliatr/functory/download/functory-${param.version}.tar.gz";
+ inherit (param) sha256;
+ };
+
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ];
+
+ strictDeps = true;
+
+ installTargets = [ "ocamlfind-install" ];
+
+ createFindlibDestdir = true;
+
+ meta = with lib; {
+ homepage = "https://www.lri.fr/~filliatr/functory/";
+ description = "Distributed computing library for Objective Caml which facilitates distributed execution of parallelizable computations in a seamless fashion";
+ license = licenses.lgpl21;
+ maintainers = [ maintainers.vbgl ];
+ broken = lib.versionAtLeast ocaml.version "5.0";
+ inherit (ocaml.meta) platforms;
+ };
+}
diff --git a/pkgs/development/ocaml-modules/gg/default.nix b/pkgs/development/ocaml-modules/gg/default.nix
index 7b015cf6840ce..8e6c205695e19 100644
--- a/pkgs/development/ocaml-modules/gg/default.nix
+++ b/pkgs/development/ocaml-modules/gg/default.nix
@@ -13,43 +13,40 @@ let
version = "1.0.0";
in
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
- "gg is not available for OCaml ${ocaml.version}"
-
- stdenv.mkDerivation
- {
-
- pname = "ocaml${ocaml.version}-gg";
- inherit version;
-
- src = fetchurl {
- url = "${homepage}/releases/gg-${version}.tbz";
- sha256 = "sha256:0j7bpj8k17csnz6v6frkz9aycywsb7xmznnb31g8rbfk3626f3ci";
- };
-
- strictDeps = true;
-
- nativeBuildInputs = [
- ocaml
- findlib
- ocamlbuild
- topkg
- ];
- buildInputs = [ topkg ];
-
- inherit (topkg) buildPhase installPhase;
-
- meta = with lib; {
- description = "Basic types for computer graphics in OCaml";
- longDescription = ''
- Gg is an OCaml module providing basic types for computer graphics. It
- defines types and functions for floats, vectors, points, sizes,
- matrices, quaternions, axis aligned boxes, colors, color spaces, and
- raster data.
- '';
- inherit homepage;
- inherit (ocaml.meta) platforms;
- license = licenses.bsd3;
- maintainers = [ maintainers.jirkamarsik ];
- };
- }
+stdenv.mkDerivation {
+
+ pname = "ocaml${ocaml.version}-gg";
+ inherit version;
+
+ src = fetchurl {
+ url = "${homepage}/releases/gg-${version}.tbz";
+ sha256 = "sha256:0j7bpj8k17csnz6v6frkz9aycywsb7xmznnb31g8rbfk3626f3ci";
+ };
+
+ strictDeps = true;
+
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ocamlbuild
+ topkg
+ ];
+ buildInputs = [ topkg ];
+
+ inherit (topkg) buildPhase installPhase;
+
+ meta = with lib; {
+ description = "Basic types for computer graphics in OCaml";
+ longDescription = ''
+ Gg is an OCaml module providing basic types for computer graphics. It
+ defines types and functions for floats, vectors, points, sizes,
+ matrices, quaternions, axis aligned boxes, colors, color spaces, and
+ raster data.
+ '';
+ inherit homepage;
+ inherit (ocaml.meta) platforms;
+ license = licenses.bsd3;
+ maintainers = [ maintainers.jirkamarsik ];
+ broken = !(lib.versionAtLeast ocaml.version "4.08");
+ };
+}
diff --git a/pkgs/development/ocaml-modules/hmap/default.nix b/pkgs/development/ocaml-modules/hmap/default.nix
index 61892116d6e93..7021af3b8f3d3 100644
--- a/pkgs/development/ocaml-modules/hmap/default.nix
+++ b/pkgs/development/ocaml-modules/hmap/default.nix
@@ -11,8 +11,6 @@
let
minimumSupportedOcamlVersion = "4.02.0";
in
-assert lib.versionOlder minimumSupportedOcamlVersion ocaml.version;
-
stdenv.mkDerivation rec {
pname = "hmap";
version = "0.8.1";
@@ -46,5 +44,6 @@ stdenv.mkDerivation rec {
homepage = "https://erratique.ch/software/hmap";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.pmahoney ];
+ broken = !(lib.versionOlder minimumSupportedOcamlVersion ocaml.version);
};
}
diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix
index 43a6424f7c045..7fca71f2035a0 100644
--- a/pkgs/development/ocaml-modules/javalib/default.nix
+++ b/pkgs/development/ocaml-modules/javalib/default.nix
@@ -9,51 +9,48 @@
extlib,
}:
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
- "javalib is not available for OCaml ${ocaml.version}"
-
- stdenv.mkDerivation
- rec {
- pname = "ocaml${ocaml.version}-javalib";
- version = "3.2.2";
-
- src = fetchFromGitHub {
- owner = "javalib-team";
- repo = "javalib";
- rev = version;
- hash = "sha256-XaI7GTU/O5UEWuYX4yqaIRmEoH7FuvCg/+gtKbE/P1s=";
- };
-
- nativeBuildInputs = [
- which
- ocaml
- findlib
- ];
-
- strictDeps = true;
-
- patches = [
- ./configure.sh.patch
- ./Makefile.config.example.patch
- ];
-
- createFindlibDestdir = true;
-
- configureScript = "./configure.sh";
- dontAddPrefix = "true";
- dontAddStaticConfigureFlags = true;
- configurePlatforms = [ ];
-
- propagatedBuildInputs = [
- camlzip
- extlib
- ];
-
- meta = with lib; {
- description = "Library that parses Java .class files into OCaml data structures";
- homepage = "https://javalib-team.github.io/javalib/";
- license = licenses.lgpl3;
- maintainers = [ maintainers.vbgl ];
- inherit (ocaml.meta) platforms;
- };
- }
+stdenv.mkDerivation rec {
+ pname = "ocaml${ocaml.version}-javalib";
+ version = "3.2.2";
+
+ src = fetchFromGitHub {
+ owner = "javalib-team";
+ repo = "javalib";
+ rev = version;
+ hash = "sha256-XaI7GTU/O5UEWuYX4yqaIRmEoH7FuvCg/+gtKbE/P1s=";
+ };
+
+ nativeBuildInputs = [
+ which
+ ocaml
+ findlib
+ ];
+
+ strictDeps = true;
+
+ patches = [
+ ./configure.sh.patch
+ ./Makefile.config.example.patch
+ ];
+
+ createFindlibDestdir = true;
+
+ configureScript = "./configure.sh";
+ dontAddPrefix = "true";
+ dontAddStaticConfigureFlags = true;
+ configurePlatforms = [ ];
+
+ propagatedBuildInputs = [
+ camlzip
+ extlib
+ ];
+
+ meta = with lib; {
+ description = "Library that parses Java .class files into OCaml data structures";
+ homepage = "https://javalib-team.github.io/javalib/";
+ license = licenses.lgpl3;
+ maintainers = [ maintainers.vbgl ];
+ inherit (ocaml.meta) platforms;
+ broken = !(lib.versionAtLeast ocaml.version "4.08");
+ };
+}
diff --git a/pkgs/development/ocaml-modules/kafka/default.nix b/pkgs/development/ocaml-modules/kafka/default.nix
index 9c0698878a58b..f096b7f3190c8 100644
--- a/pkgs/development/ocaml-modules/kafka/default.nix
+++ b/pkgs/development/ocaml-modules/kafka/default.nix
@@ -7,28 +7,25 @@
zlib,
}:
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
- "kafka is not available for OCaml ${ocaml.version}"
+buildDunePackage rec {
+ pname = "kafka";
+ version = "0.5";
- buildDunePackage
- rec {
- pname = "kafka";
- version = "0.5";
+ src = fetchurl {
+ url = "https://github.com/didier-wenzek/ocaml-kafka/releases/download/${version}/kafka-${version}.tbz";
+ sha256 = "0m9212yap0a00hd0f61i4y4fna3141p77qj3mm7jl1h4q60jdhvy";
+ };
- src = fetchurl {
- url = "https://github.com/didier-wenzek/ocaml-kafka/releases/download/${version}/kafka-${version}.tbz";
- sha256 = "0m9212yap0a00hd0f61i4y4fna3141p77qj3mm7jl1h4q60jdhvy";
- };
+ propagatedBuildInputs = [
+ rdkafka
+ zlib
+ ];
- propagatedBuildInputs = [
- rdkafka
- zlib
- ];
-
- meta = with lib; {
- homepage = "https://github.com/didier-wenzek/ocaml-kafka";
- description = "OCaml bindings for Kafka";
- license = licenses.mit;
- maintainers = [ maintainers.vbgl ];
- };
- }
+ meta = with lib; {
+ homepage = "https://github.com/didier-wenzek/ocaml-kafka";
+ description = "OCaml bindings for Kafka";
+ license = licenses.mit;
+ maintainers = [ maintainers.vbgl ];
+ broken = lib.versionAtLeast ocaml.version "5.0";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/kafka/lwt.nix b/pkgs/development/ocaml-modules/kafka/lwt.nix
index e638fe513f3bc..0ee37ea0f657b 100644
--- a/pkgs/development/ocaml-modules/kafka/lwt.nix
+++ b/pkgs/development/ocaml-modules/kafka/lwt.nix
@@ -7,23 +7,20 @@
cmdliner,
}:
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
- "kafka_lwt is not available for OCaml ${ocaml.version}"
+buildDunePackage {
+ pname = "kafka_lwt";
- buildDunePackage
- {
- pname = "kafka_lwt";
+ inherit (kafka) version src;
- inherit (kafka) version src;
+ buildInputs = [ cmdliner ];
- buildInputs = [ cmdliner ];
+ propagatedBuildInputs = [
+ kafka
+ lwt
+ ];
- propagatedBuildInputs = [
- kafka
- lwt
- ];
-
- meta = kafka.meta // {
- description = "OCaml bindings for Kafka, Lwt bindings";
- };
- }
+ meta = kafka.meta // {
+ description = "OCaml bindings for Kafka, Lwt bindings";
+ broken = lib.versionAtLeast ocaml.version "5.0";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix
index 3736fc84a8d4d..06b7f64157d38 100644
--- a/pkgs/development/ocaml-modules/lablgl/default.nix
+++ b/pkgs/development/ocaml-modules/lablgl/default.nix
@@ -9,73 +9,70 @@
camlp-streams,
}:
-if lib.versionOlder ocaml.version "4.06" then
- throw "lablgl is not available for OCaml ${ocaml.version}"
-else
+stdenv.mkDerivation rec {
+ pname = "ocaml${ocaml.version}-lablgl";
+ version = "1.07";
- stdenv.mkDerivation rec {
- pname = "ocaml${ocaml.version}-lablgl";
- version = "1.07";
+ src = fetchFromGitHub {
+ owner = "garrigue";
+ repo = "lablgl";
+ rev = "v${version}";
+ hash = "sha256-GiQKHMn5zHyvDrA2ve12X5YTm3/RZp8tukIqifgVaW4=";
+ };
- src = fetchFromGitHub {
- owner = "garrigue";
- repo = "lablgl";
- rev = "v${version}";
- hash = "sha256-GiQKHMn5zHyvDrA2ve12X5YTm3/RZp8tukIqifgVaW4=";
- };
+ strictDeps = true;
- strictDeps = true;
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ];
+ buildInputs = [
+ libglut
+ camlp-streams
+ ];
+ propagatedBuildInputs = [
+ libGLU
+ ];
- nativeBuildInputs = [
- ocaml
- findlib
- ];
- buildInputs = [
- libglut
- camlp-streams
- ];
- propagatedBuildInputs = [
- libGLU
- ];
+ patches = [ ./META.patch ];
- patches = [ ./META.patch ];
+ preConfigure = ''
+ mkdir -p $out/bin
+ mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs
+ cp \
+ Makefile.config.${if stdenv.hostPlatform.isDarwin then "osx" else "ex"} \
+ Makefile.config
+ '';
- preConfigure = ''
- mkdir -p $out/bin
- mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs
- cp \
- Makefile.config.${if stdenv.hostPlatform.isDarwin then "osx" else "ex"} \
- Makefile.config
- '';
+ makeFlags = [
+ "BINDIR=${placeholder "out"}/bin/"
+ "INSTALLDIR=${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib/lablgl/"
+ "DLLDIR=${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib/stublibs/"
+ "XINCLUDES="
+ "TKINCLUDES="
+ "TKLIBS="
+ ];
- makeFlags = [
- "BINDIR=${placeholder "out"}/bin/"
- "INSTALLDIR=${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib/lablgl/"
- "DLLDIR=${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib/stublibs/"
- "XINCLUDES="
- "TKINCLUDES="
- "TKLIBS="
- ];
+ buildFlags = [
+ "lib"
+ "libopt"
+ "glut"
+ "glutopt"
+ ];
- buildFlags = [
- "lib"
- "libopt"
- "glut"
- "glutopt"
- ];
-
- postInstall = ''
- cp ./META $out/lib/ocaml/${ocaml.version}/site-lib/lablgl
- '';
+ postInstall = ''
+ cp ./META $out/lib/ocaml/${ocaml.version}/site-lib/lablgl
+ '';
- meta = with lib; {
- description = "OpenGL bindings for ocaml";
- homepage = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html";
- license = licenses.gpl2;
- maintainers = with maintainers; [
- pSub
- vbgl
- ];
- mainProgram = "lablglut";
- };
- }
+ meta = with lib; {
+ description = "OpenGL bindings for ocaml";
+ homepage = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [
+ pSub
+ vbgl
+ ];
+ mainProgram = "lablglut";
+ broken = lib.versionOlder ocaml.version "4.06";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix
index 469c3750cafc5..172e1d539e27f 100644
--- a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix
@@ -10,41 +10,38 @@
xmlm,
}:
-if lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "4.13" then
- throw "lablgtk-extras is not available for OCaml ${ocaml.version}"
-else
+stdenv.mkDerivation rec {
+ version = "1.6";
+ pname = "ocaml${ocaml.version}-lablgtk-extras";
+ src = fetchFromGitLab {
+ domain = "framagit.org";
+ owner = "zoggy";
+ repo = "lablgtk-extras";
+ rev = "release-${version}";
+ sha256 = "1bbdp5j18s582mmyd7qiaq1p08g2ag4gl7x65pmzahbhg719hjda";
+ };
- stdenv.mkDerivation rec {
- version = "1.6";
- pname = "ocaml${ocaml.version}-lablgtk-extras";
- src = fetchFromGitLab {
- domain = "framagit.org";
- owner = "zoggy";
- repo = "lablgtk-extras";
- rev = "release-${version}";
- sha256 = "1bbdp5j18s582mmyd7qiaq1p08g2ag4gl7x65pmzahbhg719hjda";
- };
+ strictDeps = true;
- strictDeps = true;
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ camlp4
+ ];
+ propagatedBuildInputs = [
+ config-file
+ lablgtk
+ xmlm
+ ];
- nativeBuildInputs = [
- ocaml
- findlib
- camlp4
- ];
- propagatedBuildInputs = [
- config-file
- lablgtk
- xmlm
- ];
+ createFindlibDestdir = true;
- createFindlibDestdir = true;
-
- meta = {
- inherit (ocaml.meta) platforms;
- maintainers = with lib.maintainers; [ vbgl ];
- homepage = "https://framagit.org/zoggy/lablgtk-extras/";
- description = "Collection of libraries and modules useful when developing OCaml/LablGtk2 applications";
- license = lib.licenses.lgpl2Plus;
- };
- }
+ meta = {
+ inherit (ocaml.meta) platforms;
+ maintainers = with lib.maintainers; [ vbgl ];
+ homepage = "https://framagit.org/zoggy/lablgtk-extras/";
+ description = "Collection of libraries and modules useful when developing OCaml/LablGtk2 applications";
+ license = lib.licenses.lgpl2Plus;
+ broken = lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "4.13";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix
index 2a15aecfe0c99..0782692d7713d 100644
--- a/pkgs/development/ocaml-modules/labltk/default.nix
+++ b/pkgs/development/ocaml-modules/labltk/default.nix
@@ -134,5 +134,6 @@ param.stdenv.mkDerivation {
license = lib.licenses.lgpl21;
inherit (ocaml.meta) platforms;
maintainers = [ lib.maintainers.vbgl ];
+ broken = !(params ? ${lib.versions.majorMinor ocaml.version});
};
}
diff --git a/pkgs/development/ocaml-modules/lem/default.nix b/pkgs/development/ocaml-modules/lem/default.nix
index 8a2ac28d82899..150b7a9519ca8 100644
--- a/pkgs/development/ocaml-modules/lem/default.nix
+++ b/pkgs/development/ocaml-modules/lem/default.nix
@@ -10,49 +10,46 @@
zarith,
}:
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07")
- "lem is not available for OCaml ${ocaml.version}"
-
- stdenv.mkDerivation
- rec {
- pname = "ocaml${ocaml.version}-lem";
- version = "2025-03-13";
-
- src = fetchFromGitHub {
- owner = "rems-project";
- repo = "lem";
- rev = version;
- hash = "sha256-ZV2OiFonMlNzqtsumMQ8jzY9/ATaZxiNHZ7JzOfGluY=";
- };
-
- nativeBuildInputs = [
- makeWrapper
- ocamlbuild
- findlib
- ocaml
- ];
- propagatedBuildInputs = [
- zarith
- num
+stdenv.mkDerivation rec {
+ pname = "ocaml${ocaml.version}-lem";
+ version = "2025-03-13";
+
+ src = fetchFromGitHub {
+ owner = "rems-project";
+ repo = "lem";
+ rev = version;
+ hash = "sha256-ZV2OiFonMlNzqtsumMQ8jzY9/ATaZxiNHZ7JzOfGluY=";
+ };
+
+ nativeBuildInputs = [
+ makeWrapper
+ ocamlbuild
+ findlib
+ ocaml
+ ];
+ propagatedBuildInputs = [
+ zarith
+ num
+ ];
+
+ installFlags = [ "INSTALL_DIR=$(out)" ];
+
+ createFindlibDestdir = true;
+
+ postInstall = ''
+ wrapProgram $out/bin/lem --set LEMLIB $out/share/lem/library
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/rems-project/lem";
+ description = "Tool for lightweight executable mathematics";
+ mainProgram = "lem";
+ maintainers = with maintainers; [ genericnerdyusername ];
+ license = with licenses; [
+ bsd3
+ gpl2
];
-
- installFlags = [ "INSTALL_DIR=$(out)" ];
-
- createFindlibDestdir = true;
-
- postInstall = ''
- wrapProgram $out/bin/lem --set LEMLIB $out/share/lem/library
- '';
-
- meta = with lib; {
- homepage = "https://github.com/rems-project/lem";
- description = "Tool for lightweight executable mathematics";
- mainProgram = "lem";
- maintainers = with maintainers; [ genericnerdyusername ];
- license = with licenses; [
- bsd3
- gpl2
- ];
- platforms = ocaml.meta.platforms;
- };
- }
+ platforms = ocaml.meta.platforms;
+ broken = !(lib.versionAtLeast ocaml.version "4.07");
+ };
+}
diff --git a/pkgs/development/ocaml-modules/linksem/default.nix b/pkgs/development/ocaml-modules/linksem/default.nix
index ccefd91c06cf8..40930e21f94f2 100644
--- a/pkgs/development/ocaml-modules/linksem/default.nix
+++ b/pkgs/development/ocaml-modules/linksem/default.nix
@@ -7,35 +7,32 @@
lem,
}:
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07")
- "linksem is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+ pname = "ocaml${ocaml.version}-linksem";
+ version = "0.8";
- stdenv.mkDerivation
- rec {
- pname = "ocaml${ocaml.version}-linksem";
- version = "0.8";
+ src = fetchFromGitHub {
+ owner = "rems-project";
+ repo = "linksem";
+ rev = version;
+ hash = "sha256-7/YfDK3TruKCckMzAPLRrwBkHRJcX1S+AzXHWRxkZPA=";
+ };
- src = fetchFromGitHub {
- owner = "rems-project";
- repo = "linksem";
- rev = version;
- hash = "sha256-7/YfDK3TruKCckMzAPLRrwBkHRJcX1S+AzXHWRxkZPA=";
- };
+ nativeBuildInputs = [
+ findlib
+ ocaml
+ ];
- nativeBuildInputs = [
- findlib
- ocaml
- ];
+ propagatedBuildInputs = [ lem ];
- propagatedBuildInputs = [ lem ];
+ createFindlibDestdir = true;
- createFindlibDestdir = true;
-
- meta = with lib; {
- homepage = "https://github.com/rems-project/linksem";
- description = "Formalisation of substantial parts of ELF linking and DWARF debug information";
- maintainers = with maintainers; [ genericnerdyusername ];
- license = licenses.bsd2;
- platforms = ocaml.meta.platforms;
- };
- }
+ meta = with lib; {
+ homepage = "https://github.com/rems-project/linksem";
+ description = "Formalisation of substantial parts of ELF linking and DWARF debug information";
+ maintainers = with maintainers; [ genericnerdyusername ];
+ license = licenses.bsd2;
+ platforms = ocaml.meta.platforms;
+ broken = !(lib.versionAtLeast ocaml.version "4.07");
+ };
+}
diff --git a/pkgs/development/ocaml-modules/mariadb/default.nix b/pkgs/development/ocaml-modules/mariadb/default.nix
index 4fbc81bfc313b..a53a996da8a48 100644
--- a/pkgs/development/ocaml-modules/mariadb/default.nix
+++ b/pkgs/development/ocaml-modules/mariadb/default.nix
@@ -12,66 +12,63 @@
libmysqlclient,
}:
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07")
- "mariadb is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+ pname = "ocaml${ocaml.version}-mariadb";
+ version = "1.1.6";
- stdenv.mkDerivation
- rec {
- pname = "ocaml${ocaml.version}-mariadb";
- version = "1.1.6";
+ src = fetchurl {
+ url = "https://github.com/andrenth/ocaml-mariadb/releases/download/${version}/ocaml-mariadb-${version}.tar.gz";
+ sha256 = "sha256-3/C1Gz6luUzS7oaudLlDHMT6JB2v5OdbLVzJhtayHGM=";
+ };
- src = fetchurl {
- url = "https://github.com/andrenth/ocaml-mariadb/releases/download/${version}/ocaml-mariadb-${version}.tar.gz";
- sha256 = "sha256-3/C1Gz6luUzS7oaudLlDHMT6JB2v5OdbLVzJhtayHGM=";
- };
+ patches =
+ lib.lists.map
+ (
+ x:
+ fetchpatch {
+ url = "https://github.com/andrenth/ocaml-mariadb/commit/${x.path}.patch";
+ inherit (x) hash;
+ }
+ )
+ [
+ {
+ path = "9db2e4d8dec7c584213d0e0f03d079a36a35d9d5";
+ hash = "sha256-heROtU02cYBJ5edIHMdYP1xNXcLv8h79GYGBuudJhgE=";
+ }
+ {
+ path = "40cd3102bc7cce4ed826ed609464daeb1bbb4581";
+ hash = "sha256-YVsAMJiOgWRk9xPaRz2sDihBYLlXv+rhWtQIMOVLtSg=";
+ }
+ ];
- patches =
- lib.lists.map
- (
- x:
- fetchpatch {
- url = "https://github.com/andrenth/ocaml-mariadb/commit/${x.path}.patch";
- inherit (x) hash;
- }
- )
- [
- {
- path = "9db2e4d8dec7c584213d0e0f03d079a36a35d9d5";
- hash = "sha256-heROtU02cYBJ5edIHMdYP1xNXcLv8h79GYGBuudJhgE=";
- }
- {
- path = "40cd3102bc7cce4ed826ed609464daeb1bbb4581";
- hash = "sha256-YVsAMJiOgWRk9xPaRz2sDihBYLlXv+rhWtQIMOVLtSg=";
- }
- ];
+ postPatch = ''
+ substituteInPlace setup.ml --replace '#use "topfind"' \
+ '#directory "${findlib}/lib/ocaml/${ocaml.version}/site-lib/";; #use "topfind"'
+ '';
- postPatch = ''
- substituteInPlace setup.ml --replace '#use "topfind"' \
- '#directory "${findlib}/lib/ocaml/${ocaml.version}/site-lib/";; #use "topfind"'
- '';
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ocamlbuild
+ ];
+ buildInputs = [
+ mariadb
+ libmysqlclient
+ camlp-streams
+ ocamlbuild
+ ];
+ propagatedBuildInputs = [ ctypes ];
- nativeBuildInputs = [
- ocaml
- findlib
- ocamlbuild
- ];
- buildInputs = [
- mariadb
- libmysqlclient
- camlp-streams
- ocamlbuild
- ];
- propagatedBuildInputs = [ ctypes ];
+ strictDeps = true;
- strictDeps = true;
+ preInstall = "mkdir -p $OCAMLFIND_DESTDIR/stublibs";
- preInstall = "mkdir -p $OCAMLFIND_DESTDIR/stublibs";
-
- meta = {
- description = "OCaml bindings for MariaDB";
- license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ bcc32 ];
- homepage = "https://github.com/andrenth/ocaml-mariadb";
- inherit (ocaml.meta) platforms;
- };
- }
+ meta = {
+ description = "OCaml bindings for MariaDB";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ bcc32 ];
+ homepage = "https://github.com/andrenth/ocaml-mariadb";
+ inherit (ocaml.meta) platforms;
+ broken = !(lib.versionAtLeast ocaml.version "4.07");
+ };
+}
diff --git a/pkgs/development/ocaml-modules/memprof-limits/default.nix b/pkgs/development/ocaml-modules/memprof-limits/default.nix
index 32ffbd5f82cf9..e469c9daff9dd 100644
--- a/pkgs/development/ocaml-modules/memprof-limits/default.nix
+++ b/pkgs/development/ocaml-modules/memprof-limits/default.nix
@@ -5,26 +5,24 @@
ocaml,
}:
-if !(lib.versionOlder ocaml.version "5.0.0") then
- throw "memprof-limits is not available for OCaml ${ocaml.version}"
-else
- buildDunePackage rec {
- pname = "memprof-limits";
- version = "0.2.1";
+buildDunePackage rec {
+ pname = "memprof-limits";
+ version = "0.2.1";
- src = fetchFromGitLab {
- owner = "gadmm";
- repo = pname;
- rev = "v${version}";
- hash = "sha256-Pmuln5TihPoPZuehZlqPfERif6lf7O+0454kW9y3aKc=";
- };
+ src = fetchFromGitLab {
+ owner = "gadmm";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-Pmuln5TihPoPZuehZlqPfERif6lf7O+0454kW9y3aKc=";
+ };
- minimalOCamlVersion = "4.12";
+ minimalOCamlVersion = "4.12";
- meta = with lib; {
- homepage = "https://ocaml.org/p/memprof-limits/latest";
- description = "Memory limits, allocation limits, and thread cancellation for OCaml";
- license = licenses.lgpl3;
- maintainers = with maintainers; [ alizter ];
- };
- }
+ meta = with lib; {
+ homepage = "https://ocaml.org/p/memprof-limits/latest";
+ description = "Memory limits, allocation limits, and thread cancellation for OCaml";
+ license = licenses.lgpl3;
+ maintainers = with maintainers; [ alizter ];
+ broken = !(lib.versionOlder ocaml.version "5.0.0");
+ };
+}
diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix
index 4c6677114b091..ff7e19c89ce01 100644
--- a/pkgs/development/ocaml-modules/mtime/default.nix
+++ b/pkgs/development/ocaml-modules/mtime/default.nix
@@ -8,36 +8,33 @@
topkg,
}:
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
- "mtime is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+ pname = "ocaml${ocaml.version}-mtime";
+ version = "2.1.0";
- stdenv.mkDerivation
- rec {
- pname = "ocaml${ocaml.version}-mtime";
- version = "2.1.0";
+ src = fetchurl {
+ url = "https://erratique.ch/software/mtime/releases/mtime-${version}.tbz";
+ sha256 = "sha256-CXyygC43AerZVy4bSD1aKMbi8KOUSfqvm0StiomDTYg=";
+ };
- src = fetchurl {
- url = "https://erratique.ch/software/mtime/releases/mtime-${version}.tbz";
- sha256 = "sha256-CXyygC43AerZVy4bSD1aKMbi8KOUSfqvm0StiomDTYg=";
- };
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ocamlbuild
+ topkg
+ ];
+ buildInputs = [ topkg ];
- nativeBuildInputs = [
- ocaml
- findlib
- ocamlbuild
- topkg
- ];
- buildInputs = [ topkg ];
+ strictDeps = true;
- strictDeps = true;
+ inherit (topkg) buildPhase installPhase;
- inherit (topkg) buildPhase installPhase;
-
- meta = with lib; {
- description = "Monotonic wall-clock time for OCaml";
- homepage = "https://erratique.ch/software/mtime";
- inherit (ocaml.meta) platforms;
- maintainers = [ maintainers.vbgl ];
- license = licenses.bsd3;
- };
- }
+ meta = with lib; {
+ description = "Monotonic wall-clock time for OCaml";
+ homepage = "https://erratique.ch/software/mtime";
+ inherit (ocaml.meta) platforms;
+ maintainers = [ maintainers.vbgl ];
+ license = licenses.bsd3;
+ broken = !(lib.versionAtLeast ocaml.version "4.08");
+ };
+}
diff --git a/pkgs/development/ocaml-modules/nonstd/default.nix b/pkgs/development/ocaml-modules/nonstd/default.nix
index 7d547d3818f94..32baf666f8b1b 100644
--- a/pkgs/development/ocaml-modules/nonstd/default.nix
+++ b/pkgs/development/ocaml-modules/nonstd/default.nix
@@ -5,28 +5,26 @@
ocaml,
}:
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0") "nonstd is not available for OCaml ≥ 5.0"
+buildDunePackage rec {
+ pname = "nonstd";
+ version = "0.0.3";
- buildDunePackage
- rec {
- pname = "nonstd";
- version = "0.0.3";
+ minimalOCamlVersion = "4.02";
- minimalOCamlVersion = "4.02";
+ src = fetchzip {
+ url = "https://bitbucket.org/smondet/${pname}/get/${pname}.${version}.tar.gz";
+ sha256 = "0ccjwcriwm8fv29ij1cnbc9win054kb6pfga3ygzdbjpjb778j46";
+ };
- src = fetchzip {
- url = "https://bitbucket.org/smondet/${pname}/get/${pname}.${version}.tar.gz";
- sha256 = "0ccjwcriwm8fv29ij1cnbc9win054kb6pfga3ygzdbjpjb778j46";
- };
+ duneVersion = if lib.versionAtLeast ocaml.version "4.12" then "2" else "1";
+ postPatch = lib.optionalString (duneVersion != "1") "dune upgrade";
+ doCheck = true;
- duneVersion = if lib.versionAtLeast ocaml.version "4.12" then "2" else "1";
- postPatch = lib.optionalString (duneVersion != "1") "dune upgrade";
- doCheck = true;
-
- meta = with lib; {
- homepage = "https://bitbucket.org/smondet/nonstd";
- description = "Non-standard mini-library";
- license = licenses.isc;
- maintainers = [ maintainers.alexfmpe ];
- };
- }
+ meta = with lib; {
+ homepage = "https://bitbucket.org/smondet/nonstd";
+ description = "Non-standard mini-library";
+ license = licenses.isc;
+ maintainers = [ maintainers.alexfmpe ];
+ broken = lib.versionAtLeast ocaml.version "5.0";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/note/default.nix b/pkgs/development/ocaml-modules/note/default.nix
index c5e801456a473..176d6581e82df 100644
--- a/pkgs/development/ocaml-modules/note/default.nix
+++ b/pkgs/development/ocaml-modules/note/default.nix
@@ -9,32 +9,29 @@
brr,
}:
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
- "note is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+ pname = "ocaml${ocaml.version}-note";
+ version = "0.0.3";
+ src = fetchurl {
+ url = "https://erratique.ch/software/note/releases/note-${version}.tbz";
+ hash = "sha256-ZZOvCnyz7UWzFtGFI1uC0ZApzyylgZYM/HYIXGVXY2k=";
+ };
+ buildInputs = [
+ ocaml
+ findlib
+ ocamlbuild
+ topkg
+ ];
+ inherit (topkg) buildPhase installPhase;
- stdenv.mkDerivation
- rec {
- pname = "ocaml${ocaml.version}-note";
- version = "0.0.3";
- src = fetchurl {
- url = "https://erratique.ch/software/note/releases/note-${version}.tbz";
- hash = "sha256-ZZOvCnyz7UWzFtGFI1uC0ZApzyylgZYM/HYIXGVXY2k=";
- };
- buildInputs = [
- ocaml
- findlib
- ocamlbuild
- topkg
- ];
- inherit (topkg) buildPhase installPhase;
+ propagatedBuildInputs = [ brr ];
- propagatedBuildInputs = [ brr ];
-
- meta = {
- homepage = "https://erratique.ch/software/note";
- description = "OCaml module for functional reactive programming";
- license = lib.licenses.isc;
- maintainers = [ lib.maintainers.vbgl ];
- inherit (ocaml.meta) platforms;
- };
- }
+ meta = {
+ homepage = "https://erratique.ch/software/note";
+ description = "OCaml module for functional reactive programming";
+ license = lib.licenses.isc;
+ maintainers = [ lib.maintainers.vbgl ];
+ inherit (ocaml.meta) platforms;
+ broken = !(lib.versionAtLeast ocaml.version "4.08");
+ };
+}
diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
index c0cfa54ca997f..6a5a696aa20e5 100644
--- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
@@ -20,63 +20,59 @@
let
pname = "ocaml-cairo";
in
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ version = "1.2.0";
-if lib.versionAtLeast ocaml.version "4.06" then
- throw "${pname} is not available for OCaml ${ocaml.version}"
-else
+ src = fetchurl {
+ url = "http://cgit.freedesktop.org/cairo-ocaml/snapshot/cairo-ocaml-${version}.zip";
+ sha256 = "0l4p9bp6kclr570mxma8wafibr1g5fsjj8h10yr4b507g0hmlh0l";
+ };
- stdenv.mkDerivation rec {
- name = "${pname}-${version}";
- version = "1.2.0";
+ patches = [ ./META.patch ];
- src = fetchurl {
- url = "http://cgit.freedesktop.org/cairo-ocaml/snapshot/cairo-ocaml-${version}.zip";
- sha256 = "0l4p9bp6kclr570mxma8wafibr1g5fsjj8h10yr4b507g0hmlh0l";
- };
+ strictDeps = true;
- patches = [ ./META.patch ];
+ nativeBuildInputs = [
+ pkg-config
+ unzip
+ ocaml
+ automake
+ gnum4
+ autoconf
+ findlib
+ ];
+ buildInputs = [
+ freetype
+ lablgtk
+ cairo
+ gdk-pixbuf
+ gtk2
+ pango
+ ];
- strictDeps = true;
+ createFindlibDestdir = true;
- nativeBuildInputs = [
- pkg-config
- unzip
- ocaml
- automake
- gnum4
- autoconf
- findlib
- ];
- buildInputs = [
- freetype
- lablgtk
- cairo
- gdk-pixbuf
- gtk2
- pango
- ];
+ preConfigure = ''
+ aclocal -I support
+ autoconf
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE `pkg-config --cflags cairo gdk-pixbuf glib gtk+ pango`"
+ export LABLGTKDIR=${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2
+ cp ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2/pango.ml ./src
+ cp ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2/gaux.ml ./src
+ '';
- createFindlibDestdir = true;
+ postInstall = ''
+ cp META $out/lib/ocaml/${ocaml.version}/site-lib/cairo/
+ '';
- preConfigure = ''
- aclocal -I support
- autoconf
- export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE `pkg-config --cflags cairo gdk-pixbuf glib gtk+ pango`"
- export LABLGTKDIR=${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2
- cp ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2/pango.ml ./src
- cp ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2/gaux.ml ./src
- '';
+ makeFlags = [ "INSTALLDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/cairo" ];
- postInstall = ''
- cp META $out/lib/ocaml/${ocaml.version}/site-lib/cairo/
- '';
-
- makeFlags = [ "INSTALLDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/cairo" ];
-
- meta = {
- homepage = "http://cairographics.org/cairo-ocaml";
- description = "Ocaml bindings for cairo library";
- license = lib.licenses.gpl2;
- inherit (ocaml.meta) platforms;
- };
- }
+ meta = {
+ homepage = "http://cairographics.org/cairo-ocaml";
+ description = "Ocaml bindings for cairo library";
+ license = lib.licenses.gpl2;
+ broken = lib.versionAtLeast ocaml.version "4.06";
+ inherit (ocaml.meta) platforms;
+ };
+}
diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
index 43fead8c172e2..584e1b307dda8 100644
--- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
@@ -10,49 +10,46 @@
perl,
}:
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02")
- "libvirt is not available for OCaml ${ocaml.version}"
-
- stdenv.mkDerivation
- rec {
- pname = "ocaml-libvirt";
- version = "0.6.1.5";
-
- src = fetchFromGitLab {
- owner = "libvirt";
- repo = "libvirt-ocaml";
- rev = "v${version}";
- sha256 = "0xpkdmknk74yqxgw8z2w8b7ss8hpx92xnab5fsqg2byyj55gzf2k";
- };
-
- propagatedBuildInputs = [ libvirt ];
-
- nativeBuildInputs = [
- autoreconfHook
- pkg-config
- findlib
- perl
- ocaml
- ];
-
- strictDeps = true;
-
- buildFlags = [
- "all"
- "opt"
- "CPPFLAGS=-Wno-error"
- ];
- installTargets = "install-opt";
- preInstall = ''
- # Fix 'dllmllibvirt.so' install failure into non-existent directory.
- mkdir -p $OCAMLFIND_DESTDIR/stublibs
- '';
-
- meta = with lib; {
- description = "OCaml bindings for libvirt";
- homepage = "https://libvirt.org/ocaml/";
- license = licenses.gpl2;
- maintainers = [ ];
- inherit (ocaml.meta) platforms;
- };
- }
+stdenv.mkDerivation rec {
+ pname = "ocaml-libvirt";
+ version = "0.6.1.5";
+
+ src = fetchFromGitLab {
+ owner = "libvirt";
+ repo = "libvirt-ocaml";
+ rev = "v${version}";
+ sha256 = "0xpkdmknk74yqxgw8z2w8b7ss8hpx92xnab5fsqg2byyj55gzf2k";
+ };
+
+ propagatedBuildInputs = [ libvirt ];
+
+ nativeBuildInputs = [
+ autoreconfHook
+ pkg-config
+ findlib
+ perl
+ ocaml
+ ];
+
+ strictDeps = true;
+
+ buildFlags = [
+ "all"
+ "opt"
+ "CPPFLAGS=-Wno-error"
+ ];
+ installTargets = "install-opt";
+ preInstall = ''
+ # Fix 'dllmllibvirt.so' install failure into non-existent directory.
+ mkdir -p $OCAMLFIND_DESTDIR/stublibs
+ '';
+
+ meta = with lib; {
+ description = "OCaml bindings for libvirt";
+ homepage = "https://libvirt.org/ocaml/";
+ license = licenses.gpl2;
+ maintainers = [ ];
+ inherit (ocaml.meta) platforms;
+ broken = !(lib.versionAtLeast ocaml.version "4.02");
+ };
+}
diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix
index 6e16fd2f25560..725371018e080 100644
--- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix
+++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix
@@ -7,30 +7,27 @@
ppx_derivers,
}:
-if lib.versionOlder "4.13" ocaml.version then
- throw "ocaml-migrate-parsetree-1.8 is not available for OCaml ${ocaml.version}"
-else
+buildDunePackage rec {
+ pname = "ocaml-migrate-parsetree";
+ version = "1.8.0";
- buildDunePackage rec {
- pname = "ocaml-migrate-parsetree";
- version = "1.8.0";
+ src = fetchFromGitHub {
+ owner = "ocaml-ppx";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq";
+ };
- src = fetchFromGitHub {
- owner = "ocaml-ppx";
- repo = pname;
- rev = "v${version}";
- sha256 = "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq";
- };
+ propagatedBuildInputs = [
+ ppx_derivers
+ result
+ ];
- propagatedBuildInputs = [
- ppx_derivers
- result
- ];
-
- meta = {
- description = "Convert OCaml parsetrees between different major versions";
- license = lib.licenses.lgpl21;
- maintainers = [ lib.maintainers.vbgl ];
- inherit (src.meta) homepage;
- };
- }
+ meta = {
+ description = "Convert OCaml parsetrees between different major versions";
+ license = lib.licenses.lgpl21;
+ maintainers = [ lib.maintainers.vbgl ];
+ inherit (src.meta) homepage;
+ broken = lib.versionOlder "4.13" ocaml.version;
+ };
+}
diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix
index 2c66caae99f99..129e2a9be1988 100644
--- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix
+++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix
@@ -5,28 +5,25 @@
ocaml,
}:
-lib.throwIf (lib.versionAtLeast ocaml.version "5.1")
- "ocaml-migrate-parsetree is not available for OCaml ${ocaml.version}"
+buildDunePackage rec {
+ pname = "ocaml-migrate-parsetree";
+ version = "2.4.0";
- buildDunePackage
- rec {
- pname = "ocaml-migrate-parsetree";
- version = "2.4.0";
+ minimalOCamlVersion = "4.02";
- minimalOCamlVersion = "4.02";
+ src = fetchurl {
+ url = "https://github.com/ocaml-ppx/${pname}/releases/download/${version}/${pname}-${version}.tbz";
+ sha256 = "sha256-7EnEUtwzemIFVqtoK/AZi/UBglULUC2PsjClkSYKpqQ=";
+ };
- src = fetchurl {
- url = "https://github.com/ocaml-ppx/${pname}/releases/download/${version}/${pname}-${version}.tbz";
- sha256 = "sha256-7EnEUtwzemIFVqtoK/AZi/UBglULUC2PsjClkSYKpqQ=";
- };
-
- meta = {
- description = "Convert OCaml parsetrees between different major versions";
- license = lib.licenses.lgpl21;
- maintainers = with lib.maintainers; [
- vbgl
- sternenseemann
- ];
- homepage = "https://github.com/ocaml-ppx/ocaml-migrate-parsetree";
- };
- }
+ meta = {
+ description = "Convert OCaml parsetrees between different major versions";
+ license = lib.licenses.lgpl21;
+ maintainers = with lib.maintainers; [
+ vbgl
+ sternenseemann
+ ];
+ homepage = "https://github.com/ocaml-ppx/ocaml-migrate-parsetree";
+ broken = lib.versionAtLeast ocaml.version "5.1";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
index 2f6d2a596f4ab..927fcced62f88 100644
--- a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
+++ b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
@@ -13,42 +13,36 @@
let
inherit (callPackage ./generic.nix args) src version library_deps;
in
+buildDunePackage {
+ pname = "ocamlformat";
+ inherit src version;
-lib.throwIf
- (
- lib.versionAtLeast ocaml.version "5.0" && !lib.versionAtLeast version "0.23"
- || lib.versionAtLeast ocaml.version "5.1" && !lib.versionAtLeast version "0.25"
- || lib.versionAtLeast ocaml.version "5.2" && !lib.versionAtLeast version "0.26.2"
- || lib.versionAtLeast ocaml.version "5.3" && !lib.versionAtLeast version "0.27"
- || lib.versionAtLeast ocaml.version "5.4" && !lib.versionAtLeast version "0.28"
- )
- "ocamlformat ${version} is not available for OCaml ${ocaml.version}"
+ minimalOCamlVersion = "4.08";
- buildDunePackage
- {
- pname = "ocamlformat";
- inherit src version;
+ nativeBuildInputs = if lib.versionAtLeast version "0.25.1" then [ ] else [ menhir ];
- minimalOCamlVersion = "4.08";
+ buildInputs = [
+ re
+ ]
+ ++ library_deps
+ ++ lib.optionals (lib.versionAtLeast version "0.25.1") [
+ (ocamlformat-lib.override { inherit version; })
+ ];
- nativeBuildInputs = if lib.versionAtLeast version "0.25.1" then [ ] else [ menhir ];
-
- buildInputs = [
- re
- ]
- ++ library_deps
- ++ lib.optionals (lib.versionAtLeast version "0.25.1") [
- (ocamlformat-lib.override { inherit version; })
+ meta = {
+ homepage = "https://github.com/ocaml-ppx/ocamlformat";
+ description = "Auto-formatter for OCaml code";
+ maintainers = with lib.maintainers; [
+ Zimmi48
+ Julow
];
-
- meta = {
- homepage = "https://github.com/ocaml-ppx/ocamlformat";
- description = "Auto-formatter for OCaml code";
- maintainers = with lib.maintainers; [
- Zimmi48
- Julow
- ];
- license = lib.licenses.mit;
- mainProgram = "ocamlformat";
- };
- }
+ license = lib.licenses.mit;
+ mainProgram = "ocamlformat";
+ broken =
+ lib.versionAtLeast ocaml.version "5.0" && !lib.versionAtLeast version "0.23"
+ || lib.versionAtLeast ocaml.version "5.1" && !lib.versionAtLeast version "0.25"
+ || lib.versionAtLeast ocaml.version "5.2" && !lib.versionAtLeast version "0.26.2"
+ || lib.versionAtLeast ocaml.version "5.3" && !lib.versionAtLeast version "0.27"
+ || lib.versionAtLeast ocaml.version "5.4" && !lib.versionAtLeast version "0.28";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix
index dbf4f3c5379af..a7d0e734b9905 100644
--- a/pkgs/development/ocaml-modules/ocamlnet/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix
@@ -13,62 +13,59 @@
nettle,
}:
-lib.throwIf (lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "5.0")
- "ocamlnet is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+ pname = "ocaml${ocaml.version}-ocamlnet";
+ version = "4.1.9";
- stdenv.mkDerivation
- rec {
- pname = "ocaml${ocaml.version}-ocamlnet";
- version = "4.1.9";
+ src = fetchurl {
+ url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz";
+ sha256 = "1vlwxjxr946gdl61a1d7yk859cijq45f60dhn54ik3w4g6cx33pr";
+ };
- src = fetchurl {
- url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz";
- sha256 = "1vlwxjxr946gdl61a1d7yk859cijq45f60dhn54ik3w4g6cx33pr";
- };
+ nativeBuildInputs = [
+ pkg-config
+ which
+ ocaml
+ findlib
+ ];
+ buildInputs = [
+ ncurses
+ ocaml_pcre
+ camlzip
+ gnutls
+ nettle
+ ];
- nativeBuildInputs = [
- pkg-config
- which
- ocaml
- findlib
- ];
- buildInputs = [
- ncurses
- ocaml_pcre
- camlzip
- gnutls
- nettle
- ];
+ strictDeps = true;
- strictDeps = true;
+ createFindlibDestdir = true;
- createFindlibDestdir = true;
+ dontAddPrefix = true;
+ dontAddStaticConfigureFlags = true;
+ configurePlatforms = [ ];
- dontAddPrefix = true;
- dontAddStaticConfigureFlags = true;
- configurePlatforms = [ ];
+ preConfigure = ''
+ configureFlagsArray=(
+ -bindir $out/bin
+ -enable-gnutls
+ -enable-zip
+ -enable-pcre
+ -disable-gtk2
+ -with-nethttpd
+ -datadir $out/lib/ocaml/${ocaml.version}/ocamlnet
+ )
+ '';
- preConfigure = ''
- configureFlagsArray=(
- -bindir $out/bin
- -enable-gnutls
- -enable-zip
- -enable-pcre
- -disable-gtk2
- -with-nethttpd
- -datadir $out/lib/ocaml/${ocaml.version}/ocamlnet
- )
- '';
+ buildPhase = ''
+ make all
+ make opt
+ '';
- buildPhase = ''
- make all
- make opt
- '';
-
- meta = {
- homepage = "http://projects.camlcity.org/projects/ocamlnet.html";
- description = "Library implementing Internet protocols (http, cgi, email, etc.) for OCaml";
- license = "Most Ocamlnet modules are released under the zlib/png license. The HTTP server module Nethttpd is, however, under the GPL.";
- inherit (ocaml.meta) platforms;
- };
- }
+ meta = {
+ homepage = "http://projects.camlcity.org/projects/ocamlnet.html";
+ description = "Library implementing Internet protocols (http, cgi, email, etc.) for OCaml";
+ license = "Most Ocamlnet modules are released under the zlib/png license. The HTTP server module Nethttpd is, however, under the GPL.";
+ inherit (ocaml.meta) platforms;
+ broken = lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "5.0";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
index 263caad548632..766758489fccb 100644
--- a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
+++ b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
@@ -8,42 +8,39 @@
pprint,
}:
-if lib.versionOlder ocaml.version "4.02" then
- throw "ocp-ocamlres is not available for OCaml ${ocaml.version}"
-else
+stdenv.mkDerivation rec {
+ pname = "ocaml${ocaml.version}-ocp-ocamlres";
+ version = "0.4";
+ src = fetchFromGitHub {
+ owner = "OCamlPro";
+ repo = "ocp-ocamlres";
+ rev = "v${version}";
+ sha256 = "0smfwrj8qhzknhzawygxi0vgl2af4vyi652fkma59rzjpvscqrnn";
+ };
- stdenv.mkDerivation rec {
- pname = "ocaml${ocaml.version}-ocp-ocamlres";
- version = "0.4";
- src = fetchFromGitHub {
- owner = "OCamlPro";
- repo = "ocp-ocamlres";
- rev = "v${version}";
- sha256 = "0smfwrj8qhzknhzawygxi0vgl2af4vyi652fkma59rzjpvscqrnn";
- };
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ];
+ buildInputs = [
+ astring
+ pprint
+ ];
- nativeBuildInputs = [
- ocaml
- findlib
- ];
- buildInputs = [
- astring
- pprint
- ];
+ strictDeps = true;
- strictDeps = true;
+ createFindlibDestdir = true;
- createFindlibDestdir = true;
+ installFlags = [ "BINDIR=$(out)/bin" ];
+ preInstall = "mkdir -p $out/bin";
- installFlags = [ "BINDIR=$(out)/bin" ];
- preInstall = "mkdir -p $out/bin";
-
- meta = {
- description = "Simple tool and library to embed files and directories inside OCaml executables";
- homepage = "https://www.typerex.org/ocp-ocamlres.html";
- license = lib.licenses.lgpl3Plus;
- maintainers = [ lib.maintainers.vbgl ];
- mainProgram = "ocp-ocamlres";
- inherit (ocaml.meta) platforms;
- };
- }
+ meta = {
+ description = "Simple tool and library to embed files and directories inside OCaml executables";
+ homepage = "https://www.typerex.org/ocp-ocamlres.html";
+ license = lib.licenses.lgpl3Plus;
+ maintainers = [ lib.maintainers.vbgl ];
+ mainProgram = "ocp-ocamlres";
+ inherit (ocaml.meta) platforms;
+ broken = lib.versionOlder ocaml.version "4.02";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix
index 8f30944d35908..625e59ff5bb5c 100644
--- a/pkgs/development/ocaml-modules/ocurl/default.nix
+++ b/pkgs/development/ocaml-modules/ocurl/default.nix
@@ -9,40 +9,39 @@
lwt,
lwt_ppx,
}:
-if lib.versionOlder ocaml.version "4.04" then
- throw "ocurl is not available for OCaml ${ocaml.version}"
-else
- stdenv.mkDerivation rec {
- pname = "ocurl";
- version = "0.9.2";
- src = fetchurl {
- url = "https://github.com/ygrek/ocurl/releases/download/${version}/ocurl-${version}.tar.gz";
- sha256 = "sha256-4DWXGMh02s1VwLWW5d7h0jtMOUubWmBPGm1hghfWd2M=";
- };
+stdenv.mkDerivation rec {
+ pname = "ocurl";
+ version = "0.9.2";
- nativeBuildInputs = [
- pkg-config
- ocaml
- findlib
- ];
- propagatedBuildInputs = [
- curl
- lwt
- lwt_ppx
- ];
+ src = fetchurl {
+ url = "https://github.com/ygrek/ocurl/releases/download/${version}/ocurl-${version}.tar.gz";
+ sha256 = "sha256-4DWXGMh02s1VwLWW5d7h0jtMOUubWmBPGm1hghfWd2M=";
+ };
- strictDeps = true;
+ nativeBuildInputs = [
+ pkg-config
+ ocaml
+ findlib
+ ];
+ propagatedBuildInputs = [
+ curl
+ lwt
+ lwt_ppx
+ ];
- createFindlibDestdir = true;
- meta = {
- description = "OCaml bindings to libcurl";
- license = lib.licenses.mit;
- homepage = "http://ygrek.org.ua/p/ocurl/";
- maintainers = with lib.maintainers; [
- dandellion
- bennofs
- ];
- platforms = ocaml.meta.platforms or [ ];
- };
- }
+ strictDeps = true;
+
+ createFindlibDestdir = true;
+ meta = {
+ description = "OCaml bindings to libcurl";
+ license = lib.licenses.mit;
+ homepage = "http://ygrek.org.ua/p/ocurl/";
+ maintainers = with lib.maintainers; [
+ dandellion
+ bennofs
+ ];
+ platforms = ocaml.meta.platforms or [ ];
+ broken = lib.versionOlder ocaml.version "4.04";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/osdp/default.nix b/pkgs/development/ocaml-modules/osdp/default.nix
index 05af890d045ac..1f11669e8f390 100644
--- a/pkgs/development/ocaml-modules/osdp/default.nix
+++ b/pkgs/development/ocaml-modules/osdp/default.nix
@@ -10,37 +10,34 @@
autoconf,
}:
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
- "osdp is not available for OCaml ${ocaml.version}"
+buildDunePackage {
+ pname = "osdp";
+ version = "1.1.1";
- buildDunePackage
- {
- pname = "osdp";
- version = "1.1.1";
+ src = fetchurl {
+ url = "https://github.com/Embedded-SW-VnV/osdp/releases/download/v1.1.1/osdp-1.1.1.tgz";
+ hash = "sha256-X7CS2g+MyQPDjhUCvFS/DoqcCXTEw8SCsSGED64TGKQ=";
+ };
- src = fetchurl {
- url = "https://github.com/Embedded-SW-VnV/osdp/releases/download/v1.1.1/osdp-1.1.1.tgz";
- hash = "sha256-X7CS2g+MyQPDjhUCvFS/DoqcCXTEw8SCsSGED64TGKQ=";
- };
+ preConfigure = ''
+ autoconf
+ '';
- preConfigure = ''
- autoconf
- '';
+ nativeBuildInputs = [
+ autoconf
+ findlib
+ csdp
+ ];
+ propagatedBuildInputs = [
+ zarith
+ ocplib-simplex
+ csdp
+ ];
- nativeBuildInputs = [
- autoconf
- findlib
- csdp
- ];
- propagatedBuildInputs = [
- zarith
- ocplib-simplex
- csdp
- ];
-
- meta = {
- description = "OCaml Interface to SDP solvers";
- homepage = "https://github.com/Embedded-SW-VnV/osdp";
- license = lib.licenses.lgpl3Plus;
- };
- }
+ meta = {
+ description = "OCaml Interface to SDP solvers";
+ homepage = "https://github.com/Embedded-SW-VnV/osdp";
+ license = lib.licenses.lgpl3Plus;
+ broken = lib.versionAtLeast ocaml.version "5.0";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix
index 1c45d67324d60..6a60fd9cf1760 100644
--- a/pkgs/development/ocaml-modules/piqi/default.nix
+++ b/pkgs/development/ocaml-modules/piqi/default.nix
@@ -11,54 +11,51 @@
base64,
}:
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
- "piqi is not available for OCaml ${ocaml.version}"
-
- stdenv.mkDerivation
- rec {
- version = "0.6.16";
- pname = "piqi";
- name = "ocaml${ocaml.version}-${pname}-${version}";
-
- src = fetchFromGitHub {
- owner = "alavrik";
- repo = pname;
- rev = "v${version}";
- sha256 = "sha256-qE+yybTn+kzbY0h8udhZYO+GwQPI/J/6p3LMmF12cFU=";
- };
-
- nativeBuildInputs = [
- ocaml
- findlib
- which
- ];
- propagatedBuildInputs = [
- sedlex
- xmlm
- easy-format
- base64
- ];
-
- strictDeps = true;
-
- patches = [
- ./no-stream.patch
- ./no-ocamlpath-override.patch
- ];
-
- createFindlibDestdir = true;
-
- postBuild = "make -C piqilib piqilib.cma";
-
- installTargets = [
- "install"
- "ocaml-install"
- ];
-
- meta = with lib; {
- homepage = "https://piqi.org";
- description = "Universal schema language and a collection of tools built around it";
- license = licenses.asl20;
- maintainers = [ maintainers.maurer ];
- };
- }
+stdenv.mkDerivation rec {
+ version = "0.6.16";
+ pname = "piqi";
+ name = "ocaml${ocaml.version}-${pname}-${version}";
+
+ src = fetchFromGitHub {
+ owner = "alavrik";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-qE+yybTn+kzbY0h8udhZYO+GwQPI/J/6p3LMmF12cFU=";
+ };
+
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ which
+ ];
+ propagatedBuildInputs = [
+ sedlex
+ xmlm
+ easy-format
+ base64
+ ];
+
+ strictDeps = true;
+
+ patches = [
+ ./no-stream.patch
+ ./no-ocamlpath-override.patch
+ ];
+
+ createFindlibDestdir = true;
+
+ postBuild = "make -C piqilib piqilib.cma";
+
+ installTargets = [
+ "install"
+ "ocaml-install"
+ ];
+
+ meta = with lib; {
+ homepage = "https://piqi.org";
+ description = "Universal schema language and a collection of tools built around it";
+ license = licenses.asl20;
+ maintainers = [ maintainers.maurer ];
+ broken = lib.versionAtLeast ocaml.version "5.0";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix
index 75bdee5783a8e..e8ed1e4540e26 100644
--- a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix
@@ -14,46 +14,43 @@
findlib,
}:
-lib.throwIf (lib.versionAtLeast ocaml.version "5.2")
- "ppx_cstubs is not available for OCaml ${ocaml.version}"
-
- buildDunePackage
- rec {
- pname = "ppx_cstubs";
- version = "0.7.0";
-
- minimalOCamlVersion = "4.08";
-
- src = fetchFromGitHub {
- owner = "fdopen";
- repo = "ppx_cstubs";
- rev = version;
- hash = "sha256-qMmwRWCIfNyhCQYPKLiufnb57sTR3P+WInOqtPDywFs=";
- };
-
- patches = [ ./ppxlib.patch ];
-
- nativeBuildInputs = [ cppo ];
-
- buildInputs = [
- bigarray-compat
- containers
- findlib
- integers
- num
- ppxlib
- re
- ];
-
- propagatedBuildInputs = [
- ctypes
- ];
-
- meta = with lib; {
- homepage = "https://github.com/fdopen/ppx_cstubs";
- changelog = "https://github.com/fdopen/ppx_cstubs/raw/${version}/CHANGES.md";
- description = "Preprocessor for easier stub generation with ocaml-ctypes";
- license = licenses.lgpl21Plus;
- maintainers = [ maintainers.osener ];
- };
- }
+buildDunePackage rec {
+ pname = "ppx_cstubs";
+ version = "0.7.0";
+
+ minimalOCamlVersion = "4.08";
+
+ src = fetchFromGitHub {
+ owner = "fdopen";
+ repo = "ppx_cstubs";
+ rev = version;
+ hash = "sha256-qMmwRWCIfNyhCQYPKLiufnb57sTR3P+WInOqtPDywFs=";
+ };
+
+ patches = [ ./ppxlib.patch ];
+
+ nativeBuildInputs = [ cppo ];
+
+ buildInputs = [
+ bigarray-compat
+ containers
+ findlib
+ integers
+ num
+ ppxlib
+ re
+ ];
+
+ propagatedBuildInputs = [
+ ctypes
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/fdopen/ppx_cstubs";
+ changelog = "https://github.com/fdopen/ppx_cstubs/raw/${version}/CHANGES.md";
+ description = "Preprocessor for easier stub generation with ocaml-ctypes";
+ license = licenses.lgpl21Plus;
+ maintainers = [ maintainers.osener ];
+ broken = lib.versionAtLeast ocaml.version "5.2";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix
index 21d6f116b9e70..086b0da2576f4 100644
--- a/pkgs/development/ocaml-modules/ppx_tools/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix
@@ -8,97 +8,85 @@
cppo,
}:
-if lib.versionAtLeast ocaml.version "5.2" then
- throw "ppx_tools is not available for OCaml ${ocaml.version}"
-else
-
- let
- param =
- let
- v6_6 = {
- version = "6.6";
- sha256 = "sha256-QhuaQ9346a3neoRM4GrOVzjR8fg9ysMZR1VzNgyIQtc=";
- nativeBuildInputs = [ cppo ];
- buildInputs = [ cppo ];
- };
- in
- {
- "4.02" = {
- version = "5.0+4.02.0";
- sha256 = "16drjk0qafjls8blng69qiv35a84wlafpk16grrg2i3x19p8dlj8";
- };
- "4.03" = {
- version = "5.0+4.03.0";
- sha256 = "061v1fl5z7z3ywi4ppryrlcywnvnqbsw83ppq72qmkc7ma4603jg";
- };
- "4.04" = {
- version = "unstable-20161114";
- rev = "49c08e2e4ea8fef88692cd1dcc1b38a9133f17ac";
- sha256 = "0ywzfkf5brj33nwh49k9if8x8v433ral25f3nbklfc9vqr06zrfl";
- };
- "4.05" = {
- version = "5.0+4.05.0";
- sha256 = "1jvvhk6wnkvm7b9zph309ihsc0hyxfpahmxxrq19vx8c674jsdm4";
- };
- "4.06" = {
- version = "5.1+4.06.0";
- sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw";
- };
- "4.07" = {
- version = "5.1+4.06.0";
- sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw";
- };
- "4.08" = v6_6;
- "4.09" = v6_6;
- "4.10" = v6_6;
- "4.11" = v6_6;
- "4.12" = v6_6;
- "4.13" = v6_6;
- "4.14" = v6_6;
- "5.0" = v6_6;
- "5.1" = v6_6;
- }
- .${ocaml.meta.branch};
- in
-
- let
- src = fetchFromGitHub {
- owner = "alainfrisch";
- repo = pname;
- rev = param.rev or param.version;
- inherit (param) sha256;
- };
- pname = "ppx_tools";
- meta = with lib; {
- description = "Tools for authors of ppx rewriters";
- homepage = "https://www.lexifi.com/ppx_tools";
- license = licenses.mit;
- maintainers = with maintainers; [ vbgl ];
- };
- in
- if lib.versionAtLeast param.version "6.0" then
- buildDunePackage {
- inherit pname src meta;
- inherit (param) version buildInputs nativeBuildInputs;
+let
+ param =
+ let
+ v6_6 = {
+ version = "6.6";
+ sha256 = "sha256-QhuaQ9346a3neoRM4GrOVzjR8fg9ysMZR1VzNgyIQtc=";
+ nativeBuildInputs = [ cppo ];
+ buildInputs = [ cppo ];
+ };
+ in
+ {
+ "4.02" = {
+ version = "5.0+4.02.0";
+ sha256 = "16drjk0qafjls8blng69qiv35a84wlafpk16grrg2i3x19p8dlj8";
+ };
+ "4.03" = {
+ version = "5.0+4.03.0";
+ sha256 = "061v1fl5z7z3ywi4ppryrlcywnvnqbsw83ppq72qmkc7ma4603jg";
+ };
+ "4.04" = {
+ version = "unstable-20161114";
+ rev = "49c08e2e4ea8fef88692cd1dcc1b38a9133f17ac";
+ sha256 = "0ywzfkf5brj33nwh49k9if8x8v433ral25f3nbklfc9vqr06zrfl";
+ };
+ "4.05" = {
+ version = "5.0+4.05.0";
+ sha256 = "1jvvhk6wnkvm7b9zph309ihsc0hyxfpahmxxrq19vx8c674jsdm4";
+ };
+ "4.06" = {
+ version = "5.1+4.06.0";
+ sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw";
+ };
+ "4.07" = {
+ version = "5.1+4.06.0";
+ sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw";
+ };
}
- else
- stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-${pname}-${param.version}";
+ .${ocaml.meta.branch} or v6_6;
+in
+
+let
+ src = fetchFromGitHub {
+ owner = "alainfrisch";
+ repo = pname;
+ rev = param.rev or param.version;
+ inherit (param) sha256;
+ };
+ pname = "ppx_tools";
+ meta = with lib; {
+ description = "Tools for authors of ppx rewriters";
+ homepage = "https://www.lexifi.com/ppx_tools";
+ license = licenses.mit;
+ maintainers = with maintainers; [ vbgl ];
+ broken = lib.versionAtLeast ocaml.version "5.2";
+ };
+in
+if lib.versionAtLeast param.version "6.0" then
+ buildDunePackage {
+ inherit pname src meta;
+ inherit (param) version buildInputs nativeBuildInputs;
+ }
+else
+ stdenv.mkDerivation {
+ name = "ocaml${ocaml.version}-${pname}-${param.version}";
- inherit src;
+ inherit src;
- nativeBuildInputs = [
- ocaml
- findlib
- ];
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ];
- strictDeps = true;
+ strictDeps = true;
- createFindlibDestdir = true;
+ createFindlibDestdir = true;
- dontStrip = true;
+ dontStrip = true;
- meta = meta // {
- inherit (ocaml.meta) platforms;
- };
- }
+ meta = meta // {
+ inherit (ocaml.meta) platforms;
+ };
+ }
diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix
index 759d92bb44672..76aabf9f81940 100644
--- a/pkgs/development/ocaml-modules/ppxlib/default.nix
+++ b/pkgs/development/ocaml-modules/ppxlib/default.nix
@@ -103,37 +103,32 @@ let
."${version}";
in
-if
- param ? max_version && lib.versionAtLeast ocaml.version param.max_version
- || param ? min_version && lib.versionOlder ocaml.version param.min_version
-then
- throw "ppxlib-${version} is not available for OCaml ${ocaml.version}"
-else
+buildDunePackage rec {
+ pname = "ppxlib";
+ inherit version;
- buildDunePackage rec {
- pname = "ppxlib";
- inherit version;
+ src = fetchurl {
+ url = "https://github.com/ocaml-ppx/ppxlib/releases/download/${version}/ppxlib-${version}.tbz";
+ inherit (param) sha256;
+ };
- src =
- param.src or (fetchurl {
- url = "https://github.com/ocaml-ppx/ppxlib/releases/download/${version}/ppxlib-${version}.tbz";
- inherit (param) sha256;
- });
+ propagatedBuildInputs = [
+ ocaml-compiler-libs
+ ]
+ ++ (param.OMP or [ ])
+ ++ [
+ ppx_derivers
+ stdio
+ stdlib-shims
+ ];
- propagatedBuildInputs = [
- ocaml-compiler-libs
- ]
- ++ (param.OMP or [ ])
- ++ [
- ppx_derivers
- stdio
- stdlib-shims
- ];
-
- meta = {
- description = "Comprehensive ppx tool set";
- license = lib.licenses.mit;
- maintainers = [ lib.maintainers.vbgl ];
- homepage = "https://github.com/ocaml-ppx/ppxlib";
- };
- }
+ meta = {
+ description = "Comprehensive ppx tool set";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.vbgl ];
+ homepage = "https://github.com/ocaml-ppx/ppxlib";
+ broken =
+ param ? max_version && lib.versionAtLeast ocaml.version param.max_version
+ || param ? min_version && lib.versionOlder ocaml.version param.min_version;
+ };
+}
diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix
index 4624e22600a16..a29060b191bbd 100644
--- a/pkgs/development/ocaml-modules/ptime/default.nix
+++ b/pkgs/development/ocaml-modules/ptime/default.nix
@@ -8,50 +8,47 @@
topkg,
}:
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
- "ptime is not available for OCaml ${ocaml.version}"
-
- stdenv.mkDerivation
- (finalAttrs: {
- version = "1.2.0";
- pname = "ocaml${ocaml.version}-ptime";
-
- src = fetchurl {
- url = "https://erratique.ch/software/ptime/releases/ptime-${finalAttrs.version}.tbz";
- hash = "sha256-lhZ0f99JDsNugCTKsn7gHjoK9XfYojImY4+kA03nOrA=";
- };
-
- nativeBuildInputs = [
- findlib
- ocaml
- ocamlbuild
- topkg
- ];
-
- buildInputs = [
- topkg
- ];
-
- strictDeps = true;
-
- inherit (topkg) buildPhase installPhase;
-
- meta = {
- description = "POSIX time for OCaml";
- homepage = "https://erratique.ch/software/ptime";
- license = lib.licenses.isc;
- longDescription = ''
- Ptime has platform independent POSIX time support in pure OCaml.
- It provides a type to represent a well-defined range of POSIX timestamps
- with picosecond precision, conversion with date-time values, conversion
- with RFC 3339 timestamps and pretty printing to a human-readable,
- locale-independent representation.
-
- The additional Ptime_clock library provides access to a system POSIX clock
- and to the system's current time zone offset.
-
- Ptime is not a calendar library.
- '';
- maintainers = with lib.maintainers; [ sternenseemann ];
- };
- })
+stdenv.mkDerivation (finalAttrs: {
+ version = "1.2.0";
+ pname = "ocaml${ocaml.version}-ptime";
+
+ src = fetchurl {
+ url = "https://erratique.ch/software/ptime/releases/ptime-${finalAttrs.version}.tbz";
+ hash = "sha256-lhZ0f99JDsNugCTKsn7gHjoK9XfYojImY4+kA03nOrA=";
+ };
+
+ nativeBuildInputs = [
+ findlib
+ ocaml
+ ocamlbuild
+ topkg
+ ];
+
+ buildInputs = [
+ topkg
+ ];
+
+ strictDeps = true;
+
+ inherit (topkg) buildPhase installPhase;
+
+ meta = {
+ description = "POSIX time for OCaml";
+ homepage = "https://erratique.ch/software/ptime";
+ license = lib.licenses.isc;
+ longDescription = ''
+ Ptime has platform independent POSIX time support in pure OCaml.
+ It provides a type to represent a well-defined range of POSIX timestamps
+ with picosecond precision, conversion with date-time values, conversion
+ with RFC 3339 timestamps and pretty printing to a human-readable,
+ locale-independent representation.
+
+ The additional Ptime_clock library provides access to a system POSIX clock
+ and to the system's current time zone offset.
+
+ Ptime is not a calendar library.
+ '';
+ maintainers = with lib.maintainers; [ sternenseemann ];
+ broken = !(lib.versionAtLeast ocaml.version "4.08");
+ };
+})
diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/pkgs/development/ocaml-modules/rresult/default.nix
index cc559c1c1740b..43a860367b589 100644
--- a/pkgs/development/ocaml-modules/rresult/default.nix
+++ b/pkgs/development/ocaml-modules/rresult/default.nix
@@ -9,37 +9,34 @@
result,
}:
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07")
- "rresult is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+ pname = "ocaml${ocaml.version}-rresult";
+ version = "0.7.0";
+ src = fetchurl {
+ url = "https://erratique.ch/software/rresult/releases/rresult-${version}.tbz";
+ sha256 = "sha256-Eap/W4NGDmBDHjFU4+MsBx1G4VHqV2DPJDd4Bb+XVUA=";
+ };
- stdenv.mkDerivation
- rec {
- pname = "ocaml${ocaml.version}-rresult";
- version = "0.7.0";
- src = fetchurl {
- url = "https://erratique.ch/software/rresult/releases/rresult-${version}.tbz";
- sha256 = "sha256-Eap/W4NGDmBDHjFU4+MsBx1G4VHqV2DPJDd4Bb+XVUA=";
- };
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ocamlbuild
+ topkg
+ ];
+ buildInputs = [ topkg ];
- nativeBuildInputs = [
- ocaml
- findlib
- ocamlbuild
- topkg
- ];
- buildInputs = [ topkg ];
+ propagatedBuildInputs = [ result ];
- propagatedBuildInputs = [ result ];
+ strictDeps = true;
- strictDeps = true;
+ inherit (topkg) buildPhase installPhase;
- inherit (topkg) buildPhase installPhase;
-
- meta = {
- license = lib.licenses.isc;
- homepage = "https://erratique.ch/software/rresult";
- description = "Result value combinators for OCaml";
- maintainers = [ lib.maintainers.vbgl ];
- inherit (ocaml.meta) platforms;
- };
- }
+ meta = {
+ license = lib.licenses.isc;
+ homepage = "https://erratique.ch/software/rresult";
+ description = "Result value combinators for OCaml";
+ maintainers = [ lib.maintainers.vbgl ];
+ inherit (ocaml.meta) platforms;
+ broken = !(lib.versionAtLeast ocaml.version "4.07");
+ };
+}
diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix
index 57cf08744cb3a..5bb16cd6e86be 100644
--- a/pkgs/development/ocaml-modules/sawja/default.nix
+++ b/pkgs/development/ocaml-modules/sawja/default.nix
@@ -12,51 +12,47 @@ let
pname = "sawja";
version = "1.5.12";
in
-
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
- "${pname} is not available for OCaml ${ocaml.version}"
-
- stdenv.mkDerivation
- {
-
- pname = "ocaml${ocaml.version}-${pname}";
-
- inherit version;
-
- src = fetchFromGitHub {
- owner = "javalib-team";
- repo = pname;
- rev = version;
- hash = "sha256-G1W8/G0TEcldnFnH/NAb9a6ZSGGP2fWTM47lI8bBHnw=";
- };
-
- nativeBuildInputs = [
- which
- ocaml
- findlib
- ];
-
- strictDeps = true;
-
- patches = [
- ./configure.sh.patch
- ./Makefile.config.example.patch
- ];
-
- createFindlibDestdir = true;
-
- configureScript = "./configure.sh";
- dontAddPrefix = "true";
- dontAddStaticConfigureFlags = true;
- configurePlatforms = [ ];
-
- propagatedBuildInputs = [ javalib ];
-
- meta = with lib; {
- description = "Library written in OCaml, relying on Javalib to provide a high level representation of Java bytecode programs";
- homepage = "http://sawja.inria.fr/";
- license = licenses.gpl3Plus;
- maintainers = [ maintainers.vbgl ];
- inherit (ocaml.meta) platforms;
- };
- }
+stdenv.mkDerivation {
+
+ pname = "ocaml${ocaml.version}-${pname}";
+
+ inherit version;
+
+ src = fetchFromGitHub {
+ owner = "javalib-team";
+ repo = pname;
+ rev = version;
+ hash = "sha256-G1W8/G0TEcldnFnH/NAb9a6ZSGGP2fWTM47lI8bBHnw=";
+ };
+
+ nativeBuildInputs = [
+ which
+ ocaml
+ findlib
+ ];
+
+ strictDeps = true;
+
+ patches = [
+ ./configure.sh.patch
+ ./Makefile.config.example.patch
+ ];
+
+ createFindlibDestdir = true;
+
+ configureScript = "./configure.sh";
+ dontAddPrefix = "true";
+ dontAddStaticConfigureFlags = true;
+ configurePlatforms = [ ];
+
+ propagatedBuildInputs = [ javalib ];
+
+ meta = with lib; {
+ description = "Library written in OCaml, relying on Javalib to provide a high level representation of Java bytecode programs";
+ homepage = "http://sawja.inria.fr/";
+ license = licenses.gpl3Plus;
+ maintainers = [ maintainers.vbgl ];
+ inherit (ocaml.meta) platforms;
+ broken = !(lib.versionAtLeast ocaml.version "4.08");
+ };
+}
diff --git a/pkgs/development/ocaml-modules/sodium/default.nix b/pkgs/development/ocaml-modules/sodium/default.nix
index 7ca2e65935adb..77b91c1137901 100644
--- a/pkgs/development/ocaml-modules/sodium/default.nix
+++ b/pkgs/development/ocaml-modules/sodium/default.nix
@@ -9,46 +9,43 @@
libsodium,
}:
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
- "sodium is not available for OCaml ${ocaml.version}"
-
- stdenv.mkDerivation
- rec {
- pname = "ocaml${ocaml.version}-sodium";
- version = "0.6.0";
-
- src = fetchFromGitHub {
- owner = "dsheets";
- repo = "ocaml-sodium";
- rev = version;
- sha256 = "124gpi1jhac46x05gp5viykyrafnlp03v1cmkl13c6pgcs8w04pv";
- };
-
- patches = [
- # ctypes.stubs no longer pulls in bigarray automatically
- ./lib-gen-link-bigarray.patch
- ];
-
- nativeBuildInputs = [
- ocaml
- findlib
- ocamlbuild
- ];
- propagatedBuildInputs = [
- ctypes
- libsodium
- ];
-
- strictDeps = true;
-
- createFindlibDestdir = true;
-
- hardeningDisable = lib.optional stdenv.hostPlatform.isDarwin "strictoverflow";
-
- meta = with lib; {
- homepage = "https://github.com/dsheets/ocaml-sodium";
- description = "Binding to libsodium 1.0.9+";
- inherit (ocaml.meta) platforms;
- maintainers = [ maintainers.rixed ];
- };
- }
+stdenv.mkDerivation rec {
+ pname = "ocaml${ocaml.version}-sodium";
+ version = "0.6.0";
+
+ src = fetchFromGitHub {
+ owner = "dsheets";
+ repo = "ocaml-sodium";
+ rev = version;
+ sha256 = "124gpi1jhac46x05gp5viykyrafnlp03v1cmkl13c6pgcs8w04pv";
+ };
+
+ patches = [
+ # ctypes.stubs no longer pulls in bigarray automatically
+ ./lib-gen-link-bigarray.patch
+ ];
+
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ocamlbuild
+ ];
+ propagatedBuildInputs = [
+ ctypes
+ libsodium
+ ];
+
+ strictDeps = true;
+
+ createFindlibDestdir = true;
+
+ hardeningDisable = lib.optional stdenv.hostPlatform.isDarwin "strictoverflow";
+
+ meta = with lib; {
+ homepage = "https://github.com/dsheets/ocaml-sodium";
+ description = "Binding to libsodium 1.0.9+";
+ inherit (ocaml.meta) platforms;
+ maintainers = [ maintainers.rixed ];
+ broken = lib.versionAtLeast ocaml.version "5.0";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/sosa/default.nix b/pkgs/development/ocaml-modules/sosa/default.nix
index ded25d88f58e3..5659bb4fa3809 100644
--- a/pkgs/development/ocaml-modules/sosa/default.nix
+++ b/pkgs/development/ocaml-modules/sosa/default.nix
@@ -7,46 +7,43 @@
ocamlbuild,
}:
-lib.throwIf (lib.versionOlder ocaml.version "4.02")
- "sosa is not available for OCaml ${ocaml.version}"
-
- stdenv.mkDerivation
- rec {
- pname = "ocaml${ocaml.version}-sosa";
- version = "0.3.0";
-
- src = fetchFromGitHub {
- owner = "hammerlab";
- repo = "sosa";
- rev = "sosa.${version}";
- sha256 = "053hdv6ww0q4mivajj4iyp7krfvgq8zajq9d8x4mia4lid7j0dyk";
- };
-
- postPatch = lib.optionalString (lib.versionAtLeast ocaml.version "4.07") ''
- for p in functors list_of of_mutable
- do
- substituteInPlace src/lib/$p.ml --replace Pervasives. Stdlib.
- done
- '';
-
- nativeBuildInputs = [
- ocaml
- ocamlbuild
- findlib
- ];
-
- strictDeps = true;
-
- buildPhase = "make build";
-
- createFindlibDestdir = true;
-
- doCheck = true;
-
- meta = with lib; {
- homepage = "http://www.hammerlab.org/docs/sosa/master/index.html";
- description = "Sane OCaml String API";
- license = licenses.isc;
- maintainers = [ maintainers.alexfmpe ];
- };
- }
+stdenv.mkDerivation rec {
+ pname = "ocaml${ocaml.version}-sosa";
+ version = "0.3.0";
+
+ src = fetchFromGitHub {
+ owner = "hammerlab";
+ repo = "sosa";
+ rev = "sosa.${version}";
+ sha256 = "053hdv6ww0q4mivajj4iyp7krfvgq8zajq9d8x4mia4lid7j0dyk";
+ };
+
+ postPatch = lib.optionalString (lib.versionAtLeast ocaml.version "4.07") ''
+ for p in functors list_of of_mutable
+ do
+ substituteInPlace src/lib/$p.ml --replace Pervasives. Stdlib.
+ done
+ '';
+
+ nativeBuildInputs = [
+ ocaml
+ ocamlbuild
+ findlib
+ ];
+
+ strictDeps = true;
+
+ buildPhase = "make build";
+
+ createFindlibDestdir = true;
+
+ doCheck = true;
+
+ meta = with lib; {
+ homepage = "http://www.hammerlab.org/docs/sosa/master/index.html";
+ description = "Sane OCaml String API";
+ license = licenses.isc;
+ maintainers = [ maintainers.alexfmpe ];
+ broken = !(lib.versionOlder ocaml.version "4.02");
+ };
+}
diff --git a/pkgs/development/ocaml-modules/stdcompat/default.nix b/pkgs/development/ocaml-modules/stdcompat/default.nix
index dd1a26e1ebac1..d75b4839a8b0b 100644
--- a/pkgs/development/ocaml-modules/stdcompat/default.nix
+++ b/pkgs/development/ocaml-modules/stdcompat/default.nix
@@ -5,27 +5,24 @@
fetchurl,
}:
-lib.throwIf (lib.versionAtLeast ocaml.version "5.2")
- "stdcompat is not available for OCaml ${ocaml.version}"
+buildDunePackage rec {
+ pname = "stdcompat";
+ version = "19";
- buildDunePackage
- rec {
- pname = "stdcompat";
- version = "19";
+ minimalOCamlVersion = "4.06";
- minimalOCamlVersion = "4.06";
+ src = fetchurl {
+ url = "https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz";
+ sha256 = "sha256-DKQGd4nnIN6SPls6hcA/2Jvc7ivYNpeMU6rYsVc1ClU=";
+ };
- src = fetchurl {
- url = "https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz";
- sha256 = "sha256-DKQGd4nnIN6SPls6hcA/2Jvc7ivYNpeMU6rYsVc1ClU=";
- };
+ # Otherwise ./configure script will run and create files conflicting with dune.
+ dontConfigure = true;
- # Otherwise ./configure script will run and create files conflicting with dune.
- dontConfigure = true;
-
- meta = {
- homepage = "https://github.com/thierry-martinez/stdcompat";
- license = lib.licenses.bsd2;
- maintainers = [ lib.maintainers.vbgl ];
- };
- }
+ meta = {
+ homepage = "https://github.com/thierry-martinez/stdcompat";
+ license = lib.licenses.bsd2;
+ maintainers = [ lib.maintainers.vbgl ];
+ broken = lib.versionAtLeast ocaml.version "5.2";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix
index 092d3973db900..d5b5517411f1f 100644
--- a/pkgs/development/ocaml-modules/tsdl/default.nix
+++ b/pkgs/development/ocaml-modules/tsdl/default.nix
@@ -13,56 +13,53 @@
pkg-config,
}:
-if lib.versionOlder ocaml.version "4.03" then
- throw "tsdl is not available for OCaml ${ocaml.version}"
-else
+let
+ pname = "tsdl";
+ version = "1.1.0";
+ webpage = "https://erratique.ch/software/${pname}";
+in
- let
- pname = "tsdl";
- version = "1.1.0";
- webpage = "https://erratique.ch/software/${pname}";
- in
+stdenv.mkDerivation {
+ pname = "ocaml${ocaml.version}-${pname}";
+ inherit version;
- stdenv.mkDerivation {
- pname = "ocaml${ocaml.version}-${pname}";
- inherit version;
+ src = fetchurl {
+ url = "${webpage}/releases/${pname}-${version}.tbz";
+ hash = "sha256-ZN4+trqesU1IREKcwm1Ro37jszKG8XcVigoE4BdGhzs=";
+ };
- src = fetchurl {
- url = "${webpage}/releases/${pname}-${version}.tbz";
- hash = "sha256-ZN4+trqesU1IREKcwm1Ro37jszKG8XcVigoE4BdGhzs=";
- };
+ strictDeps = true;
- strictDeps = true;
+ nativeBuildInputs = [
+ pkg-config
+ ocaml
+ findlib
+ ocamlbuild
+ topkg
+ ];
+ buildInputs = [ topkg ];
+ propagatedBuildInputs = [
+ SDL2
+ ctypes
+ ctypes-foreign
+ ];
- nativeBuildInputs = [
- pkg-config
- ocaml
- findlib
- ocamlbuild
- topkg
- ];
- buildInputs = [ topkg ];
- propagatedBuildInputs = [
- SDL2
- ctypes
- ctypes-foreign
- ];
+ preConfigure = ''
+ # The following is done to avoid an additional dependency (ncurses)
+ # due to linking in the custom bytecode runtime. Instead, just
+ # compile directly into a native binary, even if it's just a
+ # temporary build product.
+ substituteInPlace myocamlbuild.ml \
+ --replace ".byte" ".native"
+ '';
- preConfigure = ''
- # The following is done to avoid an additional dependency (ncurses)
- # due to linking in the custom bytecode runtime. Instead, just
- # compile directly into a native binary, even if it's just a
- # temporary build product.
- substituteInPlace myocamlbuild.ml \
- --replace ".byte" ".native"
- '';
+ inherit (topkg) buildPhase installPhase;
- inherit (topkg) buildPhase installPhase;
-
- meta = with lib; {
- homepage = webpage;
- description = "Thin bindings to the cross-platform SDL library";
- license = licenses.isc;
- inherit (ocaml.meta) platforms;
- };
- }
+ meta = with lib; {
+ homepage = webpage;
+ description = "Thin bindings to the cross-platform SDL library";
+ license = licenses.isc;
+ inherit (ocaml.meta) platforms;
+ broken = lib.versionOlder ocaml.version "4.03";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/twt/default.nix b/pkgs/development/ocaml-modules/twt/default.nix
index ef5fae48b37c7..eb30e395c749b 100644
--- a/pkgs/development/ocaml-modules/twt/default.nix
+++ b/pkgs/development/ocaml-modules/twt/default.nix
@@ -6,45 +6,42 @@
findlib,
}:
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
- "twt is not available for OCaml ${ocaml.version}"
-
- stdenv.mkDerivation
- rec {
- pname = "ocaml${ocaml.version}-twt";
- version = "0.94.0";
-
- src = fetchFromGitHub {
- owner = "mlin";
- repo = "twt";
- rev = "v${version}";
- sha256 = "sha256-xbjLPd7P1KyuC3i6WHLBcdLwd14atcBsd5ER+l97KAk=";
- };
-
- nativeBuildInputs = [
- ocaml
- findlib
- ];
-
- strictDeps = true;
-
- preInstall = ''
- mkdir -p $out/bin
- mkdir -p $OCAMLFIND_DESTDIR
- '';
-
- dontBuild = true;
-
- installFlags = [ "PREFIX=$(out)" ];
-
- dontStrip = true;
-
- meta = with lib; {
- description = "“The Whitespace Thing” for OCaml";
- homepage = "http://people.csail.mit.edu/mikelin/ocaml+twt/";
- license = licenses.mit;
- maintainers = [ maintainers.vbgl ];
- mainProgram = "ocaml+twt";
- inherit (ocaml.meta) platforms;
- };
- }
+stdenv.mkDerivation rec {
+ pname = "ocaml${ocaml.version}-twt";
+ version = "0.94.0";
+
+ src = fetchFromGitHub {
+ owner = "mlin";
+ repo = "twt";
+ rev = "v${version}";
+ sha256 = "sha256-xbjLPd7P1KyuC3i6WHLBcdLwd14atcBsd5ER+l97KAk=";
+ };
+
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ];
+
+ strictDeps = true;
+
+ preInstall = ''
+ mkdir -p $out/bin
+ mkdir -p $OCAMLFIND_DESTDIR
+ '';
+
+ dontBuild = true;
+
+ installFlags = [ "PREFIX=$(out)" ];
+
+ dontStrip = true;
+
+ meta = with lib; {
+ description = "“The Whitespace Thing” for OCaml";
+ homepage = "http://people.csail.mit.edu/mikelin/ocaml+twt/";
+ license = licenses.mit;
+ maintainers = [ maintainers.vbgl ];
+ mainProgram = "ocaml+twt";
+ broken = lib.versionAtLeast ocaml.version "5.0";
+ inherit (ocaml.meta) platforms;
+ };
+}
diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix
index 512be9b782f4b..d6f3781fe588f 100644
--- a/pkgs/development/ocaml-modules/ulex/default.nix
+++ b/pkgs/development/ocaml-modules/ulex/default.nix
@@ -22,44 +22,40 @@ let
sha256 = "0cmscxcmcxhlshh4jd0lzw5ffzns12x3bj7h27smbc8waxkwffhl";
};
in
-
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
- "ulex is not available for OCaml ${ocaml.version}"
-
- stdenv.mkDerivation
- {
- pname = "ocaml${ocaml.version}-${pname}";
- inherit (param) version;
-
- src = fetchFromGitHub {
- owner = "ocaml-community";
- repo = pname;
- rev = "v${param.version}";
- inherit (param) sha256;
- };
-
- createFindlibDestdir = true;
-
- nativeBuildInputs = [
- ocaml
- findlib
- ocamlbuild
- camlp4
- ];
- propagatedBuildInputs = [ camlp4 ];
-
- strictDeps = true;
-
- buildFlags = [
- "all"
- "all.opt"
- ];
-
- meta = {
- homepage = "https://opam.ocaml.org/packages/ulex/";
- description = "Lexer generator for Unicode and OCaml";
- license = lib.licenses.mit;
- inherit (ocaml.meta) platforms;
- maintainers = [ lib.maintainers.roconnor ];
- };
- }
+stdenv.mkDerivation {
+ pname = "ocaml${ocaml.version}-${pname}";
+ inherit (param) version;
+
+ src = fetchFromGitHub {
+ owner = "ocaml-community";
+ repo = pname;
+ rev = "v${param.version}";
+ inherit (param) sha256;
+ };
+
+ createFindlibDestdir = true;
+
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ocamlbuild
+ camlp4
+ ];
+ propagatedBuildInputs = [ camlp4 ];
+
+ strictDeps = true;
+
+ buildFlags = [
+ "all"
+ "all.opt"
+ ];
+
+ meta = {
+ homepage = "https://opam.ocaml.org/packages/ulex/";
+ description = "Lexer generator for Unicode and OCaml";
+ license = lib.licenses.mit;
+ inherit (ocaml.meta) platforms;
+ maintainers = [ lib.maintainers.roconnor ];
+ broken = lib.versionAtLeast ocaml.version "5.0";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/uri/sexp.nix b/pkgs/development/ocaml-modules/uri/sexp.nix
index df54c7636c739..db31f8d0f0371 100644
--- a/pkgs/development/ocaml-modules/uri/sexp.nix
+++ b/pkgs/development/ocaml-modules/uri/sexp.nix
@@ -8,21 +8,21 @@
sexplib0,
}:
-if lib.versionOlder ocaml.version "4.04" then
- throw "uri-sexp is not available for OCaml ${ocaml.version}"
-else
+buildDunePackage {
+ pname = "uri-sexp";
+ inherit (uri) version src;
- buildDunePackage {
- pname = "uri-sexp";
- inherit (uri) version src meta;
+ duneVersion = "3";
- duneVersion = "3";
+ checkInputs = [ ounit ];
+ propagatedBuildInputs = [
+ ppx_sexp_conv
+ sexplib0
+ uri
+ ];
+ doCheck = lib.versionAtLeast ocaml.version "4.08";
- checkInputs = [ ounit ];
- propagatedBuildInputs = [
- ppx_sexp_conv
- sexplib0
- uri
- ];
- doCheck = lib.versionAtLeast ocaml.version "4.08";
- }
+ meta = uri.meta // {
+ broken = uri.meta.broken or false || lib.versionOlder ocaml.version "4.04";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix
index 77ca17170585b..6f203bdc5832f 100644
--- a/pkgs/development/ocaml-modules/uuidm/default.nix
+++ b/pkgs/development/ocaml-modules/uuidm/default.nix
@@ -10,45 +10,42 @@
version ? if lib.versionAtLeast ocaml.version "4.14" then "0.9.10" else "0.9.8",
}:
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
- "uuidm is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation {
+ inherit version;
+ pname = "uuidm";
+ src = fetchurl {
+ url = "https://erratique.ch/software/uuidm/releases/uuidm-${version}.tbz";
+ hash =
+ {
+ "0.9.10" = "sha256-kWVZSofWMyky5nAuxoh1xNhwMKZ2qUahL3Dh27J36Vc=";
+ "0.9.8" = "sha256-/GZbkJVDQu1UY8SliK282kUWAVMfOnpQadUlRT/tJrM=";
+ }
+ ."${version}";
+ };
- stdenv.mkDerivation
- {
- inherit version;
- pname = "uuidm";
- src = fetchurl {
- url = "https://erratique.ch/software/uuidm/releases/uuidm-${version}.tbz";
- hash =
- {
- "0.9.10" = "sha256-kWVZSofWMyky5nAuxoh1xNhwMKZ2qUahL3Dh27J36Vc=";
- "0.9.8" = "sha256-/GZbkJVDQu1UY8SliK282kUWAVMfOnpQadUlRT/tJrM=";
- }
- ."${version}";
- };
+ strictDeps = true;
- strictDeps = true;
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ocamlbuild
+ topkg
+ ];
+ configurePlatforms = [ ];
+ buildInputs = [
+ topkg
+ cmdliner
+ ];
- nativeBuildInputs = [
- ocaml
- findlib
- ocamlbuild
- topkg
- ];
- configurePlatforms = [ ];
- buildInputs = [
- topkg
- cmdliner
- ];
+ inherit (topkg) buildPhase installPhase;
- inherit (topkg) buildPhase installPhase;
-
- meta = with lib; {
- description = "OCaml module implementing 128 bits universally unique identifiers version 3, 5 (name based with MD5, SHA-1 hashing) and 4 (random based) according to RFC 4122";
- homepage = "https://erratique.ch/software/uuidm";
- license = licenses.bsd3;
- maintainers = [ maintainers.maurer ];
- mainProgram = "uuidtrip";
- inherit (ocaml.meta) platforms;
- };
- }
+ meta = with lib; {
+ description = "OCaml module implementing 128 bits universally unique identifiers version 3, 5 (name based with MD5, SHA-1 hashing) and 4 (random based) according to RFC 4122";
+ homepage = "https://erratique.ch/software/uuidm";
+ license = licenses.bsd3;
+ maintainers = [ maintainers.maurer ];
+ mainProgram = "uuidtrip";
+ inherit (ocaml.meta) platforms;
+ broken = !(lib.versionAtLeast ocaml.version "4.08");
+ };
+}
diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix
index 0fc5a247e8e97..522a001f4a4de 100644
--- a/pkgs/development/ocaml-modules/uunf/default.nix
+++ b/pkgs/development/ocaml-modules/uunf/default.nix
@@ -22,52 +22,48 @@ let
}
."${version}";
in
+stdenv.mkDerivation {
+ name = "ocaml${ocaml.version}-${pname}-${version}";
+ inherit version;
-if lib.versionOlder ocaml.version "4.03" then
- throw "${pname} is not available for OCaml ${ocaml.version}"
-else
+ src = fetchurl {
+ url = "${webpage}/releases/${pname}-${version}.tbz";
+ inherit hash;
+ };
- stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-${pname}-${version}";
- inherit version;
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ocamlbuild
+ topkg
+ ];
+ buildInputs = [
+ topkg
+ uutf
+ ]
+ ++ lib.optional cmdlinerSupport cmdliner;
- src = fetchurl {
- url = "${webpage}/releases/${pname}-${version}.tbz";
- inherit hash;
- };
+ strictDeps = true;
- nativeBuildInputs = [
- ocaml
- findlib
- ocamlbuild
- topkg
- ];
- buildInputs = [
- topkg
- uutf
- ]
- ++ lib.optional cmdlinerSupport cmdliner;
+ prePatch = lib.optionalString stdenv.hostPlatform.isAarch64 "ulimit -s 16384";
- strictDeps = true;
+ buildPhase = ''
+ runHook preBuild
+ ${topkg.run} build \
+ --with-uutf true \
+ --with-cmdliner ${lib.boolToString cmdlinerSupport}
+ runHook postBuild
+ '';
- prePatch = lib.optionalString stdenv.hostPlatform.isAarch64 "ulimit -s 16384";
+ inherit (topkg) installPhase;
- buildPhase = ''
- runHook preBuild
- ${topkg.run} build \
- --with-uutf true \
- --with-cmdliner ${lib.boolToString cmdlinerSupport}
- runHook postBuild
- '';
-
- inherit (topkg) installPhase;
-
- meta = with lib; {
- description = "OCaml module for normalizing Unicode text";
- homepage = webpage;
- license = licenses.bsd3;
- maintainers = [ maintainers.vbgl ];
- mainProgram = "unftrip";
- inherit (ocaml.meta) platforms;
- };
- }
+ meta = with lib; {
+ description = "OCaml module for normalizing Unicode text";
+ homepage = webpage;
+ license = licenses.bsd3;
+ maintainers = [ maintainers.vbgl ];
+ mainProgram = "unftrip";
+ inherit (ocaml.meta) platforms;
+ broken = lib.versionOlder ocaml.version "4.03";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix
index 5b99a1b04cf1e..b3d47c8b1d601 100644
--- a/pkgs/development/ocaml-modules/vg/default.nix
+++ b/pkgs/development/ocaml-modules/vg/default.nix
@@ -22,64 +22,60 @@ let
version = "0.9.5";
webpage = "https://erratique.ch/software/${pname}";
in
+stdenv.mkDerivation {
-if versionOlder ocaml.version "4.14" then
- throw "vg is not available for OCaml ${ocaml.version}"
-else
+ name = "ocaml${ocaml.version}-${pname}-${version}";
- stdenv.mkDerivation {
+ src = fetchurl {
+ url = "${webpage}/releases/${pname}-${version}.tbz";
+ hash = "sha256-qcTtvIfSUwzpUZDspL+54UTNvWY6u3BTvfGWF6c0Jvw=";
+ };
- name = "ocaml${ocaml.version}-${pname}-${version}";
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ocamlbuild
+ ];
+ buildInputs = [ topkg ];
- src = fetchurl {
- url = "${webpage}/releases/${pname}-${version}.tbz";
- hash = "sha256-qcTtvIfSUwzpUZDspL+54UTNvWY6u3BTvfGWF6c0Jvw=";
- };
+ propagatedBuildInputs = [
+ uchar
+ result
+ gg
+ ]
+ ++ optionals pdfBackend [
+ otfm
+ ]
+ ++ optionals htmlcBackend [
+ brr
+ ];
- nativeBuildInputs = [
- ocaml
- findlib
- ocamlbuild
- ];
- buildInputs = [ topkg ];
+ strictDeps = true;
- propagatedBuildInputs = [
- uchar
- result
- gg
- ]
- ++ optionals pdfBackend [
- otfm
- ]
- ++ optionals htmlcBackend [
- brr
- ];
+ buildPhase =
+ topkg.buildPhase
+ + " --with-otfm ${lib.boolToString pdfBackend}"
+ + " --with-brr ${lib.boolToString htmlcBackend}"
+ + " --with-cairo2 false";
- strictDeps = true;
+ inherit (topkg) installPhase;
- buildPhase =
- topkg.buildPhase
- + " --with-otfm ${lib.boolToString pdfBackend}"
- + " --with-brr ${lib.boolToString htmlcBackend}"
- + " --with-cairo2 false";
+ meta = with lib; {
+ description = "Declarative 2D vector graphics for OCaml";
+ longDescription = ''
+ Vg is an OCaml module for declarative 2D vector graphics. In Vg, images
+ are values that denote functions mapping points of the cartesian plane
+ to colors. The module provides combinators to define and compose these
+ values.
- inherit (topkg) installPhase;
-
- meta = with lib; {
- description = "Declarative 2D vector graphics for OCaml";
- longDescription = ''
- Vg is an OCaml module for declarative 2D vector graphics. In Vg, images
- are values that denote functions mapping points of the cartesian plane
- to colors. The module provides combinators to define and compose these
- values.
-
- Renderers for PDF, SVG and the HTML canvas are distributed with the
- module. An API allows to implement new renderers.
- '';
- homepage = webpage;
- license = licenses.isc;
- maintainers = [ maintainers.jirkamarsik ];
- mainProgram = "vecho";
- inherit (ocaml.meta) platforms;
- };
- }
+ Renderers for PDF, SVG and the HTML canvas are distributed with the
+ module. An API allows to implement new renderers.
+ '';
+ homepage = webpage;
+ license = licenses.isc;
+ maintainers = [ maintainers.jirkamarsik ];
+ mainProgram = "vecho";
+ inherit (ocaml.meta) platforms;
+ broken = versionOlder ocaml.version "4.14";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/vlq/default.nix b/pkgs/development/ocaml-modules/vlq/default.nix
index e6b8070963df9..984c20586737b 100644
--- a/pkgs/development/ocaml-modules/vlq/default.nix
+++ b/pkgs/development/ocaml-modules/vlq/default.nix
@@ -6,26 +6,23 @@
dune-configurator,
}:
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
- "vlq is not available for OCaml ${ocaml.version}"
+buildDunePackage rec {
+ pname = "vlq";
+ version = "0.2.1";
- buildDunePackage
- rec {
- pname = "vlq";
- version = "0.2.1";
+ src = fetchurl {
+ url = "https://github.com/flowtype/ocaml-vlq/releases/download/v${version}/vlq-v${version}.tbz";
+ sha256 = "02wr9ph4q0nxmqgbc67ydf165hmrdv9b655krm2glc3ahb6larxi";
+ };
- src = fetchurl {
- url = "https://github.com/flowtype/ocaml-vlq/releases/download/v${version}/vlq-v${version}.tbz";
- sha256 = "02wr9ph4q0nxmqgbc67ydf165hmrdv9b655krm2glc3ahb6larxi";
- };
+ buildInputs = [ dune-configurator ];
- buildInputs = [ dune-configurator ];
+ meta = {
+ description = "Encoding variable-length quantities, in particular base64";
+ license = lib.licenses.mit;
+ homepage = "https://github.com/flowtype/ocaml-vlq";
+ maintainers = [ lib.maintainers.nomeata ];
+ broken = lib.versionAtLeast ocaml.version "5.0";
+ };
- meta = {
- description = "Encoding variable-length quantities, in particular base64";
- license = lib.licenses.mit;
- homepage = "https://github.com/flowtype/ocaml-vlq";
- maintainers = [ lib.maintainers.nomeata ];
- };
-
- }
+}
diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix
index 5af0836ed2ca3..24fe6fb00061f 100644
--- a/pkgs/development/ocaml-modules/wasm/default.nix
+++ b/pkgs/development/ocaml-modules/wasm/default.nix
@@ -24,9 +24,6 @@ buildDunePackage rec {
export sourceRoot=$PWD
'';
- # x86_64-unknown-linux-musl-ld: -r and -pie may not be used together
- hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
-
nativeBuildInputs = [
menhir
odoc
diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix
index 21d0b28a09b73..3ad17d8aa74f9 100644
--- a/pkgs/development/ocaml-modules/xmlm/default.nix
+++ b/pkgs/development/ocaml-modules/xmlm/default.nix
@@ -11,38 +11,34 @@ let
pname = "xmlm";
webpage = "https://erratique.ch/software/${pname}";
in
+stdenv.mkDerivation rec {
+ name = "ocaml${ocaml.version}-${pname}-${version}";
+ version = "1.4.0";
-if lib.versionOlder ocaml.version "4.05" then
- throw "xmlm is not available for OCaml ${ocaml.version}"
-else
+ src = fetchurl {
+ url = "${webpage}/releases/${pname}-${version}.tbz";
+ sha256 = "sha256-CRJSJY490WMgw85N2yG81X79nIwuv7eZ7mpUPtSS2fo=";
+ };
- stdenv.mkDerivation rec {
- name = "ocaml${ocaml.version}-${pname}-${version}";
- version = "1.4.0";
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ocamlbuild
+ topkg
+ ];
+ buildInputs = [ topkg ];
- src = fetchurl {
- url = "${webpage}/releases/${pname}-${version}.tbz";
- sha256 = "sha256-CRJSJY490WMgw85N2yG81X79nIwuv7eZ7mpUPtSS2fo=";
- };
+ strictDeps = true;
- nativeBuildInputs = [
- ocaml
- findlib
- ocamlbuild
- topkg
- ];
- buildInputs = [ topkg ];
+ inherit (topkg) buildPhase installPhase;
- strictDeps = true;
-
- inherit (topkg) buildPhase installPhase;
-
- meta = with lib; {
- description = "OCaml streaming codec to decode and encode the XML data format";
- homepage = webpage;
- license = licenses.isc;
- maintainers = [ maintainers.vbgl ];
- mainProgram = "xmltrip";
- inherit (ocaml.meta) platforms;
- };
- }
+ meta = with lib; {
+ description = "OCaml streaming codec to decode and encode the XML data format";
+ homepage = webpage;
+ license = licenses.isc;
+ maintainers = [ maintainers.vbgl ];
+ mainProgram = "xmltrip";
+ inherit (ocaml.meta) platforms;
+ broken = lib.versionOlder ocaml.version "4.05";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/z3/default.nix b/pkgs/development/ocaml-modules/z3/default.nix
index ddc9e29310157..e0643d5e5e564 100644
--- a/pkgs/development/ocaml-modules/z3/default.nix
+++ b/pkgs/development/ocaml-modules/z3/default.nix
@@ -7,43 +7,40 @@
z3,
}:
-if lib.versionOlder ocaml.version "4.08" then
- throw "z3 is not available for OCaml ${ocaml.version}"
-else
-
- let
- z3-with-ocaml = (
- z3.override {
- ocamlBindings = true;
- inherit ocaml findlib zarith;
- }
- );
- in
-
- stdenv.mkDerivation {
-
- pname = "ocaml${ocaml.version}-z3";
- inherit (z3-with-ocaml) version;
-
- dontUnpack = true;
-
- installPhase = ''
- runHook preInstall
- mkdir -p $OCAMLFIND_DESTDIR
- cp -r ${z3-with-ocaml.ocaml}/lib/ocaml/${ocaml.version}/site-lib/stublibs $OCAMLFIND_DESTDIR
- cp -r ${z3-with-ocaml.ocaml}/lib/ocaml/${ocaml.version}/site-lib/Z3 $OCAMLFIND_DESTDIR/z3
- runHook postInstall
- '';
-
- nativeBuildInputs = [ findlib ];
- propagatedBuildInputs = [
- z3-with-ocaml.lib
- zarith
- ];
-
- strictDeps = true;
-
- meta = z3.meta // {
- description = "Z3 Theorem Prover (OCaml API)";
- };
- }
+let
+ z3-with-ocaml = (
+ z3.override {
+ ocamlBindings = true;
+ inherit ocaml findlib zarith;
+ }
+ );
+in
+
+stdenv.mkDerivation {
+
+ pname = "ocaml${ocaml.version}-z3";
+ inherit (z3-with-ocaml) version;
+
+ dontUnpack = true;
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $OCAMLFIND_DESTDIR
+ cp -r ${z3-with-ocaml.ocaml}/lib/ocaml/${ocaml.version}/site-lib/stublibs $OCAMLFIND_DESTDIR
+ cp -r ${z3-with-ocaml.ocaml}/lib/ocaml/${ocaml.version}/site-lib/Z3 $OCAMLFIND_DESTDIR/z3
+ runHook postInstall
+ '';
+
+ nativeBuildInputs = [ findlib ];
+ propagatedBuildInputs = [
+ z3-with-ocaml.lib
+ zarith
+ ];
+
+ strictDeps = true;
+
+ meta = z3.meta // {
+ description = "Z3 Theorem Prover (OCaml API)";
+ broken = lib.versionOlder ocaml.version "4.08";
+ };
+}
diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix
index 09ef6ced26009..6b0e4ad4074a2 100644
--- a/pkgs/development/ocaml-modules/zarith/default.nix
+++ b/pkgs/development/ocaml-modules/zarith/default.nix
@@ -9,49 +9,46 @@
version ? if lib.versionAtLeast ocaml.version "4.08" then "1.14" else "1.13",
}:
-if lib.versionOlder ocaml.version "4.04" then
- throw "zarith is not available for OCaml ${ocaml.version}"
-else
+stdenv.mkDerivation (finalAttrs: {
+ pname = "ocaml${ocaml.version}-zarith";
+ inherit version;
+ src = fetchFromGitHub {
+ owner = "ocaml";
+ repo = "Zarith";
+ rev = "release-${version}";
+ hash =
+ {
+ "1.13" = "sha256-CNVKoJeO3fsmWaV/dwnUA8lgI4ZlxR/LKCXpCXUrpSg=";
+ "1.14" = "sha256-xUrBDr+M8uW2KOy7DZieO/vDgsSOnyBnpOzQDlXJ0oE=";
+ }
+ ."${finalAttrs.version}";
+ };
- stdenv.mkDerivation (finalAttrs: {
- pname = "ocaml${ocaml.version}-zarith";
- inherit version;
- src = fetchFromGitHub {
- owner = "ocaml";
- repo = "Zarith";
- rev = "release-${version}";
- hash =
- {
- "1.13" = "sha256-CNVKoJeO3fsmWaV/dwnUA8lgI4ZlxR/LKCXpCXUrpSg=";
- "1.14" = "sha256-xUrBDr+M8uW2KOy7DZieO/vDgsSOnyBnpOzQDlXJ0oE=";
- }
- ."${finalAttrs.version}";
- };
+ nativeBuildInputs = [
+ pkg-config
+ ocaml
+ findlib
+ ];
+ propagatedBuildInputs = [ gmp ];
+ strictDeps = true;
- nativeBuildInputs = [
- pkg-config
- ocaml
- findlib
- ];
- propagatedBuildInputs = [ gmp ];
- strictDeps = true;
-
- dontAddPrefix = true;
- dontAddStaticConfigureFlags = true;
- configurePlatforms = [ ];
- configureFlags = [ "-installdir ${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib" ];
+ dontAddPrefix = true;
+ dontAddStaticConfigureFlags = true;
+ configurePlatforms = [ ];
+ configureFlags = [ "-installdir ${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib" ];
- preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs";
+ preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs";
- meta = with lib; {
- description = "Fast, arbitrary precision OCaml integers";
- homepage = "https://github.com/ocaml/Zarith";
- changelog = "https://github.com/ocaml/Zarith/raw/${finalAttrs.src.rev}/Changes";
- license = licenses.lgpl2;
- inherit (ocaml.meta) platforms;
- maintainers = with maintainers; [
- thoughtpolice
- vbgl
- ];
- };
- })
+ meta = with lib; {
+ description = "Fast, arbitrary precision OCaml integers";
+ homepage = "https://github.com/ocaml/Zarith";
+ changelog = "https://github.com/ocaml/Zarith/raw/${finalAttrs.src.rev}/Changes";
+ license = licenses.lgpl2;
+ inherit (ocaml.meta) platforms;
+ maintainers = with maintainers; [
+ thoughtpolice
+ vbgl
+ ];
+ broken = lib.versionOlder ocaml.version "4.04";
+ };
+})
diff --git a/pkgs/development/ocaml-modules/zipc/default.nix b/pkgs/development/ocaml-modules/zipc/default.nix
index 74717ec794713..7f983a68a0221 100644
--- a/pkgs/development/ocaml-modules/zipc/default.nix
+++ b/pkgs/development/ocaml-modules/zipc/default.nix
@@ -9,38 +9,35 @@
cmdliner,
}:
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.14")
- "zipc is not available for OCaml ${ocaml.version}"
-
- stdenv.mkDerivation
- rec {
- pname = "ocaml${ocaml.version}-zipc";
- version = "0.2.0";
-
- src = fetchurl {
- url = "https://erratique.ch/software/zipc/releases/zipc-${version}.tbz";
- hash = "sha256-YQqkCURwrJgFH0+zgfket25zJQ4w+Tcc1mTSrDuWRt0=";
- };
-
- strictDeps = true;
-
- nativeBuildInputs = [
- ocaml
- findlib
- ocamlbuild
- ];
-
- buildInputs = [
- cmdliner
- topkg
- ];
-
- inherit (topkg) buildPhase installPhase;
-
- meta = {
- description = "ZIP archive and deflate codec for OCaml";
- homepage = "https://erratique.ch/software/zipc";
- license = lib.licenses.isc;
- maintainers = [ lib.maintainers.vbgl ];
- };
- }
+stdenv.mkDerivation rec {
+ pname = "ocaml${ocaml.version}-zipc";
+ version = "0.2.0";
+
+ src = fetchurl {
+ url = "https://erratique.ch/software/zipc/releases/zipc-${version}.tbz";
+ hash = "sha256-YQqkCURwrJgFH0+zgfket25zJQ4w+Tcc1mTSrDuWRt0=";
+ };
+
+ strictDeps = true;
+
+ nativeBuildInputs = [
+ ocaml
+ findlib
+ ocamlbuild
+ ];
+
+ buildInputs = [
+ cmdliner
+ topkg
+ ];
+
+ inherit (topkg) buildPhase installPhase;
+
+ meta = {
+ description = "ZIP archive and deflate codec for OCaml";
+ homepage = "https://erratique.ch/software/zipc";
+ license = lib.licenses.isc;
+ maintainers = [ lib.maintainers.vbgl ];
+ broken = !(lib.versionAtLeast ocaml.version "4.14");
+ };
+}
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index d7203d4648700..35d176e3f70ba 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -6,6 +6,7 @@
replaceVars,
isPy310,
isPyPy,
+ pythonOlder,
# build-system
cython,
@@ -20,6 +21,7 @@
aiosignal,
async-timeout,
attrs,
+ backports-zstd,
frozenlist,
multidict,
propcache,
@@ -49,20 +51,16 @@
buildPythonPackage rec {
pname = "aiohttp";
- version = "3.12.15";
+ version = "3.13.2";
pyproject = true;
src = fetchFromGitHub {
owner = "aio-libs";
repo = "aiohttp";
tag = "v${version}";
- hash = "sha256-nVDGSbzjCdyJFCsHq8kJigNA4vGs4Pg1Vyyvw+gKg2w=";
+ hash = "sha256-LqYGrrWgSZazk0hjQvTFwqtU/PtMEaPi+m1Ya8Ds+pU=";
};
- patches = lib.optionals (!lib.meta.availableOn stdenv.hostPlatform isa-l) [
- ./remove-isal.patch
- ];
-
postPatch = ''
rm -r vendor
patchShebangs tools
@@ -92,17 +90,20 @@ buildPythonPackage rec {
dependencies = [
aiohappyeyeballs
aiosignal
- async-timeout
attrs
frozenlist
multidict
propcache
yarl
]
+ ++ lib.optionals (pythonOlder "3.11") [
+ async-timeout
+ ]
++ optional-dependencies.speedups;
optional-dependencies.speedups = [
aiodns
+ backports-zstd
(if isPyPy then brotlicffi else brotli)
];
@@ -130,6 +131,7 @@ buildPythonPackage rec {
"test_requote_redirect_url_default"
"test_tcp_connector_ssl_shutdown_timeout_nonzero_passed"
"test_tcp_connector_ssl_shutdown_timeout_zero_not_passed"
+ "test_invalid_idna"
# don't run benchmarks
"test_import_time"
# racy
diff --git a/pkgs/development/python-modules/aiohttp/remove-isal.patch b/pkgs/development/python-modules/aiohttp/remove-isal.patch
deleted file mode 100644
index 4a91fca368ae8..0000000000000
--- a/pkgs/development/python-modules/aiohttp/remove-isal.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 62fb04f2e..bb5b279dd 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -12,7 +12,6 @@ from typing import Any, AsyncIterator, Callable, Generator, Iterator
- from unittest import mock
- from uuid import uuid4
-
--import isal.isal_zlib
- import pytest
- import zlib_ng.zlib_ng
- from blockbuster import blockbuster_ctx
-@@ -333,7 +332,7 @@ def unused_port_socket() -> Generator[socket.socket, None, None]:
- s.close()
-
-
--@pytest.fixture(params=[zlib, zlib_ng.zlib_ng, isal.isal_zlib])
-+@pytest.fixture(params=[zlib, zlib_ng.zlib_ng])
- def parametrize_zlib_backend(
- request: pytest.FixtureRequest,
- ) -> Generator[None, None, None]:
diff --git a/pkgs/development/python-modules/aiolimiter/default.nix b/pkgs/development/python-modules/aiolimiter/default.nix
index a76d3a3ec8d88..9569cfb0d1337 100644
--- a/pkgs/development/python-modules/aiolimiter/default.nix
+++ b/pkgs/development/python-modules/aiolimiter/default.nix
@@ -3,20 +3,16 @@
buildPythonPackage,
fetchFromGitHub,
poetry-core,
- importlib-metadata,
pytest-asyncio,
pytest-cov-stub,
pytestCheckHook,
- pythonOlder,
toml,
}:
buildPythonPackage rec {
pname = "aiolimiter";
version = "1.2.1";
- format = "pyproject";
-
- disabled = pythonOlder "3.7";
+ pyproject = true;
src = fetchFromGitHub {
owner = "mjpieters";
@@ -25,9 +21,15 @@ buildPythonPackage rec {
hash = "sha256-wgHR0GzaPXlhL4ErklFqmWNFO49dvd5X5MgyYHVH4Eo=";
};
- nativeBuildInputs = [ poetry-core ];
+ # ERROR: '"session"' is not a valid asyncio_default_fixture_loop_scope. Valid scopes are: function, class, module, package, session.
+ # Post 1.2.1, the project switched from tox and is no longer affected, hence fixed in nixpkgs only.
+ postPatch = ''
+ substituteInPlace tox.ini --replace-fail \
+ 'asyncio_default_fixture_loop_scope = "session"' \
+ 'asyncio_default_fixture_loop_scope = session'
+ '';
- propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+ build-system = [ poetry-core ];
nativeCheckInputs = [
pytest-asyncio
@@ -38,11 +40,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "aiolimiter" ];
- meta = with lib; {
+ meta = {
description = "Implementation of a rate limiter for asyncio";
homepage = "https://github.com/mjpieters/aiolimiter";
changelog = "https://github.com/mjpieters/aiolimiter/blob/v${version}/CHANGELOG.md";
- license = with licenses; [ mit ];
- maintainers = with maintainers; [ fab ];
+ license = with lib.licenses; [ mit ];
+ maintainers = with lib.maintainers; [ fab ];
};
}
diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix
index 6259ce3314c21..696115fc61b96 100644
--- a/pkgs/development/python-modules/anthropic/default.nix
+++ b/pkgs/development/python-modules/anthropic/default.nix
@@ -11,6 +11,7 @@
# dependencies
anyio,
distro,
+ docstring-parser,
httpx,
jiter,
pydantic,
@@ -23,6 +24,7 @@
# test
dirty-equals,
+ inline-snapshot,
nest-asyncio,
pytest-asyncio,
pytest-xdist,
@@ -32,14 +34,14 @@
buildPythonPackage rec {
pname = "anthropic";
- version = "0.62.0";
+ version = "0.71.0";
pyproject = true;
src = fetchFromGitHub {
owner = "anthropics";
repo = "anthropic-sdk-python";
tag = "v${version}";
- hash = "sha256-EVLSC6ClHnmGqMoefMXj3M4dh812ZN5t9nF3gfCLyCo=";
+ hash = "sha256-n8hu2RFuZN0ojHhhU4qPQaT2DUvqSglFhBo2ORln/mc=";
};
postPatch = ''
@@ -55,6 +57,7 @@ buildPythonPackage rec {
dependencies = [
anyio
distro
+ docstring-parser
httpx
jiter
pydantic
@@ -69,6 +72,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
dirty-equals
+ inline-snapshot
nest-asyncio
pytest-asyncio
pytest-xdist
diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix
index f5e02b9d2067c..2565129d22150 100644
--- a/pkgs/development/python-modules/anyio/default.nix
+++ b/pkgs/development/python-modules/anyio/default.nix
@@ -95,6 +95,8 @@ buildPythonPackage rec {
"test_nonexistent_main_module"
# 3 second timeout expired
"test_keyboardinterrupt_during_test"
+ # racy with high thread count, see https://github.com/NixOS/nixpkgs/issues/448125
+ "test_multiple_threads"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# PermissionError: [Errno 1] Operation not permitted: '/dev/console'
diff --git a/pkgs/development/python-modules/backports-zstd/default.nix b/pkgs/development/python-modules/backports-zstd/default.nix
new file mode 100644
index 0000000000000..412b35bcb9924
--- /dev/null
+++ b/pkgs/development/python-modules/backports-zstd/default.nix
@@ -0,0 +1,61 @@
+{
+ buildPythonPackage,
+ fetchFromGitHub,
+ lib,
+ pytestCheckHook,
+ setuptools,
+ zstd,
+}:
+
+buildPythonPackage rec {
+ pname = "backports-zstd";
+ version = "1.0.0";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "rogdham";
+ repo = "backports.zstd";
+ tag = "v${version}";
+ fetchSubmodules = true;
+ postFetch = ''
+ rm -r "$out/src/c/zstd"
+ '';
+ hash = "sha256-5t5ET8b65v4ArV9zrmu+kDXLG3QQRpMMZPSG+RRaCLk=";
+ };
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace-fail 'ROOT_PATH / "src" / "c" / "zstd"' 'Path("${zstd.src}")'
+
+ # need to preserve $PYTHONPATH when calling sys.executable
+ substituteInPlace tests/test/support/script_helper.py \
+ --replace-fail "return __cached_interp_requires_environment" "return True"
+ '';
+
+ build-system = [ setuptools ];
+
+ pypaBuildFlags = [ "--config-setting=--build-option=--system-zstd" ];
+
+ buildInputs = [ zstd ];
+
+ pythonImportsCheck = [ "backports.zstd" ];
+
+ nativeCheckInputs = [
+ pytestCheckHook
+ ];
+
+ enabledTestPaths = [ "tests" ];
+
+ disabledTestPaths = [
+ # sandbox doesn't allow setting SUID bit
+ "tests/test/test_tarfile.py::TestExtractionFilters::test_modes"
+ ];
+
+ meta = {
+ changelog = "https://github.com/rogdham/backports.zstd/blob/${src.tag}/CHANGELOG.md";
+ description = "Backport of compression.zstd";
+ homepage = "https://github.com/rogdham/backports.zstd";
+ license = lib.licenses.psfl;
+ maintainers = [ lib.maintainers.dotlambda ];
+ };
+}
diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix
index e900f539fc971..b50cb3faef221 100644
--- a/pkgs/development/python-modules/bcrypt/default.nix
+++ b/pkgs/development/python-modules/bcrypt/default.nix
@@ -5,12 +5,9 @@
rustPlatform,
rustc,
setuptools,
- setuptoolsRustBuildHook,
- fetchPypi,
- pythonOlder,
+ setuptools-rust,
+ fetchFromGitHub,
pytestCheckHook,
- libiconv,
- stdenv,
# for passthru.tests
asyncssh,
django_4,
@@ -21,14 +18,14 @@
buildPythonPackage rec {
pname = "bcrypt";
- version = "4.3.0";
- format = "pyproject";
+ version = "5.0.0";
+ pyproject = true;
- disabled = pythonOlder "3.6";
-
- src = fetchPypi {
- inherit pname version;
- hash = "sha256-Oj/SIEF4ttKtzwnLT2Qm/+9UdiV3p8m1TBWQCMsojBg=";
+ src = fetchFromGitHub {
+ owner = "pyca";
+ repo = "bcrypt";
+ tag = version;
+ hash = "sha256-7Dp07xoq6h+fiP7d7/TRRoYszWsyQF1c4vuFUpZ7u6U=";
};
cargoRoot = "src/_bcrypt";
@@ -39,20 +36,20 @@ buildPythonPackage rec {
src
cargoRoot
;
- hash = "sha256-HgHvfMBspPsSYhllnKBg5XZB6zxFIqJj+4//xKG8HwA=";
+ hash = "sha256-hYMJlwxnXA0ZOJiyZ8rDp9govVcc1SGkDfqUVngnUPQ=";
};
- nativeBuildInputs = [
+ build-system = [
setuptools
- setuptoolsRustBuildHook
+ setuptools-rust
+ ];
+
+ nativeBuildInputs = [
rustPlatform.cargoSetupHook
cargo
rustc
];
- # Remove when https://github.com/NixOS/nixpkgs/pull/190093 lands.
- buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
-
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "bcrypt" ];
@@ -67,10 +64,11 @@ buildPythonPackage rec {
;
};
- meta = with lib; {
+ meta = {
+ changelog = "https://github.com/pyca/bcrypt/blob/${src.tag}/CHANGELOG.rst";
description = "Modern password hashing for your software and your servers";
homepage = "https://github.com/pyca/bcrypt/";
- license = licenses.asl20;
- maintainers = [ ];
+ license = lib.licenses.asl20;
+ maintainers = [ lib.maintainers.dotlambda ];
};
}
diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix
index 62f0badbdc7b9..73474c854bb0e 100644
--- a/pkgs/development/python-modules/bokeh/default.nix
+++ b/pkgs/development/python-modules/bokeh/default.nix
@@ -21,7 +21,6 @@
channels,
click,
colorcet,
- coverage,
firefox,
geckodriver,
isort,
@@ -81,7 +80,6 @@ buildPythonPackage rec {
channels
click
colorcet
- coverage
firefox
geckodriver
isort
diff --git a/pkgs/development/python-modules/calver/default.nix b/pkgs/development/python-modules/calver/default.nix
index df45ea99e4819..46a47d3c4cbd2 100644
--- a/pkgs/development/python-modules/calver/default.nix
+++ b/pkgs/development/python-modules/calver/default.nix
@@ -10,14 +10,14 @@
let
self = buildPythonPackage rec {
pname = "calver";
- version = "2025.04.17";
+ version = "2025.10.20";
pyproject = true;
src = fetchFromGitHub {
owner = "di";
repo = "calver";
tag = version;
- hash = "sha256-C0l/SThDhA1DnOeMJfuh3d8R606nzyQag+cg7QqvYWY=";
+ hash = "sha256-8CfPQ4uMgKDqMMgutLdsjn/MaAVBJQAp1KqUfxzNMQw=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix
index a9fd9152666e4..698d88e2c5bf1 100644
--- a/pkgs/development/python-modules/cbor2/default.nix
+++ b/pkgs/development/python-modules/cbor2/default.nix
@@ -2,30 +2,23 @@
lib,
buildPythonPackage,
fetchPypi,
- pythonOlder,
-
- withCExtensions ? true,
-
- # build-system
- setuptools,
- setuptools-scm,
-
- # tests
hypothesis,
pytest-cov-stub,
pytestCheckHook,
+ pythonOlder,
+ setuptools-scm,
+ setuptools,
+ withCExtensions ? true,
}:
buildPythonPackage rec {
pname = "cbor2";
- version = "5.6.5";
+ version = "5.7.0";
pyproject = true;
- disabled = pythonOlder "3.8";
-
src = fetchPypi {
inherit pname version;
- hash = "sha256-toKCBnfuHbukX32hGJjScg+S4Gvjas7CkIZ9Xr89fgk=";
+ hash = "sha256-P22EP0200OxQHEZFPCKk++uxq/tbdA4byrNMYVzXQGs=";
};
build-system = [
@@ -33,8 +26,6 @@ buildPythonPackage rec {
setuptools-scm
];
- pythonImportsCheck = [ "cbor2" ];
-
nativeCheckInputs = [
hypothesis
pytest-cov-stub
@@ -49,12 +40,15 @@ buildPythonPackage rec {
inherit withCExtensions;
};
- meta = with lib; {
- changelog = "https://github.com/agronholm/cbor2/releases/tag/${version}";
+ pythonImportsCheck = [ "cbor2" ];
+
+ meta = {
description = "Python CBOR (de)serializer with extensive tag support";
- mainProgram = "cbor2";
+ changelog = "https://github.com/agronholm/cbor2/releases/tag/${version}";
homepage = "https://github.com/agronholm/cbor2";
- license = licenses.mit;
+ license = lib.licenses.mit;
maintainers = [ ];
+ mainProgram = "cbor2";
+
};
}
diff --git a/pkgs/development/python-modules/changelog-chug/default.nix b/pkgs/development/python-modules/changelog-chug/default.nix
index a13435f0a247e..c4ffe1eb76255 100644
--- a/pkgs/development/python-modules/changelog-chug/default.nix
+++ b/pkgs/development/python-modules/changelog-chug/default.nix
@@ -5,7 +5,6 @@
docutils,
semver,
setuptools,
- coverage,
testscenarios,
testtools,
unittestCheckHook,
@@ -39,7 +38,6 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
- coverage
testscenarios
testtools
unittestCheckHook
diff --git a/pkgs/development/python-modules/construct-classes/default.nix b/pkgs/development/python-modules/construct-classes/default.nix
index 189729fb9bd74..bcfa798f614d2 100644
--- a/pkgs/development/python-modules/construct-classes/default.nix
+++ b/pkgs/development/python-modules/construct-classes/default.nix
@@ -3,6 +3,7 @@
buildPythonPackage,
construct,
fetchFromGitHub,
+ fetchpatch2,
pytestCheckHook,
uv-build,
}:
@@ -19,6 +20,14 @@ buildPythonPackage rec {
hash = "sha256-goOQMt/nVjWXYltpnKHtJaLOhR+gRTmtoUh7zVb7go4=";
};
+ patches = [
+ (fetchpatch2 {
+ name = "uv-build.patch";
+ url = "https://github.com/matejcik/construct-classes/commit/d1ecacc0cf5cb332ffe6ed85ce9dfc552f77231f.patch?full_index=1";
+ hash = "sha256-VeifL8bER0mIRNXKTA+/cje8AxWJKg/q8ipmf3gTeiw=";
+ })
+ ];
+
build-system = [ uv-build ];
dependencies = [ construct ];
diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix
index 7dd1e7d6fa5f0..53374790cedd3 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.7";
+ version = "7.11.0";
pyproject = true;
src = fetchFromGitHub {
owner = "nedbat";
repo = "coveragepy";
tag = version;
- hash = "sha256-u62kfYE1yk/cIfyklWJz8vehPe9PL9uN+03bZZraw/U=";
+ hash = "sha256-l4JeGgy+WAN6NHz0ZkPYqiNw0k5VxaX32Vcp11sylgU=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/cron-converter/default.nix b/pkgs/development/python-modules/cron-converter/default.nix
index e6c6f9afe1f0d..0865b9cefd6bb 100644
--- a/pkgs/development/python-modules/cron-converter/default.nix
+++ b/pkgs/development/python-modules/cron-converter/default.nix
@@ -2,7 +2,6 @@
lib,
fetchFromGitHub,
buildPythonPackage,
- unittestCheckHook,
setuptools,
python-dateutil,
python,
@@ -19,13 +18,21 @@ buildPythonPackage rec {
hash = "sha256-XpkpEMurRrhq1S4XnhPRW5CCBk+HzljOSQfZ98VJ7UE=";
};
+ postPatch = ''
+ # Timezone does not match
+ substituteInPlace tests/integration/tests_cron_seeker.py \
+ --replace-fail "test_timezone" "dont_test_timezone"
+ '';
+
build-system = [ setuptools ];
- propagatedBuildInputs = [ python-dateutil ];
+ dependencies = [ python-dateutil ];
checkPhase = ''
+ runHook preCheck
${python.interpreter} -m unittest discover -s tests/unit -v
${python.interpreter} -m unittest discover -s tests/integration -v
+ runHook postCheck
'';
pythonImportsCheck = [ "cron_converter" ];
diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index 11f6406d42386..d9b3a68715ae1 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "cryptography";
- version = "46.0.1"; # Also update the hash in vectors.nix
+ version = "46.0.2";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "pyca";
repo = "cryptography";
tag = version;
- hash = "sha256-saTHFKSJa9gjtEp6uGAHsvzFE3yPeck1WGdIE1+9kgs=";
+ hash = "sha256-gsEHKEYiMw2eliEpxwzFGDetOp77PivlMoBD3HBbbFA=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
@@ -83,7 +83,7 @@ buildPythonPackage rec {
vectors = cryptography-vectors;
};
- meta = with lib; {
+ meta = {
description = "Package which provides cryptographic recipes and primitives";
longDescription = ''
Cryptography includes both high level recipes and low level interfaces to
@@ -91,13 +91,12 @@ buildPythonPackage rec {
digests, and key derivation functions.
'';
homepage = "https://github.com/pyca/cryptography";
- changelog =
- "https://cryptography.io/en/latest/changelog/#v" + replaceStrings [ "." ] [ "-" ] version;
- license = with licenses; [
+ changelog = "https://cryptography.io/en/latest/changelog/#v" + lib.replaceString "." "-" version;
+ license = with lib.licenses; [
asl20
bsd3
psfl
];
- maintainers = with maintainers; [ mdaniels5757 ];
+ maintainers = with lib.maintainers; [ mdaniels5757 ];
};
}
diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix
index 0a9a1a5d58946..f8614e08a2403 100644
--- a/pkgs/development/python-modules/cryptography/vectors.nix
+++ b/pkgs/development/python-modules/cryptography/vectors.nix
@@ -1,22 +1,29 @@
{
lib,
buildPythonPackage,
- fetchPypi,
cryptography,
+ fetchpatch2,
uv-build,
}:
buildPythonPackage rec {
pname = "cryptography-vectors";
# The test vectors must have the same version as the cryptography package
- inherit (cryptography) version;
+ inherit (cryptography) version src;
pyproject = true;
- src = fetchPypi {
- pname = "cryptography_vectors";
- inherit version;
- hash = "sha256-B40Sh84rRdJGtCxs+545Dh96+hdsGZsL1t6p1s6Jou4=";
- };
+ sourceRoot = "${src.name}/vectors";
+
+ patches = [
+ # https://github.com/NixOS/nixpkgs/pull/449568
+ (fetchpatch2 {
+ name = "uv-build.patch";
+ url = "https://github.com/pyca/cryptography/commit/5f311c1cbe09ddea6136b0bb737fb7df6df1b923.patch?full_index=1";
+ stripLen = 1;
+ includes = [ "pyproject.toml" ];
+ hash = "sha256-OdHK0OGrvOi3mS0q+v8keDLvKxtgQkDkHQSYnmC/vd4=";
+ })
+ ];
build-system = [ uv-build ];
diff --git a/pkgs/development/python-modules/django-bootstrap3/default.nix b/pkgs/development/python-modules/django-bootstrap3/default.nix
index 62abd28fde239..cc9d493ad8f0d 100644
--- a/pkgs/development/python-modules/django-bootstrap3/default.nix
+++ b/pkgs/development/python-modules/django-bootstrap3/default.nix
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+ fetchpatch2,
# build-system
uv-build,
@@ -26,6 +27,14 @@ buildPythonPackage rec {
hash = "sha256-TaB2PeBjmCNFuEZ+To2Q3C6zlFCaaTB70LxQWWb5AEo=";
};
+ patches = [
+ (fetchpatch2 {
+ name = "uv-build.patch";
+ url = "https://github.com/zostera/django-bootstrap3/commit/5e1a86549e9607b8e2a9772a3a839fc81b9ae6c0.patch?full_index=1";
+ hash = "sha256-VcRC7ehyVTl0KuovD8tNCbZnKXKCOGpux1XXUOoDaTw=";
+ })
+ ];
+
build-system = [ uv-build ];
dependencies = [ django ];
diff --git a/pkgs/development/python-modules/django-bootstrap4/default.nix b/pkgs/development/python-modules/django-bootstrap4/default.nix
index 389aaf503a413..151aaea4894df 100644
--- a/pkgs/development/python-modules/django-bootstrap4/default.nix
+++ b/pkgs/development/python-modules/django-bootstrap4/default.nix
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+ fetchpatch2,
# build-system
uv-build,
@@ -29,6 +30,14 @@ buildPythonPackage rec {
hash = "sha256-+G9UHW4eUGl00A/kDj+iTP7ehjj/dwUENKffvGxE6/4=";
};
+ patches = [
+ (fetchpatch2 {
+ name = "uv-build.patch";
+ url = "https://github.com/zostera/django-bootstrap4/commit/09b14bc9b70e7da92200c4bc014e2d3c597f0ea6.patch?full_index=1";
+ hash = "sha256-ZW9y8n0ZCOP37EoP32e7ue6h93KgGw1pW8Q1Q8IuNk8=";
+ })
+ ];
+
build-system = [ uv-build ];
dependencies = [ beautifulsoup4 ];
diff --git a/pkgs/development/python-modules/django-bootstrap5/default.nix b/pkgs/development/python-modules/django-bootstrap5/default.nix
index a3a67ada4c95d..538d2adc202ee 100644
--- a/pkgs/development/python-modules/django-bootstrap5/default.nix
+++ b/pkgs/development/python-modules/django-bootstrap5/default.nix
@@ -4,6 +4,7 @@
buildPythonPackage,
django,
fetchFromGitHub,
+ fetchpatch2,
jinja2,
pillow,
pytest-django,
@@ -23,6 +24,14 @@ buildPythonPackage rec {
hash = "sha256-aqP2IkAkZsw5vbQxhiy9L3giSgb0seub9gsxPTajiXo=";
};
+ patches = [
+ (fetchpatch2 {
+ name = "uv-build.patch";
+ url = "https://github.com/zostera/django-bootstrap5/commit/d1d54f5fc8041d2781189321402b4f3937f77913.patch?full_index=1";
+ hash = "sha256-cFOY+pu2TAZXpAipSIQh1nPPC0ipfncvpObcH667+ac=";
+ })
+ ];
+
build-system = [ uv-build ];
dependencies = [ django ];
diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix
index a661b22f939fc..570ee2e03b8bc 100644
--- a/pkgs/development/python-modules/django/4.nix
+++ b/pkgs/development/python-modules/django/4.nix
@@ -45,7 +45,7 @@
buildPythonPackage rec {
pname = "django";
- version = "4.2.25";
+ version = "4.2.26";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -54,7 +54,7 @@ buildPythonPackage rec {
owner = "django";
repo = "django";
rev = "refs/tags/${version}";
- hash = "sha256-HUNKvLDLZ1VmcyIN0QVMUJZgmd1zBulhzGzGgkZ/84E=";
+ hash = "sha256-2NkkQcsY+BDvLGtvjYfGwgAK2S6LDbbcl7CwbwuF5a0=";
};
patches = [
diff --git a/pkgs/development/python-modules/elastic-transport/default.nix b/pkgs/development/python-modules/elastic-transport/default.nix
index fe29e2841651c..f083603fd0c7f 100644
--- a/pkgs/development/python-modules/elastic-transport/default.nix
+++ b/pkgs/development/python-modules/elastic-transport/default.nix
@@ -4,6 +4,7 @@
buildPythonPackage,
certifi,
fetchFromGitHub,
+ fetchpatch,
mock,
opentelemetry-api,
opentelemetry-sdk,
@@ -34,6 +35,14 @@ buildPythonPackage rec {
hash = "sha256-LWSvE88wEwMxRi6IZsMkIRP8UTRfImC9QZnuka1oiso=";
};
+ # FIXME: backport fix for pytest-asyncio 1.2.0, as updating this entire ecosystem is painful
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/elastic/elastic-transport-python/commit/d749d0be54821e81979888ff34b1451354548863.patch";
+ hash = "sha256-FrabqeLn3Sr1sg/lWWYsMPd0CZS/6BZYLnaK66T93BQ=";
+ })
+ ];
+
build-system = [ setuptools ];
dependencies = [
diff --git a/pkgs/development/python-modules/fb-re2/default.nix b/pkgs/development/python-modules/fb-re2/default.nix
deleted file mode 100644
index 11defafe39539..0000000000000
--- a/pkgs/development/python-modules/fb-re2/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
- lib,
- buildPythonPackage,
- fetchpatch,
- fetchPypi,
- re2,
-}:
-
-buildPythonPackage rec {
- pname = "fb-re2";
- version = "1.0.7";
- format = "setuptools";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "83b2c2cd58d3874e6e3a784cf4cf2f1a57ce1969e50180f92b010eea24ef26cf";
- };
-
- patches = [
- # Bump stdlib to c++17 to fix build with recent re2
- # https://github.com/facebook/pyre2/issues/24
- # https://github.com/facebook/pyre2/pull/25
- (fetchpatch {
- url = "https://github.com/facebook/pyre2/pull/25/commits/08fb06ec3ccd412ca69483d27234684a04cb91a0.patch";
- hash = "sha256-kzxE2AxpE1tJJK0dJgoFfVka9zy2u0HEqiHoS7DQDQ0=";
- })
- ];
-
- buildInputs = [ re2 ];
-
- # no tests in PyPI tarball
- doCheck = false;
-
- meta = {
- description = "Python wrapper for Google's RE2";
- homepage = "https://github.com/facebook/pyre2";
- license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ ivan ];
- };
-}
diff --git a/pkgs/development/python-modules/ffmpy/default.nix b/pkgs/development/python-modules/ffmpy/default.nix
index 23bc6a0eca9ef..9703bc808f453 100644
--- a/pkgs/development/python-modules/ffmpy/default.nix
+++ b/pkgs/development/python-modules/ffmpy/default.nix
@@ -3,6 +3,7 @@
stdenv,
buildPythonPackage,
fetchFromGitHub,
+ fetchpatch2,
pythonOlder,
uv-build,
pytestCheckHook,
diff --git a/pkgs/development/python-modules/filedepot/default.nix b/pkgs/development/python-modules/filedepot/default.nix
index 072e6ea60ef1d..f620aac9a3608 100644
--- a/pkgs/development/python-modules/filedepot/default.nix
+++ b/pkgs/development/python-modules/filedepot/default.nix
@@ -35,9 +35,9 @@ buildPythonPackage rec {
dependencies = [
anyascii
+ legacy-cgi
google-cloud-storage
- ]
- ++ lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ];
+ ];
nativeCheckInputs = [
flaky
diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix
index 2b7c7bdfa8ac0..bd33052a9c63a 100644
--- a/pkgs/development/python-modules/filelock/default.nix
+++ b/pkgs/development/python-modules/filelock/default.nix
@@ -6,20 +6,18 @@
hatchling,
pytest-asyncio,
pytest-mock,
+ pytest-timeout,
pytestCheckHook,
- pythonOlder,
}:
buildPythonPackage rec {
pname = "filelock";
- version = "3.18.0";
+ version = "3.20.0";
pyproject = true;
- disabled = pythonOlder "3.8";
-
src = fetchPypi {
inherit pname version;
- hash = "sha256-rbyI6ruZ0v7IycGyKbFx8Yr6ZVQAFz3cZT1dAVAfufI=";
+ hash = "sha256-cR6UO07GvkLh1OZpC0jcF1yCKWdGa7McDCk/NDNME/Q=";
};
build-system = [
@@ -30,6 +28,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
pytest-asyncio
pytest-mock
+ pytest-timeout
pytestCheckHook
];
diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix
index 27a653155fb81..9cbb2ba902c2b 100644
--- a/pkgs/development/python-modules/fontmake/default.nix
+++ b/pkgs/development/python-modules/fontmake/default.nix
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "fontmake";
- version = "3.10.1";
+ version = "3.11.0";
pyproject = true;
src = fetchFromGitHub {
owner = "googlefonts";
repo = "fontmake";
tag = "v${version}";
- hash = "sha256-cHFxb7lWUj/7ATynoMGQkhArKWCHHLYvQG5IoaXwVBs=";
+ hash = "sha256-H3r5G+lEoIlS7mmQ1abQeZ1cD/aGskphm5X0rAshX+U=";
};
build-system = [
diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index f776b814e31bf..65f72e01e9193 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -26,7 +26,7 @@
buildPythonPackage rec {
pname = "fonttools";
- version = "4.59.0";
+ version = "4.60.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "fonttools";
repo = "fonttools";
tag = version;
- hash = "sha256-f3iedVwwh98XkFzPJ/+XZ2n4pcDXDoPlQki+neGVuXE=";
+ hash = "sha256-h/JRItD5IHlhNSamxRxk/dvyAKUFayzxHvlW7v4N1s8=";
};
build-system = [
diff --git a/pkgs/development/python-modules/genson/default.nix b/pkgs/development/python-modules/genson/default.nix
index 40643f85e07be..c4febd74c4f3c 100644
--- a/pkgs/development/python-modules/genson/default.nix
+++ b/pkgs/development/python-modules/genson/default.nix
@@ -1,6 +1,5 @@
{
buildPythonPackage,
- coverage,
fetchPypi,
jsonschema,
lib,
diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix
index ef2f8aa953f5c..5c625b117c7b6 100644
--- a/pkgs/development/python-modules/githubkit/default.nix
+++ b/pkgs/development/python-modules/githubkit/default.nix
@@ -3,6 +3,7 @@
anyio,
buildPythonPackage,
fetchFromGitHub,
+ fetchpatch2,
hishel,
httpx,
pydantic,
@@ -26,6 +27,14 @@ buildPythonPackage rec {
hash = "sha256-67Y0r4Po3z4YmnbWC0HBLmsKD68HMIGvHKo5SLe+KRc=";
};
+ patches = [
+ (fetchpatch2 {
+ name = "uv-build.patch";
+ url = "https://github.com/yanyongyu/githubkit/commit/2817664d904541242d4cedf7aae85cd4c4b606e2.patch?full_index=1";
+ hash = "sha256-mmtjlebHZpHX457frSOe88tsUo7iNdSIUynGZjcjuw4=";
+ })
+ ];
+
pythonRelaxDeps = [ "hishel" ];
build-system = [ uv-build ];
diff --git a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix
index 4555e9772d1fc..307066a468885 100644
--- a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix
+++ b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix
@@ -11,21 +11,18 @@
protobuf,
pytest-asyncio,
pytestCheckHook,
- pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "google-ai-generativelanguage";
- version = "0.6.18";
+ version = "0.9.0";
pyproject = true;
- disabled = pythonOlder "3.7";
-
src = fetchPypi {
pname = "google_ai_generativelanguage";
inherit version;
- hash = "sha256-J0up/PaUZv9k6XHVZYhENDiOUjMAr9Ro/I4wM82OYG4=";
+ hash = "sha256-JSR0j0E5F0Rv68jgh53A1PAmoGT4nxfEK4G+p3q3bIQ=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix
index 1f30f82d7f073..7cb99ac62011b 100644
--- a/pkgs/development/python-modules/google-api-core/default.nix
+++ b/pkgs/development/python-modules/google-api-core/default.nix
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "google-api-core";
- version = "2.25.1";
+ version = "2.26.0";
pyproject = true;
src = fetchFromGitHub {
owner = "googleapis";
repo = "python-api-core";
tag = "v${version}";
- hash = "sha256-lh4t03upQQxY2KGwucXfEeNvqVVXlZ6hjR/e47imetk=";
+ hash = "sha256-BA2OWzr0sH77YUkFqMsGJQppqbG3R4sQ2kepicdzejE=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix
index 304595531a241..54360a12fd128 100644
--- a/pkgs/development/python-modules/google-api-python-client/default.nix
+++ b/pkgs/development/python-modules/google-api-python-client/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "google-api-python-client";
- version = "2.177.0";
+ version = "2.185.0";
pyproject = true;
src = fetchFromGitHub {
owner = "googleapis";
repo = "google-api-python-client";
tag = "v${version}";
- hash = "sha256-CEjbUIXtG5z1/28DsNCm/npMSd/+DyY5PMJHm9XDe2M=";
+ hash = "sha256-uItN7P6tZTxEHfma+S0p4grRRnAaIhuTezvJzWjvkfE=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix
index e0389c8f8f410..d9e435c32486b 100644
--- a/pkgs/development/python-modules/google-auth/default.nix
+++ b/pkgs/development/python-modules/google-auth/default.nix
@@ -25,14 +25,14 @@
buildPythonPackage rec {
pname = "google-auth";
- version = "2.40.3";
+ version = "2.41.1";
pyproject = true;
src = fetchFromGitHub {
owner = "googleapis";
repo = "google-auth-library-python";
tag = "v${version}";
- hash = "sha256-X1HTh24oos2GUxB9DDLtNH7BsBRLD0S/ngjsDAQYvhI=";
+ hash = "sha256-EPiI3cJy+NkT1oyKZJKcvQwAb64UQZDSNfWorZjIew8=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix
index a519eee42309c..48b80a05fefd1 100644
--- a/pkgs/development/python-modules/google-cloud-iam/default.nix
+++ b/pkgs/development/python-modules/google-cloud-iam/default.nix
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "google-cloud-iam";
- version = "2.19.0";
+ version = "2.20.0";
pyproject = true;
src = fetchFromGitHub {
owner = "googleapis";
repo = "google-cloud-python";
tag = "google-cloud-iam-v${version}";
- hash = "sha256-E1LISOLQcXqUMTTPLR+lwkR6gF1fuGGB44j38cIK/Z4=";
+ hash = "sha256-ICSBKEqNaXZZopGDwB0pkt06xN0gnsTBUA/HCQVxQTU=";
};
sourceRoot = "${src.name}/packages/google-cloud-iam";
diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix
index 508a28a223560..f0aa00153a768 100644
--- a/pkgs/development/python-modules/google-cloud-kms/default.nix
+++ b/pkgs/development/python-modules/google-cloud-kms/default.nix
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "google-cloud-kms";
- version = "3.4.1";
+ version = "3.7.0";
pyproject = true;
src = fetchFromGitHub {
owner = "googleapis";
repo = "google-cloud-python";
tag = "google-cloud-kms-v${version}";
- hash = "sha256-5PzidE1CWN+pt7+gcAtbuXyL/pq6cnn0MCRkBfmeUSw=";
+ hash = "sha256-/ZBpSn6bZpzFgIg3LmfV7xMowh9Gpslw0fcN021jAow=";
};
sourceRoot = "${src.name}/packages/google-cloud-kms";
diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix
index 04b83a3d15e6b..521c9769bc7d0 100644
--- a/pkgs/development/python-modules/google-cloud-storage/default.nix
+++ b/pkgs/development/python-modules/google-cloud-storage/default.nix
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "google-cloud-storage";
- version = "3.3.0";
+ version = "3.4.1";
pyproject = true;
src = fetchFromGitHub {
owner = "googleapis";
repo = "python-storage";
tag = "v${version}";
- hash = "sha256-I0wC/BV8fJr3JW1nyq2TPJZlZaT4+h2lJBdGTttSzRo=";
+ hash = "sha256-fLS1rrblNKm8dTG/Srg6IfcEjeZCS2QGNwW6ZXIo7UQ=";
};
pythonRelaxDeps = [ "google-auth" ];
diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix
index 012af3877b96b..04c7b91a6dc3e 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.75.1";
+ version = "1.76.0";
pyproject = true;
src = fetchPypi {
pname = "grpcio_channelz";
inherit version;
- hash = "sha256-4MqgbU3j62LT/cVOXJ3JADqj7iHpxQ9dNTiuqFTSdvI=";
+ hash = "sha256-KrFe97IlKpujHfUAu+KVzlMQqLAepvbWehcXLZFKQag=";
};
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 fe84d0817569e..461484ac96450 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.75.1";
+ version = "1.76.0";
format = "setuptools";
src = fetchPypi {
pname = "grpcio_health_checking";
inherit version;
- hash = "sha256-iI6huGrWXALIVHSG6VJjVi4UU2Pj1UAPUkT38sUyPmM=";
+ hash = "sha256-t6mddAlrOrOlmYf8AjdAaOHBgKNS6NH3nxDlojcnCY0=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix
index 4b6290afd7915..5374f5da493d4 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.75.1";
+ version = "1.76.0";
pyproject = true;
src = fetchPypi {
pname = "grpcio_reflection";
inherit version;
- hash = "sha256-K+PyC3uT5uaRoLx2H9fpmWqUC0yWxo9spPf7xHw/S2Q=";
+ hash = "sha256-4OfkmSHC7pUeXd/wvbrL0awacIiL62HVZ/PQG3md7LE=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix
index 51294793b6397..f7d888c7e22d1 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.75.1";
+ version = "1.76.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "grpcio_status";
inherit version;
- hash = "sha256-gWKvohgzoghckQicw5WtiA+sE3ih1gIz2XZkntcky/g=";
+ hash = "sha256-Jfy/7HTBXRoctdo/q47pZyhS3Balqe61uvfXqZUpQ80=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix
index 6edd72430bfaf..7a5d7e0ef6934 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.75.1";
+ version = "1.76.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "grpcio_testing";
inherit version;
- hash = "sha256-RUF4XosbetXbFVEyGsFE3WOM/z0fsC+St9ZRHFhLmKg=";
+ hash = "sha256-loQmPvqyo9xRFBeDOx5qB1hZfic6Ibbb8XwXAizvfCQ=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix
index 254f2f94b5ede..95baa1a69e6e6 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.75.1";
+ version = "1.76.0";
pyproject = true;
src = fetchPypi {
pname = "grpcio_tools";
inherit version;
- hash = "sha256-u3iWDPPViUHh/scMvazPJVkYvu0Tw0ESppFabY+s69E=";
+ hash = "sha256-zoAWm15q3z6DAvPrtssMOp8ICJEzq8pLdq1n91H1rYg=";
};
outputs = [
diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix
index f8d67db96e648..e88a79dd7f126 100644
--- a/pkgs/development/python-modules/grpcio/default.nix
+++ b/pkgs/development/python-modules/grpcio/default.nix
@@ -19,14 +19,14 @@
# nixpkgs-update: no auto update
buildPythonPackage rec {
pname = "grpcio";
- version = "1.75.1";
+ version = "1.76.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
- hash = "sha256-PoHYns6ZuaziOmkWiAusphPAOnmZJa+yhXiH76ixs9I=";
+ hash = "sha256-e+eDiNbaGiXA1exQZSPbWLGL4i2cN9jToywIvkmHvXM=";
};
outputs = [
diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix
index be3bbbc831250..1ac7962800a64 100644
--- a/pkgs/development/python-modules/gst-python/default.nix
+++ b/pkgs/development/python-modules/gst-python/default.nix
@@ -43,6 +43,9 @@ buildPythonPackage rec {
stripLen = 2;
hash = "sha256-BfWPc8dsB09KiEm9bNT8e+jH76jiDefQlEhhLJoq7tI=";
})
+
+ # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/4322
+ ./skip-failing-test-not-initialized.patch
];
# Python 2.x is not supported.
diff --git a/pkgs/development/python-modules/gst-python/skip-failing-test-not-initialized.patch b/pkgs/development/python-modules/gst-python/skip-failing-test-not-initialized.patch
new file mode 100644
index 0000000000000..169c85a0802ce
--- /dev/null
+++ b/pkgs/development/python-modules/gst-python/skip-failing-test-not-initialized.patch
@@ -0,0 +1,50 @@
+diff --git a/testsuite/test_gst.py b/testsuite/test_gst.py
+index 2111b968..fd8a4627 100644
+--- a/testsuite/test_gst.py
++++ b/testsuite/test_gst.py
+@@ -38,45 +38,6 @@ class TimeArgsTest(TestCase):
+ self.assertEqual(Gst.TIME_ARGS(Gst.SECOND), '0:00:01.000000000')
+
+
+-class TestNotInitialized(TestCase):
+- def testNotInitialized(self):
+- if sys.version_info >= (3, 0):
+- assert_type = Gst.NotInitialized
+- else:
+- assert_type = TypeError
+-
+- with self.assertRaises(assert_type):
+- Gst.Caps.from_string("audio/x-raw")
+-
+- with self.assertRaises(assert_type):
+- Gst.Structure.from_string("audio/x-raw")
+-
+- with self.assertRaises(assert_type):
+- Gst.ElementFactory.make("identity", None)
+-
+- def testNotDeinitialized(self):
+- Gst.init(None)
+-
+- assert(Gst.Caps.from_string("audio/x-raw"))
+- assert(Gst.Structure.from_string("audio/x-raw"))
+- assert(Gst.ElementFactory.make("identity", None))
+-
+- Gst.deinit()
+- if sys.version_info >= (3, 0):
+- assert_type = Gst.NotInitialized
+- else:
+- assert_type = TypeError
+-
+- with self.assertRaises(assert_type):
+- Gst.Caps.from_string("audio/x-raw")
+-
+- with self.assertRaises(assert_type):
+- Gst.Structure.from_string("audio/x-raw")
+-
+- with self.assertRaises(assert_type):
+- Gst.ElementFactory.make("identity", None)
+-
+-
+ class TestStructure(TestCase):
+
+ def test_new(self):
diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix
index 764a9cda9e28c..28c3e53d8128a 100644
--- a/pkgs/development/python-modules/gym/default.nix
+++ b/pkgs/development/python-modules/gym/default.nix
@@ -100,6 +100,9 @@ buildPythonPackage rec {
# The requested array has an inhomogeneous shape after 1 dimensions.
# The detected shape was (2,) + inhomogeneous part
"test_sample_contains"
+
+ # segfault
+ "test_record_video"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# Fatal Python error: Aborted
diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix
index 16b874cc9ce89..a5480e992abe7 100644
--- a/pkgs/development/python-modules/hass-nabucasa/default.nix
+++ b/pkgs/development/python-modules/hass-nabucasa/default.nix
@@ -2,6 +2,7 @@
lib,
acme,
aiohttp,
+ async-timeout,
atomicwrites-homeassistant,
attrs,
buildPythonPackage,
@@ -57,6 +58,7 @@ buildPythonPackage rec {
dependencies = [
acme
aiohttp
+ async-timeout
atomicwrites-homeassistant
attrs
ciso8601
diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix
index a3fff70db1b43..aefe7334db73f 100644
--- a/pkgs/development/python-modules/idna/default.nix
+++ b/pkgs/development/python-modules/idna/default.nix
@@ -1,29 +1,34 @@
{
lib,
buildPythonPackage,
- fetchPypi,
+ fetchFromGitHub,
flit-core,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "idna";
- version = "3.10";
+ version = "3.11";
pyproject = true;
- src = fetchPypi {
- inherit pname version;
- hash = "sha256-EvZcm0cKvabcNc+OY8xXSxxSsR3yyGAwrwrAmwGxPqk=";
+ src = fetchFromGitHub {
+ owner = "kjd";
+ repo = "idna";
+ tag = "v${version}";
+ hash = "sha256-4mnWOit+lrZnVslVyfalt6lv7qSYpLlyvET553SplJU=";
};
build-system = [ flit-core ];
+ pythonImportsCheck = [ "idna" ];
+
nativeCheckInputs = [ pytestCheckHook ];
meta = {
homepage = "https://github.com/kjd/idna/";
- changelog = "https://github.com/kjd/idna/releases/tag/v${version}";
+ changelog = "https://github.com/kjd/idna/releases/tag/${src.tag}";
description = "Internationalized Domain Names in Applications (IDNA)";
license = lib.licenses.bsd3;
+ maintainers = [ lib.maintainers.dotlambda ];
};
}
diff --git a/pkgs/development/python-modules/inline-snapshot/default.nix b/pkgs/development/python-modules/inline-snapshot/default.nix
index bff769ab1ec5d..3e2c78c98ccef 100644
--- a/pkgs/development/python-modules/inline-snapshot/default.nix
+++ b/pkgs/development/python-modules/inline-snapshot/default.nix
@@ -24,14 +24,14 @@
buildPythonPackage rec {
pname = "inline-snapshot";
- version = "0.24.0";
+ version = "0.28.0";
pyproject = true;
src = fetchFromGitHub {
owner = "15r10nk";
repo = "inline-snapshot";
tag = version;
- hash = "sha256-UiVxG9W1lwvvoflVey4250iL8gL8Tm41LBo0ab0tTqk=";
+ hash = "sha256-f572H7jeolv9nONuRBtZR/pcVDs5oX/dOiEjXlJyiio=";
};
build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/instructor/default.nix b/pkgs/development/python-modules/instructor/default.nix
index 959449e53e76c..993309fd72ad6 100644
--- a/pkgs/development/python-modules/instructor/default.nix
+++ b/pkgs/development/python-modules/instructor/default.nix
@@ -33,19 +33,23 @@
buildPythonPackage rec {
pname = "instructor";
- version = "1.10.0";
+ version = "1.11.3";
pyproject = true;
src = fetchFromGitHub {
owner = "jxnl";
repo = "instructor";
- tag = version;
+ tag = "v${version}";
hash = "sha256-vknPfRHyLoLo2838p/fbjrqyaBORZzLp9+fN98yVDz0=";
};
build-system = [ hatchling ];
- pythonRelaxDeps = [ "rich" ];
+ pythonRelaxDeps = [
+ "jiter"
+ "openai"
+ "rich"
+ ];
dependencies = [
aiohttp
diff --git a/pkgs/development/python-modules/jiter/Cargo.lock b/pkgs/development/python-modules/jiter/Cargo.lock
index 591a3682f5762..8d4e23c2c22be 100644
--- a/pkgs/development/python-modules/jiter/Cargo.lock
+++ b/pkgs/development/python-modules/jiter/Cargo.lock
@@ -1,12 +1,12 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
-version = 4
+version = 3
[[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",
@@ -16,22 +16,37 @@ dependencies = [
]
[[package]]
-name = "arbitrary"
-version = "1.4.1"
+name = "aho-corasick"
+version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
[[package]]
-name = "autocfg"
-version = "1.4.0"
+name = "anes"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
[[package]]
-name = "bencher"
-version = "0.1.5"
+name = "anstyle"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
+
+[[package]]
+name = "arbitrary"
+version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dfdb4953a096c551ce9ace855a604d702e6e62d77fac690575ae347571717f5"
+checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"
+
+[[package]]
+name = "autocfg"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
[[package]]
name = "bitvec"
@@ -45,12 +60,25 @@ dependencies = [
"wyz",
]
+[[package]]
+name = "bumpalo"
+version = "3.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+
+[[package]]
+name = "cast"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
+
[[package]]
name = "cc"
-version = "1.2.7"
+version = "1.2.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7"
+checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7"
dependencies = [
+ "find-msvc-tools",
"jobserver",
"libc",
"shlex",
@@ -58,29 +86,111 @@ dependencies = [
[[package]]
name = "cfg-if"
-version = "1.0.0"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+
+[[package]]
+name = "ciborium"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
+dependencies = [
+ "ciborium-io",
+ "ciborium-ll",
+ "serde",
+]
+
+[[package]]
+name = "ciborium-io"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
+
+[[package]]
+name = "ciborium-ll"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
+dependencies = [
+ "ciborium-io",
+ "half",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c2cfd7bf8a6017ddaa4e32ffe7403d547790db06bd171c1c53926faab501623"
+dependencies = [
+ "clap_builder",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a4c05b9e80c5ccd3a7ef080ad7b6ba7d6fc00a985b8b157197075677c82c7a0"
+dependencies = [
+ "anstyle",
+ "clap_lex",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
[[package]]
name = "codspeed"
-version = "2.7.2"
+version = "2.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "450a0e9df9df1c154156f4344f99d8f6f6e69d0fc4de96ef6e2e68b2ec3bce97"
+checksum = "93f4cce9c27c49c4f101fffeebb1826f41a9df2e7498b7cd4d95c0658b796c6c"
dependencies = [
"colored",
"libc",
+ "serde",
"serde_json",
+ "uuid",
]
[[package]]
-name = "codspeed-bencher-compat"
-version = "2.7.2"
+name = "codspeed-criterion-compat"
+version = "2.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "025afeee31b5b589484a884c7eb92bf80e0a5420bc4cb1f00d3a08c000211558"
+checksum = "c3c23d880a28a2aab52d38ca8481dd7a3187157d0a952196b6db1db3c8499725"
dependencies = [
- "bencher",
"codspeed",
+ "codspeed-criterion-compat-walltime",
+ "colored",
+]
+
+[[package]]
+name = "codspeed-criterion-compat-walltime"
+version = "2.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b0a2f7365e347f4f22a67e9ea689bf7bc89900a354e22e26cf8a531a42c8fbb"
+dependencies = [
+ "anes",
+ "cast",
+ "ciborium",
+ "clap",
+ "codspeed",
+ "criterion-plot",
+ "is-terminal",
+ "itertools",
+ "num-traits",
+ "once_cell",
+ "oorandom",
+ "plotters",
+ "rayon",
+ "regex",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "tinytemplate",
+ "walkdir",
]
[[package]]
@@ -90,14 +200,67 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
dependencies = [
"lazy_static",
- "windows-sys",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "criterion-plot"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
+dependencies = [
+ "cast",
+ "itertools",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
]
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
+[[package]]
+name = "crunchy"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
+
+[[package]]
+name = "either"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+
[[package]]
name = "equivalent"
-version = "1.0.1"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
[[package]]
name = "funty"
@@ -107,7 +270,7 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
[[package]]
name = "fuzz"
-version = "0.8.2"
+version = "0.11.1"
dependencies = [
"indexmap",
"jiter",
@@ -120,20 +283,32 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.15"
+version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
dependencies = [
"cfg-if",
"libc",
- "wasi",
+ "r-efi",
+ "wasip2",
+]
+
+[[package]]
+name = "half"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
+dependencies = [
+ "cfg-if",
+ "crunchy",
+ "zerocopy",
]
[[package]]
name = "hashbrown"
-version = "0.15.2"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
[[package]]
name = "heck"
@@ -141,11 +316,17 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+[[package]]
+name = "hermit-abi"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
+
[[package]]
name = "indexmap"
-version = "2.7.0"
+version = "2.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
+checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f"
dependencies = [
"equivalent",
"hashbrown",
@@ -153,24 +334,46 @@ dependencies = [
[[package]]
name = "indoc"
-version = "2.0.5"
+version = "2.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
+checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706"
+dependencies = [
+ "rustversion",
+]
+
+[[package]]
+name = "is-terminal"
+version = "0.4.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
[[package]]
name = "itoa"
-version = "1.0.14"
+version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
[[package]]
name = "jiter"
-version = "0.8.2"
+version = "0.11.1"
dependencies = [
"ahash",
- "bencher",
"bitvec",
- "codspeed-bencher-compat",
+ "codspeed-criterion-compat",
"lexical-parse-float",
"num-bigint",
"num-traits",
@@ -184,7 +387,7 @@ dependencies = [
[[package]]
name = "jiter-python"
-version = "0.8.2"
+version = "0.11.1"
dependencies = [
"jiter",
"pyo3",
@@ -192,13 +395,24 @@ dependencies = [
[[package]]
name = "jobserver"
-version = "0.1.32"
+version = "0.1.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
dependencies = [
+ "getrandom",
"libc",
]
+[[package]]
+name = "js-sys"
+version = "0.3.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
[[package]]
name = "lazy_static"
version = "1.5.0"
@@ -207,55 +421,56 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "lexical-parse-float"
-version = "0.8.5"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f"
+checksum = "52a9f232fbd6f550bc0137dcb5f99ab674071ac2d690ac69704593cb4abbea56"
dependencies = [
"lexical-parse-integer",
"lexical-util",
- "static_assertions",
]
[[package]]
name = "lexical-parse-integer"
-version = "0.8.6"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9"
+checksum = "9a7a039f8fb9c19c996cd7b2fcce303c1b2874fe1aca544edc85c4a5f8489b34"
dependencies = [
"lexical-util",
- "static_assertions",
]
[[package]]
name = "lexical-util"
-version = "0.8.5"
+version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc"
-dependencies = [
- "static_assertions",
-]
+checksum = "2604dd126bb14f13fb5d1bd6a66155079cb9fa655b37f875b3a742c705dbed17"
[[package]]
name = "libc"
-version = "0.2.169"
+version = "0.2.177"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
[[package]]
name = "libfuzzer-sys"
-version = "0.4.8"
+version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b9569d2f74e257076d8c6bfa73fb505b46b851e51ddaecc825944aa3bed17fa"
+checksum = "5037190e1f70cbeef565bd267599242926f724d3b8a9f510fd7e0b540cfa4404"
dependencies = [
"arbitrary",
"cc",
]
+[[package]]
+name = "log"
+version = "0.4.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+
[[package]]
name = "memchr"
-version = "2.7.4"
+version = "2.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
[[package]]
name = "memoffset"
@@ -296,9 +511,15 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.20.2"
+version = "1.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "oorandom"
+version = "11.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
[[package]]
name = "paste"
@@ -306,28 +527,55 @@ version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+[[package]]
+name = "plotters"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
+dependencies = [
+ "num-traits",
+ "plotters-backend",
+ "plotters-svg",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "plotters-backend"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
+
+[[package]]
+name = "plotters-svg"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
+dependencies = [
+ "plotters-backend",
+]
+
[[package]]
name = "portable-atomic"
-version = "1.10.0"
+version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
[[package]]
name = "proc-macro2"
-version = "1.0.92"
+version = "1.0.102"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+checksum = "8e0f6df8eaa422d97d72edcd152e1451618fed47fabbdbd5a8864167b1d4aff7"
dependencies = [
"unicode-ident",
]
[[package]]
name = "pyo3"
-version = "0.23.3"
+version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e484fd2c8b4cb67ab05a318f1fd6fa8f199fcc30819f08f07d200809dba26c15"
+checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383"
dependencies = [
- "cfg-if",
"indoc",
"libc",
"memoffset",
@@ -342,20 +590,19 @@ dependencies = [
[[package]]
name = "pyo3-build-config"
-version = "0.23.3"
+version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc0e0469a84f208e20044b98965e1561028180219e35352a2afaf2b942beff3b"
+checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f"
dependencies = [
- "once_cell",
"python3-dll-a",
"target-lexicon",
]
[[package]]
name = "pyo3-ffi"
-version = "0.23.3"
+version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb1547a7f9966f6f1a0f0227564a9945fe36b90da5a93b3933fc3dc03fae372d"
+checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105"
dependencies = [
"libc",
"pyo3-build-config",
@@ -363,9 +610,9 @@ dependencies = [
[[package]]
name = "pyo3-macros"
-version = "0.23.3"
+version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdb6da8ec6fa5cedd1626c886fc8749bdcbb09424a86461eb8cdf096b7c33257"
+checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded"
dependencies = [
"proc-macro2",
"pyo3-macros-backend",
@@ -375,9 +622,9 @@ dependencies = [
[[package]]
name = "pyo3-macros-backend"
-version = "0.23.3"
+version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38a385202ff5a92791168b1136afae5059d3ac118457bb7bc304c197c2d33e7d"
+checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf"
dependencies = [
"heck",
"proc-macro2",
@@ -388,48 +635,128 @@ dependencies = [
[[package]]
name = "python3-dll-a"
-version = "0.2.12"
+version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b66f9171950e674e64bad3456e11bb3cca108e5c34844383cfe277f45c8a7a8"
+checksum = "d381ef313ae70b4da5f95f8a4de773c6aa5cd28f73adec4b4a31df70b66780d8"
dependencies = [
"cc",
]
[[package]]
name = "quote"
-version = "1.0.38"
+version = "1.0.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
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 = "radium"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+[[package]]
+name = "rayon"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "regex"
+version = "1.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
[[package]]
name = "ryu"
-version = "1.0.18"
+version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
[[package]]
name = "serde"
-version = "1.0.217"
+version = "1.0.228"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.217"
+version = "1.0.228"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
dependencies = [
"proc-macro2",
"quote",
@@ -438,15 +765,16 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.134"
+version = "1.0.145"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
dependencies = [
"indexmap",
"itoa",
"memchr",
"ryu",
"serde",
+ "serde_core",
]
[[package]]
@@ -457,21 +785,15 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
[[package]]
name = "smallvec"
-version = "1.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
+version = "1.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
[[package]]
name = "syn"
-version = "2.0.94"
+version = "2.0.108"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "987bc0be1cdea8b10216bd06e2ca407d40b9543468fafd3ddfb02f36e77f71f3"
+checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917"
dependencies = [
"proc-macro2",
"quote",
@@ -486,21 +808,42 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
[[package]]
name = "target-lexicon"
-version = "0.12.16"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c"
+
+[[package]]
+name = "tinytemplate"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
+dependencies = [
+ "serde",
+ "serde_json",
+]
[[package]]
name = "unicode-ident"
-version = "1.0.14"
+version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+checksum = "462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06"
[[package]]
name = "unindent"
-version = "0.2.3"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
+
+[[package]]
+name = "uuid"
+version = "1.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
+checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
+dependencies = [
+ "getrandom",
+ "js-sys",
+ "wasm-bindgen",
+]
[[package]]
name = "version_check"
@@ -509,10 +852,107 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.104"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19"
+dependencies = [
+ "bumpalo",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "winapi-util"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
[[package]]
name = "windows-sys"
@@ -523,6 +963,15 @@ dependencies = [
"windows-targets",
]
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
+]
+
[[package]]
name = "windows-targets"
version = "0.52.6"
@@ -587,6 +1036,12 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+[[package]]
+name = "wit-bindgen"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+
[[package]]
name = "wyz"
version = "0.5.1"
@@ -598,18 +1053,18 @@ dependencies = [
[[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",
diff --git a/pkgs/development/python-modules/jiter/default.nix b/pkgs/development/python-modules/jiter/default.nix
index 7d5cb4c5931c2..ce44681e80aa1 100644
--- a/pkgs/development/python-modules/jiter/default.nix
+++ b/pkgs/development/python-modules/jiter/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "jiter";
- version = "0.8.2";
+ version = "0.11.1";
pyproject = true;
src = fetchFromGitHub {
owner = "pydantic";
repo = "jiter";
tag = "v${version}";
- hash = "sha256-6FPwQ6t/zLB86k97S+6z5xWKBPJvjZ5/x3KrxOOT1gk=";
+ hash = "sha256-/OSLwqSy/CkAFv0hn1zED70MRsWV8/NTrSfqP7OSRFc=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/langchain-anthropic/default.nix b/pkgs/development/python-modules/langchain-anthropic/default.nix
index a0d9e62488cc1..7c78e85479023 100644
--- a/pkgs/development/python-modules/langchain-anthropic/default.nix
+++ b/pkgs/development/python-modules/langchain-anthropic/default.nix
@@ -4,7 +4,7 @@
fetchFromGitHub,
# build-system
- pdm-backend,
+ hatchling,
# dependencies
anthropic,
@@ -12,6 +12,7 @@
pydantic,
# tests
+ langchain,
langchain-tests,
pytest-asyncio,
pytestCheckHook,
@@ -22,19 +23,19 @@
buildPythonPackage rec {
pname = "langchain-anthropic";
- version = "0.3.18";
+ version = "1.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-anthropic==${version}";
- hash = "sha256-ZedCz4FyKowhxLVpHrBsmGKHkMCA5yW7ui6LI0QGQ44=";
+ hash = "sha256-3kW5w98t5F199k14MoCY2dZGrC/HdBzKuRpM37EY3LQ=";
};
sourceRoot = "${src.name}/libs/partners/anthropic";
- build-system = [ pdm-backend ];
+ build-system = [ hatchling ];
dependencies = [
anthropic
@@ -49,6 +50,7 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
+ langchain
langchain-tests
pytest-asyncio
pytestCheckHook
diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix
index 2877c9edfff85..5b29a60e13841 100644
--- a/pkgs/development/python-modules/langchain-aws/default.nix
+++ b/pkgs/development/python-modules/langchain-aws/default.nix
@@ -4,7 +4,7 @@
fetchFromGitHub,
# build-system
- poetry-core,
+ pdm-backend,
# dependencies
boto3,
@@ -24,14 +24,14 @@
buildPythonPackage rec {
pname = "langchain-aws";
- version = "0.2.33";
+ version = "1.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain-aws";
tag = "langchain-aws==${version}";
- hash = "sha256-8VRZhwrR5PdLo9FamQClKbYfuHUGVxamku4osyl8Wl4=";
+ hash = "sha256-Y4r9a7EiyOACcU41+1Lo89jguu1QmijWsNeoNqKF3cY=";
};
postPatch = ''
@@ -41,7 +41,7 @@ buildPythonPackage rec {
sourceRoot = "${src.name}/libs/aws";
- build-system = [ poetry-core ];
+ build-system = [ pdm-backend ];
dependencies = [
boto3
diff --git a/pkgs/development/python-modules/langchain-chroma/001-async-test.patch b/pkgs/development/python-modules/langchain-chroma/001-async-test.patch
deleted file mode 100644
index 178fd37199f85..0000000000000
--- a/pkgs/development/python-modules/langchain-chroma/001-async-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/libs/partners/chroma/tests/integration_tests/test_vectorstores.py b/libs/partners/chroma/tests/integration_tests/test_vectorstores.py
-index 382b24cb5..f99a34112 100644
---- a/tests/integration_tests/test_vectorstores.py
-+++ b/tests/integration_tests/test_vectorstores.py
-@@ -36,7 +36,7 @@ def test_chroma() -> None:
-
- assert output == [Document(page_content="foo")]
-
--
-+@pytest.mark.asyncio
- async def test_chroma_async() -> None:
- """Test end to end construction and search."""
- texts = ["foo", "bar", "baz"]
diff --git a/pkgs/development/python-modules/langchain-chroma/default.nix b/pkgs/development/python-modules/langchain-chroma/default.nix
index e412b4e02738b..d8ff4c47f065e 100644
--- a/pkgs/development/python-modules/langchain-chroma/default.nix
+++ b/pkgs/development/python-modules/langchain-chroma/default.nix
@@ -4,7 +4,7 @@
fetchFromGitHub,
# build-system
- pdm-backend,
+ hatchling,
# dependencies
chromadb,
@@ -22,21 +22,19 @@
buildPythonPackage rec {
pname = "langchain-chroma";
- version = "0.2.6";
+ version = "1.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-chroma==${version}";
- hash = "sha256-HxoxxOgiDC/rf4hCA6uQBPmK11/fqddc5d4nMpIFxEw=";
+ hash = "sha256-fKFcl4NiNaypJGoV8bDrH7MwnsXNtnm7Hkxp/+SLc2c=";
};
sourceRoot = "${src.name}/libs/partners/chroma";
- patches = [ ./001-async-test.patch ];
-
- build-system = [ pdm-backend ];
+ build-system = [ hatchling ];
pythonRelaxDeps = [
# Each component release requests the exact latest core.
@@ -59,11 +57,6 @@ buildPythonPackage rec {
pytestCheckHook
];
- disabledTests = [
- # Bad integration test, not used or vetted by the langchain team
- "test_chroma_update_document"
- ];
-
passthru = {
# python updater script sets the wrong tag
skipBulkUpdate = true;
diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix
index 80ef77828e11f..3b103a45a49d1 100644
--- a/pkgs/development/python-modules/langchain-core/default.nix
+++ b/pkgs/development/python-modules/langchain-core/default.nix
@@ -5,7 +5,7 @@
fetchFromGitHub,
# build-system
- pdm-backend,
+ hatchling,
# dependencies
jsonpatch,
@@ -36,19 +36,19 @@
buildPythonPackage rec {
pname = "langchain-core";
- version = "0.3.72";
+ version = "1.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-core==${version}";
- hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
+ hash = "sha256-/V2xwpVIR7AWkN85D51LYokMrTrnJlIkGr0q1ztVh8A=";
};
sourceRoot = "${src.name}/libs/core";
- build-system = [ pdm-backend ];
+ build-system = [ hatchling ];
pythonRelaxDeps = [
"packaging"
diff --git a/pkgs/development/python-modules/langchain-deepseek/default.nix b/pkgs/development/python-modules/langchain-deepseek/default.nix
index e6978addf2e82..cd5683c5007f9 100644
--- a/pkgs/development/python-modules/langchain-deepseek/default.nix
+++ b/pkgs/development/python-modules/langchain-deepseek/default.nix
@@ -4,7 +4,7 @@
fetchFromGitHub,
# build-system
- pdm-backend,
+ hatchling,
# dependencies
langchain-core,
@@ -22,20 +22,20 @@
buildPythonPackage rec {
pname = "langchain-deepseek";
- version = "0.1.4";
+ version = "1.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-deepseek==${version}";
- hash = "sha256-lIlThVpyZF5osiCyYMO8kQUNtG5eUjXGZLdgRraj4Yc=";
+ hash = "sha256-sOJxtiYL/hgDEeWkCvHP3mfI4tmrBuQp1BYN5WX+npo=";
};
sourceRoot = "${src.name}/libs/partners/deepseek";
build-system = [
- pdm-backend
+ hatchling
];
pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/langchain-fireworks/default.nix b/pkgs/development/python-modules/langchain-fireworks/default.nix
index 3a614511e2445..e30ec4de50188 100644
--- a/pkgs/development/python-modules/langchain-fireworks/default.nix
+++ b/pkgs/development/python-modules/langchain-fireworks/default.nix
@@ -4,7 +4,7 @@
fetchFromGitHub,
# build-system
- pdm-backend,
+ hatchling,
# dependencies
aiohttp,
@@ -24,19 +24,19 @@
buildPythonPackage rec {
pname = "langchain-fireworks";
- version = "0.3.0";
+ version = "1.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-fireworks==${version}";
- hash = "sha256-OZou323FAk2I4YuQV7sllbzDwFQWy/90FK3gIHnEBd0=";
+ hash = "sha256-JULxbSSSerM7HifVBRxkv5YgpP5jFdm3XzHIJbM8T1Y=";
};
sourceRoot = "${src.name}/libs/partners/fireworks";
- build-system = [ pdm-backend ];
+ build-system = [ hatchling ];
dependencies = [
aiohttp
@@ -75,8 +75,8 @@ buildPythonPackage rec {
description = "Build LangChain applications with Fireworks";
homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/fireworks";
license = lib.licenses.mit;
- maintainers = [
- lib.maintainers.sarahec
+ maintainers = with lib.maintainers; [
+ sarahec
];
};
}
diff --git a/pkgs/development/python-modules/langchain-google-genai/default.nix b/pkgs/development/python-modules/langchain-google-genai/default.nix
index b28f462f03591..f89cb67878446 100644
--- a/pkgs/development/python-modules/langchain-google-genai/default.nix
+++ b/pkgs/development/python-modules/langchain-google-genai/default.nix
@@ -4,7 +4,7 @@
fetchFromGitHub,
# build-system
- poetry-core,
+ pdm-backend,
# dependencies
filetype,
@@ -29,19 +29,19 @@
buildPythonPackage rec {
pname = "langchain-google-genai";
- version = "2.1.10";
+ version = "3.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain-google";
tag = "libs/genai/v${version}";
- hash = "sha256-kqII8RG1ep+n5CqKLY1v7Mc+zJh6kl1rAjMmkomfeqM=";
+ hash = "sha256-9Z0iRSICApA5/iHB7NTVYGpkktaoynG74W2mvn9zeMg=";
};
sourceRoot = "${src.name}/libs/genai";
- build-system = [ poetry-core ];
+ build-system = [ pdm-backend ];
pythonRelaxDeps = [
# Each component release requests the exact latest core.
@@ -85,9 +85,9 @@ buildPythonPackage rec {
description = "LangChain integrations for Google Gemini";
homepage = "https://github.com/langchain-ai/langchain-google/tree/main/libs/genai";
license = lib.licenses.mit;
- maintainers = [
- lib.maintainers.eu90h
- lib.maintainers.sarahec
+ maintainers = with lib.maintainers; [
+ eu90h
+ sarahec
];
};
}
diff --git a/pkgs/development/python-modules/langchain-groq/default.nix b/pkgs/development/python-modules/langchain-groq/default.nix
index 96478eb5fa856..a70487f2378d8 100644
--- a/pkgs/development/python-modules/langchain-groq/default.nix
+++ b/pkgs/development/python-modules/langchain-groq/default.nix
@@ -4,7 +4,7 @@
fetchFromGitHub,
# build-system
- pdm-backend,
+ hatchling,
# dependencies
langchain-core,
@@ -20,19 +20,19 @@
buildPythonPackage rec {
pname = "langchain-groq";
- version = "0.3.8";
+ version = "1.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-groq==${version}";
- hash = "sha256-mlkNKzVX4VUQ9+/rB0fD4HfwjbCA9Yp4DJkMT+ExJ1c=";
+ hash = "sha256-OuZEdpPp0mKSejd43RW3bXzCzp3E4Pce7flsSr5JleY=";
};
sourceRoot = "${src.name}/libs/partners/groq";
- build-system = [ pdm-backend ];
+ build-system = [ hatchling ];
pythonRelaxDeps = [
# Each component release requests the exact latest core.
diff --git a/pkgs/development/python-modules/langchain-huggingface/default.nix b/pkgs/development/python-modules/langchain-huggingface/default.nix
index e8a1dd68fc1a2..ef4043f16e1cf 100644
--- a/pkgs/development/python-modules/langchain-huggingface/default.nix
+++ b/pkgs/development/python-modules/langchain-huggingface/default.nix
@@ -4,7 +4,7 @@
fetchFromGitHub,
# build-system
- pdm-backend,
+ hatchling,
# dependencies
huggingface-hub,
@@ -33,19 +33,19 @@
buildPythonPackage rec {
pname = "langchain-huggingface";
- version = "0.3.1";
+ version = "1.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-huggingface==${version}";
- hash = "sha256-nae7KwCKjkvenOO8vErxFQStHolc+N8EUuK6U8r48Kc=";
+ hash = "sha256-5ovHScT4bi4Ix7ejeyTjYxBvraoegtyIBojTdTBH5Js=";
};
sourceRoot = "${src.name}/libs/partners/huggingface";
- build-system = [ pdm-backend ];
+ build-system = [ hatchling ];
pythonRelaxDeps = [
# Each component release requests the exact latest core.
diff --git a/pkgs/development/python-modules/langchain-mistralai/default.nix b/pkgs/development/python-modules/langchain-mistralai/default.nix
index 9b6f5d9abc4c1..35ac8078c34e3 100644
--- a/pkgs/development/python-modules/langchain-mistralai/default.nix
+++ b/pkgs/development/python-modules/langchain-mistralai/default.nix
@@ -4,7 +4,7 @@
fetchFromGitHub,
# build-system
- pdm-backend,
+ hatchling,
# dependencies
langchain-core,
@@ -24,19 +24,19 @@
buildPythonPackage rec {
pname = "langchain-mistralai";
- version = "0.2.12";
+ version = "1.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-mistralai==${version}";
- hash = "sha256-eZyoveKn4S0nkK/2q8+HK0bpFAQEez4PyRETQeZItMo=";
+ hash = "sha256-khpZY6kttbgacnY1EKCyIPBR2ZiZHC3OA+0NpIBXg9s=";
};
sourceRoot = "${src.name}/libs/partners/mistralai";
- build-system = [ pdm-backend ];
+ build-system = [ hatchling ];
dependencies = [
langchain-core
diff --git a/pkgs/development/python-modules/langchain-ollama/default.nix b/pkgs/development/python-modules/langchain-ollama/default.nix
index b315678abe784..93072b4645384 100644
--- a/pkgs/development/python-modules/langchain-ollama/default.nix
+++ b/pkgs/development/python-modules/langchain-ollama/default.nix
@@ -4,7 +4,7 @@
fetchFromGitHub,
# build-system
- pdm-backend,
+ hatchling,
# dependencies
langchain-core,
@@ -22,20 +22,20 @@
buildPythonPackage rec {
pname = "langchain-ollama";
- version = "0.3.8";
+ version = "1.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-ollama==${version}";
- hash = "sha256-r6O06JHJOtMPA/FOmkr6YCT5pUnlcG9wu2Bm3Gae5Mk=";
+ hash = "sha256-BINQYT+tLHAOKU54Cu6KP2vDg02MgkK9+XOYli8AXzs=";
};
sourceRoot = "${src.name}/libs/partners/ollama";
build-system = [
- pdm-backend
+ hatchling
];
pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix
index 2e6bb2ab23feb..8d3d8fe6c6d73 100644
--- a/pkgs/development/python-modules/langchain-openai/default.nix
+++ b/pkgs/development/python-modules/langchain-openai/default.nix
@@ -4,7 +4,7 @@
fetchFromGitHub,
# build-system
- pdm-backend,
+ hatchling,
# dependencies
langchain-core,
@@ -13,6 +13,7 @@
# tests
freezegun,
+ langchain,
langchain-tests,
lark,
pandas,
@@ -32,19 +33,19 @@
buildPythonPackage rec {
pname = "langchain-openai";
- version = "0.3.28";
+ version = "1.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-openai==${version}";
- hash = "sha256-HpAdCHxmfGJcqXArvtlYagNuEBGBjrbICIwh9nI0qMQ=";
+ hash = "sha256-lKZZw9kMV3oM7fNpVvofZJfOcyoUdqByWQmBV5MTFZo=";
};
sourceRoot = "${src.name}/libs/partners/openai";
- build-system = [ pdm-backend ];
+ build-system = [ hatchling ];
pythonRelaxDeps = [
# Each component release requests the exact latest core.
@@ -60,6 +61,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
freezegun
+ langchain
langchain-tests
lark
pandas
@@ -78,26 +80,16 @@ buildPythonPackage rec {
disabledTests = [
# These tests require network access
- "test__convert_dict_to_message_tool_call"
"test__get_encoding_model"
- "test_azure_openai_api_key_is_secret_string"
- "test_azure_openai_api_key_masked_when_passed_from_env"
- "test_azure_openai_api_key_masked_when_passed_via_constructor"
- "test_azure_openai_secrets"
- "test_azure_openai_uses_actual_secret_value_from_secretstr"
- "test_azure_serialized_secrets"
"test_chat_openai_get_num_tokens"
"test_embed_documents_with_custom_chunk_size"
"test_get_num_tokens_from_messages"
"test_get_token_ids"
"test_init_o1"
- "test_openai_get_num_tokens"
- ];
- disabledTestPaths = [
- # TODO recheck on next update. Langchain has been working on Pydantic errors.
- # ValidationError from pydantic
- "tests/unit_tests/chat_models/test_responses_stream.py"
+ # TypeError: exceptions must be derived from Warning, not
+ # https://github.com/langchain-ai/langchain/issues/33705
+ "test_init_minimal_reasoning_effort"
];
pythonImportsCheck = [ "langchain_openai" ];
diff --git a/pkgs/development/python-modules/langchain-perplexity/default.nix b/pkgs/development/python-modules/langchain-perplexity/default.nix
index 9638e5aa883d4..55d0109f1ad53 100644
--- a/pkgs/development/python-modules/langchain-perplexity/default.nix
+++ b/pkgs/development/python-modules/langchain-perplexity/default.nix
@@ -4,7 +4,7 @@
fetchFromGitHub,
# build-system
- pdm-backend,
+ hatchling,
# dependencies
langchain-core,
@@ -23,19 +23,19 @@
buildPythonPackage rec {
pname = "langchain-perplexity";
- version = "0.1.2";
+ version = "1.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-perplexity==${version}";
- hash = "sha256-4KYLyhGbG8Y8cDGffE4/8OM61eAKRFTgxKDKMTQExic=";
+ hash = "sha256-RUvzV1DQqg0nK/SABBekXlhuKmMT7vHTlyxb7RVpoiI=";
};
sourceRoot = "${src.name}/libs/partners/perplexity";
- build-system = [ pdm-backend ];
+ build-system = [ hatchling ];
dependencies = [
langchain-core
@@ -73,8 +73,8 @@ buildPythonPackage rec {
description = "Build LangChain applications with Perplexity";
homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/perplexity";
license = lib.licenses.mit;
- maintainers = [
- lib.maintainers.sarahec
+ maintainers = with lib.maintainers; [
+ sarahec
];
};
}
diff --git a/pkgs/development/python-modules/langchain-tests/default.nix b/pkgs/development/python-modules/langchain-tests/default.nix
index 79528751b939a..84f368fa507d6 100644
--- a/pkgs/development/python-modules/langchain-tests/default.nix
+++ b/pkgs/development/python-modules/langchain-tests/default.nix
@@ -4,7 +4,7 @@
fetchFromGitHub,
# build-system
- pdm-backend,
+ hatchling,
# dependencies
httpx,
@@ -30,19 +30,19 @@
buildPythonPackage rec {
pname = "langchain-tests";
- version = "0.3.21";
+ version = "1.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-tests==${version}";
- hash = "sha256-CufnUFhYTENuq4/32u0w3UZb7TdZxEpshyQqLH6NEZo=";
+ hash = "sha256-t+3o7XoemvEALVYMx+FpkGQVx2c/npRrK3cNDp3bp9A=";
};
sourceRoot = "${src.name}/libs/standard-tests";
- build-system = [ pdm-backend ];
+ build-system = [ hatchling ];
pythonRelaxDeps = [
# Each component release requests the exact latest core.
diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix
index d331a852ca614..2740e682a1c82 100644
--- a/pkgs/development/python-modules/langchain-text-splitters/default.nix
+++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix
@@ -4,12 +4,13 @@
fetchFromGitHub,
# build-system
- pdm-backend,
+ hatchling,
# dependencies
langchain-core,
# tests
+ beautifulsoup4,
httpx,
pytest-asyncio,
pytestCheckHook,
@@ -20,19 +21,19 @@
buildPythonPackage rec {
pname = "langchain-text-splitters";
- version = "0.3.11";
+ version = "1.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-text-splitters==${version}";
- hash = "sha256-SShVzssXi18j5gcDSwwDT+umObEk7uhaCP2mMolQJxI=";
+ hash = "sha256-DOWd94Vx61OS1OI2uIZVonf6BiXkjbS2pTrzleKvifM=";
};
sourceRoot = "${src.name}/libs/text-splitters";
- build-system = [ pdm-backend ];
+ build-system = [ hatchling ];
pythonRelaxDeps = [
# Each component release requests the exact latest core.
@@ -45,6 +46,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "langchain_text_splitters" ];
nativeCheckInputs = [
+ beautifulsoup4
httpx
pytest-asyncio
pytestCheckHook
diff --git a/pkgs/development/python-modules/langchain-xai/default.nix b/pkgs/development/python-modules/langchain-xai/default.nix
index 6769f74c3440f..439645e393377 100644
--- a/pkgs/development/python-modules/langchain-xai/default.nix
+++ b/pkgs/development/python-modules/langchain-xai/default.nix
@@ -5,7 +5,7 @@
fetchFromGitHub,
# build-system
- pdm-backend,
+ hatchling,
# dependencies
aiohttp,
@@ -25,19 +25,19 @@
buildPythonPackage rec {
pname = "langchain-xai";
- version = "0.2.5";
+ version = "1.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-xai==${version}";
- hash = "sha256-nae7KwCKjkvenOO8vErxFQStHolc+N8EUuK6U8r48Kc=";
+ hash = "sha256-engdUNTT3KsAGrJ93PiFQoI6jbBFPAqavDsrD073484=";
};
sourceRoot = "${src.name}/libs/partners/xai";
- build-system = [ pdm-backend ];
+ build-system = [ hatchling ];
dependencies = [
aiohttp
diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix
index 96754ea94d52f..77e77ce0e5e75 100644
--- a/pkgs/development/python-modules/langchain/default.nix
+++ b/pkgs/development/python-modules/langchain/default.nix
@@ -5,16 +5,14 @@
pythonOlder,
# build-system
- pdm-backend,
-
- # buildInputs
- bash,
+ hatchling,
# dependencies
aiohttp,
async-timeout,
langchain-core,
langchain-text-splitters,
+ langgraph,
langsmith,
numpy,
pydantic,
@@ -44,21 +42,19 @@
buildPythonPackage rec {
pname = "langchain";
- version = "0.3.72";
+ version = "1.0.2";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
- tag = "langchain-core==${version}";
- hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
+ tag = "langchain==${version}";
+ hash = "sha256-NQra/L7OfnVyFTbGkSDcG30r8W733eAs9abII53wy4g=";
};
- sourceRoot = "${src.name}/libs/langchain";
-
- build-system = [ pdm-backend ];
+ sourceRoot = "${src.name}/libs/langchain_v1";
- buildInputs = [ bash ];
+ build-system = [ hatchling ];
pythonRelaxDeps = [
# Each component release requests the exact latest core.
@@ -72,6 +68,7 @@ buildPythonPackage rec {
aiohttp
langchain-core
langchain-text-splitters
+ langgraph
langsmith
numpy
pydantic
@@ -111,47 +108,28 @@ buildPythonPackage rec {
"tests/unit_tests"
];
+ # All pass with sandbox=false
disabledTests = [
- # These tests have database access
- "test_table_info"
- "test_sql_database_run"
- # These tests have network access
- "test_socket_disabled"
- "test_openai_agent_with_streaming"
- "test_openai_agent_tools_agent"
- # This test may require a specific version of langchain-community
- "test_compatible_vectorstore_documentation"
- # AssertionErrors
- "test_callback_handlers"
- "test_generic_fake_chat_model"
- # Test is outdated
- "test_serializable_mapping"
- "test_person"
- "test_aliases_hidden"
- # AssertionError: (failed string match due to terminal control chars in output)
- # https://github.com/langchain-ai/langchain/issues/32150
- "test_filecallback"
+ # Depends on shell's truncation style
+ "test_truncation_indicator_present"
+ # Depends on the sleep shell command
+ "test_timeout_returns_error"
+ # Can't see the shell session results when sandboxed
+ "test_startup_and_shutdown_commands"
];
disabledTestPaths = [
- # pydantic.errors.PydanticUserError: `ConversationSummaryMemory` is not fully defined; you should define `BaseCache`, then call `ConversationSummaryMemory.model_rebuild()`.
- "tests/unit_tests/chains/test_conversation.py"
- # pydantic.errors.PydanticUserError: `ConversationSummaryMemory` is not fully defined; you should define `BaseCache`, then call `ConversationSummaryMemory.model_rebuild()`.
- "tests/unit_tests/chains/test_memory.py"
- # pydantic.errors.PydanticUserError: `ConversationSummaryBufferMemory` is not fully defined; you should define `BaseCache`, then call `ConversationSummaryBufferMemory.model_rebuild()`.
- "tests/unit_tests/chains/test_summary_buffer_memory.py"
- "tests/unit_tests/output_parsers/test_fix.py"
- "tests/unit_tests/chains/test_llm_checker.py"
- # TypeError: Can't instantiate abstract class RunnableSerializable[RetryOutputParserRetryChainInput, str] without an implementation for abstract method 'invoke'
- "tests/unit_tests/output_parsers/test_retry.py"
- # pydantic.errors.PydanticUserError: `LLMSummarizationCheckerChain` is not fully defined; you should define `BaseCache`, then call `LLMSummarizationCheckerChain.model_rebuild()`.
- "tests/unit_tests/chains/test_llm_summarization_checker.py"
+ # Their configuration tests don't place nicely with nixpkgs
+ "tests/unit_tests/test_pytest_config.py"
];
pythonImportsCheck = [ "langchain" ];
- passthru.updateScript = gitUpdater {
- rev-prefix = "langchain==";
+ passthru = {
+ skipBulkUpdate = true;
+ updateScript = gitUpdater {
+ rev-prefix = "langchain==";
+ };
};
__darwinAllowLocalNetworking = true;
@@ -165,6 +143,5 @@ buildPythonPackage rec {
natsukium
sarahec
];
- mainProgram = "langchain-server";
};
}
diff --git a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
index 7040ae3135437..b1769bb307508 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
@@ -26,14 +26,14 @@
buildPythonPackage rec {
pname = "langgraph-checkpoint-postgres";
- version = "2.0.23";
+ version = "3.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langgraph";
tag = "checkpointpostgres==${version}";
- hash = "sha256-QAzT8T3bf3R3gwI/iWDYYDz0SxgLZsP61oMk72dYz4s=";
+ hash = "sha256-YjO8KfDx7lZOps+dG7CPsY7LOqhKIBdfCXexPsR2pB4=";
};
postgresqlTestSetupPost = ''
@@ -84,6 +84,7 @@ buildPythonPackage rec {
"test_vector_search_with_filters"
"test_vector_search_pagination"
"test_vector_search_edge_cases"
+ "test_non_ascii"
# Flaky under a parallel build (database in use)
"test_store_ttl"
];
diff --git a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
index 44877b4eadebe..7ffc5b24374d2 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
@@ -22,14 +22,14 @@
buildPythonPackage rec {
pname = "langgraph-checkpoint-sqlite";
- version = "2.0.11";
+ version = "3.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langgraph";
tag = "checkpointsqlite==${version}";
- hash = "sha256-v/gRYkiS4AR1epWwPdG/QYbnUYte894kHTn5F58pVGI=";
+ hash = "sha256-YjO8KfDx7lZOps+dG7CPsY7LOqhKIBdfCXexPsR2pB4=";
};
sourceRoot = "${src.name}/libs/checkpoint-sqlite";
diff --git a/pkgs/development/python-modules/langgraph-checkpoint/default.nix b/pkgs/development/python-modules/langgraph-checkpoint/default.nix
index b0769f2a5306f..43e5b68aade28 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint/default.nix
@@ -18,6 +18,7 @@
pytest-asyncio,
pytest-mock,
pytestCheckHook,
+ redis,
# passthru
gitUpdater,
@@ -25,14 +26,14 @@
buildPythonPackage rec {
pname = "langgraph-checkpoint";
- version = "2.1.1";
+ version = "3.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langgraph";
tag = "checkpoint==${version}";
- hash = "sha256-UY3AChShKfOrtOQzOm5vi3Yy3rlBc+TAje9L2L6My/U=";
+ hash = "sha256-YjO8KfDx7lZOps+dG7CPsY7LOqhKIBdfCXexPsR2pB4=";
};
sourceRoot = "${src.name}/libs/checkpoint";
@@ -55,12 +56,7 @@ buildPythonPackage rec {
pytest-asyncio
pytest-mock
pytestCheckHook
- ];
-
- disabledTests = [
- # assert 1.0000000000000004 == 1.0000000000000002
- # https://github.com/langchain-ai/langgraph/issues/5845
- "test_embed_with_path"
+ redis
];
passthru = {
diff --git a/pkgs/development/python-modules/langgraph-prebuilt/default.nix b/pkgs/development/python-modules/langgraph-prebuilt/default.nix
index 59d69db2ba02c..cface66811d5f 100644
--- a/pkgs/development/python-modules/langgraph-prebuilt/default.nix
+++ b/pkgs/development/python-modules/langgraph-prebuilt/default.nix
@@ -31,14 +31,14 @@
# It exists so the langgraph team can iterate on it without having to rebuild langgraph.
buildPythonPackage rec {
pname = "langgraph-prebuilt";
- version = "0.6.4";
+ version = "1.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langgraph";
tag = "prebuilt==${version}";
- hash = "sha256-9jl16cKp3E7j79PXrr/3splrcJtfQQN7yFJ5sfa6c+I=";
+ hash = "sha256-YjO8KfDx7lZOps+dG7CPsY7LOqhKIBdfCXexPsR2pB4=";
};
sourceRoot = "${src.name}/libs/prebuilt";
diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix
index ef3089303418b..8c0ac5e6875a9 100644
--- a/pkgs/development/python-modules/langgraph/default.nix
+++ b/pkgs/development/python-modules/langgraph/default.nix
@@ -40,14 +40,14 @@
}:
buildPythonPackage rec {
pname = "langgraph";
- version = "0.6.4";
+ version = "1.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langgraph";
tag = version;
- hash = "sha256-9jl16cKp3E7j79PXrr/3splrcJtfQQN7yFJ5sfa6c+I=";
+ hash = "sha256-YjO8KfDx7lZOps+dG7CPsY7LOqhKIBdfCXexPsR2pB4=";
};
postgresqlTestSetupPost = ''
diff --git a/pkgs/development/python-modules/legacy-cgi/default.nix b/pkgs/development/python-modules/legacy-cgi/default.nix
index ede0920e34119..b525610504077 100644
--- a/pkgs/development/python-modules/legacy-cgi/default.nix
+++ b/pkgs/development/python-modules/legacy-cgi/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "legacy-cgi";
- version = "2.6.3";
+ version = "2.6.4";
pyproject = true;
src = fetchFromGitHub {
owner = "jackrosenthal";
repo = "legacy-cgi";
tag = "v${version}";
- hash = "sha256-l2BuSlxAA31VlJ/Fhs4cGbidbXEt/zEH3BiWsuh29GM=";
+ hash = "sha256-2CCYRRWP8FP54AcLnehJ0Kj3F3U4cz8vnesSj5EakdA=";
};
build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix
index c89cdb8daba8e..7f6e9fc13ef14 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.4";
+ version = "1.8.5";
pyproject = true;
src = fetchFromGitHub {
owner = "Instagram";
repo = "LibCST";
tag = "v${version}";
- hash = "sha256-OSLaEIfFM/uU3GkcVpvbeesqzr+qXa/BgkDEan7Ybkg=";
+ hash = "sha256-4FFkxy8UrLOXuZwvGvGQNZGtY27yLtiTWAzTbxLm3Eo=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
@@ -39,7 +39,7 @@ buildPythonPackage rec {
src
cargoRoot
;
- hash = "sha256-F/TaKZpynaCwXU0YvvuTEh5/pvMOpKur7wMSE7dtgNo=";
+ hash = "sha256-eFdcyqzH7meF4kIVT2qhbKVxEB6KtZVEONMgYw4sBew=";
};
cargoRoot = "native";
diff --git a/pkgs/development/python-modules/libpass/default.nix b/pkgs/development/python-modules/libpass/default.nix
index 834d0b512b9eb..5f02a27cc3a3d 100644
--- a/pkgs/development/python-modules/libpass/default.nix
+++ b/pkgs/development/python-modules/libpass/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "libpass";
- version = "1.9.2";
+ version = "1.9.3";
pyproject = true;
src = fetchFromGitHub {
owner = "ThirVondukr";
repo = "passlib";
tag = version;
- hash = "sha256-xL+92LdZxCH+yu2vz2AC44b4EYiGJbWfPkoSO3mSSjw=";
+ hash = "sha256-fzI9HpGE3wNK41ZSOeA5NAr5T4r3Jzdqe5+SHoWVXUs=";
};
build-system = [ hatchling ];
@@ -41,6 +41,15 @@ buildPythonPackage rec {
pythonImportsCheck = [ "passlib" ];
+ disabledTestPaths = [
+ # https://github.com/notypecheck/passlib/issues/18
+ "tests/test_handlers_bcrypt.py::bcrypt_bcrypt_test::test_70_hashes"
+ "tests/test_handlers_bcrypt.py::bcrypt_bcrypt_test::test_77_fuzz_input"
+ "tests/test_handlers_django.py::django_bcrypt_test::test_77_fuzz_input"
+ "tests/test_handlers_bcrypt.py::bcrypt_bcrypt_test::test_secret_w_truncate_size"
+ "tests/test_handlers_django.py::django_bcrypt_test::test_secret_w_truncate_size"
+ ];
+
disabledTests = [
# timming sensitive
"test_dummy_verify"
diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix
index 3cf144ae99611..24e51364669b2 100644
--- a/pkgs/development/python-modules/marimo/default.nix
+++ b/pkgs/development/python-modules/marimo/default.nix
@@ -1,6 +1,7 @@
{
lib,
buildPythonPackage,
+ fetchpatch2,
fetchPypi,
pythonOlder,
@@ -42,6 +43,15 @@ buildPythonPackage rec {
hash = "sha256-cmkz/ZyVYfpz4yOxghsXPF4PhRluwqSXo1CcwvwkXFg=";
};
+ patches = [
+ # https://github.com/marimo-team/marimo/pull/6714
+ (fetchpatch2 {
+ name = "uv-build.patch";
+ url = "https://github.com/Prince213/marimo/commit/b1c690e82e8117c451a74fdf172eb51a4861853d.patch?full_index=1";
+ hash = "sha256-iFS5NSGjaGdECRk0LCRSA8XzRb1/sVSZCTRLy6taHNU=";
+ })
+ ];
+
build-system = [ uv-build ];
dependencies = [
diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix
index f6ff184eb2c0a..f75b9ba52faf2 100644
--- a/pkgs/development/python-modules/mat2/default.nix
+++ b/pkgs/development/python-modules/mat2/default.nix
@@ -50,6 +50,11 @@ buildPythonPackage rec {
./executable-name.patch
# hardcode path to mat2 executable
./tests.patch
+ (fetchpatch {
+ name = "fix-test_html.patch";
+ url = "https://github.com/jvoisin/mat2/commit/00b4f110711754496932c59d5af3c0b2ed694484.patch";
+ hash = "sha256-5h/nM1dK8HmYtoIBVGOvUegMFBpGxcfpn5O6QrjLi9M=";
+ })
];
postPatch = ''
diff --git a/pkgs/development/python-modules/materialx/default.nix b/pkgs/development/python-modules/materialx/default.nix
index 5d9a744079c3c..96d3995259cd7 100644
--- a/pkgs/development/python-modules/materialx/default.nix
+++ b/pkgs/development/python-modules/materialx/default.nix
@@ -11,7 +11,6 @@
openimageio,
imath,
python,
- apple-sdk_14,
}:
buildPythonPackage rec {
@@ -36,9 +35,6 @@ buildPythonPackage rec {
openimageio
imath
]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [
- apple-sdk_14
- ]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
libX11
libXt
@@ -46,6 +42,7 @@ buildPythonPackage rec {
];
cmakeFlags = [
+ "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
(lib.cmakeBool "MATERIALX_BUILD_OIIO" true)
(lib.cmakeBool "MATERIALX_BUILD_SHARED_LIBS" true)
(lib.cmakeBool "MATERIALX_BUILD_PYTHON" true)
diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix
index d0132580ed368..3287ac61d725d 100644
--- a/pkgs/development/python-modules/mkdocstrings-python/default.nix
+++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "mkdocstrings-python";
- version = "1.16.12";
+ version = "1.18.2";
pyproject = true;
src = fetchFromGitHub {
owner = "mkdocstrings";
repo = "python";
tag = version;
- hash = "sha256-NL5gn8HgT0hvIlUDs//sErAaSVXvxLDJGT7nZX65ZVU=";
+ hash = "sha256-BdUNj7EJAbOs8Ff+IGbd7be+lRG6MQCIgNAi5oH9OgA=";
};
build-system = [ pdm-backend ];
diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix
index 1816bc34f7ed5..9aec1b175c760 100644
--- a/pkgs/development/python-modules/mlx/default.nix
+++ b/pkgs/development/python-modules/mlx/default.nix
@@ -12,7 +12,7 @@
cmake,
# buildInputs
- apple-sdk_14,
+ apple-sdk,
fmt,
nanobind,
nlohmann_json,
@@ -48,7 +48,7 @@ let
patches = [
(replaceVars ./darwin-build-fixes.patch {
- sdkVersion = apple-sdk_14.version;
+ sdkVersion = apple-sdk.version;
})
];
@@ -95,7 +95,6 @@ let
];
buildInputs = [
- apple-sdk_14
fmt
gguf-tools
nanobind
diff --git a/pkgs/development/python-modules/moonraker-api/default.nix b/pkgs/development/python-modules/moonraker-api/default.nix
index f45195078d386..0e7e4cbb1b7ec 100644
--- a/pkgs/development/python-modules/moonraker-api/default.nix
+++ b/pkgs/development/python-modules/moonraker-api/default.nix
@@ -1,6 +1,7 @@
{
lib,
aiohttp,
+ async-timeout,
buildPythonPackage,
fetchFromGitHub,
pytest-aiohttp,
@@ -28,7 +29,10 @@ buildPythonPackage rec {
--replace 'name="moonraker-api",' 'name="moonraker-api",version="${version}",'
'';
- propagatedBuildInputs = [ aiohttp ];
+ propagatedBuildInputs = [
+ aiohttp
+ async-timeout
+ ];
nativeCheckInputs = [
pytest-aiohttp
diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix
index a35bbdbee805f..286c7395781e5 100644
--- a/pkgs/development/python-modules/multidict/default.nix
+++ b/pkgs/development/python-modules/multidict/default.nix
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "multidict";
- version = "6.6.4";
+ version = "6.7.0";
pyproject = true;
src = fetchFromGitHub {
owner = "aio-libs";
repo = "multidict";
tag = "v${version}";
- hash = "sha256-Ewxwz+0Y8pXJpHobLxrV7cuA9fsAaawWmW9XoEg7dxU=";
+ hash = "sha256-NEiUXHwY7bas7+Ddf9hdR6m/N+wbRG/NguoMROIWjeU=";
};
postPatch = ''
@@ -37,11 +37,9 @@ buildPythonPackage rec {
typing-extensions
];
- env =
- { }
- // lib.optionalAttrs stdenv.cc.isClang {
- NIX_CFLAGS_COMPILE = "-Wno-error=unused-command-line-argument";
- };
+ env = lib.optionalAttrs stdenv.cc.isClang {
+ NIX_CFLAGS_COMPILE = "-Wno-error=unused-command-line-argument";
+ };
nativeCheckInputs = [
objgraph
@@ -58,11 +56,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "multidict" ];
- meta = with lib; {
+ meta = {
changelog = "https://github.com/aio-libs/multidict/blob/${src.tag}/CHANGES.rst";
description = "Multidict implementation";
homepage = "https://github.com/aio-libs/multidict/";
- license = licenses.asl20;
- maintainers = with maintainers; [ dotlambda ];
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ dotlambda ];
};
}
diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix
index 46b338fb2ff1f..7bbd7781cb837 100644
--- a/pkgs/development/python-modules/numpy/2.nix
+++ b/pkgs/development/python-modules/numpy/2.nix
@@ -19,6 +19,7 @@
# native dependencies
blas,
+ coreutils,
lapack,
# Reverse dependency
@@ -59,7 +60,7 @@ let
in
buildPythonPackage rec {
pname = "numpy";
- version = "2.3.3";
+ version = "2.3.4";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -69,7 +70,7 @@ buildPythonPackage rec {
repo = "numpy";
tag = "v${version}";
fetchSubmodules = true;
- hash = "sha256-6RMzF5vOWSX7gL3mps9ECClJF3mNqL1mexM6j8/yfdc=";
+ hash = "sha256-MfL7UQeSuxJIEQzY/0LIuScyBCilINt8e+zAeUNPmH0=";
};
patches = lib.optionals python.hasDistutilsCxxPatch [
@@ -83,6 +84,10 @@ buildPythonPackage rec {
# remove needless reference to full Python path stored in built wheel
substituteInPlace numpy/meson.build \
--replace-fail 'py.full_path()' "'python'"
+
+ # Test_POWER_Features::test_features - FileNotFoundError: [Errno 2] No such file or directory: '/bin/true'
+ substituteInPlace numpy/_core/tests/test_cpu_features.py \
+ --replace-fail '/bin/true' '${lib.getExe' coreutils "true"}'
'';
build-system = [
@@ -161,6 +166,10 @@ buildPythonPackage rec {
# AssertionError: (np.int64(0), np.longdouble('9.9999999999999994515e-21'), np.longdouble('3.9696755572509052902e+20'), 'arctanh')
"test_loss_of_precision"
]
+ ++ lib.optionals (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isBigEndian) [
+ # https://github.com/numpy/numpy/issues/29918
+ "test_sq_cases"
+ ]
++ lib.optionals (stdenv.hostPlatform ? gcc.arch) [
# remove if https://github.com/numpy/numpy/issues/27460 is resolved
"test_validate_transcendentals"
diff --git a/pkgs/development/python-modules/openai-agents/default.nix b/pkgs/development/python-modules/openai-agents/default.nix
index 0812eb19d871d..8ae73edda1342 100644
--- a/pkgs/development/python-modules/openai-agents/default.nix
+++ b/pkgs/development/python-modules/openai-agents/default.nix
@@ -14,13 +14,13 @@
buildPythonPackage rec {
pname = "openai-agents";
- version = "0.2.9";
+ version = "0.4.2";
pyproject = true;
src = fetchPypi {
inherit version;
pname = "openai_agents";
- hash = "sha256-YZxRyM5J+EFHSp5hlXPW9/lqRkMpAHUhRa0EMJq3Cuk=";
+ hash = "sha256-KByv+DmzqyzzvFIRCr6TysoASYXEG/B96OYNA8SnUo4=";
};
build-system = [
diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix
index c127e68c19235..7c021dfe81d51 100644
--- a/pkgs/development/python-modules/openai/default.nix
+++ b/pkgs/development/python-modules/openai/default.nix
@@ -51,14 +51,14 @@
buildPythonPackage rec {
pname = "openai";
- version = "1.101.0";
+ version = "2.7.2";
pyproject = true;
src = fetchFromGitHub {
owner = "openai";
repo = "openai-python";
tag = "v${version}";
- hash = "sha256-XCstUYM2jiq3PbNiRmLnguzQtvrGk0Ik5K0tk37bq2U=";
+ hash = "sha256-g7YbKzRZQOM4e16Mgo7u3QoQQI6VTNrV4DUip9fYsLA=";
};
postPatch = ''substituteInPlace pyproject.toml --replace-fail "hatchling==1.26.3" "hatchling"'';
diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix
index 6f92156c4ae9f..8227e6c2e080e 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.11.0";
+ version = "10.0.0";
pyproject = true;
src = fetchFromGitHub {
@@ -38,7 +38,7 @@ buildPythonPackage rec {
postFetch = ''
rm "$out/.git_archival.txt"
'';
- hash = "sha256-mdH7bFfUzjSOOIhRK4GpizohFB82s8v9N2yEX2X/dms=";
+ hash = "sha256-DiNRjN4tnADaFOxLV9wdvJe9KEOb+h9IOSzaPGtGuk0=";
};
patches = [
diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix
index 153192fb6dbff..a2cfc6de6be02 100644
--- a/pkgs/development/python-modules/pillow/default.nix
+++ b/pkgs/development/python-modules/pillow/default.nix
@@ -8,6 +8,7 @@
# build-system
setuptools,
pkg-config,
+ pybind11,
# native dependencies
freetype,
@@ -43,17 +44,20 @@
buildPythonPackage rec {
pname = "pillow";
- version = "11.3.0";
+ version = "12.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "python-pillow";
repo = "pillow";
tag = version;
- hash = "sha256-VOOIxzTyERI85CvA2oIutybiivU14kIko8ysXpmwUN8=";
+ hash = "sha256-58mjwHErEZPkkGBVZznkkMQN5Zo4ZBBiXnhqVp1F81g=";
};
- build-system = [ setuptools ];
+ build-system = [
+ setuptools
+ pybind11
+ ];
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix
index 80d1091542036..6ea5d6b7361eb 100644
--- a/pkgs/development/python-modules/platformdirs/default.nix
+++ b/pkgs/development/python-modules/platformdirs/default.nix
@@ -12,16 +12,14 @@
buildPythonPackage rec {
pname = "platformdirs";
- version = "4.3.8";
+ version = "4.5.0";
pyproject = true;
- disabled = pythonOlder "3.7";
-
src = fetchFromGitHub {
- owner = "platformdirs";
+ owner = "tox-dev";
repo = "platformdirs";
tag = version;
- hash = "sha256-ePaEpsBkTomRX+RJsed8aJtefl5WCW/N9IT8ae4+ln4=";
+ hash = "sha256-ESXp9I6SL13BdsQLCUcfS8kwqayURCEguhINnK6Dd6k=";
};
build-system = [
@@ -37,11 +35,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "platformdirs" ];
- meta = with lib; {
+ meta = {
description = "Module for determining appropriate platform-specific directories";
homepage = "https://platformdirs.readthedocs.io/";
- changelog = "https://github.com/platformdirs/platformdirs/releases/tag/${version}";
- license = licenses.mit;
- maintainers = with maintainers; [ fab ];
+ changelog = "https://github.com/tox-dev/platformdirs/releases/tag/${src.tag}";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ fab ];
};
}
diff --git a/pkgs/development/python-modules/pproxy/default.nix b/pkgs/development/python-modules/pproxy/default.nix
index 8d355218a0cc0..f652fa2b13ac8 100644
--- a/pkgs/development/python-modules/pproxy/default.nix
+++ b/pkgs/development/python-modules/pproxy/default.nix
@@ -4,6 +4,9 @@
fetchFromGitHub,
pycryptodome,
uvloop,
+ asyncssh,
+ aioquic,
+ python-daemon,
setuptools,
pythonOlder,
}:
@@ -24,10 +27,17 @@ buildPythonPackage rec {
nativeBuildInputs = [ setuptools ];
- propagatedBuildInputs = [
- pycryptodome
- uvloop
- ];
+ optional-dependencies = {
+ accelerated = [
+ pycryptodome
+ uvloop
+ ];
+ sshtunnel = [ asyncssh ];
+ quic = [ aioquic ];
+ daemon = [ python-daemon ];
+ };
+
+ nativeCheckInputs = lib.flatten (lib.attrValues optional-dependencies);
pythonImportsCheck = [ "pproxy" ];
diff --git a/pkgs/development/python-modules/protobuf/6.nix b/pkgs/development/python-modules/protobuf/6.nix
index 88b571b65a3b9..f5ce6a82e7166 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.1";
+ version = "6.33.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
- hash = "sha256-7iRp5KAhR0q5uq/qbNBw5b8nx9KUM1BN3qGk7lhQ9o0=";
+ hash = "sha256-FAMD1cjSA3cwxUj4x7k7ILsdwwG+KAw3i4K4iUWJyVQ=";
};
build-system = [ setuptools ];
@@ -23,8 +23,12 @@ buildPythonPackage rec {
protobuf
];
- # the pypi source archive does not ship tests
- doCheck = false;
+ doCheck =
+ # https://protobuf.dev/support/cross-version-runtime-guarantee/#backwards
+ # The non-python protobuf provides the protoc binary which must not be newer.
+ assert lib.versionAtLeast version ("6." + protobuf.version);
+ # the pypi source archive does not ship tests
+ false;
pythonImportsCheck = [
"google.protobuf"
@@ -45,7 +49,9 @@ buildPythonPackage rec {
meta = {
description = "Protocol Buffers are Google's data interchange format";
homepage = "https://developers.google.com/protocol-buffers/";
- changelog = "https://github.com/protocolbuffers/protobuf/releases/v${version}";
+ changelog = "https://github.com/protocolbuffers/protobuf/releases/v${
+ builtins.substring 2 (-1) version
+ }";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ GaetanLepage ];
};
diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix
index 20e3bf06c1d3c..dac2afcd346fc 100644
--- a/pkgs/development/python-modules/psutil/default.nix
+++ b/pkgs/development/python-modules/psutil/default.nix
@@ -2,25 +2,25 @@
lib,
stdenv,
buildPythonPackage,
- fetchPypi,
+ fetchFromGitHub,
setuptools,
pytestCheckHook,
python,
- pythonOlder,
+ gitUpdater,
}:
buildPythonPackage rec {
pname = "psutil";
- version = "7.1.0";
+ version = "7.1.2";
pyproject = true;
inherit stdenv;
- disabled = pythonOlder "3.7";
-
- src = fetchPypi {
- inherit pname version;
- hash = "sha256-ZVcIs8BpOHyLd7By/EKaV9DiFCIdAcCnct99/tyzvNI=";
+ src = fetchFromGitHub {
+ owner = "giampaolo";
+ repo = "psutil";
+ tag = "release-${version}";
+ hash = "sha256-LyGnLrq+SzCQmz8/P5DOugoNEyuH0IC7uIp8UAPwH0U=";
};
postPatch = ''
@@ -63,11 +63,15 @@ buildPythonPackage rec {
pythonImportsCheck = [ "psutil" ];
- meta = with lib; {
+ passthru.updateScript = gitUpdater {
+ rev-prefix = "release-";
+ };
+
+ meta = {
description = "Process and system utilization information interface";
homepage = "https://github.com/giampaolo/psutil";
- changelog = "https://github.com/giampaolo/psutil/blob/release-${version}/HISTORY.rst";
- license = licenses.bsd3;
+ changelog = "https://github.com/giampaolo/psutil/blob/${src.tag}/HISTORY.rst";
+ license = lib.licenses.bsd3;
maintainers = [ ];
};
}
diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix
index cbc3923dd1261..026ddf281e485 100644
--- a/pkgs/development/python-modules/psycopg2/default.nix
+++ b/pkgs/development/python-modules/psycopg2/default.nix
@@ -2,7 +2,6 @@
stdenv,
lib,
buildPythonPackage,
- pythonOlder,
isPyPy,
fetchPypi,
libpq,
@@ -12,16 +11,17 @@
sphinxHook,
sphinx-better-theme,
buildPackages,
+ setuptools,
}:
buildPythonPackage rec {
pname = "psycopg2";
- version = "2.9.10";
- format = "setuptools";
+ version = "2.9.11";
+ pyproject = true;
# Extension modules don't work well with PyPy. Use psycopg2cffi instead.
# c.f. https://github.com/NixOS/nixpkgs/pull/104151#issuecomment-729750892
- disabled = pythonOlder "3.6" || isPyPy;
+ disabled = isPyPy;
outputs = [
"out"
@@ -30,7 +30,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- hash = "sha256-EuwLQLAnP5UpYjPodQRBM5KY5qVy9wOdpbJg48i2DhE=";
+ hash = "sha256-lk0xyvco4hfGl/936mnCughl+kHsILsA8Jd+Yv3MUuM=";
};
postPatch = ''
@@ -46,6 +46,10 @@ buildPythonPackage rec {
sphinx-better-theme
];
+ build-system = [
+ setuptools
+ ];
+
buildInputs = [ libpq ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ openssl ];
sphinxRoot = "doc/src";
diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix
index df80e01731eef..9e69b571c7fdc 100644
--- a/pkgs/development/python-modules/pyatspi/default.nix
+++ b/pkgs/development/python-modules/pyatspi/default.nix
@@ -1,54 +1,52 @@
{
lib,
fetchurl,
+ meson,
+ ninja,
pkg-config,
buildPythonPackage,
isPy3k,
at-spi2-core,
pygobject3,
gnome,
- python,
}:
buildPythonPackage rec {
pname = "pyatspi";
- version = "2.46.1";
- format = "other";
+ version = "2.58.0";
+
+ pyproject = false;
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "+R9qV0NOnAfRPVxL+BndeOjuYFqsKuRdjGTCgRT7BBs=";
+ url = "mirror://gnome/sources/pyatspi/${lib.versions.majorMinor version}/pyatspi-${version}.tar.xz";
+ sha256 = "6dKQ1TzH4wZtly/RilDuiF77i+CqJSYvGe9/iE/qDv8=";
};
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [
+ meson
+ ninja
+ pkg-config
+ ];
buildInputs = [
at-spi2-core
pygobject3
];
- configureFlags = [ "PYTHON=${python.pythonOnBuildForHost.interpreter}" ];
-
- postPatch = ''
- # useless python existence check for us
- substituteInPlace configure \
- --replace '&& ! which' '&& false'
- '';
-
disabled = !isPy3k;
passthru = {
updateScript = gnome.updateScript {
- packageName = pname;
- attrPath = "python3.pkgs.${pname}";
+ packageName = "pyatspi";
+ attrPath = "python3.pkgs.pyatspi";
versionPolicy = "odd-unstable";
};
};
meta = with lib; {
description = "Python client bindings for D-Bus AT-SPI";
- homepage = "https://wiki.linuxfoundation.org/accessibility/d-bus";
- license = licenses.gpl2;
+ homepage = "https://gitlab.gnome.org/GNOME/pyatspi2";
+ license = licenses.lgpl2Only;
maintainers = with maintainers; [ jtojnar ];
platforms = with platforms; unix;
};
diff --git a/pkgs/development/python-modules/pydal/default.nix b/pkgs/development/python-modules/pydal/default.nix
index 04db786876f17..fe850650f3303 100644
--- a/pkgs/development/python-modules/pydal/default.nix
+++ b/pkgs/development/python-modules/pydal/default.nix
@@ -4,7 +4,6 @@
buildPythonPackage,
fetchPypi,
pytestCheckHook,
- pythonAtLeast,
pythonOlder,
setuptools,
legacy-cgi,
@@ -26,7 +25,7 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
- checkInputs = lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ];
+ checkInputs = [ legacy-cgi ];
enabledTestPaths = [
"tests/*.py"
diff --git a/pkgs/development/python-modules/pygame-ce/0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch b/pkgs/development/python-modules/pygame-ce/0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch
new file mode 100644
index 0000000000000..1e1f407dbc193
--- /dev/null
+++ b/pkgs/development/python-modules/pygame-ce/0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch
@@ -0,0 +1,151 @@
+From 3e3fbdc11ab00c4c04eb68c40b23979245c987fa Mon Sep 17 00:00:00 2001
+From: Marcin Serwin
+Date: Sat, 8 Nov 2025 19:47:41 +0100
+Subject: [PATCH] Use SDL_AllocFormat instead of creating it manually
+
+According to the docs, `SDL_PixelFormat` is a read-only structure.
+Creating it manually leaves out some important fields like `format` and
+`next` pointer to be undefined.
+
+Signed-off-by: Marcin Serwin
+---
+ src_c/surface.c | 80 ++++++++++++++-----------------------------------
+ 1 file changed, 23 insertions(+), 57 deletions(-)
+
+diff --git a/src_c/surface.c b/src_c/surface.c
+index f118a4db4..e51e80554 100644
+--- a/src_c/surface.c
++++ b/src_c/surface.c
+@@ -1844,9 +1844,8 @@ surf_convert(pgSurfaceObject *self, PyObject *args)
+ */
+ int bpp = 0;
+ SDL_Palette *palette = SDL_AllocPalette(default_palette_size);
+- SDL_PixelFormat format;
++ Uint32 format_enum = 0;
+
+- memcpy(&format, surf->format, sizeof(format));
+ if (pg_IntFromObj(argobject, &bpp)) {
+ Uint32 Rmask, Gmask, Bmask, Amask;
+
+@@ -1904,30 +1903,23 @@ surf_convert(pgSurfaceObject *self, PyObject *args)
+ "nonstandard bit depth given");
+ }
+ }
+- format.Rmask = Rmask;
+- format.Gmask = Gmask;
+- format.Bmask = Bmask;
+- format.Amask = Amask;
++ format_enum = SDL_MasksToPixelFormatEnum(bpp, Rmask, Gmask,
++ Bmask, Amask);
+ }
+ else if (PySequence_Check(argobject) &&
+ PySequence_Size(argobject) == 4) {
+- Uint32 mask;
++ Uint32 Rmask, Gmask, Bmask, Amask;
+
+- if (!pg_UintFromObjIndex(argobject, 0, &format.Rmask) ||
+- !pg_UintFromObjIndex(argobject, 1, &format.Gmask) ||
+- !pg_UintFromObjIndex(argobject, 2, &format.Bmask) ||
+- !pg_UintFromObjIndex(argobject, 3, &format.Amask)) {
++ if (!pg_UintFromObjIndex(argobject, 0, &Rmask) ||
++ !pg_UintFromObjIndex(argobject, 1, &Gmask) ||
++ !pg_UintFromObjIndex(argobject, 2, &Bmask) ||
++ !pg_UintFromObjIndex(argobject, 3, &Amask)) {
+ pgSurface_Unprep(self);
+ return RAISE(PyExc_ValueError,
+ "invalid color masks given");
+ }
+- mask =
+- format.Rmask | format.Gmask | format.Bmask | format.Amask;
+- for (bpp = 0; bpp < 32; ++bpp) {
+- if (!(mask >> bpp)) {
+- break;
+- }
+- }
++ format_enum = SDL_MasksToPixelFormatEnum(bpp, Rmask, Gmask,
++ Bmask, Amask);
+ }
+ else {
+ pgSurface_Unprep(self);
+@@ -1935,22 +1927,11 @@ surf_convert(pgSurfaceObject *self, PyObject *args)
+ PyExc_ValueError,
+ "invalid argument specifying new format to convert to");
+ }
+- format.BitsPerPixel = (Uint8)bpp;
+- format.BytesPerPixel = (bpp + 7) / 8;
+- if (PG_FORMAT_BitsPerPixel((&format)) > 8) {
+- /* Allow a 8 bit source surface with an empty palette to be
+- * converted to a format without a palette (pygame-ce issue
+- * #146). If the target format has a non-NULL palette pointer
+- * then SDL_ConvertSurface checks that the palette is not
+- * empty-- that at least one entry is not black.
+- */
+- format.palette = NULL;
+- }
+- if (SDL_ISPIXELFORMAT_INDEXED(SDL_MasksToPixelFormatEnum(
+- PG_FORMAT_BitsPerPixel((&format)), format.Rmask,
+- format.Gmask, format.Bmask, format.Amask))) {
++ SDL_PixelFormat *format = SDL_AllocFormat(format_enum);
++
++ if (SDL_ISPIXELFORMAT_INDEXED(format_enum)) {
+ if (SDL_ISPIXELFORMAT_INDEXED(PG_SURF_FORMATENUM(surf))) {
+- SDL_SetPixelFormatPalette(&format, surf->format->palette);
++ SDL_SetPixelFormatPalette(format, surf->format->palette);
+ }
+ else {
+ /* Give the surface something other than an all white
+@@ -1958,12 +1939,13 @@ surf_convert(pgSurfaceObject *self, PyObject *args)
+ */
+ SDL_SetPaletteColors(palette, default_palette_colors, 0,
+ default_palette_size);
+- SDL_SetPixelFormatPalette(&format, palette);
++ SDL_SetPixelFormatPalette(format, palette);
+ }
+ }
+- newsurf = PG_ConvertSurface(surf, &format);
++ newsurf = PG_ConvertSurface(surf, format);
+ SDL_SetSurfaceBlendMode(newsurf, SDL_BLENDMODE_NONE);
+ SDL_FreePalette(palette);
++ SDL_FreeFormat(format);
+ }
+ }
+ else {
+@@ -4540,29 +4522,13 @@ pgSurface_Blit(pgSurfaceObject *dstobj, pgSurfaceObject *srcobj,
+ }
+ else {
+ SDL_PixelFormat *fmt = src->format;
+- SDL_PixelFormat newfmt;
++ SDL_PixelFormat *newfmt =
++ SDL_AllocFormat(SDL_MasksToPixelFormatEnum(
++ fmt->BitsPerPixel, fmt->Rmask, fmt->Gmask, fmt->Bmask, 0));
+
+- newfmt.palette = 0; /* Set NULL (or SDL gets confused) */
+-#if SDL_VERSION_ATLEAST(3, 0, 0)
+- newfmt.bits_per_pixel = fmt->bits_per_pixel;
+- newfmt.bytes_per_pixel = fmt->bytes_per_pixel;
+-#else
+- newfmt.BitsPerPixel = fmt->BitsPerPixel;
+- newfmt.BytesPerPixel = fmt->BytesPerPixel;
+-#endif
+- newfmt.Amask = 0;
+- newfmt.Rmask = fmt->Rmask;
+- newfmt.Gmask = fmt->Gmask;
+- newfmt.Bmask = fmt->Bmask;
+- newfmt.Ashift = 0;
+- newfmt.Rshift = fmt->Rshift;
+- newfmt.Gshift = fmt->Gshift;
+- newfmt.Bshift = fmt->Bshift;
+- newfmt.Aloss = 0;
+- newfmt.Rloss = fmt->Rloss;
+- newfmt.Gloss = fmt->Gloss;
+- newfmt.Bloss = fmt->Bloss;
+- src = PG_ConvertSurface(src, &newfmt);
++ src = PG_ConvertSurface(src, newfmt);
++
++ SDL_FreeFormat(newfmt);
+ if (src) {
+ #if SDL_VERSION_ATLEAST(3, 0, 0)
+ result = SDL_BlitSurface(src, srcrect, dst, dstrect) ? 0 : -1;
+--
+2.51.0
+
diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix
index edef7857b0425..1f132ab7fab0c 100644
--- a/pkgs/development/python-modules/pygame-ce/default.nix
+++ b/pkgs/development/python-modules/pygame-ce/default.nix
@@ -61,8 +61,12 @@ buildPythonPackage rec {
]) buildInputs
);
})
- # https://github.com/libsdl-org/sdl2-compat/issues/476
+
+ # Can be removed with the next SDL3 bump.
./skip-rle-tests.patch
+
+ # https://github.com/pygame-community/pygame-ce/pull/3639
+ ./0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch
];
postPatch = ''
diff --git a/pkgs/development/python-modules/pygame-ce/skip-rle-tests.patch b/pkgs/development/python-modules/pygame-ce/skip-rle-tests.patch
index d0792e0e0e921..f7ecc1ccb3305 100644
--- a/pkgs/development/python-modules/pygame-ce/skip-rle-tests.patch
+++ b/pkgs/development/python-modules/pygame-ce/skip-rle-tests.patch
@@ -1,20 +1,20 @@
diff --git a/test/surface_test.py b/test/surface_test.py
-index 4e4b5d4..ffc7ffb 100644
+index c2c91f4f5..58d916de8 100644
--- a/test/surface_test.py
+++ b/test/surface_test.py
-@@ -375,6 +375,7 @@ class SurfaceTypeTest(unittest.TestCase):
- self.assertTrue(s1.get_flags() & pygame.RLEACCELOK)
- self.assertTrue(not s2.get_flags() & pygame.RLEACCELOK)
-
-+ @unittest.skipIf(True, "https://github.com/libsdl-org/sdl2-compat/issues/476")
- def test_solarwolf_rle_usage(self):
- """Test for error/crash when calling set_colorkey() followed
- by convert twice in succession. Code originally taken
-@@ -403,6 +404,7 @@ class SurfaceTypeTest(unittest.TestCase):
+@@ -404,6 +404,7 @@ class SurfaceTypeTest(unittest.TestCase):
finally:
pygame.display.quit()
-+ @unittest.skipIf(True, "https://github.com/libsdl-org/sdl2-compat/issues/476")
++ @unittest.skipIf(True, "https://github.com/libsdl-org/SDL/pull/14429")
def test_solarwolf_rle_usage_2(self):
"""Test for RLE status after setting alpha"""
+@@ -435,6 +436,7 @@ class SurfaceTypeTest(unittest.TestCase):
+ finally:
+ pygame.display.quit()
+
++ @unittest.skipIf(True, "https://github.com/libsdl-org/SDL/issues/14424")
+ def test_set_alpha__set_colorkey_rle(self):
+ pygame.display.init()
+ try:
diff --git a/pkgs/development/python-modules/pygame/0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch b/pkgs/development/python-modules/pygame/0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch
new file mode 100644
index 0000000000000..d786e1f248a5f
--- /dev/null
+++ b/pkgs/development/python-modules/pygame/0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch
@@ -0,0 +1,53 @@
+From bc1a52062adfacc94661883157dd4ef58e00e031 Mon Sep 17 00:00:00 2001
+From: Marcin Serwin
+Date: Sat, 8 Nov 2025 14:48:04 +0100
+Subject: [PATCH] Use SDL_AllocFormat instead of creating it manually
+
+According to the docs, `SDL_PixelFormat` is a read-only structure.
+Creating it manually leaves out some important fields like `format` and
+`next` pointer to be undefined.
+
+Signed-off-by: Marcin Serwin
+---
+ src_c/surface.c | 25 +++++++------------------
+ 1 file changed, 7 insertions(+), 18 deletions(-)
+
+diff --git a/src_c/surface.c b/src_c/surface.c
+index 958ce43f..9be3d8fb 100644
+--- a/src_c/surface.c
++++ b/src_c/surface.c
+@@ -3730,24 +3730,13 @@ pgSurface_Blit(pgSurfaceObject *dstobj, pgSurfaceObject *srcobj,
+ }
+ else {
+ SDL_PixelFormat *fmt = src->format;
+- SDL_PixelFormat newfmt;
+-
+- newfmt.palette = 0; /* Set NULL (or SDL gets confused) */
+- newfmt.BitsPerPixel = fmt->BitsPerPixel;
+- newfmt.BytesPerPixel = fmt->BytesPerPixel;
+- newfmt.Amask = 0;
+- newfmt.Rmask = fmt->Rmask;
+- newfmt.Gmask = fmt->Gmask;
+- newfmt.Bmask = fmt->Bmask;
+- newfmt.Ashift = 0;
+- newfmt.Rshift = fmt->Rshift;
+- newfmt.Gshift = fmt->Gshift;
+- newfmt.Bshift = fmt->Bshift;
+- newfmt.Aloss = 0;
+- newfmt.Rloss = fmt->Rloss;
+- newfmt.Gloss = fmt->Gloss;
+- newfmt.Bloss = fmt->Bloss;
+- src = SDL_ConvertSurface(src, &newfmt, 0);
++ SDL_PixelFormat *newfmt =
++ SDL_AllocFormat(SDL_MasksToPixelFormatEnum(
++ fmt->BitsPerPixel, fmt->Rmask, fmt->Gmask, fmt->Bmask, 0));
++
++ src = SDL_ConvertSurface(src, newfmt, 0);
++
++ SDL_FreeFormat(newfmt);
+ if (src) {
+ result = SDL_BlitSurface(src, srcrect, dst, dstrect);
+ SDL_FreeSurface(src);
+--
+2.51.0
+
diff --git a/pkgs/development/python-modules/pygame/adapt-to-sdl3-format-message.patch b/pkgs/development/python-modules/pygame/adapt-to-sdl3-format-message.patch
deleted file mode 100644
index f8c0a98402b7b..0000000000000
--- a/pkgs/development/python-modules/pygame/adapt-to-sdl3-format-message.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src_c/surface.c b/src_c/surface.c
-index ee9991fb..32c007bd 100644
---- a/src_c/surface.c
-+++ b/src_c/surface.c
-@@ -733,7 +733,8 @@ _raise_create_surface_error(void)
- {
- const char *msg = SDL_GetError();
-
-- if (strcmp(msg, "Unknown pixel format") == 0)
-+ if (strcmp(msg, "Unknown pixel format") == 0 ||
-+ strcmp(msg, "Parameter 'format' is invalid") == 0)
- return RAISE(PyExc_ValueError, "Invalid mask values");
- return RAISE(pgExc_SDLError, msg);
- }
diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix
index 62e4bcba5dd07..d4a4c92f89c88 100644
--- a/pkgs/development/python-modules/pygame/default.nix
+++ b/pkgs/development/python-modules/pygame/default.nix
@@ -62,14 +62,16 @@ buildPythonPackage rec {
# mixer queue test returns busy queue when it shouldn't
./skip-mixer-test.patch
- # https://github.com/libsdl-org/sdl2-compat/issues/476
+
+ # Can be removed with the next SDL3 bump.
./skip-rle-tests.patch
- # https://github.com/libsdl-org/sdl2-compat/issues/489
- ./adapt-to-sdl3-format-message.patch
# https://github.com/pygame/pygame/pull/4497
./0001-Use-SDL_HasSurfaceRLE-when-available.patch
./0002-Don-t-assume-that-touch-devices-support-get_num_fing.patch
+
+ # https://github.com/pygame/pygame/pull/4651
+ ./0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch
];
postPatch = ''
diff --git a/pkgs/development/python-modules/pygame/skip-rle-tests.patch b/pkgs/development/python-modules/pygame/skip-rle-tests.patch
index d0792e0e0e921..5f9c6be928d4b 100644
--- a/pkgs/development/python-modules/pygame/skip-rle-tests.patch
+++ b/pkgs/development/python-modules/pygame/skip-rle-tests.patch
@@ -1,20 +1,20 @@
diff --git a/test/surface_test.py b/test/surface_test.py
-index 4e4b5d4..ffc7ffb 100644
+index b1147d27..c7ba2928 100644
--- a/test/surface_test.py
+++ b/test/surface_test.py
-@@ -375,6 +375,7 @@ class SurfaceTypeTest(unittest.TestCase):
- self.assertTrue(s1.get_flags() & pygame.RLEACCELOK)
- self.assertTrue(not s2.get_flags() & pygame.RLEACCELOK)
-
-+ @unittest.skipIf(True, "https://github.com/libsdl-org/sdl2-compat/issues/476")
- def test_solarwolf_rle_usage(self):
- """Test for error/crash when calling set_colorkey() followed
- by convert twice in succession. Code originally taken
-@@ -403,6 +404,7 @@ class SurfaceTypeTest(unittest.TestCase):
+@@ -346,6 +346,7 @@ class SurfaceTypeTest(unittest.TestCase):
finally:
pygame.display.quit()
-+ @unittest.skipIf(True, "https://github.com/libsdl-org/sdl2-compat/issues/476")
++ @unittest.skipIf(True, "https://github.com/libsdl-org/SDL/pull/14429")
def test_solarwolf_rle_usage_2(self):
"""Test for RLE status after setting alpha"""
+@@ -377,6 +378,7 @@ class SurfaceTypeTest(unittest.TestCase):
+ finally:
+ pygame.display.quit()
+
++ @unittest.skipIf(True, "https://github.com/libsdl-org/SDL/issues/14424")
+ def test_set_alpha__set_colorkey_rle(self):
+ pygame.display.init()
+ try:
diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index 18c6690e60f64..9825af96472eb 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "pygobject";
- version = "3.50.0";
+ version = "3.54.3";
outputs = [
"out"
@@ -30,8 +30,8 @@ buildPythonPackage rec {
format = "other";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- hash = "sha256-jYNudbWogdRX7hYiyuSjK826KKC6ViGTrbO7tHJHIhI=";
+ url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz";
+ hash = "sha256-qNoJE0oPfVZJHPJBIUXjWqdOkddg6PM3CWoc2guSuuc=";
};
depsBuildBuild = [ pkg-config ];
@@ -73,7 +73,7 @@ buildPythonPackage rec {
homepage = "https://pygobject.readthedocs.io/";
description = "Python bindings for Glib";
license = licenses.lgpl21Plus;
- maintainers = with maintainers; [ jtojnar ];
+ teams = [ teams.gnome ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/python-modules/pyhcl/default.nix b/pkgs/development/python-modules/pyhcl/default.nix
index d947eb84944d5..101e639cbde7b 100644
--- a/pkgs/development/python-modules/pyhcl/default.nix
+++ b/pkgs/development/python-modules/pyhcl/default.nix
@@ -1,25 +1,23 @@
{
buildPythonPackage,
fetchFromGitHub,
- isPy3k,
lib,
# pythonPackages
- coverage,
- pytest,
+ pytestCheckHook,
+ setuptools,
}:
buildPythonPackage rec {
pname = "pyhcl";
version = "0.4.5";
- format = "setuptools";
- disabled = !isPy3k;
+ pyproject = true;
src = fetchFromGitHub {
owner = "virtuald";
repo = "pyhcl";
- rev = version;
- sha256 = "sha256-vF40xEahs98G0lIC6XIl3eJHIuai2xTAeshUjiKN/BY=";
+ tag = version;
+ hash = "sha256-vF40xEahs98G0lIC6XIl3eJHIuai2xTAeshUjiKN/BY=";
};
# https://github.com/virtuald/pyhcl/blob/51a7524b68fe21e175e157b8af931016d7a357ad/setup.py#L64
@@ -27,16 +25,12 @@ buildPythonPackage rec {
echo '__version__ = "${version}"' > ./src/hcl/version.py
'';
+ build-system = [ setuptools ];
+
nativeCheckInputs = [
- coverage
- pytest
+ pytestCheckHook
];
- # https://github.com/virtuald/pyhcl/blob/51a7524b68fe21e175e157b8af931016d7a357ad/tests/run_tests.sh#L4
- checkPhase = ''
- coverage run --source hcl -m pytest tests
- '';
-
meta = with lib; {
description = "HCL is a configuration language. pyhcl is a python parser for it";
mainProgram = "hcltool";
diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix
index 5f5b26a17acb8..11a60e232336a 100644
--- a/pkgs/development/python-modules/pynacl/default.nix
+++ b/pkgs/development/python-modules/pynacl/default.nix
@@ -1,62 +1,64 @@
{
lib,
buildPythonPackage,
- fetchPypi,
- fetchpatch2,
- pytestCheckHook,
- sphinxHook,
- pythonOlder,
- libsodium,
cffi,
+ fetchFromGitHub,
hypothesis,
+ libsodium,
+ pytestCheckHook,
+ pytest-xdist,
+ pythonOlder,
+ setuptools,
+ sphinxHook,
}:
buildPythonPackage rec {
pname = "pynacl";
- version = "1.5.0";
+ version = "1.6.0";
outputs = [
"out"
"doc"
];
- format = "setuptools";
+ pyproject = true;
- disabled = pythonOlder "3.6";
+ disabled = pythonOlder "3.8";
- src = fetchPypi {
- inherit version;
- pname = "PyNaCl";
- sha256 = "8ac7448f09ab85811607bdd21ec2464495ac8b7c66d146bf545b0f08fb9220ba";
+ src = fetchFromGitHub {
+ owner = "pyca";
+ repo = "pynacl";
+ tag = version;
+ hash = "sha256-7SDJB2bXn0IGJQi597yehs9epdfmS7slbQ97vFVUkEA=";
};
- patches = [
- (fetchpatch2 {
- # sphinx 8 compat
- url = "https://github.com/pyca/pynacl/commit/81943b3c61b9cc731ae0f2e87b7a91e42fbc8fa1.patch";
- hash = "sha256-iO3pBqGW2zZE8lG8khpPjqJso9/rmFbdnwCcBs8iFeI=";
- })
+ build-system = [
+ cffi
+ setuptools
];
+ # cffi is listed in both build-system.requires and project.dependencies,
+ # and is indeed needed in both when cross-compiling
+ dependencies = [ cffi ];
+
nativeBuildInputs = [ sphinxHook ];
buildInputs = [ libsodium ];
propagatedNativeBuildInputs = [ cffi ];
- propagatedBuildInputs = [ cffi ];
-
nativeCheckInputs = [
hypothesis
pytestCheckHook
+ pytest-xdist
];
- SODIUM_INSTALL = "system";
+ env.SODIUM_INSTALL = "system";
pythonImportsCheck = [ "nacl" ];
- meta = with lib; {
+ meta = {
description = "Python binding to the Networking and Cryptography (NaCl) library";
homepage = "https://github.com/pyca/pynacl/";
- license = licenses.asl20;
- maintainers = [ ];
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ mdaniels5757 ];
};
}
diff --git a/pkgs/development/python-modules/pyperclip/default.nix b/pkgs/development/python-modules/pyperclip/default.nix
index 2fe17a9825508..6ae8a535b2d27 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.10.0";
+ version = "1.11.0";
pname = "pyperclip";
pyproject = true;
src = fetchPypi {
inherit pname version;
- hash = "sha256-GAyDRrEYaSHHXf0U2QSKa11Gv8SZd4gRlSxt1uscpr4=";
+ hash = "sha256-JEA1lj5EKFMNnjphAaHvlyCcaCXtqxVnvqwUjMwdsbY=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix
index a251f89fc5dea..6d1d227385324 100644
--- a/pkgs/development/python-modules/pytest-asyncio/default.nix
+++ b/pkgs/development/python-modules/pytest-asyncio/default.nix
@@ -7,18 +7,19 @@
pytest,
setuptools-scm,
backports-asyncio-runner,
+ typing-extensions,
}:
buildPythonPackage rec {
pname = "pytest-asyncio";
- version = "1.1.0"; # N.B.: when updating, tests bleak and aioesphomeapi tests
+ version = "1.2.0"; # N.B.: when updating, tests bleak and aioesphomeapi tests
pyproject = true;
src = fetchFromGitHub {
owner = "pytest-dev";
repo = "pytest-asyncio";
tag = "v${version}";
- hash = "sha256-+dLOzMPKI3nawfyZVZZ6hg6OkaEGZBp8oC5VIr7y0es=";
+ hash = "sha256-27FCV7zgFGe/Q0fkYyh5Z05foVGhbKBRPTH4UK/tW5A=";
};
outputs = [
@@ -29,8 +30,12 @@ buildPythonPackage rec {
build-system = [ setuptools-scm ];
buildInputs = [ pytest ];
- dependencies = lib.optionals (pythonOlder "3.11") [
+
+ dependencies = [
backports-asyncio-runner
+ ]
+ ++ lib.optionals (pythonOlder "3.13") [
+ typing-extensions
];
postInstall = ''
diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix
index 1dc9f25ea63f7..3c03379fceb45 100644
--- a/pkgs/development/python-modules/pytest-mock/default.nix
+++ b/pkgs/development/python-modules/pytest-mock/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "pytest-mock";
- version = "3.15.0";
+ version = "3.15.1";
pyproject = true;
src = fetchFromGitHub {
owner = "pytest-dev";
repo = "pytest-mock";
tag = "v${version}";
- hash = "sha256-a9Mu0FfU8rTbMeA1YoM/Kb5R2IUO8FyzQfscBVuBFfo=";
+ hash = "sha256-9h5/cssWs4F0LKnFLjWDsEjB2AYczLvnSjiUdsaEcBQ=";
};
build-system = [
@@ -35,11 +35,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "pytest_mock" ];
- meta = with lib; {
+ meta = {
description = "Thin wrapper around the mock package for easier use with pytest";
homepage = "https://github.com/pytest-dev/pytest-mock";
changelog = "https://github.com/pytest-dev/pytest-mock/blob/${src.tag}/CHANGELOG.rst";
- license = licenses.mit;
- maintainers = with maintainers; [ dotlambda ];
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ dotlambda ];
};
}
diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix
index 18286d14fcd94..ac36a4ae56579 100644
--- a/pkgs/development/python-modules/pytest-regressions/default.nix
+++ b/pkgs/development/python-modules/pytest-regressions/default.nix
@@ -1,4 +1,5 @@
{
+ stdenv,
lib,
buildPythonPackage,
fetchFromGitHub,
@@ -63,6 +64,13 @@ buildPythonPackage rec {
"-Wignore::DeprecationWarning"
];
+ disabledTests = lib.optionals (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isBigEndian) [
+ # https://github.com/ESSS/pytest-regressions/issues/156
+ # i686-linux not listed in the report, but seems to have this issue as well
+ "test_different_data_types"
+ "test_common_case" # not listed in the issue, but fails after the above is skipped
+ ];
+
pythonImportsCheck = [
"pytest_regressions"
"pytest_regressions.plugin"
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index e332672444ea1..edd68ff232b80 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -76,9 +76,6 @@ 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/pywebcopy/default.nix b/pkgs/development/python-modules/pywebcopy/default.nix
index ebdda05aeead8..028a78177ea93 100644
--- a/pkgs/development/python-modules/pywebcopy/default.nix
+++ b/pkgs/development/python-modules/pywebcopy/default.nix
@@ -6,7 +6,6 @@
legacy-cgi,
lxml-html-clean,
pytestCheckHook,
- pythonAtLeast,
requests,
setuptools,
six,
@@ -28,11 +27,11 @@ buildPythonPackage rec {
dependencies = [
cachecontrol
+ legacy-cgi
lxml-html-clean
requests
six
- ]
- ++ lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ];
+ ];
nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix
index 07c57be63ef06..7c0884f08dd5e 100644
--- a/pkgs/development/python-modules/rdflib/default.nix
+++ b/pkgs/development/python-modules/rdflib/default.nix
@@ -3,6 +3,7 @@
stdenv,
buildPythonPackage,
fetchFromGitHub,
+ fetchpatch,
pythonOlder,
# builds
@@ -38,6 +39,12 @@ buildPythonPackage rec {
tag = version;
hash = "sha256-FisMiBTiL6emJS0d7UmlwGUzayA+CME5GGWgw/owfhc=";
};
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/RDFLib/rdflib/commit/0ab817f86b5733c9a3b4ede7ef065b8d79e53fc5.diff";
+ hash = "sha256-+yWzQ3MyH0wihgiQRMMXV/FpG8WlXaIBhpsDF4e3rbY=";
+ })
+ ];
build-system = [ poetry-core ];
@@ -66,8 +73,6 @@ buildPythonPackage rec {
# requires network access
"rdflib/__init__.py::rdflib"
"test/jsonld/test_onedotone.py::test_suite"
- # https://github.com/RDFLib/rdflib/issues/3274
- "test/test_sparql/test_translate_algebra.py::test_roundtrip"
];
disabledTests = [
diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix
index 4de467cc8a8d6..4ca491e0e0766 100644
--- a/pkgs/development/python-modules/regex/default.nix
+++ b/pkgs/development/python-modules/regex/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "regex";
- version = "2025.7.34";
+ version = "2025.9.18";
pyproject = true;
src = fetchPypi {
inherit pname version;
- hash = "sha256-nq2XZSF6/QSoaCLfzU7SdH3+Qm6IfaQTsV/wrCRX4ho=";
+ hash = "sha256-xbojJ0xhxv70R7pqOTMyl9DCR/UwWdugvKQVysUR7cQ=";
};
build-system = [ setuptools ];
@@ -31,6 +31,6 @@ buildPythonPackage rec {
licenses.asl20
licenses.cnri-python
];
- maintainers = [ ];
+ maintainers = with lib.maintainers; [ dwoffinden ];
};
}
diff --git a/pkgs/development/python-modules/remi/default.nix b/pkgs/development/python-modules/remi/default.nix
index 1e55434b8f9d4..0db323c1c46a6 100644
--- a/pkgs/development/python-modules/remi/default.nix
+++ b/pkgs/development/python-modules/remi/default.nix
@@ -2,7 +2,6 @@
lib,
buildPythonPackage,
fetchFromGitHub,
- pythonOlder,
setuptools,
pytestCheckHook,
matplotlib,
@@ -47,8 +46,6 @@ buildPythonPackage rec {
dependencies = [
setuptools # pkg_resources is referenced at runtime
- ]
- ++ lib.optionals (!pythonOlder "3.13") [
legacy-cgi
];
diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix
index 3c79d8a8785fa..27b0137014c81 100644
--- a/pkgs/development/python-modules/sanic/default.nix
+++ b/pkgs/development/python-modules/sanic/default.nix
@@ -95,7 +95,15 @@ buildPythonPackage rec {
# Racy, e.g. Address already in use
"test_logger_vhosts"
# Event loop is closed
+ "test_asyncio_server_no_start_serving"
+ "test_asyncio_server_start_serving"
+ "test_create_asyncio_server"
+ "test_create_server_main_convenience"
+ "test_create_server_main"
+ "test_create_server_no_startup"
"test_create_server_trigger_events"
+ "test_multiple_uvloop_configs_display_warning"
+ "test_uvloop_cannot_never_called_with_create_server"
];
disabledTestPaths = [
diff --git a/pkgs/development/python-modules/servefile/default.nix b/pkgs/development/python-modules/servefile/default.nix
index 1d1c0c175baca..67cd43a9094e1 100644
--- a/pkgs/development/python-modules/servefile/default.nix
+++ b/pkgs/development/python-modules/servefile/default.nix
@@ -5,7 +5,6 @@
lib,
pyopenssl,
pytestCheckHook,
- pythonAtLeast,
requests,
}:
@@ -22,9 +21,9 @@ buildPythonPackage rec {
};
dependencies = [
+ legacy-cgi
pyopenssl
- ]
- ++ lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ];
+ ];
nativeCheckInputs = [
pytestCheckHook
diff --git a/pkgs/development/python-modules/setproctitle/default.nix b/pkgs/development/python-modules/setproctitle/default.nix
index e99a269901394..aa1211029abbd 100644
--- a/pkgs/development/python-modules/setproctitle/default.nix
+++ b/pkgs/development/python-modules/setproctitle/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
];
# Setting the process title fails on macOS in the Nix builder environment (regardless of sandboxing)
- disabledTests = if stdenv.hostPlatform.isDarwin then [ "test_setproctitle_darwin" ] else null;
+ disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_setproctitle_darwin" ];
pythonImportsCheck = [ "setproctitle" ];
diff --git a/pkgs/development/python-modules/sigstore-models/default.nix b/pkgs/development/python-modules/sigstore-models/default.nix
index 2a45c9cdef5a5..5bda1519e17d4 100644
--- a/pkgs/development/python-modules/sigstore-models/default.nix
+++ b/pkgs/development/python-modules/sigstore-models/default.nix
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+ fetchpatch2,
pydantic,
typing-extensions,
uv-build,
@@ -20,6 +21,15 @@ buildPythonPackage rec {
hash = "sha256-zlIZzfgHZPEuiZu3JNX74Cg1jPNaO1HUhMtpxoyOoqk=";
};
+ patches = [
+ # https://github.com/astral-sh/sigstore-models/pull/4
+ (fetchpatch2 {
+ name = "uv-build.patch";
+ url = "https://github.com/Prince213/sigstore-models/commit/0cbd46ce7ebc8a5d2825b8fc98147a9ba4b3be70.patch?full_index=1";
+ hash = "sha256-6DLhhHkGW2Ok9xwKx6YT5BkCqQNH/Ja/KEO9FHl4NXo=";
+ })
+ ];
+
build-system = [ uv-build ];
dependencies = [
diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix
index 31e38d275587c..3a360da09b07f 100644
--- a/pkgs/development/python-modules/simplejson/default.nix
+++ b/pkgs/development/python-modules/simplejson/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "simplejson";
- version = "3.20.1";
+ version = "3.20.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "simplejson";
repo = "simplejson";
tag = "v${version}";
- hash = "sha256-wE/jqBMXVtmbc/78X4lgfvuj074CrzfLJL1CM6LCfas=";
+ hash = "sha256-err3NWljoC6MxJoFSYuqLHGKfDcst6ya7myP9XIRbFc=";
};
nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix
index 200af582e86bf..f06e3580fddca 100644
--- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix
+++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix
@@ -4,26 +4,23 @@
fetchPypi,
hatch-vcs,
hatchling,
- pythonOlder,
sphinx,
pytestCheckHook,
}:
let
pname = "sphinx-autodoc-typehints";
- version = "3.2.0";
+ version = "3.4.0";
in
buildPythonPackage {
inherit pname version;
pyproject = true;
- disabled = pythonOlder "3.7";
-
src = fetchPypi {
pname = "sphinx_autodoc_typehints";
inherit version;
- hash = "sha256-EHrJi8i0g3ICyIwHNtWdbaRAduZaDX19VDp4Yx9mKps=";
+ hash = "sha256-oknrcmSdBbS4fUKgykIln1UEmg/xVTk0FGP1nkslasU=";
};
pythonRelaxDeps = [ "sphinx" ];
diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index 7402fa2b3103b..36d8c62176e87 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -118,6 +118,7 @@ buildPythonPackage rec {
"test_class_alias_having_doccomment"
"test_class_alias_for_imported_object_having_doccomment"
"test_decorators"
+ "test_xml_warnings"
# racy with too many threads
# https://github.com/NixOS/nixpkgs/issues/353176
"test_document_toc_only"
diff --git a/pkgs/development/python-modules/time-machine/default.nix b/pkgs/development/python-modules/time-machine/default.nix
index b7d5585e86170..0ac251fe8020c 100644
--- a/pkgs/development/python-modules/time-machine/default.nix
+++ b/pkgs/development/python-modules/time-machine/default.nix
@@ -2,25 +2,22 @@
lib,
buildPythonPackage,
fetchFromGitHub,
- pythonAtLeast,
- pythonOlder,
setuptools,
python-dateutil,
+ tokenize-rt,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "time-machine";
- version = "2.16.0";
+ version = "2.19.0";
pyproject = true;
- disabled = pythonOlder "3.10";
-
src = fetchFromGitHub {
owner = "adamchainz";
repo = "time-machine";
tag = version;
- hash = "sha256-xNoLtgON1dfKAgK0XhSMLHLsUr/nST3lepy15YWDEcE=";
+ hash = "sha256-bPpn+RNlvy/tkFrxDY4Q13fNlNuMFj1+br8M2uU3t9A=";
};
build-system = [ setuptools ];
@@ -29,9 +26,16 @@ buildPythonPackage rec {
python-dateutil
];
- nativeCheckInputs = [ pytestCheckHook ];
+ optional-dependencies.cli = [
+ tokenize-rt
+ ];
+
+ nativeCheckInputs = [
+ pytestCheckHook
+ ]
+ ++ optional-dependencies.cli;
- disabledTests = lib.optionals (pythonAtLeast "3.9") [
+ disabledTests = [
# https://github.com/adamchainz/time-machine/issues/405
"test_destination_string_naive"
# Assertion Errors related to Africa/Addis_Ababa
diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix
index 960a5c2a109d4..ca68bef650450 100644
--- a/pkgs/development/python-modules/torch/source/default.nix
+++ b/pkgs/development/python-modules/torch/source/default.nix
@@ -42,7 +42,6 @@
removeReferencesTo,
# Build inputs
- apple-sdk_13,
openssl,
numactl,
llvmPackages,
@@ -582,9 +581,6 @@ buildPythonPackage.override { inherit stdenv; } rec {
++ lib.optionals rocmSupport [ rocmPackages.llvm.openmp ]
++ lib.optionals (cudaSupport || rocmSupport) [ effectiveMagma ]
++ lib.optionals stdenv.hostPlatform.isLinux [ numactl ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [
- apple-sdk_13
- ]
++ lib.optionals tritonSupport [ _tritonEffective ]
++ lib.optionals MPISupport [ mpi ]
++ lib.optionals rocmSupport [
diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix
index 034f5a1539a29..be337533b977c 100644
--- a/pkgs/development/python-modules/torchvision/default.nix
+++ b/pkgs/development/python-modules/torchvision/default.nix
@@ -2,7 +2,6 @@
lib,
stdenv,
torch,
- apple-sdk_13,
buildPythonPackage,
darwinMinVersionHook,
fetchFromGitHub,
@@ -55,14 +54,6 @@ buildPythonPackage {
libjpeg_turbo
libpng
torch.cxxdev
- ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [
- # This should match the SDK used by `torch` above
- apple-sdk_13
-
- # error: unknown type name 'MPSGraphCompilationDescriptor'; did you mean 'MPSGraphExecutionDescriptor'?
- # https://developer.apple.com/documentation/metalperformanceshadersgraph/mpsgraphcompilationdescriptor/
- (darwinMinVersionHook "12.0")
];
dependencies = [
diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix
index c8ee4e01a9ef3..e8f4a22ca4fd0 100644
--- a/pkgs/development/python-modules/typer/default.nix
+++ b/pkgs/development/python-modules/typer/default.nix
@@ -16,7 +16,6 @@
shellingham,
# tests
- coverage,
pytest-xdist,
pytestCheckHook,
writableTmpDirAsHomeHook,
@@ -38,6 +37,13 @@ buildPythonPackage rec {
hash = "sha256-mMsOEI4FpLkLkpjxjnUdmKdWD65Zx3Z1+L+XsS79k44=";
};
+ postPatch = ''
+ for f in $(find tests -type f -print); do
+ # replace `sys.executable -m coverage run` with `sys.executable`
+ sed -z -i 's/"-m",\n\?\s*"coverage",\n\?\s*"run",//g' "$f"
+ done
+ '';
+
env.TIANGOLO_BUILD_PACKAGE = package;
build-system = [ pdm-backend ];
@@ -60,7 +66,6 @@ buildPythonPackage rec {
doCheck = package == "typer"; # tests expect standard dependencies
nativeCheckInputs = [
- coverage # execs coverage in tests
pytest-xdist
pytestCheckHook
writableTmpDirAsHomeHook
diff --git a/pkgs/development/python-modules/types-psutil/default.nix b/pkgs/development/python-modules/types-psutil/default.nix
index 0083966409468..32336993ace85 100644
--- a/pkgs/development/python-modules/types-psutil/default.nix
+++ b/pkgs/development/python-modules/types-psutil/default.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "types-psutil";
- version = "7.0.0.20250801";
+ version = "7.0.0.20250822";
format = "setuptools";
src = fetchPypi {
pname = "types_psutil";
inherit version;
- hash = "sha256-AjC1YjQlLMb1nDYdzLqqCPMIjqNWk2er5pAEhdOIyX0=";
+ hash = "sha256-Imy8DA6pzApQuKvMHZGibIdty0C+I4Ex9peINpBBlpg=";
};
# Module doesn't have tests
diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix
index 24a44fe5db082..3c202ae9f13be 100644
--- a/pkgs/development/python-modules/types-requests/default.nix
+++ b/pkgs/development/python-modules/types-requests/default.nix
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "types-requests";
- version = "2.32.4.20250611";
+ version = "2.32.4.20250913";
pyproject = true;
src = fetchPypi {
pname = "types_requests";
inherit version;
- hash = "sha256-dByHd+1kJYML9R5U1qviRfebTcuQGfFiK3c0Y5Rr+CY=";
+ hash = "sha256-q9bU+c46k4PyaXdamDWkwk5c1rn2R9ZPiKpGE8M9710=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix
index 8fdcc17567d78..9aa1f469cf14d 100644
--- a/pkgs/development/python-modules/types-setuptools/default.nix
+++ b/pkgs/development/python-modules/types-setuptools/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "types-setuptools";
- version = "80.9.0.20250801";
+ version = "80.9.0.20250822";
pyproject = true;
src = fetchPypi {
pname = "types_setuptools";
inherit version;
- hash = "sha256-4ekmgvoHImQVOWu04tMfEWoW/75YOwWwH5kQ/N6jt+g=";
+ hash = "sha256-Bw6ncWlo7GeoTH93aNmVL/JNKLZbZZR5ekZPGzBm+WU=";
};
nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix
index 871fb640c09f4..5e443864e6096 100644
--- a/pkgs/development/python-modules/ufo2ft/default.nix
+++ b/pkgs/development/python-modules/ufo2ft/default.nix
@@ -6,11 +6,10 @@
compreffor,
cu2qu,
defcon,
- fetchPypi,
+ fetchFromGitHub,
fontmath,
fonttools,
pytestCheckHook,
- pythonOlder,
setuptools-scm,
skia-pathops,
syrupy,
@@ -19,14 +18,14 @@
buildPythonPackage rec {
pname = "ufo2ft";
- version = "3.6.0";
+ version = "3.6.2";
pyproject = true;
- disabled = pythonOlder "3.8";
-
- src = fetchPypi {
- inherit pname version;
- hash = "sha256-hKqTjD8cTgyxHZnaojPAT5JY11okvLiNOnemoULnpmw=";
+ src = fetchFromGitHub {
+ owner = "googlefonts";
+ repo = "ufo2ft";
+ tag = "v${version}";
+ hash = "sha256-TIeq4As5nThYck5jQLTdZySfOg51DtkiiYiiWEVSzxo=";
};
build-system = [
@@ -69,11 +68,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "ufo2ft" ];
- meta = with lib; {
+ meta = {
description = "Bridge from UFOs to FontTools objects";
homepage = "https://github.com/googlefonts/ufo2ft";
- changelog = "https://github.com/googlefonts/ufo2ft/releases/tag/v${version}";
- license = licenses.mit;
+ changelog = "https://github.com/googlefonts/ufo2ft/releases/tag/${src.tag}";
+ license = lib.licenses.mit;
maintainers = [ ];
};
}
diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix
index a54accfa3516b..5b130b5ffea91 100644
--- a/pkgs/development/python-modules/uncertainties/default.nix
+++ b/pkgs/development/python-modules/uncertainties/default.nix
@@ -38,6 +38,11 @@ buildPythonPackage rec {
]
++ optional-dependencies.arrays;
+ disabledTests = [
+ # Flaky tests, see: https://github.com/lmfit/uncertainties/issues/343
+ "test_repeated_summation_complexity"
+ ];
+
pythonImportsCheck = [ "uncertainties" ];
meta = {
diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix
index 9c4be78c1c729..63251d02f9cf0 100644
--- a/pkgs/development/python-modules/uvloop/default.nix
+++ b/pkgs/development/python-modules/uvloop/default.nix
@@ -3,7 +3,7 @@
stdenv,
buildPythonPackage,
pythonOlder,
- fetchPypi,
+ fetchFromGitHub,
fetchpatch,
# build-system
@@ -21,30 +21,16 @@
buildPythonPackage rec {
pname = "uvloop";
- version = "0.21.0";
+ version = "0.22.0";
pyproject = true;
- disabled = pythonOlder "3.8";
-
- src = fetchPypi {
- inherit pname version;
- hash = "sha256-O/ErD9poRHgGp62Ee/pZFhMXcnXTW2ckse5XP6o3BOM=";
+ src = fetchFromGitHub {
+ owner = "MagicStack";
+ repo = "uvloop";
+ tag = "v${version}";
+ hash = "sha256-LAOa+Oshssy4ZHl4eE6dn2DeZQ9d5tRDV5Hv9BCJJ3c=";
};
- patches = [
- # fix test failures on Python 3.13
- # (remove on next update)
- (fetchpatch {
- url = "https://github.com/MagicStack/uvloop/commit/96b7ed31afaf02800d779a395591da6a2c8c50e1.patch";
- hash = "sha256-Nbe3BuIuwlylll5fIYij+OiP90ZeFNI0GKHK9SwWRk8=";
- excludes = [ ".github/workflows/tests.yml" ];
- })
- (fetchpatch {
- url = "https://github.com/MagicStack/uvloop/commit/56807922f847ddac231a53d5b03eef70092b987c.patch";
- hash = "sha256-X5Ob1t/CRy9csw2JrWvwS55G6qTqZhIuGLTy83O03GU=";
- })
- ];
-
postPatch = ''
rm -rf vendor
@@ -82,6 +68,8 @@ buildPythonPackage rec {
"tests/test_dns.py"
# Asserts on exact wording of error message
"tests/test_tcp.py::Test_AIO_TCP::test_create_connection_open_con_addr"
+ # ConnectionAbortedError: SSL handshake is taking longer than 15.0 seconds
+ "tests/test_tcp.py::Test_AIO_TCPSSL::test_create_connection_ssl_1"
]
++ lib.optionals (pythonOlder "3.11") [
"tests/test_tcp.py::Test_UV_TCPSSL::test_create_connection_ssl_failed_certificat"
diff --git a/pkgs/development/python-modules/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix
index 42cf3a141c0d0..802614d21df82 100644
--- a/pkgs/development/python-modules/versioningit/default.nix
+++ b/pkgs/development/python-modules/versioningit/default.nix
@@ -5,7 +5,6 @@
fetchPypi,
packaging,
tomli,
- coverage,
pytestCheckHook,
build,
hatchling,
@@ -27,6 +26,11 @@ buildPythonPackage rec {
hash = "sha256-uRrX1z5z0hIg5pVA8gIT8rcpofmzXATp4Tfq8o0iFNo=";
};
+ postPatch = ''
+ substituteInPlace tox.ini \
+ --replace-fail "ignore:.*No source for code:coverage.exceptions.CoverageWarning" ""
+ '';
+
build-system = [ hatchling ];
dependencies = [
@@ -35,7 +39,6 @@ buildPythonPackage rec {
++ lib.optionals (pythonOlder "3.11") [ tomli ];
nativeCheckInputs = [
- coverage
pytestCheckHook
build
hatchling
diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix
index d673a96face7c..9e81d3601b941 100644
--- a/pkgs/development/python-modules/wandb/default.nix
+++ b/pkgs/development/python-modules/wandb/default.nix
@@ -44,7 +44,6 @@
bokeh,
boto3,
cloudpickle,
- coverage,
flask,
google-cloud-artifact-registry,
google-cloud-compute,
@@ -228,7 +227,6 @@ buildPythonPackage rec {
bokeh
boto3
cloudpickle
- coverage
flask
google-cloud-artifact-registry
google-cloud-compute
diff --git a/pkgs/development/python-modules/web/default.nix b/pkgs/development/python-modules/web/default.nix
index b79a399aea5d8..7cedc0a391c0c 100644
--- a/pkgs/development/python-modules/web/default.nix
+++ b/pkgs/development/python-modules/web/default.nix
@@ -2,7 +2,6 @@
lib,
buildPythonPackage,
fetchPypi,
- pythonAtLeast,
pytestCheckHook,
cheroot,
legacy-cgi,
@@ -25,8 +24,8 @@ buildPythonPackage rec {
propagatedBuildInputs = [
cheroot
- ]
- ++ lib.optional (pythonAtLeast "3.13") legacy-cgi;
+ legacy-cgi
+ ];
# requires multiple running databases
doCheck = false;
diff --git a/pkgs/development/python-modules/webob/default.nix b/pkgs/development/python-modules/webob/default.nix
index 34425a936f343..d45c06105875d 100644
--- a/pkgs/development/python-modules/webob/default.nix
+++ b/pkgs/development/python-modules/webob/default.nix
@@ -5,7 +5,6 @@
setuptools,
legacy-cgi,
pytestCheckHook,
- pythonAtLeast,
pythonOlder,
# for passthru.tests
@@ -31,7 +30,7 @@ buildPythonPackage rec {
build-system = [ setuptools ];
# https://github.com/Pylons/webob/issues/437
- dependencies = lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ];
+ dependencies = [ legacy-cgi ];
nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/wfuzz/default.nix b/pkgs/development/python-modules/wfuzz/default.nix
index 2277341460be2..9d00d2a3a5c0c 100644
--- a/pkgs/development/python-modules/wfuzz/default.nix
+++ b/pkgs/development/python-modules/wfuzz/default.nix
@@ -14,7 +14,6 @@
setuptools,
six,
fetchpatch2,
- pythonAtLeast,
legacy-cgi,
}:
@@ -51,13 +50,13 @@ buildPythonPackage rec {
dependencies = [
chardet
distutils # src/wfuzz/plugin_api/base.py
+ legacy-cgi
pycurl
six
setuptools
pyparsing
]
- ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ]
- ++ lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ];
+ ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ];
nativeCheckInputs = [
netaddr
diff --git a/pkgs/development/python-modules/xmltodict/default.nix b/pkgs/development/python-modules/xmltodict/default.nix
index 166f53fd3d1a4..9d1c01842a420 100644
--- a/pkgs/development/python-modules/xmltodict/default.nix
+++ b/pkgs/development/python-modules/xmltodict/default.nix
@@ -1,22 +1,21 @@
{
lib,
buildPythonPackage,
- fetchPypi,
+ fetchFromGitHub,
pytestCheckHook,
- pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "xmltodict";
- version = "0.14.2";
+ version = "1.0.2";
pyproject = true;
- disabled = pythonOlder "3.7";
-
- src = fetchPypi {
- inherit pname version;
- hash = "sha256-IB58KLshDjdJmdHd5jgpI6sO0ail+u7OSKtSW3gQpVM=";
+ src = fetchFromGitHub {
+ owner = "martinblech";
+ repo = "xmltodict";
+ tag = "v${version}";
+ hash = "sha256-gnTNkh0GLfRmjMsLhfvpNrewfinNOhem0i3wzIZvKpA=";
};
build-system = [ setuptools ];
@@ -25,11 +24,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "xmltodict" ];
- meta = with lib; {
+ meta = {
description = "Makes working with XML feel like you are working with JSON";
homepage = "https://github.com/martinblech/xmltodict";
- changelog = "https://github.com/martinblech/xmltodict/blob/v${version}/CHANGELOG.md";
- license = licenses.mit;
+ changelog = "https://github.com/martinblech/xmltodict/blob/${src.tag}/CHANGELOG.md";
+ license = lib.licenses.mit;
maintainers = [ ];
};
}
diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix
index 36184650fcb9d..8e7387921a2d4 100644
--- a/pkgs/development/python-modules/yarl/default.nix
+++ b/pkgs/development/python-modules/yarl/default.nix
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "yarl";
- version = "1.21.1";
+ version = "1.22.0";
pyproject = true;
src = fetchFromGitHub {
owner = "aio-libs";
repo = "yarl";
tag = "v${version}";
- hash = "sha256-YN2Gn/wokwbBbVcKvqNNJZ8eZKxwwdKbA84kPsx1Dg0=";
+ hash = "sha256-IkP6AxLT260NN2X2bd7b5LGVGFUjo7eQiuWxvMtcb8g=";
};
build-system = [
@@ -58,11 +58,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "yarl" ];
- meta = with lib; {
- changelog = "https://github.com/aio-libs/yarl/blob/v${version}/CHANGES.rst";
+ meta = {
+ changelog = "https://github.com/aio-libs/yarl/blob/${src.tag}/CHANGES.rst";
description = "Yet another URL library";
homepage = "https://github.com/aio-libs/yarl";
- license = licenses.asl20;
- maintainers = with maintainers; [ dotlambda ];
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ dotlambda ];
};
}
diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index c0a65e96495a7..bd70e8d594908 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "doxygen";
- version = "1.14.0";
+ version = "1.15.0";
src = fetchFromGitHub {
owner = "doxygen";
repo = "doxygen";
tag = "Release_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
- hash = "sha256-d90fIP8rDQ30fY1vF3wAPlIa8xrSEOdHTpPjYnduZdI=";
+ hash = "sha256-HbUAIfkfP0Tvb2NLSerTSL8A+8Ox2thgGL2/zGLkZdc=";
};
# https://github.com/doxygen/doxygen/issues/10928#issuecomment-2179320509
@@ -30,6 +30,12 @@ stdenv.mkDerivation (finalAttrs: {
--replace-fail 'JAVACC_CHAR_TYPE=\"unsigned char\"' \
'JAVACC_CHAR_TYPE=\"char8_t\"' \
--replace-fail "CMAKE_CXX_STANDARD 17" "CMAKE_CXX_STANDARD 20"
+ ''
+ # otherwise getting linker errors for deps
+ + lib.optionalString stdenv.hostPlatform.isDarwin ''
+ substituteInPlace CMakeLists.txt \
+ --replace-fail 'set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)' \
+ 'set(CMAKE_INTERPROCEDURAL_OPTIMIZATION FALSE)'
'';
nativeBuildInputs = [
diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix
index dbfe917ed23db..1cc57988ff230 100644
--- a/pkgs/development/tools/electron/common.nix
+++ b/pkgs/development/tools/electron/common.nix
@@ -82,16 +82,14 @@ in
patches =
base.patches
- # Fix build with Rust 1.89.0
++ lib.optionals (lib.versionOlder info.version "38") [
+ # Fix build with Rust 1.89.0
# https://chromium-review.googlesource.com/c/chromium/src/+/6624733
(fetchpatch {
name = "Define-rust-no-alloc-shim-is-unstable-v2.patch";
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 {
@@ -99,6 +97,15 @@ in
url = "https://github.com/chromium/chromium/commit/b0ff8c3b258a8816c05bdebf472dbba719d3c491.patch";
hash = "sha256-YIWcsCj5w0jUd7D67hsuk0ljTA/IbHwA6db3eK4ggUY=";
})
+ ]
+ ++ lib.optionals (lib.versionOlder info.version "39") [
+ # Fix build with Rust 1.90.0
+ # https://chromium-review.googlesource.com/c/chromium/src/+/6875644
+ (fetchpatch {
+ name = "Define-rust-alloc-error-handler-should-panic-v2.patch";
+ url = "https://github.com/chromium/chromium/commit/23d818d3c7fba4658248f17fd7b8993199242aa9.patch";
+ hash = "sha256-JVv36PgU/rr34jrhgCyf4Pp8o5j2T8fD1xBVH1avT48=";
+ })
];
npmRoot = "third_party/node";
diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix
index ee9d867c128d2..ad645ef016ec8 100644
--- a/pkgs/development/tools/haskell/vaultenv/default.nix
+++ b/pkgs/development/tools/haskell/vaultenv/default.nix
@@ -46,6 +46,7 @@ mkDerivation rec {
prePatch = ''
substituteInPlace package.yaml \
--replace -Werror ""
+ hpack
'';
isLibrary = false;
@@ -82,7 +83,6 @@ mkDerivation rec {
hspec-expectations
quickcheck-instances
];
- preConfigure = "hpack";
homepage = "https://github.com/channable/vaultenv#readme";
description = "Runs processes with secrets from HashiCorp Vault";
license = lib.licenses.bsd3;
diff --git a/pkgs/development/tools/misc/binutils/2.38/default.nix b/pkgs/development/tools/misc/binutils/2.38/default.nix
index 4b3c8443dbbc1..80a34de000ead 100644
--- a/pkgs/development/tools/misc/binutils/2.38/default.nix
+++ b/pkgs/development/tools/misc/binutils/2.38/default.nix
@@ -179,7 +179,6 @@ stdenv.mkDerivation {
hardeningDisable = [
"format"
- "pie"
];
configurePlatforms = [
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 2dee9eb4f5724..706489915c3f3 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -209,7 +209,6 @@ stdenv.mkDerivation (finalAttrs: {
hardeningDisable = [
"format"
- "pie"
];
configurePlatforms = [
diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix
index 0e707e4fdaee3..4897a9b597cd1 100644
--- a/pkgs/development/tools/ocaml/camlidl/default.nix
+++ b/pkgs/development/tools/ocaml/camlidl/default.nix
@@ -6,58 +6,55 @@
writeText,
}:
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.03")
- "camlidl is not available for OCaml ${ocaml.version}"
-
- stdenv.mkDerivation
- rec {
- pname = "ocaml${ocaml.version}-camlidl";
- version = "1.12";
-
- src = fetchFromGitHub {
- owner = "xavierleroy";
- repo = "camlidl";
- rev = "camlidl112";
- hash = "sha256-ONPQMDFaU2OzFa5jgMVKx+ZRKk8ZgBZyk42vDvbM7E0=";
- };
-
- nativeBuildInputs = [ ocaml ];
-
- # build fails otherwise
- enableParallelBuilding = false;
-
- preBuild = ''
- mv config/Makefile.unix config/Makefile
- substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out
- substituteInPlace config/Makefile --replace 'OCAMLLIB=$(shell $(OCAMLC) -where)' OCAMLLIB=$out/lib/ocaml/${ocaml.version}/site-lib/camlidl
- substituteInPlace config/Makefile --replace CPP=cpp CPP=${stdenv.cc}/bin/cpp
- substituteInPlace lib/Makefile --replace '$(OCAMLLIB)/Makefile.config' "${ocaml}/lib/ocaml/Makefile.config"
- mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/camlidl/caml
- mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/camlidl/stublibs
- '';
-
- postInstall = ''
- cat >$out/lib/ocaml/${ocaml.version}/site-lib/camlidl/META <$out/lib/ocaml/${ocaml.version}/site-lib/camlidl/META < sVersionMap = {{{{
- output.write(f" #endif /* __has_attribute(availability) */\n")
+@@ -327,9 +352,9 @@ static const std::array sVersionMap = {{{{
output.write(f"#endif /* defined(__has_feature) && defined(__has_attribute) */\n")
def AVAILABILITY_MACRO_IMPL(self, output, prefix, dispatcher, **optionals):
+ av_version_hash = zlib.adler32(avVersion.encode()) # This does not need to cryptographically secure as it is meant to detect accidental failures
- count = len(versions.platforms())
- for platformString in versions.platforms():
- platform = versions.platforms()[platformString]
@@ -241,4 +241,3 @@ index 8ebd250..5bb9edb 100755
if getattr(args, platform, None):
--
2.45.2
-
diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix
index 9a7ec45613559..27d7af4b0b95e 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix
@@ -3,8 +3,10 @@
bootstrapStdenv,
buildPackages,
fetchpatch2,
+ icu76, # The ICU version should correspond to the same one used by Apple’s ICU package
mkAppleDerivation,
python3,
+ stdenvNoCC,
testers,
}:
@@ -12,6 +14,19 @@
# - ../../../development/libraries/icu/make-icu.nix
# - https://github.com/apple-oss-distributions/ICU/blob/main/makefile
let
+ privateHeaders = stdenvNoCC.mkDerivation {
+ name = "ICU-deps-private-headers";
+
+ buildCommand = ''
+ mkdir -p "$out/include/os"
+ cat < "$out/include/os/feature_private.h"
+ #pragma once
+ extern "C" bool _os_feature_enabled_impl(const char*, const char*);
+ #define os_feature_enabled(a, b) _os_feature_enabled_impl(#a, #b)
+ EOF
+ '';
+ };
+
stdenv = bootstrapStdenv;
withStatic = stdenv.hostPlatform.isStatic;
@@ -26,13 +41,6 @@ let
patches = [
# Skip MessageFormatTest test, which is known to crash sometimes and should be suppressed if it does.
./patches/suppress-icu-check-crash.patch
-
- # Python 3.13 compatibility
- (fetchpatch2 {
- url = "https://github.com/unicode-org/icu/commit/60d6bd71efc0cde8f861b109ff87dbbf9fc96586.patch?full_index=1";
- hash = "sha256-aJBSVvKidPUjD956jLjyRk8fewUZ9f+Ip4ka6rjevzU=";
- stripLen = 2;
- })
];
preConfigure = ''
@@ -67,6 +75,7 @@ let
env.NIX_CFLAGS_COMPILE = toString [
"-DU_SHOW_CPLUSPLUS_API=1"
"-DU_SHOW_INTERNAL_API=1"
+ "-I${privateHeaders}/include"
];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
@@ -93,24 +102,38 @@ let
++ lib.optional withStatic "static";
outputBin = "dev";
- postPatch = lib.optionalString self.finalPackage.doCheck ''
- # Skip test for missing encodingSamples data.
- substituteInPlace test/cintltst/ucsdetst.c \
- --replace-fail "&TestMailFilterCSS" "NULL"
+ postPatch =
+ lib.optionalString self.finalPackage.doCheck (
+ ''
+ # Skip test for missing encodingSamples data.
+ substituteInPlace test/cintltst/ucsdetst.c \
+ --replace-fail "&TestMailFilterCSS" "NULL"
- # Disable failing tests
- substituteInPlace test/cintltst/cloctst.c \
- --replace-fail 'TESTCASE(TestCanonicalForm);' ""
+ # Disable failing tests
+ substituteInPlace test/cintltst/cloctst.c \
+ --replace-fail 'TESTCASE(TestCanonicalForm);' ""
- substituteInPlace test/intltest/rbbitst.cpp \
- --replace-fail 'TESTCASE_AUTO(TestExternalBreakEngineWithFakeYue);' ""
+ substituteInPlace test/intltest/rbbitst.cpp \
+ --replace-fail 'TESTCASE_AUTO(TestExternalBreakEngineWithFakeYue);' ""
- # Otherwise `make install` is broken.
- substituteInPlace Makefile.in \
- --replace-fail '$(top_srcdir)/../LICENSE' "$NIX_BUILD_TOP/source/icu/LICENSE"
- substituteInPlace config/dist-data.sh \
- --replace-fail "\''${top_srcdir}/../LICENSE" "$NIX_BUILD_TOP/source/icu/LICENSE"
- '';
+ # Add missing test data. It’s not included in the source release.
+ chmod u+w "$NIX_BUILD_TOP/source/icu"
+ tar -C "$NIX_BUILD_TOP/source" -axf ${lib.escapeShellArg icu76.src} icu/testdata
+ ''
+ + lib.optionalString stdenv.hostPlatform.isx86_64 ''
+ # These tests fail under Rosetta 2 with a floating-point exception.
+ substituteInPlace test/intltest/caltest.cpp \
+ --replace-fail 'TESTCASE_AUTO(Test22633RollTwiceGetTimeOverflow);' "" \
+ --replace-fail 'TESTCASE_AUTO(Test22750Roll);' ""
+ ''
+ )
+ + ''
+ # Otherwise `make install` is broken.
+ substituteInPlace Makefile.in \
+ --replace-fail '$(top_srcdir)/../LICENSE' "$NIX_BUILD_TOP/source/icu/LICENSE"
+ substituteInPlace config/dist-data.sh \
+ --replace-fail "\''${top_srcdir}/../LICENSE" "$NIX_BUILD_TOP/source/icu/LICENSE"
+ '';
# remove dependency on bootstrap-tools in early stdenv build
postInstall =
diff --git a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix
index 231d0ffb562fb..f846f1aebc277 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix
@@ -13,14 +13,15 @@ let
buildCommand = ''
install -D -t "$out/include/IOKit/pwr_mgt" \
- '${iokitUser}/pwr_mgt.subproj/IOPMLibPrivate.h'
+ '${iokitUser}/pwr_mgt.subproj/IOPMLibPrivate.h' \
+ '${iokitUser}/pwr_mgt.subproj/IOPMAssertionCategories.h'
'';
};
in
mkAppleDerivation {
releaseName = "PowerManagement";
- xcodeHash = "sha256-l6lm8aaiJg4H2BQVCjlFldpfhnmPAlsiMK7Cghzuh1E=";
+ xcodeHash = "sha256-cjTF4dR6S55mLwp4GkQhkkNk9sMMKDc/5JTm46Z7/KE=";
env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include";
diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/package.nix
index f994ab88d0290..ba19dccc12843 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/package.nix
@@ -38,7 +38,7 @@ mkAppleDerivation {
"man"
];
- xcodeHash = "sha256-2p/JyMPw6acHphvzkaJXPXGwxCUEoxryCejww5kPHvQ=";
+ xcodeHash = "sha256-QhkylTnnCy4qG8fpUMlKqDGKz58jysL0YF4lFGJzPzE=";
postPatch = ''
# Meson generators require using @BASENAME@ in the output.
diff --git a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/package.nix
index 0f5e1f77dd1a1..ca416bc659342 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/package.nix
@@ -1,7 +1,6 @@
{
lib,
apple-sdk,
- apple-sdk_12,
bison,
buildPackages,
flex,
@@ -14,10 +13,7 @@
let
Libc = apple-sdk.sourceRelease "Libc";
-
- # Older versions of xnu are missing required headers. The one for the 11.3 SDK doesn’t define a needed function
- # that was added in 11.3. This version of xnu has everything that’s needed.
- xnu = apple-sdk_12.sourceRelease "xnu";
+ xnu = apple-sdk.sourceRelease "xnu";
privateHeaders = stdenvNoCC.mkDerivation {
name = "adv_cmds-deps-private-headers";
diff --git a/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix b/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix
index b2c02c05e6247..413e6532b3a6f 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix
@@ -71,15 +71,6 @@ mkAppleDerivation {
xcodeHash = "sha256-SYW6pBlCQkcbkBqCq+W/mDYZZ7/co2HlPZwXzgh/LnI=";
- postPatch = ''
- # Disable experimental bounds safety stuff that’s not available in LLVM 16.
- for header in copyfile.h xattr_flags.h; do
- substituteInPlace "$header" \
- --replace-fail '__ptrcheck_abi_assume_single()' "" \
- --replace-fail '__unsafe_indexable' ""
- done
- '';
-
env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include";
meta.description = "Darwin file copying library";
diff --git a/pkgs/os-specific/darwin/apple-source-releases/doc_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/doc_cmds/package.nix
index ec022deebdf20..493fabf82baf2 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/doc_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/doc_cmds/package.nix
@@ -1,11 +1,28 @@
{
lib,
+ apple-sdk,
mkAppleDerivation,
pkg-config,
shell_cmds,
+ stdenvNoCC,
zlib,
}:
+let
+ xnu = apple-sdk.sourceRelease "xnu";
+
+ privateHeaders = stdenvNoCC.mkDerivation {
+ name = "doc_cmds-deps-private-headers";
+
+ buildCommand = ''
+ install -D -m644 -t "$out/include/System/sys" \
+ '${xnu}/bsd/sys/codesign.h'
+
+ install -D -m644 -t "$out/include/kern" \
+ '${xnu}/osfmk/kern/cs_blobs.h'
+ '';
+ };
+in
mkAppleDerivation {
releaseName = "doc_cmds";
@@ -14,11 +31,13 @@ mkAppleDerivation {
"man"
];
- xcodeHash = "sha256-7/ADsfXTKqQhgratg2Twj7JgfFV0/U9rEvtsnX+NFPw=";
+ xcodeHash = "sha256-Nt6yHx3K8OkrdSWuX9s+JJIkeA5S6HDBAtTtrEjbk4w=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ zlib ];
+ env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include";
+
postInstall = ''
HOST_PATH='${lib.getBin shell_cmds}/bin' patchShebangs --host "$out/libexec"
'';
diff --git a/pkgs/os-specific/darwin/apple-source-releases/dyld/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/dyld/meson.build.in
index 71b4ec7dc606c..b3c095cc54992 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/dyld/meson.build.in
+++ b/pkgs/os-specific/darwin/apple-source-releases/dyld/meson.build.in
@@ -40,6 +40,7 @@ common_inc = [
'dyld',
'include',
'mach_o',
+ 'include/mach-o',
]
@@ -86,6 +87,79 @@ lsl_dep = declare_dependency(
link_with : lsl,
)
+libmach_o = static_library(
+ 'mach_o',
+ dependencies : [ lsl_dep ],
+ include_directories : [
+ common_inc,
+ 'mach_o',
+ ],
+ sources : [
+ 'mach_o/Architecture.cpp',
+ 'mach_o/Archive.cpp',
+ 'mach_o/BindOpcodes.cpp',
+ 'mach_o/ChainedFixups.cpp',
+ 'mach_o/CompactUnwind.cpp',
+ 'mach_o/DataInCode.cpp',
+ 'mach_o/DwarfDebug.cpp',
+ 'mach_o/Error.cpp',
+ 'mach_o/ExportsTrie.cpp',
+ 'mach_o/Fixups.cpp',
+ 'mach_o/FunctionStarts.cpp',
+ 'mach_o/FunctionVariants.cpp',
+ 'mach_o/GradedArchitectures.cpp',
+ 'mach_o/Header.cpp',
+ 'mach_o/Image.cpp',
+ 'mach_o/Instructions.cpp',
+ # 'mach_o/LinkerOptimizationHints.cpp',
+ 'mach_o/LoggingStub.cpp',
+ 'mach_o/Misc.cpp',
+ 'mach_o/NListSymbolTable.cpp',
+ 'mach_o/ObjC.cpp',
+ 'mach_o/Platform.cpp',
+ 'mach_o/Policy.cpp',
+ 'mach_o/RebaseOpcodes.cpp',
+ 'mach_o/SplitSeg.cpp',
+ 'mach_o/Symbol.cpp',
+ 'mach_o/Universal.cpp',
+ 'mach_o/Version32.cpp',
+ 'mach_o/Version64.cpp',
+ ],
+)
+libmach_o_dep = declare_dependency(
+ include_directories : [ 'mach_o' ],
+ link_with : libmach_o,
+)
+
+libmach_o_writer = static_library(
+ 'mach_o_writer',
+ dependencies : [ lsl_dep ],
+ include_directories : [
+ common_inc,
+ 'mach_o_writer',
+ ],
+ sources : [
+ 'mach_o_writer/ArchiveWriter.cpp',
+ 'mach_o_writer/BindOpcodesWriter.cpp',
+ 'mach_o_writer/ChainedFixupsWriter.cpp',
+ 'mach_o_writer/ChunkBumpAllocator.cpp',
+ 'mach_o_writer/CompactUnwindWriter.cpp',
+ 'mach_o_writer/DataInCodeWriter.cpp',
+ 'mach_o_writer/ExportsTrieWriter.cpp',
+ 'mach_o_writer/FunctionStartsWriter.cpp',
+ 'mach_o_writer/FunctionVariantsWriter.cpp',
+ 'mach_o_writer/HeaderWriter.cpp',
+ 'mach_o_writer/LinkerOptimizationHintsWriter.cpp',
+ 'mach_o_writer/NListSymbolTableWriter.cpp',
+ 'mach_o_writer/RebaseOpcodesWriter.cpp',
+ 'mach_o_writer/SplitSegWriter.cpp',
+ 'mach_o_writer/UniversalWriter.cpp',
+ ],
+)
+libmach_o_writer_dep = declare_dependency(
+ include_directories : [ 'mach_o_writer' ],
+ link_with : libmach_o_writer,
+)
# These files need to be built with `BUILDING_LIBDYLD` not `BUILDING_DYLDINFO`.
# `dyld_info` can’t just link against `libdyld` because the symbols it needs are not publicly exported.
@@ -110,15 +184,17 @@ libminidyld = static_library(
'common/MachOLayout.cpp',
'common/MachOLoaded.cpp',
'libdyld/CrashReporterAnnotations.c',
- 'mach_o/ChainedFixups.cpp',
- 'mach_o/GradedArchitectures.cpp',
],
)
libdsc_extractor = shared_library(
'dsc_extractor',
cpp_args : [ '-DBUILDING_SHARED_CACHE_EXTRACTOR=1' ],
- dependencies : [ corecrypto_dep, lsl_dep ],
+ dependencies : [
+ corecrypto_dep,
+ libmach_o_dep,
+ lsl_dep
+ ],
include_directories : [
common_inc,
'cache-builder',
@@ -132,6 +208,7 @@ libdsc_extractor = shared_library(
sources : [
'common/DyldSharedCache.cpp',
'common/MachOFile.cpp',
+ 'common/TargetPolicy.cpp',
'other-tools/dsc_extractor.cpp',
'other-tools/dsc_iterator.cpp',
'common/MachOLayout.cpp',
@@ -156,6 +233,7 @@ executable(
],
dependencies : [
corecrypto_dep,
+ libmach_o_dep,
llvm_dep,
lsl_dep,
],
@@ -175,31 +253,10 @@ executable(
'common/MachOFile.cpp',
'common/MetadataVisitor.cpp',
'common/SwiftVisitor.cpp',
- 'mach_o/Architecture.cpp',
- 'mach_o/Archive.cpp',
- 'mach_o/BindOpcodes.cpp',
- 'mach_o/ChainedFixups.cpp',
- 'mach_o/CompactUnwind.cpp',
- 'mach_o/Error.cpp',
- 'mach_o/ExportsTrie.cpp',
- 'mach_o/Fixups.cpp',
- 'mach_o/FunctionStarts.cpp',
- 'mach_o/Header.cpp',
- 'mach_o/Image.cpp',
- 'mach_o/Instructions.cpp',
- 'mach_o/LoggingStub.cpp',
- 'mach_o/Misc.cpp',
- 'mach_o/NListSymbolTable.cpp',
- 'mach_o/ObjC.cpp',
- 'mach_o/Platform.cpp',
- 'mach_o/Policy.cpp',
- 'mach_o/RebaseOpcodes.cpp',
- 'mach_o/SplitSeg.cpp',
- 'mach_o/Symbol.cpp',
- 'mach_o/Universal.cpp',
- 'mach_o/Version32.cpp',
- 'mach_o/Version64.cpp',
+ 'common/TargetPolicy.cpp',
'other-tools/dyld_info.cpp',
+ 'other-tools/MiscFileUtils.cpp',
+ 'other-tools/SymbolicatedImage.cpp',
],
)
install_man('doc/man/man1/dyld_info.1')
diff --git a/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix b/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix
index 869d4b3ea9da3..8cc3eaa2071ad 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix
@@ -1,11 +1,12 @@
{
lib,
- apple-sdk_12,
+ apple-sdk,
ld64,
mkAppleDerivation,
cmake,
- llvmPackages,
+ llvm,
openssl,
+ pkgsBuildHost,
pkg-config,
stdenvNoCC,
fetchurl,
@@ -19,11 +20,11 @@ let
hash = "sha256-0ybVcwHuGEdThv0PPjYQc3SW0YVOyrM3/L9zG/l1Vtk=";
};
- launchd = apple-sdk_12.sourceRelease "launchd";
- Libc = apple-sdk_12.sourceRelease "Libc";
- libplatform = apple-sdk_12.sourceRelease "libplatform";
- libpthread = apple-sdk_12.sourceRelease "libpthread";
- xnu = apple-sdk_12.sourceRelease "xnu";
+ launchd = apple-sdk.sourceRelease "launchd";
+ Libc = apple-sdk.sourceRelease "Libc";
+ libplatform = apple-sdk.sourceRelease "libplatform";
+ libpthread = apple-sdk.sourceRelease "libpthread";
+ xnu = apple-sdk.sourceRelease "xnu";
privateHeaders = stdenvNoCC.mkDerivation {
name = "dyld-deps-private-headers";
@@ -43,7 +44,8 @@ let
install -D -m644 -t "$out/include/System" \
'${Libc}/stdlib/FreeBSD/atexit.h'
- mkdir -p "$out/include/System/sys"
+ install -D -m644 -t "$out/include/System/sys" \
+ '${xnu}/bsd/sys/csr.h'
substitute '${xnu}/bsd/sys/fsgetpath.h' "$out/include/System/sys/fsgetpath.h" \
--replace-fail '#ifdef __APPLE_API_PRIVATE' '#if 1'
@@ -91,13 +93,11 @@ mkAppleDerivation {
propagatedBuildOutputs = [ ];
- xcodeHash = "sha256-NfaENSF699xjc+eKtOm1RyXUCMD6xTaJ5+9arLllqyw=";
+ xcodeHash = "sha256-4yOJouk9AjEt7W3+0cQRMUDDqBhU+J9c16ZQSzUF5go=";
patches = [
# Disable use of private kdebug API
./patches/0001-Disable-kdebug-trace.patch
- # dyld_info requires `startsWith`, but it’s not normally built for `dyld_info`.
- ./patches/0002-Provide-startsWith-for-dyld_info.patch
# dyld_info tries to weakly link against libLTO using this macro.
./patches/0003-Add-weaklinking_h.patch
# The LLVMOpInfoCallback args comment out one of the args. Fix that for compatibility with nixpkgs LLVM.
@@ -108,6 +108,9 @@ mkAppleDerivation {
# `dsc_extractor` builds a dylib, but it includes a program that can perform cache extraction.
# This extracts just the driver into a file to make building the actual program easier.
./patches/0006-Add-dsc_extractor_bin_cpp.patch
+ # Fix missing symbol for `mach_o::ChainedFixups::PointerFormat::writeChainEntry`,
+ # which isn’t actually needed by `dyld_info` or `dsc_extractor`.
+ ./patches/0007-Fix-missing-writeChainEntry.patch
];
postPatch = ''
@@ -143,6 +146,9 @@ mkAppleDerivation {
substituteInPlace dyld/Loader.h \
--replace-fail 'dyld_priv.h' 'mach-o/dyld_priv.h'
+ substituteInPlace common/DyldSharedCache.h \
+ --replace-fail 'dyld_cache_format.h' 'mach-o/dyld_cache_format.h'
+
# Remove unused header include (since the compat shims don’t provide it).
substituteInPlace other-tools/dsc_extractor.cpp \
--replace-fail '#include ' ""
@@ -155,13 +161,13 @@ mkAppleDerivation {
env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include";
buildInputs = [
- apple-sdk_12 # Needed for `PLATFORM_FIRMWARE` and `PLATFORM_SEPOS` defines in `mach-o/loader.h`.
- llvmPackages.llvm
+ llvm
openssl
];
nativeBuildInputs = [
cmake # CMake is required for Meson to find LLVM as a dependency.
+ (lib.getDev pkgsBuildHost.llvm) # Workaround Meson limitations with LLVM 21.
pkg-config
];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0002-Provide-startsWith-for-dyld_info.patch b/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0002-Provide-startsWith-for-dyld_info.patch
deleted file mode 100644
index 746f21cc23ae0..0000000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0002-Provide-startsWith-for-dyld_info.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/common/MachOFile.cpp b/common/MachOFile.cpp
-index 3e7b95bcfe..265ae7c475 100644
---- a/common/MachOFile.cpp
-+++ b/common/MachOFile.cpp
-@@ -2493,7 +2493,14 @@
- }
- #endif // BUILDING_APP_CACHE_UTIL || BUILDING_DYLDINFO
-
--#if BUILDING_CACHE_BUILDER || BUILDING_CACHE_BUILDER_UNIT_TESTS
-+#if BUILDING_DYLDINFO || BUILDING_CACHE_BUILDER || BUILDING_CACHE_BUILDER_UNIT_TESTS
-+
-+#if BUILDING_DYLDINFO
-+static bool startsWith(const char* buffer, const char* valueToFind) {
-+ return strncmp(buffer, valueToFind, strlen(valueToFind)) == 0;
-+}
-+#endif
-+
- static bool platformExcludesPrebuiltClosure_macOS(const char* path) {
- // We no longer support ROSP, so skip all paths which start with the special prefix
- if ( startsWith(path, "/System/Library/Templates/Data/") )
diff --git a/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0004-Fix-llvm-op-info-callback-args.patch b/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0004-Fix-llvm-op-info-callback-args.patch
index cc3e0c8729ffa..ea18669b09f1a 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0004-Fix-llvm-op-info-callback-args.patch
+++ b/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0004-Fix-llvm-op-info-callback-args.patch
@@ -1,7 +1,7 @@
diff --git a/other-tools/dyld_info.cpp b/other-tools/dyld_info.cpp
index 2de4978ba5..2ce27257d9 100644
---- a/other-tools/dyld_info.cpp
-+++ b/other-tools/dyld_info.cpp
+--- a/other-tools/SymbolicatedImage.cpp
++++ b/other-tools/SymbolicatedImage.cpp
@@ -991,7 +991,7 @@
return ((SymbolicatedImage*)di)->lookupSymbol(referencePC, referenceValue, *referenceType, *referenceName);
}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0007-Fix-missing-writeChainEntry.patch b/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0007-Fix-missing-writeChainEntry.patch
new file mode 100644
index 0000000000000..5590f8f5861a2
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0007-Fix-missing-writeChainEntry.patch
@@ -0,0 +1,13 @@
+diff --git a/mach_o/ChainedFixups.h b/mach_o/ChainedFixups.h
+index 10ff8847e0..336f80dd81 100644
+--- a/mach_o/ChainedFixups.h
++++ b/mach_o/ChainedFixups.h
+@@ -78,7 +78,7 @@
+ std::span segOffsetTable, uint32_t pageIndex, uint32_t pageSize,
+ void (^callback)(const Fixup& f, bool& stop)) const;
+ virtual Fixup parseChainEntry(const void* loc, const MappedSegment* seg, uint64_t preferedLoadAddress=0, std::span segOffsetTable={}) const = 0;
+- virtual void writeChainEntry(const Fixup& fixup, const void* nextLoc, uint64_t preferedLoadAddress, std::span) const;
++ virtual void writeChainEntry(const Fixup& fixup, const void* nextLoc, uint64_t preferedLoadAddress, std::span) const = 0;
+
+ protected:
+ constexpr PointerFormat() { }
diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/meson.build.in
index 638742f978c2a..9919a3d90b3a5 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/meson.build.in
+++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/meson.build.in
@@ -4,7 +4,10 @@
# Project settings
project('file_cmds', 'c', version : '@version@')
add_global_arguments(
+ # These are not defined automatically by Clang. Not having them defined causes compilation failures.
'-DTARGET_OS_BRIDGE=0',
+ '-DTARGET_OS_EXCLAVECORE=0',
+ '-DTARGET_OS_EXCLAVEKIT=0',
language : 'c',
)
diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix
index 584d2a312a605..160a394b4ba72 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix
@@ -53,6 +53,8 @@ let
uint64_t xdi_xdtream_obj_id;
};
#define APFS_CLEAR_PURGEABLE 0
+ #define APFS_PURGEABLE_FLAGS_MASK 0xFFFF
+ #define APFSIOC_GET_PURGEABLE_FILE_FLAGS _IOR('J', 71, uint64_t)
#define APFSIOC_MARK_PURGEABLE _IOWR('J', 68, uint64_t)
#define APFSIOC_XDSTREAM_OBJ_ID _IOWR('J', 53, struct xdstream_obj_id)
EOF
@@ -89,7 +91,7 @@ mkAppleDerivation {
"xattr"
];
- xcodeHash = "sha256-u23AoLa7J0eFtf4dXKkVO59eYL2I3kRsHcWPfT03MCU=";
+ xcodeHash = "sha256-KEZYuaDxLdprF+wGiszUdTXPQBfLNj0xP9Y0uarNjSs=";
patches = [
# Fixes build of ls
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix
index 942f0a26da436..7aefb636900e3 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix
@@ -23,8 +23,6 @@ mkAppleDerivation (finalAttrs: {
];
patches = [
- # Clang 18 requires that no non-private symbols by defined after cfi_startproc. Apply the upstream libffi fix.
- ./patches/llvm-18-compatibility.patch
# Fix a memory leak when using the trampoline dylib. See https://github.com/libffi/libffi/pull/621#discussion_r955298301.
./patches/fix-tramponline-memory-leak.patch
# Fix automake-18.18 compatibility, https://github.com/libffi/libffi/issues/853#issuecomment-2909994482
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libffi/patches/llvm-18-compatibility.patch b/pkgs/os-specific/darwin/apple-source-releases/libffi/patches/llvm-18-compatibility.patch
deleted file mode 100644
index a264d7b76d1ba..0000000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/libffi/patches/llvm-18-compatibility.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/src/aarch64/sysv.S b/src/aarch64/sysv.S
-index eeaf3f8..329889c 100644
---- a/src/aarch64/sysv.S
-+++ b/src/aarch64/sysv.S
-@@ -76,8 +76,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
- x5 closure
- */
-
-- cfi_startproc
- CNAME(ffi_call_SYSV):
-+ cfi_startproc
- /* Sign the lr with x1 since that is where it will be stored */
- SIGN_LR_WITH_REG(x1)
-
-@@ -268,8 +268,8 @@ CNAME(ffi_closure_SYSV_V):
- #endif
-
- .align 4
-- cfi_startproc
- CNAME(ffi_closure_SYSV):
-+ cfi_startproc
- SIGN_LR
- stp x29, x30, [sp, #-ffi_closure_SYSV_FS]!
- cfi_adjust_cfa_offset (ffi_closure_SYSV_FS)
-@@ -500,8 +500,8 @@ CNAME(ffi_go_closure_SYSV_V):
- #endif
-
- .align 4
-- cfi_startproc
- CNAME(ffi_go_closure_SYSV):
-+ cfi_startproc
- stp x29, x30, [sp, #-ffi_closure_SYSV_FS]!
- cfi_adjust_cfa_offset (ffi_closure_SYSV_FS)
- cfi_rel_offset (x29, 0)
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libresolv/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/libresolv/meson.build.in
index 6a7c523a164c5..0c1adce503a5b 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libresolv/meson.build.in
+++ b/pkgs/os-specific/darwin/apple-source-releases/libresolv/meson.build.in
@@ -3,6 +3,12 @@
# Project settings
project('libresolv', 'c', version : '@version@')
+add_project_arguments(
+ '-DCOMMON_DIGEST_FOR_RFC_1321', # To enable legacy `MD5` APIs in CommonCrypto.
+ # This is not defined automatically by Clang. Not having them defined causes compilation failures.
+ '-DTARGET_OS_BRIDGE=0',
+ language : 'c',
+)
# Dependencies
@@ -20,8 +26,8 @@ libresolv = library(
'dns_async.c',
'dns_util.c',
'dst_api.c',
- 'dst_hmac_link.c',
- 'dst_support.c',
+ 'hmac_link.c',
+ 'mtctxres.c',
'ns_date.c',
'ns_name.c',
'ns_netint.c',
@@ -41,15 +47,19 @@ libresolv = library(
'res_query.c',
'res_send.c',
'res_sendsigned.c',
+ 'res_state.c',
'res_update.c',
+ 'support.c',
],
soversion : '9'
)
install_headers(
+ 'arpa/nameser_compat.h',
'dns.h',
'dns_util.h',
'nameser.h',
'resolv.h',
+ preserve_path : true,
)
install_man(
'resolver.3',
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix
index 158317c22c80b..56c38bcece53f 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix
@@ -2,14 +2,31 @@
lib,
apple-sdk,
mkAppleDerivation,
+ stdenvNoCC,
}:
let
configd = apple-sdk.sourceRelease "configd";
+ dyld = apple-sdk.sourceRelease "dyld";
Libinfo = apple-sdk.sourceRelease "Libinfo";
+ Libnotify = apple-sdk.sourceRelease "Libnotify";
+ xnu = apple-sdk.sourceRelease "xnu";
# `arpa/nameser_compat.h` is included in the Libc source release instead of libresolv.
Libc = apple-sdk.sourceRelease "Libc";
+
+ privateHeaders = stdenvNoCC.mkDerivation {
+ name = "libresolv-deps-private-headers";
+
+ buildCommand = ''
+ install -D -t "$out/include/mach-o" \
+ '${dyld}/include/mach-o/dyld_priv.h'
+
+ substituteInPlace "$out/include/mach-o/dyld_priv.h" \
+ --replace-fail ', bridgeos(3.0)' "" \
+ --replace-fail '//@VERSION_DEFS@' 'const dyld_build_version_t dyld_2024_SU_E_os_versions = { 1 /* macOS */, 150400 };'
+ '';
+ };
in
mkAppleDerivation {
releaseName = "libresolv";
@@ -20,19 +37,20 @@ mkAppleDerivation {
"man"
];
- xcodeHash = "sha256-yHNa6cpI3T4R/iakeHmL6S/c9p+VpYR4fudv2UXUpnY=";
+ postPatch = ''
+ cp ${Libc}/include/arpa/nameser_compat.h arpa/nameser_compat.h
- postUnpack = ''
- mkdir -p "$sourceRoot/arpa"
- ln -s "$NIX_BUILD_TOP/$sourceRoot/nameser.h" "$sourceRoot/arpa/nameser.h"
+ # Use CommonCrypto’s implementation of MD5. The upstream build appears to use corecrypto, which we can’t use.
+ substituteInPlace hmac_link.c \
+ --replace-fail '' ''
'';
- env.NIX_CFLAGS_COMPILE = "-I${configd}/dnsinfo -I${Libinfo}/lookup.subproj";
+ xcodeHash = "sha256-Q5jHee9rxge6HJtf9/sFK15FsS02GQmx7L0BBDiyGIs=";
+
+ env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include -I${configd}/dnsinfo -I${Libinfo}/lookup.subproj -I${Libnotify}";
postInstall = ''
- mkdir -p "$out/include/arpa"
- ln -s ../nameser.h "$out/include/arpa"
- cp ${Libc}/include/arpa/nameser_compat.h "$out/include/arpa"
+ ln -s ../nameser.h "''${!outputDev}/include/arpa"
'';
meta = {
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix
index 95f35054e026f..a0afe4511d536 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix
@@ -1,5 +1,4 @@
{
- apple-sdk_14,
copyfile,
mkAppleDerivation,
}:
@@ -15,13 +14,7 @@ mkAppleDerivation {
xcodeHash = "sha256-LwR9fmvcdJ/QYlOx+7ffhV4mKvjkwN3rX3+yHSCovKQ=";
- patches = [
- # The only change from macOS 13 to 14 was setting this flag. Check at runtime and only set if supported.
- ./patches/0001-Conditionally-pre-condition.patch
- ];
-
buildInputs = [
- (apple-sdk_14.override { enableBootstrap = true; })
copyfile
];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/patches/0001-Conditionally-pre-condition.patch b/pkgs/os-specific/darwin/apple-source-releases/libutil/patches/0001-Conditionally-pre-condition.patch
deleted file mode 100644
index 27f5faee7cdad..0000000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/libutil/patches/0001-Conditionally-pre-condition.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ca796729722da704e8a9c64c7a201cbe0a9cb9be Mon Sep 17 00:00:00 2001
-From: Randy Eckenrode
-Date: Mon, 5 Aug 2024 22:21:47 -0400
-Subject: [PATCH] Conditionally pre-condition
-
----
- wipefs.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/wipefs.cpp b/wipefs.cpp
-index d8e6339..6cb7963 100644
---- a/wipefs.cpp
-+++ b/wipefs.cpp
-@@ -391,7 +391,9 @@ wipefs_wipe(wipefs_ctx handle)
- // Since we always issue a a single extent, set the kIOStorageUnmapOptionWhole
- // option flag for drive pre-conditioning.
- //
-- unmap.options = kIOStorageUnmapOptionWhole;
-+ if (__builtin_available(macOS 14.0, *)) {
-+ unmap.options = kIOStorageUnmapOptionWhole;
-+ }
-
- //
- // Don't bother to check the return value since this is mostly
---
-2.44.1
diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in
index f0dc469eb1423..9261757157759 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in
+++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in
@@ -14,6 +14,10 @@ add_global_arguments(
'-DUSE_RFC2292BIS=1',
'-D__APPLE_USE_RFC_3542=1',
'-D__APPLE_API_OBSOLETE=1',
+ # Define flexible array member attribute macros as nothing. Unfortunately, Apple’s usage does not work with
+ # the C23 attributes supported by Clang.
+ '-D__counted_by_or_null(N)=',
+ '-D__sized_by_or_null(N)=',
language : 'c',
)
@@ -23,6 +27,8 @@ cc = meson.get_compiler('c')
libipsec = cc.find_library('ipsec')
libresolv = cc.find_library('resolv')
+libutil = cc.find_library('util')
+
libpcap = dependency('pcap')
openssl = dependency('openssl')
@@ -200,7 +206,7 @@ executable(
dependencies : [ libnetwork_cmds ],
install : true,
sources : [
- # 'netstat.tproj/bpf.c',
+ 'netstat.tproj/bpf.c',
'netstat.tproj/data.c',
'netstat.tproj/if.c',
'netstat.tproj/inet.c',
@@ -276,29 +282,31 @@ executable(
)
install_man('route.tproj/route.8')
-# Depends on a bunch of IPv6 stuff from later SDKs (>11.3). Package once those become the default.
-# executable(
-# 'rtadvd',
-# c_args : [
-# '-DINET6',
-# '-DHAVE_GETIFADDRS',
-# ],
-# install : true,
-# sources : [
-# 'rtadvd.tproj/advcap.c',
-# 'rtadvd.tproj/config.c',
-# 'rtadvd.tproj/dump.c',
-# 'rtadvd.tproj/if.c',
-# 'rtadvd.tproj/rrenum.c',
-# 'rtadvd.tproj/rtadvd.c',
-# 'rtadvd.tproj/rtadvd_logging.c',
-# 'rtadvd.tproj/timer.c',
-# ],
-# )
-# install_man(
-# 'rtadvd.tproj/rtadvd.8',
-# 'rtadvd.tproj/rtadvd.conf.5',
-# )
+executable(
+ 'rtadvd',
+ c_args : [
+ '-DINET6',
+ '-DHAVE_GETIFADDRS',
+ # Required for `_COMM_PAGE_CPU_CAPABILITIES` in
+ '-DPRIVATE',
+ ],
+ dependencies : libutil,
+ install : true,
+ sources : [
+ 'rtadvd.tproj/advcap.c',
+ 'rtadvd.tproj/config.c',
+ 'rtadvd.tproj/dump.c',
+ 'rtadvd.tproj/if.c',
+ 'rtadvd.tproj/rrenum.c',
+ 'rtadvd.tproj/rtadvd.c',
+ 'rtadvd.tproj/rtadvd_logging.c',
+ 'rtadvd.tproj/timer.c',
+ ],
+)
+install_man(
+ 'rtadvd.tproj/rtadvd.8',
+ 'rtadvd.tproj/rtadvd.conf.5',
+)
executable(
'rtsol',
diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix
index f6bb8f551c9bc..ec9d4c32ca1f4 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix
@@ -1,9 +1,10 @@
{
lib,
- apple-sdk,
+ apple-sdk_15,
fetchurl,
libpcap,
libresolv,
+ libutil,
mkAppleDerivation,
openssl,
pkg-config,
@@ -12,61 +13,7 @@
}:
let
- # Newer releases of ifconfig use `ioctls` and undocumented APIs newer than 11.x.
- # Use files from an older release for now.
- old_ifconfig = {
- ifconfig = fetchurl {
- url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/ifconfig.tproj/ifconfig.c";
- hash = "sha256-yuUpdRHRwYLnivuaQuh8HJdLj/8ppq+K1NFqA8Bg+1k=";
- };
- af_inet = fetchurl {
- url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/ifconfig.tproj/af_inet.c";
- hash = "sha256-sqcCEzhTur43DG6Ac/1Rt8Kx0umWhDzlV58t+6FlzNU=";
- };
- af_inet6 = fetchurl {
- url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/ifconfig.tproj/af_inet6.c";
- hash = "sha256-jp0R0Ncwvp9G/lIzKW6wBTAiO8yNyII5c49feTanbIo=";
- };
- af_link = fetchurl {
- url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/ifconfig.tproj/af_link.c";
- hash = "sha256-5rXJg5azy9SjK675Djt4K1PaczsoVjQ/Lls/u5Kk1+A=";
- };
- };
-
- # Newer releases of netstat use struct members that aren’t present with the 11.x headers.
- # Use files from an older release for now.
- old_netstat = {
- "if.c" = fetchurl {
- url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/if.c";
- hash = "sha256-P87rexLkoV1BCyUghVrkGoG6r9rAoWynfpvlwIj7A40=";
- };
- "main.c" = fetchurl {
- url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/main.c";
- hash = "sha256-e3n54l6Wo+G5koMhGMfOTo8+QIkJRurr2fBOjg/nFgI=";
- };
- "inet.c" = fetchurl {
- url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/inet.c";
- hash = "sha256-X1+dz+D6xR2Xqoxypjmy65pKBCh4iGVfByJGI0wVGO0=";
- };
- "inet6.c" = fetchurl {
- url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/inet6.c";
- hash = "sha256-av5K1UQE3edUbzKN9FIn/DOeibsJaTZc0xJzDu9VZ5Q=";
- };
- "netstat.h" = fetchurl {
- url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/netstat.h";
- hash = "sha256-UYi3lmA8G0wRJqVA2NYyMj0yCBUlxu0gMoMYW7NauJg=";
- };
- "unix.c" = fetchurl {
- url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/unix.c";
- hash = "sha256-txs/mnR4WK8JAUN3PtqZsp6q2h+nx5VFKxI/itCTBNo=";
- };
- "systm.c" = fetchurl {
- url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/systm.c";
- hash = "sha256-bISSIsA6OYfkHNOKB4dj9KNLBHfcelGVzwGiYiVqnRM=";
- };
- };
-
- xnu = apple-sdk.sourceRelease "xnu";
+ xnu = apple-sdk_15.sourceRelease "xnu";
privateHeaders = stdenvNoCC.mkDerivation {
name = "network_cmds-deps-private-headers";
@@ -84,27 +31,51 @@ let
install -D -t "$out/include" \
'${xnu}/osfmk/kern/cs_blobs.h'
- install -D -t "$out/firehose" \
+ install -D -t "$out/include/firehose" \
+ '${xnu}/libkern/firehose/firehose_types_private.h' \
'${xnu}/libkern/firehose/tracepoint_private.h'
+ for dir in arm i386 machine; do
+ mkdir -p "$out/include/$dir"
+ for file in '${xnu}/osfmk/'$dir/*; do
+ name=$(basename "$file")
+ # Skip copying `endian.h` because it conflicts with the SDK, breaking the build on x86_64-darwin.
+ test "$name" != endian.h && cp -r "$file" "$out/include/$dir/$name"
+ done
+ done
+
install -D -t "$out/include/net" \
+ '${xnu}/bsd/net/droptap.h' \
'${xnu}/bsd/net/if_bond_internal.h' \
'${xnu}/bsd/net/if_bond_var.h' \
'${xnu}/bsd/net/if_fake_var.h' \
+ '${xnu}/bsd/net/if_mib_private.h' \
+ '${xnu}/bsd/net/if_var_private.h' \
'${xnu}/bsd/net/if_vlan_var.h' \
'${xnu}/bsd/net/lacp.h' \
'${xnu}/bsd/net/net_perf.h'
mkdir -p "$out/include/net/classq" "$out/include/net/pktsched"
+ cat < "$out/include/net/bpf.h"
+ #pragma once
+ #include_next
+ #include
+ $(sed -n \
+ -e '/^#define BPF_D_/p' \
+ -e '/^struct xbpf_d\s*{/,/^};/p' \
+ '${xnu}/bsd/net/bpf.h')
+ EOF
+
# IFNET constants are defined as enums, so they have to be pre-processed and grepped from the file.
cat < "$out/include/net/if.h"
#pragma once
#include
$(sed \
-e 's/^\s*\(IFNET_[^=]*\)=\s*\([^,]*\),*/#define \1\2/' \
- '${xnu}/bsd/net/if.h' | grep '^#define IFNET_')
+ '${xnu}/bsd/net/if_private.h' | grep '^#define IFNET_')
#include_next
#include
+ typedef void* ifnet_t;
#define ifreq ifreq_private
$(sed -n \
-e '/^#define IFEF_TXSTART/p' \
@@ -130,10 +101,9 @@ let
-e '/^struct if_throttlereq\s*{/,/^};/p' \
-e '/^struct ipv6_prefix\s*{/,/^};/p' \
-e '/^struct ifreq\s*{/,/^};/p' \
- '${xnu}/bsd/net/if.h')
+ '${xnu}/bsd/net/if_private.h')
#undef ifreq
EOF
- unifdef -x 1 -DPRIVATE -m "$out/include/net/if.h"
cat < "$out/include/net/content_filter.h"
#pragma once
@@ -143,34 +113,26 @@ let
cat < "$out/include/net/if_var.h"
#pragma once
+ #include
+ #define IF_NETEM_MODEL_IOD 2
+ #define IF_NETEM_MODEL_FPD 3
#include_next
- $(sed -n \
- -e '/^#define IFNAMSIZ\s/p' \
- -e '/^#define IF_NETEM/p' \
- -e '/^struct if_bandwidths\s*{/,/^};/p' \
- -e '/^struct if_data_extended\s*{/,/^};/p' \
- -e '/^struct if_interface_state\s*{/,/^};/p' \
- -e '/^struct if_latencies\s*{/,/^};/p' \
- -e '/^struct if_linkparamsreq\s*{/,/^};/p' \
- -e '/^struct if_netem_params\s*{/,/^};/p' \
- -e '/^struct if_netif_stats\s*{/,/^};/p' \
- -e '/^struct if_packet_stats\s*{/,/^};/p' \
- -e '/^struct if_rxpoll_stats\s*{/,/^};/p' \
- -e '/^struct if_traffic_class\s*{/,/^};/p' \
- '${xnu}/bsd/net/if_var.h')
EOF
cat < "$out/include/net/route.h"
#pragma once
#include_next
$(sed -n \
+ -e '/^#define RTM_/p' \
-e '/^struct rt_msghdr_ext\s*{/,/^};/p' \
-e '/^struct rt_reach_info\s*{/,/^};/p' \
- '${xnu}/bsd/net/route.h')
+ -e '/^struct rtstat_64\s*{/,/^};/p' \
+ '${xnu}/bsd/net/route_private.h')
EOF
ln -s "$out/include/net/route.h" "$out/include/net/route_private.h"
install -D -t "$out/include/netinet" \
+ '${xnu}/bsd/netinet/icmp6.h' \
'${xnu}/bsd/netinet/ip_flowid.h'
cat < "$out/include/netinet/in.h"
@@ -180,7 +142,7 @@ let
-e '/^#define _DSCP/p' \
-e '/^#define IP_NO/p' \
-e '/^union sockaddr_in_4_6\s*{/,/^};/p' \
- '${xnu}/bsd/netinet/in.h')
+ '${xnu}/bsd/netinet/in_private.h')
#include
EOF
@@ -190,7 +152,7 @@ let
-e '/^struct tcp_info\s*{/,/^};/p' \
-e '/^struct tcp_conn_status\s*{/,/^};/p' \
-e '/^typedef struct conninfo_tcp\s*{/,/} conninfo_tcp_t;/p' \
- '${xnu}/bsd/netinet/tcp.h')
+ '${xnu}/bsd/netinet/tcp_private.h')
#include_next
EOF
@@ -202,7 +164,7 @@ let
#pragma once
$(sed -n \
-e '/^#define IPV6_/p' \
- '${xnu}/bsd/netinet6/in6.h')
+ '${xnu}/bsd/netinet6/in6_private.h')
#include_next
EOF
@@ -228,6 +190,9 @@ let
EOF
install -D -t "$out/include/os" \
+ '${xnu}/libkern/os/atomic_private.h' \
+ '${xnu}/libkern/os/atomic_private_arch.h' \
+ '${xnu}/libkern/os/atomic_private_impl.h' \
'${xnu}/libkern/os/log_private.h'
declare -a privateHeaders=(
@@ -286,25 +251,28 @@ let
#pragma once
#include
#include
+ $(sed -n \
+ -e '/^typedef.*sae_associd_t/p' \
+ -e '/^typedef.*sae_connid_t/p' \
+ '${xnu}/bsd/sys/socket.h')
$(sed -n \
-e '/^#define AF_MULTIPATH\s/p' \
-e '/^#define CIAUX_TCP\s/p' \
-e '/^#define NET_RT_/p' \
-e '/^#define SO_RECV/p' \
-e '/^#define SO_TRAFFIC_CLASS\s/,/^#define SO_TC_MAX/p' \
- -e '/^typedef.*sae_associd_t/p' \
- -e '/^typedef.*sae_connid_t/p' \
-e '/^struct so_aidreq\s*{/,/^};/p' \
-e '/^struct so_cidreq\s*{/,/^};/p' \
-e '/^struct so_cinforeq\s*{/,/^};/p' \
-e '/^struct so_cordreq\s*{/,/^};/p' \
- '${xnu}/bsd/sys/socket.h')
+ '${xnu}/bsd/sys/socket_private.h')
#include_next
EOF
cat < "$out/include/sys/socketvar.h"
#pragma once
$(sed -n \
+ -e '/^#define SO_STATS_/p' \
-e '/^#define SO_TC_STATS_MAX\s/p' \
-e '/^#define XSO_/p' \
-e '/^struct data_stats\s*{/,/^};/p' \
@@ -312,6 +280,7 @@ let
-e '/^struct xsocket_n\s*{/,/^};/p' \
-e '/^struct xsockbuf_n\s*{/,/^};/p' \
-e '/^struct xsockstat_n\s*{/,/^};/p' \
+ -e '/^typedef.*so_gen_t;/p' \
'${xnu}/bsd/sys/socketvar.h')
#include_next
EOF
@@ -326,9 +295,11 @@ let
-e '/^#define SIOCGIFAGENTDATA\s/p' \
-e '/^#define SIOCGIFAGENTIDS\s/p' \
-e '/^#define SIOCGIFCLAT46ADDR\s/p' \
+ -e '/^#define SIOCGIFCONSTRAINED\s/p' \
-e '/^#define SIOCGIFDELEGATE\s/p' \
-e '/^#define SIOCGIFDESC\s/p' \
-e '/^#define SIOCGIFEFLAGS\s/p' \
+ -e '/^#define SIOCGIFGENERATIONID\s/p' \
-e '/^#define SIOCGIFGETRTREFCNT\s/p' \
-e '/^#define SIOCGIFINTERFACESTATE\s/p' \
-e '/^#define SIOCGIFLINKPARAMS\s/p' \
@@ -343,20 +314,27 @@ let
-e '/^#define SIOCGIFTIMESTAMPENABLED\s/p' \
-e '/^#define SIOCGIFTYPE\s/p' \
-e '/^#define SIOCGIFXFLAGS\s/p' \
+ -e '/^#define SIOCGQOSMARKINGENABLED\s/p' \
+ -e '/^#define SIOCGQOSMARKINGMODE\s/p' \
-e '/^#define SIOCGSTARTDELAY\s/p' \
-e '/^#define SIOCSECNMODE\s/p' \
-e '/^#define SIOCSETROUTERMODE\s/p' \
-e '/^#define SIOCSFASTLANECAPABLE\s/p' \
-e '/^#define SIOCSFASTLEENABLED\s/p' \
-e '/^#define SIOCSIF2KCL\s/p' \
+ -e '/^#define SIOCSIFCONSTRAINED\s/p' \
-e '/^#define SIOCSIFDESC\s/p' \
+ -e '/^#define SIOCSIFDISABLEINPUT\s/p' \
-e '/^#define SIOCSIFDISABLEOUTPUT\s/p' \
-e '/^#define SIOCSIFEXPENSIVE\s/p' \
-e '/^#define SIOCSIFINTERFACESTATE\s/p' \
-e '/^#define SIOCSIFLINKPARAMS\s/p' \
-e '/^#define SIOCSIFLOG\s/p' \
-e '/^#define SIOCSIFLOWPOWER\s/p' \
+ -e '/^#define SIOCSIFMARKWAKEPKT\s/p' \
-e '/^#define SIOCSIFMPKLOG\s/p' \
+ -e '/^#define SIOCSIFNOACKPRIO\s/p' \
+ -e '/^#define SIOCSIFNOTRAFFICSHAPING\s/p' \
-e '/^#define SIOCSIFPROBECONNECTIVITY\s/p' \
-e '/^#define SIOCSIFSUBFAMILY\s/p' \
-e '/^#define SIOCSIFTHROTTLE\s/p' \
@@ -364,10 +342,11 @@ let
-e '/^#define SIOCSIFTIMESTAMPENABLE\s/p' \
-e '/^#define SIOCSQOSMARKINGENABLED\s/p' \
-e '/^#define SIOCSQOSMARKINGMODE\s/p' \
- '${xnu}/bsd/sys/sockio.h')
+ '${xnu}/bsd/sys/sockio_private.h')
#undef ifreq
#include_next
EOF
+ ln -s "$out/include/sys/sockio.h" "$out/include/sys/sockio_private.h"
cat < "$out/include/sys/sys_domain.h"
#pragma once
@@ -388,10 +367,16 @@ let
cat < "$out/include/sys/unpcb.h"
#pragma once
#include_next
+ #define KERNEL
+ #ifdef KERNEL
+ $(sed -n \
+ -e '/^struct unpcb_compat\s*{/,/^};/p' \
+ '${xnu}/bsd/sys/unpcb.h')
+ #undef KERNEL
$(sed -n \
-e '/^#define xu_addr/p' \
- -e '/^struct xunpcb64_list_entry\s*{/,/^};/p' \
- -e '/^struct xunpcb64\s*{/,/^};/p' \
+ -e '/^struct *xunpcb\(64\|_n\)_list_entry\s*{/,/^};/p' \
+ -e '/^struct *xunpcb\(64\|_n\)\s*{/,/^};/p' \
'${xnu}/bsd/sys/unpcb.h')
'';
};
@@ -404,7 +389,7 @@ mkAppleDerivation {
"man"
];
- xcodeHash = "sha256-HkcIvKB4ektuk+3J/Sque8Pr5dMeNFZRlENuiu3KdsA=";
+ xcodeHash = "sha256-1RJ/s9vnfCGY2Vc2XH8dg8rB+0lwK2IBC7zIx4PuXWQ=";
patches = [
# Some private headers depend on corecrypto, which we can’t use.
@@ -416,15 +401,6 @@ mkAppleDerivation {
# Fix invalid pointer conversion error from trying to pass `NULL` to a `size_t`.
substituteInPlace ndp.tproj/ndp.c --replace-fail 'NULL, NULL);' 'NULL, 0);'
- # Copy older files that are more compatible with the current SDK.
- ${lib.concatLines (
- lib.mapAttrsToList (name: path: "cp '${path}' 'ifconfig.tproj/${name}.c'") old_ifconfig
- )}
-
- ${lib.concatLines (
- lib.mapAttrsToList (name: path: "cp '${path}' 'netstat.tproj/${name}'") old_netstat
- )}
-
# Use private struct ifreq instead of the one defined in the system header.
substituteInPlace ifconfig.tproj/ifconfig.c \
--replace-fail $'struct\tifreq' 'struct ifreq' \
@@ -449,6 +425,7 @@ mkAppleDerivation {
buildInputs = [
libpcap
libresolv
+ libutil
openssl
];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/package.nix
index 86eaba2136e53..30f1eef87c270 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/package.nix
@@ -14,7 +14,7 @@ mkAppleDerivation {
"man"
];
- xcodeHash = "sha256-FLCJY40l74ExO0WTaA8hb9guhOBXeui2GqWL/7QeJJk=";
+ xcodeHash = "sha256-Ox8Ii2sUuledUttZ64DaHC0iFlUybs3lNZ23IDeziPM=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/removefile/package.nix b/pkgs/os-specific/darwin/apple-source-releases/removefile/package.nix
index ab9f28605b5af..2ece68a526a27 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/removefile/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/removefile/package.nix
@@ -37,14 +37,7 @@ mkAppleDerivation {
"man"
];
- xcodeHash = "sha256-pE92mVI0KTHOVKBA4T5R1rHy5//uipOimas7DaTVe0U=";
-
- postPatch = ''
- # Disable experimental bounds safety stuff that’s not available in LLVM 16.
- substituteInPlace removefile.h \
- --replace-fail '__ptrcheck_abi_assume_single()' "" \
- --replace-fail '__unsafe_indexable' ""
- '';
+ xcodeHash = "sha256-7dNq0nE2MmFM9U+epTrkCoM1lrswm98m3RWuLDsAuDk=";
env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include";
diff --git a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/package.nix
index f12c88ef2a645..c8a305b61baa4 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/package.nix
@@ -24,7 +24,7 @@ mkAppleDerivation {
"man"
];
- xcodeHash = "sha256-26N7AZV/G+ryc2Nu1v91rEdb1a6jDpnj6t5rzEG2YA4=";
+ xcodeHash = "sha256-fY8k7qzqqiv/KvGIB4a82qbNsm23QPnGOadrZmNoi54=";
postPatch = ''
# Fix `mktemp` templates
diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build.in
index f12b3fe41b924..3263cdb2837ce 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build.in
+++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build.in
@@ -15,9 +15,11 @@ add_project_arguments(
'-DPRIVATE=1',
# From bsd/sys/private_event.h in xnu
'-Dkqueue_id_t=uint64_t',
+ # These are not defined automatically by Clang. Not having them defined causes compilation failures.
+ '-DTARGET_OS_EXCLAVECORE=0',
+ '-DTARGET_OS_EXCLAVEKIT=0',
language : 'c',
)
-sdk_version = get_option('sdk_version')
# Dependencies
@@ -39,15 +41,7 @@ dbm = cc.find_library('dbm')
ncurses = dependency('ncurses')
openbsm = cc.find_library('bsm')
pam = cc.find_library('pam')
-
-# Feature Tests
-if sdk_version.version_compare('<12')
- add_project_arguments(
- '-DIOMainPort=IOMasterPort',
- '-DkIOMainPortDefault=kIOMasterPortDefault',
- language : 'c'
- )
-endif
+util = cc.find_library('util')
# Generators
@@ -278,14 +272,11 @@ executable(
executable(
'latency',
- build_by_default : sdk_version.version_compare('>=12'),
- dependencies : [ ncurses ],
- install : sdk_version.version_compare('>=12'),
+ dependencies : [ util, ncurses ],
+ install : true,
sources : 'latency/latency.c',
)
-if sdk_version.version_compare('>=12')
- install_man('latency/latency.1')
-endif
+install_man('latency/latency.1')
executable(
'login',
@@ -303,27 +294,21 @@ executable(
executable(
'lskq',
- build_by_default : sdk_version.version_compare('>=12'),
- install : sdk_version.version_compare('>=12'),
+ install : true,
sources : 'lskq/lskq.c',
)
-if sdk_version.version_compare('>=12')
- install_man('lskq/lskq.1')
-endif
+install_man('lskq/lskq.1')
executable(
'lsmp',
- build_by_default : sdk_version.version_compare('>=12'),
- install : sdk_version.version_compare('>=12'),
+ install : true,
sources : [
'lsmp/lsmp.c',
'lsmp/port_details.c',
'lsmp/task_details.c'
]
)
-if sdk_version.version_compare('>=12')
- install_man('lsmp/lsmp.1')
-endif
+install_man('lsmp/lsmp.1')
executable(
'ltop',
@@ -469,14 +454,11 @@ install_man('sa/sa.8')
executable(
'sc_usage',
- build_by_default : sdk_version.version_compare('>=12'),
- dependencies : ncurses,
- install : sdk_version.version_compare('>=12'),
+ dependencies : [ncurses, util],
+ install : true,
sources : 'sc_usage/sc_usage.c',
)
-if sdk_version.version_compare('>=12')
- install_man('sc_usage/sc_usage.1')
-endif
+install_man('sc_usage/sc_usage.1')
executable('shutdown',
# Requires IOKitUser kext APIs
@@ -599,4 +581,3 @@ executable(
sources : 'zprint/zprint.c',
)
# install_man('zprint/zprint.1')
-
diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.options b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.options
deleted file mode 100644
index 8c4ce874c64c5..0000000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.options
+++ /dev/null
@@ -1 +0,0 @@
-option('sdk_version', type : 'string')
diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix
index 5e2b5ea0f834f..934213c73bd06 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix
@@ -1,7 +1,9 @@
{
lib,
+ AvailabilityVersions,
apple-sdk,
- apple-sdk_12,
+ apple-sdk_15,
+ libutil,
mkAppleDerivation,
ncurses,
openpam,
@@ -13,17 +15,20 @@
let
libdispatch = apple-sdk.sourceRelease "libdispatch"; # Has to match the version of the SDK
- Libc = apple-sdk_12.sourceRelease "Libc";
- libmalloc = apple-sdk_12.sourceRelease "libmalloc";
- OpenDirectory = apple-sdk_12.sourceRelease "OpenDirectory";
+ Libc = apple-sdk.sourceRelease "Libc";
+ libmalloc = apple-sdk.sourceRelease "libmalloc";
+ OpenDirectory = apple-sdk.sourceRelease "OpenDirectory";
- libplatform = apple-sdk_12.sourceRelease "libplatform";
- xnu = apple-sdk_12.sourceRelease "xnu";
+ libplatform = apple-sdk.sourceRelease "libplatform";
+ xnu = apple-sdk_15.sourceRelease "xnu"; # Needed for `posix_spawn_secflag_options`
privateHeaders = stdenvNoCC.mkDerivation {
name = "system_cmds-deps-private-headers";
buildCommand = ''
+ mkdir -p "$out/include/sys"
+ '${lib.getExe AvailabilityVersions}' ${lib.getVersion apple-sdk} "$out"
+
install -D -t "$out/include/CFOpenDirectory" \
'${OpenDirectory}/Core/CFOpenDirectoryPriv.h' \
'${OpenDirectory}/Core/CFODTrigger.h'
@@ -43,6 +48,7 @@ let
install -D -t "$out/include" \
'${libmalloc}/private/stack_logging.h' \
'${libplatform}/private/_simple.h' \
+ '${xnu}/libsyscall/wrappers/libproc/libproc_private.h' \
'${xnu}/libsyscall/wrappers/spawn/spawn_private.h'
touch "$out/include/btm.h"
@@ -71,13 +77,29 @@ let
install -D -t "$out/include/sys" \
'${xnu}/bsd/sys/csr.h' \
+ '${xnu}/bsd/sys/event_private.h' \
'${xnu}/bsd/sys/pgo.h' \
+ '${xnu}/bsd/sys/kdebug_private.h' \
'${xnu}/bsd/sys/kern_memorystatus.h' \
+ '${xnu}/bsd/sys/proc_info_private.h' \
'${xnu}/bsd/sys/reason.h' \
'${xnu}/bsd/sys/resource.h' \
+ '${xnu}/bsd/sys/resource_private.h' \
'${xnu}/bsd/sys/spawn_internal.h' \
'${xnu}/bsd/sys/stackshot.h'
+ cat < "$out/include/sys/kdebug.h"
+ #pragma once
+ #include_next
+ #include
+ EOF
+
+ cat < "$out/include/sys/proc_info.h"
+ #pragma once
+ #include_next
+ #include
+ EOF
+
# Older source releases depend on CrashReporterClient.h, but it’s not publicly available.
touch "$out/include/CrashReporterClient.h"
'';
@@ -88,12 +110,24 @@ mkAppleDerivation {
xcodeHash = "sha256-gdtn3zNIneZKy6+X0mQ51CFVLNM6JQYLbd/lotG5/Tw=";
+ patches = [
+ # `posix_spawnattr_set_use_sec_transition_shims_np` is only available on macOS 15.2 or newer.
+ # Disable the feature that requires it when running on older systems.
+ ./patches/conditionalize-security-transition-shims.patch
+ ];
+
postPatch = ''
# Replace hard-coded, impure system paths with the output path in the store.
sed -e "s|PATH=[^;]*|PATH='$out/bin'|" -i "pagesize/pagesize.sh"
# Requires BackgroundTaskManagement.framework headers.
sed -e '/ if (os_feature_enabled(cronBTMToggle, cronBTMCheck))/,/ }/d' -i atrun/atrun.c
+
+ # Fix format security errors
+ for src in latency/latency.c sc_usage/sc_usage.c; do
+ substituteInPlace $src \
+ --replace-fail 'printw(tbuf)' 'printw("%s", tbuf);'
+ done
'';
preConfigure = ''
@@ -104,13 +138,12 @@ mkAppleDerivation {
buildInputs = [
apple-sdk.privateFrameworksHook
+ libutil
ncurses
openpam
];
nativeBuildInputs = [ pkg-config ];
- mesonFlags = [ (lib.mesonOption "sdk_version" stdenv.hostPlatform.darwinSdkVersion) ];
-
meta.description = "System commands for Darwin";
}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/patches/conditionalize-security-transition-shims.patch b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/patches/conditionalize-security-transition-shims.patch
new file mode 100644
index 0000000000000..b51f97e2dfc0d
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/patches/conditionalize-security-transition-shims.patch
@@ -0,0 +1,33 @@
+diff --git a/taskpolicy/taskpolicy.c b/taskpolicy/taskpolicy.c
+index b031f944b2..4ad82018ed 100644
+--- a/taskpolicy/taskpolicy.c
++++ b/taskpolicy/taskpolicy.c
+@@ -126,7 +126,12 @@
+ flag_s = true;
+ break;
+ case 'S':
+- sec_transition_shims = parse_sec_transition_shims(optarg);
++ if (__builtin_available(macOS 15.2, *)) {
++ sec_transition_shims = parse_sec_transition_shims(optarg);
++ } else {
++ fprintf(stderr, "Running with security transition shims is only supported on macOS 15.2 and newer.\n");
++ exit(EX_USAGE);
++ }
+ break;
+ case '?':
+ default:
+@@ -246,9 +251,11 @@
+ if (ret != 0) errc(EX_NOINPUT, ret, "posix_spawnattr_set_darwin_role_np");
+ }
+
+- if (sec_transition_shims) {
+- ret = posix_spawnattr_set_use_sec_transition_shims_np(&attr, sec_transition_shims);
+- if (ret != 0) errc(EX_NOINPUT, ret, "setting security transition shims");
++ if (__builtin_available(macOS 15.2, *)) {
++ if (sec_transition_shims) {
++ ret = posix_spawnattr_set_use_sec_transition_shims_np(&attr, sec_transition_shims);
++ if (ret != 0) errc(EX_NOINPUT, ret, "setting security transition shims");
++ }
+ }
+
+ ret = posix_spawnp(&pid, argv[0], NULL, &attr, argv, environ);
diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix
index b640edb096b82..6c71c21c1ee77 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix
@@ -1,7 +1,6 @@
{
lib,
apple-sdk,
- apple-sdk_13,
bzip2,
libmd,
libresolv,
@@ -18,7 +17,6 @@
let
Libc = apple-sdk.sourceRelease "Libc";
- Libc_13 = apple-sdk_13.sourceRelease "Libc";
CommonCrypto = apple-sdk.sourceRelease "CommonCrypto";
libplatform = apple-sdk.sourceRelease "libplatform";
@@ -30,7 +28,7 @@ let
buildCommand = ''
install -D -t "$out/include" \
'${libplatform}/private/_simple.h' \
- '${Libc_13}/include/vis.h'
+ '${Libc}/include/vis.h'
install -D -t "$out/include/os" \
'${Libc}/os/assumes.h' \
'${xnu}/libkern/os/base_private.h'
@@ -47,7 +45,7 @@ mkAppleDerivation {
"man"
];
- xcodeHash = "sha256-dZ+yJyfflhmUyx3gitRXC115QxS87SGC4/HjMa199Ts=";
+ xcodeHash = "sha256-4nwDGUBSx5jjeLQ3EGQFdPZE2MfNGcBvlTU/Sye6OIk=";
postPatch = ''
# Improve compatiblity with libmd in nixpkgs.
@@ -60,18 +58,6 @@ mkAppleDerivation {
--replace-fail SHA224_CTX SHA2_CTX \
--replace-fail '' '' \
--replace-fail 'const void *, unsigned int, char *' 'const uint8_t *, size_t, char *'
- ''
- + lib.optionalString (lib.versionOlder (lib.getVersion apple-sdk) "13.0") ''
- # Backport vis APIs from the 13.3 SDK (needed by vis).
- cp '${Libc_13}/gen/FreeBSD/vis.c' vis/vis-libc.c
- # Backport errx APIs from the 13.3 SDK (needed by lots of things).
- mkdir sys
- cp '${Libc_13}/gen/FreeBSD/err.c' err-libc.c
- cp '${Libc_13}/include/err.h' err.h
- cp '${Libc_13}/fbsdcompat/sys/cdefs.h' sys/cdefs.h
- substituteInPlace err.h \
- --replace-fail '__cold' ""
- touch namespace.h un-namespace.h libc_private.h
'';
env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include";
diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json
index 4081232cd0fba..a80d604e2b83f 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/versions.json
+++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json
@@ -1,27 +1,27 @@
{
"AvailabilityVersions": {
- "hash": "sha256-PT54BPSRkQiIHrpxZCdjo6XvNuWxESabLndCBYjulfs=",
- "version": "143.6"
+ "hash": "sha256-eQ46qHk4AuHA+hRZq1IG2UtvZr/X2vtlOvi6hnG+FyA=",
+ "version": "151"
},
"Csu": {
"hash": "sha256-l8RI8aiin7ovZuoDh54thDmd/b502w+dtjN5ZoISZBg=",
"version": "88"
},
"ICU": {
- "hash": "sha256-7ImBX4SlrFaLnHdQ4bm4F8q9IpHhQMaeVOO6pnnhyzQ=",
- "version": "74222.203"
+ "hash": "sha256-dIgrTjHcQm8dy2Ku5wNIHuPjHfoV+48TM0PNDDn6ZPk=",
+ "version": "76104.4"
},
"IOKitTools": {
"hash": "sha256-Oknsvzn4nv77WU7f0WPS446iwR2BM2q4iw46r/qctAE=",
"version": "125"
},
"PowerManagement": {
- "hash": "sha256-APkvbp0FhNrypQcDUuREUYOnNLOZGOKhsj5JLcDgvAU=",
- "version": "1740.60.27"
+ "hash": "sha256-ssg655SPT7gWnJWDaxambMKCopr+vLPYERW0IMKT0T8=",
+ "version": "1754.140.4"
},
"adv_cmds": {
- "hash": "sha256-alJOcKeHmIh67ZmN7/YdIouCP/qzakkhimsuZaOkr+c=",
- "version": "231"
+ "hash": "sha256-O+SB8sj3yqPv7GEBQQgvq+Y7kQRZI/i/UVa17J/OhZM=",
+ "version": "235"
},
"basic_cmds": {
"hash": "sha256-RQve2GqS9ke9hd8kupRMgoOKalTS229asi5tBGrBmS8=",
@@ -29,47 +29,47 @@
},
"bootstrap_cmds": {
"hash": "sha256-6JG0sysgqLlgcpIOXfN+F0/gxpIIHZZ5et3gmDBoBGQ=",
- "version": "136"
+ "version": "138"
},
"copyfile": {
- "hash": "sha256-Vz1fo4p2b6S8xfyDPu1FNgMkH1aX0tkpXCZkdzkRdq0=",
- "version": "213.40.2"
+ "hash": "sha256-hIHlY0prIFY0j8z0Hvlv2psrwLj41jYfKBM0KutLxew=",
+ "version": "224"
},
"developer_cmds": {
"hash": "sha256-jgQUjN9zmqi0/7XpqzbRsJjZIYeMrxXT1Zf3qi7+o+8=",
"version": "83"
},
"diskdev_cmds": {
- "hash": "sha256-v3TFHLUlumt/sHxkOTyxDA4iG8ci5ZmMn7HCb4+9Uo0=",
- "version": "737.60.1"
+ "hash": "sha256-TD/sJkzIquTgq1zP/B7eBArxeTcp1Lqa8e8cJ1jnkHU=",
+ "version": "737.140.4"
},
"doc_cmds": {
- "hash": "sha256-/Mf+RhaTU9O5i95gddZ2h9eDjLezwj3nP6FvryMF54E=",
- "version": "66"
+ "hash": "sha256-nnwKXKKjgJXcLCArD38Dme2L1WyR1U0rwn7zI+NCftw=",
+ "version": "69"
},
"dyld": {
- "hash": "sha256-DDhV7X81nhd3oeJuICEvF8FU43yE/afQ/LYgDNtXswA=",
- "version": "1241.17"
+ "hash": "sha256-pbpSD5OeSMOcMJFAd7kyLINPROjqsafsCSphVGyIPyg=",
+ "version": "1286.10"
},
"file_cmds": {
- "hash": "sha256-/79jS//IBZiQBumGA60lKDmddQCzl/r8QnviD6lGXNg=",
- "version": "448.0.3"
+ "hash": "sha256-Rf/XA6uEaj7Wps2s8Oc/OhQVBjz8XiqJlj+cxjiQfQU=",
+ "version": "457.140.3"
},
"libffi": {
- "hash": "sha256-YjRMS3H3hIEfQm5MVSxGNTBtFc/9al7iQGDeZy6m/0U=",
- "version": "39"
+ "hash": "sha256-xHefZVsZg9kUXV0t/HLdjPkkD/hn/4bvdRVJ4PsQLeM=",
+ "version": "40"
},
"libiconv": {
- "hash": "sha256-eaUp0z7HqX0AW2C90gDVFeiJnmGRxPDuzyb1Jlm1pNc=",
- "version": "109"
+ "hash": "sha256-50DC6LePtvdAh9FLa/esiwCUmYDxKofN6hCiv9+dmgQ=",
+ "version": "109.100.2"
},
"libpcap": {
- "hash": "sha256-RViIXv5zP2Bcive5qrcfb9vNWwhSe6fGCaToSgDYNxU=",
- "version": "137"
+ "hash": "sha256-DqINoombdui5N6lNHcZ07c7LrVum4f8fFK89ymdCd0c=",
+ "version": "140"
},
"libresolv": {
- "hash": "sha256-ndGcicbHizPazTCB0P3aioDOv7IJPmTOgLnioFHH2+o=",
- "version": "83"
+ "hash": "sha256-GtPVlL1mD58um5hOFd3HQKQ7pqutBe9jZKgQw8pOkPE=",
+ "version": "91"
},
"libutil": {
"hash": "sha256-tUsl22Z0HUVSkSoohFXkhicNFCW+RARvpTS0q6yaQFk=",
@@ -80,36 +80,36 @@
"version": "38.0.1"
},
"misc_cmds": {
- "hash": "sha256-qPqcV9d4mKeu9ZD3rt3p5m1p/NyLy6np19ULC6FmnMI=",
- "version": "44"
+ "hash": "sha256-04uBS16nNrg73Fqh4Obev7nQDjTTlY4f5+pEv3i0FIU=",
+ "version": "45"
},
"network_cmds": {
- "hash": "sha256-aGBsxdYW21QjTILxcR8tHufQKvkvmai9MKOCxBNZvmI=",
- "version": "698.60.4"
+ "hash": "sha256-sfZX6aA8mspfRKARIYFXX+bmlLHDoi485HQOvbRNP1Y=",
+ "version": "705.100.5"
},
"patch_cmds": {
- "hash": "sha256-foIoIMe+zgPISFmE10q4cwEUBhiah4nbD7UtjBumZYU=",
- "version": "66"
+ "hash": "sha256-fDY2NOT3DnU5pm06cHSs+JJcA/EFP8Lxjg7sErUerJ0=",
+ "version": "72"
},
"remote_cmds": {
- "hash": "sha256-a5ELSGJSTlyCb3bPdJqYSX320UzIkS2FiHxSpELIgls=",
- "version": "303.0.2"
+ "hash": "sha256-8c/NgQZ+K6jJ3aoYK78/BsEkM1gmRS+9z0437+SvcCw=",
+ "version": "306"
},
"removefile": {
- "hash": "sha256-h1jb4DcgDHwi9eiUguc2e5OLP8ZHxCN3B4Myp/DFDBg=",
- "version": "75"
+ "hash": "sha256-Z5UD0mk/s80CQB0PZWDzSl2JWXmnVmwUvlNb28+hR3k=",
+ "version": "81"
},
"shell_cmds": {
- "hash": "sha256-bcu9NNS7NW5oc5yrOk+GxZcQo0AP0+mOnph9HhLdRts=",
- "version": "319.0.1"
+ "hash": "sha256-hoMssbZCrmzyJTgEAzOS4L7DhY9z/yXIcvHRhL6W5qc=",
+ "version": "326"
},
"system_cmds": {
- "hash": "sha256-9nNJeVJo4XwGSHh+SJydhVt+I8+Rb5hCsPiFYKQ8/28=",
- "version": "1012.60.2"
+ "hash": "sha256-mEo+v0m+aP42XHHwibGKPkT55JFYLTOD5YT5IYQ8Hr0=",
+ "version": "1026.140.2"
},
"text_cmds": {
- "hash": "sha256-76dagwRcAf5fpoyH5FDR5kdCldv6Mgre6aFBzxaCRkg=",
- "version": "190.0.1"
+ "hash": "sha256-5BBH/v1mJpExz65VDX6oh3dFCz49E+JMqJxkO96Y/xo=",
+ "version": "195"
},
"top": {
"hash": "sha256-e+k/jE49BMZZ24ge9JCa2ct5f1og6ewWb6U5ZMWdIEc=",
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index ed1f723d5ee2c..06e713a9dacd9 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -69,7 +69,6 @@ stdenv.mkDerivation rec {
hardeningDisable = [
"format"
- "pie"
]
++ lib.optionals enableStatic [ "fortify" ];
diff --git a/pkgs/os-specific/linux/kernel/build.nix b/pkgs/os-specific/linux/kernel/build.nix
index 4ec0c63cb7616..b52959f681a25 100644
--- a/pkgs/os-specific/linux/kernel/build.nix
+++ b/pkgs/os-specific/linux/kernel/build.nix
@@ -199,7 +199,6 @@ lib.makeOverridable (
"fortify"
"stackprotector"
"pic"
- "pie"
];
${if isModular then "outputs" else null} = [
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
new file mode 100644
index 0000000000000..a41ae39b7eac5
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -0,0 +1,604 @@
+{
+ lib,
+ stdenv,
+ buildPackages,
+ bc,
+ bison,
+ flex,
+ perl,
+ rsync,
+ gmp,
+ libmpc,
+ mpfr,
+ openssl,
+ cpio,
+ elfutils,
+ hexdump,
+ zstd,
+ python3Minimal,
+ zlib,
+ pahole,
+ kmod,
+ ubootTools,
+ fetchpatch,
+ rustc-unwrapped,
+ rust-bindgen-unwrapped,
+ rustPlatform,
+}:
+
+let
+ lib_ = lib;
+ stdenv_ = stdenv;
+
+ readConfig =
+ configfile:
+ let
+ matchLine =
+ line:
+ let
+ match = lib.match "(CONFIG_[^=]+)=([ym])" line;
+ in
+ lib.optional (match != null) {
+ name = lib.elemAt match 0;
+ value = lib.elemAt match 1;
+ };
+ in
+ lib.listToAttrs (lib.concatMap matchLine (lib.splitString "\n" (builtins.readFile configfile)));
+in
+lib.makeOverridable (
+ {
+ # The kernel version
+ version,
+ # The kernel pname (should be set for variants)
+ pname ? "linux",
+ # Position of the Linux build expression
+ pos ? null,
+ # Additional kernel make flags
+ extraMakeFlags ? [ ],
+ # The name of the kernel module directory
+ # Needs to be X.Y.Z[-extra], so pad with zeros if needed.
+ modDirVersion ? null, # derive from version
+ # The kernel source (tarball, git checkout, etc.)
+ src,
+ # a list of { name=..., patch=..., extraConfig=...} patches
+ kernelPatches ? [ ],
+ # The kernel .config file
+ configfile,
+ # Manually specified nixexpr representing the config
+ # If unspecified, this will be autodetected from the .config
+ config ? lib.optionalAttrs (builtins.isPath configfile || allowImportFromDerivation) (
+ readConfig configfile
+ ),
+ # Custom seed used for CONFIG_GCC_PLUGIN_RANDSTRUCT if enabled. This is
+ # automatically extended with extra per-version and per-config values.
+ randstructSeed ? "",
+ # Extra meta attributes
+ extraMeta ? { },
+
+ # for module compatibility
+ isZen ? false,
+ isLibre ? false,
+ isHardened ? false,
+
+ # Whether to utilize the controversial import-from-derivation feature to parse the config
+ allowImportFromDerivation ? false,
+ # ignored
+ features ? null,
+ lib ? lib_,
+ stdenv ? stdenv_,
+ }:
+
+ let
+ # Provide defaults. Note that we support `null` so that callers don't need to use optionalAttrs,
+ # which can lead to unnecessary strictness and infinite recursions.
+ modDirVersion_ = if modDirVersion == null then lib.versions.pad 3 version else modDirVersion;
+ in
+ let
+ # Shadow the un-defaulted parameter; don't want null.
+ modDirVersion = modDirVersion_;
+ inherit (lib)
+ hasAttr
+ getAttr
+ optional
+ optionals
+ optionalString
+ optionalAttrs
+ maintainers
+ teams
+ platforms
+ ;
+
+ drvAttrs =
+ config_: kernelConf: kernelPatches: configfile:
+ let
+ # Folding in `ubootTools` in the default nativeBuildInputs is problematic, as
+ # it makes updating U-Boot cumbersome, since it will go above the current
+ # threshold of rebuilds
+ #
+ # To prevent these needless rounds of staging for U-Boot builds, we can
+ # limit the inclusion of ubootTools to target platforms where uImage *may*
+ # be produced.
+ #
+ # This command lists those (kernel-named) platforms:
+ # .../linux $ grep -l uImage ./arch/*/Makefile | cut -d'/' -f3 | sort
+ #
+ # This is still a guesstimation, but since none of our cached platforms
+ # coincide in that list, this gives us "perfect" decoupling here.
+ linuxPlatformsUsingUImage = [
+ "arc"
+ "arm"
+ "csky"
+ "mips"
+ "powerpc"
+ "sh"
+ "sparc"
+ "xtensa"
+ ];
+ needsUbootTools = lib.elem stdenv.hostPlatform.linuxArch linuxPlatformsUsingUImage;
+
+ config =
+ let
+ attrName = attr: "CONFIG_" + attr;
+ in
+ {
+ isSet = attr: hasAttr (attrName attr) config;
+
+ getValue = attr: if config.isSet attr then getAttr (attrName attr) config else null;
+
+ isYes = attr: (config.getValue attr) == "y";
+
+ isNo = attr: (config.getValue attr) == "n";
+
+ isModule = attr: (config.getValue attr) == "m";
+
+ isEnabled = attr: (config.isModule attr) || (config.isYes attr);
+
+ isDisabled = attr: (!(config.isSet attr)) || (config.isNo attr);
+ }
+ // config_;
+
+ isModular = config.isYes "MODULES";
+ withRust = config.isYes "RUST";
+
+ target = kernelConf.target or "vmlinux";
+
+ buildDTBs = kernelConf.DTB or false;
+
+ # Dependencies that are required to build kernel modules
+ moduleBuildDependencies = [
+ pahole
+ perl
+ elfutils
+ # module makefiles often run uname commands to find out the kernel version
+ (buildPackages.deterministic-uname.override { inherit modDirVersion; })
+ ]
+ ++ optional (lib.versionAtLeast version "5.13") zstd
+ ++ optionals withRust [
+ rustc-unwrapped
+ rust-bindgen-unwrapped
+ ];
+
+ in
+ (optionalAttrs isModular {
+ outputs = [
+ "out"
+ "dev"
+ "modules"
+ ];
+ })
+ // {
+ __structuredAttrs = true;
+
+ passthru = rec {
+ inherit
+ version
+ modDirVersion
+ config
+ kernelPatches
+ configfile
+ moduleBuildDependencies
+ stdenv
+ ;
+ inherit
+ isZen
+ isHardened
+ isLibre
+ withRust
+ ;
+ isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true;
+ baseVersion = lib.head (lib.splitString "-rc" version);
+ kernelOlder = lib.versionOlder baseVersion;
+ kernelAtLeast = lib.versionAtLeast baseVersion;
+ };
+
+ inherit src;
+
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
+ nativeBuildInputs = [
+ bison
+ flex
+ perl
+ bc
+ openssl
+ rsync
+ gmp
+ libmpc
+ mpfr
+ elfutils
+ zstd
+ python3Minimal
+ kmod
+ hexdump
+ ]
+ ++ optional needsUbootTools ubootTools
+ ++ optionals (lib.versionAtLeast version "5.2") [
+ cpio
+ pahole
+ zlib
+ ]
+ ++ optionals withRust [
+ rustc-unwrapped
+ rust-bindgen-unwrapped
+ ];
+
+ env = {
+ RUST_LIB_SRC = lib.optionalString withRust rustPlatform.rustLibSrc;
+
+ # avoid leaking Rust source file names into the final binary, which adds
+ # a false dependency on rust-lib-src on targets with uncompressed kernels
+ KRUSTFLAGS = lib.optionalString withRust "--remap-path-prefix ${rustPlatform.rustLibSrc}=/";
+ };
+
+ patches =
+ # kernelPatches can contain config changes and no actual patch
+ lib.filter (p: p != null) (map (p: p.patch) kernelPatches)
+ # Required for deterministic builds along with some postPatch magic.
+ ++ optional (lib.versionOlder version "5.19") ./randstruct-provide-seed.patch
+ ++ optional (lib.versionAtLeast version "5.19") ./randstruct-provide-seed-5.19.patch
+ # Linux 5.12 marked certain PowerPC-only symbols as GPL, which breaks
+ # OpenZFS; this was fixed in Linux 5.19 so we backport the fix
+ # https://github.com/openzfs/zfs/pull/13367
+ ++
+ optional
+ (
+ lib.versionAtLeast version "5.12" && lib.versionOlder version "5.19" && stdenv.hostPlatform.isPower
+ )
+ (fetchpatch {
+ url = "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/patch/?id=d9e5c3e9e75162f845880535957b7fd0b4637d23";
+ hash = "sha256-bBOyJcP6jUvozFJU0SPTOf3cmnTQ6ZZ4PlHjiniHXLU=";
+ });
+
+ postPatch = ''
+ # Ensure that depmod gets resolved through PATH
+ sed -i Makefile -e 's|= /sbin/depmod|= depmod|'
+
+ # Some linux-hardened patches now remove certain files in the scripts directory, so the file may not exist.
+ [[ -f scripts/ld-version.sh ]] && patchShebangs scripts/ld-version.sh
+
+ # Set randstruct seed to a deterministic but diversified value. Note:
+ # we could have instead patched gen-random-seed.sh to take input from
+ # the buildFlags, but that would require also patching the kernel's
+ # toplevel Makefile to add a variable export. This would be likely to
+ # cause future patch conflicts.
+ for file in scripts/gen-randstruct-seed.sh scripts/gcc-plugins/gen-random-seed.sh; do
+ if [ -f "$file" ]; then
+ substituteInPlace "$file" \
+ --replace NIXOS_RANDSTRUCT_SEED \
+ $(echo ${randstructSeed}${src} ${placeholder "configfile"} | sha256sum | cut -d ' ' -f 1 | tr -d '\n')
+ break
+ fi
+ done
+
+ patchShebangs scripts
+
+ # also patch arch-specific install scripts
+ for i in $(find arch -name install.sh); do
+ patchShebangs "$i"
+ done
+
+ # unset $src because the build system tries to use it and spams a bunch of warnings
+ # see: https://github.com/torvalds/linux/commit/b1992c3772e69a6fd0e3fc81cd4d2820c8b6eca0
+ unset src
+ '';
+
+ configurePhase = ''
+ runHook preConfigure
+
+ mkdir build
+ export buildRoot="$(pwd)/build"
+
+ echo "manual-config configurePhase buildRoot=$buildRoot pwd=$PWD"
+
+ if [ -f "$buildRoot/.config" ]; then
+ echo "Could not link $buildRoot/.config : file exists"
+ exit 1
+ fi
+ ln -sv ${configfile} $buildRoot/.config
+
+ # reads the existing .config file and prompts the user for options in
+ # the current kernel source that are not found in the file.
+ make "''${makeFlags[@]}" oldconfig
+ runHook postConfigure
+
+ make "''${makeFlags[@]}" prepare
+ actualModDirVersion="$(cat $buildRoot/include/config/kernel.release)"
+ if [ "$actualModDirVersion" != "${modDirVersion}" ]; then
+ echo "Error: modDirVersion ${modDirVersion} specified in the Nix expression is wrong, it should be: $actualModDirVersion"
+ exit 1
+ fi
+
+ buildFlags+=("KBUILD_BUILD_TIMESTAMP=$(date -u -d @$SOURCE_DATE_EPOCH)")
+
+ cd $buildRoot
+ '';
+
+ buildFlags = [
+ "KBUILD_BUILD_VERSION=1-NixOS"
+ target
+ "vmlinux" # for "perf" and things like that
+ "scripts_gdb"
+ ]
+ ++ optional isModular "modules"
+ ++ optionals buildDTBs [
+ "dtbs"
+ "DTC_FLAGS=-@"
+ ]
+ ++ extraMakeFlags;
+
+ installFlags = [
+ "INSTALL_PATH=${placeholder "out"}"
+ ]
+ ++ (optional isModular "INSTALL_MOD_PATH=${placeholder "modules"}")
+ ++ optionals buildDTBs [
+ "dtbs_install"
+ "INSTALL_DTBS_PATH=${placeholder "out"}/dtbs"
+ ];
+
+ preInstall =
+ let
+ # All we really need to do here is copy the final image and System.map to $out,
+ # and use the kernel's modules_install, firmware_install, dtbs_install, etc. targets
+ # for the rest. Easy, right?
+ #
+ # Unfortunately for us, the obvious way of getting the built image path,
+ # make -s image_name, does not work correctly, because some architectures
+ # (*cough* aarch64 *cough*) change KBUILD_IMAGE on the fly in their install targets,
+ # so we end up attempting to install the thing we didn't actually build.
+ #
+ # Thankfully, there's a way out that doesn't involve just hardcoding everything.
+ #
+ # The kernel has an install target, which runs a pretty simple shell script
+ # (located at scripts/install.sh or arch/$arch/boot/install.sh, depending on
+ # which kernel version you're looking at) that tries to do something sensible.
+ #
+ # (it would be great to hijack this script immediately, as it has all the
+ # information we need passed to it and we don't need it to try and be smart,
+ # but unfortunately, the exact location of the scripts differs between kernel
+ # versions, and they're seemingly not considered to be public API at all)
+ #
+ # One of the ways it tries to discover what "something sensible" actually is
+ # is by delegating to what's supposed to be a user-provided install script
+ # located at ~/bin/installkernel.
+ #
+ # (the other options are:
+ # - a distribution-specific script at /sbin/installkernel,
+ # which we can't really create in the sandbox easily
+ # - an architecture-specific script at arch/$arch/boot/install.sh,
+ # which attempts to guess _something_ and usually guesses very wrong)
+ #
+ # More specifically, the install script exec's into ~/bin/installkernel, if one
+ # exists, with the following arguments:
+ #
+ # $1: $KERNELRELEASE - full kernel version string
+ # $2: $KBUILD_IMAGE - the final image path
+ # $3: System.map - path to System.map file, seemingly hardcoded everywhere
+ # $4: $INSTALL_PATH - path to the destination directory as specified in installFlags
+ #
+ # $2 is exactly what we want, so hijack the script and use the knowledge given to it
+ # by the makefile overlords for our own nefarious ends.
+ #
+ # Note that the makefiles specifically look in ~/bin/installkernel, and
+ # writeShellScriptBin writes the script to /bin/installkernel,
+ # so HOME needs to be set to just the store path.
+ #
+ # FIXME: figure out a less roundabout way of doing this.
+ installkernel = buildPackages.writeShellScriptBin "installkernel" ''
+ cp -av $2 $4
+ cp -av $3 $4
+ '';
+ in
+ ''
+ installFlags+=("-j$NIX_BUILD_CORES")
+ export HOME=${installkernel}
+ '';
+
+ # Some image types need special install targets (e.g. uImage is installed with make uinstall on arm)
+ installTargets = [
+ (kernelConf.installTarget or (
+ if target == "uImage" && stdenv.hostPlatform.linuxArch == "arm" then
+ "uinstall"
+ else if
+ (target == "zImage" || target == "Image.gz" || target == "vmlinuz.efi")
+ && builtins.elem stdenv.hostPlatform.linuxArch [
+ "arm"
+ "arm64"
+ "parisc"
+ "riscv"
+ ]
+ then
+ "zinstall"
+ else
+ "install"
+ )
+ )
+ ];
+
+ # We remove a bunch of stuff that is symlinked from other places to save space,
+ # which trips the broken symlink check. So, just skip it. We'll know if it explodes.
+ dontCheckForBrokenSymlinks = true;
+
+ postInstall = optionalString isModular ''
+ mkdir -p $dev
+ cp vmlinux $dev/
+
+ mkdir -p $dev/lib/modules/${modDirVersion}/build/scripts
+ cp -rL ../scripts/gdb/ $dev/lib/modules/${modDirVersion}/build/scripts
+
+ if [ -z "''${dontStrip-}" ]; then
+ installFlags+=("INSTALL_MOD_STRIP=1")
+ fi
+ make modules_install "''${makeFlags[@]}" "''${installFlags[@]}"
+ unlink $modules/lib/modules/${modDirVersion}/build
+
+ mkdir -p $dev/lib/modules/${modDirVersion}/{build,source}
+
+ # To save space, exclude a bunch of unneeded stuff when copying.
+ (cd .. && rsync --archive --prune-empty-dirs \
+ --exclude='/build/' \
+ * $dev/lib/modules/${modDirVersion}/source/)
+
+ cd $dev/lib/modules/${modDirVersion}/source
+
+ cp $buildRoot/{.config,Module.symvers} $dev/lib/modules/${modDirVersion}/build
+ make modules_prepare "''${makeFlags[@]}" O=$dev/lib/modules/${modDirVersion}/build
+
+ # For reproducibility, removes accidental leftovers from a `cc1` call
+ # from a `try-run` call from the Makefile
+ rm -f $dev/lib/modules/${modDirVersion}/build/.[0-9]*.d
+
+ # Keep some extra files on some arches (powerpc, aarch64)
+ for f in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o; do
+ if [ -f "$buildRoot/$f" ]; then
+ mkdir -p "$(dirname $dev/lib/modules/${modDirVersion}/build/$f)"
+ cp $buildRoot/$f $dev/lib/modules/${modDirVersion}/build/$f
+ fi
+ done
+
+ # !!! No documentation on how much of the source tree must be kept
+ # If/when kernel builds fail due to missing files, you can add
+ # them here. Note that we may see packages requiring headers
+ # from drivers/ in the future; it adds 50M to keep all of its
+ # headers on 3.10 though.
+
+ chmod u+w -R ..
+ buildArchDir="$dev/lib/modules/${modDirVersion}/build/arch"
+
+ # Remove unused arches
+ for d in $(cd arch/; ls); do
+ if [ -d "$buildArchDir/$d" ]; then continue; fi
+ if [ -d "$buildArchDir/arm64" ] && [ "$d" = arm ]; then continue; fi
+ rm -rf arch/$d
+ done
+
+ # Remove all driver-specific code (50M of which is headers)
+ rm -fR drivers
+
+ # Keep all headers
+ find . -type f -name '*.h' -print0 | xargs -0 -r chmod u-w
+
+ # Keep linker scripts (they are required for out-of-tree modules on aarch64)
+ find . -type f -name '*.lds' -print0 | xargs -0 -r chmod u-w
+
+ # Keep root and arch-specific Makefiles
+ chmod u-w Makefile arch/*/Makefile*
+
+ # Keep whole scripts dir
+ chmod u-w -R scripts
+
+ # Delete everything not kept
+ find . -type f -perm -u=w -print0 | xargs -0 -r rm
+
+ # Delete empty directories
+ find -empty -type d -delete
+ '';
+
+ requiredSystemFeatures = [ "big-parallel" ];
+
+ meta = {
+ # https://github.com/NixOS/nixpkgs/pull/345534#issuecomment-2391238381
+ broken = withRust && lib.versionOlder version "6.12";
+
+ description =
+ "The Linux kernel"
+ + (
+ if kernelPatches == [ ] then
+ ""
+ else
+ " (with patches: " + lib.concatStringsSep ", " (map (x: x.name) kernelPatches) + ")"
+ );
+ license = lib.licenses.gpl2Only;
+ homepage = "https://www.kernel.org/";
+ maintainers = [ maintainers.thoughtpolice ];
+ teams = [ teams.linux-kernel ];
+ platforms = platforms.linux;
+ badPlatforms =
+ lib.optionals (lib.versionOlder version "4.15") [
+ "riscv32-linux"
+ "riscv64-linux"
+ ]
+ ++ lib.optional (lib.versionOlder version "5.19") "loongarch64-linux";
+ timeout = 14400; # 4 hours
+ identifiers.cpeParts = {
+ part = "o";
+ vendor = "linux";
+ product = "linux_kernel";
+ inherit version;
+ update = "*";
+ };
+ }
+ // extraMeta;
+ };
+
+ commonMakeFlags = import ./common-flags.nix {
+ inherit
+ lib
+ stdenv
+ buildPackages
+ extraMakeFlags
+ ;
+ };
+ in
+
+ stdenv.mkDerivation (
+ builtins.foldl' lib.recursiveUpdate { } [
+ (drvAttrs config stdenv.hostPlatform.linux-kernel kernelPatches configfile)
+ {
+ inherit pname version;
+
+ enableParallelBuilding = true;
+
+ hardeningDisable = [
+ "bindnow"
+ "format"
+ "fortify"
+ "stackprotector"
+ "pic"
+ ];
+
+ makeFlags = [
+ "O=$(buildRoot)"
+
+ # We have a `modules` variable in the environment for our
+ # split output, but the kernel Makefiles also define their
+ # own `modules` variable. Their definition wins, but Make
+ # remembers that the variable was originally from the
+ # environment and exports it to all the build recipes. This
+ # breaks the build with an “Argument list too long” error due
+ # to passing the huge list of every module object file in the
+ # environment of every process invoked by every build recipe.
+ #
+ # We use `--eval` here to undefine the inherited environment
+ # variable before any Makefiles are read, ensuring that the
+ # kernel’s definition creates a new, unexported variable.
+ "--eval=undefine modules"
+ ]
+ ++ commonMakeFlags;
+
+ passthru = { inherit commonMakeFlags; };
+
+ karch = stdenv.hostPlatform.linuxArch;
+ }
+ (optionalAttrs (pos != null) { inherit pos; })
+ ]
+ )
+)
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 964ebdf07d2b6..0aa8ce5a68c73 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -163,6 +163,7 @@
# on their live NixOS system, we disable it by default.
withKernelInstall ? false,
withLibarchive ? true,
+ withVConsole ? true,
# tests assume too much system access for them to be feasible for us right now
withTests ? false,
# build only libudev and libsystemd
@@ -202,15 +203,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
inherit pname;
- version = "258";
+ version = "258.1";
- # 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.
src = fetchFromGitHub {
owner = "systemd";
repo = "systemd";
rev = "v${finalAttrs.version}";
- hash = "sha256-xtGZaVNsBNxkidgfVBu8xtvj0SxpY6OyJCUE+gq59qE=";
+ hash = "sha256-LA+6/d9W3CxK0G2sXsPHM4BVLf8IzsWW6IxJFby6/JU=";
};
# On major changes, or when otherwise required, you *must* :
@@ -224,14 +223,12 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
# https://github.com/systemd/systemd/pull/39094
(fetchpatch {
- url = "https://github.com/systemd/systemd/commit/0f44a6c64aebc64a0611a605831206afee9cb730.patch";
- hash = "sha256-DO6q17mE2U8iLezMYt4PX5Ror20N1gCrUbXeQmrW1is=";
+ url = "https://github.com/systemd/systemd/commit/8b4ee3d68d2e70d9a396b74d155eab3b11763311.patch";
+ hash = "sha256-JJDaSHQjd1QZ18CQHq40viB0AF/0MiescmZUcc/6LDg=";
})
-
- # https://github.com/systemd/systemd/pull/39069
(fetchpatch {
- url = "https://github.com/systemd/systemd/commit/b5fdfedf729712b9824a5cb457a07d5699d2946c.patch";
- hash = "sha256-0SvAn9Dl4z80PRIvDbIVIjKp5DsT/IUoHa5IiH1HHFY=";
+ url = "https://github.com/systemd/systemd/commit/13b0e7fc6d2623800ba04b104f3b628388c9f5e6.patch";
+ hash = "sha256-X+tY3NjfRJpF6wvd++xEps0DIFTbX/6Zw9oO4Y9FmNI=";
})
./0001-Start-device-units-for-uninitialised-encrypted-devic.patch
@@ -328,17 +325,13 @@ stdenv.mkDerivation (finalAttrs: {
separateDebugInfo = true;
__structuredAttrs = true;
- hardeningDisable = [
- # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111523
- "trivialautovarinit"
- ]
- ++ (lib.optionals withLibBPF [
+ hardeningDisable = lib.optionals withLibBPF [
# breaks clang -target bpf; should be fixed to not use
# a wrapped clang?
"zerocallusedregs"
"shadowstack"
"pacret"
- ]);
+ ];
nativeBuildInputs = [
pkg-config
@@ -447,7 +440,6 @@ stdenv.mkDerivation (finalAttrs: {
(lib.mesonOption "tty-gid" "3") # tty in NixOS has gid 3
(lib.mesonOption "pamconfdir" "${placeholder "out"}/etc/pam.d")
(lib.mesonOption "shellprofiledir" "${placeholder "out"}/etc/profile.d")
- (lib.mesonOption "kmod-path" "${kmod}/bin/kmod")
# /bin/sh is also the upstream default. Explicitly set this so that we're
# independent of upstream changes to the default.
@@ -468,10 +460,6 @@ stdenv.mkDerivation (finalAttrs: {
(lib.mesonOption "pkgconfiglibdir" "${placeholder "dev"}/lib/pkgconfig")
(lib.mesonOption "pkgconfigdatadir" "${placeholder "dev"}/share/pkgconfig")
- # Keyboard
- (lib.mesonOption "loadkeys-path" "${kbd}/bin/loadkeys")
- (lib.mesonOption "setfont-path" "${kbd}/bin/setfont")
-
# SBAT
(lib.mesonOption "sbat-distro" "nixos")
(lib.mesonOption "sbat-distro-summary" "NixOS")
@@ -488,8 +476,8 @@ stdenv.mkDerivation (finalAttrs: {
(lib.mesonOption "sysvrcnd-path" "")
# Login
- (lib.mesonOption "sulogin-path" "${util-linux.login}/bin/sulogin")
- (lib.mesonOption "nologin-path" "${util-linux.login}/bin/nologin")
+ (lib.mesonOption "sulogin-path" "${lib.getOutput "login" util-linux}/bin/sulogin")
+ (lib.mesonOption "nologin-path" "${lib.getOutput "login" util-linux}/bin/nologin")
# Mount
(lib.mesonOption "mount-path" "${lib.getOutput "mount" util-linux}/bin/mount")
@@ -573,6 +561,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.mesonEnable "man" true)
(lib.mesonEnable "nspawn" withNspawn)
+ (lib.mesonBool "vconsole" withVConsole)
(lib.mesonBool "analyze" withAnalyze)
(lib.mesonBool "logind" withLogind)
(lib.mesonBool "localed" withLocaled)
@@ -599,7 +588,13 @@ stdenv.mkDerivation (finalAttrs: {
(lib.mesonBool "create-log-dirs" false)
(lib.mesonBool "smack" true)
(lib.mesonBool "b_pie" true)
-
+ ]
+ ++ lib.optionals withVConsole [
+ (lib.mesonOption "loadkeys-path" "${kbd}/bin/loadkeys")
+ (lib.mesonOption "setfont-path" "${kbd}/bin/setfont")
+ ]
+ ++ lib.optionals withKmod [
+ (lib.mesonOption "kmod-path" "${kmod}/bin/kmod")
]
++ lib.optionals (withShellCompletions == false) [
(lib.mesonOption "bashcompletiondir" "no")
@@ -857,11 +852,7 @@ stdenv.mkDerivation (finalAttrs: {
# Avoid *.EFI binary stripping.
# At least on aarch64-linux strip removes too much from PE32+ files:
# https://github.com/NixOS/nixpkgs/issues/169693
- # The hack is to move EFI file out of lib/ before doStrip run and return it
- # after doStrip run.
- preFixup = lib.optionalString withBootloader ''
- mv $out/lib/systemd/boot/efi $out/dont-strip-me
- '';
+ stripExclude = [ "lib/systemd/boot/efi/*" ];
# Wrap in the correct path for LUKS2 tokens.
postFixup =
@@ -871,9 +862,6 @@ stdenv.mkDerivation (finalAttrs: {
wrapProgram $out/$f --prefix LD_LIBRARY_PATH : ${placeholder "out"}/lib/cryptsetup
done
''
- + lib.optionalString withBootloader ''
- mv $out/dont-strip-me $out/lib/systemd/boot/efi
- ''
+ lib.optionalString withUkify ''
# To cross compile a derivation that builds a UKI with ukify, we need to wrap
# ukify with the correct binutils. When wrapping, no splicing happens so we
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index c38d38cd4b747..9c1d9c3c137aa 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -7,6 +7,7 @@
python313,
replaceVars,
ffmpeg-headless,
+ ffmpeg_7-headless,
inetutils,
nixosTests,
home-assistant,
@@ -85,7 +86,7 @@ let
];
});
- av = super.av.overridePythonAttrs rec {
+ av = (super.av.override { ffmpeg-headless = ffmpeg_7-headless; }).overridePythonAttrs rec {
version = "13.1.0";
src = fetchFromGitHub {
owner = "PyAV-Org";
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index 9e3eaa8548cd3..e3964c40f03d5 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -254,8 +254,6 @@ stdenv.mkDerivation {
--replace-fail '@nixStoreDirLen@' "''${#NIX_STORE}"
'' postPatch;
- hardeningEnable = lib.optional (!stdenv.hostPlatform.isDarwin) "pie";
-
enableParallelBuilding = true;
preInstall = ''
diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix
index 5a856b21c5415..f949284f808dd 100644
--- a/pkgs/servers/http/tengine/default.nix
+++ b/pkgs/servers/http/tengine/default.nix
@@ -137,8 +137,6 @@ stdenv.mkDerivation rec {
preConfigure = (lib.concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules);
- hardeningEnable = optional (!stdenv.hostPlatform.isDarwin) "pie";
-
enableParallelBuilding = true;
postInstall = ''
diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index 64ae1151400e0..48b422fd72c76 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-09-07T16-13-09Z";
+ version = "2025-10-15T17-29-55Z";
src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
- hash = "sha256-0IVxxeM+h3josP+wnS3q4Nrmd3fT9V+KlHxlwz3QyIQ=";
+ hash = "sha256-HbjmCJYkWyRRHKriLP6QohaXYLk3QEVfi32Krq3ujjo=";
};
- vendorHash = "sha256-JrDLUVGtwYqwwB+Suutewi6snHyIpG3DOnDn5O0C+L0=";
+ vendorHash = "sha256-BFnTJE9QFWmPsx90hDTG8MusdnwaBPYJxM5bCFk3hew=";
doCheck = false;
diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix
index 985dbda33bdfa..f532e9b09322a 100644
--- a/pkgs/servers/nosql/mongodb/mongodb.nix
+++ b/pkgs/servers/nosql/mongodb/mongodb.nix
@@ -169,8 +169,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- hardeningEnable = [ "pie" ];
-
meta = with lib; {
description = "Scalable, high-performance, open source NoSQL database";
homepage = "http://www.mongodb.org";
diff --git a/pkgs/servers/sql/postgresql/13.nix b/pkgs/servers/sql/postgresql/13.nix
index 53aa3ea5e44ee..7be01f723e007 100644
--- a/pkgs/servers/sql/postgresql/13.nix
+++ b/pkgs/servers/sql/postgresql/13.nix
@@ -1,7 +1,9 @@
import ./generic.nix {
- version = "13.22";
- rev = "refs/tags/REL_13_22";
- hash = "sha256-6zHA+WU1FroUbGJcTAeEbPKBVQY7SKpT5+Kxe9ZhtoM=";
+ version = "13.23";
+ # TODO: Move back to tag, when they appear upstream:
+ # rev = "refs/tags/REL_13_23";
+ rev = "89df812eb890814b105d871185935b580478e660";
+ hash = "sha256-GSIHFSt2wzaI3HkA3yX/gZZF+LKwODHYislagdhQjmE=";
muslPatches = {
disable-test-collate-icu-utf8 = {
url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b";
diff --git a/pkgs/servers/sql/postgresql/14.nix b/pkgs/servers/sql/postgresql/14.nix
index e0b6deadab984..09262f8be4534 100644
--- a/pkgs/servers/sql/postgresql/14.nix
+++ b/pkgs/servers/sql/postgresql/14.nix
@@ -1,7 +1,9 @@
import ./generic.nix {
- version = "14.19";
- rev = "refs/tags/REL_14_19";
- hash = "sha256-z8MEeLae4W4YqGBNcPtKnUENxnixugnv5Q6r+LW4uu8=";
+ version = "14.20";
+ # TODO: Move back to tag, when they appear upstream:
+ # rev = "refs/tags/REL_14_20";
+ rev = "9ad034be354da9af1cea76836a9e576c110d1ff3";
+ hash = "sha256-5wWuS78yn1p+ZjlUy5jCf1mLq78D3iI7mWPBVTd1Ufk=";
muslPatches = {
disable-test-collate-icu-utf8 = {
url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7";
diff --git a/pkgs/servers/sql/postgresql/15.nix b/pkgs/servers/sql/postgresql/15.nix
index 6cb49891ad0d7..11e4144564e84 100644
--- a/pkgs/servers/sql/postgresql/15.nix
+++ b/pkgs/servers/sql/postgresql/15.nix
@@ -1,7 +1,9 @@
import ./generic.nix {
- version = "15.14";
- rev = "refs/tags/REL_15_14";
- hash = "sha256-KzN0gsEY6wFLqNYMxbTj2NH+4IWO0pplWP4XO/fqRLM=";
+ version = "15.15";
+ # TODO: Move back to tag, when they appear upstream:
+ # rev = "refs/tags/REL_15_15";
+ rev = "32f38816779420502d4a311835d5fe939e9548a0";
+ hash = "sha256-veGKXAvK+dNofBuSXsmCsPdXDJOC04+QV3HEr0XaE68=";
muslPatches = {
dont-use-locale-a = {
url = "https://git.alpinelinux.org/aports/plain/main/postgresql15/dont-use-locale-a-on-musl.patch?id=f424e934e6d076c4ae065ce45e734aa283eecb9c";
diff --git a/pkgs/servers/sql/postgresql/16.nix b/pkgs/servers/sql/postgresql/16.nix
index c0b7498da49cb..478c1dc234bd0 100644
--- a/pkgs/servers/sql/postgresql/16.nix
+++ b/pkgs/servers/sql/postgresql/16.nix
@@ -1,7 +1,9 @@
import ./generic.nix {
- version = "16.10";
- rev = "refs/tags/REL_16_10";
- hash = "sha256-1zG8+G/lNA1xm0hxLVEilIaI+25d4gfpqA2aCb4+taY=";
+ version = "16.11";
+ # TODO: Move back to tag, when they appear upstream:
+ # rev = "refs/tags/REL_16_11";
+ rev = "d61dd817be70749d14e982a369e97fdda9d5cba6";
+ hash = "sha256-hxv+N+OWqiXmFmsB+SSYGKQLBbHtNMnneHFvOtUz8z4=";
muslPatches = {
dont-use-locale-a = {
url = "https://git.alpinelinux.org/aports/plain/main/postgresql16/dont-use-locale-a-on-musl.patch?id=08a24be262339fd093e641860680944c3590238e";
diff --git a/pkgs/servers/sql/postgresql/17.nix b/pkgs/servers/sql/postgresql/17.nix
index faacd3b72fc51..3f6e2b3f5b224 100644
--- a/pkgs/servers/sql/postgresql/17.nix
+++ b/pkgs/servers/sql/postgresql/17.nix
@@ -1,7 +1,9 @@
import ./generic.nix {
- version = "17.6";
- rev = "refs/tags/REL_17_6";
- hash = "sha256-/7C+bjmiJ0/CvoAc8vzTC50vP7OsrM6o0w+lmmHvKvU=";
+ version = "17.7";
+ # TODO: Move back to tag, when they appear upstream:
+ # rev = "refs/tags/REL_17_7";
+ rev = "fbb530a3dff569222bea7098ad4de3d8bde97740";
+ hash = "sha256-W+505LAeiO5ln7wBhxZLv/p3GxiJp8MFfCGVDyvHREg=";
muslPatches = {
dont-use-locale-a = {
url = "https://git.alpinelinux.org/aports/plain/main/postgresql17/dont-use-locale-a-on-musl.patch?id=d69ead2c87230118ae7f72cef7d761e761e1f37e";
diff --git a/pkgs/servers/sql/postgresql/18.nix b/pkgs/servers/sql/postgresql/18.nix
index 401471cde9a7b..ab7a401d8b988 100644
--- a/pkgs/servers/sql/postgresql/18.nix
+++ b/pkgs/servers/sql/postgresql/18.nix
@@ -1,7 +1,9 @@
import ./generic.nix {
- version = "18.0";
- rev = "refs/tags/REL_18_0";
- hash = "sha256-xA6gbJe4tIV9bYRFrdI4Rfy20ZwTkvyyjt7ZxvCFEec=";
+ version = "18.1";
+ # TODO: Move back to tag, when they appear upstream:
+ # rev = "refs/tags/REL_18_1";
+ rev = "4b324845ba5d24682b9b3708a769f00d160afbd7";
+ hash = "sha256-cZA2hWtr5RwsUrRWkvl/yvUzFPSfdtpyAKGXfrVUr0g=";
muslPatches = {
dont-use-locale-a = {
url = "https://git.alpinelinux.org/aports/plain/main/postgresql17/dont-use-locale-a-on-musl.patch?id=d69ead2c87230118ae7f72cef7d761e761e1f37e";
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 836b48664aa58..5cc4f21ea8dbe 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -163,11 +163,12 @@ let
dlSuffix = if olderThan "16" then ".so" else stdenv.hostPlatform.extensions.sharedLibrary;
- # Pin LLVM 20 until upstream has resolved:
+ # Pin LLVM 20 until upstream has fully resolved:
# https://www.postgresql.org/message-id/flat/d25e6e4a-d1b4-84d3-2f8a-6c45b975f53d%40applied-asynchrony.com
+ # Currently still a problem on aarch64.
# TODO: Remove with next minor releases
llvmPackages = lib.warnIf (
- version == "17.7"
+ version == "17.8"
) "PostgreSQL: Is the pin for LLVM 20 still needed?" llvmPackages_20;
stdenv' =
@@ -425,12 +426,6 @@ let
]
++ lib.optionals (stdenv'.hostPlatform.isDarwin && olderThan "16") [
./patches/export-dynamic-darwin-15-.patch
- ]
- ++ lib.optionals (atLeast "17") [
- (fetchpatch2 {
- url = "https://github.com/postgres/postgres/commit/a48d1ef58652229521ba4b5070e19f857608b22e.patch";
- hash = "sha256-3FKQS1Vpu+p6z6c1GWs6GlrLl2Bgm9paEU/z81LrEus=";
- })
];
installTargets = [ "install-world" ];
diff --git a/pkgs/servers/sql/postgresql/libpq.nix b/pkgs/servers/sql/postgresql/libpq.nix
index 3048e467397b5..32878f3660ab2 100644
--- a/pkgs/servers/sql/postgresql/libpq.nix
+++ b/pkgs/servers/sql/postgresql/libpq.nix
@@ -40,20 +40,20 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libpq";
- version = "18.0";
+ version = "18.1";
src = fetchFromGitHub {
owner = "postgres";
repo = "postgres";
# rev, not tag, on purpose: see generic.nix.
- rev = "refs/tags/REL_18_0";
- hash = "sha256-xA6gbJe4tIV9bYRFrdI4Rfy20ZwTkvyyjt7ZxvCFEec=";
+ # TODO: Move back to tag, when they appear upstream:
+ # rev = "refs/tags/REL_18_1";
+ rev = "4b324845ba5d24682b9b3708a769f00d160afbd7";
+ hash = "sha256-cZA2hWtr5RwsUrRWkvl/yvUzFPSfdtpyAKGXfrVUr0g=";
};
__structuredAttrs = true;
- hardeningEnable = lib.optionals (!stdenv.cc.isClang) [ "pie" ];
-
outputs = [
"out"
"dev"
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index dcd8341ee0fda..61db87acd5553 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -3352,11 +3352,11 @@ self: with self; {
}:
stdenv.mkDerivation (finalAttrs: {
pname = "xorg-server";
- version = "21.1.18";
+ version = "21.1.20";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/xserver/xorg-server-21.1.18.tar.xz";
- sha256 = "0lk3268gzpll547zvaa64rdhs4z89d7w567lbd55swl71n9x2y68";
+ url = "mirror://xorg/individual/xserver/xorg-server-21.1.20.tar.xz";
+ sha256 = "sha256-dpW8YYJLOoG2utL3iwVADKAVAD3kAtGzIhFxBbcC6Tc=";
};
hardeningDisable = [
"bindnow"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 5307be640d4b4..33aa31bf7c8dd 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -77,4 +77,4 @@ mirror://xorg/individual/font/font-jis-misc-1.0.4.tar.xz
mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz
mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz
mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-21.1.18.tar.xz
+mirror://xorg/individual/xserver/xorg-server-21.1.20.tar.xz
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index d00df6ff4139c..24c1287b8744b 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -151,10 +151,11 @@ let
"nostrictaliasing"
"pacret"
"pic"
- "pie"
"relro"
"stackprotector"
"glibcxxassertions"
+ "libcxxhardeningfast"
+ "libcxxhardeningextensive"
"stackclashprotection"
"strictoverflow"
"trivialautovarinit"
@@ -227,14 +228,7 @@ let
canExecuteHostOnBuild = buildPlatform.canExecute hostPlatform;
defaultHardeningFlags =
- (if stdenvHasCC then stdenv.cc else { }).defaultHardeningFlags or
- # fallback safe-ish set of flags
- (
- if isOpenBSD && isStatic then
- knownHardeningFlags # Need pie, in fact
- else
- remove "pie" knownHardeningFlags
- );
+ (if stdenvHasCC then stdenv.cc else { }).defaultHardeningFlags or knownHardeningFlags;
stdenvHostSuffix = optionalString (hostPlatform != buildPlatform) "-${hostPlatform.config}";
stdenvStaticMarker = optionalString isStatic "-static";
userHook = config.stdenv.userHook or null;
@@ -434,6 +428,8 @@ let
(concretizeFlagImplications "fortify" [ "fortify3" ])
# disabling strictflexarrays1 implies strictflexarrays3 should also be disabled
(concretizeFlagImplications "strictflexarrays1" [ "strictflexarrays3" ])
+ # disabling libcxxhardeningfast implies libcxxhardeningextensive should also be disabled
+ (concretizeFlagImplications "libcxxhardeningfast" [ "libcxxhardeningextensive" ])
]
);
enabledHardeningOptions =
@@ -442,7 +438,7 @@ let
else
subtractLists hardeningDisable' (defaultHardeningFlags ++ hardeningEnable);
# hardeningDisable additionally supports "all".
- erroneousHardeningFlags = subtractLists knownHardeningFlags (
+ erroneousHardeningFlags = subtractLists (knownHardeningFlags ++ [ "pie" ]) (
hardeningEnable ++ remove "all" hardeningDisable
);
@@ -640,7 +636,9 @@ let
else
null
} =
- builtins.concatStringsSep " " enabledHardeningOptions;
+ lib.warnIf ((builtins.elem "pie" hardeningEnable) || (builtins.elem "pie" hardeningDisable))
+ "The 'pie' hardening flag has been removed in favor of enabling PIE by default in compilers and should no longer be used. PIE can be disabled with the -no-pie compiler flag, but this is usually not necessary as most build systems pass this if needed. Usage of the 'pie' hardening flag will become an error in future."
+ (builtins.concatStringsSep " " enabledHardeningOptions);
# TODO: remove platform condition
# Enabling this check could be a breaking change as it requires to edit nix.conf
diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix
index 8d1bdbf3fed1b..9dc3413f0e045 100644
--- a/pkgs/test/cc-wrapper/default.nix
+++ b/pkgs/test/cc-wrapper/default.nix
@@ -116,6 +116,16 @@ stdenv.mkDerivation {
''
}
+ ${
+ # Check whether fuse-ld=gold works on our GNU toolchain
+ # Regression test for https://github.com/NixOS/nixpkgs/issues/49071
+ lib.optionalString stdenv.cc.isGNU ''
+ echo "checking whether compiler builds valid C binaries... " >&2
+ CFLAGS="-fuse-ld=gold" ${CC} -o cc-check ${./cc-main.c}
+ ${emulator} ./cc-check
+ ''
+ }
+
echo "checking whether compiler uses NIX_CFLAGS_COMPILE... " >&2
mkdir -p foo/include
cp ${./foo.c} foo/include/foo.h
diff --git a/pkgs/test/cc-wrapper/hardening.nix b/pkgs/test/cc-wrapper/hardening.nix
index f3e8d38d0ee8b..fae8d72c2989a 100644
--- a/pkgs/test/cc-wrapper/hardening.nix
+++ b/pkgs/test/cc-wrapper/hardening.nix
@@ -31,8 +31,8 @@ let
[ -n "$preBuild" ] && eval "$preBuild"
n=$out/bin/test-bin
mkdir -p "$(dirname "$n")"
- cp "$codePath" code.c
- NIX_DEBUG=1 $CC -x c code.c -O1 $TEST_EXTRA_FLAGS -o "$n"
+ cp "$codePath" .
+ NIX_DEBUG=1 $CC -x ''${TEST_SOURCE_LANG:-c} "$(basename $codePath)" -O1 $TEST_EXTRA_FLAGS -o "$n"
'';
f1exampleWithStdEnv = writeCBinWithStdenv ./fortify1-example.c;
@@ -41,15 +41,60 @@ let
flexArrF2ExampleWithStdEnv = writeCBinWithStdenv ./flex-arrays-fortify-example.c;
+ # we don't really have a reliable property for testing for
+ # libstdc++ we'll just have to check for the absence of libcxx
checkGlibcxxassertionsWithStdEnv =
- expectDefined:
- writeCBinWithStdenv (
- writeText "main.cpp" ''
- #if${if expectDefined then "n" else ""}def _GLIBCXX_ASSERTIONS
- #error "Expected _GLIBCXX_ASSERTIONS to be ${if expectDefined then "" else "un"}defined"
- #endif
- int main() {}
- ''
+ expectDefined: stdenv': derivationArgs:
+ brokenIf (stdenv.cc.libcxx != null) (
+ writeCBinWithStdenv
+ (writeText "main.cpp" ''
+ #if${if expectDefined then "n" else ""}def _GLIBCXX_ASSERTIONS
+ #error "Expected _GLIBCXX_ASSERTIONS to be ${if expectDefined then "" else "un"}defined"
+ #endif
+ int main() {}
+ '')
+ stdenv'
+ (
+ derivationArgs
+ // {
+ env = (derivationArgs.env or { }) // {
+ TEST_SOURCE_LANG = derivationArgs.env.TEST_SOURCE_LANG or "c++";
+ };
+ }
+ )
+ );
+
+ checkLibcxxHardeningWithStdEnv =
+ expectValue: stdenv': env:
+ brokenIf (stdenv.cc.libcxx == null) (
+ writeCBinWithStdenv
+ (writeText "main.cpp" (
+ ''
+ #include
+ #ifndef _LIBCPP_HARDENING_MODE
+ #error "Expected _LIBCPP_HARDENING_MODE to be defined"
+ #endif
+ #ifndef ${expectValue}
+ #error "Expected ${expectValue} to be defined"
+ #endif
+
+ #if _LIBCPP_HARDENING_MODE != ${expectValue}
+ #error "Expected _LIBCPP_HARDENING_MODE to equal ${expectValue}"
+ #endif
+ ''
+ + ''
+ int main() {}
+ ''
+ ))
+ stdenv'
+ (
+ env
+ // {
+ env = (env.env or { }) // {
+ TEST_SOURCE_LANG = env.env.TEST_SOURCE_LANG or "c++";
+ };
+ }
+ )
);
# for when we need a slightly more complicated program
@@ -455,25 +500,10 @@ nameDrvAfterAttrName (
)
);
- pieExplicitEnabled = brokenIf stdenv.hostPlatform.isStatic (
- checkTestBin
- (f2exampleWithStdEnv stdenv {
- hardeningEnable = [ "pie" ];
- })
- {
- ignorePie = false;
- }
- );
-
- pieExplicitEnabledStructuredAttrs = brokenIf stdenv.hostPlatform.isStatic (
- checkTestBin
- (f2exampleWithStdEnv stdenv {
- hardeningEnable = [ "pie" ];
- __structuredAttrs = true;
- })
- {
- ignorePie = false;
- }
+ pieAlwaysEnabled = brokenIf stdenv.hostPlatform.isStatic (
+ checkTestBin (f2exampleWithStdEnv stdenv { }) {
+ ignorePie = false;
+ }
);
relROExplicitEnabled =
@@ -662,22 +692,10 @@ nameDrvAfterAttrName (
)
);
- pieExplicitDisabled = brokenIf (stdenv.hostPlatform.isMusl && stdenv.cc.isClang) (
- checkTestBin
- (f2exampleWithStdEnv stdenv {
- hardeningDisable = [ "pie" ];
- })
- {
- ignorePie = false;
- expectFailure = true;
- }
- );
-
# can't force-disable ("partial"?) relro
relROExplicitDisabled = brokenIf true (
checkTestBin
(f2exampleWithStdEnv stdenv {
- hardeningDisable = [ "pie" ];
})
{
ignoreRelRO = false;
@@ -717,6 +735,48 @@ nameDrvAfterAttrName (
hardeningDisable = [ "glibcxxassertions" ];
};
+ lchFastExplicitDisabled = checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_NONE" stdenv {
+ hardeningDisable = [ "libcxxhardeningfast" ];
+ };
+
+ lchExtensiveExplicitEnabled =
+ checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_EXTENSIVE" stdenv
+ {
+ hardeningEnable = [ "libcxxhardeningextensive" ];
+ };
+
+ lchExtensiveExplicitDisabledDoesntDisableLchFast =
+ checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_FAST" stdenv
+ {
+ hardeningEnable = [ "libcxxhardeningfast" ];
+ hardeningDisable = [ "libcxxhardeningextensive" ];
+ };
+
+ lchFastExplicitDisabledDisablesLchExtensive =
+ checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_NONE" stdenv
+ {
+ hardeningEnable = [ "libcxxhardeningextensive" ];
+ hardeningDisable = [ "libcxxhardeningfast" ];
+ };
+
+ lchFastExtensiveExplicitEnabledResultsInLchExtensive =
+ checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_EXTENSIVE" stdenv
+ {
+ hardeningEnable = [
+ "libcxxhardeningfast"
+ "libcxxhardeningextensive"
+ ];
+ };
+
+ lchFastExtensiveExplicitDisabledDisablesBoth =
+ checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_NONE" stdenv
+ {
+ hardeningDisable = [
+ "libcxxhardeningfast"
+ "libcxxhardeningextensive"
+ ];
+ };
+
# most flags can't be "unsupported" by compiler alone and
# binutils doesn't have an accessible hardeningUnsupportedFlags
# mechanism, so can only test a couple of flags through altered
@@ -923,6 +983,30 @@ nameDrvAfterAttrName (
hardeningEnable = [ "glibcxxassertions" ];
};
+ lchFastStdenvUnsupp =
+ checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_NONE"
+ (stdenvUnsupport [ "libcxxhardeningfast" ])
+ {
+ hardeningEnable = [ "libcxxhardeningfast" ];
+ };
+
+ lchFastStdenvUnsuppUnsupportsLchExtensive =
+ checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_NONE"
+ (stdenvUnsupport [ "libcxxhardeningfast" ])
+ {
+ hardeningEnable = [ "libcxxhardeningextensive" ];
+ };
+
+ lchExtensiveStdenvUnsuppDoesntUnsupportLchFast =
+ checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_FAST"
+ (stdenvUnsupport [ "libcxxhardeningextensive" ])
+ {
+ hardeningEnable = [
+ "libcxxhardeningfast"
+ "libcxxhardeningextensive"
+ ];
+ };
+
fortify3EnabledEnvEnablesFortify1 =
checkTestBin
(f1exampleWithStdEnv stdenv {
@@ -1018,6 +1102,38 @@ nameDrvAfterAttrName (
expectFailure = true;
};
+ lchFastEnabledEnv = checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_FAST" stdenv {
+ hardeningDisable = [
+ "libcxxhardeningfast"
+ "libcxxhardeningextensive"
+ ];
+ postConfigure = ''
+ export NIX_HARDENING_ENABLE="libcxxhardeningfast"
+ '';
+ };
+
+ lchExtensiveEnabledEnv = checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_EXTENSIVE" stdenv {
+ hardeningDisable = [
+ "libcxxhardeningfast"
+ "libcxxhardeningextensive"
+ ];
+ postConfigure = ''
+ export NIX_HARDENING_ENABLE="libcxxhardeningextensive"
+ '';
+ };
+
+ lchFastExtensiveEnabledEnvResultsInLchExtensive =
+ checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_EXTENSIVE" stdenv
+ {
+ hardeningDisable = [
+ "libcxxhardeningfast"
+ "libcxxhardeningextensive"
+ ];
+ postConfigure = ''
+ export NIX_HARDENING_ENABLE="libcxxhardeningextensive libcxxhardeningfast"
+ '';
+ };
+
# NIX_HARDENING_ENABLE can't enable an unsupported feature
stackProtectorUnsupportedEnabledEnv =
checkTestBin
@@ -1085,7 +1201,6 @@ nameDrvAfterAttrName (
hardeningDisable = [ "all" ];
hardeningEnable = [
"fortify"
- "pie"
];
};
in
@@ -1101,13 +1216,6 @@ nameDrvAfterAttrName (
expectFailure = true;
};
- allExplicitDisabledPie = brokenIf (stdenv.hostPlatform.isMusl && stdenv.cc.isClang) (
- checkTestBin tb {
- ignorePie = false;
- expectFailure = true;
- }
- );
-
# can't force-disable ("partial"?) relro
allExplicitDisabledRelRO = brokenIf true (
checkTestBin tb {
@@ -1134,9 +1242,15 @@ nameDrvAfterAttrName (
hardeningDisable = [ "all" ];
}) true;
- glibcxxassertionsExplicitDisabled = checkGlibcxxassertionsWithStdEnv false stdenv {
+ allExplicitDisabledGlibcxxAssertions = checkGlibcxxassertionsWithStdEnv false stdenv {
hardeningDisable = [ "all" ];
};
+
+ allExplicitDisabledLibcxxHardening =
+ checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_NONE" stdenv
+ {
+ hardeningDisable = [ "all" ];
+ };
}
)
)
diff --git a/pkgs/test/haskell/upstreamStackHpackVersion/default.nix b/pkgs/test/haskell/upstreamStackHpackVersion/default.nix
index 5092bb4730496..5b7a7ff724b58 100644
--- a/pkgs/test/haskell/upstreamStackHpackVersion/default.nix
+++ b/pkgs/test/haskell/upstreamStackHpackVersion/default.nix
@@ -5,7 +5,8 @@
# matches with the version of hpack used by the upstream stack release. This
# is because hpack works slightly differently based on the version, and it can
# be frustrating to use hpack in a team setting when members are using different
-# versions. See for more info: https://github.com/NixOS/nixpkgs/issues/223390
+# versions. See for more info:
+# https://github.com/NixOS/nixpkgs/issues/223390 krank:ignore-line
#
# This test is written as a fixed-output derivation, because we need to access
# accesses the internet to download the upstream stack release.
diff --git a/pkgs/tools/misc/coreutils/cp-1.patch b/pkgs/tools/misc/coreutils/cp-1.patch
new file mode 100644
index 0000000000000..f40fdbbead791
--- /dev/null
+++ b/pkgs/tools/misc/coreutils/cp-1.patch
@@ -0,0 +1,32 @@
+From 231cc20195294c9774ab68f523dd06059f4b0a5c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?=
+Date: Wed, 29 Oct 2025 23:41:55 +0000
+Subject: [PATCH] copy: avoid posix_fadvise bypassing copy offload behavior
+
+* src/copy-file-data.c (): pass 0 to posix_fadvise to indicate to EOF.
+coreutils 9.8 used OFF_T_MAX instead, which triggered OpenZFS 2.2.2
+at least to synchronously (decompress and) populate the page cache.
+Addresses https://github.com/coreutils/coreutils/issues/122
+---
+ src/copy-file-data.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/copy-file-data.c b/src/copy-file-data.c
+index 1eefd3071f58a54f725c96dfcd2fd352012398c5..9eb6f47244f0a62c2f4934c7663794fd4dcf21bf 100644
+--- a/src/copy-file-data.c
++++ b/src/copy-file-data.c
+@@ -536,9 +536,12 @@ copy_file_data (int ifd, struct stat const *ist, off_t ipos, char const *iname,
+ && scantype != PLAIN_SCANTYPE)));
+
+ /* Don't bother calling fadvise for small copies, as it is not
+- likely to help performance and might even hurt it. */
++ likely to help performance and might even hurt it.
++ Note it's important to use a 0 length to indicate the whole file
++ as OpenZFS 2.2.2 at least will otherwise synchronously
++ (decompress and) populate the cache when given a specific length. */
+ if (IO_BUFSIZE < ibytes)
+- fdadvise (ifd, ipos, ibytes <= OFF_T_MAX - ipos ? ibytes : 0,
++ fdadvise (ifd, ipos, ibytes < OFF_T_MAX - ipos ? ibytes : 0,
+ FADVISE_SEQUENTIAL);
+
+ /* If not making a sparse file, try to use a more-efficient
diff --git a/pkgs/tools/misc/coreutils/cp-2.patch b/pkgs/tools/misc/coreutils/cp-2.patch
new file mode 100644
index 0000000000000..197269e787687
--- /dev/null
+++ b/pkgs/tools/misc/coreutils/cp-2.patch
@@ -0,0 +1,68 @@
+(NB: we drop the NEWS change to avoid conflicts)
+
+From 64b8fdb5b4767e0f833486507c3eae46ed1b40f8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?=
+Date: Thu, 30 Oct 2025 13:02:48 +0000
+Subject: [PATCH] copy: don't avoid copy-offload upon SEEK_HOLE indicating
+ non-sparse
+
+* src/copy-file-data.c (infer_scantype): Fall back to a plain copy
+if SEEK_HOLE indicates non-sparse, as zero copy avoids copy offload.
+This was seen with transparently compressed files on OpenZFS.
+* tests/cp/sparse-perf.sh: Add a test case even though it might
+only trigger on compressed file systems that don't support reflink.
+* NEWS: Mention the bug fix.
+Addresses https://github.com/coreutils/coreutils/issues/122
+---
+ NEWS | 8 ++++++++
+ src/copy-file-data.c | 11 +++++++++--
+ tests/cp/sparse-perf.sh | 10 ++++++++++
+ 3 files changed, 27 insertions(+), 2 deletions(-)
+
+diff --git a/src/copy-file-data.c b/src/copy-file-data.c
+index 9eb6f47244f0a62c2f4934c7663794fd4dcf21bf..8fd25fee9201eda7bd0a8caf01f02821a3390448 100644
+--- a/src/copy-file-data.c
++++ b/src/copy-file-data.c
+@@ -481,12 +481,19 @@ infer_scantype (int fd, struct stat const *sb, off_t pos,
+ if (scan_inference->hole_start < sb->st_size)
+ return LSEEK_SCANTYPE;
+
+- /* Though the file likely has holes, SEEK_DATA and SEEK_HOLE
++ /* Though the file may have holes, SEEK_DATA and SEEK_HOLE
+ didn't find any. This can happen with file systems like
+ circa-2025 squashfs that support SEEK_HOLE only trivially.
+- Fall back on ZERO_SCANTYPE. */
++ This can also happen due to transparent file compression,
++ which can also indicate fewer than the usual number of blocks. */
++
+ if (lseek (fd, pos, SEEK_SET) < 0)
+ return ERROR_SCANTYPE;
++
++ /* we prefer to return PLAIN_SCANTYPE here so that copy offload
++ continues to be used. Falling through to ZERO_SCANTYPE would be
++ less performant in the compressed file case. */
++ return PLAIN_SCANTYPE;
+ }
+ }
+ else if (pos < scan_inference->ext_start || errno == ENXIO)
+diff --git a/tests/cp/sparse-perf.sh b/tests/cp/sparse-perf.sh
+index 5a283c1fe65816a36342d9f583c1ed787947bf10..5ee984c527d7d8b6395d4193fcf81804b1135b8a 100755
+--- a/tests/cp/sparse-perf.sh
++++ b/tests/cp/sparse-perf.sh
+@@ -35,6 +35,16 @@ cmp $other_partition_sparse k2 || fail=1
+ grep ': avoided' cp.out && { cat cp.out; fail=1; }
+
+
++# Create a large-non-sparse-but-compressible file
++# Ensure we don't avoid copy offload which we saw with
++# transparent compression on OpenZFS at least
++# (as that triggers our sparse heuristic).
++mls='might-look-sparse'
++yes | head -n1M > "$mls" || framework_failure_
++cp --debug "$mls" "$mls.cp" >cp.out || fail=1
++cmp "$mls" "$mls.cp" || fail=1
++grep ': avoided' cp.out && { cat cp.out; fail=1; }
++
+
+ # Create a large-but-sparse file on the current partition.
+ # We disable relinking below, thus verifying SEEK_HOLE support
diff --git a/pkgs/tools/misc/coreutils/cp-3.patch b/pkgs/tools/misc/coreutils/cp-3.patch
new file mode 100644
index 0000000000000..0c662e042e45a
--- /dev/null
+++ b/pkgs/tools/misc/coreutils/cp-3.patch
@@ -0,0 +1,52 @@
+From 2c5754649e08a664f3d43f7bc1df08f498bc1554 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?=
+Date: Fri, 31 Oct 2025 15:37:55 +0000
+Subject: [PATCH] copy: be more defensive/restrictive with posix_fadvise
+
+* src/copy-file-data.c (copy_file_data): Only give the
+POSIX_FADV_SEQUENTIAL hint when we _know_ we'll definitely
+use a read/write loop to copy the data. Also only apply
+the hint to the whole file, as we've seen OpenZFS at least
+special case that.
+(sparse_copy): Update stale comment.
+---
+ src/copy-file-data.c | 17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/src/copy-file-data.c b/src/copy-file-data.c
+index 8fd25fee9201eda7bd0a8caf01f02821a3390448..c46b7edc5228f5f1e9c398d8ad7ff20b6fa60fb6 100644
+--- a/src/copy-file-data.c
++++ b/src/copy-file-data.c
+@@ -105,8 +105,6 @@ is_CLONENOTSUP (int err)
+ If HOLE_SIZE, look for holes in the input; *HOLE_SIZE contains
+ the size of the current hole so far, and update *HOLE_SIZE
+ at end to be the size of the hole at the end of the copy.
+- Set *TOTAL_N_READ to the number of bytes read; this counts
+- the trailing hole, which has not yet been output.
+ Read and update *DEBUG as needed.
+ If successful, return the number of bytes copied,
+ otherwise diagnose the failure and return -1. */
+@@ -542,14 +540,17 @@ copy_file_data (int ifd, struct stat const *ist, off_t ipos, char const *iname,
+ || (x->sparse_mode == SPARSE_AUTO
+ && scantype != PLAIN_SCANTYPE)));
+
+- /* Don't bother calling fadvise for small copies, as it is not
+- likely to help performance and might even hurt it.
+- Note it's important to use a 0 length to indicate the whole file
++ /* If we _know_ we're going to read data sequentially into the process,
++ i.e., --reflink or --sparse are not in auto mode,
++ give that hint to the kernel so it can tune caching behavior.
++ Also we don't bother calling fadvise for small copies,
++ as it is not likely to help performance and might even hurt it.
++ Also we only apply this hint for the whole file (0 length)
+ as OpenZFS 2.2.2 at least will otherwise synchronously
+ (decompress and) populate the cache when given a specific length. */
+- if (IO_BUFSIZE < ibytes)
+- fdadvise (ifd, ipos, ibytes < OFF_T_MAX - ipos ? ibytes : 0,
+- FADVISE_SEQUENTIAL);
++ if (ipos == 0 && ibytes == COUNT_MAX
++ && (x->reflink_mode != REFLINK_AUTO || x->sparse_mode != SPARSE_AUTO))
++ fdadvise (ifd, 0, 0, FADVISE_SEQUENTIAL);
+
+ /* If not making a sparse file, try to use a more-efficient
+ buffer size. */
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 4f94c41dcf42a..221f9853f6afc 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -55,6 +55,19 @@ stdenv.mkDerivation rec {
hash = "sha256-5tT9LYUskUGhwqGKE9FGoM1+RRlfcik6TkwETsbMyhU=";
};
+ patches = [
+ # Extremely bad bug where `tail` prints fewer lines than it should.
+ # https://github.com/coreutils/coreutils/commit/914972e80dbf82aac9ffe3ff1f67f1028e1a788b
+ ./tail.patch
+ # Fix performance regression in cp.
+ # https://github.com/coreutils/coreutils/commit/231cc20195294c9774ab68f523dd06059f4b0a5c
+ # https://github.com/coreutils/coreutils/commit/64b8fdb5b4767e0f833486507c3eae46ed1b40f8
+ # https://github.com/coreutils/coreutils/commit/2c5754649e08a664f3d43f7bc1df08f498bc1554
+ ./cp-1.patch
+ ./cp-2.patch
+ ./cp-3.patch
+ ];
+
postPatch = ''
# The test tends to fail on btrfs, f2fs and maybe other unusual filesystems.
sed '2i echo Skipping dd sparse test && exit 77' -i ./tests/dd/sparse.sh
diff --git a/pkgs/tools/misc/coreutils/tail.patch b/pkgs/tools/misc/coreutils/tail.patch
new file mode 100644
index 0000000000000..40336daae1370
--- /dev/null
+++ b/pkgs/tools/misc/coreutils/tail.patch
@@ -0,0 +1,50 @@
+(NB: we omit the new test, in order to avoid rerunning autoconf.)
+
+From 914972e80dbf82aac9ffe3ff1f67f1028e1a788b Mon Sep 17 00:00:00 2001
+From: Hannes Braun
+Date: Wed, 24 Sep 2025 21:20:49 +0200
+Subject: [PATCH] tail: fix tailing larger number of lines in regular files
+
+* src/tail.c (file_lines): Seek to the previous block instead of the
+beginning (or a little before) of the block that was just scanned.
+Otherwise, the same block is read and scanned (at least partially)
+again. This bug was introduced by commit v9.7-219-g976f8abc1.
+* tests/tail/basic-seek.sh: Add a new test.
+* tests/local.mk: Reference the new test.
+* NEWS: mention the bug fix.
+---
+ NEWS | 4 ++++
+ src/tail.c | 2 +-
+ tests/local.mk | 1 +
+ tests/tail/basic-seek.sh | 28 ++++++++++++++++++++++++++++
+ 4 files changed, 34 insertions(+), 1 deletion(-)
+ create mode 100755 tests/tail/basic-seek.sh
+
+diff --git a/NEWS b/NEWS
+index 7a1a73113e839f010aa6c734e6f07da68827b953..dc1d26879327761d35499815776477771758edd4 100644
+--- a/NEWS
++++ b/NEWS
+@@ -7,6 +7,10 @@ GNU coreutils NEWS -*- outline -*-
+ `basenc --base58` would not operate correctly with input > 15561475 bytes.
+ [bug introduced with --base58 in coreutils-9.8]
+
++ 'tail' outputs the correct number of lines again for non-small -n values.
++ Previously it may have output too few lines.
++ [bug introduced in coreutils-9.8]
++
+
+ * Noteworthy changes in release 9.8 (2025-09-22) [stable]
+
+diff --git a/src/tail.c b/src/tail.c
+index b8bef1d91cdb6cde2b666b6c1575376e075eaeb8..c7779c77dfe4cf5a672a265b6e796c7153590170 100644
+--- a/src/tail.c
++++ b/src/tail.c
+@@ -596,7 +596,7 @@ file_lines (char const *prettyname, int fd, struct stat const *sb,
+ goto free_buffer;
+ }
+
+- pos = xlseek (fd, -bufsize, SEEK_CUR, prettyname);
++ pos = xlseek (fd, -(bufsize + bytes_read), SEEK_CUR, prettyname);
+ bytes_read = read (fd, buffer, bufsize);
+ if (bytes_read < 0)
+ {
diff --git a/pkgs/tools/misc/fffuu/default.nix b/pkgs/tools/misc/fffuu/default.nix
index 2b6172d852fc3..9a9d57f154250 100644
--- a/pkgs/tools/misc/fffuu/default.nix
+++ b/pkgs/tools/misc/fffuu/default.nix
@@ -16,17 +16,17 @@ mkDerivation {
sha256 = "1qc7p44dqja6qrjbjdc2xn7n9v41j5v59sgjnxjj5k0mxp58y1ch";
};
+ postUnpack = ''
+ sourceRoot="$sourceRoot/haskell_tool"
+ '';
+
postPatch = ''
- substituteInPlace haskell_tool/fffuu.cabal \
+ substituteInPlace fffuu.cabal \
--replace "containers >=0.5 && <0.6" "containers >= 0.6" \
--replace "optparse-generic >= 1.2.3 && < 1.3" "optparse-generic >= 1.2.3" \
--replace "split >= 0.2.3 && <= 0.2.4" "split >= 0.2.3"
'';
- preCompileBuildDriver = ''
- cd haskell_tool
- '';
-
isLibrary = false;
isExecutable = true;
diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix
index 2744e04aee8df..26999bd53ed56 100644
--- a/pkgs/tools/networking/openssh/common.nix
+++ b/pkgs/tools/networking/openssh/common.nix
@@ -52,6 +52,12 @@ assert withFIDO -> withSecurityKey;
stdenv.mkDerivation (finalAttrs: {
inherit pname version src;
+ outputs = [
+ "out"
+ "dev"
+ "man"
+ ];
+
patches = [
# Making openssh pass the LOCALE_ARCHIVE variable to the forked session processes,
# so the session 'bash' will receive the proper locale archive, and thus process
@@ -60,6 +66,10 @@ stdenv.mkDerivation (finalAttrs: {
# See discussion in https://github.com/NixOS/nixpkgs/pull/16966
./dont_create_privsep_path.patch
+
+ # See discussion in https://github.com/NixOS/nixpkgs/issues/453782 and
+ # https://github.com/openssh/openssh-portable/pull/602
+ ./fix_pkcs11_tests.patch
]
++ extraPatches;
@@ -67,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
# On Hydra this makes installation fail (sometimes?),
# and nix store doesn't allow such fancy permission bits anyway.
''
- substituteInPlace Makefile.in --replace '$(INSTALL) -m 4711' '$(INSTALL) -m 0711'
+ substituteInPlace Makefile.in --replace-fail '$(INSTALL) -m 4711' '$(INSTALL) -m 0711'
'';
strictDeps = true;
@@ -138,16 +148,13 @@ stdenv.mkDerivation (finalAttrs: {
enableParallelBuilding = true;
- hardeningEnable = [ "pie" ];
-
doCheck = false;
enableParallelChecking = false;
nativeCheckInputs = [
openssl
]
++ lib.optional (!stdenv.hostPlatform.isDarwin) hostname
- # TODO: softhsm is currently breaking the tests; see #453782
- ++ lib.optional (false && !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isMusl) softhsm;
+ ++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isMusl) softhsm;
preCheck = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) (
''
@@ -182,27 +189,23 @@ stdenv.mkDerivation (finalAttrs: {
# explicitly enable the PermitUserEnvironment feature
substituteInPlace regress/test-exec.sh \
- --replace \
+ --replace-fail \
'cat << EOF > $OBJ/sshd_config' \
$'cat << EOF > $OBJ/sshd_config\n\tPermitUserEnvironment yes'
# some tests want to use files under /bin as example files
for f in regress/sftp-cmds.sh regress/forwarding.sh; do
- substituteInPlace $f --replace '/bin' "$(dirname $(type -p ls))"
+ substituteInPlace $f --replace-fail '/bin' "$(dirname $(type -p ls))"
done
# set up NIX_REDIRECTS for direct invocations
set -a; source ~/.ssh/environment.base; set +a
''
- # See softhsm in nativeCheckInputs above.
- +
- lib.optionalString
- (!finalAttrs.doCheck && !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isMusl)
- ''
- # The extra tests check PKCS#11 interactions, which softhsm emulates with software only
- substituteInPlace regress/test-exec.sh \
- --replace /usr/local/lib/softhsm/libsofthsm2.so ${lib.getLib softhsm}/lib/softhsm/libsofthsm2.so
- ''
+ + lib.optionalString (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isMusl) ''
+ # The extra tests check PKCS#11 interactions, which softhsm emulates with software only
+ substituteInPlace regress/test-exec.sh \
+ --replace-fail /usr/local/lib/softhsm/libsofthsm2.so ${lib.getLib softhsm}/lib/softhsm/libsofthsm2.so
+ ''
);
# integration tests hard to get working on darwin with its shaky
# sandbox
@@ -223,7 +226,7 @@ stdenv.mkDerivation (finalAttrs: {
# Install ssh-copy-id, it's very useful.
cp contrib/ssh-copy-id $out/bin/
chmod +x $out/bin/ssh-copy-id
- cp contrib/ssh-copy-id.1 $out/share/man/man1/
+ cp contrib/ssh-copy-id.1 $man/share/man/man1/
'';
installTargets = [ "install-nokeys" ];
diff --git a/pkgs/tools/networking/openssh/copyid.nix b/pkgs/tools/networking/openssh/copyid.nix
index 55da4a5c701ce..e8d6f4b3f3882 100644
--- a/pkgs/tools/networking/openssh/copyid.nix
+++ b/pkgs/tools/networking/openssh/copyid.nix
@@ -6,6 +6,10 @@
runCommand "ssh-copy-id-${openssh.version}"
{
+ outputs = [
+ "out"
+ "man"
+ ];
meta = openssh.meta // {
description = "Tool to copy SSH public keys to a remote machine";
priority = (openssh.meta.priority or lib.meta.defaultPriority) - 1;
@@ -13,5 +17,5 @@ runCommand "ssh-copy-id-${openssh.version}"
}
''
install -Dm 755 {${openssh},$out}/bin/ssh-copy-id
- install -Dm 644 {${openssh},$out}/share/man/man1/ssh-copy-id.1.gz
+ install -Dm 644 {${openssh.man},$man}/share/man/man1/ssh-copy-id.1.gz
''
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index f70fd678f68f0..6e95321b3de1a 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -8,47 +8,11 @@
let
common = opts: callPackage (import ./common.nix opts) { };
- # Gets the correct OpenSSH URL for a given version.
- urlFor =
- version:
- let
- urlVersion =
- {
- # 10.0p1 was accidentally released as 10.0p2:
- # https://www.openwall.com/lists/oss-security/2025/04/09/6
- "10.0p2" = "10.0p1";
- }
- .${version} or version;
- in
- "mirror://openbsd/OpenSSH/portable/openssh-${urlVersion}.tar.gz";
+ # Gets the OpenSSH mirror URL.
+ urlFor = version: "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz";
in
{
openssh = common rec {
- pname = "openssh";
- version = "10.1p1";
-
- src = fetchurl {
- url = urlFor version;
- hash = "sha256-ufx6K4JXlGem8vQ+SoHI4d/aYU3bT5slWq/XAgu/B1g=";
- };
-
- extraPatches = [
- # Use ssh-keysign from PATH
- # ssh-keysign is used for host-based authentication, and is designed to be used
- # as SUID-root program. OpenSSH defaults to referencing it from libexec, which
- # cannot be made SUID in Nix.
- ./ssh-keysign-8.5.patch
- ];
- extraMeta = {
- maintainers = with lib.maintainers; [
- philiptaron
- numinit
- ];
- teams = [ lib.teams.helsinki-systems ];
- };
- };
-
- openssh_10_2 = common rec {
pname = "openssh";
version = "10.2p1";
diff --git a/pkgs/tools/networking/openssh/fix_pkcs11_tests.patch b/pkgs/tools/networking/openssh/fix_pkcs11_tests.patch
new file mode 100644
index 0000000000000..c4459c8ee0e12
--- /dev/null
+++ b/pkgs/tools/networking/openssh/fix_pkcs11_tests.patch
@@ -0,0 +1,51 @@
+From 642218d8dd1ec79fa0c8db491fd46faa3ab026f7 Mon Sep 17 00:00:00 2001
+From: Morgan Jones
+Date: Tue, 21 Oct 2025 01:15:55 -0700
+Subject: [PATCH 1/2] test-exec: use -P for allowed PKCS#11 library when
+ starting agent
+
+If we just loaded a PKCS#11 library, we should allow it so the
+regression test can run.
+
+Fixes: https://github.com/NixOS/nixpkgs/issues/453782
+---
+ regress/test-exec.sh | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/regress/test-exec.sh b/regress/test-exec.sh
+index 5b0c91f3faa..30b3da8709d 100644
+--- a/regress/test-exec.sh
++++ b/regress/test-exec.sh
+@@ -1023,6 +1023,9 @@ p11_ssh_add() {
+
+ start_ssh_agent() {
+ EXTRA_AGENT_ARGS="$1"
++ if [ "$PKCS11_OK" = "yes" ]; then
++ EXTRA_AGENT_ARGS="${EXTRA_AGENT_ARGS} -P${TEST_SSH_PKCS11}"
++ fi
+ SSH_AUTH_SOCK="$OBJ/agent.sock"
+ export SSH_AUTH_SOCK
+ rm -f $SSH_AUTH_SOCK $OBJ/agent.log
+
+From 5ae735db7d81b38ee059d63a4011291cb4456aef Mon Sep 17 00:00:00 2001
+From: Morgan Jones
+Date: Tue, 21 Oct 2025 01:50:23 -0700
+Subject: [PATCH 2/2] test-exec: give more time for ssh-agent to start
+
+---
+ regress/test-exec.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/regress/test-exec.sh b/regress/test-exec.sh
+index 30b3da8709d..56a7653b386 100644
+--- a/regress/test-exec.sh
++++ b/regress/test-exec.sh
+@@ -1034,7 +1034,7 @@ start_ssh_agent() {
+ > $OBJ/agent.log 2>&1 &
+ AGENT_PID=$!
+ trap "kill $AGENT_PID" EXIT
+- for x in 0 1 2 3 4 ; do
++ for x in $(seq 15); do
+ # Give it a chance to start
+ ${SSHADD} -l > /dev/null 2>&1
+ r=$?
diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix
index 5d70b379e6efd..b55637e6649c2 100644
--- a/pkgs/tools/networking/privoxy/default.nix
+++ b/pkgs/tools/networking/privoxy/default.nix
@@ -32,8 +32,6 @@ stdenv.mkDerivation rec {
})
];
- hardeningEnable = [ "pie" ];
-
nativeBuildInputs = [
autoreconfHook
w3m
diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix
index a777fa228986f..d34a4590823a9 100644
--- a/pkgs/tools/package-management/lix/common-lix.nix
+++ b/pkgs/tools/package-management/lix/common-lix.nix
@@ -373,7 +373,6 @@ stdenv.mkDerivation (finalAttrs: {
# fortify breaks the build with lto and musl for some reason
++ lib.optional stdenv.hostPlatform.isMusl "fortify";
- # hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ];
separateDebugInfo = stdenv.hostPlatform.isLinux && !enableStatic;
enableParallelBuilding = true;
diff --git a/pkgs/tools/package-management/nix/common-meson.nix b/pkgs/tools/package-management/nix/common-meson.nix
index 66a221c555219..40094ecac21b5 100644
--- a/pkgs/tools/package-management/nix/common-meson.nix
+++ b/pkgs/tools/package-management/nix/common-meson.nix
@@ -101,8 +101,6 @@ stdenv.mkDerivation (finalAttrs: {
"doc"
];
- hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ];
-
hardeningDisable = [
"shadowstack"
]
diff --git a/pkgs/tools/package-management/nix/modular/packaging/components.nix b/pkgs/tools/package-management/nix/modular/packaging/components.nix
index 2a8b5e12a4c44..df8ee0671382b 100644
--- a/pkgs/tools/package-management/nix/modular/packaging/components.nix
+++ b/pkgs/tools/package-management/nix/modular/packaging/components.nix
@@ -150,7 +150,6 @@ let
pkg-config
];
separateDebugInfo = !stdenv.hostPlatform.isStatic;
- hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
};
mesonLibraryLayer = finalAttrs: prevAttrs: {
diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index 49f144d390bae..343004ddc3243 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -19,7 +19,6 @@
sqlite,
zstd,
libcap,
- apple-sdk_13,
darwinMinVersionHook,
openssl,
#, libselinux
@@ -90,10 +89,6 @@ stdenv.mkDerivation rec {
libcap
audit
systemd
- ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [
- apple-sdk_13
- (darwinMinVersionHook "13.0")
];
patches = lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix
index 5028d1096e321..c10aabed38aab 100644
--- a/pkgs/tools/security/gopass/default.nix
+++ b/pkgs/tools/security/gopass/default.nix
@@ -10,7 +10,6 @@
xclip,
wl-clipboard,
passAlias ? false,
- apple-sdk_14,
nix-update-script,
versionCheckHook,
}:
@@ -36,11 +35,6 @@ buildGoModule (finalAttrs: {
makeBinaryWrapper
];
- buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
- # For ScreenCaptureKit.h, see https://github.com/NixOS/nixpkgs/pull/358760#discussion_r1858327365
- apple-sdk_14
- ];
-
src = fetchFromGitHub {
owner = "gopasspw";
repo = "gopass";
diff --git a/pkgs/tools/system/nvtop/build-nvtop.nix b/pkgs/tools/system/nvtop/build-nvtop.nix
index 79721da656b43..df66ef58e24af 100644
--- a/pkgs/tools/system/nvtop/build-nvtop.nix
+++ b/pkgs/tools/system/nvtop/build-nvtop.nix
@@ -9,7 +9,6 @@
ncurses,
testers,
udev,
- apple-sdk_12,
addDriverRunpath,
amd ? false,
intel ? false,
@@ -77,7 +76,6 @@ stdenv.mkDerivation (finalAttrs: {
ncurses
]
++ lib.optional stdenv.hostPlatform.isLinux udev
- ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_12
++ lib.optional nvidia cudatoolkit
++ lib.optional needDrm libdrm;
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index 6bc745fe88b75..015b2409e115d 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -32,12 +32,6 @@ stdenv.mkDerivation rec {
hash = "sha256-+MNIZQnecFGSE4sA7ywAu73Q6Eww1cB9I/xzqdxMycw=";
};
- # PIE is incompatible with the "persistent malloc" ("pma") feature.
- # While build system attempts to pass -no-pie to gcc. nixpkgs' `ld`
- # wrapped still passes `-pie` flag to linker and breaks linkage.
- # Let's disable "pie" until `ld` is fixed to do the right thing.
- hardeningDisable = [ "pie" ];
-
# When we do build separate interactive version, it makes sense to always include man.
outputs = [
"out"
diff --git a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
index d179ef835a92b..154ad98cab057 100644
--- a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
+++ b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
@@ -45,13 +45,17 @@ lib.fix (
### buildEnv with custom attributes
buildEnv' =
args:
- (
- buildEnv { inherit (args) name paths; }
+ (buildEnv (
+ {
+ inherit (args) name paths;
+ }
// lib.optionalAttrs (args ? extraOutputsToInstall) { inherit (args) extraOutputsToInstall; }
- ).overrideAttrs
+ // lib.optionalAttrs (args ? pathsToLink) { inherit (args) pathsToLink; }
+ )).overrideAttrs
(
removeAttrs args [
"extraOutputsToInstall"
+ "pathsToLink"
"name"
"paths"
"pkgs"
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3a0be37918638..0b3af593808e5 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -294,6 +294,9 @@ mapAliases {
apacheAnt = throw "'apacheAnt' has been renamed to/replaced by 'ant'"; # Converted to throw 2025-10-27
apacheKafka_3_7 = throw "apacheKafka_2_8 through _3_8 have been removed from nixpkgs as outdated"; # Added 2025-09-27
apacheKafka_3_8 = throw "apacheKafka_2_8 through _3_8 have been removed from nixpkgs as outdated"; # Added 2025-09-27
+ apple-sdk_11 = throw "apple-sdk_11 was removed as Nixpkgs no longer supports macOS 11; see the 25.11 release notes"; # Added 2025-05-10
+ apple-sdk_12 = throw "apple-sdk_12 was removed as Nixpkgs no longer supports macOS 12; see the 25.11 release notes"; # Added 2025-05-10
+ apple-sdk_13 = throw "apple-sdk_13 was removed as Nixpkgs no longer supports macOS 13; see the 25.11 release notes"; # Added 2025-05-10
appthreat-depscan = throw "'appthreat-depscan' has been renamed to/replaced by 'dep-scan'"; # Converted to throw 2025-10-27
arangodb = throw "arangodb has been removed, as it was unmaintained and the packaged version does not build with supported GCC versions"; # Added 2025-08-12
arc-browser = throw "arc-browser was removed due to being unmaintained"; # Added 2025-09-03
@@ -529,6 +532,7 @@ mapAliases {
elm-github-install = throw "'elm-github-install' has been removed as it is abandoned upstream and only supports Elm 0.18.0"; # Added 2025-08-25
emacsMacport = throw "'emacsMacport' has been renamed to/replaced by 'emacs-macport'"; # Converted to throw 2025-10-27
emacsNativeComp = throw "'emacsNativeComp' has been renamed to/replaced by 'emacs'"; # Converted to throw 2025-10-27
+ emanote = throw "'emanote' has been removed due to lack of a Nixpkgs maintainer"; # Added 2025-09-18
embree2 = throw "embree2 has been removed, as it is unmaintained upstream and depended on tbb_2020"; # Added 2025-09-14
emojione = throw "emojione has beem removed, as it has been archived upstream."; # Added 2025-11-06
EmptyEpsilon = throw "'EmptyEpsilon' has been renamed to/replaced by 'empty-epsilon'"; # Converted to throw 2025-10-27
@@ -665,6 +669,7 @@ mapAliases {
gnatinspect = throw "'gnatinspect' has been renamed to/replaced by 'gnatPackages.gnatinspect'"; # Converted to throw 2025-10-27
gnome-firmware-updater = throw "'gnome-firmware-updater' has been renamed to/replaced by 'gnome-firmware'"; # Converted to throw 2025-10-27
gnome-passwordsafe = throw "'gnome-passwordsafe' has been renamed to/replaced by 'gnome-secrets'"; # Converted to throw 2025-10-27
+ gnome-recipes = throw "'gnome-recipes' has been removed due to lack of upstream maintenance and dependency on insecure libraries"; # Added 2025-09-06
gnome-resources = throw "'gnome-resources' has been renamed to/replaced by 'resources'"; # Converted to throw 2025-10-27
gnu-cobol = throw "'gnu-cobol' has been renamed to/replaced by 'gnucobol'"; # Converted to throw 2025-10-27
gnubik = throw "'gnubik' has been removed due to lack of maintainance upstream and its dependency on GTK 2"; # Added 2025-09-16
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 870df36051cad..18b4dd3f45f5a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2517,6 +2517,7 @@ with pkgs;
pslSupport = true;
zstdSupport = true;
http3Support = true;
+ c-aresSupport = true;
}
// lib.optionalAttrs (!stdenv.hostPlatform.isStatic) {
brotliSupport = true;
@@ -3433,7 +3434,7 @@ with pkgs;
};
# Not in aliases because it wouldn't get picked up by callPackage
- netbox = netbox_4_3;
+ netbox = netbox_4_4;
netcap-nodpi = callPackage ../by-name/ne/netcap/package.nix {
withDpi = false;
@@ -3558,10 +3559,6 @@ with pkgs;
etcDir = "/etc/ssh";
};
- openssh_10_2 = opensshPackages.openssh_10_2.override {
- etcDir = "/etc/ssh";
- };
-
opensshTest = openssh.tests.openssh;
opensshWithKerberos = openssh.override {
@@ -5221,15 +5218,15 @@ 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 { };
- rust = rust_1_89;
+ rust_1_90 = callPackage ../development/compilers/rust/1_90.nix { };
+ rust = rust_1_90;
mrustc = callPackage ../development/compilers/mrustc { };
mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { };
mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { };
- rustPackages_1_89 = rust_1_89.packages.stable;
- rustPackages = rustPackages_1_89;
+ rustPackages_1_90 = rust_1_90.packages.stable;
+ rustPackages = rustPackages_1_90;
inherit (rustPackages)
cargo
@@ -7025,9 +7022,6 @@ with pkgs;
vapoursynth-editor = libsForQt5.callPackage ../by-name/va/vapoursynth/editor.nix { };
- # TODO: Fix references and add justStaticExecutables https://github.com/NixOS/nixpkgs/issues/318013
- emanote = haskellPackages.emanote;
-
enchant2 = callPackage ../development/libraries/enchant/2.x.nix { };
enchant = enchant2;
@@ -7107,7 +7101,7 @@ with pkgs;
fmt_12
;
- fmt = fmt_11;
+ fmt = fmt_12;
fplll = callPackage ../development/libraries/fplll { };
fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix { };
@@ -8239,7 +8233,7 @@ with pkgs;
prospector = callPackage ../development/tools/prospector { };
- protobuf = protobuf_32;
+ protobuf = protobuf_33;
inherit
({
@@ -8731,9 +8725,6 @@ with pkgs;
### DEVELOPMENT / LIBRARIES / DARWIN SDKS
- apple-sdk_11 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "11"; };
- apple-sdk_12 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "12"; };
- apple-sdk_13 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "13"; };
apple-sdk_14 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "14"; };
apple-sdk_15 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "15"; };
apple-sdk_26 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "26"; };
@@ -8901,23 +8892,23 @@ with pkgs;
"3000"
];
};
- sbcl_2_5_5 = wrapLisp {
- pkg = callPackage ../development/compilers/sbcl { version = "2.5.5"; };
+ sbcl_2_5_7 = wrapLisp {
+ pkg = callPackage ../development/compilers/sbcl { version = "2.5.7"; };
faslExt = "fasl";
flags = [
"--dynamic-space-size"
"3000"
];
};
- sbcl_2_5_7 = wrapLisp {
- pkg = callPackage ../development/compilers/sbcl { version = "2.5.7"; };
+ sbcl_2_5_9 = wrapLisp {
+ pkg = callPackage ../development/compilers/sbcl { version = "2.5.9"; };
faslExt = "fasl";
flags = [
"--dynamic-space-size"
"3000"
];
};
- sbcl = sbcl_2_5_7;
+ sbcl = sbcl_2_5_9;
sbclPackages = recurseIntoAttrs sbcl.pkgs;
@@ -10178,6 +10169,12 @@ with pkgs;
withVmspawn = false;
withQrencode = false;
withLibarchive = false;
+ withVConsole = false;
+ # withKmod = false; # breaks udevCheckHook of bcache-tools
+ withFirstboot = false;
+ withKexectools = false;
+ withLibseccomp = false;
+ withNspawn = false;
};
systemdLibs = systemdMinimal.override {
pname = "systemd-minimal-libs";
@@ -11736,8 +11733,6 @@ with pkgs;
pcmanfm-qt = lxqt.pcmanfm-qt;
- pdfmixtool = libsForQt5.callPackage ../applications/office/pdfmixtool { };
-
pijuice = with python3Packages; toPythonApplication pijuice;
pinegrow6 = callPackage ../applications/editors/pinegrow { pinegrowVersion = "6"; };
diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix
index 09d31a2d117c0..c8e8a3f585908 100644
--- a/pkgs/top-level/config.nix
+++ b/pkgs/top-level/config.nix
@@ -139,6 +139,39 @@ let
null;
};
+ npmRegistryOverrides = mkOption {
+ type = types.attrsOf types.str;
+ description = ''
+ The default NPM registry overrides for all `fetchNpmDeps` calls, as an attribute set.
+
+ For each attribute, all files fetched from the host corresponding to the name will instead be fetched from the host (and sub-path) specified in the value.
+
+ For example, an override like `"registry.npmjs.org" = "my-mirror.local/registry.npmjs.org"` will replace a URL like `https://registry.npmjs.org/foo.tar.gz` with `https://my-mirror.local/registry.npmjs.org/foo.tar.gz`.
+
+ To set the string directly, see [`npmRegistryOverridesString`](#opt-npmRegistryOverridesString).
+ '';
+ default = { };
+ example = {
+ "registry.npmjs.org" = "my-mirror.local/registry.npmjs.org";
+ };
+ };
+
+ npmRegistryOverridesString = mkOption {
+ type = types.addCheck types.str (
+ s:
+ let
+ j = builtins.fromJSON s;
+ in
+ lib.isAttrs j && lib.all builtins.isString (builtins.attrValues j)
+ );
+ description = ''
+ A string containing a string with a JSON representation of NPM registry overrides for `fetchNpmDeps`.
+
+ This overrides the [`npmRegistryOverrides`](#opt-npmRegistryOverrides) option, see its documentation for more details.
+ '';
+ default = builtins.toJSON config.npmRegistryOverrides;
+ };
+
doCheckByDefault = mkMassRebuild {
feature = "run `checkPhase` by default";
};
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index fc7eae850cbbf..6cf6be084b438 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -14,8 +14,6 @@ let
"native-bignum"
# Binary GHCs
"ghc902Binary"
- "ghc924Binary"
- "ghc963Binary"
"ghc984Binary"
];
@@ -48,6 +46,16 @@ let
# Use this rather than `rec { ... }` below for sake of overlays.
inherit (pkgs.haskell) compiler packages;
+ # The GHC LLVM backend rarely sees significant changes relating to
+ # LLVM version support, as it uses the textual IR format and invokes
+ # the LLVM binary tools rather than linking to the C++ libraries.
+ #
+ # Consider backporting upstream GHC changes to support new LLVM
+ # versions in `common-llvm-patches.nix` to allow the version to be
+ # shared across our supported versions of GHC. If the required
+ # changes are too invasive, it’s fine to decouple individual versions
+ # from this default or disable their LLVM support if it’s not load‐
+ # bearing (e.g. GHC 9.4.8 is important for cross‐compiling GHC).
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_20;
llvmPackages = pkgs.llvmPackages_20;
@@ -78,123 +86,50 @@ in
inherit llvmPackages;
};
- ghc924Binary = callPackage ../development/compilers/ghc/9.2.4-binary.nix { };
-
- ghc963Binary = callPackage ../development/compilers/ghc/9.6.3-binary.nix { };
-
ghc984Binary = callPackage ../development/compilers/ghc/9.8.4-binary.nix { };
ghc948 = callPackage ../development/compilers/ghc/9.4.8.nix {
bootPkgs =
# Building with 9.2 is broken due to
- # https://gitlab.haskell.org/ghc/ghc/-/issues/21914
+ # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 krank:ignore-line
bb.packages.ghc902Binary;
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;
};
ghc94 = compiler.ghc948;
ghc967 = callPackage ../development/compilers/ghc/9.6.7.nix {
- bootPkgs = bb.packages.ghc924Binary;
+ bootPkgs = bb.packages.ghc948;
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;
};
ghc96 = compiler.ghc967;
ghc984 = callPackage ../development/compilers/ghc/9.8.4.nix {
- bootPkgs =
- if stdenv.buildPlatform.isAarch64 && stdenv.buildPlatform.isMusl then
- bb.packages.ghc984Binary
- else
- bb.packages.ghc963Binary;
+ bootPkgs = if stdenv.buildPlatform.isi686 then bb.packages.ghc948 else bb.packages.ghc984Binary;
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;
};
ghc98 = compiler.ghc984;
- ghc9101 = callPackage ../development/compilers/ghc/9.10.1.nix {
- bootPkgs =
- if stdenv.buildPlatform.isDarwin then
- # it seems like the GHC 9.6.* bindists are built with a different
- # toolchain than we are using (which I'm guessing from the fact
- # 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.ghc967
- else
- bb.packages.ghc963Binary;
- 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;
- };
ghc9102 = callPackage ../development/compilers/ghc/9.10.2.nix {
- bootPkgs =
- if stdenv.buildPlatform.isDarwin then
- # it seems like the GHC 9.6.* bindists are built with a different
- # toolchain than we are using (which I'm guessing from the fact
- # 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.ghc967
- else
- bb.packages.ghc963Binary;
+ bootPkgs = if stdenv.buildPlatform.isi686 then bb.packages.ghc967 else bb.packages.ghc984Binary;
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;
};
ghc9103 = callPackage ../development/compilers/ghc/9.10.3.nix {
- bootPkgs =
- if stdenv.buildPlatform.isDarwin then
- # it seems like the GHC 9.6.* bindists are built with a different
- # toolchain than we are using (which I'm guessing from the fact
- # 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.ghc967
- else
- bb.packages.ghc963Binary;
+ bootPkgs = if stdenv.buildPlatform.isi686 then bb.packages.ghc967 else bb.packages.ghc984Binary;
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;
};
ghc910 = compiler.ghc9103;
- ghc9121 = callPackage ../development/compilers/ghc/9.12.1.nix {
- bootPkgs =
- # No suitable bindist packaged yet
- bb.packages.ghc9103;
- 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;
- };
ghc9122 = callPackage ../development/compilers/ghc/9.12.2.nix {
bootPkgs =
# No suitable bindist packaged yet
bb.packages.ghc9103;
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;
};
@@ -202,9 +137,6 @@ in
ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
bootPkgs = bb.packages.ghc984Binary;
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;
};
@@ -248,18 +180,6 @@ in
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.0.x.nix { };
packageSetConfig = bootstrapPackageSet;
};
- ghc924Binary = callPackage ../development/haskell-modules {
- buildHaskellPackages = bh.packages.ghc924Binary;
- ghc = bh.compiler.ghc924Binary;
- compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { };
- packageSetConfig = bootstrapPackageSet;
- };
- ghc963Binary = callPackage ../development/haskell-modules {
- buildHaskellPackages = bh.packages.ghc963Binary;
- ghc = bh.compiler.ghc963Binary;
- compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { };
- packageSetConfig = bootstrapPackageSet;
- };
ghc984Binary = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc984Binary;
ghc = bh.compiler.ghc984Binary;
@@ -284,11 +204,6 @@ in
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { };
};
ghc98 = packages.ghc984;
- ghc9101 = callPackage ../development/haskell-modules {
- buildHaskellPackages = bh.packages.ghc9101;
- ghc = bh.compiler.ghc9101;
- compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.10.x.nix { };
- };
ghc9102 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc9102;
ghc = bh.compiler.ghc9102;
@@ -300,11 +215,6 @@ in
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.10.x.nix { };
};
ghc910 = packages.ghc9103;
- ghc9121 = callPackage ../development/haskell-modules {
- buildHaskellPackages = bh.packages.ghc9121;
- ghc = bh.compiler.ghc9121;
- compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.12.x.nix { };
- };
ghc9122 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc9122;
ghc = bh.compiler.ghc9122;
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index d38c23d0d40ba..0eca813cb084d 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -466,21 +466,9 @@ let
dune_1 = callPackage ../development/tools/ocaml/dune/1.nix { };
- dune_2 =
- if lib.versionAtLeast ocaml.version "4.08" then
- callPackage ../development/tools/ocaml/dune/2.nix { }
- else if lib.versionAtLeast ocaml.version "4.02" then
- pkgs.dune_2
- else
- throw "dune_2 is not available for OCaml ${ocaml.version}";
+ dune_2 = callPackage ../development/tools/ocaml/dune/2.nix { };
- dune_3 =
- if lib.versionAtLeast ocaml.version "4.08" then
- callPackage ../development/tools/ocaml/dune/3.nix { }
- else if lib.versionAtLeast ocaml.version "4.02" then
- pkgs.dune_3
- else
- throw "dune_3 is not available for OCaml ${ocaml.version}";
+ dune_3 = callPackage ../development/tools/ocaml/dune/3.nix { };
dune-action-plugin = callPackage ../development/ocaml-modules/dune-action-plugin { };
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index f13fab62c9ab8..171397c958672 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -155,6 +155,7 @@ mapAliases {
face_recognition_models = throw "'face_recognition_models' has been renamed to/replaced by 'face-recognition-models'"; # Converted to throw 2025-10-29
factory_boy = throw "'factory_boy' has been renamed to/replaced by 'factory-boy'"; # Converted to throw 2025-10-29
fastnlo_toolkit = throw "'fastnlo_toolkit' has been renamed to/replaced by 'fastnlo-toolkit'"; # Converted to throw 2025-10-29
+ fb-re2 = throw "fb-re2 has been removed since it is unmaintained upstream, consider google-re2 instead"; # added 2025-10-18
fenics = throw "fenics has been removed, use fenics-dolfinx instead"; # added 2025-08-07
filebrowser_safe = throw "'filebrowser_safe' has been renamed to/replaced by 'filebrowser-safe'"; # Converted to throw 2025-10-29
filesplit = throw "filesplit has been removed, since it is unmaintained"; # added 2025-08-20
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2ede101dea586..1c98dbffc3e8c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1686,6 +1686,14 @@ self: super: with self; {
backports-tarfile = callPackage ../development/python-modules/backports-tarfile { };
+ backports-zstd =
+ if pythonAtLeast "3.14" then
+ null
+ else
+ callPackage ../development/python-modules/backports-zstd {
+ inherit (pkgs) zstd;
+ };
+
backrefs = callPackage ../development/python-modules/backrefs { };
backtesting = callPackage ../development/python-modules/backtesting { };
@@ -5190,8 +5198,6 @@ self: super: with self; {
favicon = callPackage ../development/python-modules/favicon { };
- fb-re2 = callPackage ../development/python-modules/fb-re2 { };
-
fe25519 = callPackage ../development/python-modules/fe25519 { };
feather-format = callPackage ../development/python-modules/feather-format { };
@@ -8212,7 +8218,8 @@ self: super: with self; {
legacy-api-wrap = callPackage ../development/python-modules/legacy-api-wrap { };
- legacy-cgi = callPackage ../development/python-modules/legacy-cgi { };
+ legacy-cgi =
+ if pythonOlder "3.13" then null else callPackage ../development/python-modules/legacy-cgi { };
leidenalg = callPackage ../development/python-modules/leidenalg { igraph-c = pkgs.igraph; };
@@ -12740,7 +12747,7 @@ self: super: with self; {
pyatome = callPackage ../development/python-modules/pyatome { };
- pyatspi = callPackage ../development/python-modules/pyatspi { };
+ pyatspi = callPackage ../development/python-modules/pyatspi { inherit (pkgs.buildPackages) meson; };
pyatv = callPackage ../development/python-modules/pyatv { };
diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index 5013bf119de82..f803f7f47dc35 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -66,10 +66,8 @@ let
ghc948
ghc967
ghc984
- ghc9101
ghc9102
ghc9103
- # exclude ghc9121 due to severe miscompilation bug
ghc9122
];
@@ -232,8 +230,9 @@ let
tests.haskell = packagePlatforms pkgs.tests.haskell;
nixosTests = {
+ agda = packagePlatforms pkgs.nixosTests.agda;
+
inherit (packagePlatforms pkgs.nixosTests)
- agda
kmonad
xmonad
xmonad-xdg-autostart
@@ -255,9 +254,10 @@ let
cachix
# carp broken on 2024-04-09
changelog-d
- cornelis
cedille
client-ip-echo
+ cornelis
+ codd
darcs
dconf2nix
dhall
@@ -271,7 +271,6 @@ let
diagrams-builder
echidna
elm2nix
- emanote
fffuu
futhark
ghcid
@@ -317,7 +316,6 @@ let
nix-output-monitor
nix-script
nix-tree
- nixfmt-classic
nixfmt
nota
nvfetcher
@@ -541,7 +539,6 @@ let
] released;
Cabal_3_10_3_0 = lib.subtractLists [
# time < 1.13 conflicts with time == 1.14.*
- compilerNames.ghc9121
compilerNames.ghc9122
] released;
Cabal_3_12_1_0 = released;
@@ -552,14 +549,12 @@ let
funcmp = released;
git-annex = [
# 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
@@ -587,7 +582,6 @@ let
compilerNames.ghc967
];
weeder = lib.subtractLists [
- compilerNames.ghc9101
compilerNames.ghc9102
compilerNames.ghc9103
compilerNames.ghc9122
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 8c40fb1c00702..db69558506685 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -361,7 +361,6 @@ let
packages =
genAttrs
[
- "ghc94"
"ghc96"
"ghc98"
"ghc910"
@@ -395,9 +394,6 @@ let
"aarch64-linux"
];
- # Fails CI in its current state
- ocamlPackages = { };
-
pkgsRocm = pkgs.rocmPackages.meta.release-packagePlatforms;
};
mapTestOn-packages = if attrNamesOnly then packageJobs else mapTestOn packageJobs;
diff --git a/pkgs/top-level/variants.nix b/pkgs/top-level/variants.nix
index ea288206dfbc5..e3a12fcadcf59 100644
--- a/pkgs/top-level/variants.nix
+++ b/pkgs/top-level/variants.nix
@@ -165,6 +165,7 @@ self: super: {
"nostrictaliasing"
"pacret"
"glibcxxassertions"
+ "libcxxhardeningfast"
"trivialautovarinit"
]
) super'.stdenv;