diff --git a/doc/hooks/versionCheckHook.section.md b/doc/hooks/versionCheckHook.section.md index 229aebc538a55..f2fa14bb07a55 100644 --- a/doc/hooks/versionCheckHook.section.md +++ b/doc/hooks/versionCheckHook.section.md @@ -30,7 +30,7 @@ The variables that this phase control are: - `dontVersionCheck`: Disable adding this hook to the [`preInstallCheckHooks`](#ssec-installCheck-phase). Useful if you do want to load the bash functions of the hook, but run them differently. - `versionCheckProgram`: The full path to the program that should print the `${version}` string. Defaults to using the first non-empty value `$binary` out of `${NIX_MAIN_PROGRAM}` and `${pname}`, in that order, to build roughly `${placeholder "out"}/bin/$binary`. `${NIX_MAIN_PROGRAM}`'s value comes from `meta.mainProgram`, and does not normally need to be set explicitly. When setting `versionCheckProgram`, using `$out` directly won't work, as environment variables from this variable are not expanded by the hook. Hence using `placeholder "out"` is unavoidable. -- `versionCheckProgramArg`: The argument that needs to be passed to `versionCheckProgram`. If undefined the hook tries first `--help` and then `--version`. Examples: `version`, `-V`, `-v`. +- `versionCheckProgramArg`: The argument that needs to be passed to `versionCheckProgram`. If undefined the hook tries first `--version` and then `--help`. Examples: `version`, `-V`, `-v`. - `versionCheckKeepEnvironment`: A list of environment variables to keep and pass to the command. Only those variables should be added to this list that are actually required for the version command to work. If it is not feasible to explicitly list all these environment variables you can set this parameter to the special value `"*"` to disable the `--ignore-environment` flag and thus keep all environment variables. - `preVersionCheck`: A hook to run before the check is done. - `postVersionCheck`: A hook to run after the check is done. diff --git a/doc/languages-frameworks/perl.section.md b/doc/languages-frameworks/perl.section.md index 50fc4945ff765..dd95f3740837d 100644 --- a/doc/languages-frameworks/perl.section.md +++ b/doc/languages-frameworks/perl.section.md @@ -71,7 +71,7 @@ To install it with `nix-env` instead: `nix-env -f. -iA perlPackages.ClassC3`. So what does `buildPerlPackage` do? It does the following: 1. In the configure phase, it calls `perl Makefile.PL` to generate a Makefile. You can set the variable `makeMakerFlags` to pass flags to `Makefile.PL` -2. It adds the contents of the `PERL5LIB` environment variable to `#! .../bin/perl` line of Perl scripts as `-Idir` flags. This ensures that a script can find its dependencies. (This can cause this shebang line to become too long for Darwin to handle; see the note below.) +2. It adds the contents of the `PERL5LIB` environment variable to a use lib statement at the start of Perl scripts. This ensures that a script can find its dependencies. 3. In the fixup phase, it writes the propagated build inputs (`propagatedBuildInputs`) to the file `$out/nix-support/propagated-user-env-packages`. `nix-env` recursively installs all packages listed in this file when you install a package that has it. This ensures that a Perl package can find its dependencies. `buildPerlPackage` is built on top of `stdenv`, so everything can be customised in the usual way. For instance, the `BerkeleyDB` module has a `preConfigure` hook to generate a configuration file used by `Makefile.PL`: @@ -120,37 +120,6 @@ Dependencies on other Perl packages can be specified in the `buildInputs` and `p } ``` -On Darwin, if a script has too many `-Idir` flags in its first line (its “shebang line”), it will not run. This can be worked around by calling the `shortenPerlShebang` function from the `postInstall` phase: - -```nix -{ - lib, - stdenv, - buildPerlPackage, - fetchurl, - shortenPerlShebang, -}: - -{ - ImageExifTool = buildPerlPackage { - pname = "Image-ExifTool"; - version = "12.50"; - - src = fetchurl { - url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz"; - hash = "sha256-vOhB/FwQMC8PPvdnjDvxRpU6jAZcC6GMQfc0AH4uwKg="; - }; - - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/exiftool - ''; - }; -} -``` - -This will remove the `-I` flags from the shebang line, rewrite them in the `use lib` form, and put them on the next line instead. This function can be given any number of Perl scripts as arguments; it will modify them in-place. - ### Generation from CPAN {#ssec-generation-from-CPAN} Nix expressions for Perl packages can be generated (almost) automatically from CPAN. This is done by the program `nix-generate-from-cpan`, which can be installed as follows: diff --git a/doc/languages-frameworks/qt.section.md b/doc/languages-frameworks/qt.section.md index dbd08fb58718f..bd1652d9effba 100644 --- a/doc/languages-frameworks/qt.section.md +++ b/doc/languages-frameworks/qt.section.md @@ -25,15 +25,7 @@ stdenv.mkDerivation { The same goes for Qt 5 where libraries and tools are under `libsForQt5`. -Any Qt package should include `wrapQtAppsHook` or `wrapQtAppsNoGuiHook` in `nativeBuildInputs`, or explicitly set `dontWrapQtApps` to bypass generating the wrappers. - -::: {.note} - -`wrapQtAppsHook` propagates plugins and QML components from `qtwayland` on platforms that support it, to allow applications to act as native Wayland clients. It should be used for all graphical applications. - -`wrapQtAppsNoGuiHook` does not propagate `qtwayland` to reduce closure size for purely command-line applications. - -::: +Any Qt package should include `wrapQtAppsHook` in `nativeBuildInputs`, or explicitly set `dontWrapQtApps` to bypass generating the wrappers. ## Packages supporting multiple Qt versions {#qt-versions} diff --git a/doc/languages-frameworks/typst.section.md b/doc/languages-frameworks/typst.section.md index 5d95f44ae7ad2..711b6ce193bd6 100644 --- a/doc/languages-frameworks/typst.section.md +++ b/doc/languages-frameworks/typst.section.md @@ -22,7 +22,7 @@ Since **Typst Universe** does not provide a way to fetch a package with a specif ```nix typst.withPackages.override (old: { - typstPackages = old.typstPackages.extend ( + typstPackages = old.typstPackages.overrideScope ( _: previous: { polylux_0_4_0 = previous.polylux_0_4_0.overrideAttrs (oldPolylux: { src = oldPolylux.src.overrideAttrs { outputHash = YourUpToDatePolyluxHash; }; diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index a984da6d2989c..e91f536c48adb 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -3,7 +3,11 @@ ## Highlights {#sec-nixpkgs-release-26.05-highlights} -- Create the first release note entry in this section! +- GCC has been updated from GCC 14 to GCC 15. + This introduces some backwards incompatible changes; Refer to the [upstream porting guide](https://gcc.gnu.org/gcc-15/porting_to.html) for details. + +- Node.js default version has been updated from 22 LTS to 24 LTS. + This introduces some breaking changes; Refer to the [upstream migration article](https://nodejs.org/en/blog/migrations/v22-to-v24) for details. ## Backward Incompatibilities {#sec-nixpkgs-release-26.05-incompatibilities} diff --git a/lib/licenses.nix b/lib/licenses.nix index b67421054e8b4..ce2e15951fc12 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -64,6 +64,11 @@ lib.mapAttrs mkLicense ( free = false; }; + adobeDisplayPostScript = { + spdxId = "Adobe-Display-PostScript"; + fullName = "Adobe Display PostScript License"; + }; + adobeUtopia = { fullName = "Adobe Utopia Font License"; spdxId = "Adobe-Utopia"; @@ -501,6 +506,11 @@ lib.mapAttrs mkLicense ( fullName = "curl License"; }; + dec3Clause = { + spdxId = "DEC-3-Clause"; + fullName = "DEC 3-Clause License"; + }; + doc = { spdxId = "DOC"; fullName = "DOC License"; @@ -727,6 +737,11 @@ lib.mapAttrs mkLicense ( spdxId = "HPND-sell-variant"; }; + hpndSellVariantMitDisclaimerXserver = { + spdxId = "HPND-sell-MIT-disclaimer-xserver"; + fullName = "Historical Permission Notice and Disclaimer - sell xserver variant with MIT disclaimer"; + }; + hpndDec = { fullName = "Historical Permission Notice and Disclaimer - DEC variant"; spdxId = "HPND-DEC"; @@ -1113,6 +1128,13 @@ lib.mapAttrs mkLicense ( fullName = "Non-Profit Open Software License 3.0"; }; + # NTP is basically HPND, but spdx and the OSI recognize it + # hpnd says "and without fee", ntp "with or without fee" + ntp = { + spdxId = "NTP"; + fullName = "NTP License"; + }; + nvidiaCuda = { shortName = "CUDA EULA"; fullName = "CUDA Toolkit End User License Agreement (EULA)"; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 472d56cd68dd0..4e94f4cbcda62 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -29461,6 +29461,12 @@ email = "rasmus@liaskar.net"; githubId = 152716976; }; + zivarah = { + name = "Brian Lyles"; + github = "zivarah"; + email = "brianmlyles@gmail.com"; + githubId = 1123282; + }; zlepper = { name = "Rasmus Hansen"; github = "zlepper"; diff --git a/nixos/tests/lvm2/default.nix b/nixos/tests/lvm2/default.nix index 58eef6e0ccef4..a03ada67cdac5 100644 --- a/nixos/tests/lvm2/default.nix +++ b/nixos/tests/lvm2/default.nix @@ -4,11 +4,11 @@ pkgs ? import ../../.. { inherit system config; }, lib ? pkgs.lib, kernelVersionsToTest ? [ - "5.4" "5.10" "5.15" "6.1" "6.6" + "6.12" "latest" ], }: diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix index b83c55e126623..2f7bb835c4f21 100644 --- a/pkgs/applications/blockchains/bitcoin-knots/default.nix +++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix @@ -187,7 +187,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/bitcoin-cli"; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 01ff36eae23a9..6ce894f595b5f 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -187,7 +187,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/bitcoin-cli"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.tests = { diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 48b8c7324cb33..2d46569084bc5 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.1869"; + version = "9.1.1918"; outputs = [ "out" @@ -11,7 +11,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-AHx4AHsJAsEE5LRzKgBeV3LoCaoHUB+0/gq7kOHObMk="; + hash = "sha256-NU/A7yWcLaC+wqsfiHYVhnSZHGDao6+Oib/bSFNSVyQ="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix index 9b458b7e3bfc2..fb3bd413c5940 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix @@ -32,7 +32,6 @@ let nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = false; meta.mainProgram = "cord"; diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 44eaf9aed9b54..ef5747902b287 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -82,6 +82,16 @@ let }) ]; + # Fix build with GCC 15 + # https://bugs.winehq.org/show_bug.cgi?id=58191 + patches-add-truncf-to-the-import-library = [ + (pkgs.fetchpatch { + name = "add-truncf-to-the-import-library.patch"; + url = "https://gitlab.winehq.org/wine/wine/-/commit/ed66bd5c97ecc17c42a4942dafac7d406c1e5120.patch"; + hash = "sha256-mn0fRZ840MYk1WZsBLcachUzyNmBUSlvf50t9jFGXp0="; + }) + ]; + inherit (pkgs) writeShellScript; in rec { @@ -114,7 +124,8 @@ rec { # Also look for root certificates at $NIX_SSL_CERT_FILE ./cert-path.patch ] - ++ patches-binutils-2_44-fix-wine-older-than-10_2; + ++ patches-binutils-2_44-fix-wine-older-than-10_2 + ++ patches-add-truncf-to-the-import-library; updateScript = writeShellScript "update-wine-stable" '' ${updateScriptPreamble} @@ -133,9 +144,9 @@ rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "10.18"; + version = "10.19"; url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz"; - hash = "sha256-Uftyc9ZdCd6gMsSl4hl7EnJLJ8o2DhpiKyNz0e5QrXs="; + hash = "sha256-fOxYMjxvKq7nrKk1Fzecu/75biwsWAxo/4XdAAy73UY="; patches = [ # Also look for root certificates at $NIX_SSL_CERT_FILE @@ -145,7 +156,7 @@ rec { # see https://gitlab.winehq.org/wine/wine-staging staging = fetchFromGitLab { inherit version; - hash = "sha256-vhIjeEbWLpcKtkBd/KeAeaLKOUZt7LAkH6GTebs3ROM="; + hash = "sha256-GmHeqHZPnFZkntMOJJzRDUN9H+G1qXdacy/Al6T5eZU="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; @@ -204,7 +215,8 @@ rec { # Also look for root certificates at $NIX_SSL_CERT_FILE ./cert-path.patch ] - ++ patches-binutils-2_44-fix-wine-older-than-10_2; + ++ patches-binutils-2_44-fix-wine-older-than-10_2 + ++ patches-add-truncf-to-the-import-library; # see https://gitlab.winehq.org/wine/wine-staging staging = fetchFromGitLab { diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 74d5d6f732ce4..fffd5ddd398de 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -14,14 +14,12 @@ }: let qgis-unwrapped = libsForQt5.callPackage ./unwrapped.nix { - withGrass = withGrass; - withServer = withServer; - withWebKit = withWebKit; + inherit withGrass withServer withWebKit; }; in symlinkJoin { - inherit (qgis-unwrapped) version src; + inherit (qgis-unwrapped) version outputs src; pname = "qgis"; paths = [ qgis-unwrapped ]; @@ -42,6 +40,8 @@ symlinkJoin { --prefix PATH : $program_PATH \ --set PYTHONPATH $program_PYTHONPATH done + + ln -s ${qgis-unwrapped.man} $man ''; passthru = { diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 09bec63225cea..7478f5845b13d 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -83,6 +83,10 @@ in mkDerivation rec { version = "3.44.5"; pname = "qgis-unwrapped"; + outputs = [ + "out" + "man" + ]; src = fetchFromGitHub { owner = "qgis"; @@ -181,7 +185,7 @@ mkDerivation rec { dontWrapGApps = true; # wrapper params passed below postFixup = lib.optionalString withGrass '' - # GRASS has to be availble on the command line even though we baked in + # GRASS has to be available on the command line even though we baked in # the path at build time using GRASS_PREFIX. # Using wrapGAppsHook also prevents file dialogs from crashing the program # on non-NixOS. diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 8a33b6e6099ca..774b76f89fe05 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -85,13 +85,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.2-8"; + version = "7.1.2-11"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; tag = finalAttrs.version; - hash = "sha256-2jSQ59Wi6/1dbS/AgM1DfW6WlwoYuJlnTLoM8Mc6Ji8="; + hash = "sha256-RFiE23VW8AbVb7iglxjQMT6njDw+P7vLW6+nSKqN0p8="; }; outputs = [ diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-schema.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-schema.nix index 34b1775a428fe..07da05cc59c0a 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-schema.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-schema.nix @@ -46,7 +46,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/helm-schema/bin/schema"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index 731e1e5955f87..f766104463f88 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -456,7 +456,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { inherit diff --git a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix index e1cd0441551cd..ee97df25bd4e4 100644 --- a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix @@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "kubectl plugin to list allocations (cpu, memory, gpu,... X utilization, requested, limit, allocatable,...)"; diff --git a/pkgs/applications/networking/instant-messengers/linphone/bc-mbedtls/default.nix b/pkgs/applications/networking/instant-messengers/linphone/bc-mbedtls/default.nix index ad08bf4996b54..9172f6a0519cc 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/bc-mbedtls/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/bc-mbedtls/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitLab, + fetchpatch, cmake, ninja, @@ -27,6 +28,17 @@ stdenv.mkDerivation { fetchSubmodules = true; }; + patches = [ + # Fix build with gcc15 + # https://www.github.com/Mbed-TLS/mbedtls/pull/10215 + (fetchpatch { + name = "linphone-mbedtls-fix-unterminated-string-initialization.patch"; + url = "https://github.com/Mbed-TLS/mbedtls/commit/d593c54b3cbfc3c806476a725e7d82763da0da9e.patch"; + hash = "sha256-hh2cGzL75fEqlFNhEyL2fI9qsBW2Eq43DdWFD9qLsKE="; + excludes = [ "ChangeLog.d/unterminated-string-initialization.txt" ]; + }) + ]; + nativeBuildInputs = [ cmake ninja diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index a90c06d928908..06ecaa84591ef 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -174,7 +174,6 @@ stdenv.mkDerivation rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = writeScript "update-weechat" '' #!/usr/bin/env nix-shell diff --git a/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix index 2df2a5ab3d8ab..bb8bc8e456594 100644 --- a/pkgs/applications/networking/mullvad/mullvad.nix +++ b/pkgs/applications/networking/mullvad/mullvad.nix @@ -110,7 +110,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 47e7b25747e90..b6207c808046b 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -93,6 +93,7 @@ ncurses, libepoxy, gpgme, + gpgmepp, libwebp, abseil-cpp, libepubgen, @@ -358,7 +359,7 @@ stdenv.mkDerivation (finalAttrs: { # Fix this path to point to where the headers can actually be found instead. substituteInPlace configure.ac --replace-fail \ 'GPGMEPP_CFLAGS=-I/usr/include/gpgme++' \ - 'GPGMEPP_CFLAGS=-I${gpgme.dev}/include/gpgme++' + 'GPGMEPP_CFLAGS=-I${lib.getDev gpgmepp}/include/gpgme++' # Fix for Python 3.12 substituteInPlace configure.ac --replace-fail distutils.sysconfig sysconfig @@ -422,6 +423,7 @@ stdenv.mkDerivation (finalAttrs: { glm adwaita-icon-theme gpgme + gpgmepp graphite2 gtk3 (harfbuzz.override { withIcu = true; }) diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix index 3eac7df05476e..a5722c9058eef 100644 --- a/pkgs/applications/radio/gnuradio/shared.nix +++ b/pkgs/applications/radio/gnuradio/shared.nix @@ -27,6 +27,10 @@ let cross = stdenv.hostPlatform != stdenv.buildPlatform; in { + outputs = [ + "out" + "man" + ]; src = if overrideSrc != { } then overrideSrc diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index 59e7dd7fa5d50..f7b96b1c1b95e 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -79,7 +79,7 @@ let pythonEnv = unwrapped.python.withPackages (ps: pythonPkgs); pname = unwrapped.pname + "-wrapped"; - inherit (unwrapped) version; + inherit (unwrapped) outputs version; makeWrapperArgs = builtins.concatStringsSep " " ( [ ] @@ -214,15 +214,21 @@ let self = if doWrap then stdenv.mkDerivation { - inherit pname version passthru; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ + inherit + pname + outputs + version + passthru + ; + nativeBuildInputs = [ + makeWrapper xorg.lndir ]; buildCommand = '' mkdir $out cd $out - lndir -silent ${unwrapped} + lndir -silent ${unwrapped.out} + lndir -silent ${unwrapped.man} ${lib.optionalString (extraPackages != [ ]) ( builtins.concatStringsSep "\n" ( map (pkg: '' diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index 2b7492d8fbf2b..b9cbc8d0210b7 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -32,6 +32,11 @@ stdenv.mkDerivation rec { url = "https://github.com/myriadrf/LimeSuite/commit/4e5ad459d50c922267a008e5cecb3efdbff31f09.patch"; hash = "sha256-OASki3bISJvV7wjMz0pBT3kO5RvJ5BnymiF6ruHkCJ8="; }) + # Fixes for C23 (GCC 15). Remove upon next version bump + (fetchpatch { + url = "https://github.com/myriadrf/LimeSuite/commit/524cd2e548b11084e6f739b2dfe0f958c2e30354.patch"; + hash = "sha256-wxwhFjXcIgBMTJoJ6efdtyttxMFZviCTXtEb2qFX9yU="; + }) ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index e3f5f7619fd64..590c2d6a2d126 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -264,7 +264,8 @@ let ] ++ lib.optional buildIde "coqide" ++ lib.optional (!coqAtLeast "8.14") "bin/votour"; - enableParallelBuilding = true; + # workaround for irreproducible build error in https://github.com/NixOS/nixpkgs/pull/474970 + enableParallelBuilding = coqAtLeast "8.14"; createFindlibDestdir = true; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index d122f58af4f18..0af9390e8c3b8 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" + "man" "tex" ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 91dda130ccce3..7abb812c99ef3 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -361,7 +361,6 @@ let doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { # Exposed for tarsum build on non-linux systems (build-support/docker/default.nix) diff --git a/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch b/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch index 33c4ffff6fe54..9ece109737582 100644 --- a/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch +++ b/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch @@ -9,7 +9,7 @@ index 45e9a1f9b0..494ee00c66 100644 +static int is_in_store_path(const char *path) +{ + static char *store_path = NULL; -+ int store_path_len = -1; ++ static ssize_t store_path_len = -1; + + if (store_path_len == -1) { + if ((store_path = getenv("NIX_STORE")) != NULL) @@ -19,7 +19,7 @@ index 45e9a1f9b0..494ee00c66 100644 + } + + if (store_path_len > 0) -+ return strncmp(path, store_path, strlen(store_path)) == 0; ++ return strncmp(path, store_path, store_path_len) == 0; + return 0; +} + diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix index 9b8be3879b2ad..2f32733c46d8d 100644 --- a/pkgs/applications/virtualization/singularity/generic.nix +++ b/pkgs/applications/virtualization/singularity/generic.nix @@ -277,7 +277,6 @@ in versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/${projectName}"; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix index 3f20759e952e2..aefd57fbe0b40 100644 --- a/pkgs/build-support/build-mozilla-mach/default.nix +++ b/pkgs/build-support/build-mozilla-mach/default.nix @@ -59,7 +59,9 @@ in pkgsCross, # wasm32 rlbox python3, runCommand, + rustc, rust-cbindgen, + rustPlatform, unzip, which, wrapGAppsHook3, @@ -201,25 +203,9 @@ assert elfhackSupport -> isElfhackPlatform stdenv; let inherit (lib) enableFeature; - rustPackages = - pkgs: - (pkgs.rust.override ( - # aarch64-darwin firefox crashes on loading favicons due to a llvm 21 bug: - # https://github.com/NixOS/nixpkgs/issues/453372 - # https://bugzilla.mozilla.org/show_bug.cgi?id=1995582#c16 - lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) { - llvmPackages = pkgs.llvmPackages_20; - } - )).packages.stable; - - toRustC = pkgs: (rustPackages pkgs).rustc; - - rustc = toRustC pkgs; - inherit (rustPackages pkgs) rustPlatform; - # Target the LLVM version that rustc is built with for LTO. llvmPackages0 = rustc.llvmPackages; - llvmPackagesBuildBuild0 = (toRustC pkgsBuildBuild).llvmPackages; + llvmPackagesBuildBuild0 = pkgsBuildBuild.rustc.llvmPackages; # Force the use of lld and other llvm tools for LTO llvmPackages = llvmPackages0.override { @@ -234,7 +220,7 @@ let # LTO requires LLVM bintools including ld.lld and llvm-ar. buildStdenv = overrideCC llvmPackages.stdenv ( llvmPackages.stdenv.cc.override { - bintools = if ltoSupport then (toRustC buildPackages).llvmPackages.bintools else stdenv.cc.bintools; + bintools = if ltoSupport then buildPackages.rustc.llvmPackages.bintools else stdenv.cc.bintools; } ); diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index f66acf3d5e754..cf4fc875b5855 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -74,7 +74,7 @@ ($path) sub findFilesInDir($relName, $target, $ignoreCollisions, $checkCollisionContents, $priority, $ignoreSingleFileOutputs) { opendir DIR, "$target" or die "cannot open `$target': $!"; - my @names = readdir DIR or die; + my @names = readdir DIR; closedir DIR; foreach my $name (@names) { diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index 7ad39a58935c7..06f96b75ce05c 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -89,17 +89,20 @@ lib.extendMkDerivation { "buildRustPackage: `useFetchCargoVendor` is non‐optional and enabled by default as of 25.05, remove it" true; { - env = { - PKG_CONFIG_ALLOW_CROSS = if stdenv.buildPlatform != stdenv.hostPlatform then 1 else 0; - RUST_LOG = logLevel; - RUSTFLAGS = - lib.optionalString ( - stdenv.hostPlatform.isDarwin && buildType == "debug" - ) "-C split-debuginfo=packed " - # Workaround the existing RUSTFLAGS specified as a list. - + interpolateString (args.RUSTFLAGS or ""); - } - // args.env or { }; + env = + let + isDarwinDebug = stdenv.hostPlatform.isDarwin && buildType == "debug"; + in + { + PKG_CONFIG_ALLOW_CROSS = if stdenv.buildPlatform != stdenv.hostPlatform then 1 else 0; + RUST_LOG = logLevel; + # Prevent shadowing *_RUSTFLAGS environment variables + ${if args ? RUSTFLAGS || isDarwinDebug then "RUSTFLAGS" else null} = + lib.optionalString isDarwinDebug "-C split-debuginfo=packed " + # Workaround the existing RUSTFLAGS specified as a list. + + interpolateString (args.RUSTFLAGS or ""); + } + // args.env or { }; cargoDeps = if cargoVendorDir != null then diff --git a/pkgs/build-support/rust/hooks/maturin-build-hook.sh b/pkgs/build-support/rust/hooks/maturin-build-hook.sh index 57e4e12b4f1ea..3f4625a4bc320 100644 --- a/pkgs/build-support/rust/hooks/maturin-build-hook.sh +++ b/pkgs/build-support/rust/hooks/maturin-build-hook.sh @@ -23,11 +23,16 @@ maturinBuildHook() { "--target" "@rustcTargetSpec@" "--manylinux" "off" "--strip" - "--release" "--out" "$dist" "--interpreter" "$interpreter_name" ) + if [ -n "${maturinBuildProfile}" ]; then + flagsArray+=("--profile" "${maturinBuildProfile}") + else + flagsArray+=("--release") + fi + concatTo flagsArray maturinBuildFlags echoCmd 'maturinBuildHook flags' "${flagsArray[@]}" diff --git a/pkgs/build-support/setup-hooks/make-symlinks-relative.sh b/pkgs/build-support/setup-hooks/make-symlinks-relative.sh index b07b0c5ae804c..478543afed115 100644 --- a/pkgs/build-support/setup-hooks/make-symlinks-relative.sh +++ b/pkgs/build-support/setup-hooks/make-symlinks-relative.sh @@ -1,37 +1,35 @@ # symlinks are often created in postFixup # don't use fixupOutputHooks, it is before postFixup -postFixupHooks+=(_makeSymlinksRelativeInAllOutputs) +if [[ -z "${dontRewriteSymlinks-}" ]]; then + postFixupHooks+=(_makeSymlinksRelative) +fi + # For every symlink in $output that refers to another file in $output -# ensure that the symlink is relative. This removes references to the output -# has from the resulting store paths and thus the NAR files. +# ensure that the symlink is relative. +# This increases the chance that NAR files can be deduplicated. _makeSymlinksRelative() { - local symlinkTarget - - if [ "${dontRewriteSymlinks-}" ] || [ ! -e "$prefix" ]; then - return - fi - - while IFS= read -r -d $'\0' f; do - symlinkTarget=$(readlink "$f") - if [[ "$symlinkTarget"/ != "$prefix"/* ]]; then - # skip this symlink as it doesn't point to $prefix - continue - fi + local prefixes + prefixes=() + for output in $(getAllOutputNames); do + [ ! -e "${!output}" ] && continue + prefixes+=( "${!output}" ) + done + find "${prefixes[@]}" -type l -printf '%H\0%p\0' \ + | xargs -0 -n2 -r -P "$NIX_BUILD_CORES" sh -c ' + output="$1" + link="$2" - if [ ! -e "$symlinkTarget" ]; then - echo "the symlink $f is broken, it points to $symlinkTarget (which is missing)" - fi + linkTarget=$(readlink "$link") - echo "rewriting symlink $f to be relative to $prefix" - ln -snrf "$symlinkTarget" "$f" + # only touch links that point inside the same output tree + [[ $linkTarget == "$output"/* ]] || exit 0 - done < <(find $prefix -type l -print0) -} + if [ ! -e "$linkTarget" ]; then + echo "the symlink $link is broken, it points to $linkTarget (which is missing)" + fi -_makeSymlinksRelativeInAllOutputs() { - local output - for output in $(getAllOutputNames); do - prefix="${!output}" _makeSymlinksRelative - done + echo "making symlink relative: $link" + ln -snrf "$linkTarget" "$link" + ' _ } diff --git a/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh b/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh index 825da1bde962c..e573ba0b13dbf 100644 --- a/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh +++ b/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh @@ -1,88 +1,4 @@ -# This setup hook modifies a Perl script so that any "-I" flags in its shebang -# line are rewritten into a "use lib ..." statement on the next line. This gets -# around a limitation in Darwin, which will not properly handle a script whose -# shebang line exceeds 511 characters. -# -# Each occurrence of "-I /path/to/lib1" or "-I/path/to/lib2" is removed from -# the shebang line, along with the single space that preceded it. These library -# paths are placed into a new line of the form -# -# use lib "/path/to/lib1", "/path/to/lib2"; -# -# immediately following the shebang line. If a library appeared in the original -# list more than once, only its first occurrence will appear in the output -# list. In other words, the libraries are deduplicated, but the ordering of the -# first appearance of each one is preserved. -# -# Any flags other than "-I" in the shebang line are left as-is, and the -# interpreter is also left alone (although the script will abort if the -# interpreter does not seem to be either "perl" or else "env" with "perl" as -# its argument). Each line after the shebang line is left unchanged. Each file -# is modified in place. -# -# Usage: -# shortenPerlShebang SCRIPT... - +# Deprecated. Invocation in derivations can be safely removed. shortenPerlShebang() { - while [ $# -gt 0 ]; do - _shortenPerlShebang "$1" - shift - done -} - -_shortenPerlShebang() { - local program="$1" - - echo "shortenPerlShebang: rewriting shebang line in $program" - - if ! isScript "$program"; then - die "shortenPerlShebang: refusing to modify $program because it is not a script" - fi - - local temp="$(mktemp)" - - gawk ' - (NR == 1) { - if (!($0 ~ /\/(perl|env +perl)\>/)) { - print "shortenPerlShebang: script does not seem to be a Perl script" > "/dev/stderr" - exit 1 - } - idx = 0 - while (match($0, / -I ?([^ ]+)/, pieces)) { - matches[idx] = pieces[1] - idx++ - $0 = gensub(/ -I ?[^ ]+/, "", 1, $0) - } - print $0 - if (idx > 0) { - prefix = "use lib " - for (idx in matches) { - path = matches[idx] - if (!(path in seen)) { - printf "%s\"%s\"", prefix, path - seen[path] = 1 - prefix = ", " - } - } - print ";" - } - } - (NR > 1 ) { - print - } - ' "$program" > "$temp" || die - # Preserve the mode of the original file - cp --preserve=mode --attributes-only "$program" "$temp" - mv "$temp" "$program" - - # Measure the new shebang line length and make sure it's okay. We subtract - # one to account for the trailing newline that "head" included in its - # output. - local new_length=$(( $(head -n 1 "$program" | wc -c) - 1 )) - - # Darwin is okay when the shebang line contains 511 characters, but not - # when it contains 512 characters. - if [ $new_length -ge 512 ]; then - die "shortenPerlShebang: shebang line is $new_length characters--still too long for Darwin!" - fi + : } diff --git a/pkgs/by-name/_1/_1password-cli/package.nix b/pkgs/by-name/_1/_1password-cli/package.nix index 203aac1dbe542..59bccd4b84f40 100644 --- a/pkgs/by-name/_1/_1password-cli/package.nix +++ b/pkgs/by-name/_1/_1password-cli/package.nix @@ -80,7 +80,6 @@ stdenv.mkDerivation { doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/op"; - versionCheckProgramArg = "--version"; passthru = { updateScript = ./update.sh; diff --git a/pkgs/by-name/_9/_9base/fix-build-with-c23.patch b/pkgs/by-name/_9/_9base/fix-build-with-c23.patch new file mode 100644 index 0000000000000..f8f58d6c5f9bb --- /dev/null +++ b/pkgs/by-name/_9/_9base/fix-build-with-c23.patch @@ -0,0 +1,101 @@ +From ba9e372f3165e0cfd73fcc8a1352fbb790ea2439 Mon Sep 17 00:00:00 2001 +From: Moraxyc +Date: Sat, 27 Dec 2025 23:22:47 +0800 +Subject: [PATCH] fix build with c23 + +--- + dd/dd.c | 4 ++-- + troff/n5.c | 24 ++++++++++++------------ + 2 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/dd/dd.c b/dd/dd.c +index 9e69b6b..1e7d4c5 100644 +--- a/dd/dd.c ++++ b/dd/dd.c +@@ -312,11 +312,11 @@ match(char *s) + cs = string; + while(*cs++ == *s) + if(*s++ == '\0') +- goto true; ++ goto match_true; + if(*s != '\0') + return 0; + +-true: ++match_true: + cs--; + string = cs; + return 1; +diff --git a/troff/n5.c b/troff/n5.c +index 7266432..7566068 100644 +--- a/troff/n5.c ++++ b/troff/n5.c +@@ -642,15 +642,15 @@ void caseif(void) + void caseif1(int x) + { + extern int falsef; +- int notflag, true; ++ int notflag, truev; + Tchar i; + + if (x == 2) { + notflag = 0; +- true = iflist[ifx]; ++ truev = iflist[ifx]; + goto i1; + } +- true = 0; ++ truev = 0; + skip(); + if ((cbits(i = getch())) == '!') { + notflag = 1; +@@ -663,37 +663,37 @@ void caseif1(int x) + ifnum = 0; + if (!nonumb) { + if (i > 0) +- true++; ++ truev++; + goto i1; + } + i = getch(); + switch (cbits(i)) { + case 'e': + if (!(numtabp[PN].val & 01)) +- true++; ++ truev++; + break; + case 'o': + if (numtabp[PN].val & 01) +- true++; ++ truev++; + break; + case 'n': + if (NROFF) +- true++; ++ truev++; + break; + case 't': + if (TROFF) +- true++; ++ truev++; + break; + case ' ': + break; + default: +- true = cmpstr(i); ++ truev = cmpstr(i); + } + i1: +- true ^= notflag; ++ truev ^= notflag; + if (x == 1) +- iflist[ifx] = !true; +- if (true) { ++ iflist[ifx] = !truev; ++ if (truev) { + i2: + while ((cbits(i = getch())) == ' ') + ; +-- +2.51.2 + diff --git a/pkgs/by-name/_9/_9base/package.nix b/pkgs/by-name/_9/_9base/package.nix index e4cd519d3aaa7..2b4f76e55f426 100644 --- a/pkgs/by-name/_9/_9base/package.nix +++ b/pkgs/by-name/_9/_9base/package.nix @@ -29,6 +29,10 @@ stdenv.mkDerivation { # https://github.com/9fans/plan9port/commit/540caa5873bcc3bc2a0e1896119f5b53a0e8e630 # https://github.com/9fans/plan9port/commit/323e1a8fac276f008e6d5146a83cbc88edeabc87 ./getcallerpc-use-macro-or-stub.patch + # fix build with c23 + # dd.c:315:30: error: expected identifier or '*' before 'true' + # n5.c:690:22: error: lvalue required as left operand of assignment + ./fix-build-with-c23.patch ] ++ patches; diff --git a/pkgs/by-name/ab/abcm2ps/package.nix b/pkgs/by-name/ab/abcm2ps/package.nix index 8eb66b52e9e52..04e1bc40be090 100644 --- a/pkgs/by-name/ab/abcm2ps/package.nix +++ b/pkgs/by-name/ab/abcm2ps/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchfossil, + fetchpatch2, docutils, pkg-config, freetype, @@ -19,6 +20,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-YA36wfj7owKu/KyWgCj6U8EJEh831cFtQj4/JtH6kVg="; }; + patches = [ + # fix build with C23 + # 'bool' is a keyword with '-std=c23' onwards + # error: 'bool' cannot be used here + (fetchpatch2 { + url = "https://salsa.debian.org/debian/abcm2ps/-/raw/f741931567bb8cac8c9ed8e73b7ba838e4c17eb3/debian/patches/c23.diff"; + hash = "sha256-+2LuHqY5+nWykCYGEOazDeJAf9sggPNp2yiqMQRepfM="; + }) + ]; + configureFlags = [ "--INSTALL=install" ]; diff --git a/pkgs/by-name/ab/abcmidi/package.nix b/pkgs/by-name/ab/abcmidi/package.nix index c3c21c93e4c64..94562d1bb5dae 100644 --- a/pkgs/by-name/ab/abcmidi/package.nix +++ b/pkgs/by-name/ab/abcmidi/package.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-OBlkk5Fq3ep+wZqFfSXNqrXtznisNFjn9uDVj/Q4Odk="; }; + # TODO: remove once https://github.com/sshlien/abcmidi/pull/15 merged + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; + meta = { homepage = "https://abc.sourceforge.net/abcMIDI/"; downloadPage = "https://ifdo.ca/~seymour/runabc/top.html"; diff --git a/pkgs/by-name/ab/abook/0001-Fix-wcwidth-declaration.patch b/pkgs/by-name/ab/abook/0001-Fix-wcwidth-declaration.patch new file mode 100644 index 0000000000000..d95904f19da0a --- /dev/null +++ b/pkgs/by-name/ab/abook/0001-Fix-wcwidth-declaration.patch @@ -0,0 +1,48 @@ +From 2e3ea5ab32ed356c45e0a7a8db37924a77a1c949 Mon Sep 17 00:00:00 2001 +From: Marcin Serwin +Date: Sat, 20 Dec 2025 12:51:13 +0100 +Subject: [PATCH] Fix wcwidth declaration + +The wcwidth function is declared in `wchar.h` on POSIX systems which +is not included in the default Autoconf includes. Because of this +HAVE_DECL_WCWIDTH would be configured to 0. + +Since C23 functions with no arguments in prototypes are treated as +taking no arguments. This results in mismatched declaration since in +wchar.h the functions is declared as taking wchar_t. + +Signed-off-by: Marcin Serwin +--- + configure.ac | 2 +- + mbswidth.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7d756ee..a1ecbe2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -61,7 +61,7 @@ AC_CHECK_HEADER(wchar.h,[ + AC_DEFINE(HAVE_WCHAR_H, 1, [Define if you have the header file.])], + [ac_have_wchar_h=no]) + AC_CHECK_FUNCS(mbtowc wcwidth mbrtowc mbsinit,,ac_widec_funcs=no) +-AC_CHECK_DECLS(wcwidth) ++AC_CHECK_DECLS(wcwidth, [], [], [#include ]) + AC_CHECK_TYPE(wchar_t,,ac_widec_funcs=no) + + if test x$ac_widec_funcs = xyes -a x$ac_have_wchar_h = xyes; then +diff --git a/mbswidth.c b/mbswidth.c +index 031e6b7..54a2cb5 100644 +--- a/mbswidth.c ++++ b/mbswidth.c +@@ -63,7 +63,7 @@ + # warn "this configure-time declaration test was not run" + #endif + #if !HAVE_DECL_WCWIDTH +-int wcwidth (); ++int wcwidth (wchar_t); + #endif + + #ifndef wcwidth +-- +2.51.2 + diff --git a/pkgs/by-name/ab/abook/package.nix b/pkgs/by-name/ab/abook/package.nix index 9f91e82a44d8c..ff2c1e3522c9e 100644 --- a/pkgs/by-name/ab/abook/package.nix +++ b/pkgs/by-name/ab/abook/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchgit, - fetchpatch, autoreconfHook, pkg-config, ncurses, @@ -20,10 +19,7 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/abook-gcc15.patch?h=abook"; - hash = "sha256-+73+USELoby8JvuVOWZe6E+xtdhajnLnDkzD/77QoTo="; - }) + ./0001-Fix-wcwidth-declaration.patch ]; # error: implicit declaration of function 'isalnum' [-Wimplicit-function-declaration] diff --git a/pkgs/by-name/ac/acct/package.nix b/pkgs/by-name/ac/acct/package.nix index 8fb0cb7558372..6457cb539a98b 100644 --- a/pkgs/by-name/ac/acct/package.nix +++ b/pkgs/by-name/ac/acct/package.nix @@ -21,6 +21,12 @@ stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/rpms/psacct/raw/rawhide/f/psacct-6.6.4-sprintf-buffer-overflow.patch"; hash = "sha256-l74tLIuhpXj+dIA7uAY9L0qMjQ2SbDdc+vjHMyVouFc="; }) + # fix build with C23 + # error: passing argument 4 of 'qsort' from incompatible pointer type + (fetchpatch2 { + url = "https://salsa.debian.org/abower/acct/-/raw/7aeb2192d729bcd4583a75765add28c65a7fcf47/debian/patches/Fix-FTBFS-with-C23.patch"; + hash = "sha256-q1LtmhYopgSWIzIoONbKjgigIBU+LPvSvtUM3iL36c0="; + }) ]; meta = { diff --git a/pkgs/by-name/ac/ace-of-penguins/fix-gcc-15.patch b/pkgs/by-name/ac/ace-of-penguins/fix-gcc-15.patch new file mode 100644 index 0000000000000..503d1bf44f393 --- /dev/null +++ b/pkgs/by-name/ac/ace-of-penguins/fix-gcc-15.patch @@ -0,0 +1,22 @@ +diff --git a/lib/table.c b/lib/table.c +index befe696..cc08415 100644 +--- a/lib/table.c ++++ b/lib/table.c +@@ -297,10 +297,11 @@ check_dclick(int x, int y, int t) + } + + int help_is_showing = 0; +-static void help_nothing() { help_is_showing = 0; } ++static void help_nothing(void) { help_is_showing = 0; } ++static void help_nothing_args(int a, int b, int c) { help_is_showing = 0; } + void (*help_redraw)(void) = help_nothing; +-void (*help_click)(int x, int y, int b) = help_nothing; +-void (*help_key)(int c, int x, int y) = help_nothing; ++void (*help_click)(int x, int y, int b) = help_nothing_args; ++void (*help_key)(int c, int x, int y) = help_nothing_args; + + static int no_resize = 0; + void +-- +2.51.2 + diff --git a/pkgs/by-name/ac/ace-of-penguins/package.nix b/pkgs/by-name/ac/ace-of-penguins/package.nix index 86dc3fa998917..28ec3c6490140 100644 --- a/pkgs/by-name/ac/ace-of-penguins/package.nix +++ b/pkgs/by-name/ac/ace-of-penguins/package.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation (finalAttrs: { # make-imglib.c:205:5: error: 'return' with no value, in function returning non-void [-Wreturn-mismatch] # imagelib.c:109:17: error: implicit declaration of function 'malloc' [-Wimplicit-function-declaration] ./fix-gcc-14.patch + # error: initialization of 'void (*)(int, int, int)' from incompatible pointer type 'void (*)(void)' [-Wincompatible-pointer-types] + ./fix-gcc-15.patch ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/ad/addDriverRunpath/package.nix b/pkgs/by-name/ad/addDriverRunpath/package.nix index 56026b1fc908e..29832b303ad69 100644 --- a/pkgs/by-name/ad/addDriverRunpath/package.nix +++ b/pkgs/by-name/ad/addDriverRunpath/package.nix @@ -1,14 +1,14 @@ -{ lib, stdenv }: +{ + lib, + stdenv, + makeSetupHook, +}: +makeSetupHook { + name = "add-driver-runpath-hook"; -stdenv.mkDerivation { - name = "add-driver-runpath"; - - # Named "opengl-driver" for legacy reasons, but it is the path to - # hardware drivers installed by NixOS - driverLink = "/run/opengl-driver" + lib.optionalString stdenv.hostPlatform.isi686 "-32"; - - buildCommand = '' - mkdir -p $out/nix-support - substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook - ''; -} + substitutions = { + # Named "opengl-driver" for legacy reasons, but it is the path to + # hardware drivers installed by NixOS + driverLink = "/run/opengl-driver" + lib.optionalString stdenv.hostPlatform.isi686 "-32"; + }; +} ./setup-hook.sh diff --git a/pkgs/by-name/ad/adms/package.nix b/pkgs/by-name/ad/adms/package.nix index 97df479bd0bb9..5119f16e97a8f 100644 --- a/pkgs/by-name/ad/adms/package.nix +++ b/pkgs/by-name/ad/adms/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, autoreconfHook, flex, bison, @@ -23,6 +24,15 @@ stdenv.mkDerivation rec { sha256 = "0i37c9k6q1iglmzp9736rrgsnx7sw8xn3djqbbjw29zsyl3pf62c"; }; + patches = [ + # fix build with c23 + # admsXml.c:645:8: error: too many arguments to function 'verilogaparse'; expected 0, have 1 + (fetchpatch2 { + url = "https://salsa.debian.org/science-team/adms/-/raw/01ef4a94a48736c49c67d90da506b34f6114f0b0/debian/patches/0002-fix-ftbfs-gcc-15.patch"; + hash = "sha256-rSNBqdpuXA9ViyygRGn4KVknLCu0Q+UoOGLfoNAgccc="; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ flex diff --git a/pkgs/by-name/ad/adriconf/package.nix b/pkgs/by-name/ad/adriconf/package.nix index 521d3b40e557c..9577c178a2b91 100644 --- a/pkgs/by-name/ad/adriconf/package.nix +++ b/pkgs/by-name/ad/adriconf/package.nix @@ -28,6 +28,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-0XTsYeS4tNAnGhuJ81fmjHhFS6fVq1lirui5b+ojxTQ="; }; + # fix build with c23 + # error: 'uint16_t' does not name a type + postPatch = '' + sed -i '1i #include ' adriconf/ValueObject/GPUInfo.h + ''; + nativeBuildInputs = [ cmake gettext # msgfmt diff --git a/pkgs/by-name/ae/aefs/fix-build-with-c23.patch b/pkgs/by-name/ae/aefs/fix-build-with-c23.patch new file mode 100644 index 0000000000000..e14ed714a5d30 --- /dev/null +++ b/pkgs/by-name/ae/aefs/fix-build-with-c23.patch @@ -0,0 +1,75 @@ +From 5fbcd63a4fb8baca13184a2cc718ebf3ebbef245 Mon Sep 17 00:00:00 2001 +From: Moraxyc +Date: Sun, 28 Dec 2025 00:24:11 +0800 +Subject: [PATCH] fix build with c23 + +--- + emxdoc/input.c | 10 +++++----- + system/types.h | 5 +---- + 2 files changed, 6 insertions(+), 9 deletions(-) + +diff --git a/emxdoc/input.c b/emxdoc/input.c +index 50fd7a0..7d9ad4a 100644 +--- a/emxdoc/input.c ++++ b/emxdoc/input.c +@@ -31,7 +31,7 @@ Boston, MA 02111-1307, USA. */ + struct cond + { + int start_line; +- int true; ++ int is_true; + int else_seen; + }; + +@@ -225,7 +225,7 @@ redo: + if (cond_sp + 1 >= COND_STACK_SIZE) + fatal ("%s:%d: Conditional stack overflow", input_fname, line_no); + ++cond_sp; +- cond_stack[cond_sp].true = c1; ++ cond_stack[cond_sp].is_true = c1; + cond_stack[cond_sp].start_line = line_no; + cond_stack[cond_sp].else_seen = FALSE; + goto redo; +@@ -240,7 +240,7 @@ redo: + input_fname, line_no, escape, escape, + cond_stack[cond_sp].start_line); + cond_stack[cond_sp].else_seen = TRUE; +- cond_stack[cond_sp].true = !cond_stack[cond_sp].true; ++ cond_stack[cond_sp].is_true = !cond_stack[cond_sp].is_true; + goto redo; + } + else if (strcmp (p, "endif") == 0) +@@ -254,12 +254,12 @@ redo: + else if (p[0] == 'h' && p[1] >= '1' && p[1] <= '0' + SECTION_LEVELS) + { + /* Support h1 inside if */ +- if (cond_sp >= 0 && !cond_stack[cond_sp].true) ++ if (cond_sp >= 0 && !cond_stack[cond_sp].is_true) + ++ref_no; + } + } + +- if (cond_sp >= 0 && !cond_stack[cond_sp].true) ++ if (cond_sp >= 0 && !cond_stack[cond_sp].is_true) + goto redo; + + p = input; +diff --git a/system/types.h b/system/types.h +index 48b8013..327833f 100644 +--- a/system/types.h ++++ b/system/types.h +@@ -21,10 +21,7 @@ + #define _TYPES_H + + #include "config.h" +- +- +-/* Booleans (C++/C99) style. */ +-typedef int bool; ++#include + + #ifndef true + #define true 1 +-- +2.51.2 + diff --git a/pkgs/by-name/ae/aefs/package.nix b/pkgs/by-name/ae/aefs/package.nix index d6f7e54175d32..962a1e817a1af 100644 --- a/pkgs/by-name/ae/aefs/package.nix +++ b/pkgs/by-name/ae/aefs/package.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation { hash = "sha256-a3YQWxJ7+bYhf1W1kdIykV8U1R4dcDZJ7K3NvNxbF0s="; }; + # fix build with c23 + # ../system/types.h:27:13: error: 'bool' cannot be defined via 'typedef' + # input.c:228:31: error: expected identifier before 'true' + patches = [ ./fix-build-with-c23.patch ]; + # autoconf's AC_CHECK_HEADERS and AC_CHECK_LIBS fail to detect libfuse on # Darwin if FUSE_USE_VERSION isn't set at configure time. # diff --git a/pkgs/by-name/ae/aerc/package.nix b/pkgs/by-name/ae/aerc/package.nix index 2c0e7597bbd1c..401830d85a391 100644 --- a/pkgs/by-name/ae/aerc/package.nix +++ b/pkgs/by-name/ae/aerc/package.nix @@ -78,7 +78,6 @@ buildGoModule (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/af/afterstep/fix-build-with-c23.patch b/pkgs/by-name/af/afterstep/fix-build-with-c23.patch new file mode 100644 index 0000000000000..f68a636af50cd --- /dev/null +++ b/pkgs/by-name/af/afterstep/fix-build-with-c23.patch @@ -0,0 +1,81 @@ +From 081d9c3284075c65b70837079bd67621c3b64da7 Mon Sep 17 00:00:00 2001 +From: Moraxyc +Date: Sun, 28 Dec 2025 00:39:49 +0800 +Subject: [PATCH] fix build with c23 + +--- + libAfterBase/fs.c | 2 +- + src/ASDocGen/ASDocGen.c | 2 +- + src/Ident/Ident.c | 2 +- + src/afterstep/dirtree.c | 2 +- + src/afterstep/menus.h | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/libAfterBase/fs.c b/libAfterBase/fs.c +index 731bfd3..954bfd6 100644 +--- a/libAfterBase/fs.c ++++ b/libAfterBase/fs.c +@@ -818,7 +818,7 @@ my_scandir (char *dirname, struct direntry *(*namelist[]), + } + /* Optionally sort the list */ + if (dcomp) +- qsort (*namelist, n, sizeof (struct direntry *), (int (*)())dcomp); ++ qsort (*namelist, n, sizeof (struct direntry *), (int (*)(const void *, const void *))dcomp); + + /* Return the count of the entries */ + return n; +diff --git a/src/ASDocGen/ASDocGen.c b/src/ASDocGen/ASDocGen.c +index 31d7a70..9a86219 100644 +--- a/src/ASDocGen/ASDocGen.c ++++ b/src/ASDocGen/ASDocGen.c +@@ -667,7 +667,7 @@ write_options_keywords(const char *source_dir, const char *syntax_dir, SyntaxDef + sorted_list = safecalloc( max_i, sizeof(TermDef*)); + for (i = 0; i < max_i; i++) + sorted_list[i] = &(syntax->terms[i]) ; +- qsort(sorted_list, max_i, sizeof(TermDef*), (int (*)())sort_terms_by_alpha ); ++ qsort(sorted_list, max_i, sizeof(TermDef*), (int (*)(const void *, const void *))sort_terms_by_alpha ); + for (i = 0; i < max_i; i++) + { + SyntaxDef *sub_syntax = sorted_list[i]->sub_syntax ; +diff --git a/src/Ident/Ident.c b/src/Ident/Ident.c +index 1497d06..d6ddad6 100644 +--- a/src/Ident/Ident.c ++++ b/src/Ident/Ident.c +@@ -89,7 +89,7 @@ void HandleEvents(); + void DispatchEvent (ASEvent * event); + void process_message (send_data_type type, send_data_type *body); + +-Window make_ident_window(); ++Window make_ident_window(int width, int height); + void fill_window_data(); + void display_window_data(); + void add_property( const char *name, const char *value, unsigned long value_encoding, Bool span_cols ); +diff --git a/src/afterstep/dirtree.c b/src/afterstep/dirtree.c +index 46ce782..48f7e30 100644 +--- a/src/afterstep/dirtree.c ++++ b/src/afterstep/dirtree.c +@@ -675,7 +675,7 @@ void dirtree_sort (dirtree_t * tree) + list = (dirtree_t **) safemalloc (n * sizeof (dirtree_t *)); + for (n = 0, t = tree->child; t != NULL; t = t->next, n++) + list[n] = t; +- qsort (list, n, sizeof (dirtree_t *), (int (*)())dirtree_compar); ++ qsort (list, n, sizeof (dirtree_t *), (int (*)(const void *, const void *))dirtree_compar); + tree->child = list[0]; + for (i = 1; i < n; i++) + list[i - 1]->next = list[i]; +diff --git a/src/afterstep/menus.h b/src/afterstep/menus.h +index 98b2ad3..bb2a5b1 100644 +--- a/src/afterstep/menus.h ++++ b/src/afterstep/menus.h +@@ -95,7 +95,7 @@ MenuData* FindPopup( const char* name, int quiet ); + + void DeleteMenuItem( MenuDataItem* item ); + +-MenuData *CreateMenuData(); ++MenuData *CreateMenuData(char *name); + MenuData *NewMenuData (char *name); + void DeleteMenuData (MenuData * menu); + +-- +2.51.2 + diff --git a/pkgs/by-name/af/afterstep/package.nix b/pkgs/by-name/af/afterstep/package.nix index 8cf78b248fa2d..f7b4e1634e4e9 100644 --- a/pkgs/by-name/af/afterstep/package.nix +++ b/pkgs/by-name/af/afterstep/package.nix @@ -36,6 +36,12 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/afterstep/afterstep/commit/5e9e897cf8c455390dd6f5b27fec49707f6b9088.patch"; hash = "sha256-aGMTyojzXEHGjO9lMT6dwLl01Fd333BUuCIX0FU9ac4="; }) + + # fix build with c23 + # fs.c:821:66: error: passing argument 4 of 'qsort' from incompatible pointer type [-Wincompatible-pointer-types] + # Ident.c:326:1: error: conflicting types for 'make_ident_window'; have 'Window(int, int)' {aka 'long unsigned int(int, int)'} + # menuitem.c:85:11: error: conflicting types for 'CreateMenuData'; have 'MenuData *(char *)' + ./fix-build-with-c23.patch ]; postPatch = '' diff --git a/pkgs/by-name/ah/ahoy/package.nix b/pkgs/by-name/ah/ahoy/package.nix index 58dee8bc3fd19..b51c95a77f5d6 100644 --- a/pkgs/by-name/ah/ahoy/package.nix +++ b/pkgs/by-name/ah/ahoy/package.nix @@ -28,8 +28,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/ai/aichat/package.nix b/pkgs/by-name/ai/aichat/package.nix index 9fd4ceeb20a46..128474f18c23e 100644 --- a/pkgs/by-name/ai/aichat/package.nix +++ b/pkgs/by-name/ai/aichat/package.nix @@ -33,7 +33,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ai/air-formatter/package.nix b/pkgs/by-name/ai/air-formatter/package.nix index e36ffb8c68c4b..2f081926e9832 100644 --- a/pkgs/by-name/ai/air-formatter/package.nix +++ b/pkgs/by-name/ai/air-formatter/package.nix @@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/air"; - versionCheckProgramArg = "--version"; doInstallCheck = true; cargoBuildFlags = [ "-p air" ]; diff --git a/pkgs/by-name/ai/airspy/package.nix b/pkgs/by-name/ai/airspy/package.nix index 696bb8aeff674..798d2f97c8cd8 100644 --- a/pkgs/by-name/ai/airspy/package.nix +++ b/pkgs/by-name/ai/airspy/package.nix @@ -33,6 +33,11 @@ stdenv.mkDerivation rec { url = "https://github.com/airspy/airspyone_host/commit/f467acd587617640741ecbfade819d10ecd032c2.patch"; hash = "sha256-qfJrxM1hq7NScxN++d9IH+fwFfXf/YwZZUDDOVbwIJk="; }) + + (fetchpatch { + url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/9abb6b5fd1a02a7310226d03337f288be71f1d43/community/airspyone-host/gcc-15.patch"; + hash = "sha256-TFtDLT94kXZswnm8K9+U1YV+T+0fbj6oB6rbRdEpSOQ="; + }) ]; postPatch = '' diff --git a/pkgs/by-name/al/alertmanager-gotify-bridge/package.nix b/pkgs/by-name/al/alertmanager-gotify-bridge/package.nix index 09e19960b121a..940f361fa7e3b 100644 --- a/pkgs/by-name/al/alertmanager-gotify-bridge/package.nix +++ b/pkgs/by-name/al/alertmanager-gotify-bridge/package.nix @@ -26,7 +26,6 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/alertmanager_gotify_bridge"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix index d28dedfaf328b..1b6ed5a99fedd 100644 --- a/pkgs/by-name/am/amazon-q-cli/package.nix +++ b/pkgs/by-name/am/amazon-q-cli/package.nix @@ -72,7 +72,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/amazon-q"; - versionCheckProgramArg = "--version"; meta = { description = "Amazon Q Developer AI coding agent CLI"; diff --git a/pkgs/by-name/am/amd-blis/package.nix b/pkgs/by-name/am/amd-blis/package.nix index 0e59a24ed3f60..fae23b5f4b8d3 100644 --- a/pkgs/by-name/am/amd-blis/package.nix +++ b/pkgs/by-name/am/amd-blis/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, perl, python3, @@ -36,6 +37,18 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Set the date stamp to $SOURCE_DATE_EPOCH ./build-date.patch + # backporting a fix for a GCC15 build error + # ./frame/include/bli_x86_asm_macros.h:102:21: error: 'asm' operand has impossible constraints or there are not enough registers + (fetchpatch { + name = "amd-blis-gcc-15-fix-1.patch"; + url = "https://github.com/amd/blis/commit/14e46ad83bac5fd82569a43c7cbd3e791a1eacc8.patch"; + hash = "sha256-3vk9NSnhT64J6PUabeP58Gn7p1zheGbPxSRjVEX7WNg="; + }) + (fetchpatch { + name = "amd-blis-gcc-15-fix-2.patch"; + url = "https://github.com/amd/blis/commit/30c42202d78fd5ee5e54d50ad57348e5e541a7d5.patch"; + hash = "sha256-FCMWQzfzQxCQqngULoXfh35BFGaNTu732iu3HctNcFM="; + }) ]; inherit blas64; diff --git a/pkgs/by-name/am/ameba-ls/package.nix b/pkgs/by-name/am/ameba-ls/package.nix index 3c6fbcbce3a15..80abfec72dfe3 100644 --- a/pkgs/by-name/am/ameba-ls/package.nix +++ b/pkgs/by-name/am/ameba-ls/package.nix @@ -44,7 +44,6 @@ crystal.buildCrystalPackage rec { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/ameba-ls"; - versionCheckProgramArg = "--version"; meta = { description = "Crystal language server powered by Ameba linter"; diff --git a/pkgs/by-name/am/amp/package.nix b/pkgs/by-name/am/amp/package.nix index dd9d12d1b6ff0..ad97765c01db9 100644 --- a/pkgs/by-name/am/amp/package.nix +++ b/pkgs/by-name/am/amp/package.nix @@ -3,8 +3,10 @@ fetchFromGitHub, rustPlatform, pkgsBuildBuild, + oniguruma, stdenv, zlib, + pkg-config, writableTmpDirAsHomeHook, }: @@ -26,14 +28,21 @@ rustPlatform.buildRustPackage (finalAttrs: { (pkgsBuildBuild.writeShellScriptBin "git" "echo 0000000") ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + buildInputs = [ + oniguruma + ] + ++ (lib.optionals stdenv.hostPlatform.isDarwin [ zlib - ]; + ]); # Needing libgit2 <=1.8.0 #env.LIBGIT2_NO_VENDOR = 1; + # bundled oniguruma failed on gcc15 + env.RUSTONIG_SYSTEM_LIBONIG = 1; + nativeCheckInputs = [ + pkg-config writableTmpDirAsHomeHook ]; diff --git a/pkgs/by-name/an/andcli/package.nix b/pkgs/by-name/an/andcli/package.nix index fa1c0a07e1071..8cffa71c0ef66 100644 --- a/pkgs/by-name/an/andcli/package.nix +++ b/pkgs/by-name/an/andcli/package.nix @@ -32,7 +32,6 @@ buildGoModule (finalAttrs: { writableTmpDirAsHomeHook versionCheckHook ]; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "HOME" ]; doInstallCheck = true; diff --git a/pkgs/by-name/an/animeko/package.nix b/pkgs/by-name/an/animeko/package.nix index 35a4d225876c6..1d6e98bc0c2f4 100644 --- a/pkgs/by-name/an/animeko/package.nix +++ b/pkgs/by-name/an/animeko/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, gradle, autoPatchelfHook, jetbrains, # Requird by upstream due to JCEF dependency @@ -97,6 +98,16 @@ let cmakeFlags = (old.cmakeFlags or [ ]) ++ [ "-DCMAKE_POLICY_VERSION_MINIMUM=3.10" ]; + + patches = (old.patches or [ ]) ++ [ + # Fix build with gcc15 + # https://github.com/apache/thrift/pull/3078 + (fetchpatch { + name = "thrift-add-missing-cstdint-include-gcc15.patch"; + url = "https://github.com/apache/thrift/commit/947ad66940cfbadd9b24ba31d892dfc1142dd330.patch"; + hash = "sha256-pWcG6/BepUwc/K6cBs+6d74AWIhZ2/wXvCunb/KyB0s="; + }) + ]; }); in diff --git a/pkgs/by-name/an/ansible-doctor/package.nix b/pkgs/by-name/an/ansible-doctor/package.nix index 2700be69aa7e3..61012fa0f2edd 100644 --- a/pkgs/by-name/an/ansible-doctor/package.nix +++ b/pkgs/by-name/an/ansible-doctor/package.nix @@ -48,8 +48,6 @@ python3Packages.buildPythonApplication rec { # ansible.errors.AnsibleError: Unable to create local directories(/private/var/empty/.ansible/tmp) nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - meta = { description = "Annotation based documentation for your Ansible roles"; mainProgram = "ansible-doctor"; diff --git a/pkgs/by-name/ap/apache-orc/package.nix b/pkgs/by-name/ap/apache-orc/package.nix index c22580231973e..577eb5013e7e6 100644 --- a/pkgs/by-name/ap/apache-orc/package.nix +++ b/pkgs/by-name/ap/apache-orc/package.nix @@ -3,32 +3,37 @@ stdenv, fetchFromGitHub, fetchurl, - fetchpatch, cmake, gtest, lz4, - protobuf_30, + protobuf, snappy, zlib, zstd, }: let - orc-format = fetchurl { - name = "orc-format-1.1.0.tar.gz"; - url = "https://www.apache.org/dyn/closer.lua/orc/orc-format-1.1.0/orc-format-1.1.0.tar.gz?action=download"; - hash = "sha256-1KesdsVEKr9xGeLLhOcbZ34HWv9TUYqoZgVeLq0EUNc="; - }; + orc-format = + let + version = "1.1.1"; + name = "orc-format-${version}"; + archiveName = "${name}.tar.gz"; + in + fetchurl { + name = archiveName; + url = "https://www.apache.org/dyn/closer.lua/orc/${name}/${archiveName}?action=download"; + hash = "sha256-WE3+KkIClGF4/Y/H0SOb54BbntRZarIELe5znniAmSs="; + }; in stdenv.mkDerivation (finalAttrs: { pname = "apache-orc"; - version = "2.1.2"; + version = "2.2.1"; src = fetchFromGitHub { owner = "apache"; repo = "orc"; tag = "v${finalAttrs.version}"; - hash = "sha256-hNKzqNOagBJOWQRebkVHIuvqfpk9Mi30bu4z7dGbsxk="; + hash = "sha256-H7nowl2pq31RIAmTUz15x48Wc99MljFJboc4F7Ln/zk="; }; nativeBuildInputs = [ @@ -38,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtest lz4 - protobuf_30 + protobuf snappy zlib zstd @@ -62,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { GTEST_HOME = gtest.dev; LZ4_ROOT = lz4; ORC_FORMAT_URL = orc-format; - PROTOBUF_HOME = protobuf_30; + PROTOBUF_HOME = protobuf; SNAPPY_ROOT = snappy.dev; ZLIB_ROOT = zlib.dev; ZSTD_ROOT = zstd.dev; diff --git a/pkgs/by-name/ap/apfs-fuse/add_cstdint_fix_gcc15.patch b/pkgs/by-name/ap/apfs-fuse/add_cstdint_fix_gcc15.patch new file mode 100644 index 0000000000000..42402ec3ce1ed --- /dev/null +++ b/pkgs/by-name/ap/apfs-fuse/add_cstdint_fix_gcc15.patch @@ -0,0 +1,20 @@ +From 53cae3b21af9dca65cbe244ab72ec310a2e02164 Mon Sep 17 00:00:00 2001 +From: dkarpo +Date: Tue, 30 Sep 2025 10:18:03 -0600 +Subject: [PATCH] Add "" include to fix compilation. + +--- + ApfsLib/PList.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ApfsLib/PList.h b/ApfsLib/PList.h +index 645df2d..a752059 100644 +--- a/ApfsLib/PList.h ++++ b/ApfsLib/PList.h +@@ -1,5 +1,6 @@ + #pragma once + ++#include + #include + #include + #include diff --git a/pkgs/by-name/ap/apfs-fuse/package.nix b/pkgs/by-name/ap/apfs-fuse/package.nix index 87d9b78f61d27..abb952c9e6fea 100644 --- a/pkgs/by-name/ap/apfs-fuse/package.nix +++ b/pkgs/by-name/ap/apfs-fuse/package.nix @@ -26,6 +26,10 @@ stdenv.mkDerivation { # fix for CMake v4 # https://github.com/sgan81/apfs-fuse/pull/211 ./cmake-v4.patch + + # fix for GCC 15 + # https://github.com/sgan81/apfs-fuse/pull/209 + ./add_cstdint_fix_gcc15.patch ]; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/by-name/ar/arp-scan-rs/package.nix b/pkgs/by-name/ar/arp-scan-rs/package.nix index 57e987790c8f0..2eca53aff7263 100644 --- a/pkgs/by-name/ar/arp-scan-rs/package.nix +++ b/pkgs/by-name/ar/arp-scan-rs/package.nix @@ -30,8 +30,6 @@ rustPlatform.buildRustPackage rec { versionCheckProgram = [ "${placeholder "out"}/bin/arp-scan" ]; - versionCheckProgramArg = "--version"; - doInstallCheck = true; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix index 50e138504ab1b..64ac4b96483d5 100644 --- a/pkgs/by-name/ar/arrow-cpp/package.nix +++ b/pkgs/by-name/ar/arrow-cpp/package.nix @@ -17,6 +17,8 @@ "transfer" ]; }, + azure-sdk-for-cpp, + azurite, boost, brotli, bzip2, @@ -37,7 +39,7 @@ openssl, perl, pkg-config, - protobuf_31, + protobuf, python3, rapidjson, re2, @@ -58,7 +60,8 @@ !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isRiscV64, enableS3 ? true, # google-cloud-cpp fails to build on RiscV - enableGcs ? !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isRiscV64, + enableGcs ? !stdenv.hostPlatform.isRiscV64, + enableAzure ? true, }: let @@ -66,19 +69,19 @@ let name = "arrow-testing"; owner = "apache"; repo = "arrow-testing"; - rev = "d2a13712303498963395318a4eb42872e66aead7"; - hash = "sha256-c8FL37kG0uo7o0Zp71WjCl7FD5BnVgqUCCXXX9gI0lg="; + rev = "9a02925d1ba80bd493b6d4da6e8a777588d57ac4"; + hash = "sha256-dEFCkeQpQrU61uCwJp/XB2umbQHjXtzado36BGChoc0="; }; parquet-testing = fetchFromGitHub { name = "parquet-testing"; owner = "apache"; repo = "parquet-testing"; - rev = "18d17540097fca7c40be3d42c167e6bfad90763c"; - hash = "sha256-gKEQc2RKpVp39RmuZbIeIXAwiAXDHGnLXF6VQuJtnRA="; + rev = "a3d96a65e11e2bbca7d22a894e8313ede90a33a3"; + hash = "sha256-Xd6o3RT6Q0tPutV77J0P1x3F6U3RHdCBOKGUKtkQCKk="; }; - version = "20.0.0"; + version = "22.0.0"; in stdenv.mkDerivation (finalAttrs: { pname = "arrow-cpp"; @@ -88,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "apache"; repo = "arrow"; rev = "apache-arrow-${version}"; - hash = "sha256-JFPdKraCU+xRkBTAHyY4QGnBVlOjQ1P5+gq9uxyqJtk="; + hash = "sha256-i4Smt43oi4sddUt3qH7ePjensBSfPW+w/ExLVcVNKic="; }; sourceRoot = "${finalAttrs.src.name}/cpp"; @@ -107,21 +110,21 @@ stdenv.mkDerivation (finalAttrs: { ARROW_MIMALLOC_URL = fetchFromGitHub { owner = "microsoft"; repo = "mimalloc"; - rev = "v2.0.6"; - hash = "sha256-u2ITXABBN/dwU+mCIbL3tN1f4c17aBuSdNTV+Adtohc="; + tag = "v3.1.5"; + hash = "sha256-fk6nfyBFS1G0sJwUJVgTC1+aKd0We/JjsIYTO+IOfyg="; }; ARROW_XSIMD_URL = fetchFromGitHub { owner = "xtensor-stack"; repo = "xsimd"; - rev = "13.0.0"; + tag = "13.0.0"; hash = "sha256-qElJYW5QDj3s59L3NgZj5zkhnUMzIP2mBa1sPks3/CE="; }; ARROW_SUBSTRAIT_URL = fetchFromGitHub { owner = "substrait-io"; repo = "substrait"; - rev = "v0.44.0"; + tag = "v0.44.0"; hash = "sha256-V739IFTGPtbGPlxcOi8sAaYSDhNUEpITvN9IqdPReug="; }; @@ -138,6 +141,7 @@ stdenv.mkDerivation (finalAttrs: { boost brotli bzip2 + curl flatbuffers gflags glog @@ -145,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: { libbacktrace lz4 nlohmann_json # alternative JSON parser to rapidjson - protobuf_31 # substrait requires protobuf + protobuf # substrait requires protobuf rapidjson re2 snappy @@ -157,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals enableFlight [ grpc openssl - protobuf_31 + protobuf sqlite ] ++ lib.optionals enableS3 [ @@ -166,10 +170,14 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals enableGcs [ crc32c - curl google-cloud-cpp grpc nlohmann_json + ] + ++ lib.optionals enableAzure [ + azure-sdk-for-cpp.identity + azure-sdk-for-cpp.storage-blobs + azure-sdk-for-cpp.storage-files-datalake ]; # apache-orc looks for things in caps @@ -188,55 +196,61 @@ stdenv.mkDerivation (finalAttrs: { ''; cmakeFlags = [ - "-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON" - "-DARROW_BUILD_SHARED=${if enableShared then "ON" else "OFF"}" - "-DARROW_BUILD_STATIC=${if enableShared then "OFF" else "ON"}" - "-DARROW_BUILD_TESTS=${if enableShared then "ON" else "OFF"}" - "-DARROW_BUILD_INTEGRATION=ON" - "-DARROW_BUILD_UTILITIES=ON" - "-DARROW_EXTRA_ERROR_CONTEXT=ON" - "-DARROW_VERBOSE_THIRDPARTY_BUILD=ON" - "-DARROW_DEPENDENCY_SOURCE=SYSTEM" - "-Dxsimd_SOURCE=AUTO" - "-DARROW_DEPENDENCY_USE_SHARED=${if enableShared then "ON" else "OFF"}" - "-DARROW_COMPUTE=ON" - "-DARROW_CSV=ON" - "-DARROW_DATASET=ON" - "-DARROW_FILESYSTEM=ON" - "-DARROW_FLIGHT_SQL=${if enableFlight then "ON" else "OFF"}" - "-DARROW_HDFS=ON" - "-DARROW_IPC=ON" - "-DARROW_JEMALLOC=${if enableJemalloc then "ON" else "OFF"}" - "-DARROW_JSON=ON" - "-DARROW_USE_GLOG=ON" - "-DARROW_WITH_BACKTRACE=ON" - "-DARROW_WITH_BROTLI=ON" - "-DARROW_WITH_BZ2=ON" - "-DARROW_WITH_LZ4=ON" - "-DARROW_WITH_NLOHMANN_JSON=ON" - "-DARROW_WITH_SNAPPY=ON" - "-DARROW_WITH_UTF8PROC=ON" - "-DARROW_WITH_ZLIB=ON" - "-DARROW_WITH_ZSTD=ON" - "-DARROW_MIMALLOC=ON" - "-DARROW_SUBSTRAIT=ON" - "-DARROW_FLIGHT=${if enableFlight then "ON" else "OFF"}" - "-DARROW_FLIGHT_TESTING=${if enableFlight then "ON" else "OFF"}" - "-DARROW_S3=${if enableS3 then "ON" else "OFF"}" - "-DARROW_GCS=${if enableGcs then "ON" else "OFF"}" - "-DARROW_ORC=ON" + (lib.cmakeBool "CMAKE_FIND_PACKAGE_PREFER_CONFIG" true) + (lib.cmakeBool "ARROW_BUILD_SHARED" enableShared) + (lib.cmakeBool "ARROW_BUILD_STATIC" (!enableShared)) + (lib.cmakeBool "ARROW_BUILD_TESTS" enableShared) + (lib.cmakeBool "ARROW_BUILD_INTEGRATION" true) + (lib.cmakeBool "ARROW_BUILD_UTILITIES" true) + (lib.cmakeBool "ARROW_EXTRA_ERROR_CONTEXT" true) + (lib.cmakeBool "ARROW_VERBOSE_THIRDPARTY_BUILD" true) + (lib.cmakeFeature "ARROW_DEPENDENCY_SOURCE" "SYSTEM") + (lib.cmakeFeature "xsimd_SOURCE" "AUTO") + (lib.cmakeBool "ARROW_DEPENDENCY_USE_SHARED" enableShared) + (lib.cmakeBool "ARROW_COMPUTE" true) + (lib.cmakeBool "ARROW_CSV" true) + (lib.cmakeBool "ARROW_DATASET" true) + (lib.cmakeBool "ARROW_FILESYSTEM" true) + (lib.cmakeBool "ARROW_FLIGHT_SQL" enableFlight) + (lib.cmakeBool "ARROW_HDFS" true) + (lib.cmakeBool "ARROW_IPC" true) + (lib.cmakeBool "ARROW_JEMALLOC" enableJemalloc) + (lib.cmakeBool "ARROW_JSON" true) + (lib.cmakeBool "ARROW_USE_GLOG" true) + (lib.cmakeBool "ARROW_WITH_BACKTRACE" true) + (lib.cmakeBool "ARROW_WITH_BROTLI" true) + (lib.cmakeBool "ARROW_WITH_BZ2" true) + (lib.cmakeBool "ARROW_WITH_LZ4" true) + (lib.cmakeBool "ARROW_WITH_NLOHMANN_JSON" true) + (lib.cmakeBool "ARROW_WITH_SNAPPY" true) + (lib.cmakeBool "ARROW_WITH_UTF8PROC" true) + (lib.cmakeBool "ARROW_WITH_ZLIB" true) + (lib.cmakeBool "ARROW_WITH_ZSTD" true) + (lib.cmakeBool "ARROW_MIMALLOC" true) + (lib.cmakeBool "ARROW_SUBSTRAIT" true) + (lib.cmakeBool "ARROW_FLIGHT" enableFlight) + (lib.cmakeBool "ARROW_FLIGHT_TESTING" enableFlight) + (lib.cmakeBool "ARROW_S3" enableS3) + (lib.cmakeBool "ARROW_GCS" enableGcs) + (lib.cmakeBool "ARROW_AZURE" enableAzure) + (lib.cmakeBool "ARROW_ORC" true) # Parquet options: - "-DARROW_PARQUET=ON" - "-DPARQUET_BUILD_EXECUTABLES=ON" - "-DPARQUET_REQUIRE_ENCRYPTION=ON" + (lib.cmakeBool "ARROW_PARQUET" true) + (lib.cmakeBool "PARQUET_BUILD_EXECUTABLES" true) + (lib.cmakeBool "PARQUET_REQUIRE_ENCRYPTION" true) + ] + ++ lib.optionals (!enableShared) [ + (lib.cmakeFeature "ARROW_TEST_LINKAGE" "static") ] - ++ lib.optionals (!enableShared) [ "-DARROW_TEST_LINKAGE=static" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables + # needed for tools executables + (lib.cmakeFeature "CMAKE_INSTALL_RPATH" "@loader_path/../lib") + ] + ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ + (lib.cmakeBool "ARROW_USE_SIMD" false) ] - ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ "-DARROW_USE_SIMD=OFF" ] ++ lib.optionals enableS3 [ - "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp-arrow}/include/aws/core/Aws.h" + (lib.cmakeFeature "AWSSDK_CORE_HEADER_FILE" "${aws-sdk-cpp-arrow}/include/aws/core/Aws.h") ]; doInstallCheck = true; @@ -259,13 +273,6 @@ stdenv.mkDerivation (finalAttrs: { "TestMinioServer.Connect" "TestS3FS.*" "TestS3FSGeneric.*" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # TODO: revisit at 12.0.0 or when - # https://github.com/apache/arrow/commit/295c6644ca6b67c95a662410b2c7faea0920c989 - # is available, see - # https://github.com/apache/arrow/pull/15288#discussion_r1071244661 - "ExecPlanExecution.StressSourceSinkStopped" ]; in lib.optionalString finalAttrs.doInstallCheck "-${lib.concatStringsSep ":" filteredTests}"; @@ -278,7 +285,8 @@ stdenv.mkDerivation (finalAttrs: { sqlite ] ++ lib.optionals enableS3 [ minio ] - ++ lib.optionals enableFlight [ python3 ]; + ++ lib.optionals enableFlight [ python3 ] + ++ lib.optionals enableAzure [ azurite ]; installCheckPhase = let @@ -309,6 +317,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Cross-language development platform for in-memory data"; homepage = "https://arrow.apache.org/docs/cpp/"; + changelog = "https://arrow.apache.org/release/${finalAttrs.version}.html"; license = lib.licenses.asl20; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/ar/arsenal/package.nix b/pkgs/by-name/ar/arsenal/package.nix index 09a79fca68088..8646e4ee79946 100644 --- a/pkgs/by-name/ar/arsenal/package.nix +++ b/pkgs/by-name/ar/arsenal/package.nix @@ -30,7 +30,6 @@ python3.pkgs.buildPythonApplication rec { ]; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "arsenal" diff --git a/pkgs/by-name/ar/arti/package.nix b/pkgs/by-name/ar/arti/package.nix index 29daefe4e94e0..e6dd7e667f315 100644 --- a/pkgs/by-name/ar/arti/package.nix +++ b/pkgs/by-name/ar/arti/package.nix @@ -63,7 +63,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/as/asciinema-agg/package.nix b/pkgs/by-name/as/asciinema-agg/package.nix index 722988ea6fd6e..863a84436d2cd 100644 --- a/pkgs/by-name/as/asciinema-agg/package.nix +++ b/pkgs/by-name/as/asciinema-agg/package.nix @@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Command-line tool for generating animated GIF files from asciicast v2 files produced by asciinema terminal recorder"; diff --git a/pkgs/by-name/as/asciinema_3/package.nix b/pkgs/by-name/as/asciinema_3/package.nix index 2803cd784ab28..4a3c65905ea49 100644 --- a/pkgs/by-name/as/asciinema_3/package.nix +++ b/pkgs/by-name/as/asciinema_3/package.nix @@ -37,7 +37,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { homepage = "https://asciinema.org/"; diff --git a/pkgs/by-name/as/aseprite/package.nix b/pkgs/by-name/as/aseprite/package.nix index 42a9e13795a5a..44ca288f6f389 100644 --- a/pkgs/by-name/as/aseprite/package.nix +++ b/pkgs/by-name/as/aseprite/package.nix @@ -107,6 +107,11 @@ clangStdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace src/ver/CMakeLists.txt \ --replace-fail '"1.x-dev"' '"${finalAttrs.version}"' + + # Using substituteInPlace because no upstream patch for GCC 15 was found for this bundled library. + substituteInPlace third_party/json11/json11.cpp \ + --replace-fail "#include " "#include + #include " ''; cmakeFlags = [ diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index 4f479dc6e904d..52b37a84f1076 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -50,7 +50,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/as/astyle/package.nix b/pkgs/by-name/as/astyle/package.nix index 21156962d605c..a54e05d16cc46 100644 --- a/pkgs/by-name/as/astyle/package.nix +++ b/pkgs/by-name/as/astyle/package.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = !asLibrary; meta = { diff --git a/pkgs/by-name/at/at-spi2-core/package.nix b/pkgs/by-name/at/at-spi2-core/package.nix index a7f40c07c95dc..07297cfe0a655 100644 --- a/pkgs/by-name/at/at-spi2-core/package.nix +++ b/pkgs/by-name/at/at-spi2-core/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.58.1"; + version = "2.58.2"; outputs = [ "out" @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/at-spi2-core/${lib.versions.majorMinor version}/at-spi2-core-${version}.tar.xz"; - hash = "sha256-fzdKajjNcP9LMsnToDEL+oBNlG/tTJ5pp9SfrNy5Xpw="; + hash = "sha256-ooI7li7RbN1csfxTZQKf0hg5TYUqzUCYsyGFS9ZpL24="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix index d16ea8e586772..da374e413f20c 100644 --- a/pkgs/by-name/au/audit/package.nix +++ b/pkgs/by-name/au/audit/package.nix @@ -87,6 +87,7 @@ stdenv.mkDerivation (finalAttrs: { "--disable-legacy-actions" "--with-arm" "--with-aarch64" + "--with-riscv" "--with-io_uring" # allows putting audit files in /run/audit, which removes the requirement # to wait for tmpfiles to set up the /var/run -> /run symlink diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix index 58bbfc590da12..2793e668accf2 100644 --- a/pkgs/by-name/au/automatic-timezoned/package.nix +++ b/pkgs/by-name/au/automatic-timezoned/package.nix @@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "Automatically update system timezone based on location"; diff --git a/pkgs/by-name/au/autotier/package.nix b/pkgs/by-name/au/autotier/package.nix index 9da9946f42714..c3d71559d920a 100644 --- a/pkgs/by-name/au/autotier/package.nix +++ b/pkgs/by-name/au/autotier/package.nix @@ -41,6 +41,9 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + # Required by rocksdb after 10.7.5 + env.EXTRA_CFLAGS = "-std=c++20 -fno-char8_t"; + buildInputs = [ rocksdb boost diff --git a/pkgs/by-name/av/avalanche-cli/package.nix b/pkgs/by-name/av/avalanche-cli/package.nix index 956bf545bd4c6..f2d83a65fe1a4 100644 --- a/pkgs/by-name/av/avalanche-cli/package.nix +++ b/pkgs/by-name/av/avalanche-cli/package.nix @@ -73,7 +73,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/avalanche"; - versionCheckProgramArg = "--version"; doCheck = false; diff --git a/pkgs/by-name/av/avro-cpp/package.nix b/pkgs/by-name/av/avro-cpp/package.nix index ed40901ee66f7..9762e2b75ba51 100644 --- a/pkgs/by-name/av/avro-cpp/package.nix +++ b/pkgs/by-name/av/avro-cpp/package.nix @@ -43,7 +43,6 @@ stdenv.mkDerivation rec { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/avrogencpp"; - versionCheckProgramArg = "--version"; meta = { description = "C++ library which implements parts of the Avro Specification"; diff --git a/pkgs/by-name/aw/await/package.nix b/pkgs/by-name/aw/await/package.nix index 989f78b7f1874..f5f042ec37371 100644 --- a/pkgs/by-name/aw/await/package.nix +++ b/pkgs/by-name/aw/await/package.nix @@ -40,7 +40,6 @@ stdenv.mkDerivation rec { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/slavaGanzin/await/releases/tag/${version}"; diff --git a/pkgs/by-name/aw/aws-nuke/package.nix b/pkgs/by-name/aw/aws-nuke/package.nix index c00dfb60bac39..cd360c7b9258a 100644 --- a/pkgs/by-name/aw/aws-nuke/package.nix +++ b/pkgs/by-name/aw/aws-nuke/package.nix @@ -46,8 +46,6 @@ buildGoModule rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; - postInstallCheck = '' $out/bin/aws-nuke resource-types | grep "IAMUser" ''; diff --git a/pkgs/by-name/aw/aws-sam-cli/package.nix b/pkgs/by-name/aw/aws-sam-cli/package.nix index 9b4e302775521..45b08ababf827 100644 --- a/pkgs/by-name/aw/aws-sam-cli/package.nix +++ b/pkgs/by-name/aw/aws-sam-cli/package.nix @@ -11,14 +11,14 @@ python3.pkgs.buildPythonApplication rec { pname = "aws-sam-cli"; - version = "1.143.0"; + version = "1.146.0"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-sam-cli"; tag = "v${version}"; - hash = "sha256-QnJQ45ucziHmOkQdAT29szOljBExiIXZ2zvhiKYXBxI="; + hash = "sha256-b0nXhhgQgV0TZ0PGYexKxsb1s7PIe+5dqjOWJiVlWJY="; }; build-system = with python3.pkgs; [ setuptools ]; @@ -82,6 +82,12 @@ python3.pkgs.buildPythonApplication rec { xray ]); + # Remove after upstream bumps click > 8.1.8 + postPatch = '' + substituteInPlace requirements/base.txt --replace-fail \ + 'click==8.1.8' 'click==${python3.pkgs.click.version}' + ''; + postFixup = '' # Disable telemetry: https://github.com/aws/aws-sam-cli/issues/1272 wrapProgram $out/bin/sam \ @@ -125,7 +131,9 @@ python3.pkgs.buildPythonApplication rec { "tests/unit/lib/observability/cw_logs/" "tests/unit/lib/build_module/" # Disable flaky tests - "tests/unit/lib/samconfig/test_samconfig.py" + "tests/unit/cli/test_main.py" + "tests/unit/commands/samconfig/test_samconfig.py" + "tests/unit/local/docker/test_lambda_image.py" ]; disabledTests = [ diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix index 2008cb72faa78..64311c3f5310c 100644 --- a/pkgs/by-name/aw/awsebcli/package.nix +++ b/pkgs/by-name/aw/awsebcli/package.nix @@ -72,7 +72,6 @@ python.pkgs.buildPythonApplication rec { pytestCheckHook versionCheckHook ]; - versionCheckProgramArg = "--version"; enabledTestPaths = [ "tests/unit" diff --git a/pkgs/by-name/az/azurehound/package.nix b/pkgs/by-name/az/azurehound/package.nix index 6ec81536d391c..2db052e462125 100644 --- a/pkgs/by-name/az/azurehound/package.nix +++ b/pkgs/by-name/az/azurehound/package.nix @@ -29,8 +29,6 @@ buildGoModule rec { doInstallCheck = true; - versionCheckProgramArg = "--version"; - meta = { description = "Azure Data Exporter for BloodHound"; homepage = "https://github.com/SpecterOps/AzureHound"; diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix index 49609b5c3765e..f9b715998d4a7 100644 --- a/pkgs/by-name/ba/bacon/package.nix +++ b/pkgs/by-name/ba/bacon/package.nix @@ -52,7 +52,6 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = lib.optionals withSound soundDependencies; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; postInstall = diff --git a/pkgs/by-name/ba/bagr/package.nix b/pkgs/by-name/ba/bagr/package.nix index 68eb4aede9e02..89fb229ab1e5b 100644 --- a/pkgs/by-name/ba/bagr/package.nix +++ b/pkgs/by-name/ba/bagr/package.nix @@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "Command line utility for interacting with BagIt bags (RFC 8493)"; diff --git a/pkgs/by-name/ba/bambu-studio/package.nix b/pkgs/by-name/ba/bambu-studio/package.nix index b3a1786017894..771141e382666 100644 --- a/pkgs/by-name/ba/bambu-studio/package.nix +++ b/pkgs/by-name/ba/bambu-studio/package.nix @@ -3,6 +3,7 @@ lib, binutils, fetchFromGitHub, + fetchpatch, cmake, ninja, pkg-config, @@ -121,6 +122,13 @@ stdenv.mkDerivation (finalAttrs: { ./patches/no-cereal.patch # Cmake 4 support ./patches/cmake.patch + # Fix build with gcc15 + # https://github.com/bambulab/BambuStudio/pull/8555 + (fetchpatch { + name = "bambu-studio-include-stdint-header.patch"; + url = "https://github.com/bambulab/BambuStudio/commit/434752bf643933f22348d78335abe7f60550e736.patch"; + hash = "sha256-vWqTM6IHL/gBncLk6gZHw+dFe0sdVuPdUqYeVJUbTis="; + }) ]; doCheck = true; diff --git a/pkgs/by-name/ba/bark/package.nix b/pkgs/by-name/ba/bark/package.nix index 2bfb51195593b..ae9588cf4b46e 100644 --- a/pkgs/by-name/ba/bark/package.nix +++ b/pkgs/by-name/ba/bark/package.nix @@ -45,7 +45,6 @@ rustPlatform.buildRustPackage (final: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index b096c9a9af80b..4c0ec9af0b881 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -52,7 +52,6 @@ buildNpmPackage rec { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ba/bashunit/package.nix b/pkgs/by-name/ba/bashunit/package.nix index bce78ee9efeb6..861a598f0bec1 100644 --- a/pkgs/by-name/ba/bashunit/package.nix +++ b/pkgs/by-name/ba/bashunit/package.nix @@ -62,7 +62,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ba/basilk/package.nix b/pkgs/by-name/ba/basilk/package.nix index 1f39c3fdcde53..f7eb232f7163d 100644 --- a/pkgs/by-name/ba/basilk/package.nix +++ b/pkgs/by-name/ba/basilk/package.nix @@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ba/bazel_7/package.nix b/pkgs/by-name/ba/bazel_7/package.nix index dffa79c2f7c4b..13ea1b2659d0c 100644 --- a/pkgs/by-name/ba/bazel_7/package.nix +++ b/pkgs/by-name/ba/bazel_7/package.nix @@ -6,6 +6,7 @@ makeWrapper, writeTextFile, replaceVars, + fetchpatch, writeShellApplication, makeBinaryWrapper, autoPatchelfHook, @@ -388,6 +389,12 @@ stdenv.mkDerivation rec { (replaceVars ./bazel_rc.patch { bazelSystemBazelRCPath = bazelRC; }) + + # Fix build with gcc 15 by adding missing headers + (fetchpatch { + url = "https://github.com/bazelbuild/bazel/commit/1d206cac050b6c7d9ce65403e6a9909a49bfe4bc.patch"; + hash = "sha256-Tg5o1Va7dd5hvXbWhZiog+VtuiqngqbbYOkCafVudDs="; + }) ] # See enableNixHacks argument above. ++ lib.optional enableNixHacks ./nix-build-bazel-package-hacks.patch; diff --git a/pkgs/by-name/be/bento/package.nix b/pkgs/by-name/be/bento/package.nix index fdebf9c68d12d..65b3b2d826260 100644 --- a/pkgs/by-name/be/bento/package.nix +++ b/pkgs/by-name/be/bento/package.nix @@ -33,7 +33,6 @@ buildGoModule rec { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bf/bfg-repo-cleaner/package.nix b/pkgs/by-name/bf/bfg-repo-cleaner/package.nix index 77b63b8435fe2..f226fc272722a 100644 --- a/pkgs/by-name/bf/bfg-repo-cleaner/package.nix +++ b/pkgs/by-name/bf/bfg-repo-cleaner/package.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = "--version"; meta = { homepage = "https://rtyley.github.io/bfg-repo-cleaner/"; diff --git a/pkgs/by-name/bi/biber-ms/package.nix b/pkgs/by-name/bi/biber-ms/package.nix index b221b1d15dbd9..b04a1493945a6 100644 --- a/pkgs/by-name/bi/biber-ms/package.nix +++ b/pkgs/by-name/bi/biber-ms/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, perlPackages, - shortenPerlShebang, texlive, }: @@ -78,7 +77,6 @@ perlPackages.buildPerlModule { XMLWriter autovivification ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; preConfigure = '' cp '${multiscriptBltxml}' t/tdata/multiscript.bltxml @@ -86,9 +84,6 @@ perlPackages.buildPerlModule { postInstall = '' mv "$out"/bin/biber{,-ms} - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang "$out"/bin/biber-ms ''; meta = { diff --git a/pkgs/by-name/bi/biber/package.nix b/pkgs/by-name/bi/biber/package.nix index 57c31398d7d37..a194682bcd7bf 100644 --- a/pkgs/by-name/bi/biber/package.nix +++ b/pkgs/by-name/bi/biber/package.nix @@ -3,7 +3,6 @@ stdenv, fetchpatch, perlPackages, - shortenPerlShebang, texlive, }: @@ -69,11 +68,6 @@ perlPackages.buildPerlModule { TestDifferences PerlIOutf8_strict ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/biber - ''; meta = { description = "Backend for BibLaTeX"; diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index d615787792b25..685d1eba010fc 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -91,7 +91,6 @@ buildNpmPackage (finalAttrs: { versionCheckHook ]; versionCheckKeepEnvironment = [ "HOME" ]; - versionCheckProgramArg = "--version"; passthru = { tests = { diff --git a/pkgs/by-name/bm/bmputil/package.nix b/pkgs/by-name/bm/bmputil/package.nix index e9401655ff701..b45e846db04db 100644 --- a/pkgs/by-name/bm/bmputil/package.nix +++ b/pkgs/by-name/bm/bmputil/package.nix @@ -37,7 +37,6 @@ rustPlatform.buildRustPackage rec { versionCheckHook udevCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/bo/bootdev-cli/package.nix b/pkgs/by-name/bo/bootdev-cli/package.nix index ffe5f166fbadb..3521a7e628baa 100644 --- a/pkgs/by-name/bo/bootdev-cli/package.nix +++ b/pkgs/by-name/bo/bootdev-cli/package.nix @@ -41,7 +41,6 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/bootdev"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bo/bottom/package.nix b/pkgs/by-name/bo/bottom/package.nix index a524235e2078d..b9054cba18460 100644 --- a/pkgs/by-name/bo/bottom/package.nix +++ b/pkgs/by-name/bo/bottom/package.nix @@ -47,7 +47,6 @@ rustPlatform.buildRustPackage (finalAttrs: { writableTmpDirAsHomeHook ]; versionCheckProgram = "${placeholder "out"}/bin/btm"; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix index 64543f14f4fa2..d66c05d84b19b 100644 --- a/pkgs/by-name/br/broot/package.nix +++ b/pkgs/by-name/br/broot/package.nix @@ -79,7 +79,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/br/brotli/package.nix b/pkgs/by-name/br/brotli/package.nix index 31115184f1575..ee1c8535c0af4 100644 --- a/pkgs/by-name/br/brotli/package.nix +++ b/pkgs/by-name/br/brotli/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, python3Packages, staticOnly ? stdenv.hostPlatform.isStatic, @@ -11,26 +10,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "brotli"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "google"; repo = "brotli"; - rev = "v${finalAttrs.version}"; - hash = "sha256-MvceRcle2dSkkucC2PlsCizsIf8iv95d8Xjqew266wc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-kl8ZHt71v17QR2bDP+ad/5uixf+GStEPLQ5ooFoC5i8="; }; - patches = [ - # revert runpath change, breaks curl on darwin: - # https://github.com/NixOS/nixpkgs/pull/254532#issuecomment-1722337476 - (fetchpatch { - name = "revert-runpath.patch"; - url = "https://github.com/google/brotli/commit/f842c1bcf9264431cd3b15429a72b7dafbe80509.patch"; - hash = "sha256-W3LY3EjoHP74YsKOOcYQrzo+f0HbooOvEbnOibtN6TM="; - revert = true; - }) - ]; - nativeBuildInputs = [ cmake ]; cmakeFlags = lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF"; @@ -60,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/google/brotli"; + changelog = "https://github.com/google/brotli/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "General-purpose lossless compression library with CLI"; longDescription = '' Brotli is a generic-purpose lossless compression algorithm that diff --git a/pkgs/by-name/br/brush-splat/package.nix b/pkgs/by-name/br/brush-splat/package.nix index 452c72360efe6..d53edccbb6677 100644 --- a/pkgs/by-name/br/brush-splat/package.nix +++ b/pkgs/by-name/br/brush-splat/package.nix @@ -59,7 +59,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/br/brush/package.nix b/pkgs/by-name/br/brush/package.nix index 17edbfd8819f8..913563156d9cf 100644 --- a/pkgs/by-name/br/brush/package.nix +++ b/pkgs/by-name/br/brush/package.nix @@ -28,7 +28,6 @@ rustPlatform.buildRustPackage rec { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = "--version"; # Found argument '--test-threads' which wasn't expected, or isn't valid in this context doCheck = false; diff --git a/pkgs/by-name/bs/bsky-cli/package.nix b/pkgs/by-name/bs/bsky-cli/package.nix index 7b2feeec25eb9..905be6a65b4ce 100644 --- a/pkgs/by-name/bs/bsky-cli/package.nix +++ b/pkgs/by-name/bs/bsky-cli/package.nix @@ -30,7 +30,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/bsky"; - versionCheckProgramArg = "--version"; nativeBuildInputs = [ versionCheckHook ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bt/btop/package.nix b/pkgs/by-name/bt/btop/package.nix index 40daf894a3bee..e781eb4038e21 100644 --- a/pkgs/by-name/bt/btop/package.nix +++ b/pkgs/by-name/bt/btop/package.nix @@ -53,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bu/buildah-unwrapped/package.nix b/pkgs/by-name/bu/buildah-unwrapped/package.nix index 96252ce5e2732..13d4e4cf86e99 100644 --- a/pkgs/by-name/bu/buildah-unwrapped/package.nix +++ b/pkgs/by-name/bu/buildah-unwrapped/package.nix @@ -74,7 +74,6 @@ buildGoModule (finalAttrs: { writableTmpDirAsHomeHook versionCheckHook ]; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "HOME" ]; meta = { diff --git a/pkgs/by-name/bu/buildstream/package.nix b/pkgs/by-name/bu/buildstream/package.nix index 08abf06bf431c..93c74c1e80f31 100644 --- a/pkgs/by-name/bu/buildstream/package.nix +++ b/pkgs/by-name/bu/buildstream/package.nix @@ -118,7 +118,6 @@ python3Packages.buildPythonApplication rec { ''; versionCheckProgram = "${placeholder "out"}/bin/bst"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bu/bulletty/package.nix b/pkgs/by-name/bu/bulletty/package.nix index a8d20c579b7da..0967e63903f6c 100644 --- a/pkgs/by-name/bu/bulletty/package.nix +++ b/pkgs/by-name/bu/bulletty/package.nix @@ -35,7 +35,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bu/bumpp/package.nix b/pkgs/by-name/bu/bumpp/package.nix index c1a9f5cc2b97e..0c9ab5816356a 100644 --- a/pkgs/by-name/bu/bumpp/package.nix +++ b/pkgs/by-name/bu/bumpp/package.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bu/bunbun/package.nix b/pkgs/by-name/bu/bunbun/package.nix index 66a390b0c9d0e..039b8e8ae09c6 100644 --- a/pkgs/by-name/bu/bunbun/package.nix +++ b/pkgs/by-name/bu/bunbun/package.nix @@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/bu/bundler/package.nix b/pkgs/by-name/bu/bundler/package.nix index 07f1b71d99dcc..7a35a7ace0b5d 100644 --- a/pkgs/by-name/bu/bundler/package.nix +++ b/pkgs/by-name/bu/bundler/package.nix @@ -25,7 +25,6 @@ buildRubyGem rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/bundler"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/by/byacc/package.nix b/pkgs/by-name/by/byacc/package.nix index efb7dc07077dc..8da6559f602b0 100644 --- a/pkgs/by-name/by/byacc/package.nix +++ b/pkgs/by-name/by/byacc/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { urls = [ "https://invisible-mirror.net/archives/byacc/byacc-${finalAttrs.version}.tgz" - "ftp://ftp.invisible-island.net/byacc/byacc-${finalAttrs.version}.tgz" + "https://invisible-island.net/archives/byacc/byacc-${finalAttrs.version}.tgz" ]; hash = "sha256-GSwvrgSNTn9RS6RRYn+cTmEnZQmfgZwZGR+f3j5glnM="; }; diff --git a/pkgs/by-name/ca/cacert/package.nix b/pkgs/by-name/ca/cacert/package.nix index 02beade08c978..e92080542defb 100644 --- a/pkgs/by-name/ca/cacert/package.nix +++ b/pkgs/by-name/ca/cacert/package.nix @@ -23,7 +23,7 @@ let lib.concatStringsSep "\n\n" extraCertificateStrings ); - srcVersion = "3.115"; + srcVersion = "3.117"; version = if nssOverride != null then nssOverride.version else srcVersion; meta = { homepage = "https://curl.haxx.se/docs/caextract.html"; @@ -47,7 +47,7 @@ let owner = "nss-dev"; repo = "nss"; rev = "NSS_${lib.replaceStrings [ "." ] [ "_" ] version}_RTM"; - hash = "sha256-8PeFeaIOtjBZJLBx3ONwZlK5SaLnjKEFoZWvVsu/3tA="; + hash = "sha256-sAs0TiV3TK/WtgHvEjl2KFAgebyWZYmcRcmxjpn2AME="; }; dontBuild = true; diff --git a/pkgs/by-name/ca/camilladsp/package.nix b/pkgs/by-name/ca/camilladsp/package.nix index 61a915021c63c..03c96de960deb 100644 --- a/pkgs/by-name/ca/camilladsp/package.nix +++ b/pkgs/by-name/ca/camilladsp/package.nix @@ -44,7 +44,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Flexible cross-platform IIR and FIR engine for crossovers, room correction etc"; diff --git a/pkgs/by-name/ca/carapace-bridge/package.nix b/pkgs/by-name/ca/carapace-bridge/package.nix index a49ac279ace5f..f536f0d642a97 100644 --- a/pkgs/by-name/ca/carapace-bridge/package.nix +++ b/pkgs/by-name/ca/carapace-bridge/package.nix @@ -28,7 +28,6 @@ buildGoModule (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ca/cargo-aoc/package.nix b/pkgs/by-name/ca/cargo-aoc/package.nix index 53872b744128f..c2a0bb2c97680 100644 --- a/pkgs/by-name/ca/cargo-aoc/package.nix +++ b/pkgs/by-name/ca/cargo-aoc/package.nix @@ -17,7 +17,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-q0kpo6DNR+8129+vJSLoOC/bUYjlfaB77YTht6+kT00="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ca/cargo-auditable/builder.nix b/pkgs/by-name/ca/cargo-auditable/builder.nix new file mode 100644 index 0000000000000..348ff29ef61ad --- /dev/null +++ b/pkgs/by-name/ca/cargo-auditable/builder.nix @@ -0,0 +1,63 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + installShellFiles, + auditable-bootstrap, +}: +lib.extendMkDerivation { + constructDrv = rustPlatform.buildRustPackage.override { cargo-auditable = auditable-bootstrap; }; + + extendDrvArgs = + finalAttrs: + { + pname ? "cargo-auditable", + auditable ? true, + hash ? "", + cargoHash ? "", + ... + }: + { + inherit auditable pname; + + src = fetchFromGitHub { + owner = "rust-secure-code"; + repo = "cargo-auditable"; + tag = "v${finalAttrs.version}"; + inherit hash; + }; + + nativeBuildInputs = [ + installShellFiles + ]; + + checkFlags = [ + # requires wasm32-unknown-unknown target + "--skip=test_wasm" + # Seems to be a bug in tests of locked vs. semver compatible packages + # https://github.com/rust-secure-code/cargo-auditable/issues/235 + "--skip=test_proc_macro" + "--skip=test_self_hosting" + ]; + + postInstall = '' + installManPage cargo-auditable/cargo-auditable.1 + ''; + + passthru.bootstrap = auditable-bootstrap; + + meta = { + description = "Tool to make production Rust binaries auditable"; + mainProgram = "cargo-auditable"; + homepage = "https://github.com/rust-secure-code/cargo-auditable"; + changelog = "https://github.com/rust-secure-code/cargo-auditable/blob/v${finalAttrs.version}/cargo-auditable/CHANGELOG.md"; + license = with lib.licenses; [ + mit # or + asl20 + ]; + maintainers = with lib.maintainers; [ RossSmyth ]; + broken = stdenv.hostPlatform != stdenv.buildPlatform; + }; + }; +} diff --git a/pkgs/by-name/ca/cargo-auditable/package.nix b/pkgs/by-name/ca/cargo-auditable/package.nix new file mode 100644 index 0000000000000..b74e0abbd5158 --- /dev/null +++ b/pkgs/by-name/ca/cargo-auditable/package.nix @@ -0,0 +1,35 @@ +{ + buildPackages, + callPackage, + makeRustPlatform, +}: +let + # Need to use the build platform rustc and Cargo so that + # we don't infrec + rustPlatform = makeRustPlatform { + inherit (buildPackages) rustc; + cargo = buildPackages.cargo.override { + auditable = false; + }; + }; + + auditableBuilder = callPackage ./builder.nix { + inherit rustPlatform; + auditable-bootstrap = bootstrap; + }; + + version = "0.7.2"; + hash = "sha256-hR6PjTOps8JSM7UbfGlCoZmmwtWExVqYwh4lxDiFWdc="; + cargoHash = "sha256-JEfnUJ9J6Xak3AOCwQCnu+v+3Wl3QbXX20qVFWB6040="; + + # cargo-auditable cannot be built with cargo-auditable until cargo-auditable is built + bootstrap = auditableBuilder { + inherit version hash cargoHash; + pname = "cargo-auditable-bootstrap"; + auditable = false; + }; +in +auditableBuilder { + inherit version hash cargoHash; + auditable = true; +} diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix index 897376b8ecc24..e4dd50fbe5866 100644 --- a/pkgs/by-name/ca/cargo-expand/package.nix +++ b/pkgs/by-name/ca/cargo-expand/package.nix @@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-a8swmPQ+JuE/tqRYbV+kekZV8TloxszYq9k8VOGRBrM="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ca/cargo-hakari/package.nix b/pkgs/by-name/ca/cargo-hakari/package.nix index a03ee537c969d..18bce576ee7ef 100644 --- a/pkgs/by-name/ca/cargo-hakari/package.nix +++ b/pkgs/by-name/ca/cargo-hakari/package.nix @@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ca/cargo-llvm-cov/package.nix b/pkgs/by-name/ca/cargo-llvm-cov/package.nix index 52db65a97405b..4de52a2360c3d 100644 --- a/pkgs/by-name/ca/cargo-llvm-cov/package.nix +++ b/pkgs/by-name/ca/cargo-llvm-cov/package.nix @@ -93,7 +93,6 @@ rustPlatform.buildRustPackage (finalAttrs: { CobaltCause ]; - # The profiler runtime is (currently) disabled on non-Linux platforms - broken = !(stdenv.hostPlatform.isLinux && !stdenv.targetPlatform.isRedox); + broken = stdenv.targetPlatform.isRedox; }; }) diff --git a/pkgs/by-name/ca/cargo-modules/package.nix b/pkgs/by-name/ca/cargo-modules/package.nix index b98c0b3538eab..8196b5a9bcf73 100644 --- a/pkgs/by-name/ca/cargo-modules/package.nix +++ b/pkgs/by-name/ca/cargo-modules/package.nix @@ -44,7 +44,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "Cargo plugin for showing a tree-like overview of a crate's modules"; diff --git a/pkgs/by-name/ca/cargo-seek/package.nix b/pkgs/by-name/ca/cargo-seek/package.nix index 30cfdc3e53f18..40c2fe80f0fef 100644 --- a/pkgs/by-name/ca/cargo-seek/package.nix +++ b/pkgs/by-name/ca/cargo-seek/package.nix @@ -31,7 +31,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "HOME" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ca/catnip/package.nix b/pkgs/by-name/ca/catnip/package.nix index 84033d22dfe94..fb0355986bff8 100644 --- a/pkgs/by-name/ca/catnip/package.nix +++ b/pkgs/by-name/ca/catnip/package.nix @@ -37,7 +37,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/cb/cbmc/package.nix b/pkgs/by-name/cb/cbmc/package.nix index 91e5bcf21edbd..77c0d72ce4e74 100644 --- a/pkgs/by-name/cb/cbmc/package.nix +++ b/pkgs/by-name/cb/cbmc/package.nix @@ -107,7 +107,6 @@ stdenv.mkDerivation (finalAttrs: { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/cbmc"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { extraArgs = [ diff --git a/pkgs/by-name/cd/cdrtools/package.nix b/pkgs/by-name/cd/cdrtools/package.nix index bf36cda6f08bb..ed58c6e850cbe 100644 --- a/pkgs/by-name/cd/cdrtools/package.nix +++ b/pkgs/by-name/cd/cdrtools/package.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation (finalAttrs: { [ "-Wno-error=implicit-int" "-Wno-error=implicit-function-declaration" + "-std=gnu89" # Isn't compatible with C23 ] # https://github.com/macports/macports-ports/commit/656932616eebe60f4e8cfd96d8268801dad8224d ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ diff --git a/pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix b/pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix index fb9f074ed5dd6..a0ed56b858887 100644 --- a/pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix +++ b/pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix @@ -9,7 +9,7 @@ rustPlatform, cargo, rustc, - setuptoolsRustBuildHook, + setuptools-rust, openssl, Security ? null, isPyPy, @@ -74,9 +74,12 @@ buildPythonPackage rec { cargoRoot = "src/rust"; + build-system = [ + setuptools-rust + ]; + nativeBuildInputs = [ rustPlatform.cargoSetupHook - setuptoolsRustBuildHook cargo rustc pkg-config diff --git a/pkgs/by-name/ce/ceph/package.nix b/pkgs/by-name/ce/ceph/package.nix index 64ee3416ed82e..5a7494eecda68 100644 --- a/pkgs/by-name/ce/ceph/package.nix +++ b/pkgs/by-name/ce/ceph/package.nix @@ -321,9 +321,6 @@ let }; }); - httpcore = super.httpcore.overridePythonAttrs (old: { - nativeCheckInputs = lib.remove self.pproxy old.nativeCheckInputs; - }); }; }; @@ -421,6 +418,11 @@ stdenv.mkDerivation { url = "https://github.com/ceph/ceph/commit/9b38df488d7101b02afa834ea518fd52076d582a.patch?full_index=1"; hash = "sha256-VcbJhCGTUdNISBd6P96Mm5M3fFVmZ8r7pMl+srQmnIQ="; }) + (fetchpatch2 { + name = "ceph-19.2.2-gcc15.patch"; + url = "https://github.com/ceph/ceph/commit/830925f0dd196f920893b1947ae74171a202e825.patch"; + hash = "sha256-bs+noyjiyAjwqfgSHDxdZJnZ/kptOOcz75KMqAaROpg="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/cf/cfn-changeset-viewer/package.nix b/pkgs/by-name/cf/cfn-changeset-viewer/package.nix index d6e768ba44b81..4d0e0403b7ca4 100644 --- a/pkgs/by-name/cf/cfn-changeset-viewer/package.nix +++ b/pkgs/by-name/cf/cfn-changeset-viewer/package.nix @@ -24,7 +24,6 @@ buildNpmPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ch/chaos/package.nix b/pkgs/by-name/ch/chaos/package.nix index d3a5d44bb67b2..fc17052d90e51 100644 --- a/pkgs/by-name/ch/chaos/package.nix +++ b/pkgs/by-name/ch/chaos/package.nix @@ -29,8 +29,6 @@ buildGoModule rec { doInstallCheck = true; - versionCheckProgramArg = "--version"; - meta = { description = "Tool to communicate with Chaos DNS API"; homepage = "https://github.com/projectdiscovery/chaos-client"; diff --git a/pkgs/by-name/ch/chawan/package.nix b/pkgs/by-name/ch/chawan/package.nix index 47c4fe522f346..34bfcc8f10cf4 100644 --- a/pkgs/by-name/ch/chawan/package.nix +++ b/pkgs/by-name/ch/chawan/package.nix @@ -61,7 +61,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; diff --git a/pkgs/by-name/ch/check50/package.nix b/pkgs/by-name/ch/check50/package.nix index f82720beca02a..c2335ee90a3db 100644 --- a/pkgs/by-name/ch/check50/package.nix +++ b/pkgs/by-name/ch/check50/package.nix @@ -37,7 +37,6 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "check50" ]; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; # no python tests diff --git a/pkgs/by-name/cl/clang-uml/package.nix b/pkgs/by-name/cl/clang-uml/package.nix index 36b22f932f974..8bf5a994fe9e3 100644 --- a/pkgs/by-name/cl/clang-uml/package.nix +++ b/pkgs/by-name/cl/clang-uml/package.nix @@ -79,7 +79,6 @@ clangStdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "Customizable automatic UML diagram generator for C++ based on Clang"; diff --git a/pkgs/by-name/cl/clash-rs/package.nix b/pkgs/by-name/cl/clash-rs/package.nix index 191c52f5d6a9d..7c704ea103697 100644 --- a/pkgs/by-name/cl/clash-rs/package.nix +++ b/pkgs/by-name/cl/clash-rs/package.nix @@ -60,7 +60,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { extraArgs = [ diff --git a/pkgs/by-name/cl/clashtui/package.nix b/pkgs/by-name/cl/clashtui/package.nix index 086aec1809bea..54081266a0625 100644 --- a/pkgs/by-name/cl/clashtui/package.nix +++ b/pkgs/by-name/cl/clashtui/package.nix @@ -30,8 +30,6 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; - versionCheckProgramArg = "--version"; - nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index b7b7e17bd168e..49421366bad46 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -43,7 +43,6 @@ buildNpmPackage (finalAttrs: { versionCheckHook ]; versionCheckKeepEnvironment = [ "HOME" ]; - versionCheckProgramArg = "--version"; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/cl/cli50/package.nix b/pkgs/by-name/cl/cli50/package.nix index 08b849ae1fdc6..52ce04e440b43 100644 --- a/pkgs/by-name/cl/cli50/package.nix +++ b/pkgs/by-name/cl/cli50/package.nix @@ -31,7 +31,6 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "cli50" ]; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; # no python tests diff --git a/pkgs/by-name/cl/clive/package.nix b/pkgs/by-name/cl/clive/package.nix index f292ec880072b..71f50a5192321 100644 --- a/pkgs/by-name/cl/clive/package.nix +++ b/pkgs/by-name/cl/clive/package.nix @@ -43,7 +43,6 @@ buildGoModule rec { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doinstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/cl/clorinde/package.nix b/pkgs/by-name/cl/clorinde/package.nix index b41f3d3be9ec9..82b728259943d 100644 --- a/pkgs/by-name/cl/clorinde/package.nix +++ b/pkgs/by-name/cl/clorinde/package.nix @@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoTestFlags = finalAttrs.cargoBuildFlags; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix index 573703aab3f95..00b6fb81ba9aa 100644 --- a/pkgs/by-name/cl/clouddrive2/package.nix +++ b/pkgs/by-name/cl/clouddrive2/package.nix @@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeInstallCheckPhaseInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix index 4bd56963bca86..1715759a7690f 100644 --- a/pkgs/by-name/cl/cloudflare-warp/package.nix +++ b/pkgs/by-name/cl/cloudflare-warp/package.nix @@ -130,7 +130,6 @@ stdenv.mkDerivation (finalAttrs: { ''; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru = { inherit sources; diff --git a/pkgs/by-name/cl/cloudlist/package.nix b/pkgs/by-name/cl/cloudlist/package.nix index af10f9c3bf07a..43f2eea7fa7e3 100644 --- a/pkgs/by-name/cl/cloudlist/package.nix +++ b/pkgs/by-name/cl/cloudlist/package.nix @@ -29,8 +29,6 @@ buildGoModule rec { doInstallCheck = true; - versionCheckProgramArg = "--version"; - meta = { description = "Tool for listing assets from multiple cloud providers"; homepage = "https://github.com/projectdiscovery/cloudlist"; diff --git a/pkgs/by-name/cm/cmake-language-server/package.nix b/pkgs/by-name/cm/cmake-language-server/package.nix index d03a6abe72bd5..c28f5967b5a9b 100644 --- a/pkgs/by-name/cm/cmake-language-server/package.nix +++ b/pkgs/by-name/cm/cmake-language-server/package.nix @@ -51,7 +51,6 @@ python3Packages.buildPythonApplication rec { pytest-datadir pytestCheckHook ]); - versionCheckProgramArg = "--version"; # version.py generated by pdm, no idea why it's not present in test phase # https://github.com/regen100/cmake-language-server/blob/v0.1.11/pyproject.toml#L35-L36 diff --git a/pkgs/by-name/co/cobalt/package.nix b/pkgs/by-name/co/cobalt/package.nix index d361b95dbdeb7..ccb3e73b713a8 100644 --- a/pkgs/by-name/co/cobalt/package.nix +++ b/pkgs/by-name/co/cobalt/package.nix @@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-x4cnwCpbDYvUhlp8Fw2//NC9Z/kbv/hGF7MqKAft8bU="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/co/cocom-tool-set/package.nix b/pkgs/by-name/co/cocom-tool-set/package.nix index f4d2b2358d43b..9ab545e01c4ff 100644 --- a/pkgs/by-name/co/cocom-tool-set/package.nix +++ b/pkgs/by-name/co/cocom-tool-set/package.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation (finalAttrs: { NIX_CFLAGS_COMPILE = toString [ "-Wno-error=implicit-int" "-Wno-error=implicit-function-declaration" + "-std=gnu17" ]; }; diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix index bfdc3db155eef..95bffaf5aaaff 100644 --- a/pkgs/by-name/co/codebook/package.nix +++ b/pkgs/by-name/co/codebook/package.nix @@ -32,7 +32,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "Unholy spellchecker for code"; diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index a3121bf19eb2d..b40238c1a9920 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -60,7 +60,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/codeium_language_server"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/co/codesnap/package.nix b/pkgs/by-name/co/codesnap/package.nix index ff773fb4d6fa8..797f5412cb560 100644 --- a/pkgs/by-name/co/codesnap/package.nix +++ b/pkgs/by-name/co/codesnap/package.nix @@ -36,7 +36,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/co/cogl/package.nix b/pkgs/by-name/co/cogl/package.nix index 2422080084314..e3d1975ac146b 100644 --- a/pkgs/by-name/co/cogl/package.nix +++ b/pkgs/by-name/co/cogl/package.nix @@ -111,9 +111,16 @@ stdenv.mkDerivation rec { "-I${harfbuzz.dev}/include/harfbuzz" ] ); - } - // lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + NIX_CFLAGS_COMPILE = toString ( + [ ] + ++ lib.optional stdenv.cc.isGNU [ + # Fix build with gcc15 + "-std=gnu17" + ] + ++ lib.optional stdenv.cc.isClang [ + "-Wno-error=implicit-function-declaration" + ] + ); }; #doCheck = true; # all tests fail (no idea why) diff --git a/pkgs/by-name/co/committed/package.nix b/pkgs/by-name/co/committed/package.nix index 5a62039695118..7aa60418d134f 100644 --- a/pkgs/by-name/co/committed/package.nix +++ b/pkgs/by-name/co/committed/package.nix @@ -35,7 +35,6 @@ rustPlatform.buildRustPackage { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/co/compare50/package.nix b/pkgs/by-name/co/compare50/package.nix index e1fa66017524b..4d02e49000c2c 100644 --- a/pkgs/by-name/co/compare50/package.nix +++ b/pkgs/by-name/co/compare50/package.nix @@ -49,7 +49,6 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "compare50" ]; - versionCheckProgramArg = "--version"; nativeCheckInputs = [ versionCheckHook ]; # repo does not use pytest diff --git a/pkgs/by-name/co/composer-require-checker/package.nix b/pkgs/by-name/co/composer-require-checker/package.nix index b600f997f041f..89eec24a9f76e 100644 --- a/pkgs/by-name/co/composer-require-checker/package.nix +++ b/pkgs/by-name/co/composer-require-checker/package.nix @@ -20,7 +20,6 @@ php.buildComposerProject2 (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "CLI tool to check whether a specific composer package uses imported symbols that aren't part of its direct composer dependencies"; diff --git a/pkgs/by-name/co/conftest/package.nix b/pkgs/by-name/co/conftest/package.nix index a2ec0d24a9969..a20bd9201fda5 100644 --- a/pkgs/by-name/co/conftest/package.nix +++ b/pkgs/by-name/co/conftest/package.nix @@ -56,7 +56,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Write tests against structured configuration data"; diff --git a/pkgs/by-name/co/container/package.nix b/pkgs/by-name/co/container/package.nix index fe51e62cac5cc..d5cd3bb9e0596 100644 --- a/pkgs/by-name/co/container/package.nix +++ b/pkgs/by-name/co/container/package.nix @@ -46,7 +46,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/co/conventional-changelog-cli/package.nix b/pkgs/by-name/co/conventional-changelog-cli/package.nix index 5028b5fd26205..b1ee5ab384f12 100644 --- a/pkgs/by-name/co/conventional-changelog-cli/package.nix +++ b/pkgs/by-name/co/conventional-changelog-cli/package.nix @@ -65,7 +65,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { diff --git a/pkgs/by-name/co/convos/package.nix b/pkgs/by-name/co/convos/package.nix index aa65ed66b6561..74c3b41cfbeb7 100644 --- a/pkgs/by-name/co/convos/package.nix +++ b/pkgs/by-name/co/convos/package.nix @@ -5,7 +5,6 @@ perl, perlPackages, makeWrapper, - shortenPerlShebang, openssl, nixosTests, }: @@ -21,10 +20,7 @@ perlPackages.buildPerlPackage rec { sha256 = "sha256-dBvXo8y4OMKcb0imgnnzoklnPN3YePHDvy5rIBOkTfs="; }; - nativeBuildInputs = [ - makeWrapper - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ shortenPerlShebang ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = with perlPackages; [ CryptPassphrase @@ -108,9 +104,6 @@ perlPackages.buildPerlPackage rec { cp -vR templates $out/templates cp Makefile.PL $out/Makefile.PL '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/convos - '' + '' wrapProgram $out/bin/convos --set MOJO_HOME $out ''; diff --git a/pkgs/by-name/co/coordgenlibs/package.nix b/pkgs/by-name/co/coordgenlibs/package.nix index eb421a3534bc7..be43103068bb7 100644 --- a/pkgs/by-name/co/coordgenlibs/package.nix +++ b/pkgs/by-name/co/coordgenlibs/package.nix @@ -45,6 +45,13 @@ stdenv.mkDerivation (finalAttrs: { 'cmake_minimum_required(VERSION 3.5)' ''; + cmakeFlags = [ + # Be more permissive to compiler warnings + # Fix the new -Wrestrict warning in gcc 15 blocking build + # https://github.com/schrodinger/coordgenlibs/issues/137 + (lib.cmakeBool "COORDGEN_RIGOROUS_BUILD" false) + ]; + doCheck = true; # Fix the build with Clang 20. diff --git a/pkgs/by-name/co/cope/package.nix b/pkgs/by-name/co/cope/package.nix index a138bd01cb9ea..0c62015faec9e 100644 --- a/pkgs/by-name/co/cope/package.nix +++ b/pkgs/by-name/co/cope/package.nix @@ -1,12 +1,9 @@ { lib, fetchFromGitHub, - perl538Packages, + perlPackages, makeWrapper, }: -let - perlPackages = perl538Packages; -in perlPackages.buildPerlPackage { pname = "cope"; version = "0-unstable-2025-06-20"; @@ -70,5 +67,6 @@ perlPackages.buildPerlPackage { gpl1Plus ]; maintainers = with lib.maintainers; [ deftdawg ]; + broken = true; # requires old Perl we don't ship anymore }; } diff --git a/pkgs/by-name/co/countryfetch/package.nix b/pkgs/by-name/co/countryfetch/package.nix index 16b5763fb051f..560276cfffe68 100644 --- a/pkgs/by-name/co/countryfetch/package.nix +++ b/pkgs/by-name/co/countryfetch/package.nix @@ -32,7 +32,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package=countryfetch" ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/cp/cppcheck/package.nix b/pkgs/by-name/cp/cppcheck/package.nix index 58cd3ea21d74b..c86f39c301235 100644 --- a/pkgs/by-name/cp/cppcheck/package.nix +++ b/pkgs/by-name/cp/cppcheck/package.nix @@ -94,7 +94,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; installCheckPhase = '' runHook preInstallCheck diff --git a/pkgs/by-name/cp/cpplint/package.nix b/pkgs/by-name/cp/cpplint/package.nix index 196fe69cc6742..765d79c48769c 100644 --- a/pkgs/by-name/cp/cpplint/package.nix +++ b/pkgs/by-name/cp/cpplint/package.nix @@ -35,7 +35,6 @@ python3Packages.buildPythonApplication rec { testfixtures versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { homepage = "https://github.com/cpplint/cpplint"; diff --git a/pkgs/by-name/cp/cppman/package.nix b/pkgs/by-name/cp/cppman/package.nix index b0ed1eacf92a4..176f2979bc2ac 100644 --- a/pkgs/by-name/cp/cppman/package.nix +++ b/pkgs/by-name/cp/cppman/package.nix @@ -55,7 +55,6 @@ python3Packages.buildPythonApplication rec { ]; # Writable $HOME is required for `cppman --version` to work versionCheckKeepEnvironment = "HOME"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/cp/cproto/package.nix b/pkgs/by-name/cp/cproto/package.nix index 257bba7420d57..4dc9a1c1d3641 100644 --- a/pkgs/by-name/cp/cproto/package.nix +++ b/pkgs/by-name/cp/cproto/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { urls = [ "mirror://debian/pool/main/c/cproto/cproto_${version}.orig.tar.gz" # No version listings and apparently no versioned tarball over http(s). - "ftp://ftp.invisible-island.net/cproto/cproto-${version}.tgz" + "https://invisible-island.net/archives/cproto/cproto-${version}.tgz" ]; sha256 = "sha256-C9HYvo/wpMpD+Uf5V1DTT2TtqTyeLKeRAP1gFAt8YzE="; }; diff --git a/pkgs/by-name/cr/criticality-score/package.nix b/pkgs/by-name/cr/criticality-score/package.nix index 9d1409248466f..274d541b7ffc8 100644 --- a/pkgs/by-name/cr/criticality-score/package.nix +++ b/pkgs/by-name/cr/criticality-score/package.nix @@ -41,7 +41,6 @@ buildGo124Module rec { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = "--version"; meta = { description = "Gives criticality score for an open source project"; diff --git a/pkgs/by-name/cr/cronie/package.nix b/pkgs/by-name/cr/cronie/package.nix index 6c727dda3ca17..bb707390693e7 100644 --- a/pkgs/by-name/cr/cronie/package.nix +++ b/pkgs/by-name/cr/cronie/package.nix @@ -2,6 +2,7 @@ lib, autoreconfHook, fetchFromGitHub, + fetchpatch, stdenv, }: @@ -16,6 +17,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-WrzdpE9t7vWpc8QFoFs+S/HgHwsidRNmfcHp7ltSWQw="; }; + patches = [ + # Fix build with GCC 15 + (fetchpatch { + url = "https://github.com/cronie-crond/cronie/commit/09c630c654b2aeff06a90a412cce0a60ab4955a4.patch"; + hash = "sha256-OU6pCFeEPC32cPE3K9Uq9HuvpwdUZpaBtyxNOaJkFVM="; + }) + ]; + configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" diff --git a/pkgs/by-name/cr/crusader/package.nix b/pkgs/by-name/cr/crusader/package.nix index c70d2e2ff951f..ff10d08eca579 100644 --- a/pkgs/by-name/cr/crusader/package.nix +++ b/pkgs/by-name/cr/crusader/package.nix @@ -70,7 +70,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix index 44c55d6defff6..229bdc49983bd 100644 --- a/pkgs/by-name/cr/crush/package.nix +++ b/pkgs/by-name/cr/crush/package.nix @@ -42,7 +42,6 @@ buildGoModule (finalAttrs: { nativeCheckInputs = [ writableTmpDirAsHomeHook ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; updateScript = nix-update-script { }; diff --git a/pkgs/by-name/cs/csharp-ls/package.nix b/pkgs/by-name/cs/csharp-ls/package.nix index dfcc8738343ee..5a3bb73c571a4 100644 --- a/pkgs/by-name/cs/csharp-ls/package.nix +++ b/pkgs/by-name/cs/csharp-ls/package.nix @@ -21,7 +21,6 @@ buildDotnetGlobalTool rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/cs/csound/package.nix b/pkgs/by-name/cs/csound/package.nix index 155fddc1ca929..95d836daba40d 100644 --- a/pkgs/by-name/cs/csound/package.nix +++ b/pkgs/by-name/cs/csound/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, libsndfile, libsamplerate, @@ -36,6 +37,14 @@ stdenv.mkDerivation { sha256 = "sha256-NDYltwmjBsX1DWCjy8/4cXMSl3/mK+HaQHSKUmRR9TI="; }; + patches = [ + # Fix typo that breaks build + (fetchpatch { + url = "https://github.com/csound/csound/commit/bb9bafcfa17a87d3733eda1e25a812fd0be08ac6.diff"; + hash = "sha256-0M047uALPAoyQP0LbfBAybb2DWQ2/6QwZXxUjs1O1fE="; + }) + ]; + cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp diff --git a/pkgs/by-name/ct/ctags-lsp/package.nix b/pkgs/by-name/ct/ctags-lsp/package.nix index 676d358e53ccb..81f884b39626d 100644 --- a/pkgs/by-name/ct/ctags-lsp/package.nix +++ b/pkgs/by-name/ct/ctags-lsp/package.nix @@ -42,7 +42,6 @@ buildGoModule rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/cu/cups/package.nix b/pkgs/by-name/cu/cups/package.nix index 42639521e4132..665ef7fab10f5 100644 --- a/pkgs/by-name/cu/cups/package.nix +++ b/pkgs/by-name/cu/cups/package.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "cups"; - version = "2.4.14"; + version = "2.4.16"; src = fetchurl { url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; - hash = "sha256-ZgKIAg3W95yveZgRxMGjIHpIaJiZrCCTlZ1wo73Ldpk="; + hash = "sha256-AzlYcgS0+UKN0FkuswHewL+epuqNzl2WkNVr5YWrqS0="; }; outputs = [ diff --git a/pkgs/by-name/cv/cvs/package.nix b/pkgs/by-name/cv/cvs/package.nix index 47c4c2f888c7b..f903bc16a74cc 100644 --- a/pkgs/by-name/cv/cvs/package.nix +++ b/pkgs/by-name/cv/cvs/package.nix @@ -46,6 +46,10 @@ stdenv.mkDerivation { texinfo ]; + # Fix build with gcc15 + # https://savannah.nongnu.org/bugs/index.php?66726 + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; + configureFlags = [ "--with-editor=${nano}/bin/nano" diff --git a/pkgs/by-name/cy/cyme/package.nix b/pkgs/by-name/cy/cyme/package.nix index 94002e4821b53..7da2e189040d0 100644 --- a/pkgs/by-name/cy/cyme/package.nix +++ b/pkgs/by-name/cy/cyme/package.nix @@ -52,7 +52,6 @@ rustPlatform.buildRustPackage rec { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/cy/cyrus_sasl/package.nix b/pkgs/by-name/cy/cyrus_sasl/package.nix index 63dff1f5e4c57..16f83afbec07c 100644 --- a/pkgs/by-name/cy/cyrus_sasl/package.nix +++ b/pkgs/by-name/cy/cyrus_sasl/package.nix @@ -39,6 +39,11 @@ stdenv.mkDerivation rec { url = "https://github.com/cyrusimap/cyrus-sasl/compare/cb549ef71c5bb646fe583697ebdcaba93267a237...dfaa62392e7caecc6ecf0097b4d73738ec4fc0a8.patch"; hash = "sha256-pc0cZqj1QoxDqgd/j/5q3vWONEPrTm4Pr6MzHlfjRCc="; }) + # Fix build with gcc15 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/cyrus-sasl/raw/388b80c6a8f93667587b4ac2e7992d0aa1c431f9/f/cyrus-sasl-2.1.28-gcc15.patch"; + hash = "sha256-AfSQXFtVh0IHG8Uw9nWMWlkQnyaX3ZMsdZLd7hTru7Q="; + }) ]; outputs = [ @@ -63,7 +68,7 @@ stdenv.mkDerivation rec { libxcrypt ] ++ lib.optional enableLdap openldap - ++ lib.optional stdenv.hostPlatform.isLinux pam; + ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform pam) pam; configureFlags = [ "--with-openssl=${openssl.dev}" diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix index 592bbf2f1e713..496d56dda6ce9 100644 --- a/pkgs/by-name/cz/czkawka/package.nix +++ b/pkgs/by-name/cz/czkawka/package.nix @@ -71,7 +71,6 @@ let versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/czkawka_cli"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/da/dae/package.nix b/pkgs/by-name/da/dae/package.nix index 67e802908d7a7..9c40cd6b4d9ea 100644 --- a/pkgs/by-name/da/dae/package.nix +++ b/pkgs/by-name/da/dae/package.nix @@ -54,8 +54,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - passthru = { tests = { inherit (nixosTests) dae; diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix index 5e214aa5a5b0e..ec270b04428b6 100644 --- a/pkgs/by-name/da/darktable/package.nix +++ b/pkgs/by-name/da/darktable/package.nix @@ -198,7 +198,6 @@ stdenv.mkDerivation rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = gitUpdater { diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix index 38813b4744501..ceb5acadf01fd 100644 --- a/pkgs/by-name/da/databricks-cli/package.nix +++ b/pkgs/by-name/da/databricks-cli/package.nix @@ -84,7 +84,6 @@ buildGoModule (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/databricks"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/db/dbx/package.nix b/pkgs/by-name/db/dbx/package.nix index 29d90cd8eafae..e803dc6302faf 100644 --- a/pkgs/by-name/db/dbx/package.nix +++ b/pkgs/by-name/db/dbx/package.nix @@ -129,7 +129,6 @@ python.pkgs.buildPythonApplication rec { pytest-xdist pytestCheckHook ]); - versionCheckProgramArg = "--version"; disabledTests = [ # Fails because of dbfs CLI wrong call diff --git a/pkgs/by-name/dd/ddev/package.nix b/pkgs/by-name/dd/ddev/package.nix index 739e3f1eb0d42..b3a4cab1345cf 100644 --- a/pkgs/by-name/dd/ddev/package.nix +++ b/pkgs/by-name/dd/ddev/package.nix @@ -50,7 +50,6 @@ buildGoModule rec { versionCheckHook writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "HOME" ]; meta = { diff --git a/pkgs/by-name/de/deepcool-digital-linux/package.nix b/pkgs/by-name/de/deepcool-digital-linux/package.nix index 427b8393a67ab..ddcd9c19c3b30 100644 --- a/pkgs/by-name/de/deepcool-digital-linux/package.nix +++ b/pkgs/by-name/de/deepcool-digital-linux/package.nix @@ -28,7 +28,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = false; # FIXME: version cmd returns 0.8.3, set to true when we switch to a stable version nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/de/deputy/package.nix b/pkgs/by-name/de/deputy/package.nix index 53d43df4c988f..67687d15a77a9 100644 --- a/pkgs/by-name/de/deputy/package.nix +++ b/pkgs/by-name/de/deputy/package.nix @@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-TezOv07Dl99jw8FIqJvx6F8X8Au/aMPC/CXDYLkQDnE="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/de/deterministic-zip/package.nix b/pkgs/by-name/de/deterministic-zip/package.nix index 527ea94d20254..601d99c494b0c 100644 --- a/pkgs/by-name/de/deterministic-zip/package.nix +++ b/pkgs/by-name/de/deterministic-zip/package.nix @@ -23,7 +23,6 @@ buildGoModule (finalAttrs: { "-X github.com/timo-reymann/deterministic-zip/pkg/buildinfo.Version=${finalAttrs.version}" ]; - versionCheckProgramArg = "--version"; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/de/dev86/package.nix b/pkgs/by-name/de/dev86/package.nix index 726ba568479f4..9b19da1d43e80 100644 --- a/pkgs/by-name/de/dev86/package.nix +++ b/pkgs/by-name/de/dev86/package.nix @@ -6,16 +6,22 @@ stdenv.mkDerivation (finalAttrs: { pname = "dev86"; - version = "1.0.1"; + version = "1.0.1-unstable-2025-02-12"; src = fetchFromGitea { domain = "codeberg.org"; owner = "jbruchon"; repo = "dev86"; - tag = "v${finalAttrs.version}"; - hash = "sha256-xeOtESc0X7RZWCIpNZSHE8au9+opXwnHsAcayYLSX7w="; + rev = "0332db1ceb238fa7f98603cdf4223a1d839d4b31"; + hash = "sha256-f6C7ykOmOHwxeMsF1Wm81FBBJNwTP0cF4+mFMzsc208="; }; + patches = [ + # Fix for GCC 15/C23 by de-K&R-ing function definitions and adding + # missing parameters to function declarations where necessary. + ./unproto-c23-compatibility.patch + ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = { diff --git a/pkgs/by-name/de/dev86/unproto-c23-compatibility.patch b/pkgs/by-name/de/dev86/unproto-c23-compatibility.patch new file mode 100644 index 0000000000000..a931f1072914a --- /dev/null +++ b/pkgs/by-name/de/dev86/unproto-c23-compatibility.patch @@ -0,0 +1,245 @@ +diff --git a/unproto/error.c b/unproto/error.c +index 667d978cbb..2fbccacb4d 100644 +--- a/unproto/error.c ++++ b/unproto/error.c +@@ -53,7 +53,7 @@ + + #include + +-extern void exit(); ++extern void exit(int status); + + /* Application-specific stuff */ + +diff --git a/unproto/error.h b/unproto/error.h +index dfb27e9067..cb52ae646b 100644 +--- a/unproto/error.h ++++ b/unproto/error.h +@@ -1,6 +1,6 @@ + /* @(#) error.h 1.2 92/01/15 21:53:14 */ + + extern int errcount; /* error counter */ +-extern void error(); /* default context */ +-extern void error_where(); /* user-specified context */ +-extern void fatal(); /* fatal error */ ++extern void error(char *text); /* default context */ ++extern void error_where(char *path, int line, char *text); /* user-specified context */ ++extern void fatal(char *text); /* fatal error */ +diff --git a/unproto/strsave.c b/unproto/strsave.c +index 2ee00b4172..faa4e18686 100644 +--- a/unproto/strsave.c ++++ b/unproto/strsave.c +@@ -28,7 +28,7 @@ + #include + + extern int hash(register char *s, unsigned size); +-extern char *malloc(); ++extern char *malloc(long size); + + /* Application-specific stuff */ + +diff --git a/unproto/symbol.c b/unproto/symbol.c +index 67a4bf0bc6..a4beab5e92 100644 +--- a/unproto/symbol.c ++++ b/unproto/symbol.c +@@ -45,7 +45,7 @@ + #include + + extern int hash(register char *s, unsigned size); +-extern char *malloc(); ++extern char *malloc(long size); + + /* Application-specific stuff */ + +diff --git a/unproto/symbol.h b/unproto/symbol.h +index 0711c1f4dc..0e2b1d88f8 100644 +--- a/unproto/symbol.h ++++ b/unproto/symbol.h +@@ -6,6 +6,6 @@ + struct symbol *next; + }; + +-extern void sym_enter(); /* add symbol to table */ +-extern struct symbol *sym_find(); /* locate symbol */ ++extern void sym_enter(char *name, int type); /* add symbol to table */ ++extern struct symbol *sym_find(register char *name); /* locate symbol */ + extern void sym_init(); /* prime the table */ +diff --git a/unproto/tok_class.c b/unproto/tok_class.c +index 04207a07f3..9af67188ca 100644 +--- a/unproto/tok_class.c ++++ b/unproto/tok_class.c +@@ -51,8 +51,8 @@ + #include + #include + +-extern long time(); +-extern char* ctime(); ++extern long time(long *tloc); ++extern char* ctime(long *clock); + + /* Application-specific stuff */ + +@@ -61,13 +61,13 @@ + #include "token.h" + #include "symbol.h" + +-static struct token *tok_list(); +-static void tok_list_struct(); +-static void tok_list_append(); +-static void tok_strcat(); +-static void tok_time(); +-static void tok_date(); +-static void tok_space_append(); ++static struct token *tok_list(struct token *t); ++static void tok_list_struct(register struct token *list, register struct token *t); ++static void tok_list_append(struct token *h, struct token *t); ++static void tok_strcat(register struct token *t1); ++static void tok_time(struct token *t); ++static void tok_date(struct token *t); ++static void tok_space_append(register struct token *list, register struct token *t); + + #if defined(MAP_VOID_STAR) || defined(MAP_VOID) + static void tok_void(); /* rewrite void keyword */ +diff --git a/unproto/tok_io.c b/unproto/tok_io.c +index 288950b3ac..773ca5bf4d 100644 +--- a/unproto/tok_io.c ++++ b/unproto/tok_io.c +@@ -89,7 +89,7 @@ + #include "vstring.h" + #include "error.h" + +-extern char *strsave(); /* XXX need include file */ ++extern char *strsave(register char *str); /* XXX need include file */ + + /* Stuff to keep track of original source file name and position */ + +@@ -104,12 +104,12 @@ + + /* Forward declarations */ + +-static int read_quoted(); +-static void read_comment(); ++static int read_quoted(register struct vstring *vs, int ch); ++static void read_comment(register struct vstring *vs); + static int backslash_newline(); +-static char *read_hex(); +-static char *read_octal(); +-static void fix_line_control(); ++static char *read_hex(struct vstring *vs, register char *cp); ++static char *read_octal(register struct vstring *vs, register char *cp, register int c); ++static void fix_line_control(register char *path, register int line); + + /* + * Character input with one level of pushback. The INPUT() macro recursively +diff --git a/unproto/tok_pool.c b/unproto/tok_pool.c +index e2ed107ce7..bbe3d184c5 100644 +--- a/unproto/tok_pool.c ++++ b/unproto/tok_pool.c +@@ -37,7 +37,7 @@ + + /* C library */ + +-extern char *malloc(); ++extern char *malloc(long size); + + /* Application-specific stuff */ + +diff --git a/unproto/token.h b/unproto/token.h +index bb2f50a106..e3752a0eb3 100644 +--- a/unproto/token.h ++++ b/unproto/token.h +@@ -27,11 +27,11 @@ + /* Input/output functions and macros */ + + extern struct token *tok_get(); /* read next single token */ +-extern void tok_show(); /* display (composite) token */ ++extern void tok_show(register struct token *t); /* display (composite) token */ + extern struct token *tok_class(); /* classify tokens */ +-extern void tok_unget(); /* stuff token back into input */ ++extern void tok_unget(register struct token *t); /* stuff token back into input */ + extern void put_nl(); /* print newline character */ +-extern void tok_show_ch(); /* emit single-character token */ ++extern void tok_show_ch(register struct token *t); /* emit single-character token */ + + #define tok_flush(t) (tok_show(t), tok_free(t)) + +@@ -46,7 +46,7 @@ + /* Memory management */ + + struct token *tok_alloc(); /* allocate token storage */ +-extern void tok_free(); /* re-cycle storage */ ++extern void tok_free(register struct token *t); /* re-cycle storage */ + + /* Context */ + +diff --git a/unproto/unproto.c b/unproto/unproto.c +index 18fc2aaecf..802b91dd3e 100644 +--- a/unproto/unproto.c ++++ b/unproto/unproto.c +@@ -140,7 +140,7 @@ + #include + #include + +-extern void exit(); ++extern void exit(int status); + extern int optind; + extern char *optarg; + extern int getopt(); +@@ -159,16 +159,16 @@ + + /* Forward declarations. */ + +-static struct token *dcl_flush(); +-static void block_flush(); ++static struct token *dcl_flush(register struct token *t); ++static void block_flush(register struct token *t); + static void block_dcls(); +-static struct token *show_func_ptr_type(); +-static struct token *show_struct_type(); +-static void show_arg_name(); +-static void show_type(); +-static void pair_flush(); +-static void check_cast(); +-static void show_empty_list(); ++static struct token *show_func_ptr_type(struct token *t1, struct token *t2); ++static struct token *show_struct_type(register struct token *p); ++static void show_arg_name(register struct token *s); ++static void show_type(register struct token *s); ++static void pair_flush(register struct token *t, register int start, register int stop); ++static void check_cast(struct token *t); ++static void show_empty_list(register struct token *t); + + #define check_cast_flush(t) (check_cast(t), tok_free(t)) + +diff --git a/unproto/vstring.c b/unproto/vstring.c +index 220bd530fe..ef9bcffa3c 100644 +--- a/unproto/vstring.c ++++ b/unproto/vstring.c +@@ -67,8 +67,8 @@ + + /* C library */ + +-extern char *malloc(); +-extern char *realloc(); ++extern char *malloc(long size); ++extern char *realloc(char *p, long size); + + /* Application-specific stuff */ + +diff --git a/unproto/vstring.h b/unproto/vstring.h +index c2e1f88a77..16a17aa815 100644 +--- a/unproto/vstring.h ++++ b/unproto/vstring.h +@@ -5,9 +5,9 @@ + char *last; /* last position */ + }; + +-extern struct vstring *vs_alloc(); /* initial allocation */ +-extern char *vs_realloc(); /* string extension */ +-extern char *vs_strcpy(); /* copy string */ ++extern struct vstring *vs_alloc(int len); /* initial allocation */ ++extern char *vs_realloc(register struct vstring *vp, char *cp); /* string extension */ ++extern char *vs_strcpy(register struct vstring *vp, register char *dst, register char *src); /* copy string */ + + /* macro to add one character to auto-resized string */ + diff --git a/pkgs/by-name/di/diffstat/package.nix b/pkgs/by-name/di/diffstat/package.nix index 3744d3da2a2eb..7aa1b6e3ed81e 100644 --- a/pkgs/by-name/di/diffstat/package.nix +++ b/pkgs/by-name/di/diffstat/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "ftp://ftp.invisible-island.net/diffstat/diffstat-${version}.tgz" + "https://invisible-island.net/archives/diffstat/diffstat-${version}.tgz" "https://invisible-mirror.net/archives/diffstat/diffstat-${version}.tgz" ]; hash = "sha256-ifkpSorHT8728bmsQI9D6+340gjj7+C5m0rMFtxlgsc="; diff --git a/pkgs/by-name/di/difftastic/package.nix b/pkgs/by-name/di/difftastic/package.nix index bfbfdd8c2207f..92895f6588946 100644 --- a/pkgs/by-name/di/difftastic/package.nix +++ b/pkgs/by-name/di/difftastic/package.nix @@ -30,7 +30,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/difft"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/di/display3d/package.nix b/pkgs/by-name/di/display3d/package.nix index 6b9667d820596..90d4121dd9a13 100644 --- a/pkgs/by-name/di/display3d/package.nix +++ b/pkgs/by-name/di/display3d/package.nix @@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/di/distant/package.nix b/pkgs/by-name/di/distant/package.nix index 6573d5e9fbc84..6f51d4a6589c7 100644 --- a/pkgs/by-name/di/distant/package.nix +++ b/pkgs/by-name/di/distant/package.nix @@ -66,7 +66,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/dj/django-upgrade/package.nix b/pkgs/by-name/dj/django-upgrade/package.nix index 228db44bb066a..4e047a1130abf 100644 --- a/pkgs/by-name/dj/django-upgrade/package.nix +++ b/pkgs/by-name/dj/django-upgrade/package.nix @@ -26,8 +26,6 @@ python3Packages.buildPythonApplication rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; - pythonImportsCheck = [ "django_upgrade" ]; meta = { diff --git a/pkgs/by-name/do/docker-language-server/package.nix b/pkgs/by-name/do/docker-language-server/package.nix index c0d8db509963c..7fe0a09825c1d 100644 --- a/pkgs/by-name/do/docker-language-server/package.nix +++ b/pkgs/by-name/do/docker-language-server/package.nix @@ -51,7 +51,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/do/dovi-tool/package.nix b/pkgs/by-name/do/dovi-tool/package.nix index b3b8244785a88..9cf19591cc639 100644 --- a/pkgs/by-name/do/dovi-tool/package.nix +++ b/pkgs/by-name/do/dovi-tool/package.nix @@ -52,7 +52,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/dovi_tool"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/do/doxx/package.nix b/pkgs/by-name/do/doxx/package.nix index b12464d65a319..e68a101187f0a 100644 --- a/pkgs/by-name/do/doxx/package.nix +++ b/pkgs/by-name/do/doxx/package.nix @@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/dp/dpkg/package.nix b/pkgs/by-name/dp/dpkg/package.nix index 40c5a5ed0fe1d..c2e6b0ed08edf 100644 --- a/pkgs/by-name/dp/dpkg/package.nix +++ b/pkgs/by-name/dp/dpkg/package.nix @@ -125,7 +125,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; setupHook = ./setup-hook.sh; diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix index 0c44ccf9039d2..dbea0403ed51e 100644 --- a/pkgs/by-name/dp/dprint/package.nix +++ b/pkgs/by-name/dp/dprint/package.nix @@ -75,7 +75,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/dprint"; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "HOME" ]; passthru = { diff --git a/pkgs/by-name/dr/drawpile/package.nix b/pkgs/by-name/dr/drawpile/package.nix index d31a9ffc1626b..9cf75ef2c1c01 100644 --- a/pkgs/by-name/dr/drawpile/package.nix +++ b/pkgs/by-name/dr/drawpile/package.nix @@ -94,12 +94,7 @@ stdenv.mkDerivation rec { extra-cmake-modules rustc rustPlatform.cargoSetupHook - ( - if buildClient || buildServerGui then - qt6Packages.wrapQtAppsHook - else - qt6Packages.wrapQtAppsNoGuiHook - ) + qt6Packages.wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/by-name/dt/dtach/package.nix b/pkgs/by-name/dt/dtach/package.nix index 1d1be03dcd2c9..9e359d43f5941 100644 --- a/pkgs/by-name/dt/dtach/package.nix +++ b/pkgs/by-name/dt/dtach/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch2, }: stdenv.mkDerivation rec { @@ -13,6 +14,13 @@ stdenv.mkDerivation rec { sha256 = "1wwj2hlngi8qn2pisvhyfxxs8gyqjlgrrv5lz91w8ly54dlzvs9j"; }; + patches = [ + (fetchpatch2 { + url = "https://github.com/crigler/dtach/commit/6d80909a8c0fd19717010a3c76fec560f988ca48.patch?full_index=1"; + hash = "sha256-v3vToJdSwihiPCSjXjEJghiaynHPTEql3F7URXRjCbM="; + }) + ]; + installPhase = '' mkdir -p $out/bin cp dtach $out/bin/dtach diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix index e9192fecaf46d..d86c9a566447a 100644 --- a/pkgs/by-name/du/dua/package.nix +++ b/pkgs/by-name/du/dua/package.nix @@ -35,7 +35,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/du/dunst/package.nix b/pkgs/by-name/du/dunst/package.nix index 57ac6d47ccb43..ee2838fa65d3e 100644 --- a/pkgs/by-name/du/dunst/package.nix +++ b/pkgs/by-name/du/dunst/package.nix @@ -106,7 +106,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix index 35d3afef4632f..537c4af173144 100644 --- a/pkgs/by-name/du/dust/package.nix +++ b/pkgs/by-name/du/dust/package.nix @@ -48,7 +48,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/dust"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/dw/dwarf2json/package.nix b/pkgs/by-name/dw/dwarf2json/package.nix index d0a1980478f66..2551a24d5e649 100644 --- a/pkgs/by-name/dw/dwarf2json/package.nix +++ b/pkgs/by-name/dw/dwarf2json/package.nix @@ -20,7 +20,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { homepage = "https://github.com/volatilityfoundation/dwarf2json"; diff --git a/pkgs/by-name/dw/dwarfs/package.nix b/pkgs/by-name/dw/dwarfs/package.nix index a43824fd2e87d..8669f2eb3ddea 100644 --- a/pkgs/by-name/dw/dwarfs/package.nix +++ b/pkgs/by-name/dw/dwarfs/package.nix @@ -112,7 +112,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; versionCheckProgram = "${placeholder "out"}/bin/dwarfs"; meta = { diff --git a/pkgs/by-name/eb/eb-garamond/package.nix b/pkgs/by-name/eb/eb-garamond/package.nix index 7376c05b71211..c4e589d66acad 100644 --- a/pkgs/by-name/eb/eb-garamond/package.nix +++ b/pkgs/by-name/eb/eb-garamond/package.nix @@ -3,22 +3,22 @@ stdenvNoCC, fetchFromGitHub, python3, - ttfautohint, + ttfautohint-nox, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "eb-garamond"; version = "0.016"; src = fetchFromGitHub { owner = "georgd"; repo = "EB-Garamond"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ajieKhTeH6yv2qiE2xqnHFoMS65//4ZKiccAlC2PXGQ="; }; nativeBuildInputs = [ (python3.withPackages (p: [ p.fontforge ])) - ttfautohint + ttfautohint-nox ]; postPatch = '' @@ -53,4 +53,4 @@ stdenvNoCC.mkDerivation rec { license = lib.licenses.ofl; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ec/ec2-instance-selector/package.nix b/pkgs/by-name/ec/ec2-instance-selector/package.nix index 58f72da2ba030..a8a0b9cb450a3 100644 --- a/pkgs/by-name/ec/ec2-instance-selector/package.nix +++ b/pkgs/by-name/ec/ec2-instance-selector/package.nix @@ -32,7 +32,6 @@ buildGoModule (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "HOME" ]; doInstallCheck = true; diff --git a/pkgs/by-name/ed/eddie/package.nix b/pkgs/by-name/ed/eddie/package.nix index 6dd1b1b9aa2f6..977c49caeff93 100644 --- a/pkgs/by-name/ed/eddie/package.nix +++ b/pkgs/by-name/ed/eddie/package.nix @@ -130,7 +130,6 @@ buildDotnetModule (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/eddie-cli"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ed/editline/package.nix b/pkgs/by-name/ed/editline/package.nix index 716652c16190b..9a46aa80f8ea0 100644 --- a/pkgs/by-name/ed/editline/package.nix +++ b/pkgs/by-name/ed/editline/package.nix @@ -37,6 +37,10 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = lib.optional enableTermcap ncurses; + makeFlags = lib.optionals stdenv.hostPlatform.isPE [ + "LDFLAGS=-no-undefined" + ]; + outputs = [ "out" "dev" diff --git a/pkgs/by-name/ed/edk2/package.nix b/pkgs/by-name/ed/edk2/package.nix index 2188cc20ee1e0..c1eeda41b8702 100644 --- a/pkgs/by-name/ed/edk2/package.nix +++ b/pkgs/by-name/ed/edk2/package.nix @@ -55,6 +55,14 @@ stdenv.mkDerivation (finalAttrs: { }) ./fix-cross-compilation-antlr-dlg.patch + + # fix compatibility with nasm 3.01 (https://github.com/tianocore/edk2/pull/11691) + # TODO: remove when updating beyond 202511 + (fetchpatch { + name = "UefiCpuPkg-CpuExceptionHandlerLib-fix-push-instructions.patch"; + url = "https://github.com/tianocore/edk2/commit/9ccf8751a74f26142e584c7b7c7572a182b67997.patch"; + hash = "sha256-0aqpuQDxLdbSJMBXzY/57GzL2wLn0m8dkT7X6uXtKMg="; + }) ]; # FIXME: unvendor OpenSSL again once upstream updates diff --git a/pkgs/by-name/ek/eks-node-viewer/package.nix b/pkgs/by-name/ek/eks-node-viewer/package.nix index f52d258e7dbb5..95cc6a51eb0e0 100644 --- a/pkgs/by-name/ek/eks-node-viewer/package.nix +++ b/pkgs/by-name/ek/eks-node-viewer/package.nix @@ -31,7 +31,6 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/el/elfutils/package.nix b/pkgs/by-name/el/elfutils/package.nix index 4098753735ae7..b9827432a71da 100644 --- a/pkgs/by-name/el/elfutils/package.nix +++ b/pkgs/by-name/el/elfutils/package.nix @@ -57,6 +57,8 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strndupa.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; sha256 = "sha256-7daehJj1t0wPtQzTv+/Rpuqqs5Ng/EYnZzrcf2o/Lb0="; }) + # https://patchwork.sourceware.org/project/elfutils/patch/20251205145241.1165646-1-arnout@bzzt.net/ + ./test-run-sysroot-reliability.patch ] ++ lib.optionals stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ]; diff --git a/pkgs/by-name/el/elfutils/test-run-sysroot-reliability.patch b/pkgs/by-name/el/elfutils/test-run-sysroot-reliability.patch new file mode 100644 index 0000000000000..6e5b5890a7583 --- /dev/null +++ b/pkgs/by-name/el/elfutils/test-run-sysroot-reliability.patch @@ -0,0 +1,44 @@ +commit 898804bed022d1ef26e5c0b12550f87fc86f29ed +Author: Arnout Engelen +Date: Thu Dec 4 21:42:40 2025 +0100 + + tests: improve reliability of run-sysroot.sh + + Previously, the 'second' test would test the `RESOLVE_IN_ROOT` feature + when the current libc supports it, even when the currently running + kernel did not yet support it. + + Signed-off-by: Arnout Engelen + +diff --git a/tests/run-sysroot.sh b/tests/run-sysroot.sh +index fe302446..d2041e8a 100755 +--- a/tests/run-sysroot.sh ++++ b/tests/run-sysroot.sh +@@ -46,10 +46,14 @@ TID 431185: + #8 0x0000aaaae56127f0 _start + EOF + +-HAVE_OPENAT2=$(grep '^#define HAVE_OPENAT2_RESOLVE_IN_ROOT' \ +- ${abs_builddir}/../config.h | awk '{print $3}') ++libc_has_openat2_resolve_in_root() { ++ grep '^#define HAVE_OPENAT2_RESOLVE_IN_ROOT' ${abs_builddir}/../config.h | awk '{print $3}' ++} ++kernel_has_openat2_resolve_in_root() { ++ printf "%s\n%s" "5.6.0" "$(uname -r)" | sort -V -C ++} + +-if [[ "$HAVE_OPENAT2" = 1 ]]; then ++if libc_has_openat2_resolve_in_root && kernel_has_openat2_resolve_in_root; then + # Change the layout of files in sysroot to test symlink escape scenario + rm -f "${tmpdir}/sysroot/bin" + mkdir "${tmpdir}/sysroot/bin" +@@ -57,7 +61,8 @@ if [[ "$HAVE_OPENAT2" = 1 ]]; then + ln -s /bin/bash "${tmpdir}/sysroot/usr/bin/bash" + + # Check that stack with --sysroot generates correct backtrace even if target +- # binary is actually absolute symlink pointing outside of sysroot directory ++ # binary is actually absolute symlink to be interpreted relative to the sysroot ++ # directory + testrun "${abs_top_builddir}"/src/stack --core "${tmpdir}/core.bash" \ + --sysroot "${tmpdir}/sysroot" >"${tmpdir}/stack.out" + diff --git a/pkgs/by-name/el/ell/package.nix b/pkgs/by-name/el/ell/package.nix index 85795193b0d99..72f4afab8b011 100644 --- a/pkgs/by-name/el/ell/package.nix +++ b/pkgs/by-name/el/ell/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.80"; + version = "0.81"; outputs = [ "out" @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; rev = version; - hash = "sha256-B7Dz5H49d8kQaHfPQt7Y3f9D6EdqLOBMK+378g4E46U="; + hash = "sha256-NopI9aDtpEbf2JlboLTIg/9zXaZelfYhF0/RgwUgakI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/el/elm-land/package.nix b/pkgs/by-name/el/elm-land/package.nix index 07b4c59f6a9bf..ee5de487db366 100644 --- a/pkgs/by-name/el/elm-land/package.nix +++ b/pkgs/by-name/el/elm-land/package.nix @@ -40,7 +40,6 @@ buildNpmPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = writeShellScript "update-elm-land" '' diff --git a/pkgs/by-name/em/emcee/package.nix b/pkgs/by-name/em/emcee/package.nix index a487d0784bbe6..0352f28b20996 100644 --- a/pkgs/by-name/em/emcee/package.nix +++ b/pkgs/by-name/em/emcee/package.nix @@ -29,7 +29,6 @@ buildGoModule (finalAttrs: { versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/em/emmylua-check/package.nix b/pkgs/by-name/em/emmylua-check/package.nix index 42425039ba025..e619ce38b2cce 100644 --- a/pkgs/by-name/em/emmylua-check/package.nix +++ b/pkgs/by-name/em/emmylua-check/package.nix @@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/emmylua_check"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/em/emmylua-doc-cli/package.nix b/pkgs/by-name/em/emmylua-doc-cli/package.nix index dbd6d81d6f134..54acc7547db26 100644 --- a/pkgs/by-name/em/emmylua-doc-cli/package.nix +++ b/pkgs/by-name/em/emmylua-doc-cli/package.nix @@ -23,7 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/emmylua_doc_cli"; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/em/emmylua-ls/package.nix b/pkgs/by-name/em/emmylua-ls/package.nix index 9a46edef78b06..9d07a651c26d9 100644 --- a/pkgs/by-name/em/emmylua-ls/package.nix +++ b/pkgs/by-name/em/emmylua-ls/package.nix @@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/emmylua_ls"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/en/encrypted-dns-server/package.nix b/pkgs/by-name/en/encrypted-dns-server/package.nix index dec24de92ccea..1c9761440da04 100644 --- a/pkgs/by-name/en/encrypted-dns-server/package.nix +++ b/pkgs/by-name/en/encrypted-dns-server/package.nix @@ -33,7 +33,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/encrypted-dns"; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/DNSCrypt/encrypted-dns-server/releases/tag/${version}"; diff --git a/pkgs/by-name/en/envoy-bin/package.nix b/pkgs/by-name/en/envoy-bin/package.nix index cd3c45cdcf34b..de96bc2a561e3 100644 --- a/pkgs/by-name/en/envoy-bin/package.nix +++ b/pkgs/by-name/en/envoy-bin/package.nix @@ -51,7 +51,6 @@ stdenv.mkDerivation { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/envoy"; - versionCheckProgramArg = "--version"; passthru = { tests.envoy-bin = nixosTests.envoy-bin; diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix index bdbd0cb404bcd..040055bade5f1 100644 --- a/pkgs/by-name/es/esphome/package.nix +++ b/pkgs/by-name/es/esphome/package.nix @@ -177,8 +177,6 @@ python.pkgs.buildPythonApplication rec { "test_clang_tidy_mode_targeted_scan" ]; - versionCheckProgramArg = "--version"; - passthru = { dashboard = python.pkgs.esphome-dashboard; updateScript = callPackage ./update.nix { }; diff --git a/pkgs/by-name/eu/eukleides/package.nix b/pkgs/by-name/eu/eukleides/package.nix index c36f0e313a860..dfa528afce275 100644 --- a/pkgs/by-name/eu/eukleides/package.nix +++ b/pkgs/by-name/eu/eukleides/package.nix @@ -100,7 +100,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Geometry Drawing Language"; diff --git a/pkgs/by-name/ev/evil-winrm-py/package.nix b/pkgs/by-name/ev/evil-winrm-py/package.nix index 8b54b252b938a..41027b972cc69 100644 --- a/pkgs/by-name/ev/evil-winrm-py/package.nix +++ b/pkgs/by-name/ev/evil-winrm-py/package.nix @@ -41,7 +41,6 @@ python3Packages.buildPythonApplication rec { buildInputs = lib.optionals enableKerberos [ libkrb5 ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/fa/fahclient/package.nix b/pkgs/by-name/fa/fahclient/package.nix index a4bb296617271..3d5ffd2a41d4b 100644 --- a/pkgs/by-name/fa/fahclient/package.nix +++ b/pkgs/by-name/fa/fahclient/package.nix @@ -73,7 +73,6 @@ let nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; }; diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index 65d2639b5dae8..22885b8d5e517 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -257,7 +257,6 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/fa/faust2/package.nix b/pkgs/by-name/fa/faust2/package.nix index a6f23962d3674..3eba50a9e7120 100644 --- a/pkgs/by-name/fa/faust2/package.nix +++ b/pkgs/by-name/fa/faust2/package.nix @@ -6,7 +6,7 @@ makeWrapper, pkg-config, cmake, - llvm_18, # does not build with 19+ due to API changes + llvm, emscripten, openssl, libsndfile, @@ -24,13 +24,13 @@ let - version = "2.81.10"; + version = "2.83.1"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; tag = version; - hash = "sha256-xmaZY1jFIZQjWlQkJ+uHC4tY4pFPLJ+fKSbktIZkBFI="; + hash = "sha256-DojqKLoGb6aGpqpeTAXyLFsbWs/UgYr9nA+JMGa712A="; fetchSubmodules = true; }; @@ -65,7 +65,7 @@ let which ]; buildInputs = [ - llvm_18 + llvm emscripten openssl libsndfile @@ -81,7 +81,7 @@ let preConfigure = '' # include llvm-config in path - export PATH="${lib.getDev llvm_18}/bin:$PATH" + export PATH="${lib.getDev llvm}/bin:$PATH" cd build '' diff --git a/pkgs/by-name/fe/feedgnuplot/package.nix b/pkgs/by-name/fe/feedgnuplot/package.nix index 46add61d8dbc7..b468221f8bbb4 100644 --- a/pkgs/by-name/fe/feedgnuplot/package.nix +++ b/pkgs/by-name/fe/feedgnuplot/package.nix @@ -8,7 +8,6 @@ perl, perlPackages, stdenv, - shortenPerlShebang, installShellFiles, }: @@ -34,8 +33,7 @@ perlPackages.buildPerlPackage rec { nativeBuildInputs = [ makeWrapper installShellFiles - ] - ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + ]; buildInputs = [ gnuplot @@ -57,18 +55,14 @@ perlPackages.buildPerlPackage rec { # Tests require gnuplot 4.6.4 and are completely skipped with gnuplot 5. doCheck = false; - postInstall = - lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/feedgnuplot - '' - + '' - wrapProgram $out/bin/feedgnuplot \ - --prefix "PATH" ":" "$PATH" \ - --prefix "PERL5LIB" ":" "$PERL5LIB" + postInstall = '' + wrapProgram $out/bin/feedgnuplot \ + --prefix "PATH" ":" "$PATH" \ + --prefix "PERL5LIB" ":" "$PERL5LIB" - installShellCompletion --bash --name feedgnuplot.bash completions/bash/feedgnuplot - installShellCompletion --zsh completions/zsh/_feedgnuplot - ''; + installShellCompletion --bash --name feedgnuplot.bash completions/bash/feedgnuplot + installShellCompletion --zsh completions/zsh/_feedgnuplot + ''; meta = { description = "General purpose pipe-oriented plotting tool"; diff --git a/pkgs/by-name/fe/feroxbuster/package.nix b/pkgs/by-name/fe/feroxbuster/package.nix index 2fc23fb8169ef..6c5ab9db321a2 100644 --- a/pkgs/by-name/fe/feroxbuster/package.nix +++ b/pkgs/by-name/fe/feroxbuster/package.nix @@ -36,8 +36,6 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; - versionCheckProgramArg = "--version"; - passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/fe/ferretdb/package.nix b/pkgs/by-name/fe/ferretdb/package.nix index 6dbd198111404..0ee90dac7fad9 100644 --- a/pkgs/by-name/fe/ferretdb/package.nix +++ b/pkgs/by-name/fe/ferretdb/package.nix @@ -34,7 +34,6 @@ buildGoModule (finalAttrs: { # the binary panics if something required wasn't set during compilation doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.tests = nixosTests.ferretdb; diff --git a/pkgs/by-name/fe/ferron/package.nix b/pkgs/by-name/fe/ferron/package.nix index fe0185a23ccb5..9d70a767381c5 100644 --- a/pkgs/by-name/fe/ferron/package.nix +++ b/pkgs/by-name/fe/ferron/package.nix @@ -42,7 +42,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ff/fftw/package.nix b/pkgs/by-name/ff/fftw/package.nix index 1e08014e8fcec..ae56ad4b321c1 100644 --- a/pkgs/by-name/ff/fftw/package.nix +++ b/pkgs/by-name/ff/fftw/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { "https://fftw.org/fftw-${finalAttrs.version}.tar.gz" "ftp://ftp.fftw.org/pub/fftw/fftw-${finalAttrs.version}.tar.gz" ]; - sha256 = "sha256-VskyVJhSzdz6/as4ILAgDHdCZ1vpIXnlnmIVs0DiZGc="; + hash = "sha256-VskyVJhSzdz6/as4ILAgDHdCZ1vpIXnlnmIVs0DiZGc="; }; patches = [ @@ -66,9 +66,15 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (precision != "double") "--enable-${precision}" # https://www.fftw.org/fftw3_doc/SIMD-alignment-and-fftw_005fmalloc.html # FFTW will try to detect at runtime whether the CPU supports these extensions - ++ lib.optional ( - stdenv.hostPlatform.isx86_64 && (precision == "single" || precision == "double") - ) "--enable-sse2 --enable-avx --enable-avx2 --enable-avx512 --enable-avx128-fma" + ++ + lib.optionals (stdenv.hostPlatform.isx86_64 && (precision == "single" || precision == "double")) + [ + "--enable-sse2" + "--enable-avx" + "--enable-avx2" + "--enable-avx512" + "--enable-avx128-fma" + ] ++ lib.optionals enableMpi [ "--enable-mpi" # link libfftw3_mpi explicitly with -lmpi @@ -83,15 +89,18 @@ stdenv.mkDerivation (finalAttrs: { # fftw builds with -mtune=native by default postPatch = '' - substituteInPlace configure --replace "-mtune=native" "-mtune=generic" + substituteInPlace configure --replace-fail "-mtune=native" "-mtune=generic" ''; + strictDeps = true; enableParallelBuilding = true; nativeCheckInputs = [ perl ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + __structuredAttrs = true; + meta = { description = "Fastest Fourier Transform in the West library"; homepage = "https://www.fftw.org/"; diff --git a/pkgs/by-name/fi/filen-cli/package.nix b/pkgs/by-name/fi/filen-cli/package.nix index 3a89fbaa1b0d1..102847390664e 100644 --- a/pkgs/by-name/fi/filen-cli/package.nix +++ b/pkgs/by-name/fi/filen-cli/package.nix @@ -64,7 +64,6 @@ buildNpmPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/filen"; - versionCheckProgramArg = "--version"; # Writes $HOME/Library/Application Support on darwin doInstallCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix index 095e51157f305..edd214c09a0c4 100644 --- a/pkgs/by-name/fi/fish/package.nix +++ b/pkgs/by-name/fi/fish/package.nix @@ -115,7 +115,6 @@ let # Note that at this point in evaluation, there is nothing whatsoever on the # fish_function_path. That means we don't have most fish builtins, e.g., `eval`. - # additional profiles are expected in order of precedence, which means the reverse of the # NIX_PROFILES variable (same as config.environment.profiles) set -l __nix_profile_paths (string split ' ' $NIX_PROFILES)[-1..1] @@ -367,7 +366,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; # Ensure that we don't vendor libpcre2, but instead link against the one from nixpkgs diff --git a/pkgs/by-name/fi/fishnet/package.nix b/pkgs/by-name/fi/fishnet/package.nix index cd1c69a56df69..62e0331aad905 100644 --- a/pkgs/by-name/fi/fishnet/package.nix +++ b/pkgs/by-name/fi/fishnet/package.nix @@ -52,7 +52,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; - versionCheckProgramArg = "--version"; passthru = { updateScript = lib.getExe (writeShellApplication { diff --git a/pkgs/by-name/fi/fishy/package.nix b/pkgs/by-name/fi/fishy/package.nix index 87633558cb7e0..302525450f3c8 100644 --- a/pkgs/by-name/fi/fishy/package.nix +++ b/pkgs/by-name/fi/fishy/package.nix @@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/fl/flac/package.nix b/pkgs/by-name/fl/flac/package.nix index bcd2df459fc1b..d8a654779866d 100644 --- a/pkgs/by-name/fl/flac/package.nix +++ b/pkgs/by-name/fl/flac/package.nix @@ -57,7 +57,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix index 5f1c540477df9..d68d7cfca833e 100644 --- a/pkgs/by-name/fl/fluent-bit/package.nix +++ b/pkgs/by-name/fl/fluent-bit/package.nix @@ -113,8 +113,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - passthru = { tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit (nixosTests) fluent-bit; diff --git a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix index d6946bbe94588..1c69c4ff92a7c 100644 --- a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix +++ b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix @@ -32,7 +32,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/flux-operator-mcp"; - versionCheckProgramArg = "--version"; doInstallCheck = true; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/fl/fluxcd-operator/package.nix b/pkgs/by-name/fl/fluxcd-operator/package.nix index 1f68e529e81d0..39fb152d26201 100644 --- a/pkgs/by-name/fl/fluxcd-operator/package.nix +++ b/pkgs/by-name/fl/fluxcd-operator/package.nix @@ -34,7 +34,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/flux-operator"; - versionCheckProgramArg = "--version"; doInstallCheck = true; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/fo/folly/folly-fix-glog-0.7.patch b/pkgs/by-name/fo/folly/folly-fix-glog-0.7.patch new file mode 100644 index 0000000000000..4f03cf1541da0 --- /dev/null +++ b/pkgs/by-name/fo/folly/folly-fix-glog-0.7.patch @@ -0,0 +1,18 @@ +diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake +index c72273a73..d0408f2b3 100644 +--- a/CMake/folly-deps.cmake ++++ b/CMake/folly-deps.cmake +@@ -61,10 +61,9 @@ if(LIBGFLAGS_FOUND) + set(FOLLY_LIBGFLAGS_INCLUDE ${LIBGFLAGS_INCLUDE_DIR}) + endif() + +-find_package(Glog MODULE) +-set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND}) +-list(APPEND FOLLY_LINK_LIBRARIES ${GLOG_LIBRARY}) +-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR}) ++find_package(Glog CONFIG REQUIRED) ++set(FOLLY_HAVE_LIBGLOG True) ++list(APPEND FOLLY_LINK_LIBRARIES glog::glog) + + find_package(LibEvent MODULE REQUIRED) + list(APPEND FOLLY_LINK_LIBRARIES ${LIBEVENT_LIB}) diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix index 2e6584d324824..eca0493cc2f08 100644 --- a/pkgs/by-name/fo/folly/package.nix +++ b/pkgs/by-name/fo/folly/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, - fetchpatch, cmake, ninja, @@ -139,11 +138,7 @@ stdenv.mkDerivation (finalAttrs: { ./char_traits.patch # - (fetchpatch { - name = "folly-fix-glog-0.7.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-cmake-find-glog.patch?h=folly&id=4b68f47338d4b20111e3ffa1291433120bb899f0"; - hash = "sha256-QGNpS5UNEm+0PW9+agwUVILzpK9t020KXDGyP03OAwE="; - }) + ./folly-fix-glog-0.7.patch # Fix a GCC‐incompatible use of a private trait. # diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index f94aeab1e50a2..e3a367a0c37e7 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -96,7 +96,6 @@ buildGoModule rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/fo/fortran-fpm/package.nix b/pkgs/by-name/fo/fortran-fpm/package.nix index 225684d8cd453..6f02474dbb842 100644 --- a/pkgs/by-name/fo/fortran-fpm/package.nix +++ b/pkgs/by-name/fo/fortran-fpm/package.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/fo/foundry/package.nix b/pkgs/by-name/fo/foundry/package.nix index 817bfedb721b8..2f6b138fe16ba 100644 --- a/pkgs/by-name/fo/foundry/package.nix +++ b/pkgs/by-name/fo/foundry/package.nix @@ -39,7 +39,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/forge"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/fx/fx/package.nix b/pkgs/by-name/fx/fx/package.nix index 9639ef6994844..69c0bc0bc3272 100644 --- a/pkgs/by-name/fx/fx/package.nix +++ b/pkgs/by-name/fx/fx/package.nix @@ -38,7 +38,6 @@ buildGoModule (finalAttrs: { ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "HOME" ]; meta = { diff --git a/pkgs/by-name/gd/gdbuspp/package.nix b/pkgs/by-name/gd/gdbuspp/package.nix index 178de797b65fe..5bd0db891709f 100644 --- a/pkgs/by-name/gd/gdbuspp/package.nix +++ b/pkgs/by-name/gd/gdbuspp/package.nix @@ -31,6 +31,9 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; + # fix build for gcc 15 + env.NIX_CFLAGS_COMPILE = "-Wno-error=free-nonheap-object"; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/gd/gdscript-formatter/package.nix b/pkgs/by-name/gd/gdscript-formatter/package.nix index e5aac5e119917..768c367be9e02 100644 --- a/pkgs/by-name/gd/gdscript-formatter/package.nix +++ b/pkgs/by-name/gd/gdscript-formatter/package.nix @@ -26,7 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ge/gemmi/package.nix b/pkgs/by-name/ge/gemmi/package.nix index d530aa02adee1..ce1bee1ef3b56 100644 --- a/pkgs/by-name/ge/gemmi/package.nix +++ b/pkgs/by-name/ge/gemmi/package.nix @@ -57,7 +57,6 @@ stdenv.mkDerivation (finalAttrs: { addBinToPathHook versionCheckHook ]; - versionCheckProgramArg = "--version"; disabledTests = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # Numerical precision error diff --git a/pkgs/by-name/ge/get_iplayer/package.nix b/pkgs/by-name/ge/get_iplayer/package.nix index 444bf7dee82ac..23ca763f815e3 100644 --- a/pkgs/by-name/ge/get_iplayer/package.nix +++ b/pkgs/by-name/ge/get_iplayer/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, makeWrapper, stdenv, - shortenPerlShebang, perl, atomicparsley, ffmpeg, @@ -23,7 +22,7 @@ perlPackages.buildPerlPackage rec { hash = "sha256-O/mVtbudrYw0jKeSckZlgonFDiWxfeiVc8gdcy4iNBw="; }; - nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl ]; propagatedBuildInputs = with perlPackages; [ LWP @@ -54,10 +53,6 @@ perlPackages.buildPerlPackage rec { runHook postInstall ''; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/.get_iplayer-wrapped - ''; - passthru.tests.version = testers.testVersion { package = get_iplayer; command = "HOME=$(mktemp -d) get_iplayer --help"; diff --git a/pkgs/by-name/ge/geteduroam-cli/package.nix b/pkgs/by-name/ge/geteduroam-cli/package.nix index e38a24fd4b7b0..c662ecdec1f24 100644 --- a/pkgs/by-name/ge/geteduroam-cli/package.nix +++ b/pkgs/by-name/ge/geteduroam-cli/package.nix @@ -26,7 +26,6 @@ buildGoModule (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/geteduroam-cli"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ge/geteduroam/package.nix b/pkgs/by-name/ge/geteduroam/package.nix index fd4c0218b8979..0b77dd2f1a20d 100644 --- a/pkgs/by-name/ge/geteduroam/package.nix +++ b/pkgs/by-name/ge/geteduroam/package.nix @@ -61,7 +61,6 @@ buildGoModule (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/geteduroam-gui"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix index 3c7ad6786dde3..7c14a55ba528b 100644 --- a/pkgs/by-name/gh/ghostty/package.nix +++ b/pkgs/by-name/gh/ghostty/package.nix @@ -142,7 +142,6 @@ stdenv.mkDerivation (finalAttrs: { rmdir $out/share/vim ln -s $vim $out/share/vim-plugins - remove-references-to -t ${finalAttrs.deps} $out/bin/.ghostty-wrapped ''; @@ -152,8 +151,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; - versionCheckProgramArg = "--version"; - passthru = { tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit (nixosTests) allTerminfo; diff --git a/pkgs/by-name/gi/gi-docgen/package.nix b/pkgs/by-name/gi/gi-docgen/package.nix index 874d7515cc0c6..6608c40baa234 100644 --- a/pkgs/by-name/gi/gi-docgen/package.nix +++ b/pkgs/by-name/gi/gi-docgen/package.nix @@ -33,7 +33,6 @@ python3.pkgs.buildPythonApplication rec { markupsafe packaging pygments - toml # remove once python311 is the default typogrify ]; diff --git a/pkgs/by-name/gi/git-cola/package.nix b/pkgs/by-name/gi/git-cola/package.nix index 23eea9932438d..b4a486588a0a6 100644 --- a/pkgs/by-name/gi/git-cola/package.nix +++ b/pkgs/by-name/gi/git-cola/package.nix @@ -54,8 +54,6 @@ python3Packages.buildPythonApplication rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; - disabledTestPaths = [ "qtpy/" "contrib/win32" diff --git a/pkgs/by-name/gi/git-conventional-commits/package.nix b/pkgs/by-name/gi/git-conventional-commits/package.nix index 954247d554f4c..d4191bd7715cd 100644 --- a/pkgs/by-name/gi/git-conventional-commits/package.nix +++ b/pkgs/by-name/gi/git-conventional-commits/package.nix @@ -28,7 +28,6 @@ buildNpmPackage { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/gi/git-lfs/package.nix b/pkgs/by-name/gi/git-lfs/package.nix index dc17e1f8fbcd3..3b6135ba5d46c 100644 --- a/pkgs/by-name/gi/git-lfs/package.nix +++ b/pkgs/by-name/gi/git-lfs/package.nix @@ -94,7 +94,6 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/gi/git/package.nix b/pkgs/by-name/gi/git/package.nix index 2835e6270b106..6476d005edfe7 100644 --- a/pkgs/by-name/gi/git/package.nix +++ b/pkgs/by-name/gi/git/package.nix @@ -58,7 +58,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.51.2"; + version = "2.52.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { }.tar.xz" else "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - hash = "sha256-Iz1xQ6LVjmB1Xu6bdvVZ7HPqKzwpf1tQMWKs6VlmtOM="; + hash = "sha256-PNj+6G9pqUnLYQ/ujNkmTmhz0H+lhBH2Bgs9YnKe18U="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; @@ -120,6 +120,14 @@ stdenv.mkDerivation (finalAttrs: { ./git-sh-i18n.patch # Do not search for sendmail in /usr, only in $PATH ./git-send-email-honor-PATH.patch + # Address test failure (new in 2.52.0) caused by `git-gui--askyesno` being + # installed by `make install`. + (fetchurl { + name = "expect-gui--askyesno-failure-in-t1517.patch"; + url = "https://lore.kernel.org/git/20251201031040.1120091-1-brianmlyles@gmail.com/raw"; + hash = "sha256-vvhbvg74OIMzfksHiErSnjOZ+W0M/T9J8GOQ4E4wKbU="; + }) + ] ++ lib.optionals withSsh [ # Hard-code the ssh executable to ${pkgs.openssh}/bin/ssh instead of @@ -575,6 +583,7 @@ stdenv.mkDerivation (finalAttrs: { kashw2 me-and philiptaron + zivarah ]; mainProgram = "git"; }; diff --git a/pkgs/by-name/gi/github-distributed-owners/package.nix b/pkgs/by-name/gi/github-distributed-owners/package.nix index 4d8c8500e6d1d..cd5523cf1b895 100644 --- a/pkgs/by-name/gi/github-distributed-owners/package.nix +++ b/pkgs/by-name/gi/github-distributed-owners/package.nix @@ -19,7 +19,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-pt/GoXF/uSU78pZqG8PgFe+tlbwZH2qpGQD7jgC52NM="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix index 066d185aeb36e..3095a27601bbe 100644 --- a/pkgs/by-name/gi/github-mcp-server/package.nix +++ b/pkgs/by-name/gi/github-mcp-server/package.nix @@ -31,7 +31,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix index 0592229902ecd..c46291eeab872 100644 --- a/pkgs/by-name/gi/gitlab-runner/package.nix +++ b/pkgs/by-name/gi/gitlab-runner/package.nix @@ -101,8 +101,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/by-name/gi/gitlint/package.nix b/pkgs/by-name/gi/gitlint/package.nix index a66dc6a866da5..c880cf699c876 100644 --- a/pkgs/by-name/gi/gitlint/package.nix +++ b/pkgs/by-name/gi/gitlint/package.nix @@ -39,7 +39,6 @@ python3Packages.buildPythonApplication rec { python3Packages.pytestCheckHook versionCheckHook ]; - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "gitlint" diff --git a/pkgs/by-name/gj/gjs/package.nix b/pkgs/by-name/gj/gjs/package.nix index 4bbf18f7732c7..a4e0581a7a9f8 100644 --- a/pkgs/by-name/gj/gjs/package.nix +++ b/pkgs/by-name/gj/gjs/package.nix @@ -95,8 +95,9 @@ stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ xvfb-run - ] - ++ testDeps; + ]; + + checkInputs = testDeps; propagatedBuildInputs = [ glib @@ -104,6 +105,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dinstalled_test_prefix=${placeholder "installedTests"}" + (lib.mesonBool "skip_gtk_tests" (!finalAttrs.finalPackage.doCheck)) ] ++ lib.optionals (!stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isMusl) [ "-Dprofiler=disabled" @@ -111,6 +113,8 @@ stdenv.mkDerivation (finalAttrs: { doCheck = !stdenv.hostPlatform.isDarwin; + strictDeps = true; + postPatch = '' patchShebangs build/choose-tests-locale.sh substituteInPlace installed-tests/debugger-test.sh --subst-var-by gjsConsole $out/bin/gjs-console diff --git a/pkgs/by-name/gl/glance/package.nix b/pkgs/by-name/gl/glance/package.nix index 7e3ef73d83d2c..ca6aab816adef 100644 --- a/pkgs/by-name/gl/glance/package.nix +++ b/pkgs/by-name/gl/glance/package.nix @@ -27,7 +27,6 @@ buildGoModule (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/gl/glauth/package.nix b/pkgs/by-name/gl/glauth/package.nix index b6b72cde5ddf7..c08465882ecc6 100644 --- a/pkgs/by-name/gl/glauth/package.nix +++ b/pkgs/by-name/gl/glauth/package.nix @@ -40,7 +40,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "Lightweight LDAP server for development, home use, or CI"; diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix index 314b6b26192eb..887d6617d8ef8 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.86.1"; + version = "2.86.3"; outputs = [ "bin" @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - hash = "sha256-EZ0XCMoCJVbW0pie6QrRuCvZwNFmfgZpRKbQAg4tXlc="; + hash = "sha256-syEdjTS5313KBXh+8K1dfKdd7JmLlw4aqwAB0imXfGU="; }; patches = diff --git a/pkgs/by-name/gl/glpi-agent/package.nix b/pkgs/by-name/gl/glpi-agent/package.nix index e6aef1932490b..7cfbc3b72d425 100644 --- a/pkgs/by-name/gl/glpi-agent/package.nix +++ b/pkgs/by-name/gl/glpi-agent/package.nix @@ -118,7 +118,6 @@ perlPackages.buildPerlPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/gl/glpk/package.nix b/pkgs/by-name/gl/glpk/package.nix index 463addadca62f..f9d995f9b5e7c 100644 --- a/pkgs/by-name/gl/glpk/package.nix +++ b/pkgs/by-name/gl/glpk/package.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, fetchpatch, + fetchDebianPatch, libmysqlclient, # Excerpt from glpk's INSTALL file: # This feature allows the exact simplex solver to use the GNU MP @@ -51,6 +52,14 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/sagemath/sage/d3c1f607e32f964bf0cab877a63767c86fd00266/build/pkgs/glpk/patches/error_recovery.patch"; sha256 = "sha256-2hNtUEoGTFt3JgUvLH3tPWnz+DZcXNhjXzS+/V89toA="; }) + + # Fix build with gcc15 + (fetchDebianPatch { + inherit pname version; + debianRevision = "2"; + patch = "gcc-15.patch"; + hash = "sha256-wuWPYqJKIKJAJaeJXW7lhvapu8Fd3zHjLAv7Ve7q8Qw="; + }) ]; postPatch = diff --git a/pkgs/by-name/gl/glslang/package.nix b/pkgs/by-name/gl/glslang/package.nix index 283aa59dd2e42..e62d8596d31c5 100644 --- a/pkgs/by-name/gl/glslang/package.nix +++ b/pkgs/by-name/gl/glslang/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { pname = "glslang"; - version = "16.0.0"; + version = "16.1.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = version; - hash = "sha256-/DwdyuSGCx22zsXZrcZGTECfsIqvzPQzTZ2mU8EkjxY="; + hash = "sha256-cEREniYgSd62mnvKaQkgs69ETL5pLl5Gyv3hKOtSv3w="; }; outputs = [ diff --git a/pkgs/by-name/gn/gn/package.nix b/pkgs/by-name/gn/gn/package.nix index 3167ceb85795c..4aee8936d8fae 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-08-29"; + _version = "0-unstable-2025-09-18"; in _version, - rev ? "5d0a4153b0bcc86c5a23310d5b648a587be3c56d", - hash ? "sha256-WERLGrReUATmn3RhxtmyZcJBxdIY/WZqBDranCLDYEg=", + rev ? "81b24e01531ecf0eff12ec9359a555ec3944ec4e", + hash ? "sha256-sm5GWbkm3ua7EkCWTuY4TG6EXKe3asXTrH1APnNARJQ=", }: stdenv.mkDerivation { diff --git a/pkgs/by-name/go/go-chromecast/package.nix b/pkgs/by-name/go/go-chromecast/package.nix index 64de2292f07ea..43c06c1312b72 100644 --- a/pkgs/by-name/go/go-chromecast/package.nix +++ b/pkgs/by-name/go/go-chromecast/package.nix @@ -38,8 +38,6 @@ buildGoModule rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; - postInstall = lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) '' installShellCompletion --cmd go-chromecast \ --bash <($out/bin/go-chromecast completion bash) \ diff --git a/pkgs/by-name/go/go-sendxmpp/package.nix b/pkgs/by-name/go/go-sendxmpp/package.nix index c8fb292221559..0ec5f284bab93 100644 --- a/pkgs/by-name/go/go-sendxmpp/package.nix +++ b/pkgs/by-name/go/go-sendxmpp/package.nix @@ -30,7 +30,6 @@ buildGoModule (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "Tool to send messages or files to an XMPP contact or MUC"; diff --git a/pkgs/by-name/go/go-task/package.nix b/pkgs/by-name/go/go-task/package.nix index 9dd8e5e53e649..f437a73402135 100644 --- a/pkgs/by-name/go/go-task/package.nix +++ b/pkgs/by-name/go/go-task/package.nix @@ -48,7 +48,6 @@ buildGoModule (finalAttrs: { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/task"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/go/gocovsh/package.nix b/pkgs/by-name/go/gocovsh/package.nix index d99fb8934d2e6..929ce06968c44 100644 --- a/pkgs/by-name/go/gocovsh/package.nix +++ b/pkgs/by-name/go/gocovsh/package.nix @@ -26,7 +26,6 @@ buildGoModule rec { ]; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/go/gojq/package.nix b/pkgs/by-name/go/gojq/package.nix index 682afc5fef85a..a50fa19e5dd75 100644 --- a/pkgs/by-name/go/gojq/package.nix +++ b/pkgs/by-name/go/gojq/package.nix @@ -33,7 +33,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; postInstallCheck = '' $out/bin/gojq --help > /dev/null $out/bin/gojq --raw-output '.values[1]' <<< '{"values":["hello","world"]}' | grep '^world$' > /dev/null diff --git a/pkgs/by-name/go/gokapi/package.nix b/pkgs/by-name/go/gokapi/package.nix index 89e095fd5618e..24334cd1f953f 100644 --- a/pkgs/by-name/go/gokapi/package.nix +++ b/pkgs/by-name/go/gokapi/package.nix @@ -49,7 +49,6 @@ buildGoModule rec { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/go/golds/package.nix b/pkgs/by-name/go/golds/package.nix index 618952753b365..2dd2752690eef 100644 --- a/pkgs/by-name/go/golds/package.nix +++ b/pkgs/by-name/go/golds/package.nix @@ -27,7 +27,6 @@ buildGoModule rec { ldflags = [ "-s" ]; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/go/golem/package.nix b/pkgs/by-name/go/golem/package.nix index 0df59871d0c61..527d1d69ea484 100644 --- a/pkgs/by-name/go/golem/package.nix +++ b/pkgs/by-name/go/golem/package.nix @@ -60,7 +60,6 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; versionCheckProgram = [ "${placeholder "out"}/bin/golem-cli" ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/go/gomanagedocker/package.nix b/pkgs/by-name/go/gomanagedocker/package.nix index 04b7afaf56ee5..d370035add3bc 100644 --- a/pkgs/by-name/go/gomanagedocker/package.nix +++ b/pkgs/by-name/go/gomanagedocker/package.nix @@ -48,7 +48,6 @@ buildGoModule { versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/go/gonzo/package.nix b/pkgs/by-name/go/gonzo/package.nix index 1d329fd426562..52d953fa9aedb 100644 --- a/pkgs/by-name/go/gonzo/package.nix +++ b/pkgs/by-name/go/gonzo/package.nix @@ -33,7 +33,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "TUI log analysis tool"; diff --git a/pkgs/by-name/go/google-cloud-cpp/package.nix b/pkgs/by-name/go/google-cloud-cpp/package.nix index 67f83f00d44ca..778fe40d01774 100644 --- a/pkgs/by-name/go/google-cloud-cpp/package.nix +++ b/pkgs/by-name/go/google-cloud-cpp/package.nix @@ -14,32 +14,32 @@ nlohmann_json, openssl, pkg-config, - protobuf_31, + protobuf, pkgsBuildHost, - # default list of APIs: https://github.com/googleapis/google-cloud-cpp/blob/v1.32.1/CMakeLists.txt#L173 + # default list of APIs: https://github.com/googleapis/google-cloud-cpp/blob/v2.44.0/cmake/GoogleCloudCppFeatures.cmake#L24 apis ? [ "*" ], staticOnly ? stdenv.hostPlatform.isStatic, }: let # defined in cmake/GoogleapisConfig.cmake - googleapisRev = "f01a17a560b4fbc888fd552c978f4e1f8614100b"; + googleapisRev = "8cd3749f4b98f2eeeef511c16431979aeb3a6502"; googleapis = fetchFromGitHub { name = "googleapis-src"; owner = "googleapis"; repo = "googleapis"; rev = googleapisRev; - hash = "sha256-eJA3KM/CZMKTR3l6omPJkxqIBt75mSNsxHnoC+1T4gw="; + hash = "sha256-w7jq21qLEiMhuI20C6iUeSskAfZCkZgDCPu5Flr8D48="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "google-cloud-cpp"; - version = "2.38.0"; + version = "2.44.0"; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-cpp"; - rev = "v${version}"; - sha256 = "sha256-TF3MLBmjUbKJkZVcaPXbagXrAs3eEhlNQBjYQf0VtT8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-vE3oGGT33cITdAd4e5Xnlx9tX5Sz+wIFQXzj5hdcGDI="; }; patches = [ @@ -48,6 +48,19 @@ stdenv.mkDerivation rec { }) ]; + # After 30acc3c, the configPhase fails with: + # Target "spanner_database_admin_client_samples" links to: + # google-cloud-cpp::universe_domain + # but the target was not found. + # + # So, we explicitly add `universe_domain` to the list of default features + postPatch = '' + substituteInPlace cmake/GoogleCloudCppFeatures.cmake \ + --replace-fail \ + "bigtable;bigquery;iam;logging;pubsub;spanner;storage" \ + "bigtable;bigquery;iam;logging;pubsub;spanner;storage;universe_domain" \ + ''; + nativeBuildInputs = [ cmake ninja @@ -61,7 +74,7 @@ stdenv.mkDerivation rec { grpc nlohmann_json openssl - protobuf_31 + protobuf gbenchmark gtest ]; @@ -87,7 +100,7 @@ stdenv.mkDerivation rec { ]; ldLibraryPathName = "${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH"; in - lib.optionalString doInstallCheck ( + lib.optionalString finalAttrs.doInstallCheck ( lib.optionalString (!staticOnly) '' export ${ldLibraryPathName}=${lib.concatStringsSep ":" additionalLibraryPaths} '' @@ -114,23 +127,27 @@ stdenv.mkDerivation rec { runHook postInstallCheck ''; - nativeInstallCheckInputs = lib.optionals doInstallCheck [ + nativeInstallCheckInputs = lib.optionals finalAttrs.doInstallCheck [ gbenchmark gtest ]; cmakeFlags = [ - "-DBUILD_SHARED_LIBS:BOOL=${if staticOnly then "OFF" else "ON"}" + (lib.cmakeBool "BUILD_SHARED_LIBS" (!staticOnly)) # unconditionally build tests to catch linker errors as early as possible # this adds a good chunk of time to the build - "-DBUILD_TESTING:BOOL=ON" - "-DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES:BOOL=OFF" + (lib.cmakeBool "BUILD_TESTING" true) + (lib.cmakeBool "GOOGLE_CLOUD_CPP_ENABLE_EXAMPLES" false) + + # Explicitly set this variable to true as otherwise `universe_domain` will be filtered out + # See https://github.com/googleapis/google-cloud-cpp/pull/15820 for context + (lib.cmakeBool "GOOGLE_CLOUD_CPP_ENABLE_UNIVERSE_DOMAIN" true) ] ++ lib.optionals (apis != [ "*" ]) [ - "-DGOOGLE_CLOUD_CPP_ENABLE=${lib.concatStringsSep ";" apis}" + (lib.cmakeFeature "GOOGLE_CLOUD_CPP_ENABLE" (lib.concatStringsSep ";" apis)) ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "-DGOOGLE_CLOUD_CPP_GRPC_PLUGIN_EXECUTABLE=${lib.getBin pkgsBuildHost.grpc}/bin/grpc_cpp_plugin" + (lib.cmakeFeature "GOOGLE_CLOUD_CPP_GRPC_PLUGIN_EXECUTABLE" "${lib.getBin pkgsBuildHost.grpc}/bin/grpc_cpp_plugin") ]; requiredSystemFeatures = [ "big-parallel" ]; @@ -139,7 +156,8 @@ stdenv.mkDerivation rec { license = with lib.licenses; [ asl20 ]; homepage = "https://github.com/googleapis/google-cloud-cpp"; description = "C++ Idiomatic Clients for Google Cloud Platform services"; + changelog = "https://github.com/googleapis/google-cloud-cpp/blob/v${finalAttrs.version}/CHANGELOG.md"; platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ cpcloud ]; }; -} +}) diff --git a/pkgs/by-name/go/gotestwaf/package.nix b/pkgs/by-name/go/gotestwaf/package.nix index 2d96a832aa7cd..6538101bcc4a9 100644 --- a/pkgs/by-name/go/gotestwaf/package.nix +++ b/pkgs/by-name/go/gotestwaf/package.nix @@ -31,8 +31,6 @@ buildGoModule rec { doInstallCheck = true; - versionCheckProgramArg = "--version"; - meta = { description = "Tool for API and OWASP attack simulation"; homepage = "https://github.com/wallarm/gotestwaf"; diff --git a/pkgs/by-name/go/gotip/package.nix b/pkgs/by-name/go/gotip/package.nix index 443e1d445e732..f3f2a963194e7 100644 --- a/pkgs/by-name/go/gotip/package.nix +++ b/pkgs/by-name/go/gotip/package.nix @@ -26,7 +26,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/gp/gpa/package.nix b/pkgs/by-name/gp/gpa/package.nix index 349d37ba3ac72..29ec915516d27 100644 --- a/pkgs/by-name/gp/gpa/package.nix +++ b/pkgs/by-name/gp/gpa/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, intltool, pkg-config, gtk3, @@ -19,6 +20,14 @@ stdenv.mkDerivation rec { hash = "sha256-Jqj6W/cFQct0Hwxxt8/ikbHqVuq2jusHqpYs71zfM8w="; }; + patches = [ + (fetchpatch { + name = "remove-trust_item-stuff-to-make-it-build-with-gpgme-2.x.patch"; + url = "https://dev.gnupg.org/rGPAb6ba8bcc6db7765667cd6c49b7edc9a2073bc74f?diff=1"; + hash = "sha256-A3Cx4zub3Um09yjZ1mu0PZe/v7rmhXjND0Hg5WkcIf8="; + }) + ]; + nativeBuildInputs = [ intltool pkg-config diff --git a/pkgs/development/libraries/gpgme/LFS64.patch b/pkgs/by-name/gp/gpgme/LFS64.patch similarity index 100% rename from pkgs/development/libraries/gpgme/LFS64.patch rename to pkgs/by-name/gp/gpgme/LFS64.patch diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/by-name/gp/gpgme/package.nix similarity index 80% rename from pkgs/development/libraries/gpgme/default.nix rename to pkgs/by-name/gp/gpgme/package.nix index 5e3754f1206b8..259870655bcd5 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/by-name/gp/gpgme/package.nix @@ -12,8 +12,8 @@ which, texinfo, buildPackages, - qtbase ? null, # only for passthru.tests + gpa, libsForQt5, qt6Packages, python3, @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "gpgme"; - version = "1.24.3"; + version = "2.0.1"; outputs = [ "out" @@ -33,12 +33,10 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnupg/gpgme/gpgme-${version}.tar.bz2"; - hash = "sha256-v8F/W9GxeMhkn92RiVbSdwgPM98Aai3ECs3s3OaMUN0="; + hash = "sha256-ghqwaVyELqtRdSqBmAySsEEMfq3QQQP3kdXSpSZ4SWY="; }; patches = [ - # Fix a test after disallowing compressed signatures in gpg (PR #180336) - ./test_t-verify_double-plaintext.patch # Don't use deprecated LFS64 APIs (removed in musl 1.2.4) # https://dev.gnupg.org/D600 ./LFS64.patch @@ -56,8 +54,7 @@ stdenv.mkDerivation rec { libassuan libgpg-error pth - ] - ++ lib.optionals (qtbase != null) [ qtbase ]; + ]; nativeCheckInputs = [ which ]; @@ -77,11 +74,8 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-gpg-test" ]; env.NIX_CFLAGS_COMPILE = toString ( - # qgpgme uses Q_ASSERT which retains build inputs at runtime unless - # debugging is disabled - lib.optional (qtbase != null) "-DQT_NO_DEBUG" # https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html - ++ lib.optional stdenv.hostPlatform.is32bit "-D_FILE_OFFSET_BITS=64" + lib.optional stdenv.hostPlatform.is32bit "-D_FILE_OFFSET_BITS=64" ); enableParallelBuilding = true; @@ -97,14 +91,13 @@ stdenv.mkDerivation rec { ]; passthru.tests = { + inherit gpa; python = python3.pkgs.gpgme; qt5 = libsForQt5.qgpgme; qt6 = qt6Packages.qgpgme; }; meta = { - # fatal error: 'QtCore/qcompare.h' file not found - broken = qtbase != null && stdenv.hostPlatform.isDarwin; homepage = "https://gnupg.org/software/gpgme/index.html"; changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;f=NEWS;hb=gpgme-${version}"; description = "Library for making GnuPG easier to use"; diff --git a/pkgs/by-name/gp/gpgmepp/0001-Don-t-hardcode-include-as-includedir.patch b/pkgs/by-name/gp/gpgmepp/0001-Don-t-hardcode-include-as-includedir.patch new file mode 100644 index 0000000000000..3109da1af1529 --- /dev/null +++ b/pkgs/by-name/gp/gpgmepp/0001-Don-t-hardcode-include-as-includedir.patch @@ -0,0 +1,39 @@ +From b56db4b30ec696b018c04400440d0252af13990a Mon Sep 17 00:00:00 2001 +From: Marcin Serwin +Date: Mon, 22 Dec 2025 16:44:46 +0100 +Subject: [PATCH] Don't hardcode 'include' as includedir + +The headers are installed into the location pointed by +CMAKE_INSTALL_INCLUDEDIR so if it's different than the default 'include' +then the header path in the exported CMake targets is incorrect. + +Signed-off-by: Marcin Serwin +--- + src/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 7be46cb..97d21b1 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -128,7 +128,7 @@ if(ENABLE_SHARED) + + target_include_directories(Gpgmepp + PRIVATE ${LibGpgError_INCLUDE_DIRS} +- INTERFACE $ ++ INTERFACE $ + ) + + target_link_libraries(Gpgmepp Gpgme::Gpgme) +@@ -144,7 +144,7 @@ if(ENABLE_STATIC) + + target_include_directories(GpgmeppStatic + PRIVATE ${LibGpgError_INCLUDE_DIRS} +- INTERFACE $ ++ INTERFACE $ + ) + + target_link_libraries(GpgmeppStatic Gpgme::Gpgme) +-- +2.51.2 + diff --git a/pkgs/by-name/gp/gpgmepp/0001-Fix-handling-of-absolute-install-dirs-in-.pc-install.patch b/pkgs/by-name/gp/gpgmepp/0001-Fix-handling-of-absolute-install-dirs-in-.pc-install.patch new file mode 100644 index 0000000000000..4773cb0d082be --- /dev/null +++ b/pkgs/by-name/gp/gpgmepp/0001-Fix-handling-of-absolute-install-dirs-in-.pc-install.patch @@ -0,0 +1,59 @@ +From 7b8b17c82b1bc672df9c50d2b002242f00bc04a4 Mon Sep 17 00:00:00 2001 +From: Marcin Serwin +Date: Sun, 21 Dec 2025 14:51:33 +0100 +Subject: [PATCH] Fix handling of absolute install dirs in .pc installation + +CMAKE_INSTALL_*DIRs can be absolute and in this case shouldn't be +appended to the install prefix. This is handled automatically by CMake +for installation but needs to be done manually when generating +pkg-config file. + +Signed-off-by: Marcin Serwin +--- + src/CMakeLists.txt | 12 +++++++++++- + src/gpgmepp.pc.in | 4 ++-- + 2 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 7be46cb..913dd79 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -209,10 +209,20 @@ set(pkgconfig_host_line "") + if(PKGCONFIG_HOST) + set(pkgconfig_host_line "host=${PKGCONFIG_HOST}\n") + endif() ++if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}") ++ set(pkgconfig_includedir "${CMAKE_INSTALL_INCLUDEDIR}") ++else() ++ set(pkgconfig_includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") ++endif() ++if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}") ++ set(pkgconfig_libdir "${CMAKE_INSTALL_LIBDIR}") ++else() ++ set(pkgconfig_libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}") ++endif() + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/gpgmepp.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/gpgmepp.pc @ONLY) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gpgmepp.pc +- DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig") ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + + install(FILES ${Gpgmepp_HEADERS} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gpgme++) +diff --git a/src/gpgmepp.pc.in b/src/gpgmepp.pc.in +index 626c5fb..cf3e67b 100644 +--- a/src/gpgmepp.pc.in ++++ b/src/gpgmepp.pc.in +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ ++includedir=@pkgconfig_includedir@ ++libdir=@pkgconfig_libdir@ + @pkgconfig_host_line@ + Name: gpgmepp + Description: GnuPG Made Easy (C++ binding) +-- +2.51.2 + diff --git a/pkgs/by-name/gp/gpgmepp/package.nix b/pkgs/by-name/gp/gpgmepp/package.nix new file mode 100644 index 0000000000000..1c8225759bd17 --- /dev/null +++ b/pkgs/by-name/gp/gpgmepp/package.nix @@ -0,0 +1,46 @@ +{ + cmake, + fetchurl, + gpgme, + lib, + libgpg-error, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gpgmepp"; + version = "2.0.0"; + + src = fetchurl { + url = "mirror://gnupg/gpgmepp/gpgmepp-${finalAttrs.version}.tar.xz"; + hash = "sha256-1HlgScBnCKJvMJb3SO8JU0fho8HlcFYXAf6VLD9WU4I="; + }; + + outputs = [ + "out" + "dev" + ]; + + patches = [ + ./0001-Fix-handling-of-absolute-install-dirs-in-.pc-install.patch + ./0001-Don-t-hardcode-include-as-includedir.patch + ]; + + nativeBuildInputs = [ + cmake + ]; + + propagatedBuildInputs = [ + gpgme + libgpg-error + ]; + + meta = { + changelog = "https://dev.gnupg.org/source/gpgmepp/browse/master/NEWS;gpgmepp-${finalAttrs.version}?as=remarkup"; + description = "C++ bindings/wrapper for GPGME"; + homepage = "https://dev.gnupg.org/source/gpgmepp"; + license = lib.licenses.lgpl21Plus; + maintainers = [ lib.maintainers.dotlambda ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/gp/gping/package.nix b/pkgs/by-name/gp/gping/package.nix index dbad6a8f032b4..4dd42e54ce948 100644 --- a/pkgs/by-name/gp/gping/package.nix +++ b/pkgs/by-name/gp/gping/package.nix @@ -41,8 +41,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/gp/gpt-cli/package.nix b/pkgs/by-name/gp/gpt-cli/package.nix index d0bcb4129d6f0..d8215eead6cab 100644 --- a/pkgs/by-name/gp/gpt-cli/package.nix +++ b/pkgs/by-name/gp/gpt-cli/package.nix @@ -51,8 +51,6 @@ python3Packages.buildPythonApplication rec { versionCheckProgram = "${placeholder "out"}/bin/gpt"; - versionCheckProgramArg = "--version"; - meta = { description = "Command-line interface for ChatGPT, Claude and Bard"; homepage = "https://github.com/kharvd/gpt-cli"; diff --git a/pkgs/by-name/gp/gpufetch/package.nix b/pkgs/by-name/gp/gpufetch/package.nix index 123dbe3992241..79a8e051a7a8d 100644 --- a/pkgs/by-name/gp/gpufetch/package.nix +++ b/pkgs/by-name/gp/gpufetch/package.nix @@ -55,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/gr/grafanactl/package.nix b/pkgs/by-name/gr/grafanactl/package.nix index b37513c030827..a89f975b67a14 100644 --- a/pkgs/by-name/gr/grafanactl/package.nix +++ b/pkgs/by-name/gr/grafanactl/package.nix @@ -37,7 +37,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/gr/gren/package.nix b/pkgs/by-name/gr/gren/package.nix index d7e41e12eab31..197d69c5858d4 100644 --- a/pkgs/by-name/gr/gren/package.nix +++ b/pkgs/by-name/gr/gren/package.nix @@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/gren"; - versionCheckProgramArg = "--version"; passthru = { backend = haskellPackages.callPackage ./generated-backend-package.nix { }; diff --git a/pkgs/by-name/gu/guesswidth/package.nix b/pkgs/by-name/gu/guesswidth/package.nix index 92ad7241f3691..69500e618912b 100644 --- a/pkgs/by-name/gu/guesswidth/package.nix +++ b/pkgs/by-name/gu/guesswidth/package.nix @@ -45,7 +45,6 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/gu/gurk-rs/package.nix b/pkgs/by-name/gu/gurk-rs/package.nix index d5a3849796ce8..772cd64760920 100644 --- a/pkgs/by-name/gu/gurk-rs/package.nix +++ b/pkgs/by-name/gu/gurk-rs/package.nix @@ -55,7 +55,6 @@ rustPlatform.buildRustPackage rec { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ha/har-to-k6/package.nix b/pkgs/by-name/ha/har-to-k6/package.nix index e7e1ff22ac464..e6bdb12bb62de 100644 --- a/pkgs/by-name/ha/har-to-k6/package.nix +++ b/pkgs/by-name/ha/har-to-k6/package.nix @@ -22,7 +22,6 @@ buildNpmPackage rec { npmDepsHash = "sha256-RuK3CzcMkPt5MFEZpYBDtMMShHTT/115pRk1CmRkiek="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ha/harfbuzz/package.nix b/pkgs/by-name/ha/harfbuzz/package.nix index d172d5922dd92..042e82e6ae5b3 100644 --- a/pkgs/by-name/ha/harfbuzz/package.nix +++ b/pkgs/by-name/ha/harfbuzz/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "harfbuzz${lib.optionalString withIcu "-icu"}"; - version = "12.1.0"; + version = "12.2.0"; src = fetchurl { url = "https://github.com/harfbuzz/harfbuzz/releases/download/${finalAttrs.version}/harfbuzz-${finalAttrs.version}.tar.xz"; - hash = "sha256-5cgbf24LEC37AAz6QkU4uOiWq3ii9Lil7IyuYqtDNp4="; + hash = "sha256-7LYDqkJqiyRmVxhme9pkqEwVBNt0VO5Mrb02Lupk5UU="; }; postPatch = '' diff --git a/pkgs/by-name/ha/hashrat/package.nix b/pkgs/by-name/ha/hashrat/package.nix index 9f4fd90d8c62e..e8947b1ad2016 100644 --- a/pkgs/by-name/ha/hashrat/package.nix +++ b/pkgs/by-name/ha/hashrat/package.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=$(out)" ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ha/hatch/package.nix b/pkgs/by-name/ha/hatch/package.nix index fcaa9017b260d..7bc8326f3a6c9 100644 --- a/pkgs/by-name/ha/hatch/package.nix +++ b/pkgs/by-name/ha/hatch/package.nix @@ -76,8 +76,6 @@ python3Packages.buildPythonApplication rec { darwin.ps ]; - versionCheckProgramArg = "--version"; - disabledTests = [ # AssertionError: assert (1980, 1, 2, 0, 0, 0) == (2020, 2, 2, 0, 0, 0) "test_default" diff --git a/pkgs/by-name/ha/hath-rust/package.nix b/pkgs/by-name/ha/hath-rust/package.nix index 5fd02637da7ab..90a7980efa81c 100644 --- a/pkgs/by-name/ha/hath-rust/package.nix +++ b/pkgs/by-name/ha/hath-rust/package.nix @@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-4xty4nUs81nq2Ax7koFplHlscpG1Pdbd5zwd/lQwbmg="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ha/hatsu/package.nix b/pkgs/by-name/ha/hatsu/package.nix index e7423419472a3..d5c428864957e 100644 --- a/pkgs/by-name/ha/hatsu/package.nix +++ b/pkgs/by-name/ha/hatsu/package.nix @@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-NXauXnCpk8YjiX4bqZMbEy/QPb7MiJYzY64YKDV6qq0="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/hc/hcdiag/package.nix b/pkgs/by-name/hc/hcdiag/package.nix index 5b35011b9417f..ec813e26140fb 100644 --- a/pkgs/by-name/hc/hcdiag/package.nix +++ b/pkgs/by-name/hc/hcdiag/package.nix @@ -22,7 +22,6 @@ buildGoModule rec { nativeInstallCheckHooks = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/he/helix-db/package.nix b/pkgs/by-name/he/helix-db/package.nix index 98e446efb6269..b3fd33d74aca6 100644 --- a/pkgs/by-name/he/helix-db/package.nix +++ b/pkgs/by-name/he/helix-db/package.nix @@ -43,7 +43,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/he/helix/package.nix b/pkgs/by-name/he/helix/package.nix index c4ba2f0f36341..1355ee7b76e81 100644 --- a/pkgs/by-name/he/helix/package.nix +++ b/pkgs/by-name/he/helix/package.nix @@ -56,7 +56,6 @@ rustPlatform.buildRustPackage (final: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/hx"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/he/hexpatch/package.nix b/pkgs/by-name/he/hexpatch/package.nix index f740a2dadd216..f765181dd649c 100644 --- a/pkgs/by-name/he/hexpatch/package.nix +++ b/pkgs/by-name/he/hexpatch/package.nix @@ -33,7 +33,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/he/hexyl/package.nix b/pkgs/by-name/he/hexyl/package.nix index c01266c629c77..c0096251de067 100644 --- a/pkgs/by-name/he/hexyl/package.nix +++ b/pkgs/by-name/he/hexyl/package.nix @@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/hg/hgrep/package.nix b/pkgs/by-name/hg/hgrep/package.nix index 2fb66a2f19b5c..35cac23994ba7 100644 --- a/pkgs/by-name/hg/hgrep/package.nix +++ b/pkgs/by-name/hg/hgrep/package.nix @@ -25,7 +25,6 @@ rustPlatform.buildRustPackage { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/hl/hl-log-viewer/package.nix b/pkgs/by-name/hl/hl-log-viewer/package.nix index 330d0a42fc2b5..53f9e68d6f6c4 100644 --- a/pkgs/by-name/hl/hl-log-viewer/package.nix +++ b/pkgs/by-name/hl/hl-log-viewer/package.nix @@ -41,7 +41,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/hl"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/hl/hledger-check-fancyassertions/package.nix b/pkgs/by-name/hl/hledger-check-fancyassertions/package.nix index dd5188e9a4108..15854a71717bc 100644 --- a/pkgs/by-name/hl/hledger-check-fancyassertions/package.nix +++ b/pkgs/by-name/hl/hledger-check-fancyassertions/package.nix @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation rec { src = fetchurl { name = "hledger-check-fancyassertion-${version}.hs"; url = "https://raw.githubusercontent.com/simonmichael/hledger/hledger-lib-${version}/bin/hledger-check-fancyassertions.hs"; - hash = "sha256-p1JvPHSB5hkfZsTq1sSL0mxCRkhZu1zkpXTELVNFE64="; + hash = "sha256-Zokrrcy9CfVV2tNI1DDsjqC+PcTdlMdit4O4Y1gP1O4="; }; dontUnpack = true; diff --git a/pkgs/by-name/ho/homebridge-config-ui-x/package.nix b/pkgs/by-name/ho/homebridge-config-ui-x/package.nix index 641245ea7fb6d..14eb3dbe889bf 100644 --- a/pkgs/by-name/ho/homebridge-config-ui-x/package.nix +++ b/pkgs/by-name/ho/homebridge-config-ui-x/package.nix @@ -58,7 +58,6 @@ buildNpmPackage (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "Configure Homebridge, monitor and backup from a browser"; diff --git a/pkgs/by-name/ho/honeycomb-refinery/package.nix b/pkgs/by-name/ho/honeycomb-refinery/package.nix index ec9643d7c6863..596b7fbc8c4ab 100644 --- a/pkgs/by-name/ho/honeycomb-refinery/package.nix +++ b/pkgs/by-name/ho/honeycomb-refinery/package.nix @@ -44,7 +44,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ho/hot-resize/package.nix b/pkgs/by-name/ho/hot-resize/package.nix index 7637fd5331057..93276187c1533 100644 --- a/pkgs/by-name/ho/hot-resize/package.nix +++ b/pkgs/by-name/ho/hot-resize/package.nix @@ -60,7 +60,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/hp/hplip/gcc-compatability.patch b/pkgs/by-name/hp/hplip/gcc-compatability.patch new file mode 100644 index 0000000000000..65abfa6328ebe --- /dev/null +++ b/pkgs/by-name/hp/hplip/gcc-compatability.patch @@ -0,0 +1,14 @@ +diff --git a/scan/sane/ledmi.h b/scan/sane/ledmi.h +index a987c5d..f72847b 100644 +--- a/scan/sane/ledmi.h ++++ b/scan/sane/ledmi.h +@@ -162,7 +162,7 @@ struct ledm_session + int bb_open(struct ledm_session*); + int bb_close(struct ledm_session*); + int bb_get_parameters(struct ledm_session*, SANE_Parameters*, int); +-int bb_is_paper_in_adf(); /* 0 = no paper in adf, 1 = paper in adf, -1 = error */ ++int bb_is_paper_in_adf(struct ledm_session*); /* 0 = no paper in adf, 1 = paper in adf, -1 = error */ + SANE_Status bb_start_scan(struct ledm_session*); + int bb_get_image_data(struct ledm_session*, int); + int bb_end_page(struct ledm_session*, int); + diff --git a/pkgs/by-name/hp/hplip/package.nix b/pkgs/by-name/hp/hplip/package.nix index fa9cd6bf492d3..57065682b7f64 100644 --- a/pkgs/by-name/hp/hplip/package.nix +++ b/pkgs/by-name/hp/hplip/package.nix @@ -144,6 +144,8 @@ python3Packages.buildPythonApplication { # don't on NixOS). Add the equivalent NixOS path, /var/lib/cups/path/share. # See: https://github.com/NixOS/nixpkgs/issues/21796 ./hplip-3.20.11-nixos-cups-ppd-search-path.patch + # https://bugs.launchpad.net/hplip/+bug/2096650 + ./gcc-compatability.patch # Remove all ImageProcessor functionality since that is closed source (fetchurl { diff --git a/pkgs/by-name/ht/httpyac/package.nix b/pkgs/by-name/ht/httpyac/package.nix index 22cd263adb519..8742f7775cb09 100644 --- a/pkgs/by-name/ht/httpyac/package.nix +++ b/pkgs/by-name/ht/httpyac/package.nix @@ -22,7 +22,6 @@ buildNpmPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/hw/hwdata/package.nix b/pkgs/by-name/hw/hwdata/package.nix index b8b15bd8ca185..e5b1cecf12ff8 100644 --- a/pkgs/by-name/hw/hwdata/package.nix +++ b/pkgs/by-name/hw/hwdata/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hwdata"; - version = "0.401"; + version = "0.402"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${finalAttrs.version}"; - hash = "sha256-2NZwylrUfnzA0aE+xlVZ7QCpCzfW9DwGzRVHirt0TRU="; + hash = "sha256-akLI2MdF6BDwvSoKt1jhlMyhKQv4TWxLFZWF7ivIezA="; }; doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus) diff --git a/pkgs/by-name/hw/hwloc/package.nix b/pkgs/by-name/hw/hwloc/package.nix index 9681f97f108fe..602b0a5d2a5e9 100644 --- a/pkgs/by-name/hw/hwloc/package.nix +++ b/pkgs/by-name/hw/hwloc/package.nix @@ -104,5 +104,6 @@ stdenv.mkDerivation (finalAttrs: { markuskowa ]; platforms = lib.platforms.all; + broken = stdenv.hostPlatform.isCygwin; }; }) diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix index 58e7bcf3ee6d3..0732c6deff0a7 100644 --- a/pkgs/by-name/hy/hydra/package.nix +++ b/pkgs/by-name/hy/hydra/package.nix @@ -119,7 +119,6 @@ let TermReadKey Test2Harness TestPostgreSQL - TestSimple13 TextDiff TextTable UUID4Tiny diff --git a/pkgs/by-name/hy/hyfetch/package.nix b/pkgs/by-name/hy/hyfetch/package.nix index d67f01dcd9262..18819ba240785 100644 --- a/pkgs/by-name/hy/hyfetch/package.nix +++ b/pkgs/by-name/hy/hyfetch/package.nix @@ -56,7 +56,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "PATH" ]; doInstallCheck = true; diff --git a/pkgs/by-name/hy/hyperrogue/package.nix b/pkgs/by-name/hy/hyperrogue/package.nix index 7992aa8dddfae..d213abef58676 100644 --- a/pkgs/by-name/hy/hyperrogue/package.nix +++ b/pkgs/by-name/hy/hyperrogue/package.nix @@ -102,8 +102,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; - versionCheckProgramArg = "--version"; - doInstallCheck = !stdenv.hostPlatform.isDarwin; passthru = { diff --git a/pkgs/by-name/ia/iamb/package.nix b/pkgs/by-name/ia/iamb/package.nix index 6db78442252e2..714c9c8f5f93e 100644 --- a/pkgs/by-name/ia/iamb/package.nix +++ b/pkgs/by-name/ia/iamb/package.nix @@ -49,7 +49,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ic/icoutils/package.nix b/pkgs/by-name/ic/icoutils/package.nix index e85ef53206a82..b6505b0c768d0 100644 --- a/pkgs/by-name/ic/icoutils/package.nix +++ b/pkgs/by-name/ic/icoutils/package.nix @@ -25,6 +25,12 @@ stdenv.mkDerivation rec { url = "https://git.savannah.nongnu.org/cgit/icoutils.git/patch/?id=aa3572119bfe34484025f37dbbc4d5070f735908"; hash = "sha256-4YCI+SYT2bCBNegkpN5jcfi6gOeec65TmCABr98HHB4="; }) + # Fix build with GCC 15 / C23. + # https://savannah.nongnu.org/bugs/index.php?66812 + (fetchpatch { + url = "https://git.savannah.nongnu.org/cgit/icoutils.git/patch/?id=298da402990ebe1279fb82b63ae2dc66ad78fd36"; + hash = "sha256-XQXhc1GkKhm4RJZPvkV8DYULziuBo0Dpt6hscM2Qcus="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/in/intel-graphics-compiler/gcc15-allow-llvm-free-nonheap-object-warning.patch b/pkgs/by-name/in/intel-graphics-compiler/gcc15-allow-llvm-free-nonheap-object-warning.patch new file mode 100644 index 0000000000000..90cd81176d12b --- /dev/null +++ b/pkgs/by-name/in/intel-graphics-compiler/gcc15-allow-llvm-free-nonheap-object-warning.patch @@ -0,0 +1,14 @@ +diff --git a/igc/IGC/common/LLVMWarningsPush.hpp b/igc/IGC/common/LLVMWarningsPush.hpp +index 12874dfcc2..38acd80943 100644 +--- a/igc/IGC/common/LLVMWarningsPush.hpp ++++ b/igc/IGC/common/LLVMWarningsPush.hpp +@@ -43,6 +43,9 @@ + #if __GNUC__ > 8 + #pragma GCC diagnostic ignored "-Winit-list-lifetime" + #endif ++#if __GNUC__ > 14 ++#pragma GCC diagnostic ignored "-Wfree-nonheap-object" ++#endif + #endif + + #if defined(_WIN32) || defined(_WIN64) diff --git a/pkgs/by-name/in/intel-graphics-compiler/gcc15-llvm-header-fixes.patch b/pkgs/by-name/in/intel-graphics-compiler/gcc15-llvm-header-fixes.patch new file mode 100644 index 0000000000000..b60b995a726c5 --- /dev/null +++ b/pkgs/by-name/in/intel-graphics-compiler/gcc15-llvm-header-fixes.patch @@ -0,0 +1,25 @@ +diff --git a/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 98dce89168..a52947e16e 100644 +--- a/llvm-project/llvm/include/llvm/ADT/SmallVector.h ++++ b/llvm-project/llvm/include/llvm/ADT/SmallVector.h +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/llvm-project/llvm/include/llvm/Support/Threading.h b/llvm-project/llvm/include/llvm/Support/Threading.h +index ba6c531ab4..78aa5e7be5 100644 +--- a/llvm-project/llvm/include/llvm/Support/Threading.h ++++ b/llvm-project/llvm/include/llvm/Support/Threading.h +@@ -18,7 +18,7 @@ + #include "llvm/ADT/StringRef.h" + #include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX + #include "llvm/Support/Compiler.h" +-#include // So we can check the C++ standard lib macros. ++#include // So we can check the C++ standard lib macros. + #include + + #if defined(_MSC_VER) diff --git a/pkgs/by-name/in/intel-graphics-compiler/package.nix b/pkgs/by-name/in/intel-graphics-compiler/package.nix index d3d217f9591d0..2b70443cec1ce 100644 --- a/pkgs/by-name/in/intel-graphics-compiler/package.nix +++ b/pkgs/by-name/in/intel-graphics-compiler/package.nix @@ -66,6 +66,16 @@ stdenv.mkDerivation rec { # https://github.com/intel/intel-graphics-compiler/commit/4f0123a7d67fb716b647f0ba5c1ab550abf2f97d # https://github.com/intel/intel-graphics-compiler/pull/364 ./bump-cmake.patch + + # Fix for GCC 15 by adding a previously-implicit `#include ` and + # replacing `` with `` in the the llvm directory. Based + # on https://github.com/intel/intel-graphics-compiler/pull/383. + ./gcc15-llvm-header-fixes.patch + + # Fix for GCC 15 by disabling `-Werror` for `-Wfree-nonheap-object` + # warnings within LLVM. This is in accordance with IGC disabling warnings + # that originate from within LLVM (see `IGC/common/LLVMWarningsPush.hpp`). + ./gcc15-allow-llvm-free-nonheap-object-warning.patch ]; sourceRoot = "."; diff --git a/pkgs/by-name/ip/iproute2/package.nix b/pkgs/by-name/ip/iproute2/package.nix index 1911045de8ad6..700f0b087c3db 100644 --- a/pkgs/by-name/ip/iproute2/package.nix +++ b/pkgs/by-name/ip/iproute2/package.nix @@ -18,21 +18,13 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "6.17.0"; + version = "6.18.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-l4HllBCrfeqOn3m7EP8UiOY9EPy7cFA7lEJronqOLew="; + hash = "sha256-a6Ug4ZdeTFDckx7q6R6jfBmLihc3RIhfiJW4QyX51FY="; }; - patches = [ - (fetchurl { - name = "musl-redefinition.patch"; - url = "https://lore.kernel.org/netdev/20251012124002.296018-1-yureka@cyberchaos.dev/raw"; - hash = "sha256-8gSpZb/B5sMd2OilUQqg0FqM9y3GZd5Ch5AXV5wrCZQ="; - }) - ]; - postPatch = '' substituteInPlace Makefile \ --replace "CC := gcc" "CC ?= $CC" diff --git a/pkgs/by-name/is/isa-l/package.nix b/pkgs/by-name/is/isa-l/package.nix index 122d62c7e5d81..220948ac4eb45 100644 --- a/pkgs/by-name/is/isa-l/package.nix +++ b/pkgs/by-name/is/isa-l/package.nix @@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/igzip"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/is/isc-cron/package.nix b/pkgs/by-name/is/isc-cron/package.nix index fb9b58c586f7b..21409812255b7 100644 --- a/pkgs/by-name/is/isc-cron/package.nix +++ b/pkgs/by-name/is/isc-cron/package.nix @@ -1,5 +1,6 @@ { lib, + fetchpatch, fetchurl, stdenv, replaceVars, @@ -28,6 +29,11 @@ stdenv.mkDerivation (finalAttrs: { "/bin" ]; }) + # Fix build with gcc 15 + (fetchpatch { + url = "https://github.com/vixie/cron/commit/3ce0c3acdf086a82638818635961c70cba2b6ba7.patch"; + hash = "sha256-d1vN3TGAAOMlWpMZKnHU/RlZ5pBOl3+IXjZ4UALVqLI="; + }) ]; makeFlags = [ diff --git a/pkgs/by-name/is/ispell/package.nix b/pkgs/by-name/is/ispell/package.nix index e7b97ffe11c03..08d17d88fd610 100644 --- a/pkgs/by-name/is/ispell/package.nix +++ b/pkgs/by-name/is/ispell/package.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { EOF ''; + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; # Doesn't compile with C23 + meta = { description = "Interactive spell-checking program for Unix"; homepage = "https://www.cs.hmc.edu/~geoff/ispell.html"; diff --git a/pkgs/by-name/is/isync/package.nix b/pkgs/by-name/is/isync/package.nix index 414299bab329d..6e514b3dec239 100644 --- a/pkgs/by-name/is/isync/package.nix +++ b/pkgs/by-name/is/isync/package.nix @@ -8,7 +8,7 @@ db, cyrus_sasl, zlib, - perl538Packages, + perlPackages, autoreconfHook, # Disabled by default as XOAUTH2 is an "OBSOLETE" SASL mechanism and this relies # on a package that isn't really maintained anymore: @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals withCyrusSaslXoauth2 [ makeWrapper ]; buildInputs = [ - perl538Packages.TimeDate + perlPackages.TimeDate openssl db cyrus_sasl diff --git a/pkgs/by-name/iw/iwe/package.nix b/pkgs/by-name/iw/iwe/package.nix index 9e3893ba4fce0..507bfb1898cb7 100644 --- a/pkgs/by-name/iw/iwe/package.nix +++ b/pkgs/by-name/iw/iwe/package.nix @@ -31,7 +31,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { diff --git a/pkgs/by-name/ja/jacktrip/package.nix b/pkgs/by-name/ja/jacktrip/package.nix index 6e9b6dfa2290a..7bb63f730996e 100644 --- a/pkgs/by-name/ja/jacktrip/package.nix +++ b/pkgs/by-name/ja/jacktrip/package.nix @@ -63,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ja/jaq/package.nix b/pkgs/by-name/ja/jaq/package.nix index 5a67ffa753d5a..177f981790913 100644 --- a/pkgs/by-name/ja/jaq/package.nix +++ b/pkgs/by-name/ja/jaq/package.nix @@ -23,7 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ja/jazz2/package.nix b/pkgs/by-name/ja/jazz2/package.nix index 72fcde7dfc7d8..c4a12b766ef6a 100644 --- a/pkgs/by-name/ja/jazz2/package.nix +++ b/pkgs/by-name/ja/jazz2/package.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/jd/jdd/package.nix b/pkgs/by-name/jd/jdd/package.nix index 0fbecb95bcd26..9d61d4509041e 100644 --- a/pkgs/by-name/jd/jdd/package.nix +++ b/pkgs/by-name/jd/jdd/package.nix @@ -22,7 +22,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Johnny Decimal daemon for automatically organizing files into the correct drawer using their filename"; diff --git a/pkgs/by-name/je/jellyfin-tui/package.nix b/pkgs/by-name/je/jellyfin-tui/package.nix index 30d98424d560c..e540277cf49f7 100644 --- a/pkgs/by-name/je/jellyfin-tui/package.nix +++ b/pkgs/by-name/je/jellyfin-tui/package.nix @@ -34,7 +34,6 @@ rustPlatform.buildRustPackage rec { writableTmpDirAsHomeHook versionCheckHook ]; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "HOME" ]; preInstallCheck = '' mkdir -p "$HOME/${ diff --git a/pkgs/by-name/je/jen/package.nix b/pkgs/by-name/je/jen/package.nix index dbcfb71f6c399..ab7426a8677da 100644 --- a/pkgs/by-name/je/jen/package.nix +++ b/pkgs/by-name/je/jen/package.nix @@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/jn/jnv/package.nix b/pkgs/by-name/jn/jnv/package.nix index 148c728a990c8..fc5f995c0a90a 100644 --- a/pkgs/by-name/jn/jnv/package.nix +++ b/pkgs/by-name/jn/jnv/package.nix @@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-dR9cb3TBxrRGP3BFYro/nGe5XVEfJuTZbQLo+FUfFNs="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/jq/jql/package.nix b/pkgs/by-name/jq/jql/package.nix index bddd524cf6e01..e9467c3ddf596 100644 --- a/pkgs/by-name/jq/jql/package.nix +++ b/pkgs/by-name/jq/jql/package.nix @@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/js/json-schema-catalog-rs/package.nix b/pkgs/by-name/js/json-schema-catalog-rs/package.nix index 30972f40419ee..57cd9cc11d47d 100644 --- a/pkgs/by-name/js/json-schema-catalog-rs/package.nix +++ b/pkgs/by-name/js/json-schema-catalog-rs/package.nix @@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/json-schema-catalog"; - versionCheckProgramArg = "--version"; passthru = { tests = { diff --git a/pkgs/by-name/js/jsonschema-cli/package.nix b/pkgs/by-name/js/jsonschema-cli/package.nix index a1482a5d5826c..c4fe1b865ce6f 100644 --- a/pkgs/by-name/js/jsonschema-cli/package.nix +++ b/pkgs/by-name/js/jsonschema-cli/package.nix @@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index 5216fd971c1ad..9f2c4d36febbe 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -75,7 +75,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/jj"; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ka/kanidm-provision/package.nix b/pkgs/by-name/ka/kanidm-provision/package.nix index 0aebc3b284954..7e90468dac00d 100644 --- a/pkgs/by-name/ka/kanidm-provision/package.nix +++ b/pkgs/by-name/ka/kanidm-provision/package.nix @@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-dPTrIc/hTbMlFDXYMk/dTjqaNECazldfW43egDOwyLM="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/kd/kdlfmt/package.nix b/pkgs/by-name/kd/kdlfmt/package.nix index fb6753d555bb3..3311db51f0dd1 100644 --- a/pkgs/by-name/kd/kdlfmt/package.nix +++ b/pkgs/by-name/kd/kdlfmt/package.nix @@ -31,7 +31,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix index aca9a620cf03f..da5fe7bd421ee 100644 --- a/pkgs/by-name/ke/kew/package.nix +++ b/pkgs/by-name/ke/kew/package.nix @@ -91,7 +91,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ko/koto/package.nix b/pkgs/by-name/ko/koto/package.nix index 5ae56e34cbd5c..3c9cf26a59eb5 100644 --- a/pkgs/by-name/ko/koto/package.nix +++ b/pkgs/by-name/ko/koto/package.nix @@ -31,7 +31,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package=koto_cli" ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix b/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix index 7b55b7f76acfb..fdfd92a84dfba 100644 --- a/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix +++ b/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix @@ -39,7 +39,6 @@ buildPythonPackage rec { nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "kubernetes_validate" ]; diff --git a/pkgs/by-name/ku/kubexporter/package.nix b/pkgs/by-name/ku/kubexporter/package.nix index 934b843ec25c3..46c5f0fe21af0 100644 --- a/pkgs/by-name/ku/kubexporter/package.nix +++ b/pkgs/by-name/ku/kubexporter/package.nix @@ -26,7 +26,6 @@ buildGoModule rec { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ku/kuzu/package.nix b/pkgs/by-name/ku/kuzu/package.nix index 056efc08c68c7..e63600462c992 100644 --- a/pkgs/by-name/ku/kuzu/package.nix +++ b/pkgs/by-name/ku/kuzu/package.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = [ "--version" ]; meta = { changelog = "https://github.com/kuzudb/kuzu/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/by-name/la/labwc/package.nix b/pkgs/by-name/la/labwc/package.nix index 181f5ef31551a..7c7c9bc4db8a4 100644 --- a/pkgs/by-name/la/labwc/package.nix +++ b/pkgs/by-name/la/labwc/package.nix @@ -79,7 +79,6 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru = { providedSessions = [ "labwc" ]; diff --git a/pkgs/by-name/la/ladspa-sdk/package.nix b/pkgs/by-name/la/ladspa-sdk/package.nix index 6f154ea224d8d..561e7a3fec963 100644 --- a/pkgs/by-name/la/ladspa-sdk/package.nix +++ b/pkgs/by-name/la/ladspa-sdk/package.nix @@ -2,16 +2,19 @@ lib, stdenv, fetchurl, + libsndfile, }: stdenv.mkDerivation (finalAttrs: { pname = "ladspa-sdk"; - version = "1.15"; + version = "1.17"; src = fetchurl { url = "https://www.ladspa.org/download/ladspa_sdk_${finalAttrs.version}.tgz"; - sha256 = "1vgx54cgsnc3ncl9qbgjbmq12c444xjafjkgr348h36j16draaa2"; + hash = "sha256-J9JPJ55Lgb0X7L3MOOTEKZG7OIgmwLIABnzg61nT2ls="; }; + buildInputs = [ libsndfile ]; + sourceRoot = "ladspa_sdk_${finalAttrs.version}/src"; strictDeps = true; @@ -41,10 +44,11 @@ stdenv.mkDerivation (finalAttrs: { The LADSPA SDK, including the ladspa.h API header file, ten example LADSPA plugins and three example programs (applyplugin, analyseplugin and listplugins). + For just ladspa.h, use the ladspaH package. ''; homepage = "http://www.ladspa.org/ladspa_sdk/overview.html"; license = lib.licenses.lgpl2; - maintainers = [ lib.maintainers.magnetophon ]; + maintainers = with lib.maintainers; [ magnetophon ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/la/ladspaH/package.nix b/pkgs/by-name/la/ladspaH/package.nix index 7c2515002b1cf..fbd90eb81df7e 100644 --- a/pkgs/by-name/la/ladspaH/package.nix +++ b/pkgs/by-name/la/ladspaH/package.nix @@ -5,10 +5,10 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ladspa.h"; - version = "1.15"; + version = "1.17"; src = fetchurl { url = "https://www.ladspa.org/download/ladspa_sdk_${finalAttrs.version}.tgz"; - sha256 = "1vgx54cgsnc3ncl9qbgjbmq12c444xjafjkgr348h36j16draaa2"; + hash = "sha256-J9JPJ55Lgb0X7L3MOOTEKZG7OIgmwLIABnzg61nT2ls="; }; installPhase = '' diff --git a/pkgs/by-name/la/laze/package.nix b/pkgs/by-name/la/laze/package.nix index 51597f740649e..758faf417a7d2 100644 --- a/pkgs/by-name/la/laze/package.nix +++ b/pkgs/by-name/la/laze/package.nix @@ -46,7 +46,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/la/lazyjj/package.nix b/pkgs/by-name/la/lazyjj/package.nix index 64e3a0a574998..9a79af2c7ed85 100644 --- a/pkgs/by-name/la/lazyjj/package.nix +++ b/pkgs/by-name/la/lazyjj/package.nix @@ -33,7 +33,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/lc/lcov/package.nix b/pkgs/by-name/lc/lcov/package.nix index dbb78518612da..084152895912b 100644 --- a/pkgs/by-name/lc/lcov/package.nix +++ b/pkgs/by-name/lc/lcov/package.nix @@ -62,8 +62,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; - versionCheckProgramArg = "--version"; - nativeInstallCheckInputs = [ versionCheckHook ]; meta = { diff --git a/pkgs/by-name/le/ledger/package.nix b/pkgs/by-name/le/ledger/package.nix index e3a4acd822500..233e6c9c7caf8 100644 --- a/pkgs/by-name/le/ledger/package.nix +++ b/pkgs/by-name/le/ledger/package.nix @@ -89,7 +89,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/le/less/package.nix b/pkgs/by-name/le/less/package.nix index e3ee393a03060..b432523f41b16 100644 --- a/pkgs/by-name/le/less/package.nix +++ b/pkgs/by-name/le/less/package.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/le/lexical/package.nix b/pkgs/by-name/le/lexical/package.nix index 5f3ebdeed22c6..fd386e4b87a6c 100644 --- a/pkgs/by-name/le/lexical/package.nix +++ b/pkgs/by-name/le/lexical/package.nix @@ -43,7 +43,6 @@ beamPackages.mixRelease rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/li/libLAS/package.nix b/pkgs/by-name/li/libLAS/package.nix index 749125043f06a..0f61c70c5f7ab 100644 --- a/pkgs/by-name/li/libLAS/package.nix +++ b/pkgs/by-name/li/libLAS/package.nix @@ -54,6 +54,11 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/libLAS/libLAS/commit/be77a75f475ec8d59c0dae1c3c896289bcb5a287.patch"; hash = "sha256-5XDexk3IW7s2/G27GXkWp7cw1WZyQLMk/lTpfOM6PM0="; }) + (fetchpatch { + name = "fix-gcc15.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/liblas/-/raw/1.8.1.r128+gded46373-17/liblas-gcc15.patch"; + hash = "sha256-cOm5ElnR2mK+ofU0F4xzYTkFa3Oq8r/WSm4qo45vkt8="; + }) ]; # Disable setting of C++98 standard which was dropped in boost 1.84.0 diff --git a/pkgs/by-name/li/libadwaita/package.nix b/pkgs/by-name/li/libadwaita/package.nix index a1954d7c71b00..27e4948d74e7d 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.8.1"; + version = "1.8.2"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "libadwaita"; tag = finalAttrs.version; - hash = "sha256-9CcmzwQYZZc6dZAv6x90Od4lrRcYZIejzPgm6S1vz/U="; + hash = "sha256-bymC3B5mY4r7oteA6WRViWIyazt0YE6T+P+RHrYifyY="; }; depsBuildBuild = [ diff --git a/pkgs/by-name/li/libarchive-qt/package.nix b/pkgs/by-name/li/libarchive-qt/package.nix index 0286a374fba3b..03b024ecb8f34 100644 --- a/pkgs/by-name/li/libarchive-qt/package.nix +++ b/pkgs/by-name/li/libarchive-qt/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config - qt6.wrapQtAppsNoGuiHook + qt6.wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/by-name/li/libarchive/package.nix b/pkgs/by-name/li/libarchive/package.nix index 528e52dc6a727..1cfcfd29c4b78 100644 --- a/pkgs/by-name/li/libarchive/package.nix +++ b/pkgs/by-name/li/libarchive/package.nix @@ -31,13 +31,13 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation (finalAttrs: { pname = "libarchive"; - version = "3.8.2"; + version = "3.8.4"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${finalAttrs.version}"; - hash = "sha256-s7duwuNFyYq8obTS3qc6JewJ9f8LJhItlEx8wxnMgwk="; + hash = "sha256-qNz7BAvi3dTNg6Bz2cfqaYGKFJlM4C+y/GARsQRRYsY="; }; outputs = [ diff --git a/pkgs/by-name/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix index a55c166df6a05..6259025537b94 100644 --- a/pkgs/by-name/li/libblake3/package.nix +++ b/pkgs/by-name/li/libblake3/package.nix @@ -6,8 +6,7 @@ fetchpatch, onetbb, - # TBB doesn't support being built static - useTBB ? !stdenv.hostPlatform.isStatic, + useTBB ? lib.meta.availableOn stdenv.hostPlatform onetbb, }: stdenv.mkDerivation (finalAttrs: { @@ -39,6 +38,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-kidCMGd/i9D9HLLTt7l1DbiU71sFTEyr3Vew4XHUHls="; relative = "c"; }) + # fix cygwin build + (fetchpatch { + url = "https://github.com/BLAKE3-team/BLAKE3/commit/d62babb7ebb01c8ac4aaa580f4b49071a639195e.patch"; + hash = "sha256-qO8HsmBIAkR03rqITooyBiQTorUM6JCJLZOrOc2yss8="; + relative = "c"; + }) ]; sourceRoot = finalAttrs.src.name + "/c"; diff --git a/pkgs/by-name/li/libbluray-full/package.nix b/pkgs/by-name/li/libbluray-full/package.nix new file mode 100644 index 0000000000000..5a09f78f35d08 --- /dev/null +++ b/pkgs/by-name/li/libbluray-full/package.nix @@ -0,0 +1,6 @@ +{ libbluray }: +libbluray.override { + withAACS = true; + withBDplus = true; + withJava = true; +} diff --git a/pkgs/by-name/li/libbluray/package.nix b/pkgs/by-name/li/libbluray/package.nix index 4b3dfdd295d4e..fe6f8feb611f0 100644 --- a/pkgs/by-name/li/libbluray/package.nix +++ b/pkgs/by-name/li/libbluray/package.nix @@ -1,12 +1,14 @@ { lib, + callPackage, stdenv, fetchurl, pkg-config, fontconfig, - autoreconfHook, + meson, + ninja, withJava ? false, - jdk17, + jdk21_headless, # Newer JDK's depend on a release with a fix for https://code.videolan.org/videolan/libbluray/-/issues/46 ant, stripJavaArchivesHook, withAACS ? false, @@ -17,6 +19,7 @@ libxml2, withFonts ? true, freetype, + libbluray-full, # Used for tests }: # Info on how to use: @@ -24,19 +27,20 @@ stdenv.mkDerivation rec { pname = "libbluray"; - version = "1.3.4"; + version = "1.4.0"; src = fetchurl { - url = "https://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-R4/9aKD13ejvbKmJt/A1taCiLFmRQuXNP/ewO76+Xys="; + url = "https://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.xz"; + hash = "sha256-d5N7rwfq3aSysxHPOvTFAmnS6jFlBB9YQ9lkdsTJJ3c="; }; nativeBuildInputs = [ + meson + ninja pkg-config - autoreconfHook ] ++ lib.optionals withJava [ - jdk17 + jdk21_headless ant stripJavaArchivesHook ]; @@ -49,15 +53,15 @@ stdenv.mkDerivation rec { propagatedBuildInputs = lib.optional withAACS libaacs; - env.JAVA_HOME = lib.optionalString withJava jdk17.home; # Fails at runtime without this + env.JAVA_HOME = lib.optionalString withJava jdk21_headless.home; # Fails at runtime without this env.NIX_LDFLAGS = lib.optionalString withAACS "-L${libaacs}/lib -laacs" + lib.optionalString withBDplus " -L${libbdplus}/lib -lbdplus"; - configureFlags = - lib.optional (!withJava) "--disable-bdjava-jar" - ++ lib.optional (!withMetadata) "--without-libxml2" - ++ lib.optional (!withFonts) "--without-freetype"; + mesonFlags = + lib.optional (!withJava) "-Dbdj_jar=disabled" + ++ lib.optional (!withMetadata) "-dlibxml2=disabled" + ++ lib.optional (!withFonts) "-Dfreetype=disabled"; meta = { homepage = "http://www.videolan.org/developers/libbluray.html"; @@ -66,4 +70,11 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; + + passthru = { + tests = { + # Verify the "full" package when verifying changes to this package + inherit libbluray-full; + }; + }; } diff --git a/pkgs/by-name/li/libcamera/package.nix b/pkgs/by-name/li/libcamera/package.nix index 5633a74ec866c..97d3893925eb2 100644 --- a/pkgs/by-name/li/libcamera/package.nix +++ b/pkgs/by-name/li/libcamera/package.nix @@ -27,12 +27,12 @@ stdenv.mkDerivation rec { pname = "libcamera"; - version = "0.5.2"; + version = "0.6.0"; src = fetchgit { url = "https://git.libcamera.org/libcamera/libcamera.git"; rev = "v${version}"; - hash = "sha256-nr1LmnedZMGBWLf2i5uw4E/OMeXObEKgjuO+PUx/GDY="; + hash = "sha256-zGcbzL1Q2hUaj/s9NjBlp7hVjmSFb0GF8CnCoDS82Tw="; }; outputs = [ @@ -112,6 +112,7 @@ stdenv.mkDerivation rec { "-Dv4l2=true" (lib.mesonEnable "tracing" withTracing) (lib.mesonEnable "qcam" withQcam) + "-Dlibunwind=disabled" "-Dlc-compliance=disabled" # tries unconditionally to download gtest when enabled # Avoid blanket -Werror to evade build failures on less # tested compilers. diff --git a/pkgs/by-name/li/libcosmicAppHook/libcosmic-app-hook.sh b/pkgs/by-name/li/libcosmicAppHook/libcosmic-app-hook.sh index 7245d51495c05..e6a5231919564 100644 --- a/pkgs/by-name/li/libcosmicAppHook/libcosmic-app-hook.sh +++ b/pkgs/by-name/li/libcosmicAppHook/libcosmic-app-hook.sh @@ -15,11 +15,7 @@ libcosmicAppVergenHook() { libcosmicAppLinkerArgsHook() { # Force linking to certain libraries like libEGL, which are always dlopen()ed - # local flags="CARGO_TARGET_@cargoLinkerVar@_RUSTFLAGS" - - # Temporarily use this simpler solution, it should work for simple cross compilation - # https://github.com/NixOS/nixpkgs/issues/464392 - local flags="RUSTFLAGS" + local flags="CARGO_TARGET_@cargoLinkerVar@_RUSTFLAGS" export "$flags"="${!flags-} -C link-arg=-Wl,--push-state,--no-as-needed" # shellcheck disable=SC2043 diff --git a/pkgs/by-name/li/libcosmicAppHook/package.nix b/pkgs/by-name/li/libcosmicAppHook/package.nix index f6eca00a1e0a5..416ec8029da3b 100644 --- a/pkgs/by-name/li/libcosmicAppHook/package.nix +++ b/pkgs/by-name/li/libcosmicAppHook/package.nix @@ -57,10 +57,7 @@ makeSetupHook { lib.makeSearchPath "share" ( lib.optionals includeSettings [ fallbackThemes ] ++ [ targetPackages.cosmic-icons or cosmic-icons ] ); - # Temporarily using RUSTFLAGS: https://github.com/NixOS/nixpkgs/issues/464392 - # See ./libcosmic-app-hook.sh - # cargoLinkerVar = targetPackages.stdenv.hostPlatform.rust.cargoEnvVarTarget; - + cargoLinkerVar = targetPackages.stdenv.hostPlatform.rust.cargoEnvVarTarget; # force linking for all libraries that may be dlopen'd by libcosmic/iced apps cargoLinkLibs = lib.escapeShellArgs ( [ diff --git a/pkgs/by-name/li/libdrm/package.nix b/pkgs/by-name/li/libdrm/package.nix index 901e7de81f722..a56344d168b25 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.128"; + version = "2.4.129"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-O7NduHAMKgtWnyxnKaU/VJV4aFazEIVMjeV3gqIr3aw="; + hash = "sha256-WXgYP5eNaX4mpQugZhdJZO+wq5fKoeyqG4Yfvl3fd9w="; }; outputs = [ diff --git a/pkgs/by-name/li/libedit/01-cygwin.patch b/pkgs/by-name/li/libedit/01-cygwin.patch index 33bd39ed61e5e..ef6aa79c9561c 100644 --- a/pkgs/by-name/li/libedit/01-cygwin.patch +++ b/pkgs/by-name/li/libedit/01-cygwin.patch @@ -1,17 +1,3 @@ ---- libedit-20120311-3.0/src/chartype.h 2012-03-11 10:54:58.000000000 +0100 -+++ libedit-20120311-3.0/src/chartype.h 2012-05-03 19:00:20.651847423 +0200 -@@ -56,9 +56,11 @@ - /* Oh for a with char32_t and __STDC_UTF_32__ in it... - * ref: ISO/IEC DTR 19769 - */ -+#ifndef __CYGWIN__ - #if WCHAR_MAX < INT32_MAX - #warning Build environment does not support non-BMP characters - #endif -+#endif - - #ifndef HAVE_WCSDUP - wchar_t *wcsdup(const wchar_t *s); --- libedit-20120311-3.0/src/editline/readline.h 2011-02-26 23:42:59.000000000 +0100 +++ libedit-20120311-3.0/src/editline/readline.h 2012-05-03 19:00:49.211244803 +0200 @@ -75,7 +75,7 @@ typedef KEYMAP_ENTRY *Keymap; @@ -23,3 +9,14 @@ #include #endif #ifndef CTRL + +--- a/src/read.c ++++ b/src/read.c +@@ -51,6 +51,7 @@ __RCSID("$NetBSD: read.c,v 1.109 2025/01/03 00:40:08 rillig Exp $"); + #include + #include + #include ++#include + + #include "el.h" + #include "fcns.h" diff --git a/pkgs/by-name/li/libedit/package.nix b/pkgs/by-name/li/libedit/package.nix index 6f3caa1f45dab..30a316d0074d4 100644 --- a/pkgs/by-name/li/libedit/package.nix +++ b/pkgs/by-name/li/libedit/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { similar to those found in GNU Readline. ''; license = with lib.licenses; [ bsd3 ]; - maintainers = [ ]; + maintainers = with lib.maintainers; [ corngood ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/li/libev/package.nix b/pkgs/by-name/li/libev/package.nix index cf0f426f96b24..86462cc5380f8 100644 --- a/pkgs/by-name/li/libev/package.nix +++ b/pkgs/by-name/li/libev/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, updateAutotoolsGnuConfigScriptsHook, # Note: -static hasn’t work on darwin static ? with stdenv.hostPlatform; isStatic && !isDarwin, @@ -21,10 +22,22 @@ stdenv.mkDerivation rec { sha256 = "1sjs4324is7fp21an4aas2z4dwsvs6z4xwrmp72vwpq1s6wbfzjh"; }; + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/21a6f0f5829384117dfc1ed11ad67954562ef7d6/devel/libev/files/patch-ev.c"; + hash = "sha256-jaeJuCYM/U2ZNbbyA/7YOKvo0lj7Dc9L3LNJfZwcaw0="; + extraPrefix = ""; + }) + ]; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; configureFlags = lib.optional static "LDFLAGS=-static"; + makeFlags = + # doing this in configureFlags causes configure to fail + lib.optional (!static && stdenv.hostPlatform.isCygwin) "LDFLAGS=-no-undefined"; + meta = { description = "High-performance event loop/event model with lots of features"; maintainers = [ lib.maintainers.raskin ]; diff --git a/pkgs/by-name/li/libexsid/package.nix b/pkgs/by-name/li/libexsid/package.nix index d4ce696e28588..c9c59508ca0b9 100644 --- a/pkgs/by-name/li/libexsid/package.nix +++ b/pkgs/by-name/li/libexsid/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, autoreconfHook, pkg-config, docSupport ? true, @@ -20,6 +21,14 @@ stdenv.mkDerivation rec { sha256 = "1qbiri549fma8c72nmj3cpz3sn1vc256kfafnygkmkzg7wdmgi7r"; }; + patches = [ + # fix build with GCC 15 by removing unneeded argument + (fetchpatch { + url = "https://github.com/libsidplayfp/exsid-driver/commit/99bfaf25f73f96d588a38a4309fa5f18c364f4d4.patch"; + hash = "sha256-wg/oJieejyXiP5Ff9FRfACNELUt5021kXS1/zT7dMgA="; + }) + ]; + outputs = [ "out" ] ++ lib.optional docSupport "doc"; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libfido2/package.nix b/pkgs/by-name/li/libfido2/package.nix index 2dc6ea440ffa9..710960b91fb7a 100644 --- a/pkgs/by-name/li/libfido2/package.nix +++ b/pkgs/by-name/li/libfido2/package.nix @@ -48,6 +48,12 @@ stdenv.mkDerivation rec { doInstallCheck = true; + # Required for FreeBSD + # https://github.com/freebsd/freebsd-ports/blob/21a6f0f5829384117dfc1ed11ad67954562ef7d6/security/libfido2/Makefile#L37C27-L37C77 + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail "-D_POSIX_C_SOURCE=200809L" "-D_POSIX_C_SOURCE=202405L" + ''; + cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" "-DCMAKE_INSTALL_LIBDIR=lib" diff --git a/pkgs/by-name/li/libimagequant/Cargo.lock b/pkgs/by-name/li/libimagequant/Cargo.lock index eaed4b693bfe0..989062e597b6f 100644 --- a/pkgs/by-name/li/libimagequant/Cargo.lock +++ b/pkgs/by-name/li/libimagequant/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "adler2" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "arrayvec" @@ -16,15 +16,15 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "bitflags" -version = "2.8.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" [[package]] name = "bytemuck" -version = "1.21.0" +version = "1.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3" +checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4" [[package]] name = "c_test" @@ -36,24 +36,25 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.10" +version = "1.2.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229" +checksum = "b97463e1064cb1b1c1384ad0a0b9c8abd0988e2a91f52606c80ef14aadb63e36" dependencies = [ + "find-msvc-tools", "shlex", ] [[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 = "crc32fast" -version = "1.4.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" dependencies = [ "cfg-if", ] @@ -85,23 +86,30 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "either" -version = "1.13.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + +[[package]] +name = "find-msvc-tools" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" [[package]] name = "flate2" -version = "1.0.35" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" +checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" dependencies = [ "crc32fast", + "libz-rs-sys", "miniz_oxide", ] [[package]] name = "imagequant" -version = "4.4.0" +version = "4.4.1" dependencies = [ "arrayvec", "lodepng", @@ -122,15 +130,24 @@ dependencies = [ [[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 = "libz-rs-sys" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "840db8cf39d9ec4dd794376f38acc40d0fc65eec2a8f484f7fd375b84602becd" +dependencies = [ + "zlib-rs", +] [[package]] name = "lodepng" -version = "3.11.0" +version = "3.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7720115060cd38dcfe5c758525a43fd34dc615d0566374212ff0dc3b6151eac" +checksum = "77a32335d22e44238e2bb0b4d726964d18952ce1f1279ec3305305d2c61539eb" dependencies = [ "crc32fast", "flate2", @@ -140,24 +157,25 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.8.3" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ "adler2", + "simd-adler32", ] [[package]] name = "once_cell" -version = "1.20.2" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "rayon" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" dependencies = [ "either", "rayon-core", @@ -165,9 +183,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -175,9 +193,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.50" +version = "0.8.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" +checksum = "0c6a884d2998352bb4daf0183589aec883f16a6da1f4dde84d8e2e9a5409a1ce" dependencies = [ "bytemuck", ] @@ -188,12 +206,23 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + [[package]] name = "thread_local" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" dependencies = [ "cfg-if", - "once_cell", ] + +[[package]] +name = "zlib-rs" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f06ae92f42f5e5c42443fd094f245eb656abf56dd7cce9b8b263236565e00f2" diff --git a/pkgs/by-name/li/libimagequant/package.nix b/pkgs/by-name/li/libimagequant/package.nix index ec783eb935710..75f8a26aa77c8 100644 --- a/pkgs/by-name/li/libimagequant/package.nix +++ b/pkgs/by-name/li/libimagequant/package.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage rec { pname = "libimagequant"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "libimagequant"; rev = version; - hash = "sha256-c9j0wVwTWtNrPy9UUsc0Gxbe6lP82C3DMXe+k/ZBYEw="; + hash = "sha256-A7idjAAJ+syqIahyU+LPZBF+MLxVDymY+M3HM7d/qk0="; }; cargoLock = { diff --git a/pkgs/by-name/li/libjpeg_turbo/package.nix b/pkgs/by-name/li/libjpeg_turbo/package.nix index e30ee22edbd5e..deeed0c7d87da 100644 --- a/pkgs/by-name/li/libjpeg_turbo/package.nix +++ b/pkgs/by-name/li/libjpeg_turbo/package.nix @@ -32,13 +32,13 @@ assert !(enableJpeg7 && enableJpeg8); # pick only one or none, not both stdenv.mkDerivation (finalAttrs: { pname = "libjpeg-turbo"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "libjpeg-turbo"; repo = "libjpeg-turbo"; tag = finalAttrs.version; - hash = "sha256-tmeWLJxieV42f9ljSpKJoLER4QOYQLsLFC7jW54YZAk="; + hash = "sha256-jcdoCJlsDEr87i5MN4I6zARZVUxQfzdM0Ltg3IyrNRg="; }; patches = diff --git a/pkgs/by-name/li/liblqr1/package.nix b/pkgs/by-name/li/liblqr1/package.nix index bfe56beef91b3..337381f04d719 100644 --- a/pkgs/by-name/li/liblqr1/package.nix +++ b/pkgs/by-name/li/liblqr1/package.nix @@ -6,7 +6,7 @@ glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "liblqr-1"; version = "0.4.2"; @@ -18,8 +18,13 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "carlobaldassi"; repo = "liblqr"; - rev = "v${version}"; - sha256 = "10mrl5k3l2hxjhz4w93n50xwywp6y890rw2vsjcgai8627x5f1df"; + rev = "v${finalAttrs.version}"; + hash = "sha256-rgVX+hEGRfWY1FvwDBLy5nLPOyh2JE4+lB0KOmahuYI="; + }; + + # Fix build with gcc15 + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-std=gnu17"; }; nativeBuildInputs = [ pkg-config ]; @@ -34,4 +39,4 @@ stdenv.mkDerivation rec { lgpl3 ]; }; -} +}) diff --git a/pkgs/by-name/li/libmcrypt/package.nix b/pkgs/by-name/li/libmcrypt/package.nix index 31b8f5a9c4e9d..59828384b855f 100644 --- a/pkgs/by-name/li/libmcrypt/package.nix +++ b/pkgs/by-name/li/libmcrypt/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, cctools, disablePosixThreads ? false, }: @@ -15,6 +16,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-5OtsB0u6sWisR7lHwZX/jO+dUaIRzdGMqcnvNNJ6Nz4="; }; + patches = [ + # Fix build with GCC 15 + (fetchpatch { + url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/v20251224/community/libmcrypt/c23.patch"; + hash = "sha256-yTBCi5f0s8SiM5aq8X135E2Wwl7S2sO1tsVDthCdAMg="; + }) + ]; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin cctools; configureFlags = diff --git a/pkgs/by-name/li/libmhash/package.nix b/pkgs/by-name/li/libmhash/package.nix index ce3706fe4e195..89cbb8c679d34 100644 --- a/pkgs/by-name/li/libmhash/package.nix +++ b/pkgs/by-name/li/libmhash/package.nix @@ -17,6 +17,9 @@ stdenv.mkDerivation rec { patches = [ ./autotools-define-conflict-debian-fix.patch ]; + # Fix build with gcc15 + configureFlags = [ "CFLAGS=-std=gnu17" ]; + meta = { description = "Hash algorithms library"; longDescription = '' diff --git a/pkgs/by-name/li/libnftnl/package.nix b/pkgs/by-name/li/libnftnl/package.nix index 73799c03d8098..dbde8f84ac3d9 100644 --- a/pkgs/by-name/li/libnftnl/package.nix +++ b/pkgs/by-name/li/libnftnl/package.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "1.3.0"; + version = "1.3.1"; pname = "libnftnl"; src = fetchurl { url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.xz"; - hash = "sha256-D0vkeou4t3o1DuWMvUtfrmJgrUhqUncGqxXP4d1Vo8Q="; + hash = "sha256-YH2ijbpm+97M+O8Tld3tkHfo0Z8plfmk1FqcLwvP+6g="; }; configureFlags = lib.optional ( diff --git a/pkgs/by-name/li/libpst/package.nix b/pkgs/by-name/li/libpst/package.nix index e8f4837dc1d1c..c759994252b4a 100644 --- a/pkgs/by-name/li/libpst/package.nix +++ b/pkgs/by-name/li/libpst/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, autoreconfHook, bzip2, doxygen, @@ -21,6 +22,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-PSkb7rvbSNK5NGCLwGGVtkHaY9Ko9eDThvLp1tBaC0I="; }; + patches = [ + # readpst: Fix a build with gcc/C23 standard + (fetchpatch { + url = "https://github.com/pst-format/libpst/commit/cc600ee98c4ed23b8ab0bc2cf6b6c6e9cb587e89.patch"; + hash = "sha256-lD6vJrRbqnlG69+aU0v32UTxD0NfKNr6vPcysXK7ir0="; + }) + ]; + nativeBuildInputs = [ autoreconfHook doxygen diff --git a/pkgs/by-name/li/librep/package.nix b/pkgs/by-name/li/librep/package.nix index 795d43eea991c..bc6b148962ffe 100644 --- a/pkgs/by-name/li/librep/package.nix +++ b/pkgs/by-name/li/librep/package.nix @@ -58,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; meta = { diff --git a/pkgs/by-name/li/libtirpc/package.nix b/pkgs/by-name/li/libtirpc/package.nix index b0296afa746ff..11acc10764288 100644 --- a/pkgs/by-name/li/libtirpc/package.nix +++ b/pkgs/by-name/li/libtirpc/package.nix @@ -6,16 +6,16 @@ libkrb5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libtirpc"; version = "1.3.7"; src = fetchurl { url = "http://git.linux-nfs.org/?p=steved/libtirpc.git;a=snapshot;h=refs/tags/libtirpc-${ - lib.replaceStrings [ "." ] [ "-" ] version + lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version };sf=tgz"; hash = "sha256-VGftEr3xzCp8O3oqCjIZozlq599gxN5IsHBRaG37GP4="; - name = "${pname}-${version}.tar.gz"; + name = "${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; }; outputs = [ @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { "dev" ]; - KRB5_CONFIG = "${libkrb5.dev}/bin/krb5-config"; + env.KRB5_CONFIG = "${libkrb5.dev}/bin/krb5-config"; + nativeBuildInputs = [ autoreconfHook ]; propagatedBuildInputs = [ libkrb5 ]; strictDeps = true; @@ -44,6 +45,8 @@ stdenv.mkDerivation rec { doCheck = true; + __structuredAttrs = true; + meta = { homepage = "https://sourceforge.net/projects/libtirpc/"; description = "Transport-independent Sun RPC implementation (TI-RPC)"; @@ -64,4 +67,4 @@ stdenv.mkDerivation rec { been ported to replace the SunRPC of the glibc. ''; }; -} +}) diff --git a/pkgs/by-name/li/libultrahdr/package.nix b/pkgs/by-name/li/libultrahdr/package.nix index 4bf5fa1563a96..7097884d9fa89 100644 --- a/pkgs/by-name/li/libultrahdr/package.nix +++ b/pkgs/by-name/li/libultrahdr/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, replaceVars, cmake, ninja, @@ -30,6 +31,12 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ + # Fix build with gcc 15 by adding missing cstdint header + (fetchpatch { + url = "https://github.com/google/libultrahdr/commit/5fa99b5271a3c80a13c78062d7adc6310222dd8e.patch"; + hash = "sha256-o6lbDOdx+ZrCy/Iq02WjM9Tas8C5P/FMwUtXMUCoZGY="; + }) + (replaceVars ./gtest.patch { GTEST_INCLUDE_DIRS = "${lib.getDev gtest}/include"; }) diff --git a/pkgs/by-name/li/libxslt/package.nix b/pkgs/by-name/li/libxslt/package.nix index ed1b8770b4cb4..1718598b01e7a 100644 --- a/pkgs/by-name/li/libxslt/package.nix +++ b/pkgs/by-name/li/libxslt/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxslt"; - version = "1.1.43"; + version = "1.1.45"; outputs = [ "bin" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/libxslt/${lib.versions.majorMinor finalAttrs.version}/libxslt-${finalAttrs.version}.tar.xz"; - hash = "sha256-Wj1rODylr8I1sXERjpD1/2qifp/qMwMGUjGm1APwGDo="; + hash = "sha256-ms/mhBnE0GpFxVAyGzISdi2S9BRlBiyk6hnmMu5dIW4="; }; patches = [ diff --git a/pkgs/by-name/li/lightning-terminal/package.nix b/pkgs/by-name/li/lightning-terminal/package.nix index 6943c8a28ef5e..4410bfa9d6131 100644 --- a/pkgs/by-name/li/lightning-terminal/package.nix +++ b/pkgs/by-name/li/lightning-terminal/package.nix @@ -95,7 +95,6 @@ buildGoModule rec { doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/litcli"; - versionCheckProgramArg = "--version"; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/li/lightningstream/package.nix b/pkgs/by-name/li/lightningstream/package.nix index 94f19ca2d3c65..25a6c4d1d1d7c 100644 --- a/pkgs/by-name/li/lightningstream/package.nix +++ b/pkgs/by-name/li/lightningstream/package.nix @@ -53,7 +53,6 @@ buildGoModule { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/li/ligolo-ng/package.nix b/pkgs/by-name/li/ligolo-ng/package.nix index d7571b1435ce8..50b59a1fa42a0 100644 --- a/pkgs/by-name/li/ligolo-ng/package.nix +++ b/pkgs/by-name/li/ligolo-ng/package.nix @@ -43,7 +43,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/ligolo-agent"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/li/lima/package.nix b/pkgs/by-name/li/lima/package.nix index f4231043c34fd..55c4f1f44327f 100644 --- a/pkgs/by-name/li/lima/package.nix +++ b/pkgs/by-name/li/lima/package.nix @@ -95,7 +95,6 @@ buildGoModule (finalAttrs: { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/limactl"; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "HOME" ]; installCheckPhase = '' diff --git a/pkgs/by-name/li/linyaps/package.nix b/pkgs/by-name/li/linyaps/package.nix index 252c6725db7af..547fd49e10b92 100644 --- a/pkgs/by-name/li/linyaps/package.nix +++ b/pkgs/by-name/li/linyaps/package.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { cmake copyDesktopItems pkg-config - qt6Packages.wrapQtAppsNoGuiHook + qt6Packages.wrapQtAppsHook ]; postInstall = '' diff --git a/pkgs/by-name/lk/lkl/fix-hijack-and-zpoline-parallel-builds.patch b/pkgs/by-name/lk/lkl/fix-hijack-and-zpoline-parallel-builds.patch deleted file mode 100644 index 1ed9b4a97b7a0..0000000000000 --- a/pkgs/by-name/lk/lkl/fix-hijack-and-zpoline-parallel-builds.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 4ee5d9b78ca1425b4473ede98602b656f28027e8 Mon Sep 17 00:00:00 2001 -From: David Disseldorp -Date: Fri, 4 Jul 2025 15:51:14 +1000 -Subject: [PATCH] lkl: fix hijack and zpoline parallel builds - -This is a follow up change for commit 3c97822a40cb1 ("lkl: add tests -build barrier") tracked via https://github.com/lkl/linux/issues/558. -The hijack and zpoline libraries also share object files, so need a -barrier to avoid parallel build failures. - -Signed-off-by: David Disseldorp ---- - tools/lkl/Makefile | 7 ++++--- - tools/lkl/Targets | 2 ++ - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/tools/lkl/Makefile b/tools/lkl/Makefile -index 9ca22b7605e3ad..dfe7f6aef5fe02 100644 ---- a/tools/lkl/Makefile -+++ b/tools/lkl/Makefile -@@ -176,10 +176,11 @@ headers_install: $(TARGETS) - include/lkl_config.h $(DESTDIR)$(INCDIR) ; \ - cp -r $(OUTPUT)include/lkl $(DESTDIR)$(INCDIR) - --libraries_install: $(libs-y:%=$(OUTPUT)%$(SOSUF)) $(OUTPUT)liblkl.a -- $(call QUIET_INSTALL, libraries) \ -+libraries_install: $(call expand-targets,$(libs-y),$(SOSUF)) $(OUTPUT)liblkl.a -+ # filter out special .WAIT targets from install -+ $(if $(filter .%,$^),,$(call QUIET_INSTALL, libraries) \ - install -d $(DESTDIR)$(LIBDIR) ; \ -- install -m 644 $^ $(DESTDIR)$(LIBDIR) -+ install -m 644 $^ $(DESTDIR)$(LIBDIR)) - - programs_install: $(call expand-targets,$(progs-y),$(EXESUF)) - $(call QUIET_INSTALL, programs) \ -diff --git a/tools/lkl/Targets b/tools/lkl/Targets -index 3d30bd8be3c840..089a832ee23627 100644 ---- a/tools/lkl/Targets -+++ b/tools/lkl/Targets -@@ -2,6 +2,8 @@ libs-y += lib/liblkl - - ifneq ($(LKL_HOST_CONFIG_BSD),y) - libs-$(LKL_HOST_CONFIG_POSIX) += lib/hijack/liblkl-hijack -+# hijack and zpoline targets share object files, breaking parallel builds -+libs-$(LKL_HOST_CONFIG_POSIX) += .WAIT - libs-$(LKL_HOST_CONFIG_POSIX) += lib/hijack/liblkl-zpoline - endif - LDFLAGS_lib/hijack/liblkl-hijack-y += -shared -nodefaultlibs diff --git a/pkgs/by-name/lk/lkl/package.nix b/pkgs/by-name/lk/lkl/package.nix index 1d6ae37fddddf..b074d078da759 100644 --- a/pkgs/by-name/lk/lkl/package.nix +++ b/pkgs/by-name/lk/lkl/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { pname = "lkl"; - version = "2025-03-20"; + version = "2025-11-13"; outputs = [ "dev" @@ -27,8 +27,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "lkl"; repo = "linux"; - rev = "fd33ab3d21a99a31683ebada5bd3db3a54a58800"; - sha256 = "sha256-3uPkOyL/hoA/H2gKrEEDsuJvwOE2x27vxY5Y2DyNNxU="; + rev = "9c51103caa1481493ebbbaf858f016e7f25ab921"; + hash = "sha256-7S1lA6qfpGLj5lCqdOEEfcChxNw+35SC/NEjFWcwvko="; }; nativeBuildInputs = [ @@ -43,22 +43,11 @@ stdenv.mkDerivation { libarchive ]; - patches = [ - # Fix corruption in hijack and zpoline libraries when building in parallel, - # because both hijack and zpoline share object files, which may result in - # missing symbols. - # https://github.com/lkl/linux/pull/612/commits/4ee5d9b78ca1425b4473ede98602b656f28027e8 - ./fix-hijack-and-zpoline-parallel-builds.patch - ]; - postPatch = '' # Fix a /usr/bin/env reference in here that breaks sandboxed builds patchShebangs arch/lkl/scripts patchShebangs scripts/ld-version.sh - - # Fixup build with newer Linux headers: https://github.com/lkl/linux/pull/484 - sed '1i#include ' -i tools/lkl/lib/hijack/xlate.c '' + lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isLoongArch64) '' echo CONFIG_KALLSYMS=n >> arch/lkl/configs/defconfig diff --git a/pkgs/by-name/ll/llm-ls/package.nix b/pkgs/by-name/ll/llm-ls/package.nix index b60cc62023b8a..821a8a11a8a20 100644 --- a/pkgs/by-name/ll/llm-ls/package.nix +++ b/pkgs/by-name/ll/llm-ls/package.nix @@ -38,7 +38,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/lo/lowdown/fix-cygwin-build.patch b/pkgs/by-name/lo/lowdown/fix-cygwin-build.patch new file mode 100644 index 0000000000000..411266b13089b --- /dev/null +++ b/pkgs/by-name/lo/lowdown/fix-cygwin-build.patch @@ -0,0 +1,64 @@ +diff --git a/Makefile b/Makefile +index 8877a17..f73fe5f 100644 +--- a/Makefile ++++ b/Makefile +@@ -161,7 +161,7 @@ MAIN_OBJS = $(COMPAT_OBJS) + + # Mac OS X and other Unix systems use different conventions for + # indicating shared library versions. +-.if $(LINKER_SOSUFFIX) == "dylib" ++.if $(LINKER_SOSUFFIX) == "dylib" || $(LINKER_SOSUFFIX) == "dll" + LIB_SOVER = liblowdown.$(LIBVER).$(LINKER_SOSUFFIX) + .else + LIB_SOVER = liblowdown.$(LINKER_SOSUFFIX).$(LIBVER) +@@ -190,7 +190,7 @@ REGRESS_ARGS += "--parse-no-deflists" + REGRESS_ENV = LC_ALL=en_US.UTF-8 + + all: bins lowdown.pc $(LIB_SO) +-bins: lowdown lowdown-diff ++bins: lowdown$(EXESUFFIX) lowdown-diff + + www: all $(HTMLS) $(PDFS) $(THUMBS) lowdown.tar.gz lowdown.tar.gz.sha512 + +@@ -202,11 +202,11 @@ installwww: www + $(INSTALL) -m 0444 lowdown.tar.gz $(WWWDIR)/snapshots + $(INSTALL) -m 0444 lowdown.tar.gz.sha512 $(WWWDIR)/snapshots + +-lowdown: $(LIB_LOWDOWN) $(MAIN_OBJS) main.o ++lowdown$(EXESUFFIX): $(LIB_LOWDOWN) $(MAIN_OBJS) main.o + $(CC) -o $@ main.o $(MAIN_OBJS) $(LIB_LOWDOWN) $(LDFLAGS) $(LDADD_MD5) -lm $(LDADD) + +-lowdown-diff: lowdown +- ln -f lowdown lowdown-diff ++lowdown-diff: lowdown$(EXESUFFIX) ++ ln -f lowdown$(EXESUFFIX) lowdown-diff + + $(LIB_ST): $(OBJS) $(COMPAT_OBJS) + $(AR) rs $@ $(OBJS) $(COMPAT_OBJS) +@@ -240,7 +240,7 @@ install: bins + $(INSTALL_DATA) share/man/* $(DESTDIR)$(SHAREDIR)/lowdown/man + $(INSTALL_DATA) share/ms/* $(DESTDIR)$(SHAREDIR)/lowdown/ms + $(INSTALL_DATA) share/odt/* $(DESTDIR)$(SHAREDIR)/lowdown/odt +- $(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR) ++ $(INSTALL_PROGRAM) lowdown$(EXESUFFIX) $(DESTDIR)$(BINDIR) + $(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR) + for f in $(MAN1S) $(MAN5S) ; do \ + name=`basename $$f .html` ; \ +@@ -273,7 +273,7 @@ uninstall_shared: uninstall_lib_common + rm -f $(LIBDIR)/$(LIB_SOVER) $(LIBDIR)/$(LIB_SO) + + install_shared: $(LIB_SO) install_lib_common +- $(INSTALL_LIB) $(LIB_SOVER) $(DESTDIR)$(LIBDIR) ++ $(INSTALL_LIB) $(LIB_SOVER) $(IMPLIB) $(DESTDIR)$(LIBDIR) + ( cd $(DESTDIR)$(LIBDIR) && ln -sf $(LIB_SOVER) $(LIB_SO) ) + + uninstall_static: uninstall_lib_common +@@ -406,7 +406,7 @@ main.o: lowdown.h + + clean: + rm -f $(OBJS) $(COMPAT_OBJS) main.o +- rm -f lowdown lowdown-diff lowdown.pc ++ rm -f lowdown$(EXESUFFIX) lowdown-diff lowdown.pc + rm -f $(LIB_ST) $(LIB_SO) $(LIB_SOVER) + rm -f index.xml diff.xml diff.diff.xml README.xml lowdown.tar.gz.sha512 lowdown.tar.gz + rm -f $(PDFS) $(HTMLS) $(THUMBS) diff --git a/pkgs/by-name/lo/lowdown/package.nix b/pkgs/by-name/lo/lowdown/package.nix index d4720161aa07b..684ca14b0cd9a 100644 --- a/pkgs/by-name/lo/lowdown/package.nix +++ b/pkgs/by-name/lo/lowdown/package.nix @@ -32,6 +32,9 @@ stdenv.mkDerivation rec { sha512 = "649a508b7727df6e7e1203abb3853e05f167b64832fd5e1271f142ccf782e600b1de73c72dc02673d7b175effdc54f2c0f60318208a968af9f9763d09cf4f9ef"; }; + # https://github.com/kristapsdz/lowdown/pull/171 + patches = [ ./fix-cygwin-build.patch ]; + nativeBuildInputs = [ which dieHook @@ -60,6 +63,7 @@ stdenv.mkDerivation rec { runHook postConfigure ''; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isCygwin "-D_GNU_SOURCE"; # Fix rpath change on darwin to avoid failure like: # error: install_name_tool: changing install names or # rpaths can't be redone for: liblowdown.1.dylib (for architecture @@ -69,6 +73,13 @@ stdenv.mkDerivation rec { makeFlags = [ "bins" # prevents shared object from being built unnecessarily + ] + ++ lib.optionals stdenv.hostPlatform.isCygwin [ + "EXESUFFIX=.exe" + "LINKER_SOSUFFIX=dll" + "LIB_SO=cyglowdown.dll" + "IMPLIB=liblowdown.dll.a" + "LDFLAGS=-Wl,--out-implib,liblowdown.dll.a" ]; installTargets = [ diff --git a/pkgs/by-name/ls/lsr/package.nix b/pkgs/by-name/ls/lsr/package.nix index bbce9432aae40..ba458cf30419b 100644 --- a/pkgs/by-name/ls/lsr/package.nix +++ b/pkgs/by-name/ls/lsr/package.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { homepage = "https://tangled.sh/@rockorager.dev/lsr"; diff --git a/pkgs/by-name/lu/lua-language-server/package.nix b/pkgs/by-name/lu/lua-language-server/package.nix index 49564b56d7671..47343ecd69374 100644 --- a/pkgs/by-name/lu/lua-language-server/package.nix +++ b/pkgs/by-name/lu/lua-language-server/package.nix @@ -126,7 +126,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/lu/luau-lsp/package.nix b/pkgs/by-name/lu/luau-lsp/package.nix index 0cf2ca404349c..9098b44ded57c 100644 --- a/pkgs/by-name/lu/luau-lsp/package.nix +++ b/pkgs/by-name/lu/luau-lsp/package.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix index 1ce2a73bd5b05..740eec3645860 100644 --- a/pkgs/by-name/lu/lux-cli/package.nix +++ b/pkgs/by-name/lu/lux-cli/package.nix @@ -35,7 +35,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; - versionCheckProgramArg = "--version"; doInstallCheck = true; nativeBuildInputs = [ diff --git a/pkgs/by-name/ly/lynx/package.nix b/pkgs/by-name/ly/lynx/package.nix index d4b6bd227292a..2ec3cab0c39dc 100644 --- a/pkgs/by-name/ly/lynx/package.nix +++ b/pkgs/by-name/ly/lynx/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "ftp://ftp.invisible-island.net/lynx/tarballs/lynx${version}.tar.bz2" + "https://invisible-island.net/archives/lynx/tarballs/lynx${version}.tar.bz2" "https://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2" ]; hash = "sha256-c3S4mTbZkWaeEB9Ol/LJWSA24ejNqnuvwlmnerb7B84="; diff --git a/pkgs/by-name/ma/mactop/package.nix b/pkgs/by-name/ma/mactop/package.nix index 6d984640b4d58..55ee34bf4fdcb 100644 --- a/pkgs/by-name/ma/mactop/package.nix +++ b/pkgs/by-name/ma/mactop/package.nix @@ -25,7 +25,6 @@ buildGoModule rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Terminal-based monitoring tool 'top' designed to display real-time metrics for Apple Silicon chips"; diff --git a/pkgs/by-name/ma/magento-cloud/package.nix b/pkgs/by-name/ma/magento-cloud/package.nix index 15ba8a455f988..5f5298c5411b6 100644 --- a/pkgs/by-name/ma/magento-cloud/package.nix +++ b/pkgs/by-name/ma/magento-cloud/package.nix @@ -39,7 +39,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "HOME" ]; passthru = { diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix index 315685e76a363..40d240405eca4 100644 --- a/pkgs/by-name/ma/mago/package.nix +++ b/pkgs/by-name/ma/mago/package.nix @@ -31,7 +31,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/carthage-software/mago/releases/tag/${finalAttrs.version}"; diff --git a/pkgs/by-name/ma/mailutils/package.nix b/pkgs/by-name/ma/mailutils/package.nix index d70c39d7b8b59..f0d30309ee90c 100644 --- a/pkgs/by-name/ma/mailutils/package.nix +++ b/pkgs/by-name/ma/mailutils/package.nix @@ -90,6 +90,13 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/NixOS/nixpkgs/issues/223967 # https://lists.gnu.org/archive/html/bug-mailutils/2023-04/msg00000.html ./don-t-use-descrypt-password-in-the-test-suite.patch + # Fix build with gcc15 + # https://lists.gnu.org/archive/html/bug-mailutils/2025-06/msg00000.html + (fetchpatch { + name = "mailutils-fix-sighandler-incompatible-pointer-types-gcc15.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/mailutils/-/raw/87c3614083260f52dd1222e872a1836f0ff9abe1/fix-build.patch"; + hash = "sha256-RN62l5mYqtViEjXpAlQKWhFez1TPynRMj/1nvZkq5Gs="; + }) ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh b/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh index c860048d10a28..74e72dc859e5a 100644 --- a/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh +++ b/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh @@ -89,7 +89,7 @@ makeDocumentedCWrapper() { # ARGS: same as makeWrapper makeCWrapper() { local argv0 inherit_argv0 n params cmd main flags executable length - local uses_prefix uses_suffix uses_assert uses_assert_success uses_stdio uses_asprintf + local uses_sep_surround_check uses_prefix uses_suffix uses_assert uses_assert_success uses_stdio uses_asprintf local flagsBefore=() flagsAfter=() executable=$(escapeStringLiteral "$1") params=("$@") @@ -122,9 +122,11 @@ makeCWrapper() { --prefix) cmd=$(setEnvPrefix "${params[n + 1]}" "${params[n + 2]}" "${params[n + 3]}") main="$main$cmd"$'\n' + uses_sep_surround_check=1 uses_prefix=1 uses_asprintf=1 uses_stdio=1 + uses_string=1 uses_assert_success=1 uses_assert=1 n=$((n + 3)) @@ -133,9 +135,11 @@ makeCWrapper() { --suffix) cmd=$(setEnvSuffix "${params[n + 1]}" "${params[n + 2]}" "${params[n + 3]}") main="$main$cmd"$'\n' + uses_sep_surround_check=1 uses_suffix=1 uses_asprintf=1 uses_stdio=1 + uses_string=1 uses_assert_success=1 uses_assert=1 n=$((n + 3)) @@ -208,6 +212,7 @@ makeCWrapper() { [ -z "$uses_stdio" ] || printf '%s\n' "#include " [ -z "$uses_string" ] || printf '%s\n' "#include " [ -z "$uses_assert_success" ] || printf '\n%s\n' "#define assert_success(e) do { if ((e) < 0) { perror(#e); abort(); } } while (0)" + [ -z "$uses_sep_surround_check" ] || printf '\n%s\n' "$(setSepSurroundCheck)" [ -z "$uses_prefix" ] || printf '\n%s\n' "$(setEnvPrefixFn)" [ -z "$uses_suffix" ] || printf '\n%s\n' "$(setEnvSuffixFn)" [ -z "$resolve_argv0" ] || printf '\n%s\n' "$(resolveArgv0Fn)" @@ -318,18 +323,59 @@ assertValidEnvName() { esac } +setSepSurroundCheck() { + printf '%s' "\ +int is_surrounded_by_sep(char *env, char *ptr, unsigned long len, char *sep) { + unsigned long sep_len = strlen(sep); + + // Check left side (if not at start) + if (env != ptr) { + if (ptr - env < sep_len) + return 0; + if (strncmp(sep, ptr - sep_len, sep_len) != 0) { + return 0; + } + } + // Check right side (if not at end) + char *end_ptr = ptr + len; + if (*end_ptr != '\0') { + if (strncmp(sep, ptr + len, sep_len) != 0) { + return 0; + } + } + + return 1; +} +" +} + setEnvPrefixFn() { printf '%s' "\ void set_env_prefix(char *env, char *sep, char *prefix) { - char *existing = getenv(env); - if (existing) { - char *val; - assert_success(asprintf(&val, \"%s%s%s\", prefix, sep, existing)); - assert_success(setenv(env, val, 1)); - free(val); + char *existing_env = getenv(env); + if (existing_env) { + char *val; + + char *existing_prefix = strstr(existing_env, prefix); + unsigned long prefix_len = strlen(prefix); + // If the prefix already exists, remove the original + if (existing_prefix && is_surrounded_by_sep(existing_env, existing_prefix, prefix_len, sep)) { + if (existing_env == existing_prefix) { + return; + } + unsigned long sep_len = strlen(sep); + int n_before = existing_prefix - existing_env; + assert_success(asprintf(&val, \"%s%s%.*s%s\", prefix, sep, + n_before, existing_env, + existing_prefix + prefix_len + sep_len)); } else { - assert_success(setenv(env, prefix, 1)); + assert_success(asprintf(&val, \"%s%s%s\", prefix, sep, existing_env)); } + assert_success(setenv(env, val, 1)); + free(val); + } else { + assert_success(setenv(env, prefix, 1)); + } } " } @@ -337,15 +383,32 @@ void set_env_prefix(char *env, char *sep, char *prefix) { setEnvSuffixFn() { printf '%s' "\ void set_env_suffix(char *env, char *sep, char *suffix) { - char *existing = getenv(env); - if (existing) { - char *val; - assert_success(asprintf(&val, \"%s%s%s\", existing, sep, suffix)); - assert_success(setenv(env, val, 1)); - free(val); + char *existing_env = getenv(env); + if (existing_env) { + char *val; + + char *existing_suffix = strstr(existing_env, suffix); + unsigned long suffix_len = strlen(suffix); + // If the suffix already exists, remove the original + if (existing_suffix && is_surrounded_by_sep(existing_env, existing_suffix, suffix_len, sep)) { + char *end_ptr = existing_suffix + suffix_len; + if (*end_ptr == '\0') { + return; + } + unsigned long sep_len = strlen(sep); + int n_before = existing_suffix - existing_env; + assert_success(asprintf(&val, \"%.*s%s%s%s\", + n_before, existing_env, + existing_suffix + suffix_len + sep_len, + sep, suffix)); } else { - assert_success(setenv(env, suffix, 1)); + assert_success(asprintf(&val, \"%s%s%s\", existing_env, sep, suffix)); } + assert_success(setenv(env, val, 1)); + free(val); + } else { + assert_success(setenv(env, suffix, 1)); + } } " } diff --git a/pkgs/by-name/ma/markdown-code-runner/package.nix b/pkgs/by-name/ma/markdown-code-runner/package.nix index 098c0b25a1e5a..9b402a0805382 100644 --- a/pkgs/by-name/ma/markdown-code-runner/package.nix +++ b/pkgs/by-name/ma/markdown-code-runner/package.nix @@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Configurable Markdown code runner that executes and optionally replaces code blocks using external commands"; diff --git a/pkgs/by-name/ma/mask/package.nix b/pkgs/by-name/ma/mask/package.nix index b82b4f42df795..a50c8d0246c36 100644 --- a/pkgs/by-name/ma/mask/package.nix +++ b/pkgs/by-name/ma/mask/package.nix @@ -38,7 +38,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=^mask/(.*)$" ]; }; diff --git a/pkgs/by-name/ma/maskprocessor/package.nix b/pkgs/by-name/ma/maskprocessor/package.nix index a146421a5982a..08265f683b2f0 100644 --- a/pkgs/by-name/ma/maskprocessor/package.nix +++ b/pkgs/by-name/ma/maskprocessor/package.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ma/materialize/package.nix b/pkgs/by-name/ma/materialize/package.nix index 9f924166b63ec..c410ee1d2ee34 100644 --- a/pkgs/by-name/ma/materialize/package.nix +++ b/pkgs/by-name/ma/materialize/package.nix @@ -168,7 +168,6 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/environmentd"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix index 4c3a33b113d03..a4bfa13e31ba7 100644 --- a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix +++ b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix @@ -29,7 +29,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix index 50fe894d0711a..3b5a046611ca9 100644 --- a/pkgs/by-name/ma/matrix-authentication-service/package.nix +++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix @@ -87,7 +87,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { extraArgs = [ diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index 51d0131951974..0ef8df0dc6240 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.6"; + version = "1.10.0"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-hMMX59nq9Wusb0XZb8i5/EmQiPL4WopuZX7maycj0J4="; + hash = "sha256-txbMVkbws/3mvYsxf332WhTymsVdr6JlgQoi85e4pgE="; }; - cargoHash = "sha256-hNFbRtt/sVlEffu7RgXxC1NHzakP8miMyHIV/cf4sfM="; + cargoHash = "sha256-2eLzT9Ozz7p43hbysoE5isLuithqJhvo8TfRZnklzf4="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv diff --git a/pkgs/by-name/ma/mautrix-signal/package.nix b/pkgs/by-name/ma/mautrix-signal/package.nix index 7f087df9bc884..f20cc2881c08a 100644 --- a/pkgs/by-name/ma/mautrix-signal/package.nix +++ b/pkgs/by-name/ma/mautrix-signal/package.nix @@ -67,7 +67,6 @@ buildGoModule rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { homepage = "https://github.com/mautrix/signal"; diff --git a/pkgs/by-name/ma/mautrix-slack/package.nix b/pkgs/by-name/ma/mautrix-slack/package.nix index 141c9617654d8..72b53cf8e2073 100644 --- a/pkgs/by-name/ma/mautrix-slack/package.nix +++ b/pkgs/by-name/ma/mautrix-slack/package.nix @@ -30,7 +30,6 @@ buildGoModule rec { tags = lib.optional withGoolm "goolm"; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; ldflags = [ diff --git a/pkgs/by-name/ma/mawk/package.nix b/pkgs/by-name/ma/mawk/package.nix index 020435e7a420e..7de0684d118c3 100644 --- a/pkgs/by-name/ma/mawk/package.nix +++ b/pkgs/by-name/ma/mawk/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { urls = [ "https://invisible-mirror.net/archives/mawk/mawk-${finalAttrs.version}.tgz" - "ftp://ftp.invisible-island.net/mawk/mawk-${finalAttrs.version}.tgz" + "https://invisible-island.net/archives/mawk/mawk-${finalAttrs.version}.tgz" ]; hash = "sha256-bh/ejuetilwVOCMWhj/WtMbSP6t4HdWrAXf/o+6arlw="; }; diff --git a/pkgs/by-name/mb/mbake/package.nix b/pkgs/by-name/mb/mbake/package.nix index a9e69f8e41463..4f6b295178a06 100644 --- a/pkgs/by-name/mb/mbake/package.nix +++ b/pkgs/by-name/mb/mbake/package.nix @@ -40,7 +40,6 @@ python3Packages.buildPythonApplication rec { python3Packages.pytestCheckHook versionCheckHook ]; - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "mbake" ]; diff --git a/pkgs/by-name/mc/mcp-k8s-go/package.nix b/pkgs/by-name/mc/mcp-k8s-go/package.nix index 131cd879243a3..7b1096d835c5d 100644 --- a/pkgs/by-name/mc/mcp-k8s-go/package.nix +++ b/pkgs/by-name/mc/mcp-k8s-go/package.nix @@ -30,7 +30,6 @@ buildGoModule (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "MCP server connecting to Kubernetes"; diff --git a/pkgs/by-name/md/md-lsp/package.nix b/pkgs/by-name/md/md-lsp/package.nix index 670f57f85754e..37fc33ab9c9b2 100644 --- a/pkgs/by-name/md/md-lsp/package.nix +++ b/pkgs/by-name/md/md-lsp/package.nix @@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-YS7ANZlxlRpl4ww/EJM57MTb+5WAW4mH6cQoziFCv18="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { diff --git a/pkgs/by-name/md/mdbook-plugins/package.nix b/pkgs/by-name/md/mdbook-plugins/package.nix index 4ab03088820b9..206fc84d7d053 100644 --- a/pkgs/by-name/md/mdbook-plugins/package.nix +++ b/pkgs/by-name/md/mdbook-plugins/package.nix @@ -40,7 +40,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/md/mdbtools/package.nix b/pkgs/by-name/md/mdbtools/package.nix index 9a581078b72a3..1fe9a359e2246 100644 --- a/pkgs/by-name/md/mdbtools/package.nix +++ b/pkgs/by-name/md/mdbtools/package.nix @@ -53,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/mdb-ver"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/md/mdq/package.nix b/pkgs/by-name/md/mdq/package.nix index 046b1a37a8bbb..d91c0553c7035 100644 --- a/pkgs/by-name/md/mdq/package.nix +++ b/pkgs/by-name/md/mdq/package.nix @@ -23,7 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Like jq but for Markdown: find specific elements in a md doc"; diff --git a/pkgs/by-name/me/meowlnir/package.nix b/pkgs/by-name/me/meowlnir/package.nix index 5052fd5b5e047..bc00dad687e91 100644 --- a/pkgs/by-name/me/meowlnir/package.nix +++ b/pkgs/by-name/me/meowlnir/package.nix @@ -25,7 +25,6 @@ buildGoModule rec { doCheck = true; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/me/mercurial/package.nix b/pkgs/by-name/me/mercurial/package.nix index c6137a31a783f..fc624c5e238e4 100644 --- a/pkgs/by-name/me/mercurial/package.nix +++ b/pkgs/by-name/me/mercurial/package.nix @@ -63,6 +63,10 @@ let null; cargoRoot = if rustSupport then "rust" else null; + # enable building with Python 3.14 + # FIXME remove once PyO3 is updated in Cargo.lock + env.PYO3_USE_ABI3_FORWARD_COMPATIBILITY = 1; + propagatedBuildInputs = lib.optional re2Support google-re2 ++ lib.optional gitSupport pygit2 diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix index 4c40ea86e9056..8945328f808b4 100644 --- a/pkgs/by-name/me/mergiraf/package.nix +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -28,8 +28,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - cargoBuildFlags = [ # don't install the `mgf_dev` "--bin" diff --git a/pkgs/by-name/me/metal-cli/package.nix b/pkgs/by-name/me/metal-cli/package.nix index b8589c546eb44..81d1daf470b38 100644 --- a/pkgs/by-name/me/metal-cli/package.nix +++ b/pkgs/by-name/me/metal-cli/package.nix @@ -42,7 +42,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/metal"; - versionCheckProgramArg = "--version"; meta = { description = "Official Equinix Metal CLI"; diff --git a/pkgs/by-name/mi/migrate-to-uv/package.nix b/pkgs/by-name/mi/migrate-to-uv/package.nix index eb828604c7909..fb3d2f905ab2a 100644 --- a/pkgs/by-name/mi/migrate-to-uv/package.nix +++ b/pkgs/by-name/mi/migrate-to-uv/package.nix @@ -34,7 +34,6 @@ python3.pkgs.buildPythonApplication rec { ]; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mi/minimap2/package.nix b/pkgs/by-name/mi/minimap2/package.nix index 587229b2c9b9f..8dc0f3b3631b0 100644 --- a/pkgs/by-name/mi/minimap2/package.nix +++ b/pkgs/by-name/mi/minimap2/package.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mi/minio-warp/package.nix b/pkgs/by-name/mi/minio-warp/package.nix index 1ac108ceb8afd..cb50680ab54e2 100644 --- a/pkgs/by-name/mi/minio-warp/package.nix +++ b/pkgs/by-name/mi/minio-warp/package.nix @@ -36,7 +36,6 @@ buildGoModule rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix index bc621976bb1d9..1dd14eee2dd7a 100644 --- a/pkgs/by-name/mi/miniserve/package.nix +++ b/pkgs/by-name/mi/miniserve/package.nix @@ -58,7 +58,6 @@ rustPlatform.buildRustPackage (finalAttrs: { __darwinAllowLocalNetworking = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mi/miro/package.nix b/pkgs/by-name/mi/miro/package.nix index 3543f9f9baec8..69877851fcd29 100644 --- a/pkgs/by-name/mi/miro/package.nix +++ b/pkgs/by-name/mi/miro/package.nix @@ -46,7 +46,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix index 3bfbd81c62d4f..83f5f49463765 100644 --- a/pkgs/by-name/mi/mistral-rs/package.nix +++ b/pkgs/by-name/mi/mistral-rs/package.nix @@ -177,7 +177,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/mistralrs-server"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/mo/mold-unwrapped/package.nix b/pkgs/by-name/mo/mold-unwrapped/package.nix index 6c8d2f36e6457..9b0d0c678a79d 100644 --- a/pkgs/by-name/mo/mold-unwrapped/package.nix +++ b/pkgs/by-name/mo/mold-unwrapped/package.nix @@ -56,7 +56,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix index 042f8ecfc3485..126f9fed58312 100644 --- a/pkgs/by-name/mo/mongodb-ce/package.nix +++ b/pkgs/by-name/mo/mongodb-ce/package.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = stdenv.hostPlatform.isDarwin; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/mongod"; - versionCheckProgramArg = "--version"; passthru = { sources = { diff --git a/pkgs/by-name/mo/motif/package.nix b/pkgs/by-name/mo/motif/package.nix index 2b208fb331c78..e5ffb12c30fb6 100644 --- a/pkgs/by-name/mo/motif/package.nix +++ b/pkgs/by-name/mo/motif/package.nix @@ -122,12 +122,15 @@ stdenv.mkDerivation rec { "ac_cv_func_setpgrp_void=${lib.boolToYesNo (!stdenv.hostPlatform.isBSD)}" ]; - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString ( + [ + "-std=gnu17" + ] + ++ lib.optionals stdenv.cc.isClang [ "-Wno-error=implicit-function-declaration" "-Wno-error=incompatible-function-pointer-types" - ]; - }; + ] + ); enableParallelBuilding = true; diff --git a/pkgs/by-name/mo/mount-zip/package.nix b/pkgs/by-name/mo/mount-zip/package.nix index 037bc80413c00..633a19fd9f1ce 100644 --- a/pkgs/by-name/mo/mount-zip/package.nix +++ b/pkgs/by-name/mo/mount-zip/package.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/mp/mpir/package.nix b/pkgs/by-name/mp/mpir/package.nix index 86fbbd5d8e91d..8a45d1202a239 100644 --- a/pkgs/by-name/mp/mpir/package.nix +++ b/pkgs/by-name/mp/mpir/package.nix @@ -41,6 +41,10 @@ stdenv.mkDerivation rec { url = "https://github.com/wbhart/mpir/commit/4ff3b770cbf86e29b75d12c13e8b854c74bccc5a.patch"; hash = "sha256-dCB2+1IYTGzHUQkDUF4gqvR1xoMPEYVPLGE+EP2wLL4="; }) + (fetchpatch { + url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/a67361db03777a80446ffa8e512f26edb299268f/community/mpir/gcc15.patch"; + hash = "sha256-8RqMHYqDowHytgBd4RsGEOLkk+spYS+iqWQL2kzGAtI="; + }) ]; configureFlags = [ "--enable-cxx" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-fat" ]; diff --git a/pkgs/by-name/mp/mpls/package.nix b/pkgs/by-name/mp/mpls/package.nix index 3cab390e3e83b..ce72297908210 100644 --- a/pkgs/by-name/mp/mpls/package.nix +++ b/pkgs/by-name/mp/mpls/package.nix @@ -26,7 +26,6 @@ buildGoModule rec { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mp/mprocs/package.nix b/pkgs/by-name/mp/mprocs/package.nix index 1cdb821befacc..416f9c76f93cd 100644 --- a/pkgs/by-name/mp/mprocs/package.nix +++ b/pkgs/by-name/mp/mprocs/package.nix @@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ms/msedit/package.nix b/pkgs/by-name/ms/msedit/package.nix index 3c20016fcb0ea..8b9a2ed137451 100644 --- a/pkgs/by-name/ms/msedit/package.nix +++ b/pkgs/by-name/ms/msedit/package.nix @@ -50,7 +50,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = false; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/edit"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mu/mubeng/package.nix b/pkgs/by-name/mu/mubeng/package.nix index 00371de9e1adb..34c1984f756e3 100644 --- a/pkgs/by-name/mu/mubeng/package.nix +++ b/pkgs/by-name/mu/mubeng/package.nix @@ -28,7 +28,6 @@ buildGoModule rec { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "Proxy checker and IP rotator"; diff --git a/pkgs/by-name/mu/muffet/package.nix b/pkgs/by-name/mu/muffet/package.nix index af6e38d4cf175..640a837fcdbd5 100644 --- a/pkgs/by-name/mu/muffet/package.nix +++ b/pkgs/by-name/mu/muffet/package.nix @@ -20,7 +20,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Website link checker which scrapes and inspects all pages in a website recursively"; diff --git a/pkgs/by-name/mu/mullvad-vpn/package.nix b/pkgs/by-name/mu/mullvad-vpn/package.nix index eb911d0f767b8..f1e2fd3474f1d 100644 --- a/pkgs/by-name/mu/mullvad-vpn/package.nix +++ b/pkgs/by-name/mu/mullvad-vpn/package.nix @@ -147,7 +147,6 @@ stdenv.mkDerivation { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/mu/multiqc/package.nix b/pkgs/by-name/mu/multiqc/package.nix index 3e119e11187ac..cc164f0588d6f 100644 --- a/pkgs/by-name/mu/multiqc/package.nix +++ b/pkgs/by-name/mu/multiqc/package.nix @@ -119,8 +119,6 @@ python3Packages.buildPythonApplication rec { addBinToPathHook ]; - versionCheckProgramArg = "--version"; - disabledTests = # On darwin, kaleido fails to starts lib.optionals (stdenv.hostPlatform.isDarwin) [ diff --git a/pkgs/by-name/n9/n98-magerun2/package.nix b/pkgs/by-name/n9/n98-magerun2/package.nix index 82615f1db76d0..ca61ba16713cc 100644 --- a/pkgs/by-name/n9/n98-magerun2/package.nix +++ b/pkgs/by-name/n9/n98-magerun2/package.nix @@ -19,7 +19,6 @@ php83.buildComposerProject2 (finalAttrs: { vendorHash = "sha256-0Bk01aU3vicwk9swkv+8VZxcPdaEMOOtp9niNfPfQyA="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/na/nak/package.nix b/pkgs/by-name/na/nak/package.nix index 8370b2647c4c2..a2c84d130c39b 100644 --- a/pkgs/by-name/na/nak/package.nix +++ b/pkgs/by-name/na/nak/package.nix @@ -30,7 +30,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/na/nasm/package.nix b/pkgs/by-name/na/nasm/package.nix index 7092f5b57a61c..dcda488d7e176 100644 --- a/pkgs/by-name/na/nasm/package.nix +++ b/pkgs/by-name/na/nasm/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "nasm"; - version = "2.16.03"; + version = "3.01"; src = fetchurl { url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-FBKhx2C70F2wJrbA0WV6/9ZjHNCmPN229zzG1KphYUg="; + hash = "sha256-tzJMvobnZ7ZfJvRn7YsSrYDhJOPMuJB2hVyY5Dqe3dQ="; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/by-name/na/natscli/package.nix b/pkgs/by-name/na/natscli/package.nix index 14f3fee1db43c..39b6d185c02d1 100644 --- a/pkgs/by-name/na/natscli/package.nix +++ b/pkgs/by-name/na/natscli/package.nix @@ -36,7 +36,6 @@ buildGoModule rec { ''; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "NATS Command Line Interface"; diff --git a/pkgs/by-name/nb/nbqa/package.nix b/pkgs/by-name/nb/nbqa/package.nix index 2e711ecf7c9bc..7a1b855b0b72e 100644 --- a/pkgs/by-name/nb/nbqa/package.nix +++ b/pkgs/by-name/nb/nbqa/package.nix @@ -75,7 +75,6 @@ let addBinToPathHook versionCheckHook ]; - versionCheckProgramArg = "--version"; disabledTests = [ # Test data not found diff --git a/pkgs/by-name/nb/nbtscanner/package.nix b/pkgs/by-name/nb/nbtscanner/package.nix index 179e92ff781dc..c8315d24b689e 100644 --- a/pkgs/by-name/nb/nbtscanner/package.nix +++ b/pkgs/by-name/nb/nbtscanner/package.nix @@ -32,8 +32,6 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; - versionCheckProgramArg = "--version"; - meta = { description = "NetBIOS scanner written in Rust"; homepage = "https://github.com/jonkgrimes/nbtscanner"; diff --git a/pkgs/by-name/nc/ncdu/package.nix b/pkgs/by-name/nc/ncdu/package.nix index 8e90033224123..f1cc506086fbd 100644 --- a/pkgs/by-name/nc/ncdu/package.nix +++ b/pkgs/by-name/nc/ncdu/package.nix @@ -38,7 +38,6 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/nc/ncompress/package.nix b/pkgs/by-name/nc/ncompress/package.nix index b71b8e4b15792..332ce4ece99e2 100644 --- a/pkgs/by-name/nc/ncompress/package.nix +++ b/pkgs/by-name/nc/ncompress/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, }: stdenv.mkDerivation rec { @@ -15,6 +16,26 @@ stdenv.mkDerivation rec { sha256 = "sha256-Yhs3C5/kR7Ve56E84usYJprxIMAIwXVahLi1N9TIfj0="; }; + patches = [ + # dependencies for gcc15 patch + (fetchpatch { + url = "https://github.com/vapier/ncompress/commit/af7d29d87ddf8b2002dad41152efa94e9c825b35.patch"; + excludes = [ "Changes" ]; + hash = "sha256-zc+59RHVt5/aw5a4OVnOmXyFdeoshqbARG2upDujEk4="; + }) + (fetchpatch { + url = "https://github.com/vapier/ncompress/commit/aa359df10ec29a56c12f6e5c2bcec8d8ecfa2740.patch"; + excludes = [ "Changes" ]; + hash = "sha256-wtZJBSfJ6QmYK+ywijQ263PnjGwD2mXcvFWvBNeODpc="; + }) + # fix build against gcc15 + # https://github.com/vapier/ncompress/pull/40 + (fetchpatch { + url = "https://github.com/vapier/ncompress/pull/40/commits/90810a7f11bf157b479c23c0fe6cee0bebec15c6.patch"; + hash = "sha256-aqIofwTxlg2lq2+ZBhG6X6MKUoafHrADZlw7Avj8anQ="; + }) + ]; + makeFlags = [ "PREFIX=$(out)" ]; installTargets = "install_core"; @@ -23,7 +44,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://ncompress.sourceforge.net/"; + homepage = "https://vapier.github.io/ncompress/"; license = lib.licenses.publicDomain; description = "Fast, simple LZW file compressor"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ne/neon/package.nix b/pkgs/by-name/ne/neon/package.nix index 9015a737ada80..ff8d50a0ddd32 100644 --- a/pkgs/by-name/ne/neon/package.nix +++ b/pkgs/by-name/ne/neon/package.nix @@ -22,12 +22,12 @@ let in stdenv.mkDerivation rec { - version = "0.35.0"; + version = "0.36.0"; pname = "neon"; src = fetchurl { url = "https://notroj.github.io/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-FGevtz814/XQ6f1wYowUy6Jmpl4qH7bj+UXuM4XIWVs="; + sha256 = "sha256-cMx/Ku694mOQbhhbJm4E4N6Ss45fTszL9h6LeRd8Lwc="; }; patches = optionals stdenv.hostPlatform.isDarwin [ ./darwin-fix-configure.patch ]; diff --git a/pkgs/by-name/ne/neovim-node-client/package.nix b/pkgs/by-name/ne/neovim-node-client/package.nix index 87e645bedd537..06efddae9cfa7 100644 --- a/pkgs/by-name/ne/neovim-node-client/package.nix +++ b/pkgs/by-name/ne/neovim-node-client/package.nix @@ -38,7 +38,6 @@ buildNpmPackage rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/neovim-node-host"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index 0059228a3da7a..43546f509ff6f 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -236,7 +236,6 @@ stdenv.mkDerivation ( versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/nvim"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ne/netboot/package.nix b/pkgs/by-name/ne/netboot/package.nix index 48c427cb41342..fea31de59dccd 100644 --- a/pkgs/by-name/ne/netboot/package.nix +++ b/pkgs/by-name/ne/netboot/package.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/nbdbtool"; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/ne/netcap/package.nix b/pkgs/by-name/ne/netcap/package.nix index da71033b90e11..f08dfe02bcfa1 100644 --- a/pkgs/by-name/ne/netcap/package.nix +++ b/pkgs/by-name/ne/netcap/package.nix @@ -74,7 +74,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/net"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ne/netperf/package.nix b/pkgs/by-name/ne/netperf/package.nix index 53081ccff956c..ebcce6d490808 100644 --- a/pkgs/by-name/ne/netperf/package.nix +++ b/pkgs/by-name/ne/netperf/package.nix @@ -26,6 +26,14 @@ stdenv.mkDerivation { url = "https://github.com/HewlettPackard/netperf/commit/c6a2e17fe35f0e68823451fedfdf5b1dbecddbe3.patch"; sha256 = "P/lRa6EakSalKWDTgZ7bWeGleaTLLa5UhzulxKd1xE4="; }) + # Fix build with gcc15 + # https://github.com/HewlettPackard/netperf/pull/86 + # https://salsa.debian.org/debian/netperf/-/commit/a278c7a8eb24cb45dc500393c6e8749a3427f650 + (fetchpatch { + name = "netperf-fix-build-with-gcc15.patch"; + url = "https://salsa.debian.org/debian/netperf/-/raw/a278c7a8eb24cb45dc500393c6e8749a3427f650/debian/patches/0004-Fix-build-with-gcc-15.patch"; + hash = "sha256-fv/cx1rkUQRqyluWQKO5q5sNWPYcyZUz2NNYwalDizQ="; + }) ]; buildInputs = lib.optional (with stdenv.hostPlatform; isx86 && isLinux) libsmbios; diff --git a/pkgs/by-name/ng/nghttp2/package.nix b/pkgs/by-name/ng/nghttp2/package.nix index a3a62ffa0e5c4..161a32206c799 100644 --- a/pkgs/by-name/ng/nghttp2/package.nix +++ b/pkgs/by-name/ng/nghttp2/package.nix @@ -6,7 +6,7 @@ pkg-config, # Optional dependencies - enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic, + enableApp ? with stdenv.hostPlatform; !(isWindows || isCygwin) && !isStatic, c-aresMinimal, libev, openssl, diff --git a/pkgs/by-name/ng/nghttp3/package.nix b/pkgs/by-name/ng/nghttp3/package.nix index cff35f454d3a4..410708dbb7f01 100644 --- a/pkgs/by-name/ng/nghttp3/package.nix +++ b/pkgs/by-name/ng/nghttp3/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "nghttp3"; - version = "1.12.0"; + version = "1.13.1"; src = fetchurl { url = "https://github.com/ngtcp2/nghttp3/releases/download/v${finalAttrs.version}/nghttp3-${finalAttrs.version}.tar.bz2"; - hash = "sha256-KFl4NTevIT1npc5Cd923nIlBrUXtv6XM3VLZz0/6Qi0="; + hash = "sha256-8lH+Vm4oIdz9BChVN15QsevqxfHKeUjQDiFWPFgiHiA="; }; outputs = [ diff --git a/pkgs/by-name/ng/nginx-language-server/package.nix b/pkgs/by-name/ng/nginx-language-server/package.nix index cb7aee0da561b..84f38ac203db9 100644 --- a/pkgs/by-name/ng/nginx-language-server/package.nix +++ b/pkgs/by-name/ng/nginx-language-server/package.nix @@ -39,7 +39,6 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ni/ni/package.nix b/pkgs/by-name/ni/ni/package.nix index c02bbef5f50fe..fb788bf21a68e 100644 --- a/pkgs/by-name/ni/ni/package.nix +++ b/pkgs/by-name/ni/ni/package.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix index cb5b5a0f70e95..6d50a02eb1e2b 100644 --- a/pkgs/by-name/ni/nickel/package.nix +++ b/pkgs/by-name/ni/nickel/package.nix @@ -76,7 +76,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ni/ninja/package.nix b/pkgs/by-name/ni/ninja/package.nix index 0f1b424db2a07..6f15be615ace1 100644 --- a/pkgs/by-name/ni/ninja/package.nix +++ b/pkgs/by-name/ni/ninja/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { version = { "1.11" = "1.11.1"; - latest = "1.13.1"; + latest = "1.13.2"; } .${ninjaRelease}; @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { { # TODO: Remove Ninja 1.11 as soon as possible. "1.11" = "sha256-LvV/Fi2ARXBkfyA1paCRmLUwCh/rTyz+tGMg2/qEepI="; - latest = "sha256-GhAF5wUT19E02ZekW+ywsCMVGYrt56hES+MHCH4lNG4="; + latest = "sha256-D9HsIjv8EJ1qAdXFAKy260K77cCvopgQ2Fx6uXpt6VI="; } .${ninjaRelease} or (throw "Unsupported Ninja release: ${ninjaRelease}"); }; diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix index 88298d8da92e0..e5358ff184629 100644 --- a/pkgs/by-name/ni/niri/package.nix +++ b/pkgs/by-name/ni/niri/package.nix @@ -124,7 +124,6 @@ rustPlatform.buildRustPackage (finalAttrs: { checkFlags = [ "--skip=::egl" ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ni/nix-init/package.nix b/pkgs/by-name/ni/nix-init/package.nix index 5504e02a8ddc1..e6a84d96ea5e3 100644 --- a/pkgs/by-name/ni/nix-init/package.nix +++ b/pkgs/by-name/ni/nix-init/package.nix @@ -85,7 +85,6 @@ rustPlatform.buildRustPackage (finalAttrs: { }; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ni/nix-prefetch/package.nix b/pkgs/by-name/ni/nix-prefetch/package.nix index a1ee9754a6610..fc3096692aa1b 100644 --- a/pkgs/by-name/ni/nix-prefetch/package.nix +++ b/pkgs/by-name/ni/nix-prefetch/package.nix @@ -112,7 +112,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ni/nixpkgs-review/package.nix b/pkgs/by-name/ni/nixpkgs-review/package.nix index 305c6d03bca6b..74e03c8124a05 100644 --- a/pkgs/by-name/ni/nixpkgs-review/package.nix +++ b/pkgs/by-name/ni/nixpkgs-review/package.nix @@ -50,7 +50,6 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; makeWrapperArgs = let diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix index 032529630b867..8766afcc859a7 100644 --- a/pkgs/by-name/no/nom/package.nix +++ b/pkgs/by-name/no/nom/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, nix-update-script, @@ -21,6 +22,9 @@ buildGoModule rec { "-X 'main.version=${version}'" ]; + # only run xdg-specific test on linux + checkFlags = lib.optional stdenv.hostPlatform.isDarwin "-skip=^TestNewDefaultWithXDGConfigHome$"; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/no/noseyparker/package.nix b/pkgs/by-name/no/noseyparker/package.nix index 0c792869e96ff..02e7b34175de8 100644 --- a/pkgs/by-name/no/noseyparker/package.nix +++ b/pkgs/by-name/no/noseyparker/package.nix @@ -81,7 +81,6 @@ rustPlatform.buildRustPackage rec { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/noseyparker-cli"; - versionCheckProgramArg = "--version"; meta = { description = "Find secrets and sensitive information in textual data"; diff --git a/pkgs/by-name/nr/nrfutil/package.nix b/pkgs/by-name/nr/nrfutil/package.nix index a8866b96c9ccc..7c1af81f15ebb 100644 --- a/pkgs/by-name/nr/nrfutil/package.nix +++ b/pkgs/by-name/nr/nrfutil/package.nix @@ -81,7 +81,6 @@ let nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = sharedMeta // { mainProgram = name; diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix index 74568d49b6ad8..21fb513d6b353 100644 --- a/pkgs/by-name/nu/numbat/package.nix +++ b/pkgs/by-name/nu/numbat/package.nix @@ -49,7 +49,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/nv/nvi/debian-patches.nix b/pkgs/by-name/nv/nvi/debian-patches.nix index be60d0939eb21..87559570cee45 100644 --- a/pkgs/by-name/nv/nvi/debian-patches.nix +++ b/pkgs/by-name/nv/nvi/debian-patches.nix @@ -1,6 +1,6 @@ # Generated by debian-patches.sh from debian-patches.txt let - prefix = "https://sources.debian.org/data/main/n/nvi/1.81.6-23/debian/patches"; + prefix = "https://sources.debian.org/data/main/n/nvi/1.81.6-24/debian/patches"; in [ { @@ -167,4 +167,8 @@ in url = "${prefix}/0041-Fix-FTBFS-because-of-incompatible-pointer-type-error.patch"; sha256 = "1qvzrxfbk3ylr6cc3y94rlgfbdj2z14dhh6m09drkxb4bqcp2awv"; } + { + url = "${prefix}/0042-Fix-ftbfs-with-GCC-15.patch"; + sha256 = "13v5ydsnmbfqww2j8v13r83iz9zkk2z5wd9qccz7sb5wzm32zs59"; + } ] diff --git a/pkgs/by-name/nv/nvi/debian-patches.txt b/pkgs/by-name/nv/nvi/debian-patches.txt index 32e7b4a8448bd..21089f6984fe3 100644 --- a/pkgs/by-name/nv/nvi/debian-patches.txt +++ b/pkgs/by-name/nv/nvi/debian-patches.txt @@ -1,4 +1,4 @@ -nvi/1.81.6-23 +nvi/1.81.6-24 01additional_upstream_data.patch 03db4.patch 04confdefs.patch @@ -40,3 +40,4 @@ upstream/0038-Fix-A-word-search-for-keywords-starting-with-a-non-w.patch 0039-Add-function-prototypes-to-fix-implicit-function-dec.patch 0040-Add-more-function-prototypes-to-fix-Wimplicit-functi.patch 0041-Fix-FTBFS-because-of-incompatible-pointer-type-error.patch +0042-Fix-ftbfs-with-GCC-15.patch diff --git a/pkgs/by-name/nv/nvidia_oc/package.nix b/pkgs/by-name/nv/nvidia_oc/package.nix index 92af62a522a96..8335c908661b6 100644 --- a/pkgs/by-name/nv/nvidia_oc/package.nix +++ b/pkgs/by-name/nv/nvidia_oc/package.nix @@ -29,8 +29,6 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; - meta = { description = "Simple command line tool to overclock Nvidia GPUs using the NVML library on Linux"; homepage = "https://github.com/Dreaming-Codes/nvidia_oc"; diff --git a/pkgs/by-name/nv/nvitop/package.nix b/pkgs/by-name/nv/nvitop/package.nix index b26d69abe7280..b955732b809e5 100644 --- a/pkgs/by-name/nv/nvitop/package.nix +++ b/pkgs/by-name/nv/nvitop/package.nix @@ -30,7 +30,6 @@ python3Packages.buildPythonApplication rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "nvitop" ]; diff --git a/pkgs/by-name/nv/nvme-rs/package.nix b/pkgs/by-name/nv/nvme-rs/package.nix index dfda2ee059497..9e1859688010e 100644 --- a/pkgs/by-name/nv/nvme-rs/package.nix +++ b/pkgs/by-name/nv/nvme-rs/package.nix @@ -33,7 +33,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/nv/nvrh/package.nix b/pkgs/by-name/nv/nvrh/package.nix index cc731edd50d34..19897468082b1 100644 --- a/pkgs/by-name/nv/nvrh/package.nix +++ b/pkgs/by-name/nv/nvrh/package.nix @@ -35,7 +35,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/oa/oauth2-proxy/package.nix b/pkgs/by-name/oa/oauth2-proxy/package.nix index 1f4c7bd1d8062..191de4d0a3401 100644 --- a/pkgs/by-name/oa/oauth2-proxy/package.nix +++ b/pkgs/by-name/oa/oauth2-proxy/package.nix @@ -22,7 +22,6 @@ buildGoModule rec { ldflags = [ "-X github.com/oauth2-proxy/oauth2-proxy/v7/pkg/version.VERSION=v${version}" ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/ob/obj2tiles/package.nix b/pkgs/by-name/ob/obj2tiles/package.nix index ceb3635377241..7ee5817026c25 100644 --- a/pkgs/by-name/ob/obj2tiles/package.nix +++ b/pkgs/by-name/ob/obj2tiles/package.nix @@ -19,7 +19,6 @@ buildDotnetModule (finalAttrs: { nugetDeps = ./deps.json; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/Obj2Tiles"; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { description = "Converts OBJ files to OGC 3D tiles by performing splitting, decimation and conversion"; diff --git a/pkgs/by-name/ob/obs-do/package.nix b/pkgs/by-name/ob/obs-do/package.nix index 5201ab07a5a74..4b2f8c83d024a 100644 --- a/pkgs/by-name/ob/obs-do/package.nix +++ b/pkgs/by-name/ob/obs-do/package.nix @@ -19,7 +19,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-V5j+zi7ogwxs2kCMRjDD7pF8yBWE6p7J2UAOXeJGbFw="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/oc/ocsinventory-agent/package.nix b/pkgs/by-name/oc/ocsinventory-agent/package.nix index 1a3ef373e127d..f9c5bc2f1144c 100644 --- a/pkgs/by-name/oc/ocsinventory-agent/package.nix +++ b/pkgs/by-name/oc/ocsinventory-agent/package.nix @@ -5,7 +5,6 @@ fetchFromGitHub, fetchpatch, makeWrapper, - shortenPerlShebang, coreutils, dmidecode, findutils, @@ -43,7 +42,7 @@ perlPackages.buildPerlPackage rec { }) ]; - nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + nativeBuildInputs = [ makeWrapper ]; buildInputs = with perlPackages; @@ -94,10 +93,7 @@ perlPackages.buildPerlPackage rec { util-linux # last, lsblk, mount ]; in - lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/ocsinventory-agent '' - + '' wrapProgram $out/bin/ocsinventory-agent --prefix PATH : ${lib.makeBinPath runtimeDependencies} ''; diff --git a/pkgs/by-name/oc/ocsp-server/package.nix b/pkgs/by-name/oc/ocsp-server/package.nix index 4679f16def118..02b7bda379ee6 100644 --- a/pkgs/by-name/oc/ocsp-server/package.nix +++ b/pkgs/by-name/oc/ocsp-server/package.nix @@ -50,7 +50,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ok/oklch-color-picker/package.nix b/pkgs/by-name/ok/oklch-color-picker/package.nix index 10d643676f056..201ea4ed7d66f 100644 --- a/pkgs/by-name/ok/oklch-color-picker/package.nix +++ b/pkgs/by-name/ok/oklch-color-picker/package.nix @@ -33,7 +33,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 4520411b42c42..2eab4fa975572 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -269,7 +269,6 @@ goBuild (finalAttrs: { writableTmpDirAsHomeHook ]; versionCheckKeepEnvironment = "HOME"; - versionCheckProgramArg = "--version"; passthru = { tests = { diff --git a/pkgs/by-name/om/omnix/package.nix b/pkgs/by-name/om/omnix/package.nix index 31f363258f1f9..8c9b417100c75 100644 --- a/pkgs/by-name/om/omnix/package.nix +++ b/pkgs/by-name/om/omnix/package.nix @@ -114,7 +114,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/om"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/on/onetbb/package.nix b/pkgs/by-name/on/onetbb/package.nix index 927489863a7dd..34b43ec46047d 100644 --- a/pkgs/by-name/on/onetbb/package.nix +++ b/pkgs/by-name/on/onetbb/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { hwloc ]; - doCheck = true; + doCheck = !stdenv.hostPlatform.isStatic; dontUseNinjaCheck = true; @@ -71,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH" false) + (lib.cmakeBool "TBB_TEST" finalAttrs.finalPackage.doCheck) ]; env = { @@ -99,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { template-based runtime library can help you harness the latent performance of multi-core processors. ''; - platforms = lib.platforms.all; + platforms = lib.subtractLists lib.platforms.cygwin lib.platforms.all; # oneTBB does not support static builds # "You are building oneTBB as a static library. This is highly discouraged and such configuration is not supported. Consider building a dynamic library to avoid unforeseen issues." # https://github.com/uxlfoundation/oneTBB/blob/db7891a246cafbb90719c3dee497d96889ca692b/CMakeLists.txt#L160 diff --git a/pkgs/by-name/op/openapi-down-convert/package.nix b/pkgs/by-name/op/openapi-down-convert/package.nix index 03ef6be0ed829..559fdc47d5dad 100644 --- a/pkgs/by-name/op/openapi-down-convert/package.nix +++ b/pkgs/by-name/op/openapi-down-convert/package.nix @@ -29,7 +29,6 @@ buildNpmPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/op/openbao/package.nix b/pkgs/by-name/op/openbao/package.nix index a1c867874c1e1..aca2c85840639 100644 --- a/pkgs/by-name/op/openbao/package.nix +++ b/pkgs/by-name/op/openbao/package.nix @@ -57,7 +57,6 @@ buildGoModule (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/bao"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/op/opencc/package.nix b/pkgs/by-name/op/opencc/package.nix index a3b116d34b8de..820da80aa8dd9 100644 --- a/pkgs/by-name/op/opencc/package.nix +++ b/pkgs/by-name/op/opencc/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, python3, opencc, @@ -20,6 +21,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-JBTegQs9ALp4LdKKYMNp9GYEgqR9O8IkX6LqatvaTic="; }; + patches = [ + # fix build with gcc15 by adding cstdint include + (fetchpatch { + url = "https://github.com/BYVoid/OpenCC/commit/3d3adca2dbee0da7d33eb3c3563299fcbd2255e3.patch"; + hash = "sha256-4ZQxVnEHnNBKtEu0IPnSC/ZX7gm2cJ1Ss00PvCZr5P8="; + }) + (fetchpatch { + url = "https://github.com/BYVoid/OpenCC/commit/72cae18cfe4272f2b11c9ec1c44d6af7907abcab.patch"; + hash = "sha256-Cd95AsW/tLk2l8skxqfEfQUm0t23G4ocoirauwMbuwk="; + }) + ]; + nativeBuildInputs = [ cmake python3 diff --git a/pkgs/by-name/op/openfortivpn/package.nix b/pkgs/by-name/op/openfortivpn/package.nix index fc57a566c3fde..3bb3e6081f90e 100644 --- a/pkgs/by-name/op/openfortivpn/package.nix +++ b/pkgs/by-name/op/openfortivpn/package.nix @@ -54,7 +54,6 @@ stdenv.mkDerivation rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/op/openscad-lsp/package.nix b/pkgs/by-name/op/openscad-lsp/package.nix index 1edf8370b443a..ccfc5f1807263 100644 --- a/pkgs/by-name/op/openscad-lsp/package.nix +++ b/pkgs/by-name/op/openscad-lsp/package.nix @@ -24,8 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/op/openscap/package.nix b/pkgs/by-name/op/openscap/package.nix index c7e090b03d47a..09eecdbd36064 100644 --- a/pkgs/by-name/op/openscap/package.nix +++ b/pkgs/by-name/op/openscap/package.nix @@ -36,7 +36,7 @@ perl, doxygen, pkg-config, - perl538Packages, + perlPackages, }: stdenv.mkDerivation rec { @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ]; buildInputs = - with perl538Packages; + with perlPackages; [ XMLXPath LinuxACL diff --git a/pkgs/by-name/op/opkssh/package.nix b/pkgs/by-name/op/opkssh/package.nix index a433db6cf8224..91194e4ef6603 100644 --- a/pkgs/by-name/op/opkssh/package.nix +++ b/pkgs/by-name/op/opkssh/package.nix @@ -24,7 +24,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/op/opnborg/package.nix b/pkgs/by-name/op/opnborg/package.nix index 2002a48e8d5a3..821742994cfe2 100644 --- a/pkgs/by-name/op/opnborg/package.nix +++ b/pkgs/by-name/op/opnborg/package.nix @@ -30,7 +30,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/opnborg"; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/paepckehh/opnborg/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/by-name/or/orthanc/package.nix b/pkgs/by-name/or/orthanc/package.nix index 10be6a1e2d21a..ca8e98654831c 100644 --- a/pkgs/by-name/or/orthanc/package.nix +++ b/pkgs/by-name/or/orthanc/package.nix @@ -112,7 +112,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ot/otel-desktop-viewer/package.nix b/pkgs/by-name/ot/otel-desktop-viewer/package.nix index 931e7b19bbbd5..f9c24dd77bc59 100644 --- a/pkgs/by-name/ot/otel-desktop-viewer/package.nix +++ b/pkgs/by-name/ot/otel-desktop-viewer/package.nix @@ -40,7 +40,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix index fae2f54fe6c23..614963d2c87cf 100644 --- a/pkgs/by-name/ot/oterm/package.nix +++ b/pkgs/by-name/ot/oterm/package.nix @@ -61,7 +61,6 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ov/overpush/package.nix b/pkgs/by-name/ov/overpush/package.nix index d7f6cc8a45798..114de02995386 100644 --- a/pkgs/by-name/ov/overpush/package.nix +++ b/pkgs/by-name/ov/overpush/package.nix @@ -34,7 +34,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ox/ox/package.nix b/pkgs/by-name/ox/ox/package.nix index d9252d2d35a06..b1603cac0eb26 100644 --- a/pkgs/by-name/ox/ox/package.nix +++ b/pkgs/by-name/ox/ox/package.nix @@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix index 22215b1749b24..3134678c63c09 100644 --- a/pkgs/by-name/ox/oxlint/package.nix +++ b/pkgs/by-name/ox/oxlint/package.nix @@ -35,7 +35,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoTestFlags = finalAttrs.cargoBuildFlags; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pa/pack/package.nix b/pkgs/by-name/pa/pack/package.nix index 570ba547d382f..79c1fa0877c5a 100644 --- a/pkgs/by-name/pa/pack/package.nix +++ b/pkgs/by-name/pa/pack/package.nix @@ -37,7 +37,6 @@ buildGoModule (finalAttrs: { versionCheckHook writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "HOME" ]; meta = { diff --git a/pkgs/by-name/pa/packetry/package.nix b/pkgs/by-name/pa/packetry/package.nix index a012d6ed43df1..ee6085b37d11f 100644 --- a/pkgs/by-name/pa/packetry/package.nix +++ b/pkgs/by-name/pa/packetry/package.nix @@ -38,7 +38,6 @@ rustPlatform.buildRustPackage rec { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; # packetry-cli is only necessary on windows https://github.com/greatscottgadgets/packetry/pull/154 diff --git a/pkgs/by-name/pa/pahole/package.nix b/pkgs/by-name/pa/pahole/package.nix index f430d699ace37..863ee69a708c9 100644 --- a/pkgs/by-name/pa/pahole/package.nix +++ b/pkgs/by-name/pa/pahole/package.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { pname = "pahole"; - version = "1.30"; + version = "1.31"; src = fetchzip { url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-${version}.tar.gz"; - hash = "sha256-JF4KnI05uOlPuunJuetX/fX3ZRT6TDXdjCNG9/ufkgI="; + hash = "sha256-Afy0SysuDbTOa8H3m4hexy12Rmuv2NZL2wHfO4JtKL0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pa/pakku/package.nix b/pkgs/by-name/pa/pakku/package.nix index aca01a279a315..09974b1d8b116 100644 --- a/pkgs/by-name/pa/pakku/package.nix +++ b/pkgs/by-name/pa/pakku/package.nix @@ -61,7 +61,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/pa/paps/package.nix b/pkgs/by-name/pa/paps/package.nix index a65c15564fd2a..140bee6b6f443 100644 --- a/pkgs/by-name/pa/paps/package.nix +++ b/pkgs/by-name/pa/paps/package.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/pa/paq/package.nix b/pkgs/by-name/pa/paq/package.nix index 72e17b2dd54f2..ef9125d814f5d 100644 --- a/pkgs/by-name/pa/paq/package.nix +++ b/pkgs/by-name/pa/paq/package.nix @@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-M3UtXCX4caYYaXoS8F2kKheP5qX5xac2WPNCnw94B6Q="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pa/paratest/package.nix b/pkgs/by-name/pa/paratest/package.nix index 343b4c79c4709..15c73ff7ebe3c 100644 --- a/pkgs/by-name/pa/paratest/package.nix +++ b/pkgs/by-name/pa/paratest/package.nix @@ -23,7 +23,6 @@ nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/pa/parseable/package.nix b/pkgs/by-name/pa/parseable/package.nix index cc62c50660684..3ab66f0be613d 100644 --- a/pkgs/by-name/pa/parseable/package.nix +++ b/pkgs/by-name/pa/parseable/package.nix @@ -34,7 +34,6 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "rdkafka/dynamic-linking" ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pa/patchy/package.nix b/pkgs/by-name/pa/patchy/package.nix index af0b7f3d1a689..cdeb2f959bf03 100644 --- a/pkgs/by-name/pa/patchy/package.nix +++ b/pkgs/by-name/pa/patchy/package.nix @@ -22,7 +22,6 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-QaFIu7YVixQsDGL5fjQ3scKMyr0hw8lEWVc80EMTBB8="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pa/patroni/package.nix b/pkgs/by-name/pa/patroni/package.nix index 771ffae430c5b..bfc0ef13296d1 100644 --- a/pkgs/by-name/pa/patroni/package.nix +++ b/pkgs/by-name/pa/patroni/package.nix @@ -50,7 +50,6 @@ python3Packages.buildPythonApplication rec { versionCheckHook writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/pd/pdepend/package.nix b/pkgs/by-name/pd/pdepend/package.nix index 9fc769253e4e7..54ee72547dc01 100644 --- a/pkgs/by-name/pd/pdepend/package.nix +++ b/pkgs/by-name/pd/pdepend/package.nix @@ -21,7 +21,6 @@ php.buildComposerProject2 (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/pdepend/pdepend/releases/tag/${finalAttrs.version}"; diff --git a/pkgs/by-name/pd/pdftowrite/package.nix b/pkgs/by-name/pd/pdftowrite/package.nix index 700efbdde5ba0..6d4bd9bebeef7 100644 --- a/pkgs/by-name/pd/pdftowrite/package.nix +++ b/pkgs/by-name/pd/pdftowrite/package.nix @@ -78,7 +78,6 @@ python3Packages.buildPythonApplication rec { ''; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/pf/pfetch/package.nix b/pkgs/by-name/pf/pfetch/package.nix index 700c6778e6a36..6e4b44fe5302e 100644 --- a/pkgs/by-name/pf/pfetch/package.nix +++ b/pkgs/by-name/pf/pfetch/package.nix @@ -26,7 +26,6 @@ stdenvNoCC.mkDerivation rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/pg/pgformatter/package.nix b/pkgs/by-name/pg/pgformatter/package.nix index 05a491f51baa7..0721b37acb20d 100644 --- a/pkgs/by-name/pg/pgformatter/package.nix +++ b/pkgs/by-name/pg/pgformatter/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, perlPackages, fetchFromGitHub, - shortenPerlShebang, }: perlPackages.buildPerlPackage rec { @@ -33,11 +31,6 @@ perlPackages.buildPerlPackage rec { --replace "'INSTALLDIRS' => \$INSTALLDIRS," "'INSTALLDIRS' => \$INSTALLDIRS, 'INSTALLVENDORLIB' => 'bin/lib', 'INSTALLVENDORBIN' => 'bin', 'INSTALLVENDORSCRIPT' => 'bin', 'INSTALLVENDORMAN1DIR' => 'share/man/man1', 'INSTALLVENDORMAN3DIR' => 'share/man/man3'," ''; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/pg_format - ''; - doCheck = false; meta = { diff --git a/pkgs/by-name/pg/pgpdump/package.nix b/pkgs/by-name/pg/pgpdump/package.nix index 1c0d4de416154..0bc0b051f6832 100644 --- a/pkgs/by-name/pg/pgpdump/package.nix +++ b/pkgs/by-name/pg/pgpdump/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, supportCompressedPackets ? true, zlib, bzip2, @@ -18,6 +19,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-JKedgHCTDnvLyLR3nGl4XFAaxXDU1TgHrxPMlRFwtBo="; }; + patches = [ + # Fix for GCC 15. Remove on next package update. + # https://github.com/kazu-yamamoto/pgpdump/pull/45 + (fetchpatch2 { + name = "fix-c23-compatibility.patch"; + url = "https://github.com/kazu-yamamoto/pgpdump/commit/541442dc04259bde680b46742522177be40cc065.patch?full_index=1"; + hash = "sha256-ye+B8hy0etGcwCG9pD0jCnrg+U5VpFkERad61CexW9Y="; + }) + ]; + buildInputs = lib.optionals supportCompressedPackets [ zlib bzip2 diff --git a/pkgs/by-name/pg/pgtop/package.nix b/pkgs/by-name/pg/pgtop/package.nix index f34ae6c2e4f4b..fdb3153caf5f1 100644 --- a/pkgs/by-name/pg/pgtop/package.nix +++ b/pkgs/by-name/pg/pgtop/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, perlPackages, fetchFromGitHub, - shortenPerlShebang, }: perlPackages.buildPerlPackage rec { @@ -27,11 +25,6 @@ perlPackages.buildPerlPackage rec { LWP ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/pgtop - ''; - meta = { description = "PostgreSQL clone of `mytop', which in turn is a `top' clone for MySQL"; mainProgram = "pgtop"; diff --git a/pkgs/by-name/ph/phase-cli/package.nix b/pkgs/by-name/ph/phase-cli/package.nix index c748ee0a09520..2ee1db1e2a3bb 100644 --- a/pkgs/by-name/ph/phase-cli/package.nix +++ b/pkgs/by-name/ph/phase-cli/package.nix @@ -45,7 +45,6 @@ python3Packages.buildPythonApplication rec { pythonRelaxDeps = true; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = "--version"; meta = { description = "Securely manage and sync environment variables with Phase"; diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix index 30969f1d4f843..ba1c0851cebf6 100644 --- a/pkgs/by-name/ph/phel/package.nix +++ b/pkgs/by-name/ph/phel/package.nix @@ -20,7 +20,6 @@ php.buildComposerProject2 (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/phel-lang/phel-lang/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/by-name/ph/phpactor/package.nix b/pkgs/by-name/ph/phpactor/package.nix index 0ae366d493e6f..90d1703f3da53 100644 --- a/pkgs/by-name/ph/phpactor/package.nix +++ b/pkgs/by-name/ph/phpactor/package.nix @@ -27,7 +27,6 @@ php.buildComposerProject2 (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/phpactor/phpactor/releases/tag/${finalAttrs.version}"; diff --git a/pkgs/by-name/ph/phpdocumentor/package.nix b/pkgs/by-name/ph/phpdocumentor/package.nix index d8b4b101113fe..54bf824719df9 100644 --- a/pkgs/by-name/ph/phpdocumentor/package.nix +++ b/pkgs/by-name/ph/phpdocumentor/package.nix @@ -30,7 +30,6 @@ php.buildComposerProject2 (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index f8fc830fb3f63..b399bd1486f12 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -25,7 +25,6 @@ php.buildComposerProject2 (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/sebastianbergmann/phpunit/blob/${finalAttrs.version}/ChangeLog-${lib.versions.majorMinor finalAttrs.version}.md"; diff --git a/pkgs/by-name/pi/pipenv/package.nix b/pkgs/by-name/pi/pipenv/package.nix index 5f93b3d9f897e..cbcf649a51151 100644 --- a/pkgs/by-name/pi/pipenv/package.nix +++ b/pkgs/by-name/pi/pipenv/package.nix @@ -74,7 +74,6 @@ buildPythonApplication rec { versionCheckHook writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; disabledTests = [ # this test wants access to the internet diff --git a/pkgs/by-name/pi/piston-cli/package.nix b/pkgs/by-name/pi/piston-cli/package.nix index 8484f65233571..d4a91d0ee319e 100644 --- a/pkgs/by-name/pi/piston-cli/package.nix +++ b/pkgs/by-name/pi/piston-cli/package.nix @@ -48,7 +48,6 @@ python3Packages.buildPythonApplication rec { ]; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; versionCheckProgram = "${placeholder "out"}/bin/piston"; pythonImportsCheck = [ "piston" ]; diff --git a/pkgs/by-name/pi/pixi-pack/package.nix b/pkgs/by-name/pi/pixi-pack/package.nix index a7a30ee53be92..48ace993870c0 100644 --- a/pkgs/by-name/pi/pixi-pack/package.nix +++ b/pkgs/by-name/pi/pixi-pack/package.nix @@ -34,7 +34,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix index 616f3d00df49b..91754cf309991 100644 --- a/pkgs/by-name/pi/pixi/package.nix +++ b/pkgs/by-name/pi/pixi/package.nix @@ -58,7 +58,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pl/platformio-core/package.nix b/pkgs/by-name/pl/platformio-core/package.nix index 27a26e46c2ed9..f14cbc5fa3031 100644 --- a/pkgs/by-name/pl/platformio-core/package.nix +++ b/pkgs/by-name/pl/platformio-core/package.nix @@ -1,6 +1,6 @@ { lib, - python3Packages, + python3, fetchFromGitHub, fetchpatch, installShellFiles, @@ -11,6 +11,23 @@ udevCheckHook, }: +let + python = python3.override { + self = python; + packageOverrides = self: super: { + marshmallow = super.marshmallow.overridePythonAttrs (oldAttrs: rec { + version = "3.26.1"; + src = fetchFromGitHub { + owner = "marshmallow-code"; + repo = "marshmallow"; + tag = version; + hash = "sha256-l5pEhv8D6jRlU24SlsGQEkXda/b7KUdP9mAqrZCbl38="; + }; + }); + }; + }; + python3Packages = python.pkgs; +in with python3Packages; buildPythonApplication rec { pname = "platformio"; diff --git a/pkgs/by-name/pl/plotutils/debian-patches.nix b/pkgs/by-name/pl/plotutils/debian-patches.nix index d7c60a11eb676..26c88843f08a9 100644 --- a/pkgs/by-name/pl/plotutils/debian-patches.nix +++ b/pkgs/by-name/pl/plotutils/debian-patches.nix @@ -1,15 +1,15 @@ # Generated by debian-patches.sh from debian-patches.txt let - prefix = "https://sources.debian.org/data/main/p/plotutils/2.6-9/debian/patches"; + prefix = "https://sources.debian.org/data/main/p/plotutils/2.6-15/debian/patches"; in [ { url = "${prefix}/01_AC_PROG_CXX.diff"; - sha256 = "0r7xgwbk2yqs7b29gwhr8pnbqvy3a3x698j17s4yg501ragw1gqv"; + sha256 = "0ka2iazhc8bkq10iwjhd2d89h0qzrv1pzflkb6d7bj6nd75zrssb"; } { url = "${prefix}/10_repair_postscript"; - sha256 = "01v4a8mdhgsjxbf9a2xppx2lb05lp818v8afp5x2njv64wpgla8p"; + sha256 = "0br09qxwkp6kbgq1wrz886h0ddfq74jfyismc9vbs5karfa8c22j"; } { url = "${prefix}/11_manpages_sb_macro"; @@ -17,7 +17,7 @@ in } { url = "${prefix}/14_manpage_spline"; - sha256 = "1xp3cx9y9njp5wp40dkp7rwd2flkiik2gb08nh4516vkm73avfrd"; + sha256 = "0087ryzs0fvqcr6ghbiq263hyzxx3a83ywhdgcsm7mh06zb9k1q7"; } { url = "${prefix}/20_svg_attribute_syntax"; @@ -29,14 +29,18 @@ in } { url = "${prefix}/25_libpng15"; - sha256 = "0l640rcsgc2mwpk7iqm0cf3b0gfcdgcn9wg4x88gaqxzx9rriph0"; + sha256 = "0944mvwbp10fr27b6bp8xgiq3568lrp18bxcgppl7yfanz9b74mf"; } { url = "${prefix}/30_hershey_glyphs"; - sha256 = "0n7rn6ln9ikzq2dialif58ag5pch7q7zqd5zcsxxdyyasx4s5gm2"; + sha256 = "01lrpxji95v3qd3hs0rqdcmxz7khvn7axv12y56p8r232dxd5nd0"; } { url = "${prefix}/35_spline.test.error.diff"; - sha256 = "1kqj1n8myk8xmglj6qcybj34zm4kpn6aw320jbpqhblkgp7m0fb1"; + sha256 = "013d2xndf728ycdviib8q11zdms4c18dm2qfgc764wb6580zd08k"; + } + { + url = "${prefix}/42_plotutils-gcc15.patch"; + sha256 = "0rlb282kn9l2jgwb94975d3difbh6bwpyks1860by43yk5sczm3n"; } ] diff --git a/pkgs/by-name/pl/plotutils/debian-patches.txt b/pkgs/by-name/pl/plotutils/debian-patches.txt index c28d96fdd5bca..c884390cea84f 100644 --- a/pkgs/by-name/pl/plotutils/debian-patches.txt +++ b/pkgs/by-name/pl/plotutils/debian-patches.txt @@ -1,4 +1,4 @@ -plotutils/2.6-9 +plotutils/2.6-15 01_AC_PROG_CXX.diff 10_repair_postscript 11_manpages_sb_macro @@ -8,3 +8,4 @@ plotutils/2.6-9 25_libpng15 30_hershey_glyphs 35_spline.test.error.diff +42_plotutils-gcc15.patch diff --git a/pkgs/by-name/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix index cacb413cb8567..7e7d8fe6d3318 100644 --- a/pkgs/by-name/pm/pmbootstrap/package.nix +++ b/pkgs/by-name/pm/pmbootstrap/package.nix @@ -62,8 +62,6 @@ python3Packages.buildPythonApplication rec { "test_valid_chroots" ]; - versionCheckProgramArg = "--version"; - makeWrapperArgs = [ "--prefix PATH : ${ lib.makeBinPath [ diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix index 5090d9dd84acd..aa1092a7115f5 100644 --- a/pkgs/by-name/po/podman/package.nix +++ b/pkgs/by-name/po/podman/package.nix @@ -148,7 +148,6 @@ buildGoModule (finalAttrs: { writableTmpDirAsHomeHook ]; versionCheckKeepEnvironment = [ "HOME" ]; - versionCheckProgramArg = "--version"; passthru = { tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { diff --git a/pkgs/by-name/po/pods/package.nix b/pkgs/by-name/po/pods/package.nix index 25c28917edb52..fe70abdc40e63 100644 --- a/pkgs/by-name/po/pods/package.nix +++ b/pkgs/by-name/po/pods/package.nix @@ -69,7 +69,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/po/popsicle/package.nix b/pkgs/by-name/po/popsicle/package.nix index c0267f44fd3df..57c132588ff15 100644 --- a/pkgs/by-name/po/popsicle/package.nix +++ b/pkgs/by-name/po/popsicle/package.nix @@ -50,7 +50,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Multiple USB File Flasher"; diff --git a/pkgs/by-name/pr/pre-commit/package.nix b/pkgs/by-name/pr/pre-commit/package.nix index f61aebbeff621..e4a8c21fe4fe7 100644 --- a/pkgs/by-name/pr/pre-commit/package.nix +++ b/pkgs/by-name/pr/pre-commit/package.nix @@ -85,7 +85,6 @@ python3Packages.buildPythonApplication rec { # Node.js-related tests that are currently disabled on i686-linux. nodejs ]; - versionCheckProgramArg = "--version"; postPatch = '' substituteInPlace pre_commit/resources/hook-tmpl \ @@ -179,6 +178,26 @@ python3Packages.buildPythonApplication rec { "test_swift_language" "test_run_example_executable" "test_run_dep" + "test_control_c_control_c_on_install" + "test_healthy_default_creator" + "test_healthy_venv_creator" + "test_invalidated_virtualenv" + "test_language_versioned_python_hook" + "test_local_python_repo" + "test_local_repo_with_other_artifacts" + "test_python_hook_weird_setup_cfg" + "test_really_long_file_paths" + "test_reinstall" + "test_repository_state_compatibility[v1]" + "test_repository_state_compatibility[v2]" + "test_simple_python_hook_default_version" + "test_simple_python_hook" + "test_unhealthy_old_virtualenv" + "test_unhealthy_python_goes_missing" + "test_unhealthy_system_version_changes" + "test_unhealthy_then_replaced" + "test_unhealthy_unexpected_pyvenv" + "test_unhealthy_with_version_change" # i don't know why these fail "test_install_existing_hooks_no_overwrite" diff --git a/pkgs/by-name/pr/presenterm/package.nix b/pkgs/by-name/pr/presenterm/package.nix index f316c383b4422..b0eef6e5731eb 100644 --- a/pkgs/by-name/pr/presenterm/package.nix +++ b/pkgs/by-name/pr/presenterm/package.nix @@ -63,7 +63,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index 94bc5950bfba2..91aa344f35107 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchPypi, nodejs, - python3, + python312, gettext, nixosTests, pretix, @@ -12,7 +12,7 @@ }: let - python = python3.override { + python = python312.override { self = python; packageOverrides = self: super: { django = super.django_4; diff --git a/pkgs/by-name/pr/prettier/package.nix b/pkgs/by-name/pr/prettier/package.nix index c9886eb4fff8d..71f43ec18168d 100644 --- a/pkgs/by-name/pr/prettier/package.nix +++ b/pkgs/by-name/pr/prettier/package.nix @@ -170,7 +170,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/pr/prmt/package.nix b/pkgs/by-name/pr/prmt/package.nix index d1bd01527d808..4fee4cd48bc00 100644 --- a/pkgs/by-name/pr/prmt/package.nix +++ b/pkgs/by-name/pr/prmt/package.nix @@ -28,7 +28,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pr/procfd/package.nix b/pkgs/by-name/pr/procfd/package.nix index 538741ab28a6c..baf6d9131422e 100644 --- a/pkgs/by-name/pr/procfd/package.nix +++ b/pkgs/by-name/pr/procfd/package.nix @@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/pr/proksi/package.nix b/pkgs/by-name/pr/proksi/package.nix index c3fc6d5901a00..584c43497f900 100644 --- a/pkgs/by-name/pr/proksi/package.nix +++ b/pkgs/by-name/pr/proksi/package.nix @@ -58,7 +58,6 @@ rustPlatform.buildRustPackage (finalAttrs: { }; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=proksi-v(.*)" ]; }; diff --git a/pkgs/by-name/pr/prometheus-chrony-exporter/package.nix b/pkgs/by-name/pr/prometheus-chrony-exporter/package.nix index 138dc46fc8cef..c099befd7d194 100644 --- a/pkgs/by-name/pr/prometheus-chrony-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-chrony-exporter/package.nix @@ -44,7 +44,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/chrony_exporter"; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/superq/chrony_exporter/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/by-name/pr/prometheus-ebpf-exporter/package.nix b/pkgs/by-name/pr/prometheus-ebpf-exporter/package.nix index 9075e350ec6d1..12ed985a6260d 100644 --- a/pkgs/by-name/pr/prometheus-ebpf-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-ebpf-exporter/package.nix @@ -66,7 +66,6 @@ buildGoModule.override { stdenv = clangStdenv; } (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pr/prometheus-modbus-exporter/package.nix b/pkgs/by-name/pr/prometheus-modbus-exporter/package.nix index 626a95d76ccdc..d9f2b017b10df 100644 --- a/pkgs/by-name/pr/prometheus-modbus-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-modbus-exporter/package.nix @@ -33,7 +33,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/richih/modbus_exporter/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix b/pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix index d326c422b4924..bfee635449bbc 100644 --- a/pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix @@ -33,7 +33,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/paepckehh/solaredge_exporter/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/by-name/pr/prometheus-tibber-exporter/package.nix b/pkgs/by-name/pr/prometheus-tibber-exporter/package.nix index 7f17a0b70019a..e52f456a1fc2c 100644 --- a/pkgs/by-name/pr/prometheus-tibber-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-tibber-exporter/package.nix @@ -47,7 +47,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/tibber-exporter"; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/terjesannum/tibber-exporter/releases/tag/tibber-exporter-${finalAttrs.version}"; diff --git a/pkgs/by-name/pr/protonmail-export/package.nix b/pkgs/by-name/pr/protonmail-export/package.nix index 5197b511a2dd0..403f6f41f789b 100644 --- a/pkgs/by-name/pr/protonmail-export/package.nix +++ b/pkgs/by-name/pr/protonmail-export/package.nix @@ -92,7 +92,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/proton-mail-export-cli"; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix b/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix index 362470ee6c92a..2ace65fd71423 100644 --- a/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix +++ b/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix @@ -46,7 +46,6 @@ rustPlatform.buildRustPackage { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Tool to prepare a Proxmox installation ISO for automated installations"; diff --git a/pkgs/by-name/pr/proxyauth/package.nix b/pkgs/by-name/pr/proxyauth/package.nix index cb118fa5e625a..a624eb2f30dfb 100644 --- a/pkgs/by-name/pr/proxyauth/package.nix +++ b/pkgs/by-name/pr/proxyauth/package.nix @@ -34,7 +34,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/pr/prs/package.nix b/pkgs/by-name/pr/prs/package.nix index 3bafbb2615d2a..3ad7be627cd46 100644 --- a/pkgs/by-name/pr/prs/package.nix +++ b/pkgs/by-name/pr/prs/package.nix @@ -60,7 +60,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ps/psqlodbc/package.nix b/pkgs/by-name/ps/psqlodbc/package.nix index 09543fac64c16..64428c0ba5524 100644 --- a/pkgs/by-name/ps/psqlodbc/package.nix +++ b/pkgs/by-name/ps/psqlodbc/package.nix @@ -18,13 +18,13 @@ assert lib.xor withLibiodbc withUnixODBC; stdenv.mkDerivation (finalAttrs: { pname = "psqlodbc"; - version = "17.00.0006"; + version = "17.00.0007"; src = fetchFromGitHub { owner = "postgresql-interfaces"; repo = "psqlodbc"; tag = "REL-${lib.replaceString "." "_" finalAttrs.version}"; - hash = "sha256-iu1PWkfOyWtMmy7/8W+acu8v+e8nUPkCIHtVNZ8HzRg="; + hash = "sha256-KlAGA+oNV/jJpcDJNGzsq/n55QKhUwTwhfNJ6QL6Pas="; }; buildInputs = [ diff --git a/pkgs/by-name/ps/psysh/package.nix b/pkgs/by-name/ps/psysh/package.nix index ab61bfc1dd1a4..d6f867670b110 100644 --- a/pkgs/by-name/ps/psysh/package.nix +++ b/pkgs/by-name/ps/psysh/package.nix @@ -50,7 +50,6 @@ php.buildComposerProject2 (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/bobthecow/psysh/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/by-name/pu/publicsuffix-list/package.nix b/pkgs/by-name/pu/publicsuffix-list/package.nix index 09df1b471010c..a54b70e96ead6 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-10-08"; + version = "0-unstable-2025-11-14"; src = fetchFromGitHub { owner = "publicsuffix"; repo = "list"; - rev = "ee7dec4a99602baaf51879dd8469b6642881a494"; - hash = "sha256-IlR3dICad9EZeizI3V0A1YCQZiV/xg2GxtmTLG4EASU="; + rev = "64ba165cf391818a086139239c8fa223264eebcc"; + hash = "sha256-Ugou4SzYx9EtzcBtocCqhCZZaU1Sngvk1IEVAIJZ4KY="; }; dontBuild = true; diff --git a/pkgs/by-name/pu/puredata/package.nix b/pkgs/by-name/pu/puredata/package.nix index 461da99484a92..54e04bba7ebbc 100644 --- a/pkgs/by-name/pu/puredata/package.nix +++ b/pkgs/by-name/pu/puredata/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, autoreconfHook, gettext, makeWrapper, @@ -25,6 +26,12 @@ stdenv.mkDerivation rec { patches = [ # expose error function used by dependents ./expose-error.patch + + # Fix build with GCC 15 + (fetchpatch { + url = "https://github.com/pure-data/pure-data/commit/95e4105bc1044cbbcbbbcc369480a77c298d7475.patch"; + hash = "sha256-zFB9m8Nw80X9+a64Uft4tNRA4BHsVr8zxLqAof0jJEI="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/py/pylyzer/package.nix b/pkgs/by-name/py/pylyzer/package.nix index 16f006bc92a8f..fa326d936b994 100644 --- a/pkgs/by-name/py/pylyzer/package.nix +++ b/pkgs/by-name/py/pylyzer/package.nix @@ -49,7 +49,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/py/pyp/package.nix b/pkgs/by-name/py/pyp/package.nix index 74fdc2f64af29..0822f93a9d432 100644 --- a/pkgs/by-name/py/pyp/package.nix +++ b/pkgs/by-name/py/pyp/package.nix @@ -38,7 +38,6 @@ let jq versionCheckHook ]; - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "pyp" diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index 99f9dbab65304..d21cf6254984f 100644 --- a/pkgs/by-name/py/pyright/package.nix +++ b/pkgs/by-name/py/pyright/package.nix @@ -16,12 +16,17 @@ let hash = "sha256-TQrmA65CzXar++79DLRWINaMsjoqNFdvNlwDzAcqOjM="; }; - patchedPackageJSON = runCommand "package.json" { } '' - ${jq}/bin/jq ' - .devDependencies |= with_entries(select(.key == "glob" or .key == "jsonc-parser")) - | .scripts = { } - ' ${src}/package.json > $out - ''; + patchedPackageJSON = + runCommand "package.json" + { + nativeBuildInputs = [ jq ]; + } + '' + jq ' + .devDependencies |= with_entries(select(.key == "glob" or .key == "jsonc-parser")) + | .scripts = { } + ' ${src}/package.json > $out + ''; pyright-root = buildNpmPackage { pname = "pyright-root"; diff --git a/pkgs/by-name/py/pyroscope/package.nix b/pkgs/by-name/py/pyroscope/package.nix index 18f2bf17ecff8..98dcb16a7d04f 100644 --- a/pkgs/by-name/py/pyroscope/package.nix +++ b/pkgs/by-name/py/pyroscope/package.nix @@ -39,7 +39,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; - versionCheckProgramArg = "--version"; nativeBuildInputs = [ installShellFiles ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' diff --git a/pkgs/by-name/py/pytr/package.nix b/pkgs/by-name/py/pytr/package.nix index f7eb33198865f..d79ac9089f77e 100644 --- a/pkgs/by-name/py/pytr/package.nix +++ b/pkgs/by-name/py/pytr/package.nix @@ -50,8 +50,6 @@ python3Packages.buildPythonApplication rec { python3Packages.pytestCheckHook ]; - versionCheckProgramArg = "--version"; - pythonImportsCheck = [ "pytr" ]; meta = { diff --git a/pkgs/by-name/q2/q2pro/package.nix b/pkgs/by-name/q2/q2pro/package.nix index 8370fa110e02e..a0e121ef8f69e 100644 --- a/pkgs/by-name/q2/q2pro/package.nix +++ b/pkgs/by-name/q2/q2pro/package.nix @@ -107,7 +107,6 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; preVersionCheck = '' export version='${finalAttrs.internalVersion}' ''; diff --git a/pkgs/by-name/qb/qbittorrent-cli/package.nix b/pkgs/by-name/qb/qbittorrent-cli/package.nix index a58a8bbe72820..908da9522a56f 100644 --- a/pkgs/by-name/qb/qbittorrent-cli/package.nix +++ b/pkgs/by-name/qb/qbittorrent-cli/package.nix @@ -38,7 +38,6 @@ buildDotnetModule { ]; versionCheckProgram = "${placeholder "out"}/bin/qbt"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/qd/qdrant/package.nix b/pkgs/by-name/qd/qdrant/package.nix index 2232b2761d779..c27d11345d055 100644 --- a/pkgs/by-name/qd/qdrant/package.nix +++ b/pkgs/by-name/qd/qdrant/package.nix @@ -47,7 +47,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix index 79ff104b6bf93..1bf49b13e2520 100644 --- a/pkgs/by-name/qo/qownnotes/package.nix +++ b/pkgs/by-name/qo/qownnotes/package.nix @@ -87,7 +87,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/qr/qr-backup/package.nix b/pkgs/by-name/qr/qr-backup/package.nix index 0d59ac4044b3e..9f4b620a71e0f 100644 --- a/pkgs/by-name/qr/qr-backup/package.nix +++ b/pkgs/by-name/qr/qr-backup/package.nix @@ -85,7 +85,6 @@ python3Packages.buildPythonApplication rec { runHook postInstallCheck ''; - versionCheckProgramArg = [ "--version" ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/qu/quick-lint-js/package.nix b/pkgs/by-name/qu/quick-lint-js/package.nix index b83a7a164ca50..bbdcb9dfeae93 100644 --- a/pkgs/by-name/qu/quick-lint-js/package.nix +++ b/pkgs/by-name/qu/quick-lint-js/package.nix @@ -65,7 +65,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/qx/qxmpp/package.nix b/pkgs/by-name/qx/qxmpp/package.nix index c2ad46d75b4cd..336be1a9dbb62 100644 --- a/pkgs/by-name/qx/qxmpp/package.nix +++ b/pkgs/by-name/qx/qxmpp/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - kdePackages.wrapQtAppsNoGuiHook + kdePackages.wrapQtAppsHook ] ++ lib.optionals (withGstreamer || withOmemo) [ pkg-config diff --git a/pkgs/by-name/ra/radicle-ci-broker/package.nix b/pkgs/by-name/ra/radicle-ci-broker/package.nix index e9215823f40c0..72c71b01b20d3 100644 --- a/pkgs/by-name/ra/radicle-ci-broker/package.nix +++ b/pkgs/by-name/ra/radicle-ci-broker/package.nix @@ -57,7 +57,6 @@ rustPlatform.buildRustPackage (finalAttrs: { checkFlags = [ "--skip=acceptance_criteria_for_upgrades" ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ra/radicle-job/package.nix b/pkgs/by-name/ra/radicle-job/package.nix index 681a4295ec4ec..0058174202726 100644 --- a/pkgs/by-name/ra/radicle-job/package.nix +++ b/pkgs/by-name/ra/radicle-job/package.nix @@ -26,7 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/ra/radicle-native-ci/package.nix b/pkgs/by-name/ra/radicle-native-ci/package.nix index 6fb5de3a329bc..c17da970c09a1 100644 --- a/pkgs/by-name/ra/radicle-native-ci/package.nix +++ b/pkgs/by-name/ra/radicle-native-ci/package.nix @@ -34,7 +34,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index e9a0806c5fa2f..d1e984a747017 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -92,7 +92,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; postFixup = '' diff --git a/pkgs/by-name/ra/rails-new/package.nix b/pkgs/by-name/ra/rails-new/package.nix index a181e923e7275..c7edad231ed27 100644 --- a/pkgs/by-name/ra/rails-new/package.nix +++ b/pkgs/by-name/ra/rails-new/package.nix @@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-FrndtE9hjP1WswfOYJM4LW1UsE8S9QXthYO7P3nzs2I="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ra/rates/package.nix b/pkgs/by-name/ra/rates/package.nix index a73acc3d78f18..06d881833e7d2 100644 --- a/pkgs/by-name/ra/rates/package.nix +++ b/pkgs/by-name/ra/rates/package.nix @@ -22,8 +22,6 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; - versionCheckProgramArg = "--version"; - meta = { description = "CLI tool that brings currency exchange rates right into your terminal"; homepage = "https://github.com/lunush/rates"; diff --git a/pkgs/by-name/ra/rattler-build/package.nix b/pkgs/by-name/ra/rattler-build/package.nix index 6ebcabed19ff5..89341f7c201fd 100644 --- a/pkgs/by-name/ra/rattler-build/package.nix +++ b/pkgs/by-name/ra/rattler-build/package.nix @@ -54,7 +54,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/rc/rclip/package.nix b/pkgs/by-name/rc/rclip/package.nix index 9495eb01fea63..e2d53e5f21de5 100644 --- a/pkgs/by-name/rc/rclip/package.nix +++ b/pkgs/by-name/rc/rclip/package.nix @@ -46,7 +46,6 @@ python3Packages.buildPythonApplication rec { versionCheckHook ] ++ (with python3Packages; [ pytestCheckHook ]); - versionCheckProgramArg = "--version"; disabledTestPaths = [ # requires network diff --git a/pkgs/by-name/rc/rcodesign/package.nix b/pkgs/by-name/rc/rcodesign/package.nix index 617f899ec9a75..90e4b5d6d5afb 100644 --- a/pkgs/by-name/rc/rcodesign/package.nix +++ b/pkgs/by-name/rc/rcodesign/package.nix @@ -53,7 +53,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/re/re2c/package.nix b/pkgs/by-name/re/re2c/package.nix index ea0ae6fe3fdb6..f3cd39eb7c811 100644 --- a/pkgs/by-name/re/re2c/package.nix +++ b/pkgs/by-name/re/re2c/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "re2c"; - version = "4.3"; + version = "4.3.1"; src = fetchFromGitHub { owner = "skvadrik"; repo = "re2c"; rev = version; - hash = "sha256-zPOENMfXXgTwds1t+Lrmz9+GTHJf2yRpQsGT7nLRvcg="; + hash = "sha256-ihtAB6HLgYhX+FKPFy01RByy/M468YrHv2v5wB9bJws="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/readstat/package.nix b/pkgs/by-name/re/readstat/package.nix index ba0e9097d2452..f1861768ce6ed 100644 --- a/pkgs/by-name/re/readstat/package.nix +++ b/pkgs/by-name/re/readstat/package.nix @@ -39,6 +39,12 @@ stdenv.mkDerivation rec { url = "https://github.com/WizardMac/ReadStat/commit/718d49155e327471ed9bf4a8c157f849f285b46c.patch"; hash = "sha256-9hmuFa05b4JlxSzquIxXArOGhbi27A+3y5gH1IDg+R0="; }) + + # fix stringop-truncation warning + (fetchpatch { + url = "https://github.com/WizardMac/ReadStat/commit/43d4cdec6783b29d0f1d0ae9564507739cd27567.patch"; + hash = "sha256-LZtdFdru2y89NvmLqa1sryhfzZX09jEeC2qWJpDS/kI="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/rebels-in-the-sky/package.nix b/pkgs/by-name/re/rebels-in-the-sky/package.nix index 0959e3ef32ae0..144d25859e29b 100644 --- a/pkgs/by-name/re/rebels-in-the-sky/package.nix +++ b/pkgs/by-name/re/rebels-in-the-sky/package.nix @@ -47,7 +47,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/rebels"; - versionCheckProgramArg = "--version"; # Darwin: "Error: Operation not permitted (os error 1)" doInstallCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/re/rebuilderd/package.nix b/pkgs/by-name/re/rebuilderd/package.nix index a5fadbf381606..bd2880e22895f 100644 --- a/pkgs/by-name/re/rebuilderd/package.nix +++ b/pkgs/by-name/re/rebuilderd/package.nix @@ -100,7 +100,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.tests = { diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix index 4bec7e3d96237..b4a0ab80ef87d 100644 --- a/pkgs/by-name/re/redis/package.nix +++ b/pkgs/by-name/re/redis/package.nix @@ -114,7 +114,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/redis-server"; - versionCheckProgramArg = "--version"; passthru = { tests.redis = nixosTests.redis; diff --git a/pkgs/by-name/re/regolith/package.nix b/pkgs/by-name/re/regolith/package.nix index aae561ed8e5ed..307357bf0480c 100644 --- a/pkgs/by-name/re/regolith/package.nix +++ b/pkgs/by-name/re/regolith/package.nix @@ -27,7 +27,6 @@ buildGoModule rec { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/re/remod/package.nix b/pkgs/by-name/re/remod/package.nix index 699cbe74a8426..3a51f585a1e3e 100644 --- a/pkgs/by-name/re/remod/package.nix +++ b/pkgs/by-name/re/remod/package.nix @@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; diff --git a/pkgs/by-name/re/render50/package.nix b/pkgs/by-name/re/render50/package.nix index 22d62f2db5e19..cde655ee408db 100644 --- a/pkgs/by-name/re/render50/package.nix +++ b/pkgs/by-name/re/render50/package.nix @@ -36,7 +36,6 @@ python3Packages.buildPythonApplication rec { ]; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; # no pytest checks diff --git a/pkgs/by-name/re/renpy/package.nix b/pkgs/by-name/re/renpy/package.nix index 103aef1baf65e..22e835c7b1c9d 100644 --- a/pkgs/by-name/re/renpy/package.nix +++ b/pkgs/by-name/re/renpy/package.nix @@ -128,7 +128,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/re/repro-env/package.nix b/pkgs/by-name/re/repro-env/package.nix index e34a2860868ba..1790ecffc6e07 100644 --- a/pkgs/by-name/re/repro-env/package.nix +++ b/pkgs/by-name/re/repro-env/package.nix @@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/kpcyrd/repro-env/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix index 82a5541ed2c08..c1b6445c2eb89 100644 --- a/pkgs/by-name/re/rerun/package.nix +++ b/pkgs/by-name/re/rerun/package.nix @@ -186,7 +186,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/re/rescript-language-server/package.nix b/pkgs/by-name/re/rescript-language-server/package.nix index c6ee9cbc2147a..71ea91149d416 100644 --- a/pkgs/by-name/re/rescript-language-server/package.nix +++ b/pkgs/by-name/re/rescript-language-server/package.nix @@ -54,7 +54,6 @@ buildNpmPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { diff --git a/pkgs/by-name/re/restate/package.nix b/pkgs/by-name/re/restate/package.nix index 1dc235668dd60..91c7e175df8e3 100644 --- a/pkgs/by-name/re/restate/package.nix +++ b/pkgs/by-name/re/restate/package.nix @@ -114,7 +114,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ri/rich-cli/package.nix b/pkgs/by-name/ri/rich-cli/package.nix index 7b98a06d3f893..1dddef1895c61 100644 --- a/pkgs/by-name/ri/rich-cli/package.nix +++ b/pkgs/by-name/ri/rich-cli/package.nix @@ -56,7 +56,6 @@ python3Packages.buildPythonApplication rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/rich"; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix index 155d6752055d8..afc1a1a1a6d32 100644 --- a/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix +++ b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix @@ -21,7 +21,6 @@ php.buildComposerProject2 (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/ro/robo/package.nix b/pkgs/by-name/ro/robo/package.nix index 8a707bfba15ab..6912fda7f6aba 100644 --- a/pkgs/by-name/ro/robo/package.nix +++ b/pkgs/by-name/ro/robo/package.nix @@ -21,7 +21,6 @@ php82.buildComposerProject2 (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/ro/rocksdb/package.nix b/pkgs/by-name/ro/rocksdb/package.nix index 895d4bae952d3..f2b4c98885fc8 100644 --- a/pkgs/by-name/ro/rocksdb/package.nix +++ b/pkgs/by-name/ro/rocksdb/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocksdb"; - version = "10.5.1"; + version = "10.7.5"; src = fetchFromGitHub { owner = "facebook"; repo = "rocksdb"; tag = "v${finalAttrs.version}"; - hash = "sha256-TDYXzYbOLhcIRi+qi0FW1OLVtfKOF+gUbj62Tgpp3/E="; + hash = "sha256-kKMwgRcjELla/9aak5gZbUHg1bkgGhlobr964wdatxI="; }; patches = lib.optional ( @@ -90,6 +90,14 @@ stdenv.mkDerivation (finalAttrs: { sed -e '1i #include ' -i util/string_util.h sed -e '1i #include ' -i include/rocksdb/utilities/checkpoint.h '' + + lib.optionalString (lib.versionOlder finalAttrs.version "10.4.2") '' + # Fix gcc-15 build failures due to missing + sed -e '1i #include ' -i db/blob/blob_file_meta.h + sed -e '1i #include ' -i include/rocksdb/sst_partitioner.h + sed -e '1i #include ' -i include/rocksdb/write_batch_base.h + # Some older versions don't have this + sed -e '1i #include ' -i include/rocksdb/trace_record.h || true + '' + lib.optionalString (lib.versionOlder finalAttrs.version "7") '' # Fix gcc-13 build failures due to missing and # includes, fixed upstyream sice 7.x diff --git a/pkgs/by-name/ro/rogcat/package.nix b/pkgs/by-name/ro/rogcat/package.nix index f09fd79acb990..06577483ef772 100644 --- a/pkgs/by-name/ro/rogcat/package.nix +++ b/pkgs/by-name/ro/rogcat/package.nix @@ -35,8 +35,6 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; - meta = { description = "Adb logcat wrapper"; homepage = "https://github.com/flxo/rogcat"; diff --git a/pkgs/by-name/ro/rojo/package.nix b/pkgs/by-name/ro/rojo/package.nix index f5f0ad6415a2e..6641cd8af4ef1 100644 --- a/pkgs/by-name/ro/rojo/package.nix +++ b/pkgs/by-name/ro/rojo/package.nix @@ -34,7 +34,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/rojo"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/rq/rq/package.nix b/pkgs/by-name/rq/rq/package.nix index 4d5c9323cfa66..c47be258500fd 100644 --- a/pkgs/by-name/rq/rq/package.nix +++ b/pkgs/by-name/rq/rq/package.nix @@ -35,7 +35,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/rs/rsnapshot/package.nix b/pkgs/by-name/rs/rsnapshot/package.nix index 575e0278ce6b2..185028327c883 100644 --- a/pkgs/by-name/rs/rsnapshot/package.nix +++ b/pkgs/by-name/rs/rsnapshot/package.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index 17ce5aa19ab47..f96425f631124 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -75,7 +75,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ru/rumdl/package.nix b/pkgs/by-name/ru/rumdl/package.nix index a28dcaca7afc8..8c4afaaac66e1 100644 --- a/pkgs/by-name/ru/rumdl/package.nix +++ b/pkgs/by-name/ru/rumdl/package.nix @@ -44,7 +44,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ru/rundeck-cli/package.nix b/pkgs/by-name/ru/rundeck-cli/package.nix index 7133be4c9825f..0460f469e6f16 100644 --- a/pkgs/by-name/ru/rundeck-cli/package.nix +++ b/pkgs/by-name/ru/rundeck-cli/package.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/rd"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ru/rust-parallel/package.nix b/pkgs/by-name/ru/rust-parallel/package.nix index 7f1e1a5620e46..453200807e4a4 100644 --- a/pkgs/by-name/ru/rust-parallel/package.nix +++ b/pkgs/by-name/ru/rust-parallel/package.nix @@ -36,7 +36,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ru/rustpython/package.nix b/pkgs/by-name/ru/rustpython/package.nix index 36bb063c07d4b..ff9ccff266b66 100644 --- a/pkgs/by-name/ru/rustpython/package.nix +++ b/pkgs/by-name/ru/rustpython/package.nix @@ -28,7 +28,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ru/rusty-man/package.nix b/pkgs/by-name/ru/rusty-man/package.nix index 1ff58f933b6d7..bdac57fd6f7bc 100644 --- a/pkgs/by-name/ru/rusty-man/package.nix +++ b/pkgs/by-name/ru/rusty-man/package.nix @@ -20,7 +20,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-ZIRwp5AJugMDxg3DyFIH5VlD0m4Si2tJdspKE5QEB4M="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/rw/rwalk/package.nix b/pkgs/by-name/rw/rwalk/package.nix index f877eec94f6fa..8b11def63bcf0 100644 --- a/pkgs/by-name/rw/rwalk/package.nix +++ b/pkgs/by-name/rw/rwalk/package.nix @@ -37,7 +37,6 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ry/rye/package.nix b/pkgs/by-name/ry/rye/package.nix index 2bde52b68d42d..d435206ece67b 100644 --- a/pkgs/by-name/ry/rye/package.nix +++ b/pkgs/by-name/ry/rye/package.nix @@ -93,7 +93,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/s5/s5/package.nix b/pkgs/by-name/s5/s5/package.nix index a50126e9bd4c1..7da850e385a67 100644 --- a/pkgs/by-name/s5/s5/package.nix +++ b/pkgs/by-name/s5/s5/package.nix @@ -30,8 +30,6 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - meta = { description = "Cipher/decipher text within a file"; mainProgram = "s5"; diff --git a/pkgs/by-name/sa/salt-lint/package.nix b/pkgs/by-name/sa/salt-lint/package.nix index 859a84ee7d3fb..b538d7b69b60b 100644 --- a/pkgs/by-name/sa/salt-lint/package.nix +++ b/pkgs/by-name/sa/salt-lint/package.nix @@ -31,8 +31,6 @@ python3Packages.buildPythonApplication rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; - meta = { description = "Command-line utility that checks for best practices in SaltStack"; homepage = "https://salt-lint.readthedocs.io/en/latest/"; diff --git a/pkgs/by-name/sa/samply/package.nix b/pkgs/by-name/sa/samply/package.nix index 01051d19a4dd9..9ff815ea6c3d2 100644 --- a/pkgs/by-name/sa/samply/package.nix +++ b/pkgs/by-name/sa/samply/package.nix @@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-mQykzO9Ldokd3PZ1fY4pK/GtLmYMVas2iHj1Pqi9WqQ="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sa/sampo/package.nix b/pkgs/by-name/sa/sampo/package.nix index 97c632438477c..d4bdc781f31cb 100644 --- a/pkgs/by-name/sa/sampo/package.nix +++ b/pkgs/by-name/sa/sampo/package.nix @@ -34,7 +34,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sa/sasquatch/gcc15-fix-prototypes.patch b/pkgs/by-name/sa/sasquatch/gcc15-fix-prototypes.patch new file mode 100644 index 0000000000000..062bb357fce52 --- /dev/null +++ b/pkgs/by-name/sa/sasquatch/gcc15-fix-prototypes.patch @@ -0,0 +1,22 @@ +diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c +index ed5096b32d..adb6a91c7e 100644 +--- a/squashfs-tools/unsquashfs.c ++++ b/squashfs-tools/unsquashfs.c +@@ -146,7 +146,7 @@ + + #define MAX_LINE 16384 + +-void sigwinch_handler() ++void sigwinch_handler(int _signal) + { + struct winsize winsize; + +@@ -160,7 +160,7 @@ + } + + +-void sigalrm_handler() ++void sigalrm_handler(int _signal) + { + rotate = (rotate + 1) % 4; + } diff --git a/pkgs/by-name/sa/sasquatch/package.nix b/pkgs/by-name/sa/sasquatch/package.nix index fba9da9c1dbbc..fac1e79e72e34 100644 --- a/pkgs/by-name/sa/sasquatch/package.nix +++ b/pkgs/by-name/sa/sasquatch/package.nix @@ -23,7 +23,12 @@ let hash = "sha256-4Mltt0yFt4oh9hsrHL8/ch5n7nZYiXIJ1UgLktPvlKQ="; }; - patches = lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch; + patches = [ + # Fix build for GCC 15/C23 by adding parameters to unsquashfs signal + # handlers instead of relying on an empty parameter list. + ./gcc15-fix-prototypes.patch + ] + ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch; strictDeps = true; nativeBuildInputs = [ which ]; diff --git a/pkgs/by-name/sa/sawfish/package.nix b/pkgs/by-name/sa/sawfish/package.nix index 3bca8006e2132..aa1e8290dc704 100644 --- a/pkgs/by-name/sa/sawfish/package.nix +++ b/pkgs/by-name/sa/sawfish/package.nix @@ -81,7 +81,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; meta = { diff --git a/pkgs/by-name/sb/sbom-tool/package.nix b/pkgs/by-name/sb/sbom-tool/package.nix index 04ba91427e997..7d50b5bd6159e 100644 --- a/pkgs/by-name/sb/sbom-tool/package.nix +++ b/pkgs/by-name/sb/sbom-tool/package.nix @@ -37,7 +37,6 @@ buildDotnetModule rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sb/sbom4python/package.nix b/pkgs/by-name/sb/sbom4python/package.nix index d45186882529e..86d54abd0e0af 100644 --- a/pkgs/by-name/sb/sbom4python/package.nix +++ b/pkgs/by-name/sb/sbom4python/package.nix @@ -36,7 +36,6 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "sbom4python" diff --git a/pkgs/by-name/sc/scalapack/package.nix b/pkgs/by-name/sc/scalapack/package.nix index 408337773ba74..049eff90a8d8f 100644 --- a/pkgs/by-name/sc/scalapack/package.nix +++ b/pkgs/by-name/sc/scalapack/package.nix @@ -46,6 +46,14 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/Reference-ScaLAPACK/scalapack/commit/c3d6b22b0032fd2b8772d99c2239c18473e197a7.patch"; hash = "sha256-935KtaqPO2cghbD9Z8YMxGGOQJo1D1LqTje6/IL4bGI="; }) + + # Fix build with gcc15 + # https://github.com/Reference-ScaLAPACK/scalapack/pull/139 + (fetchpatch { + name = "scalapack-fix-function-declaration-arguments.patch"; + url = "https://github.com/Reference-ScaLAPACK/scalapack/commit/0cd017afa3eefd0597cfe71b7bcfd6356a258da2.patch"; + hash = "sha256-uUdazKplDt8K5yuVaHX5pLFqDMh0F7eBBGEHfxOiM0Y="; + }) ]; # Required to activate ILP64. diff --git a/pkgs/by-name/sc/scip/package.nix b/pkgs/by-name/sc/scip/package.nix index e7f552274ce8c..5e5fe6178ffd6 100644 --- a/pkgs/by-name/sc/scip/package.nix +++ b/pkgs/by-name/sc/scip/package.nix @@ -47,8 +47,6 @@ buildGo124Module (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - meta = { description = "SCIP Code Intelligence Protocol CLI"; mainProgram = "scip"; diff --git a/pkgs/by-name/sc/scmpuff/package.nix b/pkgs/by-name/sc/scmpuff/package.nix index 05ba1d72b1b7e..3a012c643cbc3 100644 --- a/pkgs/by-name/sc/scmpuff/package.nix +++ b/pkgs/by-name/sc/scmpuff/package.nix @@ -33,7 +33,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Numeric file shortcuts for common git commands"; diff --git a/pkgs/by-name/sc/scons/package.nix b/pkgs/by-name/sc/scons/package.nix index c1393046acdd1..436c30b1f8df6 100644 --- a/pkgs/by-name/sc/scons/package.nix +++ b/pkgs/by-name/sc/scons/package.nix @@ -6,13 +6,13 @@ }: python3Packages.buildPythonApplication rec { pname = "scons"; - version = "4.10.0"; + version = "4.10.1"; src = fetchFromGitHub { owner = "Scons"; repo = "scons"; tag = version; - hash = "sha256-ZmJETrznHH3zsNBO5o8JCvf+6l7NICOAfIqASYzYBaM="; + hash = "sha256-Lq6sDd6Bs9lMfTptlxdeNhOc1acP7xuLdDhIi65uqFo="; }; pyproject = true; diff --git a/pkgs/by-name/sd/sdcc/package.nix b/pkgs/by-name/sd/sdcc/package.nix index d96e7a9882156..c1f3dc77015dc 100644 --- a/pkgs/by-name/sd/sdcc/package.nix +++ b/pkgs/by-name/sd/sdcc/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, autoconf, bison, boost, @@ -70,6 +71,16 @@ stdenv.mkDerivation (finalAttrs: { gputils ]; + patches = [ + # Fix build with gcc15 + # https://sourceforge.net/p/sdcc/bugs/3846/ + (fetchpatch { + name = "sdcc-fix-aslink-elf-signature.patch"; + url = "https://src.fedoraproject.org/rpms/sdcc/raw/4a7c2a7e32369461eb451fc6f4d678a010135afc/f/sdcc-4.4.0-aslink.patch"; + hash = "sha256-xGilNetecPBj2VV3ebmln5BKqs3OoWFf6y2S3TBTHMQ="; + }) + ]; + # sdcc 4.5.0 massively rewrote sim/ucsim/Makefile.in, and lost the `.PHONY` # rule in the process. As a result, on macOS (which uses a case-insensitive # filesystem), the INSTALL file keeps the `install` target in the ucsim diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix index e16eb5927cec0..fde780a230426 100644 --- a/pkgs/by-name/sd/sdl2-compat/package.nix +++ b/pkgs/by-name/sd/sdl2-compat/package.nix @@ -2,7 +2,6 @@ cmake, lib, fetchFromGitHub, - fetchpatch2, ninja, sdl3, stdenv, @@ -31,13 +30,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "sdl2-compat"; - version = "2.32.58"; + version = "2.32.60"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "sdl2-compat"; tag = "release-${finalAttrs.version}"; - hash = "sha256-Ngmr/KG5dQ1IDVafn2Jw/29hFCzPGKc9GOenT/4fsIM="; + hash = "sha256-8nhSyifEeYEZj9tqid1x67jhxqmrR61NwQ/g0Z8vbw8="; }; nativeBuildInputs = [ @@ -74,12 +73,6 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./find-headers.patch - - # https://github.com/libsdl-org/sdl2-compat/pull/545 - (fetchpatch2 { - url = "https://github.com/libsdl-org/sdl2-compat/commit/b799076c72c2492224e81544f58f92b737cccbd3.patch?full_index=1"; - hash = "sha256-fAc8yBlT+XFHDKcF4MFgBAz2WtXGmhYzNNrjaGSr+do="; - }) ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix index 0e5feb85776ad..dae3517ae9be0 100644 --- a/pkgs/by-name/sd/sdl3/package.nix +++ b/pkgs/by-name/sd/sdl3/package.nix @@ -61,7 +61,7 @@ assert lib.assertMsg (ibusSupport -> dbusSupport) "SDL3 requires dbus support to stdenv.mkDerivation (finalAttrs: { pname = "sdl3"; - version = "3.2.26"; + version = "3.2.28"; outputs = [ "lib" @@ -74,18 +74,14 @@ stdenv.mkDerivation (finalAttrs: { owner = "libsdl-org"; repo = "SDL"; tag = "release-${finalAttrs.version}"; - hash = "sha256-edcub/zeho4mB3tItp+PSD5l+H6jUPm3seiBP6ppT0k="; + hash = "sha256-nfnvzog1bON2IaBOeWociV82lmRY+qXgdeXBe6GYlww="; }; postPatch = # Tests timeout on Darwin - # `testtray` loads assets from a relative path, which we are patching to be absolute lib.optionalString (finalAttrs.finalPackage.doCheck) '' substituteInPlace test/CMakeLists.txt \ --replace-fail 'set(noninteractive_timeout 10)' 'set(noninteractive_timeout 30)' - - substituteInPlace test/testtray.c \ - --replace-warn '../test/' '${placeholder "installedTests"}/share/assets/' '' + lib.optionalString waylandSupport '' substituteInPlace src/video/wayland/SDL_waylandmessagebox.c \ @@ -171,6 +167,9 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "SDL_TESTS" true) (lib.cmakeBool "SDL_INSTALL_TESTS" true) (lib.cmakeBool "SDL_DEPS_SHARED" false) + + # Only ppc64le baseline guarantees AltiVec + (lib.cmakeBool "SDL_ALTIVEC" (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian)) ] ++ lib.optionals diff --git a/pkgs/by-name/se/sea-orm-cli/package.nix b/pkgs/by-name/se/sea-orm-cli/package.nix index 18d89bda4ff6e..27ba7d4a5d9e4 100644 --- a/pkgs/by-name/se/sea-orm-cli/package.nix +++ b/pkgs/by-name/se/sea-orm-cli/package.nix @@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-AqrS+5y3bKuqAVvbmWDO3V0OBVSkW6212WQeY1hixsk="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/se/seagoat/package.nix b/pkgs/by-name/se/seagoat/package.nix index 2d0550823c09a..9745ac0544926 100644 --- a/pkgs/by-name/se/seagoat/package.nix +++ b/pkgs/by-name/se/seagoat/package.nix @@ -68,7 +68,6 @@ python3Packages.buildPythonApplication rec { versionCheckHook writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; disabledTests = import ./failing_tests.nix; diff --git a/pkgs/by-name/se/seahorse/package.nix b/pkgs/by-name/se/seahorse/package.nix index 4d39408085c76..2fc83e64a54af 100644 --- a/pkgs/by-name/se/seahorse/package.nix +++ b/pkgs/by-name/se/seahorse/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchurl, + fetchpatch, vala, meson, ninja, @@ -37,6 +38,16 @@ stdenv.mkDerivation rec { hash = "sha256-nBkX5KYff+u3h4Sc42znF/znBsNGiAuZHQVtVNrbysw="; }; + patches = [ + # Fix build with gpgme 2.0+ + # https://gitlab.gnome.org/GNOME/seahorse/-/merge_requests/248 + (fetchpatch { + name = "seahorse-allow-build-with-gpgme-2_0.patch"; + url = "https://gitlab.gnome.org/GNOME/seahorse/-/commit/aa68522cc696fa491ccfdff735b77bcf113168d0.patch"; + hash = "sha256-xd5K8xUGuMk+41JROsq7QpZ5gD2jPAbv1kQdLI3z9lc="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/by-name/se/serpl/package.nix b/pkgs/by-name/se/serpl/package.nix index 3b57bb465256f..2f59b87f87f33 100644 --- a/pkgs/by-name/se/serpl/package.nix +++ b/pkgs/by-name/se/serpl/package.nix @@ -43,7 +43,6 @@ rustPlatform.buildRustPackage { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/serpl"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sh/shadow/disable-xaprintf-test.patch b/pkgs/by-name/sh/shadow/disable-xaprintf-test.patch new file mode 100644 index 0000000000000..bdf45af1d6044 --- /dev/null +++ b/pkgs/by-name/sh/shadow/disable-xaprintf-test.patch @@ -0,0 +1,14 @@ +diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am +index 6e94318..dca18bb 100644 +--- a/tests/unit/Makefile.am ++++ b/tests/unit/Makefile.am +@@ -10,8 +10,7 @@ check_PROGRAMS = \ + test_snprintf \ + test_strncpy \ + test_strtcpy \ +- test_typetraits \ +- test_xaprintf ++ test_typetraits + + if ENABLE_LOGIND + check_PROGRAMS += \ diff --git a/pkgs/by-name/sh/shadow/fix-install-with-tcb.patch b/pkgs/by-name/sh/shadow/fix-install-with-tcb.patch index ff6166b92f1d3..33d90fe1e48ea 100644 --- a/pkgs/by-name/sh/shadow/fix-install-with-tcb.patch +++ b/pkgs/by-name/sh/shadow/fix-install-with-tcb.patch @@ -1,28 +1,12 @@ diff --git a/src/Makefile.am b/src/Makefile.am -index a1a2e4e..fa17f9d 100644 +index 6981815..bcc4568 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -74,10 +74,6 @@ suidubins += newgidmap newuidmap - endif - endif - --if WITH_TCB --shadowsgidubins = passwd --endif -- - LDADD = $(INTLLIBS) \ - $(top_builddir)/libmisc/libmisc.la \ - $(top_builddir)/lib/libshadow.la \ -@@ -146,12 +142,6 @@ install-am: all-am - set -e; for i in $(suidusbins); do \ - chmod $(suidperms) $(DESTDIR)$(usbindir)/$$i; \ +@@ -152,7 +152,6 @@ install-am: all-am done --if WITH_TCB -- set -e; for i in $(shadowsgidubins); do \ + if WITH_TCB + set -e; for i in $(shadowsgidubins); do \ - chown root:shadow $(DESTDIR)$(ubindir)/$$i; \ -- chmod $(sgidperms) $(DESTDIR)$(ubindir)/$$i; \ -- done --endif - if ENABLE_SUBIDS - if FCAPS - setcap cap_setuid+ep $(DESTDIR)$(ubindir)/newuidmap + chmod $(sgidperms) $(DESTDIR)$(ubindir)/$$i; \ + done + endif diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix index 028576075fdc6..c904337dc53d4 100644 --- a/pkgs/by-name/sh/shadow/package.nix +++ b/pkgs/by-name/sh/shadow/package.nix @@ -19,6 +19,7 @@ libbsd, withTcb ? lib.meta.availableOn stdenv.hostPlatform tcb, tcb, + cmocka, }: let glibc' = @@ -68,10 +69,17 @@ stdenv.mkDerivation rec { ++ lib.optional withTcb tcb; patches = [ + # Don't set $PATH to /bin:/usr/bin but inherit the $PATH of the caller. ./keep-path.patch # Obtain XML resources from XML catalog (patch adapted from gtk-doc) ./respect-xml-catalog-files-var.patch + # Avoid a chown during install to fix installation with tcb enabled + # Would have to be done as part of the NixOS modules, + # see https://github.com/NixOS/nixpkgs/issues/109457 ./fix-install-with-tcb.patch + # This unit test fails: https://github.com/shadow-maint/shadow/issues/1382 + # Can be removed after the next release + ./disable-xaprintf-test.patch ]; postPatch = '' @@ -104,6 +112,11 @@ stdenv.mkDerivation rec { substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc'.bin}/bin/nscd ''; + doCheck = true; + nativeCheckInputs = [ + cmocka + ]; + postInstall = '' # Move the su binary into the su package mkdir -p $su/bin @@ -125,6 +138,7 @@ stdenv.mkDerivation rec { passthru = { shellPath = "/bin/nologin"; + # TODO: Run system tests: https://github.com/shadow-maint/shadow/blob/master/doc/contributions/tests.md#system-tests tests = { inherit (nixosTests) shadow; }; }; } diff --git a/pkgs/by-name/sh/shapelib/package.nix b/pkgs/by-name/sh/shapelib/package.nix index 6c363af988359..f202f6da25746 100644 --- a/pkgs/by-name/sh/shapelib/package.nix +++ b/pkgs/by-name/sh/shapelib/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchDebianPatch, }: stdenv.mkDerivation rec { @@ -13,6 +14,16 @@ stdenv.mkDerivation rec { hash = "sha256-S3SjbO2U6ae+pAEVfmZK3cxb4lHn33+I1GdDYdoBLCE="; }; + patches = [ + # Fix build with gcc 15 + (fetchDebianPatch { + inherit pname version; + debianRevision = "1"; + patch = "gcc-15.patch"; + hash = "sha256-ubd8L2hxSAxTDiOSToVHGLHkpGOap5bnozdVdv9VgCQ="; + }) + ]; + doCheck = true; preCheck = '' patchShebangs tests contrib/tests diff --git a/pkgs/by-name/sh/shaperglot-cli/package.nix b/pkgs/by-name/sh/shaperglot-cli/package.nix index b04135fde4c50..dbefda1670f87 100644 --- a/pkgs/by-name/sh/shaperglot-cli/package.nix +++ b/pkgs/by-name/sh/shaperglot-cli/package.nix @@ -31,7 +31,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; installCheckPhase = '' runHook preInstallCheck diff --git a/pkgs/by-name/sh/sharutils/gcc15-c23-port.patch b/pkgs/by-name/sh/sharutils/gcc15-c23-port.patch new file mode 100644 index 0000000000000..be321476ff483 --- /dev/null +++ b/pkgs/by-name/sh/sharutils/gcc15-c23-port.patch @@ -0,0 +1,125 @@ +From: Petr Písař + +With GCC 15, which defaults to ISO 23, a build failed, for example like +this: + + gcc -DLOCALEDIR=\"/usr/local/share/locale\" -DHAVE_CONFIG_H -I. -I.. -I../libopts -I. -I.. -I../lib -I + ../lib -I../intl -Wno-format-contains-nul -g -O2 -Wno-format-contains-nul -c -o shar.o shar.c + In file included from local.h:23, + from shar-opts.h:354, + from shar.c:46: + ../lib/system.h:78:7: error: conflicting types for ‘fdopen’; have ‘FILE *(void)’ + 78 | FILE *fdopen (); + | ^~~~~~ + +The cause is that ISO C23 changed a meaning of an empty argument list +from an unspecified list to no arguments. + +Also K&R syntax is now deprecated and the compiler warned: + + encode.c: In function ‘write_encoded_bytes’: + encode.c:33:1: warning: old-style function definition [-Wold-style-definition] + 33 | write_encoded_bytes (group, file) + | ^~~~~~~~~~~~~~~~~~~ + +This patch fixes both the erros and the warnigs by specifying all the +arguments in the modern syntax. + +Signed-off-by: Petr Písař +--- + lib/system.h | 6 +++--- + src/encode.c | 13 +++---------- + src/shar.c | 2 +- + src/uudecode.c | 2 +- + 4 files changed, 8 insertions(+), 15 deletions(-) + +diff --git a/lib/system.h b/lib/system.h +index 2b9846b..811e8cf 100644 +--- a/lib/system.h ++++ b/lib/system.h +@@ -52,7 +52,7 @@ typedef enum {false = 0, true = 1} bool; + #endif + + #if !HAVE_DECL_STRTOIMAX && !defined strtoimax +-intmax_t strtoimax (); ++intmax_t strtoimax (const char *nptr, char **endptr, int base); + #endif + + #if HAVE_STRING_H +@@ -75,8 +75,8 @@ intmax_t strtoimax (); + # include + #endif + +-FILE *fdopen (); +-FILE *popen (); ++FILE *fdopen (int fd, const char *mode); ++FILE *popen (const char *command, const char *type); + + /* Global functions of the shar package. */ + +diff --git a/src/encode.c b/src/encode.c +index 09e0c69..b1de8bd 100644 +--- a/src/encode.c ++++ b/src/encode.c +@@ -30,9 +30,7 @@ + `------------------------------------------*/ + + static void +-write_encoded_bytes (group, file) +- char *group; +- FILE *file; ++write_encoded_bytes (char *group, FILE *file) + { + int c1, c2, c3, c4; + +@@ -52,10 +50,7 @@ write_encoded_bytes (group, file) + `--------------------------------------------------------------------*/ + + static int +-read_raw_bytes (file, buffer, buffer_size) +- FILE *file; +- char *buffer; +- int buffer_size; ++read_raw_bytes (FILE *file, char *buffer, int buffer_size) + { + int character; + int counter; +@@ -75,9 +70,7 @@ read_raw_bytes (file, buffer, buffer_size) + `----------------------------------------------------*/ + + void +-copy_file_encoded (input, output) +- FILE *input; +- FILE *output; ++copy_file_encoded (FILE *input, FILE *output) + { + char buffer[LINE_BUFFER_SIZE]; + int counter; +diff --git a/src/shar.c b/src/shar.c +index 6d7ed1d..2c6e2e1 100644 +--- a/src/shar.c ++++ b/src/shar.c +@@ -109,7 +109,7 @@ static inline unsigned char to_uchar (char ch) { return ch; } + #define IS_GRAPH(_c) (isprint (to_uchar (_c)) && !isspace (to_uchar (_c))) + #endif + +-struct tm *localtime (); ++struct tm *localtime (const time_t *timep); + + #if MSDOS + /* 1 extra for CR. */ +diff --git a/src/uudecode.c b/src/uudecode.c +index 0621c99..b8a316e 100644 +--- a/src/uudecode.c ++++ b/src/uudecode.c +@@ -82,7 +82,7 @@ static char const cright_years_z[] = + #define UU_CHMOD(_n, _fd, _m) chmod ((_n), UU_MODE_BITS(_m)) + #endif + +-struct passwd *getpwnam (); ++struct passwd *getpwnam (const char *name); + + static uudecode_exit_code_t read_stduu( + const char *inname, const char *outname); +-- +2.48.1 diff --git a/pkgs/by-name/sh/sharutils/gcc15-getcwdm4-port.patch b/pkgs/by-name/sh/sharutils/gcc15-getcwdm4-port.patch new file mode 100644 index 0000000000000..0c0d7fdac4b10 --- /dev/null +++ b/pkgs/by-name/sh/sharutils/gcc15-getcwdm4-port.patch @@ -0,0 +1,37 @@ +From: Petr Písař + +Some confgure tests failed because of function arguments missing from +the prototypes: + + configure:16105: checking whether getcwd (NULL, 0) allocates memory for result + configure:16162: gcc -o conftest -g -O2 conftest.c >&5 + conftest.c:186:16: error: conflicting types for 'getcwd'; have 'char *(void)' + 186 | char *getcwd (); + | ^~~~~~ + In file included from conftest.c:181: + /usr/include/unistd.h:531:14: note: previous declaration of 'getcwd' with type 'char *(char *, size_t)' + +This patch fixes it. + +Maintainer is encouraged to rebase the m4 files to the latest gnulib. + +Signed-off-by: Petr Písař +--- + m4/getcwd.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/getcwd.m4 b/m4/getcwd.m4 +index b9fbcec..6f24b14 100644 +--- a/m4/getcwd.m4 ++++ b/m4/getcwd.m4 +@@ -21,7 +21,7 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL], + # include + # endif + # ifndef getcwd +- char *getcwd (); ++ char *getcwd (char *buf, size_t size); + # endif + ]], [[ + #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +-- +2.48.1 diff --git a/pkgs/by-name/sh/sharutils/gcc15-stdboolm4-backport.patch b/pkgs/by-name/sh/sharutils/gcc15-stdboolm4-backport.patch new file mode 100644 index 0000000000000..ae8d273067745 --- /dev/null +++ b/pkgs/by-name/sh/sharutils/gcc15-stdboolm4-backport.patch @@ -0,0 +1,202 @@ +From: Petr Písař + +The bundled gnulib check for stdbool.h did not account for ISO C23 +which provides its own false and true keywords. As a result stdbool.h +presence was not correctly detected and libopts/compat/compat.h, +bundled from AutoGen, failed to compile with GCC 15 which defaults to +ISO C23: + + In file included from autoopts/project.h:30, + from libopts.c:2: + ./compat/compat.h:188:19: error: cannot use keyword ‘false’ as enumeration constant + 188 | typedef enum { false = 0, true = 1 } _Bool; + | ^~~~~ + ./compat/compat.h:188:19: note: ‘false’ is a keyword with ‘-std=c23’ onwards + ./compat/compat.h:188:41: error: expected ‘;’, identifier or ‘(’ before ‘_Bool’ + 188 | typedef enum { false = 0, true = 1 } _Bool; + | ^~~~~ + +Signed-off-by: Petr Písař +--- + m4/stdbool.m4 | 129 +++++++++++++++++++++++++++++--------------------- + 1 file changed, 74 insertions(+), 55 deletions(-) + +diff --git a/m4/stdbool.m4 b/m4/stdbool.m4 +index 7273b82..8e00e4a 100644 +--- a/m4/stdbool.m4 ++++ b/m4/stdbool.m4 +@@ -1,27 +1,40 @@ + # Check for stdbool.h that conforms to C99. + +-dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc. ++dnl Copyright (C) 2002-2006, 2009-2023 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-#serial 5 ++#serial 10 + + # Prepare for substituting if it is not supported. + + AC_DEFUN([AM_STDBOOL_H], + [ + AC_REQUIRE([AC_CHECK_HEADER_STDBOOL]) ++ AC_REQUIRE([AC_CANONICAL_HOST]) + +- # Define two additional variables used in the Makefile substitution. +- ++ dnl On some platforms, does not exist or does not conform to C99. ++ dnl On Solaris 10 with CC=cc CXX=CC, exists but is not usable ++ dnl in C++ mode (and no exists). In this case, we use our ++ dnl replacement, also in C mode (for binary compatibility between C and C++). + if test "$ac_cv_header_stdbool_h" = yes; then +- STDBOOL_H='' ++ case "$host_os" in ++ solaris*) ++ if test -z "$GCC"; then ++ GL_GENERATE_STDBOOL_H=true ++ else ++ GL_GENERATE_STDBOOL_H=false ++ fi ++ ;; ++ *) ++ GL_GENERATE_STDBOOL_H=false ++ ;; ++ esac + else +- STDBOOL_H='stdbool.h' ++ GL_GENERATE_STDBOOL_H=true + fi +- AC_SUBST([STDBOOL_H]) +- AM_CONDITIONAL([GL_GENERATE_STDBOOL_H], [test -n "$STDBOOL_H"]) ++ AM_CONDITIONAL([GL_GENERATE_STDBOOL_H], [test "$GL_GENERATE_STDBOOL_H" = "true"]) + + if test "$ac_cv_type__Bool" = yes; then + HAVE__BOOL=1 +@@ -31,70 +44,76 @@ AC_DEFUN([AM_STDBOOL_H], + AC_SUBST([HAVE__BOOL]) + ]) + +-# AM_STDBOOL_H will be renamed to gl_STDBOOL_H in the future. +-AC_DEFUN([gl_STDBOOL_H], [AM_STDBOOL_H]) +- +-# This version of the macro is needed in autoconf <= 2.68. ++m4_version_prereq([2.72], [], [ + + AC_DEFUN([AC_CHECK_HEADER_STDBOOL], +- [AC_CACHE_CHECK([for stdbool.h that conforms to C99], ++ [AC_CHECK_TYPES([_Bool]) ++ AC_CACHE_CHECK([for stdbool.h that conforms to C99 or later], + [ac_cv_header_stdbool_h], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( +- [[ +- #include +- #ifndef bool +- "error: bool is not defined" ++ [[#include ++ ++ /* "true" and "false" should be usable in #if expressions and ++ integer constant expressions, and "bool" should be a valid ++ type name. ++ ++ Although C99 requires bool, true, and false to be macros, ++ C23 and C++11 overrule that, so do not test for that. ++ Although C99 requires __bool_true_false_are_defined and ++ _Bool, C23 says they are obsolescent, so do not require ++ them. */ ++ ++ #if !true ++ #error "'true' is not true" + #endif +- #ifndef false +- "error: false is not defined" ++ #if true != 1 ++ #error "'true' is not equal to 1" + #endif ++ char b[true == 1 ? 1 : -1]; ++ char c[true]; ++ + #if false +- "error: false is not 0" ++ #error "'false' is not false" + #endif +- #ifndef true +- "error: true is not defined" +- #endif +- #if true != 1 +- "error: true is not 1" +- #endif +- #ifndef __bool_true_false_are_defined +- "error: __bool_true_false_are_defined is not defined" ++ #if false != 0 ++ #error "'false' is not equal to 0" + #endif ++ char d[false == 0 ? 1 : -1]; ++ ++ enum { e = false, f = true, g = false * true, h = true * 256 }; ++ ++ char i[(bool) 0.5 == true ? 1 : -1]; ++ char j[(bool) 0.0 == false ? 1 : -1]; ++ char k[sizeof (bool) > 0 ? 1 : -1]; ++ ++ struct sb { bool s: 1; bool t; } s; ++ char l[sizeof s.t > 0 ? 1 : -1]; + +- struct s { _Bool s: 1; _Bool t; } s; +- +- char a[true == 1 ? 1 : -1]; +- char b[false == 0 ? 1 : -1]; +- char c[__bool_true_false_are_defined == 1 ? 1 : -1]; +- char d[(bool) 0.5 == true ? 1 : -1]; +- /* See body of main program for 'e'. */ +- char f[(_Bool) 0.0 == false ? 1 : -1]; +- char g[true]; +- char h[sizeof (_Bool)]; +- char i[sizeof s.t]; +- enum { j = false, k = true, l = false * true, m = true * 256 }; + /* The following fails for + HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ +- _Bool n[m]; +- char o[sizeof n == m * sizeof n[0] ? 1 : -1]; +- char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; ++ bool m[h]; ++ char n[sizeof m == h * sizeof m[0] ? 1 : -1]; ++ char o[-1 - (bool) 0 < 0 ? 1 : -1]; + /* Catch a bug in an HP-UX C compiler. See +- http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html +- http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html ++ https://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html ++ https://lists.gnu.org/r/bug-coreutils/2005-11/msg00161.html + */ +- _Bool q = true; +- _Bool *pq = &q; ++ bool p = true; ++ bool *pp = &p; + ]], + [[ +- bool e = &s; +- *pq |= q; +- *pq |= ! q; +- /* Refer to every declared value, to avoid compiler optimizations. */ +- return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l +- + !m + !n + !o + !p + !q + !pq); ++ bool ps = &s; ++ *pp |= p; ++ *pp |= ! p; ++ ++ /* Refer to every declared value, so they cannot be ++ discarded as unused. */ ++ return (!b + !c + !d + !e + !f + !g + !h + !i + !j + !k ++ + !l + !m + !n + !o + !p + !pp + !ps); + ]])], + [ac_cv_header_stdbool_h=yes], + [ac_cv_header_stdbool_h=no])]) +- AC_CHECK_TYPES([_Bool]) +-]) ++])# AC_CHECK_HEADER_STDBOOL ++ ++]) # m4_version_prereq 2.72 +-- +2.48.1 diff --git a/pkgs/by-name/sh/sharutils/package.nix b/pkgs/by-name/sh/sharutils/package.nix index 959940b276726..8128c520b1f27 100644 --- a/pkgs/by-name/sh/sharutils/package.nix +++ b/pkgs/by-name/sh/sharutils/package.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, fetchpatch, + autoreconfHook, gettext, coreutils, updateAutotoolsGnuConfigScriptsHook, @@ -21,6 +22,7 @@ stdenv.mkDerivation rec { # GNU Gettext is needed on non-GNU platforms. buildInputs = [ + autoreconfHook coreutils gettext ]; @@ -55,6 +57,12 @@ stdenv.mkDerivation rec { url = "https://lists.gnu.org/archive/html/bug-gnu-utils/2020-01/txt5Z_KZup0yN.txt"; sha256 = "0an8vfy3qj6sss9w0i4j8ilf7g5mbc7y13l644jy5bcm9przcjbd"; }) + + # various build fixes for >= gcc 15, sourced from + # https://lists.gnu.org/archive/html/bug-gnu-utils/2025-03/msg00000.html + ./gcc15-stdboolm4-backport.patch + ./gcc15-getcwdm4-port.patch + ./gcc15-c23-port.patch ]; postPatch = diff --git a/pkgs/by-name/sh/shelldap/package.nix b/pkgs/by-name/sh/shelldap/package.nix index 3144a7fdce052..4b222ed0e8b73 100644 --- a/pkgs/by-name/sh/shelldap/package.nix +++ b/pkgs/by-name/sh/shelldap/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, perlPackages, - shortenPerlShebang, }: perlPackages.buildPerlPackage rec { @@ -29,8 +28,6 @@ perlPackages.buildPerlPackage rec { YAMLSyck ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - prePatch = '' touch Makefile.PL ''; @@ -41,10 +38,6 @@ perlPackages.buildPerlPackage rec { runHook postInstall ''; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/shelldap - ''; - # no make target 'test', not tests provided by source doCheck = false; diff --git a/pkgs/by-name/sh/shine/package.nix b/pkgs/by-name/sh/shine/package.nix index 903fd51e4edfc..ad53d5aed78aa 100644 --- a/pkgs/by-name/sh/shine/package.nix +++ b/pkgs/by-name/sh/shine/package.nix @@ -5,15 +5,15 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "shine"; - version = "3.1.1"; + version = "3.1.1-unstable-2023-01-01"; src = fetchFromGitHub { owner = "toots"; repo = "shine"; - rev = version; - sha256 = "06nwylqqji0i1isdprm2m5qsdj4qiywcgnp69c5b55pnw43f07qg"; + rev = "ab5e3526b64af1a2eaa43aa6f441a7312e013519"; + hash = "sha256-rlKWVgIl/WVIzwwMuPyWaiwvbpZi5HvKXU3S6qLoN3I="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/sh/shtris/package.nix b/pkgs/by-name/sh/shtris/package.nix index ee70c6eea6ef6..269fee615f29a 100644 --- a/pkgs/by-name/sh/shtris/package.nix +++ b/pkgs/by-name/sh/shtris/package.nix @@ -29,7 +29,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/si/sidekick/package.nix b/pkgs/by-name/si/sidekick/package.nix index 3ff0b4340c448..c63dc1e22aa73 100644 --- a/pkgs/by-name/si/sidekick/package.nix +++ b/pkgs/by-name/si/sidekick/package.nix @@ -42,7 +42,6 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Command-line tool designed to simplify the process of deploying and managing applications on a VPS"; diff --git a/pkgs/by-name/si/signal-cli/package.nix b/pkgs/by-name/si/signal-cli/package.nix index 3f9db37f9e084..f4797f9349bba 100644 --- a/pkgs/by-name/si/signal-cli/package.nix +++ b/pkgs/by-name/si/signal-cli/package.nix @@ -63,7 +63,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { doInstallCheck = stdenvNoCC.hostPlatform.isLinux; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { homepage = "https://github.com/AsamK/signal-cli"; diff --git a/pkgs/by-name/si/sigsum/package.nix b/pkgs/by-name/si/sigsum/package.nix index cd94e53c8c974..06a931d16b5fa 100644 --- a/pkgs/by-name/si/sigsum/package.nix +++ b/pkgs/by-name/si/sigsum/package.nix @@ -35,7 +35,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/sigsum-key"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/si/similarity/package.nix b/pkgs/by-name/si/similarity/package.nix index 3ad4c9c5072df..7ee56ceacbf27 100644 --- a/pkgs/by-name/si/similarity/package.nix +++ b/pkgs/by-name/si/similarity/package.nix @@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.pname}-ts"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/si/siril/package.nix b/pkgs/by-name/si/siril/package.nix index d35779d0f926d..9461a0e0b1a43 100644 --- a/pkgs/by-name/si/siril/package.nix +++ b/pkgs/by-name/si/siril/package.nix @@ -94,8 +94,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/sk/sketchybar/package.nix b/pkgs/by-name/sk/sketchybar/package.nix index e8f8ce09677ab..d1b47969597ed 100644 --- a/pkgs/by-name/sk/sketchybar/package.nix +++ b/pkgs/by-name/sk/sketchybar/package.nix @@ -46,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/sk/skhd/package.nix b/pkgs/by-name/sk/skhd/package.nix index 4c2012220a51e..f487cd1266724 100644 --- a/pkgs/by-name/sk/skhd/package.nix +++ b/pkgs/by-name/sk/skhd/package.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sk/skia-aseprite/package.nix b/pkgs/by-name/sk/skia-aseprite/package.nix index 1f5aaf9ebda3e..e901343a2941d 100644 --- a/pkgs/by-name/sk/skia-aseprite/package.nix +++ b/pkgs/by-name/sk/skia-aseprite/package.nix @@ -40,6 +40,16 @@ clangStdenv.mkDerivation (finalAttrs: { python3 ]; + # Using substituteInPlace because no clean upstream backport for GCC 15 exists for this version of Skia, newer versions fix this with large refactorings. + postPatch = '' + substituteInPlace include/private/SkSLProgramKind.h \ + --replace-fail "#include " "#include + #include " + substituteInPlace src/sksl/transform/SkSLTransform.h \ + --replace-fail "#include " "#include + #include " + ''; + preConfigure = with depSrcs; '' mkdir -p third_party/externals ln -s ${angle2} third_party/externals/angle2 diff --git a/pkgs/by-name/sk/skktools/package.nix b/pkgs/by-name/sk/skktools/package.nix index 7fb5f1992a84b..816b60adbcfe9 100644 --- a/pkgs/by-name/sk/skktools/package.nix +++ b/pkgs/by-name/sk/skktools/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, pkg-config, gdbm, glib, @@ -34,6 +35,16 @@ stdenv.mkDerivation rec { # sha256 = "1k9zxqybl1l5h0a8px2awc920qrdyp1qls50h3kfrj3g65d08aq2"; # }; + patches = [ + # Fix build with gcc15 + # https://github.com/skk-dev/skktools/pull/30 + (fetchpatch { + name = "skktools-fix-function-prototype-empty-arguments-gcc15.patch"; + url = "https://github.com/skk-dev/skktools/commit/fb6a295607dbe2b5171c2c89f8a2f0b82bee9766.patch"; + hash = "sha256-wao2kRsDq5WN4JO/YpXhNirsdnA3vZpsY9GDCTPSJKY="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gdbm diff --git a/pkgs/by-name/sl/sleuthkit/package.nix b/pkgs/by-name/sl/sleuthkit/package.nix index 2241c3c18c695..d91930eaa07fa 100644 --- a/pkgs/by-name/sl/sleuthkit/package.nix +++ b/pkgs/by-name/sl/sleuthkit/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, autoreconfHook, ant, jdk, @@ -75,6 +76,18 @@ stdenv.mkDerivation (finalAttrs: { chmod -R 755 $IVY_HOME ''; + patches = [ + # Fix build with gcc 15 + (fetchpatch { + url = "https://github.com/sleuthkit/sleuthkit/commit/8d710c36a947a2666bbef689155831d76fff56b9.patch"; + hash = "sha256-/mCal0EVTM2dM5ok3OmAXQ1HiaCUi0lmhavIuwxVEMA="; + }) + (fetchpatch { + url = "https://github.com/sleuthkit/sleuthkit/commit/f78bd37db6be72f8f4d444d124be4e26488dce4b.patch"; + hash = "sha256-ZEeN0jp5cRi6dOpWlcGYm0nLLu5b56ivdR+WrhnhCz0="; + }) + ]; + postPatch = '' substituteInPlace tsk/img/ewf.cpp --replace libewf_handle_read_random libewf_handle_read_buffer_at_offset ''; diff --git a/pkgs/by-name/sl/slipshow/package.nix b/pkgs/by-name/sl/slipshow/package.nix index 7a68b342ad61e..e686bb3d68525 100644 --- a/pkgs/by-name/sl/slipshow/package.nix +++ b/pkgs/by-name/sl/slipshow/package.nix @@ -48,7 +48,6 @@ ocamlPackages.buildDunePackage rec { doCheck = true; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/sl/slowlorust/package.nix b/pkgs/by-name/sl/slowlorust/package.nix index 984ca77783f2f..55ddccfcf4ff5 100644 --- a/pkgs/by-name/sl/slowlorust/package.nix +++ b/pkgs/by-name/sl/slowlorust/package.nix @@ -28,8 +28,6 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; - versionCheckProgramArg = "--version"; - meta = { description = "Lightweight slowloris (HTTP DoS) tool"; homepage = "https://github.com/MJVL/slowlorust"; diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix index abea2a8237bd9..b6ae7a98d1915 100644 --- a/pkgs/by-name/sl/slumber/package.nix +++ b/pkgs/by-name/sl/slumber/package.nix @@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sm/smeagol/package.nix b/pkgs/by-name/sm/smeagol/package.nix index 52aa642aee0aa..b886431d0caa2 100644 --- a/pkgs/by-name/sm/smeagol/package.nix +++ b/pkgs/by-name/sm/smeagol/package.nix @@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/smeagol-wiki"; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sm/smpmgr/package.nix b/pkgs/by-name/sm/smpmgr/package.nix index f4b2cd5a15344..5f9a63eca5e73 100644 --- a/pkgs/by-name/sm/smpmgr/package.nix +++ b/pkgs/by-name/sm/smpmgr/package.nix @@ -37,7 +37,6 @@ python3Packages.buildPythonApplication rec { pytestCheckHook versionCheckHook ]; - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "smpmgr" ]; diff --git a/pkgs/by-name/sn/snakefmt/package.nix b/pkgs/by-name/sn/snakefmt/package.nix index 9aa688267d78c..ee7cf904e451d 100644 --- a/pkgs/by-name/sn/snakefmt/package.nix +++ b/pkgs/by-name/sn/snakefmt/package.nix @@ -33,7 +33,6 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "snakefmt" ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sn/snakemake/package.nix b/pkgs/by-name/sn/snakemake/package.nix index 740e5530b44c6..b531989299cf5 100644 --- a/pkgs/by-name/sn/snakemake/package.nix +++ b/pkgs/by-name/sn/snakemake/package.nix @@ -87,8 +87,6 @@ python3Packages.buildPythonApplication rec { ]) ++ [ writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; - enabledTestPaths = [ "tests/tests.py" "tests/test_expand.py" diff --git a/pkgs/by-name/sn/sniffnet/package.nix b/pkgs/by-name/sn/sniffnet/package.nix index 6da62da38bc4f..d092483c5c254 100644 --- a/pkgs/by-name/sn/sniffnet/package.nix +++ b/pkgs/by-name/sn/sniffnet/package.nix @@ -88,7 +88,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix index 58ac5cce5dc9a..4b9cb21ff217e 100644 --- a/pkgs/by-name/sn/snx-rs/package.nix +++ b/pkgs/by-name/sn/snx-rs/package.nix @@ -51,7 +51,6 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/snx-rs"; - versionCheckProgramArg = "--version"; meta = { description = "Open source Linux client for Checkpoint VPN tunnels"; diff --git a/pkgs/by-name/so/solana-cli/package.nix b/pkgs/by-name/so/solana-cli/package.nix index 05eb62917bc76..a74d92b29a99a 100644 --- a/pkgs/by-name/so/solana-cli/package.nix +++ b/pkgs/by-name/so/solana-cli/package.nix @@ -82,7 +82,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/solana"; - versionCheckProgramArg = "--version"; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd solana \ diff --git a/pkgs/by-name/so/solc/package.nix b/pkgs/by-name/so/solc/package.nix index 0edaea143d2a3..141795a126a28 100644 --- a/pkgs/by-name/so/solc/package.nix +++ b/pkgs/by-name/so/solc/package.nix @@ -32,7 +32,6 @@ let nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { @@ -55,7 +54,6 @@ let pname version nativeInstallCheckInputs - versionCheckProgramArg doInstallCheck meta ; @@ -158,7 +156,6 @@ let pname version nativeInstallCheckInputs - versionCheckProgramArg doInstallCheck meta ; diff --git a/pkgs/by-name/so/somo/package.nix b/pkgs/by-name/so/somo/package.nix index ab4a8d5537fd2..676fae36822e5 100644 --- a/pkgs/by-name/so/somo/package.nix +++ b/pkgs/by-name/so/somo/package.nix @@ -50,7 +50,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/so/sops/package.nix b/pkgs/by-name/so/sops/package.nix index 5b9f8c8977a1f..bdf11b100e4d0 100644 --- a/pkgs/by-name/so/sops/package.nix +++ b/pkgs/by-name/so/sops/package.nix @@ -42,7 +42,6 @@ buildGoModule (final: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sp/spacetimedb/package.nix b/pkgs/by-name/sp/spacetimedb/package.nix index 0e3f3afca43dc..4a015d8f1063a 100644 --- a/pkgs/by-name/sp/spacetimedb/package.nix +++ b/pkgs/by-name/sp/spacetimedb/package.nix @@ -59,7 +59,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/spacetime"; - versionCheckProgramArg = "--version"; postInstall = '' mv $out/bin/spacetimedb-cli $out/bin/spacetime diff --git a/pkgs/by-name/sp/spdlog/package.nix b/pkgs/by-name/sp/spdlog/package.nix index d7a205d02b5c8..02c62bc429c46 100644 --- a/pkgs/by-name/sp/spdlog/package.nix +++ b/pkgs/by-name/sp/spdlog/package.nix @@ -16,24 +16,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "spdlog"; - version = "1.15.3"; + version = "1.16.0"; src = fetchFromGitHub { owner = "gabime"; repo = "spdlog"; tag = "v${finalAttrs.version}"; - hash = "sha256-0rOR9G2Y4Z4OBZtUHxID0s1aXN9ejodHrurlVCA0pIo="; + hash = "sha256-VB82cNfpJlamUjrQFYElcy0CXAbkPqZkD5zhuLeHLzs="; }; - patches = [ - # https://github.com/gabime/spdlog/pull/3451 - (fetchpatch { - name = "catch2-3.9.0-compat.patch"; - url = "https://github.com/gabime/spdlog/commit/3edc8036dbf3c7cdf0e460a913ae294c87ae90dc.patch"; - hash = "sha256-0XtNaAvDGpSTtQZjxmLbHOoY4OMZDJfLDzBh7gNQh2c="; - }) - ]; - nativeBuildInputs = [ cmake ]; # Required to build tests, even if they aren't executed buildInputs = [ catch2_3 ]; diff --git a/pkgs/by-name/sp/speechd/package.nix b/pkgs/by-name/sp/speechd/package.nix index 1768b139638dc..361304524ec1d 100644 --- a/pkgs/by-name/sp/speechd/package.nix +++ b/pkgs/by-name/sp/speechd/package.nix @@ -15,6 +15,7 @@ glib, dotconf, libsndfile, + runtimeShell, withLibao ? true, libao, withPulse ? false, @@ -101,6 +102,7 @@ stdenv.mkDerivation (finalAttrs: { ]; configureFlags = [ + "--sysconfdir=/etc" # Audio method falls back from left to right. "--with-default-audio-method=\"libao,pulse,alsa,oss\"" "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" @@ -127,8 +129,13 @@ stdenv.mkDerivation (finalAttrs: { postPatch = lib.optionalString withPico '' substituteInPlace src/modules/pico.c --replace "/usr/share/pico/lang" "${svox}/share/pico/lang" + substituteInPlace src/modules/generic.c --replace-fail "/bin/bash" "${runtimeShell}" ''; + installFlags = [ + "sysconfdir=${placeholder "out"}/etc" + ]; + postInstall = if libsOnly then '' diff --git a/pkgs/by-name/sp/sphinxygen/package.nix b/pkgs/by-name/sp/sphinxygen/package.nix index 2d227085768a8..3d24ecb148a96 100644 --- a/pkgs/by-name/sp/sphinxygen/package.nix +++ b/pkgs/by-name/sp/sphinxygen/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sphinxygen"; - version = "1.0.10"; + version = "1.0.12"; pyproject = true; src = fetchFromGitLab { owner = "drobilla"; repo = "sphinxygen"; tag = "v${version}"; - hash = "sha256-Xii5pDa1eHrHUKERC2gDif/NIkpab/IZYBRvMq9YKtE="; + hash = "sha256-54D7h6JCsUEh3y6WmpSaMFlRBElve1lscbQtJz+OJTQ="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/sp/spider/package.nix b/pkgs/by-name/sp/spider/package.nix index 86e2dc3e1d7ab..d07a58c5d72d2 100644 --- a/pkgs/by-name/sp/spider/package.nix +++ b/pkgs/by-name/sp/spider/package.nix @@ -66,7 +66,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sp/spirv-cross/package.nix b/pkgs/by-name/sp/spirv-cross/package.nix index afb3bf7411c7a..7836c338656e5 100644 --- a/pkgs/by-name/sp/spirv-cross/package.nix +++ b/pkgs/by-name/sp/spirv-cross/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spirv-cross"; - version = "1.4.328.0"; + version = "1.4.335.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-Fq2Kw8KOlh35hRZy5EnPtWAjazun4vdTk/HyhY76GRM="; + hash = "sha256-BmWHmGh7wu2hkOm04PhHxwTs3e8r8O62tq6SDx6b5xM="; }; nativeBuildInputs = [ @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { python3 ]; - cmakeFlags = lib.optionals stdenv.hostPlatform.isLinux [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isUnix [ (lib.cmakeBool "SPIRV_CROSS_SHARED" true) ]; diff --git a/pkgs/by-name/sp/spirv-headers/package.nix b/pkgs/by-name/sp/spirv-headers/package.nix index c6861fa3453f0..41fe45a1f3886 100644 --- a/pkgs/by-name/sp/spirv-headers/package.nix +++ b/pkgs/by-name/sp/spirv-headers/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spirv-headers"; - version = "1.4.328.0"; + version = "1.4.335.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-gewCQvcVRw+qdWPWRlYUMTt/aXrZ7Lea058WyqL5c08="; + hash = "sha256-HjJjMuqTrYv5LUOWcexzPHb8nhOT4duooDAhDsd44Zo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/sp/spirv-tools/package.nix b/pkgs/by-name/sp/spirv-tools/package.nix index 0a79caa40efee..9cb82cd659f5f 100644 --- a/pkgs/by-name/sp/spirv-tools/package.nix +++ b/pkgs/by-name/sp/spirv-tools/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spirv-tools"; - version = "1.4.328.0"; + version = "1.4.335.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-NXxC5XLvEEIAlA0sym6l7vWj+g8pJ4trsJI3pmZwRxU="; + hash = "sha256-H+t7ZH4SB+XgWTLj9XaJWZwAWk8M2QeC98Zi5ay8PBc="; }; # The cmake options are sufficient for turning on static building, but not diff --git a/pkgs/by-name/sq/sqld/package.nix b/pkgs/by-name/sq/sqld/package.nix index 2f12436bb919b..8254f81468b09 100644 --- a/pkgs/by-name/sq/sqld/package.nix +++ b/pkgs/by-name/sq/sqld/package.nix @@ -65,7 +65,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sq/sqruff/package.nix b/pkgs/by-name/sq/sqruff/package.nix index 954e095ef2ab1..a9f3bd29dd166 100644 --- a/pkgs/by-name/sq/sqruff/package.nix +++ b/pkgs/by-name/sq/sqruff/package.nix @@ -39,7 +39,6 @@ rustPlatform.buildRustPackage rec { ''; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ss/sscg/package.nix b/pkgs/by-name/ss/sscg/package.nix index f8379d08d710c..ee6ebf08e0521 100644 --- a/pkgs/by-name/ss/sscg/package.nix +++ b/pkgs/by-name/ss/sscg/package.nix @@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = gitUpdater { rev-prefix = "sscg-"; }; diff --git a/pkgs/by-name/ss/ssh-vault/package.nix b/pkgs/by-name/ss/ssh-vault/package.nix index 183925c932bcb..0ef9b33ba08f9 100644 --- a/pkgs/by-name/ss/ssh-vault/package.nix +++ b/pkgs/by-name/ss/ssh-vault/package.nix @@ -38,7 +38,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ss/sshocker/package.nix b/pkgs/by-name/ss/sshocker/package.nix index 6ba6011895e04..bfa19b7c947e2 100644 --- a/pkgs/by-name/ss/sshocker/package.nix +++ b/pkgs/by-name/ss/sshocker/package.nix @@ -28,8 +28,6 @@ buildGoModule rec { doInstallCheck = true; - versionCheckProgramArg = "--version"; - meta = { description = "Tool for SSH, reverse sshfs and port forwarder"; homepage = "https://github.com/lima-vm/sshocker"; diff --git a/pkgs/by-name/ss/sshwifty/package.nix b/pkgs/by-name/ss/sshwifty/package.nix index f7a9298884bf9..01e976f359452 100644 --- a/pkgs/by-name/ss/sshwifty/package.nix +++ b/pkgs/by-name/ss/sshwifty/package.nix @@ -1,45 +1,46 @@ { lib, - buildGo125Module, - buildNpmPackage, + buildGoModule, fetchFromGitHub, + fetchNpmDeps, + nodejs, + npmHooks, versionCheckHook, nixosTests, nix-update-script, - go_1_25, }: -buildGo125Module (finalAttrs: { +buildGoModule (finalAttrs: { pname = "sshwifty"; - version = "0.4.1-beta-release"; + version = "0.4.2-beta-release"; src = fetchFromGitHub { owner = "nirui"; repo = "sshwifty"; tag = finalAttrs.version; - hash = "sha256-Kg5aE4lkzSedo+VJgdsfO5XTKupsPU2DhZNdNhEQ/Q4="; + hash = "sha256-nx485HB0JqexcSdwhgbhoAwpK3Cg7tkgDrV3NM93pXk="; }; - sshwifty-ui = buildNpmPackage { - pname = "sshwifty-ui"; - inherit (finalAttrs) version src; - - npmDepsHash = "sha256-vX3CtjwjzcxxIPYG6QXsPybyBRow1YdS9pHr961P1HA="; - - npmBuildScript = "generate"; + nativeBuildInputs = [ + nodejs + npmHooks.npmConfigHook + ]; - postInstall = '' - cp -r application/controller/{static_pages,static_pages.go} \ - $out/lib/node_modules/sshwifty-ui/application/controller - ''; + overrideModAttrs = oldAttrs: { + nativeBuildInputs = lib.filter (drv: drv != npmHooks.npmConfigHook) oldAttrs.nativeBuildInputs; + preBuild = null; + }; - nativeBuildInputs = [ go_1_25 ]; + npmDeps = fetchNpmDeps { + inherit (finalAttrs) src; + hash = "sha256-5Y6hTsHSFOPhgLwEhMNOOCyLYNjp1Q5n8My3Q6lr7hQ="; }; - postPatch = '' - cp -r ${finalAttrs.sshwifty-ui}/lib/node_modules/sshwifty-ui/* . - ''; + vendorHash = "sha256-4K0fxBBcv+ZSV0ocsoagjFAXRphA27xGO40pnewaKSU="; - vendorHash = "sha256-/SLUC0xM195QfKgX9te8UP1bbzRbKF+Npyugi19JijY="; + preBuild = '' + # Generate static pages + npm run generate + ''; ldflags = [ "-s" @@ -59,8 +60,6 @@ buildGo125Module (finalAttrs: { extraArgs = [ "--version=unstable" "--version-regex=^([0-9.]+(?!.+-prebuild).+$)" - "--subpackage" - "sshwifty-ui" ]; }; }; diff --git a/pkgs/by-name/st/stalwart-cli/package.nix b/pkgs/by-name/st/stalwart-cli/package.nix index e0fdbb09050e0..4c9d813e7a2ff 100644 --- a/pkgs/by-name/st/stalwart-cli/package.nix +++ b/pkgs/by-name/st/stalwart-cli/package.nix @@ -20,7 +20,6 @@ rustPlatform.buildRustPackage { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; # Prerelease reports incorrect version dontVersionCheck = true; diff --git a/pkgs/by-name/st/star/package.nix b/pkgs/by-name/st/star/package.nix index 94775b0de9be0..aa12d73861a60 100644 --- a/pkgs/by-name/st/star/package.nix +++ b/pkgs/by-name/st/star/package.nix @@ -51,7 +51,6 @@ stdenv.mkDerivation rec { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/STAR"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/st/stasis/package.nix b/pkgs/by-name/st/stasis/package.nix index ddd5c444f98b5..97815d6a47916 100644 --- a/pkgs/by-name/st/stasis/package.nix +++ b/pkgs/by-name/st/stasis/package.nix @@ -43,7 +43,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/st/strip-tags/package.nix b/pkgs/by-name/st/strip-tags/package.nix index 8f3343bb94fef..1387d5f6f3b81 100644 --- a/pkgs/by-name/st/strip-tags/package.nix +++ b/pkgs/by-name/st/strip-tags/package.nix @@ -32,7 +32,6 @@ python3Packages.buildPythonApplication rec { pyyaml versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "CLI tool for stripping tags from HTML"; diff --git a/pkgs/by-name/st/style50/package.nix b/pkgs/by-name/st/style50/package.nix index 034f7428aa4ec..b72831d5d7f88 100644 --- a/pkgs/by-name/st/style50/package.nix +++ b/pkgs/by-name/st/style50/package.nix @@ -51,7 +51,6 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "style50" ]; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; # no python tests diff --git a/pkgs/by-name/su/submit50/package.nix b/pkgs/by-name/su/submit50/package.nix index 6c6ddcb451bfc..646cd5831241a 100644 --- a/pkgs/by-name/su/submit50/package.nix +++ b/pkgs/by-name/su/submit50/package.nix @@ -32,7 +32,6 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "submit50" ]; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; # no python tests diff --git a/pkgs/by-name/su/sudo-rs/package.nix b/pkgs/by-name/su/sudo-rs/package.nix index f112b9b1309a0..7504db39c031a 100644 --- a/pkgs/by-name/su/sudo-rs/package.nix +++ b/pkgs/by-name/su/sudo-rs/package.nix @@ -78,7 +78,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; # sudo binary fails because it checks if it is suid 0 versionCheckProgram = "${placeholder "out"}/bin/su"; - versionCheckProgramArg = "--version"; postInstallCheck = '' [ -e ${placeholder "out"}/share/man/man8/sudo.8.gz ] || \ diff --git a/pkgs/by-name/su/sus-compiler/package.nix b/pkgs/by-name/su/sus-compiler/package.nix index 5c4c7e7bbdfa1..cd06a419ba490 100644 --- a/pkgs/by-name/su/sus-compiler/package.nix +++ b/pkgs/by-name/su/sus-compiler/package.nix @@ -61,7 +61,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/sus_compiler"; - versionCheckProgramArg = "--version"; updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; }; diff --git a/pkgs/by-name/su/suspicious-package/package.nix b/pkgs/by-name/su/suspicious-package/package.nix index b757bccd67153..63ba2be0c0324 100644 --- a/pkgs/by-name/su/suspicious-package/package.nix +++ b/pkgs/by-name/su/suspicious-package/package.nix @@ -38,7 +38,6 @@ stdenv.mkDerivation { versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/sw/swaysome/package.nix b/pkgs/by-name/sw/swaysome/package.nix index 30a4a003359a6..7fde0706582f0 100644 --- a/pkgs/by-name/sw/swaysome/package.nix +++ b/pkgs/by-name/sw/swaysome/package.nix @@ -25,8 +25,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - meta = { description = "Helper to make sway behave more like awesomewm"; homepage = "https://gitlab.com/hyask/swaysome"; diff --git a/pkgs/by-name/sy/sylkserver/package.nix b/pkgs/by-name/sy/sylkserver/package.nix index 154cfcdb3db59..8f8fce608f9f8 100644 --- a/pkgs/by-name/sy/sylkserver/package.nix +++ b/pkgs/by-name/sy/sylkserver/package.nix @@ -48,7 +48,6 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/sylk-server"; - versionCheckProgramArg = "--version"; meta = { description = "SIP/XMPP/WebRTC Application Server"; diff --git a/pkgs/by-name/sy/systemctl-tui/package.nix b/pkgs/by-name/sy/systemctl-tui/package.nix index 9cf7000501efc..03d697c53cb2d 100644 --- a/pkgs/by-name/sy/systemctl-tui/package.nix +++ b/pkgs/by-name/sy/systemctl-tui/package.nix @@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix index ff1efef04cdec..328af70e0ec94 100644 --- a/pkgs/by-name/ta/tabby/package.nix +++ b/pkgs/by-name/ta/tabby/package.nix @@ -141,7 +141,6 @@ rustPlatform.buildRustPackage { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; nativeBuildInputs = [ diff --git a/pkgs/by-name/ta/tahoe-lafs/package.nix b/pkgs/by-name/ta/tahoe-lafs/package.nix index 0850840ca3fbe..406ef554b90e0 100644 --- a/pkgs/by-name/ta/tahoe-lafs/package.nix +++ b/pkgs/by-name/ta/tahoe-lafs/package.nix @@ -125,8 +125,6 @@ python3Packages.buildPythonApplication rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; - checkPhase = '' runHook preCheck diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix index 9f55a5263c28d..e76305461a08c 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.90.9"; + version = "1.92.3"; outputs = [ "out" @@ -35,10 +35,10 @@ buildGoModule (finalAttrs: { owner = "tailscale"; repo = "tailscale"; tag = "v${finalAttrs.version}"; - hash = "sha256-gfpjP1i9077VR/sDclnz+QXJcCffuS0i33m75zo91kM="; + hash = "sha256-6dE3kgYABAVtrAjGWnWZ3X4Aq7yJagxNEk6BSyIC3Yk="; }; - vendorHash = "sha256-AUOjLomba75qfzb9Vxc0Sktyeces6hBSuOMgboWcDnE="; + vendorHash = "sha256-jJSSXMyUqcJoZuqfSlBsKDQezyqS+jDkRglMMjG1K8g="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/ta/tailspin/package.nix b/pkgs/by-name/ta/tailspin/package.nix index 6663fe67a9f74..40eee21c2f359 100644 --- a/pkgs/by-name/ta/tailspin/package.nix +++ b/pkgs/by-name/ta/tailspin/package.nix @@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/tspin"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix index 56d1e6f1bb74f..105b0140ea677 100644 --- a/pkgs/by-name/ta/taplo/package.nix +++ b/pkgs/by-name/ta/taplo/package.nix @@ -56,7 +56,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ta/task-master-ai/package.nix b/pkgs/by-name/ta/task-master-ai/package.nix index de5dd29aebef2..44f2e3b52847d 100644 --- a/pkgs/by-name/ta/task-master-ai/package.nix +++ b/pkgs/by-name/ta/task-master-ai/package.nix @@ -40,7 +40,6 @@ buildNpmPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/task-master"; - versionCheckProgramArg = "--version"; meta = { description = "Node.js agentic AI workflow orchestrator"; diff --git a/pkgs/by-name/ta/taze/package.nix b/pkgs/by-name/ta/taze/package.nix index 99c765af724ab..b1b6d10b99982 100644 --- a/pkgs/by-name/ta/taze/package.nix +++ b/pkgs/by-name/ta/taze/package.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index b59fb0f3d754b..4162bf025d271 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -121,8 +121,6 @@ buildNpmPackage rec { passthru.updateScript = nix-update-script { }; - versionCheckProgramArg = "--version"; - meta = { description = "Unofficial Microsoft Teams client for Linux"; mainProgram = "teams-for-linux"; diff --git a/pkgs/by-name/te/teamtype/package.nix b/pkgs/by-name/te/teamtype/package.nix index 8ef60ecc8cfdd..539f9a5030497 100644 --- a/pkgs/by-name/te/teamtype/package.nix +++ b/pkgs/by-name/te/teamtype/package.nix @@ -37,7 +37,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/te/telegram-bot-api/package.nix b/pkgs/by-name/te/telegram-bot-api/package.nix index 56d99458b46db..2c40c961f1454 100644 --- a/pkgs/by-name/te/telegram-bot-api/package.nix +++ b/pkgs/by-name/te/telegram-bot-api/package.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "Telegram Bot API server"; diff --git a/pkgs/by-name/te/termshot/package.nix b/pkgs/by-name/te/termshot/package.nix index 0680c614457d1..4c99b73ff6ca8 100644 --- a/pkgs/by-name/te/termshot/package.nix +++ b/pkgs/by-name/te/termshot/package.nix @@ -28,7 +28,6 @@ buildGoModule (finalAttrs: { checkFlags = [ "-skip=^TestPtexec$" ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/te/terraform-mcp-server/package.nix b/pkgs/by-name/te/terraform-mcp-server/package.nix index 4da018d02a38a..ed913bb669e20 100644 --- a/pkgs/by-name/te/terraform-mcp-server/package.nix +++ b/pkgs/by-name/te/terraform-mcp-server/package.nix @@ -28,7 +28,6 @@ buildGoModule (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "Terraform Model Context Protocol (MCP) Server"; diff --git a/pkgs/by-name/tf/tflint/package.nix b/pkgs/by-name/tf/tflint/package.nix index 7b10f2fd4a209..671c325cb75de 100644 --- a/pkgs/by-name/tf/tflint/package.nix +++ b/pkgs/by-name/tf/tflint/package.nix @@ -36,8 +36,6 @@ buildGo125Module (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - passthru.withPlugins = plugins: let diff --git a/pkgs/by-name/th/thanos/package.nix b/pkgs/by-name/th/thanos/package.nix index b56882f7d6535..5ab5c6a01b55b 100644 --- a/pkgs/by-name/th/thanos/package.nix +++ b/pkgs/by-name/th/thanos/package.nix @@ -49,7 +49,6 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ti/tiledb/package.nix b/pkgs/by-name/ti/tiledb/package.nix index 1286d54fb83ae..834048882e0f4 100644 --- a/pkgs/by-name/ti/tiledb/package.nix +++ b/pkgs/by-name/ti/tiledb/package.nix @@ -56,6 +56,14 @@ stdenv.mkDerivation rec { extraPrefix = "tiledb/sm/serialization/"; hash = "sha256-5z/eJEHl+cnWRf1sMULodJyhmNh5KinDLlL1paMNiy4="; }) + + # Fix build with gcc15 + # https://github.com/TileDB-Inc/TileDB/pull/5612 + (fetchpatch { + name = "tiledb-set-c-version-to-c99.patch"; + url = "https://github.com/TileDB-Inc/TileDB/commit/4f946ad57fe823c3f53c06bf29dc18799ec6395a.patch"; + hash = "sha256-chdaa6Ysqeb3p+FcWp7GTnAzgShoPGSCErmIGn+Q4tA="; + }) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./generate_embedded_data_header.patch ]; diff --git a/pkgs/by-name/ti/timoni/package.nix b/pkgs/by-name/ti/timoni/package.nix index b5940eb3a44b8..a6cd04268d3a6 100644 --- a/pkgs/by-name/ti/timoni/package.nix +++ b/pkgs/by-name/ti/timoni/package.nix @@ -42,7 +42,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/tm/tmc-cli/package.nix b/pkgs/by-name/tm/tmc-cli/package.nix index 21d407b6729ae..84913922d3d4a 100644 --- a/pkgs/by-name/tm/tmc-cli/package.nix +++ b/pkgs/by-name/tm/tmc-cli/package.nix @@ -39,7 +39,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; - versionCheckProgramArg = "--version"; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/tm/tmux-sessionizer/package.nix b/pkgs/by-name/tm/tmux-sessionizer/package.nix index 2d0068284bf74..babf4f711d148 100644 --- a/pkgs/by-name/tm/tmux-sessionizer/package.nix +++ b/pkgs/by-name/tm/tmux-sessionizer/package.nix @@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; - versionCheckProgramArg = "--version"; doInstallCheck = true; nativeBuildInputs = [ diff --git a/pkgs/by-name/tm/tmuxai/package.nix b/pkgs/by-name/tm/tmuxai/package.nix index 538f734e86c17..d5684ba350c35 100644 --- a/pkgs/by-name/tm/tmuxai/package.nix +++ b/pkgs/by-name/tm/tmuxai/package.nix @@ -33,7 +33,6 @@ buildGoModule (finalAttrs: { ]; versionCheckKeepEnvironment = [ "HOME" ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/to/tocaia/package.nix b/pkgs/by-name/to/tocaia/package.nix index 1ba0b64931205..3c52e4d5271fe 100644 --- a/pkgs/by-name/to/tocaia/package.nix +++ b/pkgs/by-name/to/tocaia/package.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/by-name/to/tofu-ls/package.nix b/pkgs/by-name/to/tofu-ls/package.nix index d79c2a1a5adf8..81cd240974fbb 100644 --- a/pkgs/by-name/to/tofu-ls/package.nix +++ b/pkgs/by-name/to/tofu-ls/package.nix @@ -42,7 +42,6 @@ buildGoModule (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/to/tokei/package.nix b/pkgs/by-name/to/tokei/package.nix index 59d995a4cd837..fd3614a81618a 100644 --- a/pkgs/by-name/to/tokei/package.nix +++ b/pkgs/by-name/to/tokei/package.nix @@ -39,7 +39,6 @@ rustPlatform.buildRustPackage (finalAttrs: { buildFeatures = [ "all" ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/to/tombl/package.nix b/pkgs/by-name/to/tombl/package.nix index 6ceb7edd459bd..d2f54cb6e440f 100644 --- a/pkgs/by-name/to/tombl/package.nix +++ b/pkgs/by-name/to/tombl/package.nix @@ -19,7 +19,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-A3zdDzmwX2gdTLLWnUGeiqY1R5PBKZRmEHdIi1Uveaw="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/to/topiary/package.nix b/pkgs/by-name/to/topiary/package.nix index 70b9a62431876..e0d31196d5884 100644 --- a/pkgs/by-name/to/topiary/package.nix +++ b/pkgs/by-name/to/topiary/package.nix @@ -81,7 +81,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/to/tor/package.nix b/pkgs/by-name/to/tor/package.nix index e3691a0467b62..68b0e864c5dd9 100644 --- a/pkgs/by-name/to/tor/package.nix +++ b/pkgs/by-name/to/tor/package.nix @@ -110,7 +110,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { tests = { diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix index 73d4a973d2af9..f2bf86154ba1f 100644 --- a/pkgs/by-name/tp/tpnote/package.nix +++ b/pkgs/by-name/tp/tpnote/package.nix @@ -58,7 +58,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/tr/tradcpp/package.nix b/pkgs/by-name/tr/tradcpp/package.nix index e7afc2c7675b9..352891d3c75d3 100644 --- a/pkgs/by-name/tr/tradcpp/package.nix +++ b/pkgs/by-name/tr/tradcpp/package.nix @@ -17,6 +17,9 @@ stdenv.mkDerivation (finalAttrs: { # tradcpp only comes with BSD-make Makefile; the patch adds configure support patches = [ ./tradcpp-configure.patch ]; + # Fix build with gcc15 + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; + strictDeps = true; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/tr/trufflehog/package.nix b/pkgs/by-name/tr/trufflehog/package.nix index d7bdbebf28841..74e83f4442c7b 100644 --- a/pkgs/by-name/tr/trufflehog/package.nix +++ b/pkgs/by-name/tr/trufflehog/package.nix @@ -42,8 +42,6 @@ buildGoModule rec { doInstallCheck = true; - versionCheckProgramArg = "--version"; - meta = { description = "Find credentials all over the place"; homepage = "https://github.com/trufflesecurity/trufflehog"; diff --git a/pkgs/by-name/tr/trurl/package.nix b/pkgs/by-name/tr/trurl/package.nix index 8d0dcad7b22e0..d9f7b7d9442b8 100644 --- a/pkgs/by-name/tr/trurl/package.nix +++ b/pkgs/by-name/tr/trurl/package.nix @@ -56,7 +56,6 @@ stdenv.mkDerivation rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Command line tool for URL parsing and manipulation"; diff --git a/pkgs/by-name/tr/trzsz-ssh/package.nix b/pkgs/by-name/tr/trzsz-ssh/package.nix index 8194ae38e2f1c..9feafa7fb7cb8 100644 --- a/pkgs/by-name/tr/trzsz-ssh/package.nix +++ b/pkgs/by-name/tr/trzsz-ssh/package.nix @@ -27,7 +27,6 @@ buildGoModule (finalAttrs: { nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ts/tsukimi/package.nix b/pkgs/by-name/ts/tsukimi/package.nix index 5e0b84586d117..1688c044550bb 100644 --- a/pkgs/by-name/ts/tsukimi/package.nix +++ b/pkgs/by-name/ts/tsukimi/package.nix @@ -65,7 +65,6 @@ stdenv.mkDerivation rec { ]); nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ts/tsx/package.nix b/pkgs/by-name/ts/tsx/package.nix index 7db0c29058882..9f836c1c5bdc6 100644 --- a/pkgs/by-name/ts/tsx/package.nix +++ b/pkgs/by-name/ts/tsx/package.nix @@ -92,7 +92,6 @@ stdenv.mkDerivation rec { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "TypeScript Execute (tsx): The easiest way to run TypeScript in Node.js"; diff --git a/pkgs/by-name/tt/tt-burnin/package.nix b/pkgs/by-name/tt/tt-burnin/package.nix index fff3cb24c36eb..453f3752c257c 100644 --- a/pkgs/by-name/tt/tt-burnin/package.nix +++ b/pkgs/by-name/tt/tt-burnin/package.nix @@ -36,8 +36,6 @@ python3Packages.buildPythonApplication rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; - meta = { mainProgram = "tt-burnin"; description = "Command line utility to run a high power consumption workload on TT devices"; diff --git a/pkgs/by-name/tt/tt-smi/package.nix b/pkgs/by-name/tt/tt-smi/package.nix index fad569cf70db7..d0a10ed363d5d 100644 --- a/pkgs/by-name/tt/tt-smi/package.nix +++ b/pkgs/by-name/tt/tt-smi/package.nix @@ -42,8 +42,6 @@ python3Packages.buildPythonApplication rec { # Fails due to having no tests dontUsePytestCheck = true; - versionCheckProgramArg = "--version"; - meta = { mainProgram = "tt-smi"; description = "Tenstorrent console based hardware information program"; diff --git a/pkgs/by-name/tt/tt-topology/package.nix b/pkgs/by-name/tt/tt-topology/package.nix index 0ae7af8deccb2..239f5c9e6ff82 100644 --- a/pkgs/by-name/tt/tt-topology/package.nix +++ b/pkgs/by-name/tt/tt-topology/package.nix @@ -54,8 +54,6 @@ python3Packages.buildPythonApplication rec { # Tests are broken dontUsePytestCheck = true; - versionCheckProgramArg = "--version"; - meta = { mainProgram = "tt-topology"; description = "Command line utility used to flash multiple NB cards on a system to use specific eth routing configurations"; diff --git a/pkgs/by-name/tt/ttysvr/package.nix b/pkgs/by-name/tt/ttysvr/package.nix index 64779dc217c1f..1e445ffa6b845 100644 --- a/pkgs/by-name/tt/ttysvr/package.nix +++ b/pkgs/by-name/tt/ttysvr/package.nix @@ -51,7 +51,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/tu/tui-journal/package.nix b/pkgs/by-name/tu/tui-journal/package.nix index 5c377cc73405b..1f8c85e31b3bb 100644 --- a/pkgs/by-name/tu/tui-journal/package.nix +++ b/pkgs/by-name/tu/tui-journal/package.nix @@ -31,7 +31,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; nativeInstallCheckInputs = [ versionCheckHook ]; meta = { diff --git a/pkgs/by-name/tu/tuisky/package.nix b/pkgs/by-name/tu/tuisky/package.nix index 0409eb13f390d..4aaeee7869f80 100644 --- a/pkgs/by-name/tu/tuisky/package.nix +++ b/pkgs/by-name/tu/tuisky/package.nix @@ -32,7 +32,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/tu/turn-rs/package.nix b/pkgs/by-name/tu/turn-rs/package.nix index a386f18e687d9..f6cac261265eb 100644 --- a/pkgs/by-name/tu/turn-rs/package.nix +++ b/pkgs/by-name/tu/turn-rs/package.nix @@ -28,7 +28,6 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/turn-server"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/tu/turso/package.nix b/pkgs/by-name/tu/turso/package.nix index f2315e5499a87..17f653dfe44a0 100644 --- a/pkgs/by-name/tu/turso/package.nix +++ b/pkgs/by-name/tu/turso/package.nix @@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/tu/tuxedo-rs/package.nix b/pkgs/by-name/tu/tuxedo-rs/package.nix index df15a1f91d29a..d498219fcc7c9 100644 --- a/pkgs/by-name/tu/tuxedo-rs/package.nix +++ b/pkgs/by-name/tu/tuxedo-rs/package.nix @@ -26,7 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; - versionCheckProgramArg = "--version"; postInstall = '' install -Dm444 tailord/com.tux.Tailor.conf -t $out/share/dbus-1/system.d diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index 8be945c009fb9..f5da6e9c81110 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -65,7 +65,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( diff --git a/pkgs/by-name/ty/typescript/package.nix b/pkgs/by-name/ty/typescript/package.nix index 792bad6e71f75..d7083e498969e 100644 --- a/pkgs/by-name/ty/typescript/package.nix +++ b/pkgs/by-name/ty/typescript/package.nix @@ -28,7 +28,6 @@ buildNpmPackage (finalAttrs: { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/tsc"; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { diff --git a/pkgs/by-name/ty/typespec/package.nix b/pkgs/by-name/ty/typespec/package.nix index dd33b6964e959..87fab88b53a67 100644 --- a/pkgs/by-name/ty/typespec/package.nix +++ b/pkgs/by-name/ty/typespec/package.nix @@ -98,7 +98,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { extraArgs = [ ''--version-regex=typespec-stable@(\d+\.\d+\.\d+)'' ]; diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix index 7b27c250474a1..6c62d627d255c 100644 --- a/pkgs/by-name/ty/typos/package.nix +++ b/pkgs/by-name/ty/typos/package.nix @@ -31,7 +31,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "Source code spell checker"; diff --git a/pkgs/by-name/ty/typst/build-universe-package.nix b/pkgs/by-name/ty/typst/build-universe-package.nix new file mode 100644 index 0000000000000..a7628f6412dd2 --- /dev/null +++ b/pkgs/by-name/ty/typst/build-universe-package.nix @@ -0,0 +1,51 @@ +{ + lib, + buildTypstPackage, + fetchzip, + typstPackages, +}: +lib.extendMkDerivation { + inheritFunctionArgs = false; + constructDrv = buildTypstPackage; + + excludeDrvArgNames = [ + "description" + "hash" + "license" + "homepage" + "typstDeps" + ]; + + extendDrvArgs = + finalAttrs: + { + pname, + version, + description, + hash, + license, + homepage ? null, + typstDeps ? [ ], + }: + { + src = fetchzip { + inherit hash; + url = "https://packages.typst.org/preview/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + stripRoot = false; + }; + + typstDeps = builtins.filter (x: x != null) ( + lib.map (d: (lib.attrsets.attrByPath [ d ] null typstPackages)) typstDeps + ); + + meta = { + inherit description; + maintainers = with lib.maintainers; [ + cherrypiejam + RossSmyth + ]; + license = lib.map (lib.flip lib.getAttr lib.licensesSpdx) license; + } + // lib.optionalAttrs (homepage != null) { inherit homepage; }; + }; +} diff --git a/pkgs/by-name/ty/typst/package.nix b/pkgs/by-name/ty/typst/package.nix index 945bed2da8d5d..d39d2ec94d3c9 100644 --- a/pkgs/by-name/ty/typst/package.nix +++ b/pkgs/by-name/ty/typst/package.nix @@ -67,7 +67,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ty/typst/typst-packages.nix b/pkgs/by-name/ty/typst/typst-packages.nix index 6a460aafb80fb..a32f92cc95a06 100644 --- a/pkgs/by-name/ty/typst/typst-packages.nix +++ b/pkgs/by-name/ty/typst/typst-packages.nix @@ -1,53 +1,69 @@ { lib, callPackage, + newScope, }: - let toPackageName = name: version: "${name}_${lib.replaceStrings [ "." ] [ "_" ] version}"; in -lib.makeExtensible ( - final: - lib.recurseIntoAttrs ( - lib.foldlAttrs ( - packageSet: pname: versionSet: - packageSet - // (lib.foldlAttrs ( - subPackageSet: version: packageSpec: - subPackageSet - // { - ${toPackageName pname version} = callPackage ( - { - lib, - buildTypstPackage, - fetchzip, - }: - buildTypstPackage (finalAttrs: { - inherit pname version; +lib.makeScope newScope ( + self: + let + # Not public, so do not expose to the package set + buildUniversePackage = self.callPackage ./build-universe-package.nix { typstPackages = self; }; + + # Creates a versioned package out of a name, version, and packageSpec + makeVersionedPackage = pname: version: packageSpec: { + name = toPackageName pname version; + + value = buildUniversePackage { + homepage = packageSpec.homepage or null; + inherit pname version; + inherit (packageSpec) + hash + description + license + typstDeps + ; + }; + }; - src = fetchzip { - inherit (packageSpec) hash; - url = "https://packages.typst.org/preview/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - stripRoot = false; - }; + # Create a derivation for each package. This is in the format of + # typstPackages.${package}_version + versionedPackages = lib.pipe (lib.importTOML ./typst-packages-from-universe.toml) [ + # 1. Create a list of versioned packages + # Only recurse 2 levels deep because the leaf attrs are the pkgspec attrs + (lib.mapAttrsToListRecursiveCond (path: _: (lib.length path) < 2) ( + path: + let + # Path is always [ path version ] + pname = lib.head path; + version = lib.last path; + in + makeVersionedPackage pname version + )) + # 2. Transform the list into a flat attrset + lib.listToAttrs + ]; - typstDeps = builtins.filter (x: x != null) ( - lib.map (d: (lib.attrsets.attrByPath [ d ] null final)) packageSpec.typstDeps - ); + # Take two version strings and return the newer one + selectNewerVersion = v1: v2: if lib.versionOlder v1 v2 then v2 else v1; - meta = { - inherit (packageSpec) description; - maintainers = with lib.maintainers; [ cherrypiejam ]; - license = lib.map (lib.flip lib.getAttr lib.licensesSpdx) packageSpec.license; - } - // (if packageSpec ? "homepage" then { inherit (packageSpec) homepage; } else { }); - }) - ) { }; - } - ) { } versionSet) - // { - ${pname} = final.${toPackageName pname (lib.last (lib.attrNames versionSet))}; - } - ) { } (lib.importTOML ./typst-packages-from-universe.toml) - ) + # Select the latest version of each package to represent the + # unversioned derivation in the format of: + # typstPackages.${package} + latestPackages = lib.pipe (lib.importTOML ./typst-packages-from-universe.toml) [ + # Take in the attrset of each package and all its versions + # Compare each version and find the latest one. + # Then select it from the versioned package set + (lib.mapAttrs ( + pname: versions: + let + latestVersion = lib.foldl' selectNewerVersion "0.0.0" (lib.attrNames versions); + in + versionedPackages.${toPackageName pname latestVersion} + )) + ]; + in + versionedPackages // latestPackages ) diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix index 4c132b3d4e6e8..ab55601b37414 100644 --- a/pkgs/by-name/ty/typstyle/package.nix +++ b/pkgs/by-name/ty/typstyle/package.nix @@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/uc/ucon64/package.nix b/pkgs/by-name/uc/ucon64/package.nix index 7f5551fd7108b..d1045d1b946ae 100644 --- a/pkgs/by-name/uc/ucon64/package.nix +++ b/pkgs/by-name/uc/ucon64/package.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix index dfc61152edf7f..c68cc0dd19b21 100644 --- a/pkgs/by-name/ui/uiua/package.nix +++ b/pkgs/by-name/ui/uiua/package.nix @@ -73,7 +73,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = versionInfo.updateScript; diff --git a/pkgs/by-name/un/unblob/package.nix b/pkgs/by-name/un/unblob/package.nix index dc45542e7cd71..a2cb8c0165420 100644 --- a/pkgs/by-name/un/unblob/package.nix +++ b/pkgs/by-name/un/unblob/package.nix @@ -122,8 +122,6 @@ python3.pkgs.buildPythonApplication rec { ] ++ runtimeDeps; - versionCheckProgramArg = "--version"; - pytestFlags = [ "--no-cov" ]; diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix index 62657e2f4c360..dc8c7879d523a 100644 --- a/pkgs/by-name/un/unbound/package.nix +++ b/pkgs/by-name/un/unbound/package.nix @@ -52,17 +52,18 @@ nix-update-script, # for passthru.tests gnutls, + versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { pname = "unbound"; - version = "1.24.1"; + version = "1.24.2"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = "unbound"; tag = "release-${finalAttrs.version}"; - hash = "sha256-meWgu1UGhR9d8wVb8guqbnGE3UHs6uJHR20iDFnIThQ="; + hash = "sha256-kyTcDmNGKJuOMZ7cxIWh6o7aasRUoAB4M0tIG81BQsE="; }; outputs = [ @@ -202,6 +203,12 @@ stdenv.mkDerivation (finalAttrs: { ) " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'" ) (builtins.filter (p: p != null) finalAttrs.buildInputs); + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "-V"; + doInstallCheck = true; + passthru = { updateScript = nix-update-script { extraArgs = [ @@ -219,7 +226,9 @@ stdenv.mkDerivation (finalAttrs: { description = "Validating, recursive, and caching DNS resolver"; license = lib.licenses.bsd3; homepage = "https://www.unbound.net"; + changelog = "https://github.com/NLnetLabs/unbound/releases/tag/release-${finalAttrs.version}"; maintainers = with lib.maintainers; [ Scrumplex ]; + mainProgram = "unbound"; platforms = with lib.platforms; unix ++ windows; }; }) diff --git a/pkgs/by-name/un/unftp/package.nix b/pkgs/by-name/un/unftp/package.nix index 5741d5017b743..59b456e791c12 100644 --- a/pkgs/by-name/un/unftp/package.nix +++ b/pkgs/by-name/un/unftp/package.nix @@ -21,7 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/un/unzip/06-initialize-the-symlink-flag.patch b/pkgs/by-name/un/unzip/06-initialize-the-symlink-flag.patch new file mode 100644 index 0000000000000..11fa0d9f9bfac --- /dev/null +++ b/pkgs/by-name/un/unzip/06-initialize-the-symlink-flag.patch @@ -0,0 +1,20 @@ +From: Andreas Schwab +Subject: Initialize the symlink flag +Bug-Debian: https://bugs.debian.org/717029 +X-Debian-version: 6.0-10 + +--- a/process.c ++++ b/process.c +@@ -1758,6 +1758,12 @@ + = (G.crec.general_purpose_bit_flag & (1 << 11)) == (1 << 11); + #endif + ++#ifdef SYMLINKS ++ /* Initialize the symlink flag, may be set by the platform-specific ++ mapattr function. */ ++ G.pInfo->symlink = 0; ++#endif ++ + return PK_COOL; + + } /* end function process_cdir_file_hdr() */ diff --git a/pkgs/by-name/un/unzip/28-cve-2022-0529-and-cve-2022-0530.patch b/pkgs/by-name/un/unzip/28-cve-2022-0529-and-cve-2022-0530.patch new file mode 100644 index 0000000000000..8f5351e8cd824 --- /dev/null +++ b/pkgs/by-name/un/unzip/28-cve-2022-0529-and-cve-2022-0530.patch @@ -0,0 +1,173 @@ +From: Steven M. Schweda +Subject: Fix for CVE-2022-0529 and CVE-2022-0530 +Bug-Debian: https://bugs.debian.org/1010355 +X-Debian-version: 6.0-27 + +--- a/fileio.c ++++ b/fileio.c +@@ -171,8 +171,10 @@ + static ZCONST char Far FilenameTooLongTrunc[] = + "warning: filename too long--truncating.\n"; + #ifdef UNICODE_SUPPORT ++ static ZCONST char Far UFilenameCorrupt[] = ++ "error: Unicode filename corrupt.\n"; + static ZCONST char Far UFilenameTooLongTrunc[] = +- "warning: Converted unicode filename too long--truncating.\n"; ++ "warning: Converted Unicode filename too long--truncating.\n"; + #endif + static ZCONST char Far ExtraFieldTooLong[] = + "warning: extra field too long (%d). Ignoring...\n"; +@@ -2361,16 +2363,30 @@ + /* convert UTF-8 to local character set */ + fn = utf8_to_local_string(G.unipath_filename, + G.unicode_escape_all); +- /* make sure filename is short enough */ +- if (strlen(fn) >= FILNAMSIZ) { +- fn[FILNAMSIZ - 1] = '\0'; ++ ++ /* 2022-07-22 SMS, et al. CVE-2022-0530 ++ * Detect conversion failure, emit message. ++ * Continue with unconverted name. ++ */ ++ if (fn == NULL) ++ { + Info(slide, 0x401, ((char *)slide, +- LoadFarString(UFilenameTooLongTrunc))); +- error = PK_WARN; ++ LoadFarString(UFilenameCorrupt))); ++ error = PK_ERR; ++ } ++ else ++ { ++ /* make sure filename is short enough */ ++ if (strlen(fn) >= FILNAMSIZ) { ++ fn[FILNAMSIZ - 1] = '\0'; ++ Info(slide, 0x401, ((char *)slide, ++ LoadFarString(UFilenameTooLongTrunc))); ++ error = PK_WARN; ++ } ++ /* replace filename with converted UTF-8 */ ++ strcpy(G.filename, fn); ++ free(fn); + } +- /* replace filename with converted UTF-8 */ +- strcpy(G.filename, fn); +- free(fn); + } + # endif /* UNICODE_WCHAR */ + if (G.unipath_filename != G.filename_full) +--- a/process.c ++++ b/process.c +@@ -222,6 +222,8 @@ + "\nwarning: Unicode Path version > 1\n"; + static ZCONST char Far UnicodeMismatchError[] = + "\nwarning: Unicode Path checksum invalid\n"; ++ static ZCONST char Far UFilenameTooLongTrunc[] = ++ "warning: filename too long (P1) -- truncating.\n"; + #endif + + +@@ -1915,7 +1917,7 @@ + Sets both local header and central header fields. Not terribly clever, + but it means that this procedure is only called in one place. + +- 2014-12-05 SMS. ++ 2014-12-05 SMS. (oCERT.org report.) CVE-2014-8141. + Added checks to ensure that enough data are available before calling + makeint64() or makelong(). Replaced various sizeof() values with + simple ("4" or "8") constants. (The Zip64 structures do not depend +@@ -1947,9 +1949,10 @@ + ef_len - EB_HEADSIZE)); + break; + } ++ + if (eb_id == EF_PKSZ64) + { +- int offset = EB_HEADSIZE; ++ unsigned offset = EB_HEADSIZE; + + if ((G.crec.ucsize == Z64FLGL) || (G.lrec.ucsize == Z64FLGL)) + { +@@ -2046,7 +2049,7 @@ + } + if (eb_id == EF_UNIPATH) { + +- int offset = EB_HEADSIZE; ++ unsigned offset = EB_HEADSIZE; + ush ULen = eb_len - 5; + ulg chksum = CRCVAL_INITIAL; + +@@ -2504,16 +2507,17 @@ + int state_dependent; + int wsize = 0; + int max_bytes = MB_CUR_MAX; +- char buf[9]; ++ char buf[ MB_CUR_MAX+ 1]; /* ("+1" not really needed?) */ + char *buffer = NULL; + char *local_string = NULL; ++ size_t buffer_size; /* CVE-2022-0529 */ + + for (wsize = 0; wide_string[wsize]; wsize++) ; + + if (max_bytes < MAX_ESCAPE_BYTES) + max_bytes = MAX_ESCAPE_BYTES; +- +- if ((buffer = (char *)malloc(wsize * max_bytes + 1)) == NULL) { ++ buffer_size = wsize * max_bytes + 1; /* Reused below. */ ++ if ((buffer = (char *)malloc( buffer_size)) == NULL) { + return NULL; + } + +@@ -2551,8 +2555,28 @@ + } else { + /* no MB for this wide */ + /* use escape for wide character */ +- char *escape_string = wide_to_escape_string(wide_string[i]); +- strcat(buffer, escape_string); ++ size_t buffer_len; ++ size_t escape_string_len; ++ char *escape_string; ++ int err_msg = 0; ++ ++ escape_string = wide_to_escape_string(wide_string[i]); ++ buffer_len = strlen( buffer); ++ escape_string_len = strlen( escape_string); ++ ++ /* Append escape string, as space allows. */ ++ /* 2022-07-18 SMS, et al. CVE-2022-0529 */ ++ if (escape_string_len > buffer_size- buffer_len- 1) ++ { ++ escape_string_len = buffer_size- buffer_len- 1; ++ if (err_msg == 0) ++ { ++ err_msg = 1; ++ Info(slide, 0x401, ((char *)slide, ++ LoadFarString( UFilenameTooLongTrunc))); ++ } ++ } ++ strncat( buffer, escape_string, escape_string_len); + free(escape_string); + } + } +@@ -2604,9 +2628,18 @@ + ZCONST char *utf8_string; + int escape_all; + { +- zwchar *wide = utf8_to_wide_string(utf8_string); +- char *loc = wide_to_local_string(wide, escape_all); +- free(wide); ++ zwchar *wide; ++ char *loc = NULL; ++ ++ wide = utf8_to_wide_string( utf8_string); ++ ++ /* 2022-07-25 SMS, et al. CVE-2022-0530 */ ++ if (wide != NULL) ++ { ++ loc = wide_to_local_string( wide, escape_all); ++ free( wide); ++ } ++ + return loc; + } + diff --git a/pkgs/by-name/un/unzip/package.nix b/pkgs/by-name/un/unzip/package.nix index edcf4bdfa13e0..efe3226d6cdd0 100644 --- a/pkgs/by-name/un/unzip/package.nix +++ b/pkgs/by-name/un/unzip/package.nix @@ -52,14 +52,8 @@ stdenv.mkDerivation rec { name = "CVE-2019-13232-3.patch"; sha256 = "1jvs7dkdqs97qnsqc6hk088alhv8j4c638k65dbib9chh40jd7pf"; }) - (fetchurl { - url = "https://gist.github.com/veprbl/41261bb781571e2246ea42d3f37795f5/raw/d8533d8c6223150f76b0f31aec03e185fcde3579/06-initialize-the-symlink-flag.patch"; - sha256 = "1h00djdvgjhwfb60wl4qrxbyfsbbnn1qw6l2hkldnif4m8f8r1zj"; - }) - (fetchurl { - url = "https://web.archive.org/web/20230106200319/https://sources.debian.org/data/main/u/unzip/6.0-27/debian/patches/28-cve-2022-0529-and-cve-2022-0530.patch"; - sha256 = "sha256-on79jElQ+z2ULWAq14RpluAqr9d6itHiZwDkKubBzTc="; - }) + ./06-initialize-the-symlink-flag.patch + ./28-cve-2022-0529-and-cve-2022-0530.patch # Clang 16 makes implicit declarations an error by default for C99 and newer, causing the # configure script to fail to detect errno and the directory libraries on Darwin. ./implicit-declarations-fix.patch diff --git a/pkgs/by-name/up/updog/package.nix b/pkgs/by-name/up/updog/package.nix index af3b627f4c4b3..cf5cd839c1759 100644 --- a/pkgs/by-name/up/updog/package.nix +++ b/pkgs/by-name/up/updog/package.nix @@ -30,7 +30,6 @@ python3Packages.buildPythonApplication rec { ]; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; # no python tests diff --git a/pkgs/by-name/ur/uradvd/package.nix b/pkgs/by-name/ur/uradvd/package.nix index 12d12905b3b6e..71a0729b55412 100644 --- a/pkgs/by-name/ur/uradvd/package.nix +++ b/pkgs/by-name/ur/uradvd/package.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/us/usacloud/package.nix b/pkgs/by-name/us/usacloud/package.nix index 6111d773cefec..84db6dddf93f5 100644 --- a/pkgs/by-name/us/usacloud/package.nix +++ b/pkgs/by-name/us/usacloud/package.nix @@ -27,7 +27,6 @@ buildGoModule rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ut/utf8proc/package.nix b/pkgs/by-name/ut/utf8proc/package.nix index 861a16faf1f37..ec2586bb7d674 100644 --- a/pkgs/by-name/ut/utf8proc/package.nix +++ b/pkgs/by-name/ut/utf8proc/package.nix @@ -7,24 +7,25 @@ tmux, fcft, arrow-cpp, + enableStatic ? stdenv.hostPlatform.isStatic, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "utf8proc"; - version = "2.11.1"; + version = "2.11.2"; src = fetchFromGitHub { owner = "JuliaStrings"; repo = "utf8proc"; - rev = "v${version}"; - hash = "sha256-fFeevzek6Oql+wMmkZXVzKlDh3wZ6AjGCKJFsXBaqzg="; + tag = "v${finalAttrs.version}"; + hash = "sha256-/+/IrsLQ9ykuVOaItd2ZbX60pPlP2omvS1qJz51AnWA="; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DUTF8PROC_ENABLE_TESTING=ON" + (lib.cmakeBool "BUILD_SHARED_LIBS" (!enableStatic)) + (lib.cmakeBool "UTF8PROC_ENABLE_TESTING" finalAttrs.finalPackage.doCheck) ]; doCheck = true; @@ -43,4 +44,4 @@ stdenv.mkDerivation rec { lib.maintainers.sternenseemann ]; }; -} +}) diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix index b71a6d6bfb032..2127517fe8e04 100644 --- a/pkgs/by-name/ut/util-linux/package.nix +++ b/pkgs/by-name/ut/util-linux/package.nix @@ -183,6 +183,7 @@ stdenv.mkDerivation (finalAttrs: { ln -svf "$bin/bin/hexdump" "$bin/bin/hd" ln -svf "$man/share/man/man1/hexdump.1" "$man/share/man/man1/hd.1" + rm -f bash-completion/Makemodule.am installShellCompletion --bash bash-completion/* '' + lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/by-name/uu/uutils-coreutils/package.nix b/pkgs/by-name/uu/uutils-coreutils/package.nix index 1d9630d286518..e5142e2ce05de 100644 --- a/pkgs/by-name/uu/uutils-coreutils/package.nix +++ b/pkgs/by-name/uu/uutils-coreutils/package.nix @@ -98,7 +98,6 @@ stdenv.mkDerivation (finalAttrs: { prefix' = lib.optionalString (prefix != null) prefix; in "${placeholder "out"}/bin/${prefix'}ls"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/uu/uutils-findutils/package.nix b/pkgs/by-name/uu/uutils-findutils/package.nix index 4ca34b96f3035..b072ad7ef08fc 100644 --- a/pkgs/by-name/uu/uutils-findutils/package.nix +++ b/pkgs/by-name/uu/uutils-findutils/package.nix @@ -30,7 +30,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/find"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 113c53af21208..1c63b914d935a 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -56,7 +56,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ); nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/v4/v4l-utils/package.nix b/pkgs/by-name/v4/v4l-utils/package.nix index 6879cf04b8626..d565f8de3fc91 100644 --- a/pkgs/by-name/v4/v4l-utils/package.nix +++ b/pkgs/by-name/v4/v4l-utils/package.nix @@ -18,6 +18,7 @@ udevCheckHook, withUtils ? true, withGUI ? true, + withBPF ? true, alsa-lib, libGLU, qt6Packages, @@ -62,14 +63,11 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "gconv" stdenv.hostPlatform.isGnu) (lib.mesonEnable "qv4l2" withQt) (lib.mesonEnable "qvidcap" withQt) + (lib.mesonEnable "bpf" withBPF) (lib.mesonOption "udevdir" "${placeholder "out"}/lib/udev") ] ++ lib.optionals stdenv.hostPlatform.isGnu [ (lib.mesonOption "gconvsysdir" "${glibc.out}/lib/gconv") - ] - ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # BPF support fail to cross compile, unable to find `linux/lirc.h` - (lib.mesonOption "bpf" "disabled") ]; postFixup = '' @@ -78,7 +76,6 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ - clang doxygen meson ninja @@ -86,15 +83,18 @@ stdenv.mkDerivation (finalAttrs: { perl udevCheckHook ] + ++ lib.optional withBPF clang ++ lib.optional withQt qt6Packages.wrapQtAppsHook; buildInputs = [ json_c - libbpf - libelf udev ] ++ lib.optional (!stdenv.hostPlatform.isGnu) argp-standalone + ++ lib.optionals withBPF [ + libbpf + libelf + ] ++ lib.optionals withQt [ alsa-lib qt6Packages.qt5compat diff --git a/pkgs/by-name/va/vassal/package.nix b/pkgs/by-name/va/vassal/package.nix index 0d782f78ce657..10852ffa951a0 100644 --- a/pkgs/by-name/va/vassal/package.nix +++ b/pkgs/by-name/va/vassal/package.nix @@ -71,7 +71,6 @@ stdenv.mkDerivation rec { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/vassal"; - versionCheckProgramArg = "--version"; meta = { description = "Free, open-source boardgame engine"; diff --git a/pkgs/by-name/va/vaultwarden/webvault.nix b/pkgs/by-name/va/vaultwarden/webvault.nix index 9735a0c06ee64..3231d9546a8e5 100644 --- a/pkgs/by-name/va/vaultwarden/webvault.nix +++ b/pkgs/by-name/va/vaultwarden/webvault.nix @@ -1,6 +1,7 @@ { lib, buildNpmPackage, + nodejs_22, fetchFromGitHub, nixosTests, python3, @@ -11,6 +12,9 @@ buildNpmPackage rec { pname = "vaultwarden-webvault"; version = "2025.7.0.0"; + # doesn't build with newer versions + nodejs = nodejs_22; + src = fetchFromGitHub { owner = "vaultwarden"; repo = "vw_web_builds"; diff --git a/pkgs/by-name/vc/vcsi/package.nix b/pkgs/by-name/vc/vcsi/package.nix index 24ad702e66077..4123f5a5d7ea7 100644 --- a/pkgs/by-name/vc/vcsi/package.nix +++ b/pkgs/by-name/vc/vcsi/package.nix @@ -45,7 +45,6 @@ python3Packages.buildPythonApplication rec { ++ (with python3Packages; [ pytestCheckHook ]); - versionCheckProgramArg = "--version"; meta = { description = "Create video contact sheets"; diff --git a/pkgs/by-name/vd/vde2/package.nix b/pkgs/by-name/vd/vde2/package.nix index 15b9a19618499..58fb31bcfe99d 100644 --- a/pkgs/by-name/vd/vde2/package.nix +++ b/pkgs/by-name/vd/vde2/package.nix @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { }) ]; + # Fix build with gcc15 + # https://github.com/virtualsquare/vde-2/commit/fedcb99c5f44c397f459ed0951a8fba4f4effb73 + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; + preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' MACOSX_DEPLOYMENT_TARGET=10.16 ''; diff --git a/pkgs/by-name/ve/vector/package.nix b/pkgs/by-name/ve/vector/package.nix index 9c15e9e9f788a..aa599f06f90d8 100644 --- a/pkgs/by-name/ve/vector/package.nix +++ b/pkgs/by-name/ve/vector/package.nix @@ -115,7 +115,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ve/versionCheckHook/hook.sh b/pkgs/by-name/ve/versionCheckHook/hook.sh index 4a977fe7a888c..080aca4bd551f 100644 --- a/pkgs/by-name/ve/versionCheckHook/hook.sh +++ b/pkgs/by-name/ve/versionCheckHook/hook.sh @@ -61,7 +61,7 @@ versionCheckHook(){ exit 2 fi if [[ -z "${versionCheckProgramArg}" ]]; then - for cmdArg in "--help" "--version"; do + for cmdArg in "--version" "--help"; do echoPrefix="$(_handleCmdOutput "$cmdProgram" "$cmdArg" "$versionCheckKeepEnvironment")" if [[ "$echoPrefix" == "Successfully managed to" ]]; then break diff --git a/pkgs/by-name/vi/vi-mongo/package.nix b/pkgs/by-name/vi/vi-mongo/package.nix index 5505e9fb82fd3..09c033ade782c 100644 --- a/pkgs/by-name/vi/vi-mongo/package.nix +++ b/pkgs/by-name/vi/vi-mongo/package.nix @@ -26,7 +26,6 @@ buildGoModule rec { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/vi/video2x/package.nix b/pkgs/by-name/vi/video2x/package.nix index 9a2edb4387fc9..15553dde300c6 100644 --- a/pkgs/by-name/vi/video2x/package.nix +++ b/pkgs/by-name/vi/video2x/package.nix @@ -74,7 +74,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/vi/vim-vint/package.nix b/pkgs/by-name/vi/vim-vint/package.nix index b1bf0757f0789..4264afe26bac1 100644 --- a/pkgs/by-name/vi/vim-vint/package.nix +++ b/pkgs/by-name/vi/vim-vint/package.nix @@ -51,7 +51,6 @@ python3Packages.buildPythonApplication rec { pytestCheckHook pytest-cov-stub ]); - versionCheckProgramArg = "--version"; meta = { description = "Fast and Highly Extensible Vim script Language Lint implemented by Python"; diff --git a/pkgs/by-name/vo/volta/package.nix b/pkgs/by-name/vo/volta/package.nix index ab000b32cf960..803df92f8ddce 100644 --- a/pkgs/by-name/vo/volta/package.nix +++ b/pkgs/by-name/vo/volta/package.nix @@ -42,7 +42,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; # Tries to create /var/empty/.volta as $HOME is not writable doInstallCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/vo/vorta/package.nix b/pkgs/by-name/vo/vorta/package.nix index f7fcc6c6c6411..682820e8ea109 100644 --- a/pkgs/by-name/vo/vorta/package.nix +++ b/pkgs/by-name/vo/vorta/package.nix @@ -68,7 +68,6 @@ python3Packages.buildPythonApplication rec { pytestCheckHook versionCheckHook ]; - versionCheckProgramArg = "--version"; preCheck = let diff --git a/pkgs/by-name/vs/vsce/package.nix b/pkgs/by-name/vs/vsce/package.nix index cfe64458fb4ee..2a44db2305200 100644 --- a/pkgs/by-name/vs/vsce/package.nix +++ b/pkgs/by-name/vs/vsce/package.nix @@ -40,7 +40,6 @@ buildNpmPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { diff --git a/pkgs/by-name/vt/vttest/package.nix b/pkgs/by-name/vt/vttest/package.nix index ae713db4afe29..ac4ce1c4e4a8b 100644 --- a/pkgs/by-name/vt/vttest/package.nix +++ b/pkgs/by-name/vt/vttest/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ "https://invisible-mirror.net/archives/vttest/vttest-${version}.tgz" - "ftp://ftp.invisible-island.net/vttest/vttest-${version}.tgz" + "https://invisible-island.net/archives/vttest/vttest-${version}.tgz" ]; sha256 = "sha256-j+47rH6H1KpKIXvSs4q5kQw7jPmmBbRQx2zMCtKmUZ0="; }; diff --git a/pkgs/by-name/vu/vulkan-extension-layer/package.nix b/pkgs/by-name/vu/vulkan-extension-layer/package.nix index 9d1561c000272..6651d61f24ddd 100644 --- a/pkgs/by-name/vu/vulkan-extension-layer/package.nix +++ b/pkgs/by-name/vu/vulkan-extension-layer/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; - version = "1.4.328.0"; + version = "1.4.335.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ExtensionLayer"; rev = "vulkan-sdk-${version}"; - hash = "sha256-J9l20abn7meSF0WnCh3cepYKQh10ezb0mAKzc0HAo1w="; + hash = "sha256-1Ax/0W882nJFO2hVqXamT89lFu5ncnrytnwDdUIihnk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vu/vulkan-headers/package.nix b/pkgs/by-name/vu/vulkan-headers/package.nix index dad0deb6d48fe..a97e281624a7d 100644 --- a/pkgs/by-name/vu/vulkan-headers/package.nix +++ b/pkgs/by-name/vu/vulkan-headers/package.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.4.328.0"; + version = "1.4.335.0"; # Adding `ninja` here to enable Ninja backend. Otherwise on gcc-14 or # later the build fails as: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-Sg/zp6UhRC5wqBS3vdfs0sQL8cBgLiwvfG0oY0v9MWU="; + hash = "sha256-DIePLzDoImnaso0WYUv819wSDeA7Zy1I/tYAbsALXKg="; }; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/vu/vulkan-loader/package.nix b/pkgs/by-name/vu/vulkan-loader/package.nix index 8043d3832e156..558ea79570d2b 100644 --- a/pkgs/by-name/vu/vulkan-loader/package.nix +++ b/pkgs/by-name/vu/vulkan-loader/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-loader"; - version = "1.4.328.0"; + version = "1.4.335.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-+cuKdhdCMIL4b+GzIpCNrDBmC7cVX0iX2QW7BQIj9Tc="; + hash = "sha256-1xLT4AynJumzwkYOBS5i0OpCi3EdE8QctctDn+DGrvU="; }; patches = [ ./fix-pkgconfig.patch ]; diff --git a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix index 81fa934a8b359..ba2cc8f59c468 100644 --- a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix +++ b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; - version = "1.4.328.0"; + version = "1.4.335.0"; src = fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-kywAcpBYLSlhEbgssXGwMoXQC03QUEz4dwsvI0I8Nh4="; + hash = "sha256-2DUxlGH9Yco64Y74QByVniWXiYYy+e4MfyN4S+E6KKA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vu/vulkan-tools/package.nix b/pkgs/by-name/vu/vulkan-tools/package.nix index b94aa794915fd..4934c99eeea74 100644 --- a/pkgs/by-name/vu/vulkan-tools/package.nix +++ b/pkgs/by-name/vu/vulkan-tools/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.4.328.0"; + version = "1.4.335"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-QoqlHrhgaV1SRLAxmYUXaKxH1IdbnxqkcJklDy20ORg="; + hash = "sha256-C/wzLLiG7DrLyP3YRKhjawNoEOCCogXkrFeBczeVZR0="; }; patches = [ ./wayland-scanner.patch ]; diff --git a/pkgs/by-name/vu/vulkan-utility-libraries/package.nix b/pkgs/by-name/vu/vulkan-utility-libraries/package.nix index e63ae5c808874..cd947b27809e5 100644 --- a/pkgs/by-name/vu/vulkan-utility-libraries/package.nix +++ b/pkgs/by-name/vu/vulkan-utility-libraries/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-utility-libraries"; - version = "1.4.328.0"; + version = "1.4.335.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Utility-Libraries"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-qcCATZWM0YJ02Dl5VxjvbFYoE2b0r7Ku+ELr2is2VIg="; + hash = "sha256-lDO0B7wEYT6cc/t/ZW5OAxxgRfDORoGd+pF5r5R7yoQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vu/vulkan-validation-layers/package.nix b/pkgs/by-name/vu/vulkan-validation-layers/package.nix index e62d1e94e4c7a..43fe919e19b84 100644 --- a/pkgs/by-name/vu/vulkan-validation-layers/package.nix +++ b/pkgs/by-name/vu/vulkan-validation-layers/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, cmake, pkg-config, + python3, jq, glslang, libffi, @@ -25,13 +26,13 @@ let in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.4.328.0"; + version = "1.4.335.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-iz6kWvnfVnznn78XNHJqSvIW4TYkp2KgEFT302VAiaY="; + hash = "sha256-FRxr33epHe+HIH/7Y7ms+6E9L0yzaNnFzN3YnswZfRo="; }; strictDeps = true; @@ -39,6 +40,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config + python3 jq ]; diff --git a/pkgs/by-name/vu/vulkan-volk/package.nix b/pkgs/by-name/vu/vulkan-volk/package.nix index 63d7c341d3032..1534219f27566 100644 --- a/pkgs/by-name/vu/vulkan-volk/package.nix +++ b/pkgs/by-name/vu/vulkan-volk/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "volk"; - version = "1.4.328.0"; + version = "1.4.335.0"; src = fetchFromGitHub { owner = "zeux"; repo = "volk"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-7JhTLhCqdn/zDIYdIb2xJnjJVk57i+6M5OXk0KvfpDk="; + hash = "sha256-qAMMhaeJweHNeW7+5RUpFh65jUnuw0TsYwq3PrKvCkM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/w3/w3m/https.patch b/pkgs/by-name/w3/w3m/https.patch new file mode 100644 index 0000000000000..31286a70d5ae2 --- /dev/null +++ b/pkgs/by-name/w3/w3m/https.patch @@ -0,0 +1,19 @@ +Fedora patch; see https://bugzilla.redhat.com/show_bug.cgi?id=707994 + +--- old/url.c 2011-01-04 14:52:24.000000000 +0530 ++++ new/url.c 2011-09-02 18:25:43.305652690 +0530 +@@ -82,11 +82,11 @@ + {"ftp", SCM_FTP}, + {"local", SCM_LOCAL}, + {"file", SCM_LOCAL}, +- /* {"exec", SCM_EXEC}, */ ++ {"exec", SCM_EXEC}, + {"nntp", SCM_NNTP}, +- /* {"nntp", SCM_NNTP_GROUP}, */ ++ {"nntp", SCM_NNTP_GROUP}, + {"news", SCM_NEWS}, +- /* {"news", SCM_NEWS_GROUP}, */ ++ {"news", SCM_NEWS_GROUP}, + {"data", SCM_DATA}, + #ifndef USE_W3MMAILER + {"mailto", SCM_MAILTO}, diff --git a/pkgs/by-name/w3/w3m/package.nix b/pkgs/by-name/w3/w3m/package.nix index c9d00588502aa..73e82859bf633 100644 --- a/pkgs/by-name/w3/w3m/package.nix +++ b/pkgs/by-name/w3/w3m/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromSourcehut, - fetchpatch, ncurses, boehmgc, gettext, @@ -66,11 +65,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./RAND_egd.libressl.patch - (fetchpatch { - name = "https.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/https.patch?h=w3m-mouse&id=5b5f0fbb59f674575e87dd368fed834641c35f03"; - sha256 = "08skvaha1hjyapsh8zw5dgfy433mw2hk7qy9yy9avn8rjqj7kjxk"; - }) + ./https.patch ]; postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' diff --git a/pkgs/by-name/wa/waf/package.nix b/pkgs/by-name/wa/waf/package.nix index ad1b14998c635..5d8f113d041f5 100644 --- a/pkgs/by-name/wa/waf/package.nix +++ b/pkgs/by-name/wa/waf/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "waf"; - version = "2.1.7"; + version = "2.1.9"; src = fetchFromGitLab { owner = "ita1024"; repo = "waf"; rev = "waf-${finalAttrs.version}"; - hash = "sha256-qJDnox7+MUtAK8NaaDgEdRVU4YVA8f5Ky9Suv/qLI3g="; + hash = "sha256-myPGbJW/RkOtEas+qZ/vTL66bekwDBPhC6AmfXECkcw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wa/wakeonlan/package.nix b/pkgs/by-name/wa/wakeonlan/package.nix index 7434dca4f4eca..e91ddbc31b313 100644 --- a/pkgs/by-name/wa/wakeonlan/package.nix +++ b/pkgs/by-name/wa/wakeonlan/package.nix @@ -1,10 +1,8 @@ { lib, - stdenv, perlPackages, fetchFromGitHub, installShellFiles, - shortenPerlShebang, }: perlPackages.buildPerlPackage rec { @@ -22,8 +20,7 @@ perlPackages.buildPerlPackage rec { nativeBuildInputs = [ installShellFiles - ] - ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + ]; nativeCheckInputs = [ perlPackages.TestPerlCritic @@ -38,9 +35,6 @@ perlPackages.buildPerlPackage rec { installPhase = '' install -Dt $out/bin wakeonlan installManPage blib/man1/wakeonlan.1 - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/wakeonlan ''; meta = { diff --git a/pkgs/by-name/wa/wapiti/package.nix b/pkgs/by-name/wa/wapiti/package.nix index d3d750f0a16bc..96cd974c74899 100644 --- a/pkgs/by-name/wa/wapiti/package.nix +++ b/pkgs/by-name/wa/wapiti/package.nix @@ -70,8 +70,6 @@ python3Packages.buildPythonApplication rec { writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; - disabledTests = [ # Tests requires network access "test_attr" diff --git a/pkgs/by-name/wa/wasm-language-tools/package.nix b/pkgs/by-name/wa/wasm-language-tools/package.nix index 3bdf66a2d8ba8..e1adcb080635d 100644 --- a/pkgs/by-name/wa/wasm-language-tools/package.nix +++ b/pkgs/by-name/wa/wasm-language-tools/package.nix @@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/wat_server"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/wa/wasmtime/package.nix b/pkgs/by-name/wa/wasmtime/package.nix index a32a985e4df7c..5829e0e7004ae 100644 --- a/pkgs/by-name/wa/wasmtime/package.nix +++ b/pkgs/by-name/wa/wasmtime/package.nix @@ -91,7 +91,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/wa/waybar-lyric/package.nix b/pkgs/by-name/wa/waybar-lyric/package.nix index 20f6b9501a40f..bc7d6bf6476de 100644 --- a/pkgs/by-name/wa/waybar-lyric/package.nix +++ b/pkgs/by-name/wa/waybar-lyric/package.nix @@ -36,7 +36,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "XDG_CACHE_HOME" ]; preInstallCheck = '' # ERROR Failed to find cache directory diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix index d915092c3346a..1d166b8de1f01 100644 --- a/pkgs/by-name/wa/waybar/package.nix +++ b/pkgs/by-name/wa/waybar/package.nix @@ -193,7 +193,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; diff --git a/pkgs/by-name/we/webrtc-audio-processing_1/package.nix b/pkgs/by-name/we/webrtc-audio-processing_1/package.nix index 2d061db647066..cf4191c2ad10e 100644 --- a/pkgs/by-name/we/webrtc-audio-processing_1/package.nix +++ b/pkgs/by-name/we/webrtc-audio-processing_1/package.nix @@ -33,6 +33,11 @@ stdenv.mkDerivation rec { url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/0630fa25465530c0e7358f00016bdc812894f67f/community/webrtc-audio-processing-1/add-loongarch-support.patch"; hash = "sha256-Cn3KwKSSV/QJm1JW0pkEWB6OmeA0fRlVkiMU8OzXNzY="; }) + # Fix compilation against gcc15 + (fetchurl { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/webrtc-audio-processing-1/-/raw/9de1306d3a6a78f435666453b85ba8ede0dd91ea/0001-Fix-compilation-with-GCC-15.patch"; + hash = "sha256-Ws7FRBX5+nIKWJv6cROqO5eSm5AJGyZVWrAjQ4R3n0I="; + }) ]; outputs = [ diff --git a/pkgs/by-name/wg/wget2/package.nix b/pkgs/by-name/wg/wget2/package.nix index b573d532ea4be..8e02b1141b688 100644 --- a/pkgs/by-name/wg/wget2/package.nix +++ b/pkgs/by-name/wg/wget2/package.nix @@ -102,7 +102,6 @@ stdenv.mkDerivation rec { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = "--version"; meta = { description = "Successor of GNU Wget, a file and recursive website downloader"; diff --git a/pkgs/by-name/wi/wild-unwrapped/package.nix b/pkgs/by-name/wi/wild-unwrapped/package.nix index 312917e357804..453d810cd079e 100644 --- a/pkgs/by-name/wi/wild-unwrapped/package.nix +++ b/pkgs/by-name/wi/wild-unwrapped/package.nix @@ -37,7 +37,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/wk/wkg/package.nix b/pkgs/by-name/wk/wkg/package.nix index 379cd83a0275b..7c9dccb8dd733 100644 --- a/pkgs/by-name/wk/wkg/package.nix +++ b/pkgs/by-name/wk/wkg/package.nix @@ -23,7 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/wo/wofi-power-menu/package.nix b/pkgs/by-name/wo/wofi-power-menu/package.nix index 36caf9222a632..869ddd5e8957b 100644 --- a/pkgs/by-name/wo/wofi-power-menu/package.nix +++ b/pkgs/by-name/wo/wofi-power-menu/package.nix @@ -29,7 +29,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/wo/woke/package.nix b/pkgs/by-name/wo/woke/package.nix index 0d13c7ff25c80..d28f60f9b5ca6 100644 --- a/pkgs/by-name/wo/woke/package.nix +++ b/pkgs/by-name/wo/woke/package.nix @@ -34,7 +34,6 @@ buildGoModule rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/woke"; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/get-woke/woke/releases/tag/${src.tag}"; diff --git a/pkgs/by-name/ws/wstunnel/package.nix b/pkgs/by-name/ws/wstunnel/package.nix index b513fda7ce47b..349ada62a5ee5 100644 --- a/pkgs/by-name/ws/wstunnel/package.nix +++ b/pkgs/by-name/ws/wstunnel/package.nix @@ -23,7 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package wstunnel-cli" ]; nativeBuildInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; checkFlags = [ diff --git a/pkgs/by-name/wt/wtfutil/package.nix b/pkgs/by-name/wt/wtfutil/package.nix index dd7839a157939..1504e919c1b31 100644 --- a/pkgs/by-name/wt/wtfutil/package.nix +++ b/pkgs/by-name/wt/wtfutil/package.nix @@ -46,7 +46,6 @@ buildGoModule rec { doInstallCheck = true; # Darwin Error: mkdir /var/empty: file exists nativeInstallCheckInputs = lib.optional (!stdenv.hostPlatform.isDarwin) [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/xc/xcodegen/package.nix b/pkgs/by-name/xc/xcodegen/package.nix index 17ace827e11b8..dff37b0ff870a 100644 --- a/pkgs/by-name/xc/xcodegen/package.nix +++ b/pkgs/by-name/xc/xcodegen/package.nix @@ -55,7 +55,6 @@ swiftPackages.stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/xc/xcur2png/malloc.diff b/pkgs/by-name/xc/xcur2png/malloc.diff index 88f4e8e17ba90..d069db6a5297a 100644 --- a/pkgs/by-name/xc/xcur2png/malloc.diff +++ b/pkgs/by-name/xc/xcur2png/malloc.diff @@ -16,7 +16,7 @@ #include + -+void *malloc (); ++void *malloc (size_t __size); + +/* Allocate an N-byte block of memory from the heap. + If N is zero, allocate a 1-byte block. */ diff --git a/pkgs/by-name/xd/xdvdfs-cli/package.nix b/pkgs/by-name/xd/xdvdfs-cli/package.nix index 02c6e312b1e43..6a3f7769a99cc 100644 --- a/pkgs/by-name/xd/xdvdfs-cli/package.nix +++ b/pkgs/by-name/xd/xdvdfs-cli/package.nix @@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/xdvdfs"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/xe/xee/package.nix b/pkgs/by-name/xe/xee/package.nix index e8d4eca6fc60f..7e88d94aec89b 100644 --- a/pkgs/by-name/xe/xee/package.nix +++ b/pkgs/by-name/xe/xee/package.nix @@ -26,7 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "XML Execution Engine written in Rust"; diff --git a/pkgs/by-name/xh/xh/package.nix b/pkgs/by-name/xh/xh/package.nix index f3d6be7774698..3609712c82980 100644 --- a/pkgs/by-name/xh/xh/package.nix +++ b/pkgs/by-name/xh/xh/package.nix @@ -61,7 +61,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/xl/xlsxsql/package.nix b/pkgs/by-name/xl/xlsxsql/package.nix index 55de4d353cd5a..69a2d78101546 100644 --- a/pkgs/by-name/xl/xlsxsql/package.nix +++ b/pkgs/by-name/xl/xlsxsql/package.nix @@ -45,7 +45,6 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/xm/xmake/package.nix b/pkgs/by-name/xm/xmake/package.nix index 723500fdbdfdc..164669f5ed636 100644 --- a/pkgs/by-name/xm/xmake/package.nix +++ b/pkgs/by-name/xm/xmake/package.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/xm/xmlrpc_c/package.nix b/pkgs/by-name/xm/xmlrpc_c/package.nix index 67646135aa208..2b029663b05d1 100644 --- a/pkgs/by-name/xm/xmlrpc_c/package.nix +++ b/pkgs/by-name/xm/xmlrpc_c/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchDebianPatch, pkg-config, curl, libxml2, @@ -16,6 +17,15 @@ stdenv.mkDerivation rec { hash = "sha256-Z9hgBiRZ6ieEwHtNeRMxnZU5+nKfU0N46OQciRjyrfY="; }; + patches = [ + (fetchDebianPatch { + inherit pname version; + debianRevision = "1"; + patch = "fix-gcc15-build.patch"; + hash = "sha256-VcjXzzruDBuDarqhgNDHOtLxz2vlBrUAylILfMEGPmA="; + }) + ]; + postPatch = '' rm -rf lib/expat ''; diff --git a/pkgs/servers/x11/xorg/darwin/bundle_main.patch b/pkgs/by-name/xo/xorg-server/darwin/bundle_main.patch similarity index 100% rename from pkgs/servers/x11/xorg/darwin/bundle_main.patch rename to pkgs/by-name/xo/xorg-server/darwin/bundle_main.patch diff --git a/pkgs/by-name/xo/xorg-server/darwin/find-cpp.patch b/pkgs/by-name/xo/xorg-server/darwin/find-cpp.patch new file mode 100644 index 0000000000000..973a21184dd94 --- /dev/null +++ b/pkgs/by-name/xo/xorg-server/darwin/find-cpp.patch @@ -0,0 +1,13 @@ +diff --git a/hw/xquartz/bundle/meson.build b/hw/xquartz/bundle/meson.build +index 22941203b..4d3f159cf 100644 +--- a/hw/xquartz/bundle/meson.build ++++ b/hw/xquartz/bundle/meson.build +@@ -38,7 +38,7 @@ install_data('Resources/X11.icns', + install_mode: 'rw-r--r--') + + custom_target('Info.plist', +- command: [cpp, '-P', cpp_defs, '@INPUT@'], ++ command: ['clang', '-E', '-P', cpp_defs, '@INPUT@'], + capture: true, + input: 'Info.plist.cpp', + output: 'Info.plist', diff --git a/pkgs/servers/x11/xorg/darwin/stub.patch b/pkgs/by-name/xo/xorg-server/darwin/stub.patch similarity index 100% rename from pkgs/servers/x11/xorg/darwin/stub.patch rename to pkgs/by-name/xo/xorg-server/darwin/stub.patch diff --git a/pkgs/by-name/xo/xorg-server/package.nix b/pkgs/by-name/xo/xorg-server/package.nix new file mode 100644 index 0000000000000..bfede48f705ab --- /dev/null +++ b/pkgs/by-name/xo/xorg-server/package.nix @@ -0,0 +1,241 @@ +{ + lib, + stdenv, + fetchurl, + + # build system + meson, + ninja, + pkg-config, + + # deps + dbus, + dri-pkgconfig-stub, + fontutil, + libdrm, + libepoxy, + libgbm, + libGL, + libGLU, + libpciaccess, + libtirpc, + libunwind, + libx11, + libxau, + libxcb, + libxcb-image, + libxcb-keysyms, + libxcb-render-util, + libxcb-util, + libxcb-wm, + libxcvt, + libxdmcp, + libxext, + libxfixes, + libxfont_1, + libxfont_2, + libxkbfile, + libxshmfence, + mesa, + mesa-gl-headers, + openssl, + pixman, + udev, + xkbcomp, + xkeyboardconfig, + xorgproto, + xtrans, + zlib, + + # darwin specific deps + darwin, + utilmacros, + libapplewm, + + writeScript, + testers, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xorg-server"; + version = "21.1.20"; + + outputs = [ + "out" + "dev" + ]; + + src = fetchurl { + url = "mirror://xorg/individual/xserver/xorg-server-${finalAttrs.version}.tar.xz"; + hash = "sha256-dpW8YYJLOoG2utL3iwVADKAVAD3kAtGzIhFxBbcC6Tc="; + }; + + patches = lib.optionals stdenv.hostPlatform.isDarwin [ + ./darwin/bundle_main.patch + ./darwin/find-cpp.patch + ./darwin/stub.patch + ]; + + strictDeps = true; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.bootstrap_cmds + utilmacros + ]; + + buildInputs = [ + fontutil + libx11 + libxau + libxcb + libxcb-image + libxcb-keysyms + libxcb-render-util + libxcb-util + libxcb-wm + libxcvt + libxdmcp + libxfixes + libxkbfile + mesa-gl-headers + openssl + xorgproto + xtrans + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + dri-pkgconfig-stub + libdrm + libgbm + libtirpc + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.bootstrap_cmds + mesa + ]; + + propagatedBuildInputs = [ + dbus + libepoxy + libGL + libGLU + libunwind + libxext + libxfont_1 + libxfont_2 + libxshmfence + pixman + xorgproto + zlib + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libpciaccess ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libapplewm ]; + + mesonFlags = [ + "-Dxephyr=true" + "-Dxvfb=true" + "-Dxnest=true" + "-Dxorg=true" + + "-Dlog_dir=/var/log" + "-Ddefault_font_path=" + + "-Dxkb_bin_dir=${xkbcomp}/bin" + "-Dxkb_dir=${xkeyboardconfig}/share/X11/xkb" + "-Dxkb_output_dir=$out/share/X11/xkb/compiled" + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + "-Dxcsecurity=true" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "-Dglamor=false" + "-Dsecure-rpc=false" + "-Dint10=false" + "-Dpciaccess=false" + "-Dapple-application-name=XQuartz" + "-Dapple-applications-dir=${placeholder "out"}/Applications" + "-Dbundle-id-prefix=org.nixos.xquartz" + "-Dsha1=CommonCrypto" + ]; + + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace hw/xquartz/mach-startup/stub.c \ + --subst-var-by XQUARTZ_APP "$out/Applications/XQuartz.app" + ''; + + # default X install symlinks this to Xorg, we want XQuartz + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + ln -sf $out/bin/Xquartz $out/bin/X + ''; + + passthru = { + inherit (finalAttrs) version; # needed by virtualbox guest additions + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/xserver/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + description = "X server implementation by X.org"; + longDescription = '' + The X server accepts requests from client applications to create windows, which are (normally + rectangular) "virtual screens" that the client program can draw into. + Windows are then composed on the actual screen by the X server (or by a separate composite + manager) as directed by the window manager, which usually communicates with the user via + graphical controls such as buttons and draggable titlebars and borders. + + For a comprehensive overview of X Server and X Window System, consult the following article: + https://en.wikipedia.org/wiki/X_server + ''; + homepage = "https://x.org/wiki"; + license = with lib.licenses; [ + # because the license list is huge (1848 lines) this is documented by line range + # https://gitlab.freedesktop.org/xorg/xserver/-/blob/f05f269f1d5bddafe71cdfb290b118820bf17fdd/COPYING + + # 10-45, 148-170, 364-390, 431-454, 485-511, 512-534, 535-558, 1573-1593, 1692-1711, 1760-1779 + mit + + # 53-77, 124-147, 317-343, 455-484, 559-583, 629-654, 891-918, 1008-1034, 1056-1079, + # 1296-1326, 1438-1470, 1499-1522, 1523-1548 + x11 + + # 78-99, 171-191, 391-430 (doubled text), 584-605, 606-628, 707-729, 730-750, 807-828, + # 829-853, 854-879, 880-890, 919-939, 940-962, 963-985, 986-1007, 1035-1055, 1080-1102, + # 1103-1125, 1126-1148, 1149-1169, 1170-1192, 1193-1215, 1216-1236, 1237-1259, 1275-1295, + # 1327-1359, 1360-1383, 1549-1572, 1594-1617, 1618-1638, 1639-1670, 1671-1691, 1712-1732, + # 1733-1756, 1795-1814 + hpndSellVariant + + mitOpenGroup # 100-123 + hpnd # 192-214, 215-237, 344-363, 686-706, 1416-1437 + dec3Clause # 238-267 + x11NoPermitPersons # 268-292 + # missing last paragraph likely due to an error + # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2097 + sgi-b-20 # 293-316 + bsd3 # 655-685, 1471-1498, 1815-1848 (BSD-4-Clause UC with rescinded third clause) + adobeDisplayPostScript # 751-782 + ntp # 783-795 + hpndUc # 796-806 + isc # 1260-1274 + icu # 1383-1415 + # missing author/copyright notice + # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2098 + hpndSellVariantMitDisclaimerXserver # 1780-1793 + ]; + mainProgram = "X"; + maintainers = [ ]; + pkgConfigModules = [ "xorg-server" ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xt/xterm/package.nix b/pkgs/by-name/xt/xterm/package.nix index 97f2f708c6bd6..1503f24327887 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 = "403"; + version = "404"; src = fetchurl { urls = [ - "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" + "https://invisible-island.net/archives/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - hash = "sha256-EzGw31kZyyQ//jJtxv8QopHmg6Ji9wzflkpmS+czrYM="; + hash = "sha256-YzMvkhwie6WeWJ+gff2tFZnBCshZ6ibHKsHdSkG1ZaQ="; }; patches = [ ./sixel-256.support.patch ]; diff --git a/pkgs/by-name/xv/xvfb/package.nix b/pkgs/by-name/xv/xvfb/package.nix new file mode 100644 index 0000000000000..c81ee24beceec --- /dev/null +++ b/pkgs/by-name/xv/xvfb/package.nix @@ -0,0 +1,96 @@ +# xvfb is used by a bunch of things to run tests +# so try to reduce its reverse closure +{ + lib, + stdenv, + pkg-config, + xorg-server, + dri-pkgconfig-stub, + libdrm, + libGL, + libX11, + libXau, + libxcb, + libxcvt, + libxdmcp, + libxfixes, + libxfont_2, + libxkbfile, + libxshmfence, + mesa-gl-headers, + openssl, + pixman, + xcbutil, + xcbutilimage, + xcbutilkeysyms, + xcbutilrenderutil, + xcbutilwm, + xkbcomp, + xkeyboardconfig, + xorgproto, + xtrans, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xvfb"; + + inherit (xorg-server) src version; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + dri-pkgconfig-stub + libdrm + libGL + libX11 + libXau + libxcb + libxcvt + libxdmcp + libxfixes + libxfont_2 + libxkbfile + libxshmfence + mesa-gl-headers + openssl + pixman + xcbutil + xcbutilimage + xcbutilkeysyms + xcbutilrenderutil + xcbutilwm + xorgproto + xtrans + ]; + + configureFlags = [ + "--enable-xvfb" + "--disable-xorg" + "--disable-xquartz" + "--disable-xwayland" + "--with-xkb-bin-directory=${xkbcomp}/bin" + "--with-xkb-path=${xkeyboardconfig}/share/X11/xkb" + "--with-xkb-output=$out/share/X11/xkb/compiled" + ] + ++ lib.optional stdenv.hostPlatform.isDarwin "--without-dtrace"; + + meta = { + description = "X virtual framebuffer"; + longDescription = '' + Xvfb or X virtual framebuffer is a display server implementing the X11 display server + protocol. In contrast to other display servers, Xvfb performs all graphical operations in + virtual memory without showing any screen output. From the point of view of the X client app, + it acts exactly like any other X display server, serving requests and sending events and + errors as appropriate. However, no output is shown. This virtual server does not require the + computer it is running on to have any kind of graphics adapter, a screen or any input device. + Is is primarily used for testing. + ''; + inherit (xorg-server.meta) + homepage + license + mainProgram + ; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xv/xvidcore/package.nix b/pkgs/by-name/xv/xvidcore/package.nix index 77f54e745e32c..05711bf2e0031 100644 --- a/pkgs/by-name/xv/xvidcore/package.nix +++ b/pkgs/by-name/xv/xvidcore/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchurl, yasm, autoconf, @@ -8,15 +9,23 @@ libtool, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xvidcore"; version = "1.3.7"; src = fetchurl { - url = "https://downloads.xvid.com/downloads/${pname}-${version}.tar.bz2"; - sha256 = "1xyg3amgg27zf7188kss7y248s0xhh1vv8rrk0j9bcsd5nasxsmf"; + url = "https://downloads.xvid.com/downloads/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; + hash = "sha256-ruqulS1Ns5UkmDmjvQOEHWhEhD9aT4TCcf+I96oaz/c="; }; + patches = [ + # Fix build with gcc15 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/xvidcore/raw/95382dbe529e5589a727fffceb620b0a89ff55f2/f/xvidcore-c23.patch"; + hash = "sha256-bGwWNmXIEIIw4Tc7lrMZ4jnhcQ+uKAsxL6fuAOosMVA="; + }) + ]; + preConfigure = '' # Configure script is not in the root of the source directory cd build/generic @@ -70,4 +79,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix index d93a92167b644..c1d1688202300 100644 --- a/pkgs/by-name/ya/yabai/package.nix +++ b/pkgs/by-name/ya/yabai/package.nix @@ -58,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ya/yaml2json/package.nix b/pkgs/by-name/ya/yaml2json/package.nix index fcd2943e52e76..531a2744b45b8 100644 --- a/pkgs/by-name/ya/yaml2json/package.nix +++ b/pkgs/by-name/ya/yaml2json/package.nix @@ -27,7 +27,6 @@ buildGoModule (finalAttrs: { ]; nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ya/yamlfmt/package.nix b/pkgs/by-name/ya/yamlfmt/package.nix index fce075e3f7aa5..1b2e238e2e38f 100644 --- a/pkgs/by-name/ya/yamlfmt/package.nix +++ b/pkgs/by-name/ya/yamlfmt/package.nix @@ -41,7 +41,6 @@ buildGoModule (finalAttrs: { versionCheckHook ]; doInstallCheck = true; - versionCheckProgramArg = "--version"; meta = { description = "Extensible command line tool or library to format yaml files"; diff --git a/pkgs/by-name/ya/yarr/package.nix b/pkgs/by-name/ya/yarr/package.nix index 9addf8c5857c5..7beebb6581651 100644 --- a/pkgs/by-name/ya/yarr/package.nix +++ b/pkgs/by-name/ya/yarr/package.nix @@ -35,7 +35,6 @@ buildGoModule rec { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ye/yek/package.nix b/pkgs/by-name/ye/yek/package.nix index 800212911cbcf..23fe911c5e3fa 100644 --- a/pkgs/by-name/ye/yek/package.nix +++ b/pkgs/by-name/ye/yek/package.nix @@ -39,7 +39,6 @@ rustPlatform.buildRustPackage { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/yl/yle-dl/package.nix b/pkgs/by-name/yl/yle-dl/package.nix index 0856afcfc7f22..aa579c1ba014e 100644 --- a/pkgs/by-name/yl/yle-dl/package.nix +++ b/pkgs/by-name/yl/yle-dl/package.nix @@ -41,8 +41,6 @@ python3Packages.buildPythonApplication { # python3Packages.pytestCheckHook ]; - versionCheckProgramArg = "--version"; - meta = { description = "Downloads videos from Yle (Finnish Broadcasting Company) servers"; homepage = "https://aajanki.github.io/yle-dl/"; diff --git a/pkgs/by-name/yo/yodl/package.nix b/pkgs/by-name/yo/yodl/package.nix index 5e074c5fc7be9..7e284a61bedcc 100644 --- a/pkgs/by-name/yo/yodl/package.nix +++ b/pkgs/by-name/yo/yodl/package.nix @@ -83,7 +83,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/by-name/yt/ytcc/package.nix b/pkgs/by-name/yt/ytcc/package.nix index 9e2288d7c48ae..61064f552f685 100644 --- a/pkgs/by-name/yt/ytcc/package.nix +++ b/pkgs/by-name/yt/ytcc/package.nix @@ -45,8 +45,6 @@ python3Packages.buildPythonApplication { ] ++ [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - # Disable tests that touch network or shell out to commands disabledTests = [ "get_channels" diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix index 2f07f44e1c8ca..34da2fe8cb613 100644 --- a/pkgs/by-name/yt/ytdl-sub/package.nix +++ b/pkgs/by-name/yt/ytdl-sub/package.nix @@ -48,7 +48,6 @@ python3Packages.buildPythonApplication rec { python3Packages.pytestCheckHook writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; env = { YTDL_SUB_FFMPEG_PATH = "${lib.getExe' ffmpeg_7 "ffmpeg"}"; diff --git a/pkgs/by-name/yu/yuhaiin/package.nix b/pkgs/by-name/yu/yuhaiin/package.nix index f662cd6b94674..b4653c9de3d38 100644 --- a/pkgs/by-name/yu/yuhaiin/package.nix +++ b/pkgs/by-name/yu/yuhaiin/package.nix @@ -37,8 +37,6 @@ buildGoModule rec { versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; - meta = { description = "Proxy kit for Linux/Windows/MacOS"; homepage = "https://github.com/yuhaiin/yuhaiin"; diff --git a/pkgs/by-name/za/zaparoo/package.nix b/pkgs/by-name/za/zaparoo/package.nix index ce6e16edf6a51..da271137b42db 100644 --- a/pkgs/by-name/za/zaparoo/package.nix +++ b/pkgs/by-name/za/zaparoo/package.nix @@ -66,7 +66,6 @@ buildGoModule (finalAttrs: { versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 2e2067df61e9b..aed007f98beb4 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -311,7 +311,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/zeditor"; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/ze/zellij/package.nix b/pkgs/by-name/ze/zellij/package.nix index 5bdeba8e0fadb..ce80c2fc802df 100644 --- a/pkgs/by-name/ze/zellij/package.nix +++ b/pkgs/by-name/ze/zellij/package.nix @@ -54,7 +54,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; # Ensure that we don't vendor curl, but instead link against the libcurl from nixpkgs diff --git a/pkgs/by-name/zi/zig-zlint/package.nix b/pkgs/by-name/zi/zig-zlint/package.nix index 2fb60a954eb31..cfce73d35be65 100644 --- a/pkgs/by-name/zi/zig-zlint/package.nix +++ b/pkgs/by-name/zi/zig-zlint/package.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/zlint"; - versionCheckProgramArg = "--version"; # `zig build` produces a lot more artifacts, just copy over the ones we want installPhase = '' diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix index b8a71e3488040..0bed24621f7d1 100644 --- a/pkgs/by-name/zi/zipline/package.nix +++ b/pkgs/by-name/zi/zipline/package.nix @@ -123,7 +123,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/ziplinectl"; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "DATABASE_URL" ]; doInstallCheck = true; diff --git a/pkgs/by-name/zu/zuban/package.nix b/pkgs/by-name/zu/zuban/package.nix index b324726b804a1..cc3bed8a187fb 100644 --- a/pkgs/by-name/zu/zuban/package.nix +++ b/pkgs/by-name/zu/zuban/package.nix @@ -32,7 +32,6 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/by-name/zu/zug/gcc15.patch b/pkgs/by-name/zu/zug/gcc15.patch new file mode 100644 index 0000000000000..b0e44a4b7b1d0 --- /dev/null +++ b/pkgs/by-name/zu/zug/gcc15.patch @@ -0,0 +1,15 @@ +diff --git a/zug/sequence.hpp b/zug/sequence.hpp +index d7ac093..bffb771 100644 +--- a/zug/sequence.hpp ++++ b/zug/sequence.hpp +@@ -76,8 +76,9 @@ struct sequence_data + + sequence_data& operator=(sequence_data&& other) + { +- impl_ = std::move(other.impl); ++ impl_ = std::move(other.impl_); + impl_.reductor.current(this); ++ return *this; + } + + sequence_data& operator=(const sequence_data& other) diff --git a/pkgs/by-name/zu/zug/package.nix b/pkgs/by-name/zu/zug/package.nix index 95c9d82f06aa1..97eb691bbb902 100644 --- a/pkgs/by-name/zu/zug/package.nix +++ b/pkgs/by-name/zu/zug/package.nix @@ -24,6 +24,9 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/arximboldi/zug/commit/c8c74ada30d931e40636c13763b892f20d3ce1ae.patch"; hash = "sha256-0x+ScRnziBeyHWYJowcVb2zahkcK2qKrMVVk2twhtHA="; }) + + # https://github.com/arximboldi/zug/issues/45 + ./gcc15.patch ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/zv/zvm/package.nix b/pkgs/by-name/zv/zvm/package.nix index 7afb0bf41a9f3..6526e447c6f5e 100644 --- a/pkgs/by-name/zv/zvm/package.nix +++ b/pkgs/by-name/zv/zvm/package.nix @@ -20,7 +20,6 @@ buildGoModule rec { vendorHash = "sha256-yk1n0mW4WIKHTg9xgr+1IKbUpZWIaBaYrA6FwNBjVKc="; doInstallCheck = true; - versionCheckProgramArg = "--version"; nativeInstallCheckInputs = [ versionCheckHook ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/zx/zx/package.nix b/pkgs/by-name/zx/zx/package.nix index c990625106ffb..ada370da25cdb 100644 --- a/pkgs/by-name/zx/zx/package.nix +++ b/pkgs/by-name/zx/zx/package.nix @@ -55,8 +55,6 @@ buildNpmPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index c142225113246..7d7302bc143bd 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "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" + "commit": "24e42920d74ce9ac5c0c05264079d55cec49e82b", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/24e42920d74ce9ac5c0c05264079d55cec49e82b.tar.gz", + "sha256": "1kmf1wg09gsw06525mc0y91x9jy81amhd1sd3b7gl1swnj3dzqqf", + "msg": "Update from Hackage at 2025-11-24T11:39:51Z" } diff --git a/pkgs/development/compilers/dart/default.nix b/pkgs/development/compilers/dart/default.nix index 5f711e071486a..82ebeba651388 100644 --- a/pkgs/development/compilers/dart/default.nix +++ b/pkgs/development/compilers/dart/default.nix @@ -41,8 +41,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - passthru = { fetchGitHashesScript = ./fetch-git-hashes.py; updateScript = ./update.sh; diff --git a/pkgs/development/compilers/gcc/patches/15/libgcc-darwin-detection.patch b/pkgs/development/compilers/gcc/patches/15/libgcc-darwin-detection.patch index 810d8e6f69a12..41e1c4c89869d 100644 --- a/pkgs/development/compilers/gcc/patches/15/libgcc-darwin-detection.patch +++ b/pkgs/development/compilers/gcc/patches/15/libgcc-darwin-detection.patch @@ -1,11 +1,12 @@ --- a/libgcc/config.host +++ b/libgcc/config.host -@@ -239,7 +239,7 @@ case ${host} in +@@ -239,8 +239,8 @@ case ${host} in x86_64-*-darwin2[0-2]*) tmake_file="t-darwin-min-11 t-darwin-libgccs1 $tmake_file" ;; - *-*-darwin2*) +- tmake_file="t-darwin-min-11 $tmake_file" + *-*-darwin2* | *-*-darwin) - tmake_file="t-darwin-min-11 $tmake_file" ++ tmake_file="t-darwin-min-11 t-darwin-libgccs1 $tmake_file" ;; *-*-darwin1[89]*) diff --git a/pkgs/development/compilers/gcc/patches/15/libgcc-darwin-fix-reexport.patch b/pkgs/development/compilers/gcc/patches/15/libgcc-darwin-fix-reexport.patch new file mode 100644 index 0000000000000..dbb790e1eec3a --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/15/libgcc-darwin-fix-reexport.patch @@ -0,0 +1,11 @@ +--- a/libgcc/config/t-slibgcc-darwin ++++ b/libgcc/config/t-slibgcc-darwin +@@ -139,8 +139,7 @@ libgcc_s.1.dylib: all-multi libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT) + $(CC) -arch $${arch} -nodefaultlibs -dynamiclib -nodefaultrpaths \ + -o libgcc_s.1$(SHLIB_EXT)_T_$${mlib} \ + -Wl,-reexport_library,libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT)_T_$${mlib} \ + -lSystem \ +- -Wl,-reexported_symbols_list,$(srcdir)/config/darwin-unwind.ver \ + -install_name $(SHLIB_RPATH)/libgcc_s.1.dylib \ + -compatibility_version 1 -current_version 1.1 ; \ + done diff --git a/pkgs/development/compilers/gcc/patches/c++tools-dont-check-enable-default-pie.patch b/pkgs/development/compilers/gcc/patches/c++tools-dont-check-enable-default-pie.patch new file mode 100644 index 0000000000000..572829c45c6aa --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/c++tools-dont-check-enable-default-pie.patch @@ -0,0 +1,80 @@ +From 3f1f99ef82a65d66e3aaa429bf4fb746b93da0db Mon Sep 17 00:00:00 2001 +From: Kito Cheng +Date: Tue, 27 May 2025 10:10:15 +0800 +Subject: [PATCH] c++tools: Don't check --enable-default-pie. + +`--enable-default-pie` is an option to specify whether to enable +position-independent executables by default for `target`. + +However c++tools is build for `host`, so it should just follow +`--enable-host-pie` option to determine whether to build with +position-independent executables or not. + +NOTE: + +I checked PR 98324 and build with same configure option +(`--enable-default-pie` and lto bootstrap) on x86-64 linux to make sure +it won't cause same problem. + +c++tools/ChangeLog: + + * configure.ac: Don't check `--enable-default-pie`. + * configure: Regen. +--- + c++tools/configure | 11 ----------- + c++tools/configure.ac | 6 ------ + 2 files changed, 17 deletions(-) + +diff --git a/c++tools/configure b/c++tools/configure +index 1353479becaf4..6df4a2f0dfaed 100755 +--- a/c++tools/configure ++++ b/c++tools/configure +@@ -700,7 +700,6 @@ enable_option_checking + enable_c___tools + enable_maintainer_mode + enable_checking +-enable_default_pie + enable_host_pie + enable_host_bind_now + with_gcc_major_version_only +@@ -1335,7 +1334,6 @@ Optional Features: + enable expensive run-time checks. With LIST, enable + only specific categories of checks. Categories are: + yes,no,all,none,release. +- --enable-default-pie enable Position Independent Executable as default + --enable-host-pie build host code as PIE + --enable-host-bind-now link host code as BIND_NOW + +@@ -2946,15 +2944,6 @@ $as_echo "#define ENABLE_ASSERT_CHECKING 1" >>confdefs.h + + fi + +-# Check whether --enable-default-pie was given. +-# Check whether --enable-default-pie was given. +-if test "${enable_default_pie+set}" = set; then : +- enableval=$enable_default_pie; PICFLAG=-fPIE +-else +- PICFLAG= +-fi +- +- + # Enable --enable-host-pie + # Check whether --enable-host-pie was given. + if test "${enable_host_pie+set}" = set; then : +diff --git a/c++tools/configure.ac b/c++tools/configure.ac +index db34ee678e033..8c4b72a8023a8 100644 +--- a/c++tools/configure.ac ++++ b/c++tools/configure.ac +@@ -97,12 +97,6 @@ if test x$ac_assert_checking != x ; then + [Define if you want assertions enabled. This is a cheap check.]) + fi + +-# Check whether --enable-default-pie was given. +-AC_ARG_ENABLE(default-pie, +-[AS_HELP_STRING([--enable-default-pie], +- [enable Position Independent Executable as default])], +-[PICFLAG=-fPIE], [PICFLAG=]) +- + # Enable --enable-host-pie + AC_ARG_ENABLE(host-pie, + [AS_HELP_STRING([--enable-host-pie], diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index bfe11cb0b835b..d7eeee3eb7397 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -97,6 +97,9 @@ optionals noSysDirs ( # See https://github.com/NixOS/nixpkgs/pull/354107/commits/2de1b4b14e17f42ba8b4bf43a29347c91511e008 ++ optional (!atLeast14) ./cfi_startproc-reorder-label-09-1.diff ++ optional (atLeast14 && !canApplyIainsDarwinPatches) ./cfi_startproc-reorder-label-14-1.diff +# c++tools: Don't check --enable-default-pie. +# --enable-default-pie breaks bootstrap gcc otherwise, because libiberty.a is not found +++ optional (is14 || is15) ./c++tools-dont-check-enable-default-pie.patch ## 2. Patches relevant on specific platforms #################################### @@ -160,13 +163,14 @@ optionals noSysDirs ( ## Darwin -# Fixes detection of Darwin on x86_64-darwin. Otherwise, GCC uses a deployment target of 10.5, which crashes ld64. -++ optional ( - is14 && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 -) ../patches/14/libgcc-darwin-detection.patch +# Fixes detection of Darwin on x86_64-darwin and aarch64-darwin. Otherwise, GCC uses a deployment target of 10.5, which crashes ld64. +++ optional (is14 && stdenv.hostPlatform.isDarwin) ../patches/14/libgcc-darwin-detection.patch +++ optional (atLeast15 && stdenv.hostPlatform.isDarwin) ../patches/15/libgcc-darwin-detection.patch + +# Fix libgcc_s.1.dylib build on Darwin 11+ by not reexporting unwind symbols that don't exist ++ optional ( - atLeast15 && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 -) ../patches/15/libgcc-darwin-detection.patch + atLeast15 && stdenv.hostPlatform.isDarwin +) ../patches/15/libgcc-darwin-fix-reexport.patch # Fix detection of bootstrap compiler Ada support (cctools as) on Nix Darwin ++ optional (stdenv.hostPlatform.isDarwin && langAda) ./ada-cctools-as-detection-configure.patch diff --git a/pkgs/development/compilers/ghc/9.0.2-binary.nix b/pkgs/development/compilers/ghc/9.0.2-binary.nix index 4239212f2879d..cc3eb43b8ac0b 100644 --- a/pkgs/development/compilers/ghc/9.0.2-binary.nix +++ b/pkgs/development/compilers/ghc/9.0.2-binary.nix @@ -250,7 +250,7 @@ stdenv.mkDerivation { # 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; + env.${libEnvVar} = libPath; postUnpack = # Verify our assumptions of which `libtinfo.so` (ncurses) version is used, diff --git a/pkgs/development/compilers/ghc/9.8.4-binary.nix b/pkgs/development/compilers/ghc/9.8.4-binary.nix index 35f692d41eb59..c19b35a51a618 100644 --- a/pkgs/development/compilers/ghc/9.8.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.8.4-binary.nix @@ -232,7 +232,7 @@ stdenv.mkDerivation { # 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; + env.${libEnvVar} = libPath; postUnpack = # Verify our assumptions of which `libtinfo.so` (ncurses) version is used, diff --git a/pkgs/development/compilers/go/1.25.nix b/pkgs/development/compilers/go/1.25.nix index fe7dba89c6b8f..acc8569de85c7 100644 --- a/pkgs/development/compilers/go/1.25.nix +++ b/pkgs/development/compilers/go/1.25.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.25.4"; + version = "1.25.5"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-FgBDt/F7bWC1A2lDaRf9qNUDRkC6Oa4kMca5WoicyYw="; + hash = "sha256-IqX9CpHvzSihsFNxBrmVmygEth9Zw3WLUejlQpwalU8="; }; strictDeps = true; diff --git a/pkgs/development/compilers/jetbrains-jdk/jcef.nix b/pkgs/development/compilers/jetbrains-jdk/jcef.nix index 22904e925dc9f..4dbf856378196 100644 --- a/pkgs/development/compilers/jetbrains-jdk/jcef.nix +++ b/pkgs/development/compilers/jetbrains-jdk/jcef.nix @@ -2,6 +2,7 @@ autoPatchelfHook, fetchFromGitHub, fetchurl, + fetchpatch, stdenv, cmake, python3, @@ -76,6 +77,15 @@ let cmakeFlags = (old.cmakeFlags or [ ]) ++ [ "-DCMAKE_POLICY_VERSION_MINIMUM=3.10" ]; + patches = (old.patches or [ ]) ++ [ + # Fix build with gcc15 + # https://github.com/apache/thrift/pull/3078 + (fetchpatch { + name = "thrift-add-missing-cstdint-include-gcc15.patch"; + url = "https://github.com/apache/thrift/commit/947ad66940cfbadd9b24ba31d892dfc1142dd330.patch"; + hash = "sha256-pWcG6/BepUwc/K6cBs+6d74AWIhZ2/wXvCunb/KyB0s="; + }) + ]; }); in diff --git a/pkgs/development/compilers/llvm/18/mlir/mlir-add-include-cstdint.patch b/pkgs/development/compilers/llvm/18/mlir/mlir-add-include-cstdint.patch new file mode 100644 index 0000000000000..181d53c541848 --- /dev/null +++ b/pkgs/development/compilers/llvm/18/mlir/mlir-add-include-cstdint.patch @@ -0,0 +1,28 @@ +Rebase of 2 upstream commits: +https://github.com/llvm/llvm-project/commit/41eb186fbb024898bacc2577fa3b88db0510ba1f +https://github.com/llvm/llvm-project/commit/101109fc5460d5bb9bb597c6ec77f998093a6687 + +diff --git a/include/mlir/Dialect/Affine/IR/ValueBoundsOpInterfaceImpl.h b/include/mlir/Dialect/Affine/IR/ValueBoundsOpInterfaceImpl.h +index 451c466fa0c95..642e99d963ef6 100644 +--- a/include/mlir/Dialect/Affine/IR/ValueBoundsOpInterfaceImpl.h ++++ b/include/mlir/Dialect/Affine/IR/ValueBoundsOpInterfaceImpl.h +@@ -10,6 +10,7 @@ + #define MLIR_DIALECT_AFFINE_IR_VALUEBOUNDSOPINTERFACEIMPL_H + + #include "mlir/Support/LogicalResult.h" ++#include + + namespace mlir { + class DialectRegistry; +diff --git a/include/mlir/Target/SPIRV/Deserialization.h b/include/mlir/Target/SPIRV/Deserialization.h +index e39258beeaac8..a346a7fd1e5f7 100644 +--- a/include/mlir/Target/SPIRV/Deserialization.h ++++ b/include/mlir/Target/SPIRV/Deserialization.h +@@ -15,6 +15,7 @@ + + #include "mlir/IR/OwningOpRef.h" + #include "mlir/Support/LLVM.h" ++#include + + namespace mlir { + class MLIRContext; diff --git a/pkgs/development/compilers/llvm/19/mlir/mlir-add-include-cstdint.patch b/pkgs/development/compilers/llvm/19/mlir/mlir-add-include-cstdint.patch new file mode 100644 index 0000000000000..3e1ff09bc3ef5 --- /dev/null +++ b/pkgs/development/compilers/llvm/19/mlir/mlir-add-include-cstdint.patch @@ -0,0 +1,29 @@ +Rebase of 2 upstream commits: +https://github.com/llvm/llvm-project/commit/41eb186fbb024898bacc2577fa3b88db0510ba1f +https://github.com/llvm/llvm-project/commit/101109fc5460d5bb9bb597c6ec77f998093a6687 + +diff --git a/include/mlir/Dialect/Affine/IR/ValueBoundsOpInterfaceImpl.h b/include/mlir/Dialect/Affine/IR/ValueBoundsOpInterfaceImpl.h +index 451c466fa0c95..642e99d963ef6 100644 +--- a/include/mlir/Dialect/Affine/IR/ValueBoundsOpInterfaceImpl.h ++++ b/include/mlir/Dialect/Affine/IR/ValueBoundsOpInterfaceImpl.h +@@ -10,6 +10,7 @@ + #define MLIR_DIALECT_AFFINE_IR_VALUEBOUNDSOPINTERFACEIMPL_H + + #include "mlir/Support/LLVM.h" ++#include + + namespace mlir { + class DialectRegistry; +diff --git a/include/mlir/Target/SPIRV/Deserialization.h b/include/mlir/Target/SPIRV/Deserialization.h +index e39258beeaac8..a346a7fd1e5f7 100644 +--- a/include/mlir/Target/SPIRV/Deserialization.h ++++ b/include/mlir/Target/SPIRV/Deserialization.h +@@ -15,6 +15,7 @@ + + #include "mlir/IR/OwningOpRef.h" + #include "mlir/Support/LLVM.h" ++#include + + namespace mlir { + class MLIRContext; + diff --git a/pkgs/development/compilers/llvm/common/lldb/default.nix b/pkgs/development/compilers/llvm/common/lldb/default.nix index f67da50426674..ac4c4fbacd7f0 100644 --- a/pkgs/development/compilers/llvm/common/lldb/default.nix +++ b/pkgs/development/compilers/llvm/common/lldb/default.nix @@ -70,7 +70,14 @@ stdenv.mkDerivation ( sourceRoot = "${finalAttrs.src.name}/lldb"; - patches = [ ./gnu-install-dirs.patch ]; + patches = [ + ./gnu-install-dirs.patch + ] + ++ lib.optional (lib.versions.major release_version == "18") [ + # Fix build with gcc15 + # https://github.com/llvm/llvm-project/commit/bb59f04e7e75dcbe39f1bf952304a157f0035314 + ./lldb-add-include-cstdint.patch + ]; nativeBuildInputs = [ cmake diff --git a/pkgs/development/compilers/llvm/common/lldb/lldb-add-include-cstdint.patch b/pkgs/development/compilers/llvm/common/lldb/lldb-add-include-cstdint.patch new file mode 100644 index 0000000000000..2ca0b9a3eb386 --- /dev/null +++ b/pkgs/development/compilers/llvm/common/lldb/lldb-add-include-cstdint.patch @@ -0,0 +1,16 @@ +Rebase of upstream commit: +https://github.com/llvm/llvm-project/commit/bb59f04e7e75dcbe39f1bf952304a157f0035314 + +diff --git a/include/lldb/Utility/AddressableBits.h b/include/lldb/Utility/AddressableBits.h +index 0d27c3561ec27..8c7a1ec5f52c0 100644 +--- a/include/lldb/Utility/AddressableBits.h ++++ b/include/lldb/Utility/AddressableBits.h +@@ -12,6 +12,8 @@ + #include "lldb/lldb-forward.h" + ++#include ++ + namespace lldb_private { + + /// \class AddressableBits AddressableBits.h "lldb/Core/AddressableBits.h" + diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index a7821a0d976ac..00171a97068e9 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -193,6 +193,10 @@ stdenv.mkDerivation ( stripLen = 1; hash = "sha256-fqw5gTSEOGs3kAguR4tINFG7Xja1RAje+q67HJt2nGg="; }) + # Fix build with gcc15 + # https://github.com/llvm/llvm-project/commit/8f39502b85d34998752193e85f36c408d3c99248 + # https://github.com/llvm/llvm-project/commit/7abf44069aec61eee147ca67a6333fc34583b524 + ./llvm-add-include-cstdint.patch ] ++ lib.optionals (lib.versionOlder release_version "19") [ # Fixes test-suite on glibc 2.40 (https://github.com/llvm/llvm-project/pull/100804) diff --git a/pkgs/development/compilers/llvm/common/llvm/llvm-add-include-cstdint.patch b/pkgs/development/compilers/llvm/common/llvm/llvm-add-include-cstdint.patch new file mode 100644 index 0000000000000..d1e327668bc53 --- /dev/null +++ b/pkgs/development/compilers/llvm/common/llvm/llvm-add-include-cstdint.patch @@ -0,0 +1,27 @@ +Rebase of 2 upstream commits: +https://github.com/llvm/llvm-project/commit/8f39502b85d34998752193e85f36c408d3c99248 +https://github.com/llvm/llvm-project/commit/7abf44069aec61eee147ca67a6333fc34583b524 + +diff --git a/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0..879dbe1b279b1 100644 +--- a/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h ++++ b/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +@@ -15,6 +15,7 @@ + #ifndef LLVM_LIB_TARGET_AMDGPU_MCTARGETDESC_AMDGPUMCTARGETDESC_H + #define LLVM_LIB_TARGET_AMDGPU_MCTARGETDESC_AMDGPUMCTARGETDESC_H + ++#include + #include + + namespace llvm { +diff --git a/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h b/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h +index e166b68668d9b..0e0e13e896aea 100644 +--- a/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h ++++ b/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h +@@ -14,6 +14,7 @@ + #define LLVM_LIB_TARGET_X86_MCTARGETDESC_X86MCTARGETDESC_H + ++#include + #include + #include + diff --git a/pkgs/development/compilers/llvm/common/mlir/default.nix b/pkgs/development/compilers/llvm/common/mlir/default.nix index ec4944c34aaf0..c68f6a9b0b68e 100644 --- a/pkgs/development/compilers/llvm/common/mlir/default.nix +++ b/pkgs/development/compilers/llvm/common/mlir/default.nix @@ -12,6 +12,7 @@ libllvm, version, devExtraCmakeFlags ? [ ], + getVersionFile, }: stdenv.mkDerivation (finalAttrs: { @@ -38,6 +39,12 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./gnu-install-dirs.patch + ] + ++ lib.optional (lib.versionOlder release_version "20") [ + # Fix build with gcc15 + # https://github.com/llvm/llvm-project/commit/41eb186fbb024898bacc2577fa3b88db0510ba1f + # https://github.com/llvm/llvm-project/commit/101109fc5460d5bb9bb597c6ec77f998093a6687 + (getVersionFile "mlir/mlir-add-include-cstdint.patch") ]; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/llvm/common/patches.nix b/pkgs/development/compilers/llvm/common/patches.nix index 757eaf7230e58..30fa0411956a0 100644 --- a/pkgs/development/compilers/llvm/common/patches.nix +++ b/pkgs/development/compilers/llvm/common/patches.nix @@ -126,4 +126,16 @@ path = ../21; } ]; + "mlir/mlir-add-include-cstdint.patch" = [ + { + after = "18"; + before = "19"; + path = ../18; + } + { + after = "19"; + before = "20"; + path = ../19; + } + ]; } diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 2493597be8252..1e4f24cbc83f8 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -25,7 +25,7 @@ let "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I="; "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw="; - "21.1.2".officialRelease.sha256 = "sha256-SgZdBL0ivfv6/4EqmPQ+I57qT2t6i/rqnm20+T1BsFY="; + "21.1.7".officialRelease.sha256 = "sha256-SaRJ7+iZMhhBdcUDuJpMAY4REQVhrvYMqI2aq3Kz08o="; "22.0.0-git".gitRelease = { rev = "2c72af88213c0f9c507d9c8b34a39de8173a6fcc"; rev-version = "22.0.0-unstable-2025-12-28"; diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 4a66393946b28..f09ec3f79683a 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -118,6 +118,10 @@ stdenv.mkDerivation ( ++ optional noNakedPointers (flags "--disable-naked-pointers" "-no-naked-pointers"); dontAddStaticConfigureFlags = lib.versionOlder version "4.08"; + env = lib.optionalAttrs (lib.versionOlder version "4.14") { + NIX_CFLAGS_COMPILE = "-std=gnu11"; + }; + # on aarch64-darwin using --host and --target causes the build to invoke # `aarch64-apple-darwin-clang` while using assembler. However, such binary # does not exist. So, disable these configure flags on `aarch64-darwin`. diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix index 8b180376f10c2..1deaf765d57c5 100644 --- a/pkgs/development/compilers/openjdk/generic.nix +++ b/pkgs/development/compilers/openjdk/generic.nix @@ -412,10 +412,16 @@ stdenv.mkDerivation (finalAttrs: { if atLeast17 then "-Wno-error" else if atLeast11 then - # Workaround for - # `cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]` - # when building jtreg - "-Wformat" + lib.concatStringsSep " " ( + # Workaround for + # `cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]` + # when building jtreg + [ "-Wformat" ] + ++ lib.optionals (stdenv.cc.isGNU && featureVersion == "11") [ + # Fix build with gcc15 + "-std=gnu17" + ] + ) else lib.concatStringsSep " " ( [ @@ -436,6 +442,10 @@ stdenv.mkDerivation (finalAttrs: { "-Wno-error=int-conversion" "-Wno-error=incompatible-pointer-types" ] + ++ lib.optionals (stdenv.cc.isGNU && featureVersion == "8") [ + # Fix build with gcc15 + "-std=gnu17" + ] ); NIX_LDFLAGS = lib.concatStringsSep " " ( diff --git a/pkgs/development/compilers/rust/1_91.nix b/pkgs/development/compilers/rust/1_91.nix index a5fee800afa45..c9d31d1899d41 100644 --- a/pkgs/development/compilers/rust/1_91.nix +++ b/pkgs/development/compilers/rust/1_91.nix @@ -8,6 +8,11 @@ # Check the version number in the src/llvm-project git submodule in: # https://github.com/rust-lang/rust/blob//.gitmodules +# Note: The way this is structured is: +# 1. Import default.nix, and apply arguments as needed for the file-defined function +# 2. Implicitly, all arguments to this file are applied to the function that is imported. +# if you want to add an argument to default.nix's top-level function, but not the function +# it instantiates, add it to the `removeAttrs` call below. { stdenv, lib, @@ -22,6 +27,7 @@ wrapRustcWith, llvmPackages, llvm, + cargo-auditable, wrapCCWith, overrideCC, fetchpatch, @@ -51,7 +57,7 @@ import ./default.nix llvmSharedForHost = llvmSharedFor pkgsBuildHost; llvmSharedForTarget = llvmSharedFor pkgsBuildTarget; - inherit llvmPackages; + inherit llvmPackages cargo-auditable; # For use at runtime llvmShared = llvmSharedFor pkgsHostTarget; @@ -93,5 +99,6 @@ import ./default.nix "overrideCC" "pkgsHostTarget" "fetchpatch" + "cargo-auditable" ] ) diff --git a/pkgs/development/compilers/rust/cargo-auditable.nix b/pkgs/development/compilers/rust/cargo-auditable.nix deleted file mode 100644 index 2abda28c4d116..0000000000000 --- a/pkgs/development/compilers/rust/cargo-auditable.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ - lib, - buildPackages, - fetchFromGitHub, - makeRustPlatform, - installShellFiles, - stdenv, -}: - -let - args = rec { - pname = "cargo-auditable"; - version = "0.6.5"; - - src = fetchFromGitHub { - owner = "rust-secure-code"; - repo = "cargo-auditable"; - rev = "v${version}"; - sha256 = "sha256-zjv2/qZM0vRyz45DeKRtPHaamv2iLtjpSedVTEXeDr8="; - }; - - cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; - hash = "sha256-oTPGmoGlNfPVZ6qha/oXyPJp94fT2cNlVggbIGHf2bc="; - }; - - checkFlags = [ - # requires wasm32-unknown-unknown target - "--skip=test_wasm" - ]; - - meta = { - description = "Tool to make production Rust binaries auditable"; - mainProgram = "cargo-auditable"; - homepage = "https://github.com/rust-secure-code/cargo-auditable"; - changelog = "https://github.com/rust-secure-code/cargo-auditable/blob/v${version}/cargo-auditable/CHANGELOG.md"; - license = with lib.licenses; [ - mit # or - asl20 - ]; - maintainers = with lib.maintainers; [ RossSmyth ]; - broken = stdenv.hostPlatform != stdenv.buildPlatform; - }; - }; - - rustPlatform = makeRustPlatform { - inherit (buildPackages) rustc; - cargo = buildPackages.cargo.override { - auditable = false; - }; - }; - - bootstrap = rustPlatform.buildRustPackage ( - args - // { - auditable = false; - } - ); -in - -rustPlatform.buildRustPackage.override { cargo-auditable = bootstrap; } ( - args - // { - nativeBuildInputs = [ - installShellFiles - ]; - - postInstall = '' - installManPage cargo-auditable/cargo-auditable.1 - ''; - - passthru = { - inherit bootstrap; - }; - } -) diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 460c99ef5e177..5324a9f840200 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -11,6 +11,7 @@ llvmSharedForHost, llvmSharedForTarget, llvmPackages, # Exposed through rustc for LTO in Firefox + cargo-auditable, }: { stdenv, @@ -125,7 +126,7 @@ in } else self.callPackage ./cargo_cross.nix { }; - cargo-auditable = self.callPackage ./cargo-auditable.nix { }; + inherit cargo-auditable; cargo-auditable-cargo-wrapper = self.callPackage ./cargo-auditable-cargo-wrapper.nix { }; clippy-unwrapped = self.callPackage ./clippy.nix { }; clippy = if !fastCross then self.clippy-unwrapped else self.callPackage ./clippy-wrapper.nix { }; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 8213769844f53..43f4c95651656 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -240,6 +240,15 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) [ "--enable-profiler" # build libprofiler_builtins ] + ++ optionals stdenv.targetPlatform.isDarwin [ + # potentially other llvm targets work with the same fix? + "--enable-profiler" # build libprofiler_builtins + # Disable profiler for targets that don't support it + "--set=target.wasm32-unknown-unknown.profiler=false" + "--set=target.wasm32v1-none.profiler=false" + "--set=target.bpfel-unknown-none.profiler=false" + "--set=target.bpfeb-unknown-none.profiler=false" + ] ++ optionals stdenv.buildPlatform.isMusl [ "${setBuild}.musl-root=${pkgsBuildBuild.targetPackages.stdenv.cc.libc}" ] diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix index dc82033beeef2..ebd8fa92ce90e 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-11-11"; + version = "2.20.1-unstable-2025-11-20"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz"; - sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49"; + url = "https://github.com/NixOS/cabal2nix/archive/459859839cfe4fb352a29c1a72a1c4f0f537a1b8.tar.gz"; + sha256 = "1443hlbz29y2dn22kf91zx7g284zp3l2vgw6jg4wgx66v2sxrqii"; }; 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 00afd0bb28c42..81a23733d4240 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-11-11"; + version = "1.7.1.1-unstable-2025-11-20"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz"; - sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49"; + url = "https://github.com/NixOS/cabal2nix/archive/459859839cfe4fb352a29c1a72a1c4f0f537a1b8.tar.gz"; + sha256 = "1443hlbz29y2dn22kf91zx7g284zp3l2vgw6jg4wgx66v2sxrqii"; }; 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 2ad97d7259df4..3554407b8faa0 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-11-11"; + version = "2.1.3-unstable-2025-11-20"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz"; - sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49"; + url = "https://github.com/NixOS/cabal2nix/archive/459859839cfe4fb352a29c1a72a1c4f0f537a1b8.tar.gz"; + sha256 = "1443hlbz29y2dn22kf91zx7g284zp3l2vgw6jg4wgx66v2sxrqii"; }; 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 d0e04dc856ab2..503860f9737c1 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix @@ -9,14 +9,15 @@ lib, parsec-class, pretty, + process, QuickCheck, }: mkDerivation { pname = "language-nix"; - version = "2.3.0-unstable-2025-11-11"; + version = "2.3.0-unstable-2025-11-20"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz"; - sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49"; + url = "https://github.com/NixOS/cabal2nix/archive/459859839cfe4fb352a29c1a72a1c4f0f537a1b8.tar.gz"; + sha256 = "1443hlbz29y2dn22kf91zx7g284zp3l2vgw6jg4wgx66v2sxrqii"; }; postUnpack = "sourceRoot+=/language-nix; echo source root reset to $sourceRoot"; libraryHaskellDepends = [ @@ -33,6 +34,7 @@ mkDerivation { lens parsec-class pretty + process QuickCheck ]; homepage = "https://github.com/NixOS/cabal2nix/tree/master/language-nix#readme"; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4bacb842bb600..fa83e22bb9d06 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -605,42 +605,36 @@ with haskellLib; # 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/ # or git-annex @ 3571b077a1244330cc736181ee04b4d258a78476 doc/bugs/bash_completion_file_is_missing* - git-annex = lib.pipe super.git-annex ( - [ - (overrideCabal (drv: { - src = pkgs.fetchgit { - name = "git-annex-${super.git-annex.version}-src"; - url = "git://git-annex.branchable.com/"; - rev = "refs/tags/" + super.git-annex.version; - 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 - # mismatch on darwin. - postFetch = '' - rm -r $out/doc/?ndroid* - ''; - }; + git-annex = lib.pipe super.git-annex [ + (overrideCabal (drv: { + src = pkgs.fetchgit { + name = "git-annex-${super.git-annex.version}-src"; + url = "git://git-annex.branchable.com/"; + rev = "refs/tags/" + super.git-annex.version; + sha256 = "sha256-+OLFMrqpf1Ooy7CQ9S+N/H5R5+aHQtbO1pYwDF4ln8A="; + # 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 + # mismatch on darwin. + postFetch = '' + rm -r $out/doc/?ndroid* + ''; + }; - patches = drv.patches or [ ] ++ [ - # Prevent .desktop files from being installed to $out/usr/share. - # TODO(@sternenseemann): submit upstreamable patch resolving this - # (this should be possible by also taking PREFIX into account). - ./patches/git-annex-no-usr-prefix.patch - ]; + patches = drv.patches or [ ] ++ [ + # Prevent .desktop files from being installed to $out/usr/share. + # TODO(@sternenseemann): submit upstreamable patch resolving this + # (this should be possible by also taking PREFIX into account). + ./patches/git-annex-no-usr-prefix.patch + ]; - postPatch = '' - substituteInPlace Makefile \ - --replace-fail 'InstallDesktopFile $(PREFIX)/bin/git-annex' \ - 'InstallDesktopFile git-annex' - ''; - })) - ] - ++ lib.optionals (lib.versionOlder self.ghc.version "9.10") [ - (disableCabalFlag "OsPath") - (addBuildDepends [ self.filepath-bytestring ]) - ] - ); + postPatch = '' + substituteInPlace Makefile \ + --replace-fail 'InstallDesktopFile $(PREFIX)/bin/git-annex' \ + 'InstallDesktopFile git-annex' + ''; + })) + ]; # Too strict bounds on servant # Pending a hackage revision: https://github.com/berberman/arch-web/commit/5d08afee5b25e644f9e2e2b95380a5d4f4aa81ea#commitcomment-89230555 @@ -2862,12 +2856,12 @@ with haskellLib; doJailbreak # 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275 (overrideSrc rec { - version = "14.0"; + version = "14.2"; src = pkgs.fetchFromGitHub { owner = "PostgREST"; repo = "postgrest"; rev = "v${version}"; - hash = "sha256-GokYeVDuVdIbowU6xE3l8iaGbH4jnpqQFy/E+sb/Unw="; + hash = "sha256-wvE3foz2miOzA3hZ1Ar5XR0FUvP5EqAk010dXp8hiz0="; }; }) ]; @@ -3014,24 +3008,14 @@ with haskellLib; # https://github.com/mchav/snappy-hs/commit/400490df38e0db7f353c0427f034a231bdf73098#r167007963 snappy-hs = doJailbreak super.snappy-hs; + # Too strict upper bound on doctest + # https://github.com/awakesecurity/proto3-wire/pull/111 proto3-wire = appendPatches [ (fetchpatch { - # https://github.com/awakesecurity/proto3-wire/pull/108 name = "add-reverse-encoders-for-packed-repeated-fields.patch"; - url = "https://github.com/awakesecurity/proto3-wire/commit/d4376fb6f1c1ac03ee8ec5c5793700ca6508ea70.patch"; - hash = "sha256-vtEYg/jLoTn1YRVhQJi6kyta+U4XiWeS7i1ZSN7BYf8="; - includes = [ - "**.cabal" - "*.hs" - ]; - }) - (fetchpatch { - # https://github.com/awakesecurity/proto3-wire/pull/111 - name = "support-LTS-24.patch"; - url = "https://github.com/awakesecurity/proto3-wire/commit/35fd88c4daf6643135db6da9ab6ed6d6f33eb3de.patch"; + url = "https://github.com/awakesecurity/proto3-wire/commit/fcc53d9935b64b6d8aaf65c8cef17f4bbed56867.patch"; hash = "sha256-GzXlweRshVLA29xVHhJSRIU40y+KtAplIqfvp0I8cY0="; }) - ] super.proto3-wire; # 2024-07-27: building test component requires non-trivial custom build steps @@ -3092,7 +3076,7 @@ with haskellLib; http2-tls = lib.warnIf (lib.versionAtLeast self.tls.version "2.1.10") "haskellPackages.http2-tls: tls override can be removed" - (super.http2-tls.override { tls = self.tls_2_1_12; }); + (super.http2-tls.override { tls = self.tls_2_1_13; }); # Relax http2 version bound (5.3.9 -> 5.3.10) # https://github.com/well-typed/grapesy/issues/297 @@ -3176,7 +3160,7 @@ with haskellLib; ] ) super) what4 - what4_1_7 + what4_1_7_2 ; copilot-theorem = lib.pipe super.copilot-theorem [ @@ -3238,29 +3222,15 @@ with haskellLib; # https://github.com/tweag/monad-bayes/issues/378 (doJailbreak super.monad-bayes); - crucible = - lib.pipe - (super.crucible.override { - what4 = self.what4_1_7; - }) - [ - # 2025-04-13: jailbreak to allow th-abstraction >= 0.7 - (warnAfterVersion "0.7.2") - doJailbreak - - # Prevent clashes with now exported Prelude.foldl' - (appendPatch ( - pkgs.fetchpatch { - name = "base-4.20-foldl'.patch"; - url = "https://github.com/GaloisInc/crucible/commit/10f372e4b0389dd3966e04163dcd67d71e651709.patch"; - relative = "crucible"; - sha256 = "sha256-frxTs5SB1ENjH+X0lIlQ8k6pDIDOANylrqIOQpEtObU="; - } - )) - ]; + # 2025-04-13: jailbreak to allow th-abstraction >= 0.7 + crucible = doJailbreak ( + super.crucible.override { + what4 = self.what4_1_7_2; + } + ); crucible-llvm = super.crucible-llvm.override { - what4 = self.what4_1_7; + what4 = self.what4_1_7_2; }; # Test suite invokes cabal-install in a way incompatible with our generic builder @@ -3398,25 +3368,6 @@ with haskellLib; stripe-signature = doJailbreak super.stripe-signature; stripe-wreq = doJailbreak super.stripe-wreq; - # 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. botan-low = overrideCabal (drv: { diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 6ef11247985dd..ebf85f05fc220 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -401,6 +401,13 @@ self: super: ${old.postInstall or ""} ''; }) super.cabal2nix-unstable; + happy = overrideCabal (old: { + postInstall = '' + remove-references-to -t ${lib.getLib self.happy-lib} "''${!outputBin}/bin/happy" + + ${old.postInstall or ""} + ''; + }) super.happy; # https://github.com/fpco/unliftio/issues/87 unliftio = dontCheck super.unliftio; @@ -415,6 +422,10 @@ self: super: ''; }) super.rio; + # Don't use homebrew icu on macOS + # https://github.com/NixOS/nixpkgs/issues/462046 + text-icu = disableCabalFlag "homebrew" super.text-icu; + # https://github.com/haskell-crypto/cryptonite/issues/360 cryptonite = appendPatch ./patches/cryptonite-remove-argon2.patch super.cryptonite; 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 fe58bea65f886..e178514046149 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -96,6 +96,9 @@ self: super: { ++ drv.testFlags or [ ]; }) (doJailbreak super.hpack); + # Later versions require unix >= 2.8 which is tricky to provide with GHC 9.4 + crypton-x509-store = doDistribute self.crypton-x509-store_1_6_11; + # 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46 hiedb = dontCheck super.hiedb; @@ -142,6 +145,8 @@ self: super: { "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); + hlint = doDistribute self.hlint_3_6_1; + # directory-ospath-streaming requires the ospath API in core packages # filepath, directory and unix. stan = super.stan.override { diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index c0ee73d404bdc..78dadb694d519 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -16,7 +16,6 @@ broken-packages: - AC-BuildPlatform # failure in job https://hydra.nixos.org/build/233219130 at 2023-09-02 - AC-EasyRaster-GTK # failure in job https://hydra.nixos.org/build/233226232 at 2023-09-02 - AC-HalfInteger # failure in job https://hydra.nixos.org/build/233239266 at 2023-09-02 - - ac-library-hs # failure in job https://hydra.nixos.org/build/302800699 at 2025-07-27 - ac-machine # failure in job https://hydra.nixos.org/build/233253535 at 2023-09-02 - AC-MiniTest # failure in job https://hydra.nixos.org/build/233216015 at 2023-09-02 - AC-Terminal # failure in job https://hydra.nixos.org/build/233192747 at 2023-09-02 @@ -121,6 +120,7 @@ broken-packages: - air-extra # failure in job https://hydra.nixos.org/build/233250519 at 2023-09-02 - air-th # failure in job https://hydra.nixos.org/build/233228206 at 2023-09-02 - airbrake # failure in job https://hydra.nixos.org/build/233199319 at 2023-09-02 + - airgql # failure in job https://hydra.nixos.org/build/315094487 at 2025-11-29 - airship # failure in job https://hydra.nixos.org/build/233239011 at 2023-09-02 - airtable-api # failure in job https://hydra.nixos.org/build/233228482 at 2023-09-02 - ajhc # failure in job https://hydra.nixos.org/build/233197894 at 2023-09-02 @@ -163,6 +163,7 @@ broken-packages: - amazonka-mtl # failure in job https://hydra.nixos.org/build/295091544 at 2025-04-22 - amazonka-s3-encryption # failure in job https://hydra.nixos.org/build/295091601 at 2025-04-22 - AMI # failure in job https://hydra.nixos.org/build/233232505 at 2023-09-02 + - ampersand # failure in job https://hydra.nixos.org/build/315094859 at 2025-11-29 - amqp-conduit # failure in job https://hydra.nixos.org/build/233228080 at 2023-09-02 - amqp-streamly # failure in job https://hydra.nixos.org/build/295091669 at 2025-04-22 - amqp-worker # failure in job https://hydra.nixos.org/build/236675859 at 2023-10-04 @@ -255,6 +256,7 @@ broken-packages: - ArrowVHDL # failure in job https://hydra.nixos.org/build/233206149 at 2023-09-02 - artery # failure in job https://hydra.nixos.org/build/233206830 at 2023-09-02 - artifact # failure in job https://hydra.nixos.org/build/233233300 at 2023-09-02 + - arxiv-client # failure in job https://hydra.nixos.org/build/315094785 at 2025-11-29 - asap # failure in job https://hydra.nixos.org/build/233214968 at 2023-09-02 - ascii-caseless # failure in job https://hydra.nixos.org/build/307516784 at 2025-09-19 - ascii-flatten # failure in job https://hydra.nixos.org/build/233229168 at 2023-09-02 @@ -320,6 +322,9 @@ broken-packages: - authenticate-ldap # failure in job https://hydra.nixos.org/build/233216602 at 2023-09-02 - authinfo-hs # failure in job https://hydra.nixos.org/build/233224767 at 2023-09-02 - auto # failure in job https://hydra.nixos.org/build/233211088 at 2023-09-02 + - auto-export # failure in job https://hydra.nixos.org/build/315094848 at 2025-11-29 + - auto-extract # failure in job https://hydra.nixos.org/build/315094847 at 2025-11-29 + - auto-import # failure in job https://hydra.nixos.org/build/315094870 at 2025-11-29 - auto-split # failure in job https://hydra.nixos.org/build/295091795 at 2025-04-22 - autoapply # failure in job https://hydra.nixos.org/build/295091805 at 2025-04-22 - autom # failure in job https://hydra.nixos.org/build/234461198 at 2023-09-13 @@ -341,6 +346,7 @@ broken-packages: - aws-easy # failure building library in job https://hydra.nixos.org/build/237244335 at 2023-10-21 - aws-ec2 # failure in job https://hydra.nixos.org/build/233201556 at 2023-09-02 - aws-ec2-knownhosts # failure in job https://hydra.nixos.org/build/233237078 at 2023-09-02 + - aws-eventbridge-cron # failure in job https://hydra.nixos.org/build/315094885 at 2025-11-29 - aws-general # failure in job https://hydra.nixos.org/build/233211106 at 2023-09-02 - aws-lambda-runtime # failure in job https://hydra.nixos.org/build/233195123 at 2023-09-02 - aws-larpi # failure in job https://hydra.nixos.org/build/233246059 at 2023-09-02 @@ -504,7 +510,6 @@ broken-packages: - bits-show # failure in job https://hydra.nixos.org/build/252714912 at 2024-03-16 - bitset # failure in job https://hydra.nixos.org/build/233218622 at 2023-09-02 - bitspeak # failure in job https://hydra.nixos.org/build/233219582 at 2023-09-02 - - bitstream # failure in job https://hydra.nixos.org/build/233240888 at 2023-09-02 - BitStringRandomMonad # failure in job https://hydra.nixos.org/build/233203519 at 2023-09-02 - BitSyntax # failure in job https://hydra.nixos.org/build/233211551 at 2023-09-02 - bitx-bitcoin # failure in job https://hydra.nixos.org/build/233215594 at 2023-09-02 @@ -535,6 +540,7 @@ 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-contrib # failure in job https://hydra.nixos.org/build/315095091 at 2025-11-29 - 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 @@ -725,7 +731,6 @@ broken-packages: - carte # failure in job https://hydra.nixos.org/build/233201806 at 2023-09-02 - Cartesian # failure in job https://hydra.nixos.org/build/233249956 at 2023-09-02 - cas-hashable # failure in job https://hydra.nixos.org/build/233238789 at 2023-09-02 - - casa-abbreviations-and-acronyms # failure in job https://hydra.nixos.org/build/233194663 at 2023-09-02 - casadi-bindings-core # failure in job https://hydra.nixos.org/build/294582281 at 2025-04-09 - Cascade # failure in job https://hydra.nixos.org/build/233223917 at 2023-09-02 - cascading # failure in job https://hydra.nixos.org/build/233238563 at 2023-09-02 @@ -778,6 +783,7 @@ broken-packages: - cg # failure in job https://hydra.nixos.org/build/233212272 at 2023-09-02 - cgen # failure in job https://hydra.nixos.org/build/233198570 at 2023-09-02 - cgi-utils # failure in job https://hydra.nixos.org/build/233251773 at 2023-09-02 + - cgrep # failure in job https://hydra.nixos.org/build/315095274 at 2025-11-29 - cgroup-rts-threads # failure in job https://hydra.nixos.org/build/233207888 at 2023-09-02 - chakra # failure in job https://hydra.nixos.org/build/282936173 at 2024-12-24 - chalkboard # failure in job https://hydra.nixos.org/build/234453414 at 2023-09-13 @@ -1068,6 +1074,7 @@ broken-packages: - copilot-bluespec # failure in job https://hydra.nixos.org/build/253685418 at 2024-03-31 - copilot-frp-sketch # copilot >=3.7 && <3.8, - copilot-verifier # failure in job https://hydra.nixos.org/build/297024747 at 2025-05-14 + - copilot-visualizer # failure in job https://hydra.nixos.org/build/315095584 at 2025-11-29 - copr # failure in job https://hydra.nixos.org/build/233252310 at 2023-09-02 - coquina # failure in job https://hydra.nixos.org/build/307610386 at 2025-09-19 - core # failure in job https://hydra.nixos.org/build/233253971 at 2023-09-02 @@ -1094,7 +1101,6 @@ broken-packages: - cozo-hs # failure in job https://hydra.nixos.org/build/241432654 at 2023-11-19 - cparsing # failure in job https://hydra.nixos.org/build/233192377 at 2023-09-02 - cpio-conduit # failure in job https://hydra.nixos.org/build/233220518 at 2023-09-02 - - CPL # failure in job https://hydra.nixos.org/build/252731771 at 2024-03-16 - cplusplus-th # failure in job https://hydra.nixos.org/build/233204461 at 2023-09-02 - cpmonad # failure in job https://hydra.nixos.org/build/307517578 at 2025-09-19 - cps-except # failure in job https://hydra.nixos.org/build/252711064 at 2024-03-16 @@ -1123,8 +1129,9 @@ broken-packages: - crockford # failure in job https://hydra.nixos.org/build/233210759 at 2023-09-02 - crocodile # failure in job https://hydra.nixos.org/build/233222277 at 2023-09-02 - cronus # failure in job https://hydra.nixos.org/build/233225303 at 2023-09-02 + - croque-mort # failure in job https://hydra.nixos.org/build/315095572 at 2025-11-29 - crucible-debug # failure in job https://hydra.nixos.org/build/307610411 at 2025-09-19 - - crucible-symio # failure in job https://hydra.nixos.org/build/307610404 at 2025-09-19 + - crucible-llvm # failure in job https://hydra.nixos.org/build/315095700 at 2025-11-29 - cruncher-types # failure in job https://hydra.nixos.org/build/233229024 at 2023-09-02 - crunghc # failure in job https://hydra.nixos.org/build/233193295 at 2023-09-02 - crypt-sha512 # failure in job https://hydra.nixos.org/build/307517616 at 2025-09-19 @@ -1260,6 +1267,7 @@ broken-packages: - database-migrate # failure in job https://hydra.nixos.org/build/233201597 at 2023-09-02 - database-study # failure in job https://hydra.nixos.org/build/233222466 at 2023-09-02 - datadog # failure in job https://hydra.nixos.org/build/233191124 at 2023-09-02 + - dataframe # failure in job https://hydra.nixos.org/build/315095739 at 2025-11-29 - DataIndex # failure in job https://hydra.nixos.org/build/233254506 at 2023-09-02 - datalog # failure in job https://hydra.nixos.org/build/233242707 at 2023-09-02 - datapacker # failure in job https://hydra.nixos.org/build/233206524 at 2023-09-02 @@ -1465,6 +1473,7 @@ broken-packages: - DOH # failure in job https://hydra.nixos.org/build/233231913 at 2023-09-02 - doi # failure in job https://hydra.nixos.org/build/295092999 at 2025-04-22 - dom-events # failure in job https://hydra.nixos.org/build/233231199 at 2023-09-02 + - dom-parser # failure in job https://hydra.nixos.org/build/315095926 at 2025-11-29 - dom-selector # failure in job https://hydra.nixos.org/build/233212663 at 2023-09-02 - domaindriven-core # failure in job https://hydra.nixos.org/build/233234739 at 2023-09-02 - dominion # failure in job https://hydra.nixos.org/build/252714022 at 2024-03-16 @@ -1479,6 +1488,7 @@ broken-packages: - downloader # failure in job https://hydra.nixos.org/build/233195131 at 2023-09-02 - dozenal # failure in job https://hydra.nixos.org/build/233255439 at 2023-09-02 - dozens # failure in job https://hydra.nixos.org/build/233200638 at 2023-09-02 + - dpapi # failure in job https://hydra.nixos.org/build/315095939 at 2025-11-29 - dph-base # failure in job https://hydra.nixos.org/build/233211189 at 2023-09-02 - dpkg # failure in job https://hydra.nixos.org/build/233663149 at 2023-09-02 - DPM # failure in job https://hydra.nixos.org/build/233191307 at 2023-09-02 @@ -1513,6 +1523,7 @@ broken-packages: - dump-core # failure in job https://hydra.nixos.org/build/233244428 at 2023-09-02 - dunai-core # failure in job https://hydra.nixos.org/build/233255804 at 2023-09-02 - Dung # failure in job https://hydra.nixos.org/build/233206343 at 2023-09-02 + - duoids # failure in job https://hydra.nixos.org/build/315095962 at 2025-11-29 - dupIO # failure in job https://hydra.nixos.org/build/236688265 at 2023-10-04 - duplo # failure in job https://hydra.nixos.org/build/233237341 at 2023-09-02 - dura # failure in job https://hydra.nixos.org/build/233210320 at 2023-09-02 @@ -1699,7 +1710,6 @@ 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 @@ -2115,6 +2125,7 @@ broken-packages: - geojson # failure in job https://hydra.nixos.org/build/295093530 at 2025-04-22 - geojson-types # failure in job https://hydra.nixos.org/build/233224929 at 2023-09-02 - geom2d # failure in job https://hydra.nixos.org/build/233254609 at 2023-09-02 + - geomancy # failure in job https://hydra.nixos.org/build/315096508 at 2025-11-29 - GeomPredicates-SSE # failure in job https://hydra.nixos.org/build/233249584 at 2023-09-02 - geos # failure in job https://hydra.nixos.org/build/233203852 at 2023-09-02 - Get # failure in job https://hydra.nixos.org/build/233216093 at 2023-09-02 @@ -2180,7 +2191,6 @@ broken-packages: - 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 @@ -2291,7 +2301,6 @@ 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 @@ -2528,6 +2537,7 @@ broken-packages: - haskell-compression # failure in job https://hydra.nixos.org/build/233212749 at 2023-09-02 - haskell-conll # failure in job https://hydra.nixos.org/build/233203484 at 2023-09-02 - haskell-course-preludes # failure in job https://hydra.nixos.org/build/233196306 at 2023-09-02 + - haskell-debugger-view # failure in job https://hydra.nixos.org/build/315096984 at 2025-11-29 - haskell-disque # failure in job https://hydra.nixos.org/build/233226200 at 2023-09-02 - haskell-docs-cli # failure in job https://hydra.nixos.org/build/252718877 at 2024-03-16 - haskell-ffprobe # failure in job https://hydra.nixos.org/build/267973417 at 2024-07-31 @@ -2681,6 +2691,7 @@ broken-packages: - heckle # failure in job https://hydra.nixos.org/build/233228954 at 2023-09-02 - heddit # failure in job https://hydra.nixos.org/build/233229058 at 2023-09-02 - hedgehog-checkers # failure in job https://hydra.nixos.org/build/233229405 at 2023-09-02 + - hedgehog-extras # failure in job https://hydra.nixos.org/build/315097057 at 2025-11-29 - hedgehog-gen # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237243271 at 2023-10-21 - hedgehog-generic # failure in job https://hydra.nixos.org/build/233204695 at 2023-09-02 - hedgehog-golden # failure in job https://hydra.nixos.org/build/233219619 at 2023-09-02 @@ -3072,6 +3083,7 @@ broken-packages: - hsluv-haskell # failure in job https://hydra.nixos.org/build/233239548 at 2023-09-02 - hsmagick # failure in job https://hydra.nixos.org/build/233235964 at 2023-09-02 - hsmodetweaks # failure in job https://hydra.nixos.org/build/233663004 at 2023-09-02 + - hsmrc # failure in job https://hydra.nixos.org/build/315097363 at 2025-11-29 - Hsmtlib # failure in job https://hydra.nixos.org/build/233213073 at 2023-09-02 - hsmtpclient # failure in job https://hydra.nixos.org/build/233224596 at 2023-09-02 - hsnock # failure in job https://hydra.nixos.org/build/233194525 at 2023-09-02 @@ -3101,6 +3113,7 @@ broken-packages: - hspretty # failure in job https://hydra.nixos.org/build/233253394 at 2023-09-02 - hsql # failure in job https://hydra.nixos.org/build/233217626 at 2023-09-02 - hsseccomp # failure in job https://hydra.nixos.org/build/233194411 at 2023-09-02 + - hssh # failure in job https://hydra.nixos.org/build/315097366 at 2025-11-29 - hsshellscript # failure in job https://hydra.nixos.org/build/233197858 at 2023-09-02 - hsSqlite3 # failure in job https://hydra.nixos.org/build/233238549 at 2023-09-02 - hssqlppp # failure in job https://hydra.nixos.org/build/233216888 at 2023-09-02 @@ -4056,6 +4069,7 @@ broken-packages: - mixpanel-client # failure in job https://hydra.nixos.org/build/233220132 at 2023-09-02 - mkcabal # failure in job https://hydra.nixos.org/build/233202466 at 2023-09-02 - ml-w # failure in job https://hydra.nixos.org/build/233251342 at 2023-09-02 + - mlkem # failure in job https://hydra.nixos.org/build/315098220 at 2025-11-29 - mltool # failure in job https://hydra.nixos.org/build/233203849 at 2023-09-02 - mm2 # failure in job https://hydra.nixos.org/build/233260048 at 2023-09-02 - mmsyn2 # failure in job https://hydra.nixos.org/build/233201519 at 2023-09-02 @@ -4084,6 +4098,7 @@ broken-packages: - monad-atom-simple # failure in job https://hydra.nixos.org/build/233259038 at 2023-09-02 - monad-branch # failure in job https://hydra.nixos.org/build/233251253 at 2023-09-02 - monad-choice # failure in job https://hydra.nixos.org/build/233255987 at 2023-09-02 + - monad-effect-logging # failure in job https://hydra.nixos.org/build/315098256 at 2025-11-29 - monad-fork # failure in job https://hydra.nixos.org/build/233206855 at 2023-09-02 - monad-gen # failure in job https://hydra.nixos.org/build/252730194 at 2024-03-16 - monad-introspect # failure in job https://hydra.nixos.org/build/233248261 at 2023-09-02 @@ -4296,7 +4311,6 @@ broken-packages: - nested-sequence # failure in job https://hydra.nixos.org/build/233221359 at 2023-09-02 - NestedFunctor # failure in job https://hydra.nixos.org/build/233253656 at 2023-09-02 - nestedmap # failure in job https://hydra.nixos.org/build/233219375 at 2023-09-02 - - net-mqtt # failure in job https://hydra.nixos.org/build/307611123 at 2025-09-19 - net-spider # failure in job https://hydra.nixos.org/build/295095612 at 2025-04-22 - netclock # failure in job https://hydra.nixos.org/build/233207456 at 2023-09-02 - netease-fm # failure in job https://hydra.nixos.org/build/233210043 at 2023-09-02 @@ -4351,6 +4365,7 @@ broken-packages: - nicovideo-translator # failure in job https://hydra.nixos.org/build/233225618 at 2023-09-02 - nist-beacon # failure in job https://hydra.nixos.org/build/233206376 at 2023-09-02 - nitro # failure in job https://hydra.nixos.org/build/233229909 at 2023-09-02 + - nix-cache-server # failure in job https://hydra.nixos.org/build/315098561 at 2025-11-29 - nix-delegate # failure in job https://hydra.nixos.org/build/233232891 at 2023-09-02 - nix-eval # failure in job https://hydra.nixos.org/build/233256388 at 2023-09-02 - nix-freeze-tree # failure in job https://hydra.nixos.org/build/233234834 at 2023-09-02 @@ -5122,6 +5137,7 @@ broken-packages: - qc-oi-testgenerator # failure in job https://hydra.nixos.org/build/233197822 at 2023-09-02 - qd # failure in job https://hydra.nixos.org/build/233213936 at 2023-09-02 - qed # failure in job https://hydra.nixos.org/build/233249635 at 2023-09-02 + - qhs # failure in job https://hydra.nixos.org/build/315099159 at 2025-11-29 - qhull-simple # failure in job https://hydra.nixos.org/build/233248108 at 2023-09-02 - qif # failure in job https://hydra.nixos.org/build/233227609 at 2023-09-02 - QIO # failure in job https://hydra.nixos.org/build/233233009 at 2023-09-02 @@ -5747,7 +5763,6 @@ broken-packages: - simple-pipe # failure in job https://hydra.nixos.org/build/233251483 at 2023-09-02 - simple-rope # failure in job https://hydra.nixos.org/build/233239446 at 2023-09-02 - simple-server # failure in job https://hydra.nixos.org/build/233242498 at 2023-09-02 - - simple-sql-parser # failure in job https://hydra.nixos.org/build/233203075 at 2023-09-02 - simple-stacked-vm # failure in job https://hydra.nixos.org/build/233206051 at 2023-09-02 - simple-tabular # failure in job https://hydra.nixos.org/build/233233368 at 2023-09-02 - simple-tar # failure in job https://hydra.nixos.org/build/233206675 at 2023-09-02 @@ -5875,7 +5890,6 @@ broken-packages: - snipcheck # failure in job https://hydra.nixos.org/build/233214417 at 2023-09-02 - snorkels # failure in job https://hydra.nixos.org/build/233229705 at 2023-09-02 - snowtify # failure in job https://hydra.nixos.org/build/233215099 at 2023-09-02 - - soap # failure in job https://hydra.nixos.org/build/295097136 at 2025-04-22 - socket-activation # failure in job https://hydra.nixos.org/build/233258011 at 2023-09-02 - socket-sctp # failure in job https://hydra.nixos.org/build/233228125 at 2023-09-02 - socketed # failure in job https://hydra.nixos.org/build/233210087 at 2023-09-02 @@ -5944,7 +5958,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-easy # failure in job https://hydra.nixos.org/build/315099889 at 2025-11-29 - 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 @@ -6036,6 +6050,268 @@ broken-packages: - Strafunski-StrategyLib # failure in job https://hydra.nixos.org/build/233245449 at 2023-09-02 - StrappedTemplates # failure in job https://hydra.nixos.org/build/233193696 at 2023-09-02 - StrategyLib # failure in job https://hydra.nixos.org/build/233214584 at 2023-09-02 + - stratosphere-accessanalyzer # failure in job https://hydra.nixos.org/build/315099979 at 2025-11-29 + - stratosphere-acmpca # failure in job https://hydra.nixos.org/build/315099999 at 2025-11-29 + - stratosphere-aiops # failure in job https://hydra.nixos.org/build/315099983 at 2025-11-29 + - stratosphere-amazonmq # failure in job https://hydra.nixos.org/build/315099980 at 2025-11-29 + - stratosphere-amplify # failure in job https://hydra.nixos.org/build/315099995 at 2025-11-29 + - stratosphere-amplifyuibuilder # failure in job https://hydra.nixos.org/build/315100002 at 2025-11-29 + - stratosphere-apigateway # failure in job https://hydra.nixos.org/build/315100001 at 2025-11-29 + - stratosphere-apigatewayv2 # failure in job https://hydra.nixos.org/build/315100059 at 2025-11-29 + - stratosphere-appconfig # failure in job https://hydra.nixos.org/build/315099984 at 2025-11-29 + - stratosphere-appflow # failure in job https://hydra.nixos.org/build/315100009 at 2025-11-29 + - stratosphere-appintegrations # failure in job https://hydra.nixos.org/build/315099987 at 2025-11-29 + - stratosphere-applicationautoscaling # failure in job https://hydra.nixos.org/build/315099989 at 2025-11-29 + - stratosphere-applicationinsights # failure in job https://hydra.nixos.org/build/315100000 at 2025-11-29 + - stratosphere-applicationsignals # failure in job https://hydra.nixos.org/build/315099991 at 2025-11-29 + - stratosphere-appmesh # failure in job https://hydra.nixos.org/build/315100015 at 2025-11-29 + - stratosphere-apprunner # failure in job https://hydra.nixos.org/build/315099992 at 2025-11-29 + - stratosphere-appstream # failure in job https://hydra.nixos.org/build/315099993 at 2025-11-29 + - stratosphere-appsync # failure in job https://hydra.nixos.org/build/315099998 at 2025-11-29 + - stratosphere-apptest # failure in job https://hydra.nixos.org/build/315100005 at 2025-11-29 + - stratosphere-aps # failure in job https://hydra.nixos.org/build/315099996 at 2025-11-29 + - stratosphere-arcregionswitch # failure in job https://hydra.nixos.org/build/315100028 at 2025-11-29 + - stratosphere-arczonalshift # failure in job https://hydra.nixos.org/build/315100010 at 2025-11-29 + - stratosphere-ask # failure in job https://hydra.nixos.org/build/315100007 at 2025-11-29 + - stratosphere-athena # failure in job https://hydra.nixos.org/build/315100014 at 2025-11-29 + - stratosphere-auditmanager # failure in job https://hydra.nixos.org/build/315100034 at 2025-11-29 + - stratosphere-autoscaling # failure in job https://hydra.nixos.org/build/315100023 at 2025-11-29 + - stratosphere-autoscalingplans # failure in job https://hydra.nixos.org/build/315100012 at 2025-11-29 + - stratosphere-b2bi # failure in job https://hydra.nixos.org/build/315100004 at 2025-11-29 + - stratosphere-backup # failure in job https://hydra.nixos.org/build/315100043 at 2025-11-29 + - stratosphere-backupgateway # failure in job https://hydra.nixos.org/build/315100006 at 2025-11-29 + - stratosphere-batch # failure in job https://hydra.nixos.org/build/315100041 at 2025-11-29 + - stratosphere-bcmdataexports # failure in job https://hydra.nixos.org/build/315100020 at 2025-11-29 + - stratosphere-bedrock # failure in job https://hydra.nixos.org/build/315100008 at 2025-11-29 + - stratosphere-bedrockagentcore # failure in job https://hydra.nixos.org/build/315100016 at 2025-11-29 + - stratosphere-billing # failure in job https://hydra.nixos.org/build/315100011 at 2025-11-29 + - stratosphere-billingconductor # failure in job https://hydra.nixos.org/build/315100021 at 2025-11-29 + - stratosphere-budgets # failure in job https://hydra.nixos.org/build/315100013 at 2025-11-29 + - stratosphere-cassandra # failure in job https://hydra.nixos.org/build/315100060 at 2025-11-29 + - stratosphere-ce # failure in job https://hydra.nixos.org/build/315100029 at 2025-11-29 + - stratosphere-certificatemanager # failure in job https://hydra.nixos.org/build/315100024 at 2025-11-29 + - stratosphere-chatbot # failure in job https://hydra.nixos.org/build/315100017 at 2025-11-29 + - stratosphere-cleanrooms # failure in job https://hydra.nixos.org/build/315100018 at 2025-11-29 + - stratosphere-cleanroomsml # failure in job https://hydra.nixos.org/build/315100019 at 2025-11-29 + - stratosphere-cloud9 # failure in job https://hydra.nixos.org/build/315100038 at 2025-11-29 + - stratosphere-cloudformation # failure in job https://hydra.nixos.org/build/315100071 at 2025-11-29 + - stratosphere-cloudfront # failure in job https://hydra.nixos.org/build/315100049 at 2025-11-29 + - stratosphere-cloudtrail # failure in job https://hydra.nixos.org/build/315100033 at 2025-11-29 + - stratosphere-cloudwatch # failure in job https://hydra.nixos.org/build/315100064 at 2025-11-29 + - stratosphere-codeartifact # failure in job https://hydra.nixos.org/build/315100025 at 2025-11-29 + - stratosphere-codebuild # failure in job https://hydra.nixos.org/build/315100026 at 2025-11-29 + - stratosphere-codecommit # failure in job https://hydra.nixos.org/build/315100027 at 2025-11-29 + - stratosphere-codeconnections # failure in job https://hydra.nixos.org/build/315100117 at 2025-11-29 + - stratosphere-codedeploy # failure in job https://hydra.nixos.org/build/315100039 at 2025-11-29 + - stratosphere-codeguruprofiler # failure in job https://hydra.nixos.org/build/315100030 at 2025-11-29 + - stratosphere-codegurureviewer # failure in job https://hydra.nixos.org/build/315100031 at 2025-11-29 + - stratosphere-codepipeline # failure in job https://hydra.nixos.org/build/315100052 at 2025-11-29 + - stratosphere-codestar # failure in job https://hydra.nixos.org/build/315100032 at 2025-11-29 + - stratosphere-codestarconnections # failure in job https://hydra.nixos.org/build/315100065 at 2025-11-29 + - stratosphere-codestarnotifications # failure in job https://hydra.nixos.org/build/315100035 at 2025-11-29 + - stratosphere-cognito # failure in job https://hydra.nixos.org/build/315100044 at 2025-11-29 + - stratosphere-comprehend # failure in job https://hydra.nixos.org/build/315100036 at 2025-11-29 + - stratosphere-config # failure in job https://hydra.nixos.org/build/315100037 at 2025-11-29 + - stratosphere-connect # failure in job https://hydra.nixos.org/build/315100050 at 2025-11-29 + - stratosphere-connectcampaigns # failure in job https://hydra.nixos.org/build/315100051 at 2025-11-29 + - stratosphere-connectcampaignsv2 # failure in job https://hydra.nixos.org/build/315100066 at 2025-11-29 + - stratosphere-controltower # failure in job https://hydra.nixos.org/build/315100042 at 2025-11-29 + - stratosphere-cur # failure in job https://hydra.nixos.org/build/315100048 at 2025-11-29 + - stratosphere-customerprofiles # failure in job https://hydra.nixos.org/build/315100091 at 2025-11-29 + - stratosphere-databrew # failure in job https://hydra.nixos.org/build/315100106 at 2025-11-29 + - stratosphere-datapipeline # failure in job https://hydra.nixos.org/build/315100045 at 2025-11-29 + - stratosphere-datasync # failure in job https://hydra.nixos.org/build/315100046 at 2025-11-29 + - stratosphere-datazone # failure in job https://hydra.nixos.org/build/315100047 at 2025-11-29 + - stratosphere-dax # failure in job https://hydra.nixos.org/build/315100053 at 2025-11-29 + - stratosphere-deadline # failure in job https://hydra.nixos.org/build/315100055 at 2025-11-29 + - stratosphere-detective # failure in job https://hydra.nixos.org/build/315100062 at 2025-11-29 + - stratosphere-devopsguru # failure in job https://hydra.nixos.org/build/315100114 at 2025-11-29 + - stratosphere-directoryservice # failure in job https://hydra.nixos.org/build/315100063 at 2025-11-29 + - stratosphere-dlm # failure in job https://hydra.nixos.org/build/315100054 at 2025-11-29 + - stratosphere-dms # failure in job https://hydra.nixos.org/build/315100076 at 2025-11-29 + - stratosphere-docdb # failure in job https://hydra.nixos.org/build/315100056 at 2025-11-29 + - stratosphere-docdbelastic # failure in job https://hydra.nixos.org/build/315100057 at 2025-11-29 + - stratosphere-dsql # failure in job https://hydra.nixos.org/build/315100068 at 2025-11-29 + - stratosphere-dynamodb # failure in job https://hydra.nixos.org/build/315100058 at 2025-11-29 + - stratosphere-ec2 # failure in job https://hydra.nixos.org/build/315100074 at 2025-11-29 + - stratosphere-ecr # failure in job https://hydra.nixos.org/build/315100070 at 2025-11-29 + - stratosphere-ecs # failure in job https://hydra.nixos.org/build/315100061 at 2025-11-29 + - stratosphere-efs # failure in job https://hydra.nixos.org/build/315100077 at 2025-11-29 + - stratosphere-eks # failure in job https://hydra.nixos.org/build/315100097 at 2025-11-29 + - stratosphere-elasticache # failure in job https://hydra.nixos.org/build/315100069 at 2025-11-29 + - stratosphere-elasticbeanstalk # failure in job https://hydra.nixos.org/build/315100073 at 2025-11-29 + - stratosphere-elasticloadbalancing # failure in job https://hydra.nixos.org/build/315100067 at 2025-11-29 + - stratosphere-elasticloadbalancingv2 # failure in job https://hydra.nixos.org/build/315100086 at 2025-11-29 + - stratosphere-elasticsearch # failure in job https://hydra.nixos.org/build/315100079 at 2025-11-29 + - stratosphere-emr # failure in job https://hydra.nixos.org/build/315100088 at 2025-11-29 + - stratosphere-emrcontainers # failure in job https://hydra.nixos.org/build/315100084 at 2025-11-29 + - stratosphere-emrserverless # failure in job https://hydra.nixos.org/build/315100072 at 2025-11-29 + - stratosphere-entityresolution # failure in job https://hydra.nixos.org/build/315100104 at 2025-11-29 + - stratosphere-events # failure in job https://hydra.nixos.org/build/315100105 at 2025-11-29 + - stratosphere-eventschemas # failure in job https://hydra.nixos.org/build/315100075 at 2025-11-29 + - stratosphere-evidently # failure in job https://hydra.nixos.org/build/315100125 at 2025-11-29 + - stratosphere-evs # failure in job https://hydra.nixos.org/build/315100137 at 2025-11-29 + - stratosphere-finspace # failure in job https://hydra.nixos.org/build/315100078 at 2025-11-29 + - stratosphere-fis # failure in job https://hydra.nixos.org/build/315100095 at 2025-11-29 + - stratosphere-fms # failure in job https://hydra.nixos.org/build/315100082 at 2025-11-29 + - stratosphere-forecast # failure in job https://hydra.nixos.org/build/315100080 at 2025-11-29 + - stratosphere-frauddetector # failure in job https://hydra.nixos.org/build/315100081 at 2025-11-29 + - stratosphere-fsx # failure in job https://hydra.nixos.org/build/315100083 at 2025-11-29 + - stratosphere-gamelift # failure in job https://hydra.nixos.org/build/315100116 at 2025-11-29 + - stratosphere-globalaccelerator # failure in job https://hydra.nixos.org/build/315100085 at 2025-11-29 + - stratosphere-glue # failure in job https://hydra.nixos.org/build/315100109 at 2025-11-29 + - stratosphere-grafana # failure in job https://hydra.nixos.org/build/315100087 at 2025-11-29 + - stratosphere-greengrass # failure in job https://hydra.nixos.org/build/315100098 at 2025-11-29 + - stratosphere-greengrassv2 # failure in job https://hydra.nixos.org/build/315100089 at 2025-11-29 + - stratosphere-groundstation # failure in job https://hydra.nixos.org/build/315100090 at 2025-11-29 + - stratosphere-guardduty # failure in job https://hydra.nixos.org/build/315100093 at 2025-11-29 + - stratosphere-healthimaging # failure in job https://hydra.nixos.org/build/315100092 at 2025-11-29 + - stratosphere-healthlake # failure in job https://hydra.nixos.org/build/315100103 at 2025-11-29 + - stratosphere-iam # failure in job https://hydra.nixos.org/build/315100119 at 2025-11-29 + - stratosphere-identitystore # failure in job https://hydra.nixos.org/build/315100094 at 2025-11-29 + - stratosphere-imagebuilder # failure in job https://hydra.nixos.org/build/315100102 at 2025-11-29 + - stratosphere-inspector # failure in job https://hydra.nixos.org/build/315100096 at 2025-11-29 + - stratosphere-inspectorv2 # failure in job https://hydra.nixos.org/build/315100136 at 2025-11-29 + - stratosphere-internetmonitor # failure in job https://hydra.nixos.org/build/315100099 at 2025-11-29 + - stratosphere-invoicing # failure in job https://hydra.nixos.org/build/315100100 at 2025-11-29 + - stratosphere-iot # failure in job https://hydra.nixos.org/build/315100101 at 2025-11-29 + - stratosphere-iotanalytics # failure in job https://hydra.nixos.org/build/315100118 at 2025-11-29 + - stratosphere-iotcoredeviceadvisor # failure in job https://hydra.nixos.org/build/315100139 at 2025-11-29 + - stratosphere-iotevents # failure in job https://hydra.nixos.org/build/315100171 at 2025-11-29 + - stratosphere-iotfleethub # failure in job https://hydra.nixos.org/build/315100110 at 2025-11-29 + - stratosphere-iotfleetwise # failure in job https://hydra.nixos.org/build/315100146 at 2025-11-29 + - stratosphere-iotsitewise # failure in job https://hydra.nixos.org/build/315100107 at 2025-11-29 + - stratosphere-iotthingsgraph # failure in job https://hydra.nixos.org/build/315100108 at 2025-11-29 + - stratosphere-iottwinmaker # failure in job https://hydra.nixos.org/build/315100218 at 2025-11-29 + - stratosphere-iotwireless # failure in job https://hydra.nixos.org/build/315100121 at 2025-11-29 + - stratosphere-ivs # failure in job https://hydra.nixos.org/build/315100111 at 2025-11-29 + - stratosphere-ivschat # failure in job https://hydra.nixos.org/build/315100112 at 2025-11-29 + - stratosphere-kafkaconnect # failure in job https://hydra.nixos.org/build/315100113 at 2025-11-29 + - stratosphere-kendra # failure in job https://hydra.nixos.org/build/315100122 at 2025-11-29 + - stratosphere-kendraranking # failure in job https://hydra.nixos.org/build/315100123 at 2025-11-29 + - stratosphere-kinesis # failure in job https://hydra.nixos.org/build/315100115 at 2025-11-29 + - stratosphere-kinesisanalytics # failure in job https://hydra.nixos.org/build/315100141 at 2025-11-29 + - stratosphere-kinesisanalyticsv2 # failure in job https://hydra.nixos.org/build/315100134 at 2025-11-29 + - stratosphere-kinesisfirehose # failure in job https://hydra.nixos.org/build/315100156 at 2025-11-29 + - stratosphere-kinesisvideo # failure in job https://hydra.nixos.org/build/315100120 at 2025-11-29 + - stratosphere-kms # failure in job https://hydra.nixos.org/build/315100126 at 2025-11-29 + - stratosphere-lakeformation # failure in job https://hydra.nixos.org/build/315100128 at 2025-11-29 + - stratosphere-lambda # failure in job https://hydra.nixos.org/build/315100127 at 2025-11-29 + - stratosphere-launchwizard # failure in job https://hydra.nixos.org/build/315100145 at 2025-11-29 + - stratosphere-lex # failure in job https://hydra.nixos.org/build/315100172 at 2025-11-29 + - stratosphere-licensemanager # failure in job https://hydra.nixos.org/build/315100152 at 2025-11-29 + - stratosphere-lightsail # failure in job https://hydra.nixos.org/build/315100138 at 2025-11-29 + - stratosphere-location # failure in job https://hydra.nixos.org/build/315100153 at 2025-11-29 + - stratosphere-logs # failure in job https://hydra.nixos.org/build/315100129 at 2025-11-29 + - stratosphere-lookoutequipment # failure in job https://hydra.nixos.org/build/315100130 at 2025-11-29 + - stratosphere-lookoutmetrics # failure in job https://hydra.nixos.org/build/315100131 at 2025-11-29 + - stratosphere-lookoutvision # failure in job https://hydra.nixos.org/build/315100132 at 2025-11-29 + - stratosphere-m2 # failure in job https://hydra.nixos.org/build/315100133 at 2025-11-29 + - stratosphere-macie # failure in job https://hydra.nixos.org/build/315100151 at 2025-11-29 + - stratosphere-managedblockchain # failure in job https://hydra.nixos.org/build/315100140 at 2025-11-29 + - stratosphere-mediaconnect # failure in job https://hydra.nixos.org/build/315100135 at 2025-11-29 + - stratosphere-mediaconvert # failure in job https://hydra.nixos.org/build/315100148 at 2025-11-29 + - stratosphere-medialive # failure in job https://hydra.nixos.org/build/315100157 at 2025-11-29 + - stratosphere-mediapackage # failure in job https://hydra.nixos.org/build/315100166 at 2025-11-29 + - stratosphere-mediapackagev2 # failure in job https://hydra.nixos.org/build/315100150 at 2025-11-29 + - stratosphere-mediastore # failure in job https://hydra.nixos.org/build/315100173 at 2025-11-29 + - stratosphere-mediatailor # failure in job https://hydra.nixos.org/build/315100142 at 2025-11-29 + - stratosphere-memorydb # failure in job https://hydra.nixos.org/build/315100143 at 2025-11-29 + - stratosphere-mpa # failure in job https://hydra.nixos.org/build/315100144 at 2025-11-29 + - stratosphere-msk # failure in job https://hydra.nixos.org/build/315100154 at 2025-11-29 + - stratosphere-mwaa # failure in job https://hydra.nixos.org/build/315100162 at 2025-11-29 + - stratosphere-neptune # failure in job https://hydra.nixos.org/build/315100170 at 2025-11-29 + - stratosphere-neptunegraph # failure in job https://hydra.nixos.org/build/315100147 at 2025-11-29 + - stratosphere-networkfirewall # failure in job https://hydra.nixos.org/build/315100190 at 2025-11-29 + - stratosphere-networkmanager # failure in job https://hydra.nixos.org/build/315100149 at 2025-11-29 + - stratosphere-notifications # failure in job https://hydra.nixos.org/build/315100184 at 2025-11-29 + - stratosphere-notificationscontacts # failure in job https://hydra.nixos.org/build/315100158 at 2025-11-29 + - stratosphere-oam # failure in job https://hydra.nixos.org/build/315100161 at 2025-11-29 + - stratosphere-observabilityadmin # failure in job https://hydra.nixos.org/build/315100160 at 2025-11-29 + - stratosphere-odb # failure in job https://hydra.nixos.org/build/315100165 at 2025-11-29 + - stratosphere-omics # failure in job https://hydra.nixos.org/build/315100155 at 2025-11-29 + - stratosphere-opensearchserverless # failure in job https://hydra.nixos.org/build/315100181 at 2025-11-29 + - stratosphere-opensearchservice # failure in job https://hydra.nixos.org/build/315100159 at 2025-11-29 + - stratosphere-opsworks # failure in job https://hydra.nixos.org/build/315100194 at 2025-11-29 + - stratosphere-organizations # failure in job https://hydra.nixos.org/build/315100163 at 2025-11-29 + - stratosphere-osis # failure in job https://hydra.nixos.org/build/315100164 at 2025-11-29 + - stratosphere-panorama # failure in job https://hydra.nixos.org/build/315100177 at 2025-11-29 + - stratosphere-paymentcryptography # failure in job https://hydra.nixos.org/build/315100167 at 2025-11-29 + - stratosphere-pcaconnectorad # failure in job https://hydra.nixos.org/build/315100205 at 2025-11-29 + - stratosphere-pcaconnectorscep # failure in job https://hydra.nixos.org/build/315100209 at 2025-11-29 + - stratosphere-pcs # failure in job https://hydra.nixos.org/build/315100175 at 2025-11-29 + - stratosphere-personalize # failure in job https://hydra.nixos.org/build/315100220 at 2025-11-29 + - stratosphere-pinpoint # failure in job https://hydra.nixos.org/build/315100168 at 2025-11-29 + - stratosphere-pinpointemail # failure in job https://hydra.nixos.org/build/315100169 at 2025-11-29 + - stratosphere-pipes # failure in job https://hydra.nixos.org/build/315100176 at 2025-11-29 + - stratosphere-proton # failure in job https://hydra.nixos.org/build/315100183 at 2025-11-29 + - stratosphere-qbusiness # failure in job https://hydra.nixos.org/build/315100179 at 2025-11-29 + - stratosphere-qldb # failure in job https://hydra.nixos.org/build/315100180 at 2025-11-29 + - stratosphere-quicksight # failure in job https://hydra.nixos.org/build/315100174 at 2025-11-29 + - stratosphere-ram # failure in job https://hydra.nixos.org/build/315100206 at 2025-11-29 + - stratosphere-rbin # failure in job https://hydra.nixos.org/build/315100219 at 2025-11-29 + - stratosphere-rds # failure in job https://hydra.nixos.org/build/315100245 at 2025-11-29 + - stratosphere-redshift # failure in job https://hydra.nixos.org/build/315100198 at 2025-11-29 + - stratosphere-redshiftserverless # failure in job https://hydra.nixos.org/build/315100178 at 2025-11-29 + - stratosphere-refactorspaces # failure in job https://hydra.nixos.org/build/315100191 at 2025-11-29 + - stratosphere-rekognition # failure in job https://hydra.nixos.org/build/315100197 at 2025-11-29 + - stratosphere-resiliencehub # failure in job https://hydra.nixos.org/build/315100182 at 2025-11-29 + - stratosphere-resourceexplorer2 # failure in job https://hydra.nixos.org/build/315100186 at 2025-11-29 + - stratosphere-resourcegroups # failure in job https://hydra.nixos.org/build/315100193 at 2025-11-29 + - stratosphere-robomaker # failure in job https://hydra.nixos.org/build/315100199 at 2025-11-29 + - stratosphere-rolesanywhere # failure in job https://hydra.nixos.org/build/315100185 at 2025-11-29 + - stratosphere-route53 # failure in job https://hydra.nixos.org/build/315100200 at 2025-11-29 + - stratosphere-route53profiles # failure in job https://hydra.nixos.org/build/315100187 at 2025-11-29 + - stratosphere-route53recoverycontrol # failure in job https://hydra.nixos.org/build/315100188 at 2025-11-29 + - stratosphere-route53recoveryreadiness # failure in job https://hydra.nixos.org/build/315100189 at 2025-11-29 + - stratosphere-route53resolver # failure in job https://hydra.nixos.org/build/315100215 at 2025-11-29 + - stratosphere-rtbfabric # failure in job https://hydra.nixos.org/build/315100192 at 2025-11-29 + - stratosphere-rum # failure in job https://hydra.nixos.org/build/315100241 at 2025-11-29 + - stratosphere-s3 # failure in job https://hydra.nixos.org/build/315100204 at 2025-11-29 + - stratosphere-s3express # failure in job https://hydra.nixos.org/build/315100195 at 2025-11-29 + - stratosphere-s3objectlambda # failure in job https://hydra.nixos.org/build/315100228 at 2025-11-29 + - stratosphere-s3outposts # failure in job https://hydra.nixos.org/build/315100196 at 2025-11-29 + - stratosphere-s3tables # failure in job https://hydra.nixos.org/build/315100214 at 2025-11-29 + - stratosphere-sagemaker # failure in job https://hydra.nixos.org/build/315100232 at 2025-11-29 + - stratosphere-scheduler # failure in job https://hydra.nixos.org/build/315100211 at 2025-11-29 + - stratosphere-sdb # failure in job https://hydra.nixos.org/build/315100201 at 2025-11-29 + - stratosphere-secretsmanager # failure in job https://hydra.nixos.org/build/315100202 at 2025-11-29 + - stratosphere-securityhub # failure in job https://hydra.nixos.org/build/315100212 at 2025-11-29 + - stratosphere-securitylake # failure in job https://hydra.nixos.org/build/315100203 at 2025-11-29 + - stratosphere-servicecatalog # failure in job https://hydra.nixos.org/build/315100261 at 2025-11-29 + - stratosphere-servicecatalogappregistry # failure in job https://hydra.nixos.org/build/315100225 at 2025-11-29 + - stratosphere-servicediscovery # failure in job https://hydra.nixos.org/build/315100207 at 2025-11-29 + - stratosphere-ses # failure in job https://hydra.nixos.org/build/315100221 at 2025-11-29 + - stratosphere-shield # failure in job https://hydra.nixos.org/build/315100208 at 2025-11-29 + - stratosphere-signer # failure in job https://hydra.nixos.org/build/315100271 at 2025-11-29 + - stratosphere-simspaceweaver # failure in job https://hydra.nixos.org/build/315100210 at 2025-11-29 + - stratosphere-smsvoice # failure in job https://hydra.nixos.org/build/315100255 at 2025-11-29 + - stratosphere-sns # failure in job https://hydra.nixos.org/build/315100213 at 2025-11-29 + - stratosphere-sqs # failure in job https://hydra.nixos.org/build/315100226 at 2025-11-29 + - stratosphere-ssm # failure in job https://hydra.nixos.org/build/315100227 at 2025-11-29 + - stratosphere-ssmcontacts # failure in job https://hydra.nixos.org/build/315100216 at 2025-11-29 + - stratosphere-ssmguiconnect # failure in job https://hydra.nixos.org/build/315100217 at 2025-11-29 + - stratosphere-ssmincidents # failure in job https://hydra.nixos.org/build/315100223 at 2025-11-29 + - stratosphere-ssmquicksetup # failure in job https://hydra.nixos.org/build/315100247 at 2025-11-29 + - stratosphere-sso # failure in job https://hydra.nixos.org/build/315100274 at 2025-11-29 + - stratosphere-stepfunctions # failure in job https://hydra.nixos.org/build/315100260 at 2025-11-29 + - stratosphere-supportapp # failure in job https://hydra.nixos.org/build/315100222 at 2025-11-29 + - stratosphere-synthetics # failure in job https://hydra.nixos.org/build/315100252 at 2025-11-29 + - stratosphere-systemsmanagersap # failure in job https://hydra.nixos.org/build/315100224 at 2025-11-29 + - stratosphere-timestream # failure in job https://hydra.nixos.org/build/315100230 at 2025-11-29 + - stratosphere-transfer # failure in job https://hydra.nixos.org/build/315100249 at 2025-11-29 + - stratosphere-verifiedpermissions # failure in job https://hydra.nixos.org/build/315100250 at 2025-11-29 + - stratosphere-voiceid # failure in job https://hydra.nixos.org/build/315100257 at 2025-11-29 + - stratosphere-vpclattice # failure in job https://hydra.nixos.org/build/315100229 at 2025-11-29 + - stratosphere-waf # failure in job https://hydra.nixos.org/build/315100242 at 2025-11-29 + - stratosphere-wafregional # failure in job https://hydra.nixos.org/build/315100233 at 2025-11-29 + - stratosphere-wafv2 # failure in job https://hydra.nixos.org/build/315100231 at 2025-11-29 + - stratosphere-wisdom # failure in job https://hydra.nixos.org/build/315100268 at 2025-11-29 + - stratosphere-workspaces # failure in job https://hydra.nixos.org/build/315100234 at 2025-11-29 + - stratosphere-workspacesinstances # failure in job https://hydra.nixos.org/build/315100235 at 2025-11-29 + - stratosphere-workspacesthinclient # failure in job https://hydra.nixos.org/build/315100236 at 2025-11-29 + - stratosphere-workspacesweb # failure in job https://hydra.nixos.org/build/315100237 at 2025-11-29 + - stratosphere-xray # failure in job https://hydra.nixos.org/build/315100239 at 2025-11-29 - stratux-types # failure in job https://hydra.nixos.org/build/233232808 at 2023-09-02 - stream # failure in job https://hydra.nixos.org/build/233226470 at 2023-09-02 - stream-fusion # failure in job https://hydra.nixos.org/build/233225947 at 2023-09-02 @@ -6088,7 +6364,6 @@ broken-packages: - stripe-core # failure in job https://hydra.nixos.org/build/233215702 at 2023-09-02 - stripe-hs # failure in job https://hydra.nixos.org/build/233203500 at 2023-09-02 - stripe-scotty # failure in job https://hydra.nixos.org/build/252711778 at 2024-03-16 - - strong-path # failure in job https://hydra.nixos.org/build/233225171 at 2023-09-02 - struct-inspector # failure in job https://hydra.nixos.org/build/252739623 at 2024-03-16 - structural-traversal # failure in job https://hydra.nixos.org/build/233235730 at 2023-09-02 - structured # failure in job https://hydra.nixos.org/build/307522227 at 2025-09-19 @@ -6227,7 +6502,6 @@ broken-packages: - taskell # depends on old version of brick - TaskMonad # failure in job https://hydra.nixos.org/build/233219257 at 2023-09-02 - tasty-auto # failure in job https://hydra.nixos.org/build/233220008 at 2023-09-02 - - tasty-checklist # failure in job https://hydra.nixos.org/build/307522349 at 2025-09-19 - tasty-fail-fast # failure in job https://hydra.nixos.org/build/233200040 at 2023-09-02 - tasty-grading-system # failure in job https://hydra.nixos.org/build/236673021 at 2023-10-04 - tasty-hedgehog-coverage # failure in job https://hydra.nixos.org/build/233231332 at 2023-09-02 @@ -6372,6 +6646,7 @@ broken-packages: - thock # failure in job https://hydra.nixos.org/build/233256198 at 2023-09-02 - thorn # failure in job https://hydra.nixos.org/build/233242024 at 2023-09-02 - threadmanager # failure in job https://hydra.nixos.org/build/233230492 at 2023-09-02 + - threads-supervisor # failure in job https://hydra.nixos.org/build/315100613 at 2025-11-29 - threepenny-editors # failure in job https://hydra.nixos.org/build/233248820 at 2023-09-02 - threepenny-gui-contextmenu # failure in job https://hydra.nixos.org/build/233242035 at 2023-09-02 - threepenny-gui-flexbox # failure in job https://hydra.nixos.org/build/233213545 at 2023-09-02 @@ -6408,7 +6683,6 @@ 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 @@ -6562,6 +6836,7 @@ broken-packages: - TYB # failure in job https://hydra.nixos.org/build/233246075 at 2023-09-02 - tyfam-witnesses # failure in job https://hydra.nixos.org/build/233191033 at 2023-09-02 - typalyze # failure in job https://hydra.nixos.org/build/233246228 at 2023-09-02 + - type # failure in job https://hydra.nixos.org/build/315191813 at 2025-11-29 - type-combinators # failure in job https://hydra.nixos.org/build/233230024 at 2023-09-02 - type-compare # failure in job https://hydra.nixos.org/build/233207530 at 2023-09-02 - type-eq # failure in job https://hydra.nixos.org/build/233214388 at 2023-09-02 @@ -6659,6 +6934,7 @@ broken-packages: - uniqueness-periods-vector # failure in job https://hydra.nixos.org/build/233243213 at 2023-09-02 - uniqueness-periods-vector-common # failure in job https://hydra.nixos.org/build/233210018 at 2023-09-02 - units-attoparsec # failure in job https://hydra.nixos.org/build/233196308 at 2023-09-02 + - units-list # failure in job https://hydra.nixos.org/build/315100927 at 2025-11-29 - unittyped # failure in job https://hydra.nixos.org/build/233215159 at 2023-09-02 - unitym # failure in job https://hydra.nixos.org/build/233246346 at 2023-09-02 - universal-binary # failure in job https://hydra.nixos.org/build/233240583 at 2023-09-02 @@ -6860,6 +7136,7 @@ broken-packages: - wai-session-redis # failure in job https://hydra.nixos.org/build/233218737 at 2023-09-02 - wai-static-cache # failure in job https://hydra.nixos.org/build/233228597 at 2023-09-02 - wai-throttler # failure in job https://hydra.nixos.org/build/233231002 at 2023-09-02 + - wai-token-bucket-ratelimiter # failure in job https://hydra.nixos.org/build/315101114 at 2025-11-29 - waitfree # failure in job https://hydra.nixos.org/build/233222583 at 2023-09-02 - waitra # failure in job https://hydra.nixos.org/build/233222291 at 2023-09-02 - wakame # failure in job https://hydra.nixos.org/build/233254673 at 2023-09-02 @@ -6874,6 +7151,7 @@ broken-packages: - watchit # failure in job https://hydra.nixos.org/build/233199573 at 2023-09-02 - wavefront # failure in job https://hydra.nixos.org/build/233248071 at 2023-09-02 - wavefront-obj # failure in job https://hydra.nixos.org/build/233200951 at 2023-09-02 + - waypoint # failure in job https://hydra.nixos.org/build/315101124 at 2025-11-29 - weak-bag # failure in job https://hydra.nixos.org/build/233198097 at 2023-09-02 - WeakSets # failure in job https://hydra.nixos.org/build/307516240 at 2025-09-19 - Weather # failure in job https://hydra.nixos.org/build/233197934 at 2023-09-02 @@ -7043,6 +7321,7 @@ 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/315101319 at 2025-11-29 - 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 8fa57f8401d92..33fcd5134f124 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -58,6 +58,7 @@ extra-packages: - Cabal-syntax == 3.12.* - Cabal-syntax == 3.14.* - Cabal-syntax == 3.16.* # version required for cabal-install and other packages + - crypton-x509-store < 1.6.12 # 2025-11-22: requires unix >= 2.8 which isn't available for GHC < 9.6 - extensions == 0.1.0.1 # 2025-09-21: needed for Cabal 3.10 (fourmolo/ormolu with ghc 9.8) - fourmolu == 0.14.0.0 # 2023-11-13: for ghc-lib-parser 9.6 compat - fourmolu == 0.15.0.0 # 2025-09-21: for ghc-lib-parser 9.8 compat diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index ae01db0b82d4a..61bf170d412ee 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.16 +# Stackage LTS 24.21 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -53,12 +53,12 @@ default-package-overrides: - alsa-core ==0.5.0.1 - alsa-mixer ==0.3.0.1 - alsa-pcm ==0.6.1.1 - - alsa-seq ==0.6.0.9 + - alsa-seq ==0.6.0.10 - alternative-vector ==0.0.0 - alternators ==1.0.0.0 - ALUT ==2.4.0.3 - amqp ==0.24.0 - - amqp-utils ==0.6.7.2 + - amqp-utils ==0.6.7.3 - annotated-exception ==0.3.0.4 - annotated-wl-pprint ==0.7.0 - ansi-terminal ==1.1.3 @@ -168,7 +168,7 @@ default-package-overrides: - beam-core ==0.10.4.0 - beam-migrate ==0.5.3.2 - beam-postgres ==0.5.4.4 - - beam-sqlite ==0.5.4.1 + - beam-sqlite ==0.5.5.0 - bech32 ==1.1.9 - bech32-th ==1.1.9 - bench ==1.0.13 @@ -223,15 +223,15 @@ default-package-overrides: - blaze-svg ==0.3.7 - blaze-textual ==0.2.3.1 - bloodhound ==0.23.0.1 - - bloomfilter ==2.0.1.2 + - bloomfilter ==2.0.1.3 - bluefin ==0.0.17.1 - - bluefin-internal ==0.1.1.0 + - bluefin-internal ==0.1.2.0 - bm ==0.2.0.0 - bmp ==1.2.6.4 - bnb-staking-csvs ==0.2.2.0 - BNFC ==2.9.6.1 - BNFC-meta ==0.6.1 - - board-games ==0.4 + - board-games ==0.4.0.1 - bodhi ==0.1.0 - boltzmann-samplers ==0.1.1.0 - Boolean ==0.2.4 @@ -270,14 +270,14 @@ default-package-overrides: - byte-count-reader ==0.10.1.12 - byte-order ==0.1.3.1 - byteable ==0.1.1 - - bytebuild ==0.3.16.3 + - bytebuild ==0.3.17.0 - bytedump ==1.0 - bytehash ==0.1.1.2 - byteorder ==1.0.4 - bytes ==0.17.4 - byteset ==0.1.1.2 - byteslice ==0.2.15.0 - - bytesmith ==0.3.13.0 + - bytesmith ==0.3.14.0 - bytestring-aeson-orphans ==0.1.0.2 - bytestring-builder ==0.10.8.2.0 - bytestring-conversion ==0.3.2 @@ -298,10 +298,10 @@ default-package-overrides: - c2hs ==0.28.8 - ca-province-codes ==1.0.0.0 - cabal-add ==0.2 - - cabal-appimage ==0.4.1.0 + - cabal-appimage ==0.4.2.0 - cabal-clean ==0.2.20230609 - cabal-debian ==5.2.6 - - cabal-doctest ==1.0.11 + - cabal-doctest ==1.0.12 - cabal-file ==0.1.1 - cabal-flatpak ==0.1.2 - cabal-gild ==1.6.0.2 @@ -336,7 +336,7 @@ default-package-overrides: - cast ==0.1.0.2 - caster ==0.0.3.0 - cauldron ==0.9.0.1 - - cayley-client ==0.4.19.4 + - cayley-client ==0.4.19.5 - cborg ==0.2.10.0 - cborg-json ==0.2.6.0 - cdar-mBound ==0.1.0.4 @@ -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.3 - - clash-prelude-hedgehog ==1.8.3 + - clash-prelude ==1.8.4 + - clash-prelude-hedgehog ==1.8.4 - classy-prelude ==1.5.0.3 - classy-prelude-conduit ==1.5.0 - classy-prelude-yesod ==1.5.0 @@ -402,7 +402,7 @@ default-package-overrides: - cointracking-imports ==0.1.0.2 - collect-errors ==0.1.6.0 - colonnade ==1.2.0.2 - - Color ==0.4.0 + - Color ==0.4.1 - colorful-monoids ==0.2.1.3 - colorize-haskell ==1.0.1 - colour ==2.3.6 @@ -469,7 +469,7 @@ default-package-overrides: - control-bool ==0.2.1 - control-dsl ==0.2.1.3 - control-monad-free ==0.6.2 - - control-monad-omega ==0.3.3 + - control-monad-omega ==0.3.4 - convertible ==1.1.1.1 - cookie ==0.5.1 - copilot ==4.5.1 @@ -520,7 +520,7 @@ default-package-overrides: - crypton-pem ==0.3.0 - crypton-socks ==0.6.2 - crypton-x509 ==1.7.7 - - crypton-x509-store ==1.6.11 + - crypton-x509-store ==1.6.12 - crypton-x509-system ==1.6.7 - crypton-x509-validation ==1.6.14 - cryptonite ==0.30 @@ -600,7 +600,7 @@ default-package-overrides: - dejafu ==2.4.0.7 - delta-types ==1.0.0.0 - dense-linear-algebra ==0.1.0.0 - - dependent-map ==0.4.0.0 + - dependent-map ==0.4.0.1 - dependent-monoidal-map ==0.1.1.5 - dependent-sum ==0.7.2.0 - dependent-sum-aeson-orphans ==0.3.1.2 @@ -804,7 +804,7 @@ default-package-overrides: - express ==1.0.18 - extended-reals ==0.2.7.0 - extensible-exceptions ==0.1.1.4 - - extra ==1.8 + - extra ==1.8.1 - extra-data-yj ==0.1.0.0 - extractable-singleton ==0.0.1 - extrapolate ==0.4.6 @@ -991,7 +991,7 @@ default-package-overrides: - ghc-lib ==9.12.2.20250421 - ghc-lib-parser ==9.12.2.20250421 - ghc-lib-parser-ex ==9.12.0.0 - - ghc-parser ==0.2.7.0 + - ghc-parser ==0.2.8.0 - ghc-paths ==0.1.0.12 - ghc-source-gen ==0.4.6.0 - ghc-syntax-highlighter ==0.0.13.0 @@ -1240,7 +1240,7 @@ default-package-overrides: - HaTeX ==3.23.0.1 - haveibeenpwned ==0.2.0.3 - HaXml ==1.25.14 - - haxr ==3000.11.5.1 + - haxr ==3000.11.6 - Hclip ==3.0.0.4 - HCodecs ==0.5.2 - hdaemonize ==0.5.7 @@ -1311,7 +1311,7 @@ default-package-overrides: - hourglass ==0.2.12 - hourglass-orphans ==0.1.0.0 - hp2pretty ==0.10.1 - - hpack ==0.38.2 + - hpack ==0.38.3 - hpc-codecov ==0.6.3.0 - hpc-lcov ==1.2.0 - HPDF ==1.7 @@ -1411,7 +1411,7 @@ default-package-overrides: - http-common ==0.8.3.4 - http-conduit ==2.3.9.1 - http-date ==0.0.11 - - http-directory ==0.1.11 + - http-directory ==0.1.12 - http-download ==0.2.1.0 - http-io-streams ==0.1.7.2 - http-link-header ==1.2.3 @@ -1526,7 +1526,7 @@ default-package-overrides: - ip ==1.7.8 - ip6addr ==2.0.0.1 - iproute ==1.7.15 - - IPv6Addr ==2.0.6.1 + - IPv6Addr ==2.0.6.2 - IPv6DB ==0.3.3.4 - ipynb ==0.2 - ipython-kernel ==0.11.0.0 @@ -1543,7 +1543,7 @@ default-package-overrides: - ix-shapable ==0.1.0 - jack ==0.7.2.2 - jalaali ==1.0.0.0 - - java-adt ==1.0.20231204 + - java-adt ==1.0.20251105 - jira-wiki-markup ==1.5.1 - jmacro ==0.6.18 - jose ==0.11 @@ -1594,7 +1594,7 @@ default-package-overrides: - knob ==0.2.2 - koji ==0.0.2 - koji-tool ==1.3 - - kvitable ==1.1.0.1 + - kvitable ==1.1.1.0 - labels ==0.3.3 - lackey ==2.0.0.11 - lambdabot-core ==5.3.1.2 @@ -1645,7 +1645,7 @@ default-package-overrides: - lens-properties ==4.11.1 - lens-regex ==0.1.3 - lens-regex-pcre ==1.1.2.0 - - lentil ==1.5.8.0 + - lentil ==1.5.10.0 - LetsBeRational ==1.0.0.0 - leveldb-haskell ==0.6.5.1 - lexer-applicative ==2.1.0.2 @@ -1707,7 +1707,7 @@ default-package-overrides: - lr-acts ==0.0.1 - lrucache ==1.2.0.1 - lsfrom ==2.0 - - lua ==2.3.3 + - lua ==2.3.4 - lua-arbitrary ==1.0.1.1 - lucid ==2.11.20250303 - lucid-cdn ==0.2.2.0 @@ -1725,7 +1725,7 @@ default-package-overrides: - mailtrap ==0.1.2.2 - main-tester ==0.2.0.1 - mainland-pretty ==0.7.1.1 - - managed ==1.0.10 + - managed ==1.0.11 - mandrill ==0.5.8.0 - manifolds-core ==0.6.1.1 - Mantissa ==0.1.0.0 @@ -1820,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.3.0 + - mockcat ==0.5.5.0 - mockery ==0.3.5 - mod ==0.2.1.0 - modern-uri ==0.3.6.1 @@ -1916,10 +1916,10 @@ default-package-overrides: - n2o-nitro ==0.11.2 - nagios-check ==0.3.2 - named ==0.3.0.2 - - named-text ==1.2.1.0 + - named-text ==1.2.2.0 - names-th ==0.3.0.1 - nano-erl ==0.1.0.1 - - NanoID ==3.4.1.1 + - NanoID ==3.4.1.2 - nanospec ==0.2.2 - nats ==1.1.2 - natural-arithmetic ==0.2.3.0 @@ -1956,6 +1956,7 @@ default-package-overrides: - network-transport-tcp ==0.8.6 - network-transport-tests ==0.3.4 - network-uri ==2.6.4.2 + - network-uri-template ==0.1.1.4 - network-wait ==0.2.0.0 - newtype ==0.2.2.0 - newtype-generics ==0.6.2 @@ -2085,7 +2086,7 @@ default-package-overrides: - parallel ==3.2.2.0 - parallel-io ==0.3.5 - parameterized ==0.5.0.0 - - parameterized-utils ==2.1.10.0 + - parameterized-utils ==2.1.11.0 - paramtree ==0.1.2 - park-bench ==0.1.1.0 - parseargs ==0.2.0.9 @@ -2336,7 +2337,7 @@ default-package-overrides: - Ranged-sets ==0.5.0 - ranges ==0.2.4 - rank1dynamic ==0.4.3 - - rank2classes ==1.5.4 + - rank2classes ==1.5.5 - Rasterific ==0.7.5.4 - rasterific-svg ==0.3.3.2 - rate-limit ==1.4.3 @@ -2378,7 +2379,7 @@ default-package-overrides: - refined ==0.8.2 - refined-containers ==0.1.2.0 - reflection ==2.1.9 - - reflex ==0.9.3.4 + - reflex ==0.9.4.0 - reflex-dom-core ==0.8.1.4 - reflex-fsnotify ==0.3.0.2 - reflex-gadt-api ==0.2.2.3 @@ -2435,11 +2436,11 @@ default-package-overrides: - rhythmic-sequences ==0.8.0.0 - riak-protobuf ==0.25.0.0 - richenv ==0.1.0.3 - - rio ==0.1.23.0 + - rio ==0.1.24.0 - rio-orphans ==0.1.2.0 - rio-prettyprint ==0.1.8.0 - rng-utils ==0.3.1 - - roc-id ==0.2.0.5 + - roc-id ==0.2.0.6 - rocksdb-haskell ==1.0.1 - rocksdb-haskell-jprupp ==2.1.7 - rocksdb-query ==0.4.3 @@ -2452,14 +2453,14 @@ default-package-overrides: - row-types ==1.0.1.2 - rp-tree ==0.7.1 - rpm-nvr ==0.1.2 - - rpmbuild-order ==0.4.12 + - rpmbuild-order ==0.4.13 - rrb-vector ==0.2.2.1 - RSA ==2.4.1 - rss ==3000.2.0.8 - run-st ==0.1.3.3 - runmemo ==1.0.0.1 - rvar ==0.3.0.2 - - rzk ==0.7.6 + - rzk ==0.7.7 - s-cargot ==0.1.6.0 - s3-signer ==0.5.0.0 - safe ==0.3.21 @@ -2492,7 +2493,7 @@ default-package-overrides: - sandwich-webdriver ==0.3.0.1 - saturn ==1.0.0.9 - say ==0.1.0.1 - - sayable ==1.2.5.0 + - sayable ==1.2.6.0 - sbp ==6.2.2 - sbv ==11.7 - scalpel ==0.6.2.2 @@ -2701,7 +2702,7 @@ default-package-overrides: - stateWriter ==0.4.0 - static-bytes ==0.1.1 - static-text ==0.2.0.7 - - statistics ==0.16.3.0 + - statistics ==0.16.4.0 - statistics-linreg ==0.3 - statsd-rupp ==0.5.0.1 - status-notifier-item ==0.3.1.0 @@ -2733,7 +2734,7 @@ default-package-overrides: - streaming-attoparsec ==1.0.0.1 - streaming-binary ==0.3.0.1 - streaming-bytestring ==0.3.4 - - streaming-commons ==0.2.3.0 + - streaming-commons ==0.2.3.1 - streaming-wai ==0.1.1 - streamly ==0.10.1 - streamly-bytestring ==0.2.3 @@ -2831,7 +2832,7 @@ default-package-overrides: - tasty-ant-xml ==1.1.9 - tasty-autocollect ==0.4.4 - tasty-bench ==0.4.1 - - tasty-checklist ==1.0.6.0 + - tasty-checklist ==1.0.8.0 - tasty-dejafu ==2.1.0.2 - tasty-discover ==5.0.2 - tasty-expected-failure ==0.12.3 @@ -2853,7 +2854,7 @@ default-package-overrides: - tasty-rerun ==1.1.20 - tasty-silver ==3.3.2.1 - tasty-smallcheck ==0.8.2 - - tasty-sugar ==2.2.2.1 + - tasty-sugar ==2.2.3.1 - tasty-tap ==0.1.0 - tasty-th ==0.1.7 - tasty-wai ==0.1.2.0 @@ -2958,7 +2959,7 @@ default-package-overrides: - time-lens ==0.4.0.2 - time-locale-compat ==0.1.1.5 - time-locale-vietnamese ==1.0.0.0 - - time-manager ==0.2.3 + - time-manager ==0.2.4 - time-units ==1.0.0 - time-units-types ==0.2.0.1 - timeit ==2.0 @@ -3249,7 +3250,7 @@ default-package-overrides: - wl-pprint ==1.2.1 - wl-pprint-annotated ==0.1.0.1 - wl-pprint-text ==1.2.0.2 - - wled-json ==0.1.0.0 + - wled-json ==0.1.0.1 - word-compat ==0.0.6 - word-trie ==0.3.0 - word-wrap ==0.5 @@ -3310,7 +3311,7 @@ default-package-overrides: - yesod-auth-hashdb ==1.7.1.7 - yesod-auth-oauth2 ==0.7.4.0 - yesod-bin ==1.6.2.3 - - yesod-core ==1.6.27.1 + - yesod-core ==1.6.28.1 - yesod-eventsource ==1.6.0.1 - yesod-form ==1.7.9 - yesod-form-bootstrap4 ==3.0.1.1 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 6fac5357c380a..4ef52e67edf29 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -53,11 +53,11 @@ dont-distribute-packages: - age - agentx - aip - - airgql - alg - algebra-checkers - algebra-driven-design - algebra-sql + - algebraic-graph-duoids - algolia - AlgoRhythm - algorithmic-composition-additional @@ -74,7 +74,6 @@ dont-distribute-packages: - alto - amazon-emailer-client-snap - amby - - ampersand - analyze-client - anansi-hscolour - anatomy @@ -130,6 +129,7 @@ dont-distribute-packages: - array-forth - arraylist - arx + - arxiv-client-cli - ascii - ascii-cows - ascii-numbers @@ -187,6 +187,7 @@ dont-distribute-packages: - aws-sign4 - aws-sns - axiom + - axiomatic-classes - azimuth-hs - aztecs-sdl-image - aztecs-sdl-text @@ -551,6 +552,7 @@ dont-distribute-packages: - concrete-haskell - concrete-haskell-autogen - concurrency-benchmarks + - ConcurrentUtils - Condor - condor - conductive-hsc3 @@ -583,6 +585,7 @@ dont-distribute-packages: - containers-accelerate - content-store - control + - control-invariants - control-monad-attempt - control-monad-exception - control-monad-exception-monadsfd @@ -625,7 +628,6 @@ dont-distribute-packages: - crf-chain2-tiers - criu-rpc - cron-compat - - crucible-llvm - crux - crux-llvm - crypto-classical @@ -679,6 +681,8 @@ dont-distribute-packages: - datadog-tracing - datafix - dataflow + - dataframe-hasktorch + - dataframe-persistent - datasets - date-conversions - dbjava @@ -811,6 +815,8 @@ dont-distribute-packages: - DSTM - dtd - duckdb-simple + - duoidal-transformers + - duoids-hedgehog - Dust - Dust-crypto - Dust-tools @@ -869,6 +875,7 @@ dont-distribute-packages: - error-message - errors-ext - ersatz-toysat + - ersatz-viz - esotericbot - EsounD - esqueleto-postgis @@ -909,6 +916,7 @@ dont-distribute-packages: - exference - exist - exist-instances + - existential - expand - expat-enumerator - expiring-containers @@ -1111,6 +1119,7 @@ dont-distribute-packages: - GenussFold - geodetic - geolite-csv + - geomancy-layout - getemx - ghc-debugger - ghc-dump-util @@ -1195,13 +1204,6 @@ 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 @@ -1792,6 +1794,7 @@ dont-distribute-packages: - ifscs - ige-mac-integration - igrf + - ihaskell-dataframe - ihaskell-rlangqq - ihaskell-symtegration - ihttp @@ -1987,7 +1990,6 @@ dont-distribute-packages: - kubernetes-client - kure-your-boilerplate - kurita - - kvitable - laborantin-hs - labsat - labyrinth @@ -2398,7 +2400,6 @@ dont-distribute-packages: - nakadi-client - named-servant-client - named-servant-server - - named-text - nanq - NaperianNetCDF - national-australia-bank @@ -2410,8 +2411,6 @@ dont-distribute-packages: - nero-wai - nero-warp - nested-routes - - net-mqtt-lens - - net-mqtt-rpc - net-spider-cli - net-spider-pangraph - net-spider-rpl @@ -2793,7 +2792,6 @@ dont-distribute-packages: - puzzle-draw-cmdline - pvd - qd-vec - - qhs - qhull - qnap-decrypt - qr-repa @@ -3282,8 +3280,6 @@ dont-distribute-packages: - snowflake-server - snumber - Snusmumrik - - soap-openssl - - soap-tls - SoccerFun - SoccerFunGL - sock2stream @@ -3456,7 +3452,6 @@ dont-distribute-packages: - tasty-jenkins-xml - tasty-laws - tasty-lens - - tasty-sugar - TastyTLT - tateti-tateti - Taxonomy diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index b65931789812a..87c0b23de5998 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1551,6 +1551,18 @@ builtins.intersectAttrs super { }; }) (enableSeparateBinOutput super.cabal2nix-unstable); + # Cabal doesn't allow us to properly specify the test dependency + # on nix-instantiate(1). Even though we're just evaluating pure code, + # it absolutely wants to write to disk. + language-nix-unstable = overrideCabal (drv: { + testDepends = drv.testDepends or [ ] ++ [ pkgs.nix ]; + preCheck = '' + export TMP_NIX_DIR="$(mktemp -d)" + export NIX_STORE_DIR="$TMP_NIX_DIR/store" + export NIX_STATE_DIR="$TMP_NIX_DIR/state" + ''; + }) super.language-nix-unstable; + # test suite needs local redis daemon nri-redis = dontCheck super.nri-redis; @@ -2133,3 +2145,27 @@ builtins.intersectAttrs super { # Workaround for flaky test: https://github.com/basvandijk/threads/issues/10 threads = appendPatch ./patches/threads-flaky-test.patch super.threads; } + +// lib.optionalAttrs pkgs.config.allowAliases ( + lib.genAttrs + [ + "2captcha" + "3d-graphics-examples" + "3dmodels" + "4Blocks" + "assert" + "if" + ] + ( + old: + let + new = "_" + old; + in + { + name = old; + value = + lib.warnOnInstantiate "haskell.packages.*.${old} has been renamed to haskell.packages.*.${new}" + self.${new}; + } + ) +) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6b33a3258785e..580855b975c04 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -8,7 +8,7 @@ self: { - "2captcha" = callPackage ( + _2captcha = callPackage ( { mkDerivation, aeson, @@ -49,7 +49,7 @@ self: { } ) { }; - "3d-graphics-examples" = callPackage ( + _3d-graphics-examples = callPackage ( { mkDerivation, base, @@ -76,7 +76,7 @@ self: { } ) { }; - "3dmodels" = callPackage ( + _3dmodels = callPackage ( { mkDerivation, attoparsec, @@ -103,7 +103,7 @@ self: { } ) { }; - "4Blocks" = callPackage ( + _4Blocks = callPackage ( { mkDerivation, base, @@ -5428,8 +5428,8 @@ self: { }: mkDerivation { pname = "CPL"; - version = "0.0.9"; - sha256 = "0pa0iqaflj8h0w3wcwrc27vmg4k7n0x8ck5sjscxvxdbbrwjg6z1"; + version = "0.1.0"; + sha256 = "1qn9cjw11rbkbqhv16y8wqkzkrfarxr1nr3d7byzlvi1sv7fg7x5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -5441,10 +5441,8 @@ self: { readline ]; description = "An interpreter of Hagino's Categorical Programming Language (CPL)"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; + license = lib.licensesSpdx."BSD-3-Clause"; mainProgram = "cpl"; - broken = true; } ) { }; @@ -6589,8 +6587,8 @@ self: { pname = "Chart"; version = "1.9.5"; sha256 = "0nyzdag9p56vknrphdnqjsf19fmw9abs81avdm2vjgh9cnw2y7hc"; - revision = "2"; - editedCabalFile = "1a9z8an5yhsqbawzahmg77g9l6jvavhxbk2v48k4j8fyr7sy544q"; + revision = "3"; + editedCabalFile = "06cz0giahpfl3ardb0xrc474w39y9lb279i5lb4q43rn0hk64mmj"; libraryHaskellDepends = [ array base @@ -7468,59 +7466,6 @@ self: { ) { IL = null; }; Color = callPackage ( - { - mkDerivation, - base, - colour, - criterion, - data-default-class, - deepseq, - hspec, - hspec-discover, - HUnit, - JuicyPixels, - massiv, - massiv-test, - QuickCheck, - random, - vector, - }: - mkDerivation { - pname = "Color"; - version = "0.4.0"; - sha256 = "1pnvfzrqilfbxkifmp5r9m0ys06lmmhdfnskib7cc22lifg85q3x"; - libraryHaskellDepends = [ - base - data-default-class - deepseq - vector - ]; - testHaskellDepends = [ - base - colour - hspec - HUnit - JuicyPixels - massiv - massiv-test - QuickCheck - random - vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base - colour - criterion - deepseq - random - ]; - description = "Color spaces and conversions between them"; - license = lib.licenses.bsd3; - } - ) { }; - - Color_0_4_1 = callPackage ( { mkDerivation, base, @@ -7570,7 +7515,6 @@ self: { ]; description = "Color spaces and conversions between them"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -7849,6 +7793,50 @@ self: { } ) { }; + ConcurrentUtils = callPackage ( + { + mkDerivation, + _assert, + array, + atl, + base, + containers, + extra, + list-extras, + monad-loops, + monads-tf, + parallel, + profunctors, + strict, + time, + vector, + }: + mkDerivation { + pname = "ConcurrentUtils"; + version = "0.5.0.0"; + sha256 = "1caixp7gdhjsnlr79kmc4pd4ky663x9kid9i998qrd6anbrm2i8b"; + libraryHaskellDepends = [ + _assert + array + atl + base + containers + extra + list-extras + monad-loops + monads-tf + parallel + profunctors + strict + time + vector + ]; + description = "Concurrent utilities"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + } + ) { }; + Concurrential = callPackage ( { mkDerivation, @@ -24805,8 +24793,8 @@ self: { }: mkDerivation { pname = "IPv6Addr"; - version = "2.0.6.1"; - sha256 = "1gdz3m6sc7aj4wy0j9sdd4qbb1jzilw8vjqig29szcqmp6cslc3c"; + version = "2.0.6.2"; + sha256 = "0hpvs9p3vyzmlkd9nm8xjfpyfpr9h0rc5cbfzck3xvfxp4srbyzc"; libraryHaskellDepends = [ aeson attoparsec @@ -24822,7 +24810,6 @@ self: { HUnit test-framework test-framework-hunit - text ]; description = "Library to deal with IPv6 address text representations"; license = lib.licenses.bsd3; @@ -27251,6 +27238,55 @@ self: { } ) { }; + LR-demo = callPackage ( + { + mkDerivation, + alex, + array, + base, + BNFC, + Cabal, + containers, + happy, + microlens, + microlens-th, + mtl, + process, + string-qq, + transformers, + }: + mkDerivation { + pname = "LR-demo"; + version = "0.0.20251105"; + sha256 = "1ys1pniwcx7lgah6scs6i7cx6mk6glpxdifxkhrvcrfm10lhzfs0"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ + base + Cabal + process + ]; + libraryHaskellDepends = [ + array + base + containers + microlens + microlens-th + mtl + string-qq + transformers + ]; + libraryToolDepends = [ + alex + BNFC + happy + ]; + description = "LALR(1) parsetable generator and interpreter"; + license = lib.licensesSpdx."BSD-3-Clause"; + mainProgram = "lr-demo"; + } + ) { }; + LRU = callPackage ( { mkDerivation, @@ -31987,15 +32023,14 @@ self: { bytestring, bytestring-encodings, cereal, - extra, mwc-random, optparse-applicative, text, }: mkDerivation { pname = "NanoID"; - version = "3.4.1.1"; - sha256 = "1dfl5vj6fwxwrhgx11vzxij2p19q3kqri130fxgw2l6ajlckyh8x"; + version = "3.4.1.2"; + sha256 = "0aagfbmzk48nsgia01wpl1k0smvgi3s7b63h0m4sz51x9v4b5j9h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -32003,7 +32038,6 @@ self: { base bytestring cereal - extra mwc-random text ]; @@ -36062,8 +36096,8 @@ self: { }: mkDerivation { pname = "PropRatt"; - version = "0.1.0.0"; - sha256 = "0qs8g88hsak7w7qi5qmjzsir71mr5b214cr0h4ni145x6is5fa0j"; + version = "0.2.0.0"; + sha256 = "0pdwzjh80j9flxykb3xiwypks1jbwn24wm6b0fz7pxszlw5cm5g2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49580,8 +49614,8 @@ self: { }: mkDerivation { pname = "ac-library-hs"; - version = "1.5.3.0"; - sha256 = "059b54g043b5a8zszavdzw8s8pgiz6zi6qzi7zjdyi2vlxam6v6l"; + version = "1.5.3.1"; + sha256 = "1iifgwy2m6dqk61lp7jd9qvcdk6j6bmmp9y5bscvmyb2n95lvwp5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49649,9 +49683,7 @@ self: { ]; description = "Data structures and algorithms"; license = lib.licensesSpdx."CC0-1.0"; - hydraPlatforms = lib.platforms.none; mainProgram = "example-lazy-segtree"; - broken = true; } ) { }; @@ -51443,6 +51475,31 @@ self: { } ) { }; + acid-state-events = callPackage ( + { + mkDerivation, + acid-state, + base, + containers, + stm, + time, + }: + mkDerivation { + pname = "acid-state-events"; + version = "0.1.0.0"; + sha256 = "1zynj87768ak4jn7ibyab7hscawfqh6jjm9i7d1v766skqvzrg40"; + libraryHaskellDepends = [ + acid-state + base + containers + stm + time + ]; + description = "Generic event bus for acid-state applications"; + license = lib.licenses.mit; + } + ) { }; + acid-state-tls = callPackage ( { mkDerivation, @@ -57717,6 +57774,7 @@ self: { license = lib.licensesSpdx."AGPL-3.0-or-later"; hydraPlatforms = lib.platforms.none; mainProgram = "airgql"; + broken = true; } ) { }; @@ -59096,6 +59154,49 @@ self: { } ) { }; + algebraic-graph-duoids = callPackage ( + { + mkDerivation, + algebraic-graphs, + base, + Cabal, + cabal-doctest, + doctest, + duoids, + duoids-hedgehog, + hedgehog, + no-recursion, + }: + mkDerivation { + pname = "algebraic-graph-duoids"; + version = "0.0.1.0"; + sha256 = "151x544zhbgn85f0gpb0j3x2nv31lkx59jn91wcq1qxr4dmywgw9"; + setupHaskellDepends = [ + base + Cabal + cabal-doctest + no-recursion + ]; + libraryHaskellDepends = [ + algebraic-graphs + base + duoids + no-recursion + ]; + testHaskellDepends = [ + algebraic-graphs + base + doctest + duoids-hedgehog + hedgehog + no-recursion + ]; + description = "Duoid instances for the algebraic-graphs package"; + license = "(AGPL-3.0-only WITH Universal-FOSS-exception-1.0 OR AGPL-3.0-only OR LicenseRef-commercial)"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + algebraic-graphs = callPackage ( { mkDerivation, @@ -59726,8 +59827,8 @@ self: { }: mkDerivation { pname = "alignment"; - version = "0.1.0.4"; - sha256 = "0579myc2fr0ksbsykyl6bw2v204vmvmkyc4phgm8dnmh921zchpz"; + version = "0.1.0.6"; + sha256 = "1s1x3vlvgqdslqpzsw33s6if35kz2kd2kxkpc0sk5a443kzrhn9r"; libraryHaskellDepends = [ assoc base @@ -60395,49 +60496,6 @@ self: { ) { }; alsa-seq = 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.9"; - sha256 = "1kb5p95wrkp8rri9557mhmk09ib82mr34z7xy8kkr1fhrf1xnylf"; - revision = "1"; - editedCabalFile = "1xh10102dk7dxfbfzpbnakjv9cf5gq6nrn7x264hf3bwv5c7nrls"; - 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; - maintainers = [ lib.maintainers.thielema ]; - } - ) { inherit (pkgs) alsa-lib; }; - - alsa-seq_0_6_0_10 = callPackage ( { mkDerivation, alsa-core, @@ -60474,7 +60532,6 @@ self: { 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; }; @@ -75235,6 +75292,7 @@ self: { license = "GPL"; hydraPlatforms = lib.platforms.none; mainProgram = "ampersand"; + broken = true; } ) { }; @@ -75432,8 +75490,8 @@ self: { }: mkDerivation { pname = "amqp-utils"; - version = "0.6.7.2"; - sha256 = "0ypkx415bvd7rd5466df3c9rhplgirwr61c7dswkwwnjwnvvz85w"; + version = "0.6.7.3"; + sha256 = "07zyg9nx4icb8665q5c2n2cwnl9013h54kvy7xqy6d8vfjbdhwl7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -78616,6 +78674,33 @@ self: { } ) { }; + apecs-brillo = callPackage ( + { + mkDerivation, + apecs, + apecs-physics, + base, + brillo, + containers, + linear, + }: + mkDerivation { + pname = "apecs-brillo"; + version = "0.1.0"; + sha256 = "0a0j74m6p6fnzagh5knlg9fn522ahr0ag4pgnssbl0lz4x2kwh13"; + libraryHaskellDepends = [ + apecs + apecs-physics + base + brillo + containers + linear + ]; + description = "Simple brillo renderer for apecs"; + license = lib.licenses.bsd3; + } + ) { }; + apecs-effectful = callPackage ( { mkDerivation, @@ -84364,6 +84449,88 @@ self: { } ) { }; + arxiv-client = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + directory, + megaparsec, + modern-uri, + req, + text, + time, + xml-conduit, + }: + mkDerivation { + pname = "arxiv-client"; + version = "0.1.0.1"; + sha256 = "1wi8k4qr1c4yjgr4rvqlcj4l5dw37m8hxwbssm772igfa5h739l5"; + libraryHaskellDepends = [ + aeson + base + bytestring + directory + megaparsec + modern-uri + req + text + time + xml-conduit + ]; + testHaskellDepends = [ + base + text + ]; + description = "Tiny client for the arXiv Atom API with a simple query DSL"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + arxiv-client-cli = callPackage ( + { + mkDerivation, + aeson, + arxiv-client, + base, + bytestring, + directory, + filepath, + megaparsec, + optparse-generic, + process, + text, + time, + }: + mkDerivation { + pname = "arxiv-client-cli"; + version = "0.1.0.0"; + sha256 = "0ky3hbra0fh795sj1ri2sm242bh5a6qqszxdibc8v3q28s275171"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson + arxiv-client + base + bytestring + directory + filepath + megaparsec + optparse-generic + process + text + time + ]; + description = "Command line tool to search and download papers from arXiv.org"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + mainProgram = "arxiv-client-cli"; + } + ) { }; + asana = callPackage ( { mkDerivation, @@ -85824,7 +85991,7 @@ self: { } ) { ghc-binary = null; }; - "assert" = callPackage ( + _assert = callPackage ( { mkDerivation, base, @@ -90158,6 +90325,143 @@ self: { } ) { }; + auto-export = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + directory, + ghc, + ghc-exactprint, + ghc-paths, + mtl, + process, + tasty, + tasty-hunit, + }: + mkDerivation { + pname = "auto-export"; + version = "0.1.0.1"; + sha256 = "16bs4l4284viya1b4q0k965qbly99pkmny8vdgj92lkfclk1rxjr"; + libraryHaskellDepends = [ + base + bytestring + containers + ghc + ghc-exactprint + ghc-paths + mtl + ]; + testHaskellDepends = [ + base + directory + ghc + process + tasty + tasty-hunit + ]; + description = "Automatically add things to module export list"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + auto-extract = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + directory, + ghc, + ghc-exactprint, + ghc-paths, + process, + syb, + tasty, + tasty-hunit, + transformers, + }: + mkDerivation { + pname = "auto-extract"; + version = "0.1.0.0"; + sha256 = "124sb4wiwv684zhjj3lnmj6nv9yn0a1ps2zj91i6wfjb2h41lsri"; + libraryHaskellDepends = [ + base + bytestring + containers + ghc + ghc-exactprint + ghc-paths + syb + transformers + ]; + testHaskellDepends = [ + base + directory + ghc + process + tasty + tasty-hunit + ]; + description = "Extract code segment to top level function"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + auto-import = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + directory, + ghc, + ghc-boot, + ghc-exactprint, + ghc-paths, + megaparsec, + process, + tasty, + tasty-hunit, + text, + time, + }: + mkDerivation { + pname = "auto-import"; + version = "0.1.0.0"; + sha256 = "0cxvm10wvr6b16dpx3jd0j6n622yfsk4ksgajnqzpair38v19q2r"; + libraryHaskellDepends = [ + base + bytestring + containers + directory + ghc + ghc-boot + ghc-exactprint + ghc-paths + megaparsec + text + time + ]; + testHaskellDepends = [ + base + directory + process + tasty + tasty-hunit + ]; + description = "Automatically add import statements"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + auto-lift-classes = callPackage ( { mkDerivation, @@ -91404,8 +91708,8 @@ self: { }: mkDerivation { pname = "aviation-navigation"; - version = "0.1.0.0"; - sha256 = "17nb2ryrxdy3sv68cnbv7saw5k9wh9nyas74bpsyn0p8grw71sd5"; + version = "0.1.0.2"; + sha256 = "0wx5zf4bzflh8py3jmak1dhsk3yw0789kv3y6fkhvqd23vlfc8ai"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92060,6 +92364,136 @@ self: { } ) { }; + aws_0_25_1 = callPackage ( + { + mkDerivation, + aeson, + attoparsec, + attoparsec-aeson, + base, + base16-bytestring, + base64-bytestring, + blaze-builder, + byteable, + bytestring, + case-insensitive, + cereal, + conduit, + conduit-extra, + containers, + crypton, + data-default, + directory, + errors, + exceptions, + filepath, + http-client, + http-client-tls, + http-conduit, + http-types, + lifted-base, + memory, + monad-control, + mtl, + network, + network-bsd, + old-locale, + QuickCheck, + quickcheck-instances, + resourcet, + safe, + scientific, + tagged, + tasty, + tasty-hunit, + tasty-quickcheck, + text, + time, + transformers, + transformers-base, + unordered-containers, + utf8-string, + vector, + xml-conduit, + }: + mkDerivation { + pname = "aws"; + version = "0.25.1"; + sha256 = "1prv5chmcnikxizl44ql2f68ri86i9a8i2kcnz7sqqb87ysbf0f6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + attoparsec + attoparsec-aeson + base + base16-bytestring + base64-bytestring + blaze-builder + byteable + bytestring + case-insensitive + cereal + conduit + conduit-extra + containers + crypton + data-default + directory + exceptions + filepath + http-client-tls + http-conduit + http-types + lifted-base + memory + monad-control + mtl + network + network-bsd + old-locale + resourcet + safe + scientific + tagged + text + time + transformers + unordered-containers + utf8-string + vector + xml-conduit + ]; + testHaskellDepends = [ + aeson + base + bytestring + conduit + errors + http-client + http-client-tls + http-types + lifted-base + monad-control + mtl + QuickCheck + quickcheck-instances + resourcet + tagged + tasty + tasty-hunit + tasty-quickcheck + text + time + transformers + transformers-base + ]; + description = "Amazon Web Services (AWS) for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + aws-academy-grade-exporter = callPackage ( { mkDerivation, @@ -92620,6 +93054,62 @@ self: { } ) { }; + aws-eventbridge-cron = callPackage ( + { + mkDerivation, + base, + containers, + criterion, + megaparsec, + QuickCheck, + tasty, + tasty-hunit, + tasty-quickcheck, + text, + time, + tz, + tzdata, + }: + mkDerivation { + pname = "aws-eventbridge-cron"; + version = "0.2.0.0"; + sha256 = "1dv2jm31krkc8924zz0xvkrh1ffas1nmmhbgdccqrb22hbyncjp0"; + libraryHaskellDepends = [ + base + containers + megaparsec + text + time + tz + tzdata + ]; + testHaskellDepends = [ + base + containers + megaparsec + QuickCheck + tasty + tasty-hunit + tasty-quickcheck + text + time + tz + tzdata + ]; + benchmarkHaskellDepends = [ + base + criterion + text + time + tz + ]; + description = "AWS EventBridge cron, rate, and one-time parser with scheduler"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + aws-general = callPackage ( { mkDerivation, @@ -94501,9 +94991,8 @@ self: { description = "Specify axioms for type classes and quickCheck all available instances"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; } - ) { control-invariants = null; }; + ) { }; azimuth-hs = callPackage ( { @@ -100385,73 +100874,6 @@ self: { ) { }; beam-sqlite = 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.4.1"; - sha256 = "1f5yjsx7zfbfbxs3xd64rwn2m3vjffrbdn5xadhm1axhghi6srki"; - revision = "2"; - editedCabalFile = "03j11sgmsaz80qvpb1r4j6zqdwya9gyi4rmlbhjl13wn3dzsf420"; - 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; - } - ) { }; - - beam-sqlite_0_5_5_0 = callPackage ( { mkDerivation, aeson, @@ -100513,7 +100935,6 @@ self: { ]; description = "Beam driver for SQLite"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -107401,6 +107822,29 @@ self: { } ) { }; + bitarray-bs = callPackage ( + { + mkDerivation, + base, + bytestring, + }: + mkDerivation { + pname = "bitarray-bs"; + version = "0.1.0.0"; + sha256 = "0sf0sgdpgjqh6zyclpic382frzk8gwrm8k3bpffazrmlql8jzd5b"; + libraryHaskellDepends = [ + base + bytestring + ]; + testHaskellDepends = [ + base + bytestring + ]; + description = "Bit array based on ByteString"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + bitcoin-address = callPackage ( { mkDerivation, @@ -108866,8 +109310,8 @@ self: { }: mkDerivation { pname = "bitstream"; - version = "0.3.0.1"; - sha256 = "0hkgjmhw7gc6m3yyva097q0z7f1wixlmm1ja0gpg9qkgzx6piyf0"; + version = "0.3.0.2"; + sha256 = "1fz5dccb1v002jdigfi50j80knqmdwvgi1mjg37198qhfgmfyxyb"; libraryHaskellDepends = [ base base-unicode-symbols @@ -108882,9 +109326,7 @@ self: { vector ]; description = "Fast, packed, strict and lazy bit streams with stream fusion"; - license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; - broken = true; + license = lib.licensesSpdx."CC0-1.0"; } ) { }; @@ -111764,8 +112206,8 @@ self: { }: mkDerivation { pname = "bloomfilter"; - version = "2.0.1.2"; - sha256 = "0klb26ldkw32axv3927w489j71r2rc9pangsvznqjbljib9970hp"; + version = "2.0.1.3"; + sha256 = "03lwgk9bwzwfvsmdn9gg2bww2xllr0mmhklwm7sjvvvihw5blj9r"; libraryHaskellDepends = [ array base @@ -112217,6 +112659,20 @@ self: { } ) { }; + bluefin_0_2_0_0 = callPackage ( + { mkDerivation, bluefin-internal }: + mkDerivation { + pname = "bluefin"; + version = "0.2.0.0"; + sha256 = "0kyzj5lr1w8r39mngsj8bf2bsqs3dxjirsmbkbk2zsldv9g0j210"; + libraryHaskellDepends = [ bluefin-internal ]; + description = "The Bluefin effect system"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.maralorn ]; + } + ) { }; + bluefin-algae = callPackage ( { mkDerivation, @@ -112231,6 +112687,8 @@ self: { pname = "bluefin-algae"; version = "0.1.0.2"; sha256 = "02g513vqn052qd41zm9brw8lf1ic4135mi8kr3s4w0721vm4nkhh"; + revision = "1"; + editedCabalFile = "00f43pckgra69gyrrpijfbyhqzz8pwqgj10gwn3lkwapxhamcqp5"; libraryHaskellDepends = [ base bluefin @@ -112260,14 +112718,16 @@ self: { }: mkDerivation { pname = "bluefin-contrib"; - version = "0.0.16.0"; - sha256 = "0pk7zqn9b6ka90l3n1xf9b84p4567gp2dv1ks6kcamzr3g4i4ww7"; + version = "0.2.0.0"; + sha256 = "0fqv8gjgxaa1jkfhvbcdwq18r1yhf0l8clr0w77vfizwj0425nqm"; libraryHaskellDepends = [ base bluefin ]; description = "The Bluefin effect system, user contributions"; license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -112283,8 +112743,36 @@ self: { }: mkDerivation { pname = "bluefin-internal"; - version = "0.1.1.0"; - sha256 = "1s29a48hijimz919qlg3cmdzcs83jdnvzy77s6v15gsqjrwsvm0q"; + version = "0.1.2.0"; + sha256 = "1zprpah3syp7lr7j1i4fdhmphglfmlx3nxc9kjvmksaymss68bx8"; + libraryHaskellDepends = [ + async + base + monad-control + transformers + transformers-base + unliftio-core + ]; + testHaskellDepends = [ base ]; + description = "The Bluefin effect system, internals"; + license = lib.licensesSpdx."MIT"; + } + ) { }; + + bluefin-internal_0_2_0_0 = callPackage ( + { + mkDerivation, + async, + base, + monad-control, + transformers, + transformers-base, + unliftio-core, + }: + mkDerivation { + pname = "bluefin-internal"; + version = "0.2.0.0"; + sha256 = "0mc343qjbdjps66r9mjp0p0ki9lfqrhpfqk3vahwih4msvnrfc8j"; libraryHaskellDepends = [ async base @@ -112296,6 +112784,7 @@ self: { testHaskellDepends = [ base ]; description = "The Bluefin effect system, internals"; license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -112308,8 +112797,8 @@ self: { }: mkDerivation { pname = "bluefin-random"; - version = "0.0.16.1"; - sha256 = "1kh5xgrwxqx4z0psk0wx8n5b7f3qq80jhzvifs5vry1l1irdj24a"; + version = "0.2.0.0"; + sha256 = "1kvhcz84gdpv0x4jmqi75i2l85kfkmsyp8vqpl39hgxwy1d8fmyf"; libraryHaskellDepends = [ base bluefin @@ -112707,105 +113196,6 @@ self: { ) { }; board-games = 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"; - sha256 = "05lrjgxdg836ik7ry5h9m9diirfc55086winssr9y0g6vbgbifpc"; - revision = "3"; - editedCabalFile = "1wawaq86bfn45hnfb6qv3ng4i8vvps914qhvbgmmx2p5lwmml21g"; - 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"; - mainProgram = "board-games"; - maintainers = [ lib.maintainers.thielema ]; - } - ) { }; - - board-games_0_4_0_1 = callPackage ( { mkDerivation, array, @@ -112897,7 +113287,6 @@ self: { ]; description = "Three games for inclusion in a web server"; license = "GPL"; - hydraPlatforms = lib.platforms.none; mainProgram = "board-games"; maintainers = [ lib.maintainers.thielema ]; } @@ -120625,10 +121014,8 @@ self: { }: mkDerivation { pname = "bytebuild"; - version = "0.3.16.3"; - sha256 = "0l88c5c1i704g87zvnpazfmcppg90b5q5cd6q5k75yx4x9vdcc88"; - revision = "1"; - editedCabalFile = "0jcqp55d8a2fpimc937a1phd6s20ypk12r2ybm3c0d3120sr9bnd"; + version = "0.3.17.0"; + sha256 = "1qp50gnccns9snvykhign98ixly1s7bwzg5wpa969mypy480shdc"; libraryHaskellDepends = [ base byteslice @@ -121115,13 +121502,14 @@ self: { tasty, tasty-hunit, tasty-quickcheck, + text, text-short, wide-word, }: mkDerivation { pname = "bytesmith"; - version = "0.3.13.0"; - sha256 = "0gbpqz1r8xcqii9kj6nd1yjcdrpj49rr107v2ldylvilvqw6yh52"; + version = "0.3.14.0"; + sha256 = "1i7vksz1g497hrn2kf7gk8vjxnd511b1xw1jg085xx0k33pcik6w"; libraryHaskellDepends = [ base byteslice @@ -121129,6 +121517,7 @@ self: { contiguous natural-arithmetic primitive + text text-short wide-word ]; @@ -121551,6 +121940,32 @@ self: { } ) { }; + bytestring-ft = callPackage ( + { + mkDerivation, + base, + bytestring, + mono-traversable, + }: + mkDerivation { + pname = "bytestring-ft"; + version = "0.1.0.0"; + sha256 = "0m93i56n26qi47y340c3a84mrghdavnfdgf1nfd4db0j63wzzglp"; + libraryHaskellDepends = [ + base + bytestring + mono-traversable + ]; + testHaskellDepends = [ + base + bytestring + mono-traversable + ]; + description = "Byte String implemented on Finger Tree"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + bytestring-handle = callPackage ( { mkDerivation, @@ -122346,8 +122761,8 @@ self: { }: mkDerivation { pname = "bz3"; - version = "1.0.0.0"; - sha256 = "1iik8r9hwhyqfi71f8nc0lb2ia18lgkrfsfcl98y7cfq243svc1a"; + version = "1.0.0.1"; + sha256 = "02nrsn63wrc5ml00iiap1pvbkk3nmc1py52423b0x0h5kk8bidnk"; libraryHaskellDepends = [ base binary @@ -123278,8 +123693,8 @@ self: { }: mkDerivation { pname = "cabal-appimage"; - version = "0.4.1.0"; - sha256 = "009mp46i5xx6cqjbmbj6m0kh2r2l1wa3gvpnjn9nc58vqhfnhr9c"; + version = "0.4.2.0"; + sha256 = "0vaxrp127anayn9zyk1icrzrq975f773fysn20ql1zs6msbwd9ca"; libraryHaskellDepends = [ base Cabal @@ -123883,6 +124298,94 @@ self: { } ) { }; + cabal-debian_5_4_1 = callPackage ( + { + mkDerivation, + base, + Cabal, + containers, + data-default, + debian, + Diff, + directory, + exceptions, + filepath, + hsemail, + HUnit, + lens, + mtl, + network-uri, + optparse-applicative, + parsec, + pretty, + prettyprinter, + process, + pureMD5, + regex-tdfa, + syb, + text, + unix, + unliftio, + utf8-string, + }: + mkDerivation { + pname = "cabal-debian"; + version = "5.4.1"; + sha256 = "16c3jj9hcda9lhnyp6qp49f8w2rhakxiy4gr5jz5d9x8w2izrc9v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + Cabal + containers + data-default + debian + Diff + directory + exceptions + filepath + hsemail + HUnit + lens + mtl + network-uri + optparse-applicative + parsec + pretty + prettyprinter + process + pureMD5 + regex-tdfa + syb + text + unix + unliftio + utf8-string + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base + Cabal + containers + debian + Diff + directory + filepath + hsemail + HUnit + lens + pretty + process + text + ]; + description = "Create a Debianization for a Cabal package"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + mainProgram = "cabal-debian"; + broken = true; + } + ) { }; + cabal-dependency-licenses = callPackage ( { mkDerivation, @@ -124028,8 +124531,8 @@ self: { }: mkDerivation { pname = "cabal-doctest"; - version = "1.0.11"; - sha256 = "0gwjpwv2v7c7gs2dvf7ixsxx6likmgw5yi0fy4bqc0i7nkqg4bfw"; + version = "1.0.12"; + sha256 = "0b4vlfdcazlyaklcqv2w94bh6xipjpfdffzp6w36bzj5639g049i"; libraryHaskellDepends = [ base Cabal @@ -125376,8 +125879,8 @@ self: { }: mkDerivation { pname = "cabal-matrix"; - version = "1.0.0.0"; - sha256 = "1y5hc98w9c6amlzp0nvzgd331nrmnf4qgqr0n6nv80zqy9s80b65"; + version = "1.0.1.0"; + sha256 = "029r3bf3w09jzrh0xy1hz9y13wr0w603b0gp5z7wm7qp3ki21iyy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129132,8 +129635,8 @@ self: { }: mkDerivation { pname = "canadian-income-tax"; - version = "2024.1"; - sha256 = "1j68n3j05ga0l3fm9ric61i04kn0yjgzw80vzgwa5g208v1l97vj"; + version = "2024.1.0.1"; + sha256 = "04q4p0f4cmrg8zljbb79pmz1jbisv41zcz9g13gkqgp4q9r5di9s"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -129803,8 +130306,8 @@ self: { pname = "capability"; version = "0.5.0.1"; sha256 = "0sksd42ywaq5av7a1h9y66pclsk1fd9qx46q38kgs3av88zhzqci"; - revision = "5"; - editedCabalFile = "1gqrc6gql8jfgblx8v9v352a51lj5mnw41hk66cgq269ywsg8igs"; + revision = "6"; + editedCabalFile = "1yfcp0scpnfmfdl1ypab89k25301nvxf34k6a1qnlvddr3f0yi6d"; libraryHaskellDepends = [ base constraints @@ -130529,10 +131032,8 @@ self: { }: mkDerivation { pname = "cardano-addresses"; - version = "4.0.0"; - sha256 = "13cvazmshy3j9c53g7i8pd4fmh6mgiajhaf42cf2d353pjjxr1w4"; - revision = "1"; - editedCabalFile = "1alyswv1d4q616vikwyv35ycxlz73qa7w602y43iba2g953823xv"; + version = "4.0.1"; + sha256 = "0s9m54v5rfy1h0d75a59v6lqaqi2j827wh29x2xk83i3kks2arv2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131174,8 +131675,8 @@ self: { }: mkDerivation { pname = "casa-abbreviations-and-acronyms"; - version = "0.0.10"; - sha256 = "0x5n9f56xaiddxx3yxfwkhfv2zachhhmzrp7lvz1l98hmrpz9wsy"; + version = "0.0.12"; + sha256 = "1674kxqfdlq9caging8scyrk3a5bzd22w81w95wia2dpfz38mjr6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131201,8 +131702,6 @@ self: { ]; description = "CASA Abbreviations and Acronyms"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -133411,38 +133910,31 @@ self: { attoparsec, base, binary, - bytestring, exceptions, hspec, http-client, - http-conduit, lens, lens-aeson, mtl, text, - transformers, unordered-containers, vector, }: mkDerivation { pname = "cayley-client"; - version = "0.4.19.4"; - sha256 = "06lhiyk6a77dy1cw7q240yz4yj8x3haqyp1sqdqz5z20pw1a3340"; + version = "0.4.19.5"; + sha256 = "0fksq22p80j7ggj9ls90lyvi237vw28yiz7908vrcn7wf4h9f3fq"; libraryHaskellDepends = [ aeson attoparsec base binary - bytestring exceptions http-client - http-conduit lens lens-aeson mtl text - transformers - unordered-containers vector ]; testHaskellDepends = [ @@ -135393,12 +135885,14 @@ self: { ansi-terminal, array, async, + atomic-primops, base, bitarray, bitwise, bytestring, bytestring-strict-builder, - cmdargs, + clock, + concurrency, containers, deepseq, directory, @@ -135410,21 +135904,19 @@ self: { ghc-prim, mmap, monad-loops, - mono-traversable, mtl, - posix-paths, + optparse-applicative, + os-string, process, - rawfilepath, regex-base, - regex-pcre, - regex-posix, + regex-tdfa, safe, split, stm, stringsearch, + template-haskell, text, transformers, - unagi-chan, unicode-show, unix-compat, unordered-containers, @@ -135434,8 +135926,8 @@ self: { }: mkDerivation { pname = "cgrep"; - version = "8.1.0"; - sha256 = "1apm74iv3z0p5va7fzdcki7w12mph2i30wn8lzi2l8jgnymygjvq"; + version = "9.0.0"; + sha256 = "1mdrs9gvsi1vg1pg0isl8s6y6kc644p1pydilwv88lpsyfsf94qa"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -135443,12 +135935,14 @@ self: { ansi-terminal array async + atomic-primops base bitarray bitwise bytestring bytestring-strict-builder - cmdargs + clock + concurrency containers deepseq directory @@ -135460,21 +135954,19 @@ self: { ghc-prim mmap monad-loops - mono-traversable mtl - posix-paths + optparse-applicative + os-string process - rawfilepath regex-base - regex-pcre - regex-posix + regex-tdfa safe split stm stringsearch + template-haskell text transformers - unagi-chan unicode-show unix-compat unordered-containers @@ -135484,7 +135976,9 @@ self: { ]; description = "Command line tool"; license = lib.licensesSpdx."GPL-2.0-or-later"; + hydraPlatforms = lib.platforms.none; mainProgram = "cgrep"; + broken = true; } ) { }; @@ -141707,8 +142201,8 @@ self: { }: mkDerivation { pname = "clash-ghc"; - version = "1.8.3"; - sha256 = "1y2mrn4c8zcn7bjdza28k1p8716iqfc42vjggjalbcrn04zi0dsb"; + version = "1.8.4"; + sha256 = "1dgmqy5nm8fn55lmgd05akpkal46cydvbk0w6ian2z3979q4w4gb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141823,8 +142317,8 @@ self: { }: mkDerivation { pname = "clash-lib"; - version = "1.8.3"; - sha256 = "114w3vag29famrdz934v42831hbcxvkd0jxhsm730rwni95ik78c"; + version = "1.8.4"; + sha256 = "1pria81l325zdh8ccpkig5sp9lv4k819sk7pgkjf1s8hjknlsv9x"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -141949,8 +142443,8 @@ self: { }: mkDerivation { pname = "clash-lib-hedgehog"; - version = "1.8.3"; - sha256 = "1cihj7m6n46v06np6hbd3z11zr74gy2b3alhfmx1x4hy3ycsr1x9"; + version = "1.8.4"; + sha256 = "1nl085y83vgljdh1pmgckvy5v5g6dafvmkjajc7m72s8ijj7g717"; libraryHaskellDepends = [ base clash-lib @@ -142057,8 +142551,8 @@ self: { }: mkDerivation { pname = "clash-prelude"; - version = "1.8.3"; - sha256 = "00fy0vgp2pj7vad50n53pz70hc6x1mvz3a28cl1xqdyi6mk82kfj"; + version = "1.8.4"; + sha256 = "0vc9vcqbh0i8xkm833nwxfmwxi47kzcajrh8nywymal2nsid1gby"; libraryHaskellDepends = [ array arrows @@ -142141,8 +142635,8 @@ self: { }: mkDerivation { pname = "clash-prelude-hedgehog"; - version = "1.8.3"; - sha256 = "10mq2mpn6vnsb253p3hb665q94363vq5irmg8ns10p7kc2jc6l2l"; + version = "1.8.4"; + sha256 = "15jf4vr1p42s5pvs417y917j82m69df4prlgs3jl3l2h43psh3y5"; libraryHaskellDepends = [ base clash-prelude @@ -161514,6 +162008,52 @@ self: { } ) { }; + control-invariants = callPackage ( + { + mkDerivation, + _assert, + base, + containers, + data-default, + deepseq, + either, + lens, + mtl, + QuickCheck, + semigroups, + template-haskell, + th-lift, + th-printf, + transformers, + }: + mkDerivation { + pname = "control-invariants"; + version = "0.1.0.0"; + sha256 = "0qfw2g04k3jd9dqj1m46rf9dz767y3lkny8pj4zp3mnr704wnwwr"; + revision = "1"; + editedCabalFile = "0f8px9rf0d6bz0hm52iw5v89ada7jgj5lydpsr6x542hbq953wz3"; + libraryHaskellDepends = [ + _assert + base + containers + data-default + deepseq + either + lens + mtl + QuickCheck + semigroups + template-haskell + th-lift + th-printf + transformers + ]; + description = "Invariants and contract monitoring"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + control-iso = callPackage ( { mkDerivation, @@ -161760,8 +162300,8 @@ self: { }: mkDerivation { pname = "control-monad-omega"; - version = "0.3.3"; - sha256 = "0f90q6mxxb8szqvw93pypbbf4nicj1w5n9sqs4434b6cp55665z6"; + version = "0.3.4"; + sha256 = "0pyl90zk80myfw4vka2v6awh5fam43kljis613j0n0x4dkzvyf0q"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base @@ -162585,6 +163125,44 @@ self: { } ) { }; + copilot_4_6 = callPackage ( + { + mkDerivation, + base, + copilot-c99, + copilot-core, + copilot-language, + copilot-libraries, + copilot-prettyprinter, + copilot-theorem, + directory, + filepath, + optparse-applicative, + }: + mkDerivation { + pname = "copilot"; + version = "4.6"; + sha256 = "11m838rfnqg11ldbj5byvql0sf8bpy2piay2fm610rkqqmilqfmf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + copilot-c99 + copilot-core + copilot-language + copilot-libraries + copilot-prettyprinter + copilot-theorem + directory + filepath + optparse-applicative + ]; + description = "A stream DSL for writing embedded C programs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + copilot-bluespec = callPackage ( { mkDerivation, @@ -162607,8 +163185,8 @@ self: { }: mkDerivation { pname = "copilot-bluespec"; - version = "4.5.1"; - sha256 = "0lznkmyy8mgp5mlrazp57qqa7xld3f4w4cngy5379s0ipfw1h6bc"; + version = "4.6"; + sha256 = "0g28nxpqdrwabmpq4c68r826mlfcvxknlwzdnjxmdf56akiywjij"; libraryHaskellDepends = [ base copilot-core @@ -162693,6 +163271,60 @@ self: { } ) { }; + copilot-c99_4_6 = callPackage ( + { + mkDerivation, + base, + copilot-core, + directory, + filepath, + HUnit, + language-c99, + language-c99-simple, + mtl, + pretty, + process, + QuickCheck, + random, + test-framework, + test-framework-hunit, + test-framework-quickcheck2, + unix, + }: + mkDerivation { + pname = "copilot-c99"; + version = "4.6"; + sha256 = "11g890ximcm5i6ds3fpx4hqzqps055ng7mmcp8cgi6p9s7shx8hj"; + libraryHaskellDepends = [ + base + copilot-core + directory + filepath + language-c99 + language-c99-simple + mtl + pretty + ]; + testHaskellDepends = [ + base + copilot-core + directory + HUnit + pretty + process + QuickCheck + random + test-framework + test-framework-hunit + test-framework-quickcheck2 + unix + ]; + description = "A compiler for Copilot targeting C99"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + copilot-cbmc = callPackage ( { mkDerivation, @@ -162753,6 +163385,35 @@ self: { } ) { }; + copilot-core_4_6 = callPackage ( + { + mkDerivation, + base, + HUnit, + QuickCheck, + test-framework, + test-framework-hunit, + test-framework-quickcheck2, + }: + mkDerivation { + pname = "copilot-core"; + version = "4.6"; + sha256 = "0831qjcvs6d7zc1xw8snn65b2lhvxia44s6j8z196lj8sf82wkpc"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base + HUnit + QuickCheck + test-framework + test-framework-hunit + test-framework-quickcheck2 + ]; + description = "An intermediate representation for Copilot"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + copilot-frp-sketch = callPackage ( { mkDerivation, @@ -162824,6 +163485,41 @@ self: { } ) { }; + copilot-interpreter_4_6 = callPackage ( + { + mkDerivation, + base, + copilot-core, + copilot-prettyprinter, + pretty, + QuickCheck, + test-framework, + test-framework-quickcheck2, + }: + mkDerivation { + pname = "copilot-interpreter"; + version = "4.6"; + sha256 = "1vpjrrv6z7mssqxswyr9aqrc0gf580gfyhfp87xxvrpmay8jchb4"; + libraryHaskellDepends = [ + base + copilot-core + pretty + ]; + testHaskellDepends = [ + base + copilot-core + copilot-prettyprinter + pretty + QuickCheck + test-framework + test-framework-quickcheck2 + ]; + description = "Interpreter for Copilot"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + copilot-language = callPackage ( { mkDerivation, @@ -162872,6 +163568,55 @@ self: { } ) { }; + copilot-language_4_6 = callPackage ( + { + mkDerivation, + array, + base, + containers, + copilot-core, + copilot-interpreter, + copilot-theorem, + data-reify, + HUnit, + mtl, + pretty, + QuickCheck, + test-framework, + test-framework-hunit, + test-framework-quickcheck2, + }: + mkDerivation { + pname = "copilot-language"; + version = "4.6"; + sha256 = "01llv51lyagq2kgi2kfspi7gb6rix9zxhppy3avww0av08a6a6li"; + libraryHaskellDepends = [ + array + base + containers + copilot-core + copilot-interpreter + copilot-theorem + data-reify + mtl + ]; + testHaskellDepends = [ + base + copilot-core + copilot-interpreter + HUnit + pretty + QuickCheck + test-framework + test-framework-hunit + test-framework-quickcheck2 + ]; + description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + copilot-libraries = callPackage ( { mkDerivation, @@ -162911,6 +163656,46 @@ self: { } ) { }; + copilot-libraries_4_6 = callPackage ( + { + mkDerivation, + base, + containers, + copilot-interpreter, + copilot-language, + copilot-theorem, + mtl, + parsec, + QuickCheck, + test-framework, + test-framework-quickcheck2, + }: + mkDerivation { + pname = "copilot-libraries"; + version = "4.6"; + sha256 = "12mflyq9721p2npjsinbab0icdad6v16z72d4ax29xap3j0ccw4p"; + libraryHaskellDepends = [ + base + containers + copilot-language + mtl + parsec + ]; + testHaskellDepends = [ + base + copilot-interpreter + copilot-language + copilot-theorem + QuickCheck + test-framework + test-framework-quickcheck2 + ]; + description = "Libraries for the Copilot language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + copilot-prettyprinter = callPackage ( { mkDerivation, @@ -162932,6 +163717,28 @@ self: { } ) { }; + copilot-prettyprinter_4_6 = callPackage ( + { + mkDerivation, + base, + copilot-core, + pretty, + }: + mkDerivation { + pname = "copilot-prettyprinter"; + version = "4.6"; + sha256 = "0ng8zdjspgi62lzi3s42h25gf2j3mqn8rssbxrljpb8dmic479sr"; + libraryHaskellDepends = [ + base + copilot-core + pretty + ]; + description = "A prettyprinter of Copilot Specifications"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + copilot-sbv = callPackage ( { mkDerivation, @@ -163025,6 +163832,70 @@ self: { } ) { }; + copilot-theorem_4_6 = callPackage ( + { + mkDerivation, + base, + bimap, + bv-sized, + containers, + copilot-core, + copilot-prettyprinter, + data-default, + directory, + HUnit, + libBF, + mtl, + panic, + parameterized-utils, + pretty, + process, + QuickCheck, + random, + test-framework, + test-framework-quickcheck2, + transformers, + what4, + xml, + }: + mkDerivation { + pname = "copilot-theorem"; + version = "4.6"; + sha256 = "0plm8kf69mgq7qr0xv3xvl3ay3b6zdx25my2zdc826wki9iavvr8"; + libraryHaskellDepends = [ + base + bimap + bv-sized + containers + copilot-core + copilot-prettyprinter + data-default + directory + libBF + mtl + panic + parameterized-utils + pretty + process + random + transformers + what4 + xml + ]; + testHaskellDepends = [ + base + copilot-core + HUnit + QuickCheck + test-framework + test-framework-quickcheck2 + ]; + description = "k-induction for Copilot"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + copilot-verifier = callPackage ( { mkDerivation, @@ -163064,8 +163935,8 @@ self: { }: mkDerivation { pname = "copilot-verifier"; - version = "4.5.1"; - sha256 = "1a98h8pfxj2sz7dgq6a95ih9pgxkxbg7dzliczyd885s5hbfdb4k"; + version = "4.6"; + sha256 = "13czl47yisjknvhrpqw56gpvqm2qk547ci369pkin2yhrkqv91ja"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163182,8 +164053,8 @@ self: { }: mkDerivation { pname = "copilot-visualizer"; - version = "4.5.1"; - sha256 = "0bpy73c1gflj3q03kary0pqr083hncwnhvzbyy0293vxk2p6izxf"; + version = "4.6"; + sha256 = "18iv2ihcp24im88wvy1aqx3cpiwawrizjr5v0cq8sd8c3hi6g4zk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -163203,6 +164074,8 @@ self: { ]; description = "Visualizer for Copilot"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -167382,6 +168255,39 @@ self: { } ) { }; + cretheus = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + containers, + primitive, + reflection, + text, + time, + vector, + }: + mkDerivation { + pname = "cretheus"; + version = "1.1.0"; + sha256 = "0w85lv8gb987fhpv67shk7p12j80jw8axx9fmz18kkswhg88vs6g"; + libraryHaskellDepends = [ + aeson + base + bytestring + containers + primitive + reflection + text + time + vector + ]; + description = "A clean aeson wrapper"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + crf-chain1 = callPackage ( { mkDerivation, @@ -168451,7 +169357,9 @@ self: { ]; description = "Dead simple broken links checker on local HTML folders"; license = lib.licensesSpdx."ISC"; + hydraPlatforms = lib.platforms.none; mainProgram = "croque-mort"; + broken = true; } ) { }; @@ -168466,6 +169374,7 @@ self: { exceptions, fgl, hashable, + hedgehog, hspec, json, lens, @@ -168475,6 +169384,7 @@ self: { prettyprinter, QuickCheck, tasty, + tasty-hedgehog, tasty-hspec, tasty-hunit, tasty-quickcheck, @@ -168489,8 +169399,8 @@ self: { }: mkDerivation { pname = "crucible"; - version = "0.7.2"; - sha256 = "0wz9gsbqdgjsdg68rzi1gsc21bzfb34dx6hd9bdlbzkq4i1km0b3"; + version = "0.8.0.0"; + sha256 = "0vvgxa0ah2hbnj2dh1iyc9i6wwq9qa01mzc8494wv6nj3hvcbn7y"; libraryHaskellDepends = [ async base @@ -168518,6 +169428,7 @@ self: { testHaskellDepends = [ base containers + hedgehog hspec lens mtl @@ -168525,6 +169436,7 @@ self: { parameterized-utils QuickCheck tasty + tasty-hedgehog tasty-hspec tasty-hunit tasty-quickcheck @@ -168544,6 +169456,7 @@ self: { crucible, crucible-syntax, directory, + extra, filepath, isocline, lens, @@ -168560,8 +169473,8 @@ self: { }: mkDerivation { pname = "crucible-debug"; - version = "0.1.0"; - sha256 = "12xrvsj9asaq07diifi3adjy9524ma4zxsd8a9393fd1zi07693a"; + version = "0.1.2.0"; + sha256 = "0i3bbk28sihyb8nirjcz72mrhz6m08k3iz1jz2rx5jn7nwskxzba"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168570,6 +169483,7 @@ self: { crucible crucible-syntax directory + extra filepath isocline lens @@ -168638,10 +169552,8 @@ self: { }: mkDerivation { pname = "crucible-llvm"; - version = "0.7.1"; - sha256 = "0q2ifjvdgbdvpj5092v9s4nhbkwmw8hghnslcx5ljrwfm8vmzxbs"; - revision = "2"; - editedCabalFile = "12k4r85w7864b4nbg03v2w0vhk8sgld55aqqckc5qz7d78q6lzkx"; + version = "0.8.0.0"; + sha256 = "1nj45d75llj2laspiql6wzv54p5lv52x11ya06y0qgqcb0x8k4ai"; libraryHaskellDepends = [ attoparsec base @@ -168687,6 +169599,7 @@ self: { description = "Support for translating and executing LLVM code in Crucible"; license = lib.licensesSpdx."BSD-3-Clause"; hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -168713,8 +169626,8 @@ self: { }: mkDerivation { pname = "crucible-symio"; - version = "0.1.1"; - sha256 = "0c96c0iqdx2ahc9sjslck1bfnjkha1kii1p3izhw9b9d34h339d7"; + version = "0.2.0.0"; + sha256 = "1gxqanrp78d0ffg6z5pd3624qz1fmlmlvkn5ljmg2gvw7dskl4ip"; libraryHaskellDepends = [ aeson base @@ -168753,8 +169666,6 @@ self: { ]; description = "An implementation of symbolic I/O primitives for Crucible"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -168782,8 +169693,8 @@ self: { }: mkDerivation { pname = "crucible-syntax"; - version = "0.4.1"; - sha256 = "0b60qh1hnz9q8diqnc4f9pvmkbgp1amg8gfk9zjk7mlkq4x9g9bh"; + version = "0.5.0.0"; + sha256 = "08b027d6m8c1wsfn21kjywg1gqw4s4nanzj1q4kqp65n4gmaai5b"; libraryHaskellDepends = [ base bv-sized @@ -168910,8 +169821,10 @@ self: { crucible-debug, crucible-syntax, directory, + file-embed, filepath, generic-lens, + githash, Glob, lens, libBF, @@ -168919,6 +169832,7 @@ self: { parameterized-utils, prettyprinter, raw-strings-qq, + rme-what4, semigroupoids, simple-get-opt, split, @@ -168932,8 +169846,8 @@ self: { }: mkDerivation { pname = "crux"; - version = "0.7.2"; - sha256 = "025nrsa3a1wl2ymw1q4pj77hgjn3nq33qhwnx05xykkqq7fyandh"; + version = "0.8.0.0"; + sha256 = "09j0syp834xb968cjjjvlvqbyya5kavdd9xg726n064kbqj1kb5r"; libraryHaskellDepends = [ aeson ansi-terminal @@ -168950,8 +169864,10 @@ self: { crucible-debug crucible-syntax directory + file-embed filepath generic-lens + githash Glob lens libBF @@ -168959,6 +169875,7 @@ self: { parameterized-utils prettyprinter raw-strings-qq + rme-what4 semigroupoids simple-get-opt split @@ -168988,6 +169905,7 @@ self: { config-schema, containers, crucible, + crucible-debug, crucible-llvm, crucible-symio, crux, @@ -169019,8 +169937,8 @@ self: { }: mkDerivation { pname = "crux-llvm"; - version = "0.10"; - sha256 = "0648w3i2hpgkfqhcx3r7qsdgqak8295ik0g98jqs9s79dn7i8s4g"; + version = "0.11.0.0"; + sha256 = "1jhygc1yxw847v9qzrc7a7nvx1q2kvsn2kps8qkvfhcf6g08kscs"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -169032,6 +169950,7 @@ self: { config-schema containers crucible + crucible-debug crucible-llvm crucible-symio crux @@ -170524,6 +171443,7 @@ self: { cryptol = callPackage ( { mkDerivation, + aeson, alex, ansi-terminal, arithmoi, @@ -170566,7 +171486,9 @@ self: { pretty, pretty-show, prettyprinter, + primitive, process, + rme-what4, sbv, simple-smt, stm, @@ -170586,12 +171508,13 @@ self: { }: mkDerivation { pname = "cryptol"; - version = "3.3.0"; - sha256 = "1c1pny7nj34wbph6yg2dmwbrflfrp7flzgjvmp2xdb1s7h4d38rv"; + version = "3.4.0"; + sha256 = "1253c4rkv5i1kyvagyqxn94la0slsp7yvf0v4lkhlz1hzl6mfwsr"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ + aeson ansi-terminal arithmoi array @@ -170628,7 +171551,9 @@ self: { pretty pretty-show prettyprinter + primitive process + rme-what4 sbv simple-smt stm @@ -171043,7 +171968,7 @@ self: { } ) { }; - crypton-x509-store = callPackage ( + crypton-x509-store_1_6_11 = callPackage ( { mkDerivation, asn1-encoding, @@ -171086,6 +172011,57 @@ self: { ]; description = "X.509 collection accessing and storing methods"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + + crypton-x509-store = callPackage ( + { + mkDerivation, + asn1-encoding, + asn1-types, + base, + bytestring, + containers, + crypton, + crypton-x509, + directory, + filepath, + mtl, + pem, + tasty, + tasty-hunit, + unix, + }: + mkDerivation { + pname = "crypton-x509-store"; + version = "1.6.12"; + sha256 = "149wx24blr9b0pd1kaw14zl8li825hfdksyi47x1460zvxdsz86p"; + revision = "1"; + editedCabalFile = "1im0mbnshvp2f5279ca003f6vjna59yfiiphs7xggbk7fxs2iwab"; + libraryHaskellDepends = [ + asn1-encoding + asn1-types + base + bytestring + containers + crypton + crypton-x509 + directory + filepath + mtl + pem + unix + ]; + testHaskellDepends = [ + base + bytestring + crypton-x509 + tasty + tasty-hunit + ]; + description = "X.509 collection accessing and storing methods"; + license = lib.licenses.bsd3; } ) { }; @@ -181332,56 +182308,74 @@ self: { dataframe = callPackage ( { mkDerivation, + aeson, array, attoparsec, base, bytestring, bytestring-lexing, + cassava, containers, criterion, directory, + filepath, granite, hashable, HUnit, + mmap, + parallel, process, random, random-shuffle, + regex-tdfa, + scientific, snappy-hs, template-haskell, text, time, + unordered-containers, vector, vector-algorithms, zstd, }: mkDerivation { pname = "dataframe"; - version = "0.3.3.4"; - sha256 = "0s2mjndzn5nly4fmrw6ada8px1mvh9ha18hfflidy3ky3ljbmiis"; + version = "0.3.4.0"; + sha256 = "0n33zjgfkrnr9j4sg93w2iz743m3yw0hk6nnpy3081ibj24426vj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ + aeson array attoparsec base bytestring bytestring-lexing + cassava containers directory granite hashable + mmap + parallel process random + regex-tdfa + scientific snappy-hs template-haskell text time + unordered-containers vector vector-algorithms zstd ]; executableHaskellDepends = [ base + directory + filepath + process random time vector @@ -181402,7 +182396,8 @@ self: { ]; description = "A fast, safe, and intuitive DataFrame library"; license = lib.licensesSpdx."GPL-3.0-or-later"; - mainProgram = "dataframe"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -181427,6 +182422,62 @@ self: { testHaskellDepends = [ base ]; description = "Converts between dataframes and hasktorch tensors"; license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + + dataframe-persistent = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + dataframe, + HUnit, + monad-logger, + persistent, + persistent-sqlite, + resourcet, + template-haskell, + temporary, + text, + time, + transformers, + vector, + }: + mkDerivation { + pname = "dataframe-persistent"; + version = "0.1.0.0"; + sha256 = "0drpha9bkhp10ipbbh02mfs5r77awi8nfw9zrxahz2fqrysrs3dx"; + libraryHaskellDepends = [ + base + bytestring + containers + dataframe + persistent + template-haskell + text + time + transformers + vector + ]; + testHaskellDepends = [ + base + dataframe + HUnit + monad-logger + persistent + persistent-sqlite + resourcet + temporary + text + time + transformers + vector + ]; + description = "Persistent database integration for the dataframe library"; + license = lib.licensesSpdx."GPL-3.0-or-later"; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -183771,8 +184822,8 @@ self: { }: mkDerivation { pname = "dear-imgui"; - version = "2.4.0"; - sha256 = "1dzgcmz24yg3pird2gmxqhdnmwkydh54wym2x6lxq0r0dx3jphwz"; + version = "2.4.1"; + sha256 = "0s79mqv6rq1v7f595mknvm1wkzha5bh1x6l64im11zkgaycv59kl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184884,9 +185935,6 @@ self: { { mkDerivation, base, - Cabal, - cabal-doctest, - doctest, generic-lens, markdown-unlit, rank2classes, @@ -184895,13 +185943,8 @@ self: { }: mkDerivation { pname = "deep-transformations"; - version = "0.3"; - sha256 = "16v97v10xp4y9cpb1q4i56baihipyas5askhbbc6ifgzn4fzl1nn"; - setupHaskellDepends = [ - base - Cabal - cabal-doctest - ]; + version = "0.4.0.1"; + sha256 = "12c4qfjh9fnbikjlhvzy7pyasfx1l0bgqbv06bniyahjkx8zv78w"; libraryHaskellDepends = [ base generic-lens @@ -184911,7 +185954,6 @@ self: { ]; testHaskellDepends = [ base - doctest rank2classes ]; testToolDepends = [ markdown-unlit ]; @@ -186247,10 +187289,8 @@ self: { }: mkDerivation { pname = "deltaq"; - version = "1.1.0.0"; - sha256 = "06f71mikkmxpvpywl3ydss1knwy9pd3x9klbxfiz985v9q5nb4ja"; - revision = "1"; - editedCabalFile = "1g9l29msxa2w3yzv3xnvhhzgh1a2vc3s7g39g6rbx9rdx1xw68kc"; + version = "1.2.0.0"; + sha256 = "0d9a96m2bwjm52v3s041kay02lsxbq0510rhczxksg0vjqc8l14b"; libraryHaskellDepends = [ base Chart @@ -186995,32 +188035,6 @@ self: { ) { }; dependent-map = callPackage ( - { - mkDerivation, - base, - constraints-extras, - containers, - dependent-sum, - }: - mkDerivation { - pname = "dependent-map"; - version = "0.4.0.0"; - sha256 = "0b0zhyl3wkl4kkrxvq7vwjz3gn0ndxjjgyw9cky8a6xyv190pkjk"; - revision = "2"; - editedCabalFile = "18jqk1p4paaylqdvglw03v7fhyvlg59csl4kpf067wwpdpyaqs3l"; - libraryHaskellDepends = [ - base - constraints-extras - containers - dependent-sum - ]; - description = "Dependent finite maps (partial dependent products)"; - license = "unknown"; - maintainers = [ lib.maintainers.alexfmpe ]; - } - ) { }; - - dependent-map_0_4_0_1 = callPackage ( { mkDerivation, base, @@ -187040,7 +188054,6 @@ self: { ]; description = "Dependent finite maps (partial dependent products)"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.alexfmpe ]; } ) { }; @@ -187645,11 +188658,12 @@ self: { hspec, template-haskell, th-abstraction, + th-test-utils, }: mkDerivation { pname = "derive-has-field"; - version = "0.1.2.0"; - sha256 = "1ccsg6x0isnqgnxdl53y18jciwlv4nvbjb7g4vpdw60s9p0z86xw"; + version = "0.1.2.1"; + sha256 = "0zz2c5ykjmbbwfxk066di6mhlfrdqamdzg8g498jgc2dqvd10nma"; libraryHaskellDepends = [ base template-haskell @@ -187660,6 +188674,7 @@ self: { hspec template-haskell th-abstraction + th-test-utils ]; description = "Derive HasField instances with Template Haskell"; license = lib.licenses.mit; @@ -188132,6 +189147,19 @@ self: { } ) { }; + deriving-via-fun = callPackage ( + { mkDerivation, base }: + mkDerivation { + pname = "deriving-via-fun"; + version = "0.1.1.0"; + sha256 = "099wdi3204sq1mdr3i3z26scps2dvp9xxc0f8mp46fsilpl7bdys"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Deriving via first-class functions"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + derivingvia-extras = callPackage ( { mkDerivation, @@ -190901,8 +191929,8 @@ self: { }: mkDerivation { pname = "dhscanner-kbgen"; - version = "1.0.7"; - sha256 = "1z7l1q9ijk2xzy94vpbkjsx74zccp2a1b3qbjfmhfh5gkpk3gyvv"; + version = "1.0.12"; + sha256 = "1zmnc4ih9pk12wz7mxrxf0y6wrirvdngk3ch4w0605czwh8522i3"; libraryHaskellDepends = [ aeson base @@ -201460,10 +202488,8 @@ self: { }: mkDerivation { pname = "dom-lt"; - version = "0.2.3"; - sha256 = "1h73159h61f1wv6kans0nqspfq46wiz77isnjg8vd9m127hqn69x"; - revision = "1"; - editedCabalFile = "140hnm6jg74fmhi6vsq2qq8agf3ar7wakwpxfkdf0zg944p41y8x"; + version = "0.2.4"; + sha256 = "0bifkk0v4y75vawc4c3jk1h20pjry9m390svvbjmhh6nj22w8si1"; libraryHaskellDepends = [ array base @@ -201508,6 +202534,8 @@ self: { pname = "dom-parser"; version = "3.2.0"; sha256 = "1i71gcxwq0pdwkg70l33gaqcf8ihbgw3rgbw6r11p4vri0fl6fr4"; + revision = "1"; + editedCabalFile = "15h56mpdddbws6ifkd93m3l6ywg90cp9vf40b1f8qzhvwy65dpj9"; libraryHaskellDepends = [ base case-insensitive @@ -201534,6 +202562,8 @@ self: { ]; description = "Simple monadic DOM parser"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -203151,6 +204181,37 @@ self: { } ) { }; + dpapi = callPackage ( + { + mkDerivation, + base, + base64, + bytestring, + HUnit, + text, + typed-process, + Win32, + }: + mkDerivation { + pname = "dpapi"; + version = "0.1.0.0"; + sha256 = "16rl4fpjf2jn0fgh5mmsg8j9z7h5p0jqm8f6cr4bz71q0nq8rj11"; + testHaskellDepends = [ + base + base64 + bytestring + HUnit + text + typed-process + Win32 + ]; + description = "Windows DPAPI bindings"; + license = lib.licensesSpdx."MPL-2.0"; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + dph-base = callPackage ( { mkDerivation, @@ -205543,6 +206604,118 @@ self: { } ) { }; + duoidal-transformers = callPackage ( + { + mkDerivation, + base, + Cabal, + cabal-doctest, + doctest, + duoids, + no-recursion, + transformers, + }: + mkDerivation { + pname = "duoidal-transformers"; + version = "0.0.1.0"; + sha256 = "0hlnlak7pamdaaxlac8zi9gd9wvjf4lh3fbdhcz5kldxrbj5jwgv"; + setupHaskellDepends = [ + base + Cabal + cabal-doctest + no-recursion + ]; + libraryHaskellDepends = [ + base + duoids + no-recursion + transformers + ]; + testHaskellDepends = [ + base + doctest + no-recursion + ]; + description = "Extending the tranformers package with duoids"; + license = "(AGPL-3.0-only WITH Universal-FOSS-exception-1.0 OR AGPL-3.0-only OR LicenseRef-commercial)"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + + duoids = callPackage ( + { + mkDerivation, + base, + Cabal, + cabal-doctest, + doctest, + no-recursion, + }: + mkDerivation { + pname = "duoids"; + version = "0.0.1.0"; + sha256 = "1h697a56b827ddmhhp9w3wsbm815527zjl1hnp9f6hn6cwv2ylfn"; + setupHaskellDepends = [ + base + Cabal + cabal-doctest + no-recursion + ]; + libraryHaskellDepends = [ + base + no-recursion + ]; + testHaskellDepends = [ + base + doctest + no-recursion + ]; + description = "Unifying parallel and sequential operations"; + license = "(AGPL-3.0-only WITH Universal-FOSS-exception-1.0 OR AGPL-3.0-only OR LicenseRef-commercial) AND BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + duoids-hedgehog = callPackage ( + { + mkDerivation, + base, + Cabal, + cabal-doctest, + doctest, + duoids, + hedgehog, + no-recursion, + }: + mkDerivation { + pname = "duoids-hedgehog"; + version = "0.0.1.0"; + sha256 = "0vcvyqqnray1h62lnihgcaimzrc2ava77g1p5ys9fs6pkq3pxfzf"; + setupHaskellDepends = [ + base + Cabal + cabal-doctest + no-recursion + ]; + libraryHaskellDepends = [ + base + duoids + hedgehog + no-recursion + ]; + testHaskellDepends = [ + base + doctest + hedgehog + no-recursion + ]; + description = "Unifying parallel and sequential operations"; + license = "(AGPL-3.0-only WITH Universal-FOSS-exception-1.0 OR AGPL-3.0-only OR LicenseRef-commercial)"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + dupIO = callPackage ( { mkDerivation, @@ -209786,6 +210959,43 @@ self: { } ) { }; + effectful-poolboy = callPackage ( + { + mkDerivation, + async, + base, + effectful, + effectful-core, + hspec, + hspec-core, + poolboy, + timeit, + }: + mkDerivation { + pname = "effectful-poolboy"; + version = "0.1.0.0"; + sha256 = "05m8k06mrrc1insn4bnxnlfi2d137abki2lczq7fwhjm5zzr645s"; + libraryHaskellDepends = [ + async + base + effectful-core + poolboy + ]; + testHaskellDepends = [ + async + base + effectful + effectful-core + hspec + hspec-core + poolboy + timeit + ]; + description = "Simple work queue for bounded concurrency (effectful wrapper)"; + license = lib.licensesSpdx."ISC"; + } + ) { }; + effectful-postgresql = callPackage ( { mkDerivation, @@ -218551,6 +219761,41 @@ self: { } ) { }; + ersatz-viz = callPackage ( + { + mkDerivation, + base, + ersatz, + lens, + mtl, + process-extras, + text, + unordered-containers, + }: + mkDerivation { + pname = "ersatz-viz"; + version = "0"; + sha256 = "1ywrjbkr0xc7cng2a6jykxa4b4xlvv64l1wdhj8267g8m1cc576a"; + libraryHaskellDepends = [ + base + ersatz + lens + mtl + process-extras + text + unordered-containers + ]; + testHaskellDepends = [ + base + ersatz + text + ]; + description = "draw circuit (DAG) for Ersatz.Bit"; + license = lib.licensesSpdx."GPL-3.0-only"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + ert = callPackage ( { mkDerivation, @@ -221457,8 +222702,8 @@ self: { }: mkDerivation { pname = "eventlog-live"; - version = "0.3.0.0"; - sha256 = "0m0wwjazqb03v9ppilp0kr75zd49kbjnbhdsl4v81gg8p2wn3xgn"; + version = "0.4.0.0"; + sha256 = "0p0247vlm3qphcvdvh6gbb83s9zpp484q3x9691ab497nkpyzj17"; libraryHaskellDepends = [ ansi-terminal base @@ -221495,8 +222740,8 @@ self: { }: mkDerivation { pname = "eventlog-live-influxdb"; - version = "0.2.0.0"; - sha256 = "03biydj51vfs0kh9c4i457ppk3qkr11lp5y7jbyfkg1nfd4cyf76"; + version = "0.2.0.1"; + sha256 = "1bgcrq7vxn7dl4qgn02nifp48maqzh7qz2bcxmm873zka0d3k6km"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -221514,9 +222759,7 @@ self: { ]; description = "Stream eventlog data into InfluxDB"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; mainProgram = "eventlog-live-influxdb"; - broken = true; } ) { }; @@ -221524,11 +222767,14 @@ self: { { mkDerivation, aeson, + ansi-terminal, base, bytestring, data-default, dlist, eventlog-live, + eventlog-socket, + file-embed, ghc-events, grapesy, hashable, @@ -221538,6 +222784,9 @@ self: { optparse-applicative, proto-lens, random, + strict-list, + table-layout, + template-haskell, text, unordered-containers, vector, @@ -221545,19 +222794,20 @@ self: { }: mkDerivation { pname = "eventlog-live-otelcol"; - version = "0.3.0.0"; - sha256 = "1jxh4n14sidygy6z64nsfv8jq1bgi60kf6lka4nfkscyvz0mgi31"; - revision = "1"; - editedCabalFile = "1kgfd7nszj9rpc2k0frwmpj52pkfyb6grnl7ig2p5hpzp2l6lwxl"; + version = "0.5.0.0"; + sha256 = "0qk41r0km6dd3wniihqlv6v30z5gfhak4rbl1ybw3rvgzrp48p5n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson + ansi-terminal base bytestring data-default dlist eventlog-live + eventlog-socket + file-embed ghc-events grapesy hashable @@ -221567,6 +222817,9 @@ self: { optparse-applicative proto-lens random + strict-list + table-layout + template-haskell text unordered-containers vector @@ -224068,9 +225321,8 @@ self: { description = "Existential types with lens-like accessors"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; } - ) { control-invariants = null; }; + ) { }; exists = callPackage ( { @@ -224127,8 +225379,8 @@ self: { }: mkDerivation { pname = "exitcode"; - version = "0.1.0.9"; - sha256 = "0g63q2y1ipgnylfjp28yly6lbps7gbnam7lpg1x8hnmlvfz89mj7"; + version = "0.1.0.10"; + sha256 = "0w5n3gfxv7950q6ds37a92jxg7nw8vgqxd0n801qi0ai9q16w3bd"; libraryHaskellDepends = [ base bifunctors @@ -226150,8 +227402,8 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.8"; - sha256 = "18c9ad7wjf6q4yp0sagxhwyjpm9frw9kk27ih2x0nmjhmrgcx91g"; + version = "1.8.1"; + sha256 = "165mk0030bhkzh3czzpps5df5il5q46marrdhbd7nsk433bxd9v6"; libraryHaskellDepends = [ base clock @@ -241554,8 +242806,8 @@ self: { }: mkDerivation { pname = "fortran-src"; - version = "0.16.7"; - sha256 = "12d46b232aks34nvb3jc66dhz0nxq3z8ngbs6rfn71paj2mfj5cv"; + version = "0.16.8"; + sha256 = "152c71a1al7gxk7kzs73nyi237z74nqgf0i8xk98zs5v9cm1h3hk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -243411,8 +244663,8 @@ self: { }: mkDerivation { pname = "freckle-ecs"; - version = "0.0.0.0"; - sha256 = "10sffzn45w0ifi703lrrz8dz96s04hwbbgdh0wp88hamkd4nvvla"; + version = "0.0.0.1"; + sha256 = "12xlnaljc54dzdrn314z510qh00wm9skc6pq3q5x12ky9ynvjmg7"; libraryHaskellDepends = [ aeson base @@ -243536,8 +244788,8 @@ self: { }: mkDerivation { pname = "freckle-http"; - version = "0.2.0.0"; - sha256 = "0an1bqpsslr8zlpmvvp5hjw5fwpwqjr6w0m4ib7sa1d0218xzdnz"; + version = "0.3.0.0"; + sha256 = "13b32m9da2vm0740bb134y4xj0gk0cz2njadwybnjddkc0il19n8"; libraryHaskellDepends = [ aeson annotated-exception @@ -244880,6 +246132,19 @@ self: { } ) { }; + freer-base-classes = callPackage ( + { mkDerivation, base }: + mkDerivation { + pname = "freer-base-classes"; + version = "0.1.0.0"; + sha256 = "1z602q30gbal3l2b5zq1zqkp0assb6x71vilm3gk64mhfa1gkd8r"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "class NonDetable.N and Failable.F"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + freer-converse = callPackage ( { mkDerivation, @@ -245835,6 +247100,19 @@ self: { } ) { }; + from = callPackage ( + { mkDerivation, base }: + mkDerivation { + pname = "from"; + version = "1.0.0.1"; + sha256 = "1fg171hg9fknp0qbb7y51s1rl51l3hsh3hddhx2xdh6sv89cvpc2"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Typeclasses for type conversion mappings"; + license = lib.licenses.asl20; + } + ) { }; + from-env = callPackage ( { mkDerivation, @@ -245865,6 +247143,35 @@ self: { } ) { }; + from-string = callPackage ( + { + mkDerivation, + base, + bytestring, + from, + text, + }: + mkDerivation { + pname = "from-string"; + version = "1.0.0.2"; + sha256 = "00pv0swf4bd4nclv48pdl1k17yzkcaq3b3mqncva4rxrj5i6ncsi"; + libraryHaskellDepends = [ + base + bytestring + from + text + ]; + testHaskellDepends = [ + base + bytestring + from + text + ]; + description = "Instances of 'From' for common string types"; + license = lib.licenses.asl20; + } + ) { }; + from-sum = callPackage ( { mkDerivation, @@ -246783,6 +248090,19 @@ self: { } ) { }; + ftcqueue = callPackage ( + { mkDerivation, base }: + mkDerivation { + pname = "ftcqueue"; + version = "0.1.0.1"; + sha256 = "1l6p8dsmf1lad714zwv3fvjxn7v9mnvkf660h09fv930rarhq556"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "FTC Queue"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + ftdi = callPackage ( { mkDerivation, @@ -248952,8 +250272,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.25.33"; - sha256 = "0fasqms7ap96b1iyrhmp35c5z4kas7iffbbk2s1scg3wsmghd3p4"; + version = "0.25.34"; + sha256 = "1xf3nwf7wkdsv36nz77apingynx5d3lcdk8dk0s6j5l15h6n0i26"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -256856,11 +258176,12 @@ self: { mono-traversable, ptrdiff, simple-affine-space, + webcolor-labels, }: mkDerivation { pname = "geomancy"; - version = "0.2.6.0"; - sha256 = "14imwg21ig2n1g4l6z55wbkrjg9mzswgqdirzbdvp2y0krk6259q"; + version = "0.3.0.0"; + sha256 = "1m05icvkf87jhx1pv8cfdi5fcfi2vfzan7rqk9znsjid5ybx429r"; libraryHaskellDepends = [ base containers @@ -256869,6 +258190,7 @@ self: { mono-traversable ptrdiff simple-affine-space + webcolor-labels ]; testHaskellDepends = [ base @@ -256884,9 +258206,11 @@ self: { linear simple-affine-space ]; - description = "Geometry and matrix manipulation"; + description = "Vectors and matrix manipulation"; license = lib.licenses.bsd3; platforms = lib.platforms.x86; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -256921,6 +258245,7 @@ self: { description = "Geometry and matrix manipulation"; license = lib.licenses.bsd3; platforms = lib.platforms.x86; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -257733,8 +259058,8 @@ self: { { mkDerivation, base }: mkDerivation { pname = "ghc-compat"; - version = "0.1.0.1"; - sha256 = "0vb55bx45cdcf4sfvpkc4wx8zgi7h6bzchp4s66ndmqr5p0br3ld"; + version = "0.5.0.0"; + sha256 = "0kjn374x52drq4v3l90h82nkilm81fy1bv08gicykg0nc619lmp4"; libraryHaskellDepends = [ base ]; description = "GHC compatibility for MicroHs"; license = lib.licensesSpdx."Apache-2.0"; @@ -260218,8 +261543,8 @@ self: { }: mkDerivation { pname = "ghc-parser"; - version = "0.2.7.0"; - sha256 = "08m1jb093pkmbj7km7xclq6f1jz20v313ih9b4fydis974i8pv3h"; + version = "0.2.8.0"; + sha256 = "1w346jy9vgfyclkg4rri871ixbpb6skks2x4x7hcg49jn9rnmxpx"; libraryHaskellDepends = [ base ghc @@ -260976,8 +262301,7 @@ self: { deepseq, directory, filepath, - ghc, - ghc-boot, + ghc-lib, ghc-paths, optparse-applicative, process, @@ -260990,10 +262314,8 @@ self: { }: mkDerivation { pname = "ghc-tags"; - version = "1.9"; - sha256 = "0s0gipypdz9d7ny8bz38msqlr88y5b3fcd3xzdcsm5mlbra4m904"; - revision = "1"; - editedCabalFile = "0id8whk4dabyrr7kcbgzn3770ypyqin24fqpc0yn5d5x5jm0ynhz"; + version = "1.10"; + sha256 = "1ckcrafm83fqr8k4wzmpfbk889in0296ym0500kfhqj7cm80w7w7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -261006,8 +262328,7 @@ self: { deepseq directory filepath - ghc - ghc-boot + ghc-lib ghc-paths optparse-applicative process @@ -265473,11 +266794,11 @@ self: { base, base-compat, containers, - gi-gdk, + gi-gdk3, gi-gdkpixbuf, gi-glib, gi-gobject, - gi-gtk, + gi-gtk3, haskell-gi-base, mtl, text, @@ -265485,17 +266806,17 @@ self: { }: mkDerivation { pname = "gi-gtk-hs"; - version = "0.3.17"; - sha256 = "022g7xlwli8rbasxgafpp2j6ybk5iyk1hlwlg7nph361k3c0l7p6"; + version = "0.3.18"; + sha256 = "08ksv6g8rhbz3vwf1gnb0y702drzbwp0hgsisyqdd5fgqv6pvvis"; libraryHaskellDepends = [ base base-compat containers - gi-gdk + gi-gdk3 gi-gdkpixbuf gi-glib gi-gobject - gi-gtk + gi-gtk3 haskell-gi-base mtl text @@ -266439,6 +267760,7 @@ self: { Cabal, containers, gi-gdkpixbuf, + gi-gio, gi-glib, gi-gobject, haskell-gi, @@ -266450,12 +267772,13 @@ self: { }: mkDerivation { pname = "gi-notify"; - version = "0.7.28"; - sha256 = "1sph16xhvyyfp81b2njz99crzwqas8njn6h0ma7hbi068jmnj7nq"; + version = "0.7.29"; + sha256 = "0vklaj28qc3hn9mwpzij0wqy7w2mmhcjwrgirz5jzqhqxh8pv1l8"; setupHaskellDepends = [ base Cabal gi-gdkpixbuf + gi-gio gi-glib gi-gobject haskell-gi @@ -266465,6 +267788,7 @@ self: { bytestring containers gi-gdkpixbuf + gi-gio gi-glib gi-gobject haskell-gi @@ -266476,8 +267800,6 @@ self: { libraryPkgconfigDepends = [ libnotify ]; description = "Libnotify bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { inherit (pkgs) libnotify; }; @@ -268224,31 +269546,31 @@ self: { mkDerivation, base, cmdargs, + directory, + filepath, hslogger, parallel-io, regex-posix, shelly, - system-fileio, - system-filepath, text, transformers, unix, }: mkDerivation { pname = "git-all"; - version = "1.6.0"; - sha256 = "10fq88fld1lb5wrikcsg9gxcfbldr0fpix81sba8qy11g7igd7fl"; + version = "1.8.1"; + sha256 = "1c7jiyj9pz65dq6bck312fs28q4mcn5q6dp98xpp741ami8nz82k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base cmdargs + directory + filepath hslogger parallel-io regex-posix shelly - system-fileio - system-filepath text transformers unix @@ -268371,8 +269693,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20250929"; - sha256 = "1ff30f8ifp2a73d64q25mpzirnrm5q0amri9xcz7814wwynv24hj"; + version = "10.20251114"; + sha256 = "0rl72ygqgzq97ri86k9asinv14s56g06q2w1nlnb4sx3a91sw7as"; configureFlags = [ "-fassistant" "-f-benchmark" @@ -273000,8 +274322,8 @@ self: { }: mkDerivation { pname = "glob-imports"; - version = "0.0.2.1"; - sha256 = "1dwns8krs4gq97mg7xkaq41k6lrn9mc2m0ai496qamlgyp2sinln"; + version = "0.0.3.0"; + sha256 = "0xc0l0llfkhgvxg9c5y0w6g36r48jyq8cmij3sqxdwyc6lx7p9b7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -278626,6 +279948,36 @@ self: { } ) { }; + google-oauth2-jwt_0_3_3_2 = callPackage ( + { + mkDerivation, + base, + base64-bytestring, + bytestring, + HsOpenSSL, + RSA, + text, + unix-time, + }: + mkDerivation { + pname = "google-oauth2-jwt"; + version = "0.3.3.2"; + sha256 = "1j98waikh1lka2x2jwy09gnvk20zqjpjb4b4kjn6r454bm6xv0ih"; + libraryHaskellDepends = [ + base + base64-bytestring + bytestring + HsOpenSSL + RSA + text + unix-time + ]; + description = "Get a signed JWT for Google Service Accounts"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + google-search = callPackage ( { mkDerivation, @@ -279553,9 +280905,8 @@ self: { mkDerivation, aeson, base, - binary, bytestring, - connection, + crypton-connection, exceptions, hashable, http-client, @@ -279566,20 +280917,20 @@ self: { lens-aeson, scientific, text, + tls, unix, unordered-containers, vector, }: mkDerivation { pname = "gothic"; - version = "0.1.8.3"; - sha256 = "0lf0yhq4q2vcw9b69l7ixdscmz5drxiag9l31iz1ypb8cyjspi1q"; + version = "0.1.8.4"; + sha256 = "052ixajcs3nvsdwdhrhd4l7y9vxrhhdmcxdpwb4irl524mskimzm"; libraryHaskellDepends = [ aeson base - binary bytestring - connection + crypton-connection exceptions hashable http-client @@ -279590,6 +280941,7 @@ self: { lens-aeson scientific text + tls unix unordered-containers vector @@ -280080,7 +281432,6 @@ self: { ]; description = "Vulkan library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -280208,7 +281559,6 @@ self: { ]; description = "VK_KHR_surface extension of the Vulkan API"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -280253,7 +281603,6 @@ self: { ]; description = "GLFW surface for Vulkan"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -280301,7 +281650,6 @@ self: { ]; description = "VK_KHR_swapchain extension of the Vulkan API"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -280333,8 +281681,8 @@ self: { }: mkDerivation { pname = "gpu-vulkan-middle"; - version = "0.1.0.77"; - sha256 = "1ar3sw72hi2wd8aqrd2421szc7rrk5vdq5byhmgkyzrva9iyqwn3"; + version = "0.1.0.78"; + sha256 = "17q8vwmnilxq04l2xx0i59m6dn0jgh4hscv0047n1fyzv4c64798"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base @@ -280386,8 +281734,6 @@ self: { ]; description = "Medium wrapper for Vulkan API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -280429,7 +281775,6 @@ self: { ]; description = "medium wrapper for VK_KHR_surface extension of the Vulkan API"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -280462,7 +281807,6 @@ self: { ]; description = "medium wrapper for GLFW surface for the Vulkan API"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -280510,7 +281854,6 @@ self: { ]; description = "medium wrapper for VK_KHR_swapchain extension of the Vulkan API"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -280970,8 +282313,8 @@ self: { }: mkDerivation { pname = "granite"; - version = "0.3.0.4"; - sha256 = "1h7pxas9zy5brss33402qf23w4wcjkh7gxmjw0l138hf3177sf09"; + version = "0.3.0.5"; + sha256 = "0d2k9lnrqpsjhsqn82pm7pwm7qwnrccga60vkxw75sjgqv9862f3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -287690,6 +289033,8 @@ self: { pname = "h-raylib"; version = "5.5.3.1"; sha256 = "1977pd0aqb9jiply9fyz1f5rw0vh6wpv8v2dyvk0awk8v5lbsaa0"; + revision = "1"; + editedCabalFile = "0zq58lnvkpg1mcx7f1jr12gzaj2qwmsva548k4l1nall7pv93h4m"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -298877,8 +300222,8 @@ self: { }: mkDerivation { pname = "hasbolt"; - version = "0.1.7.1"; - sha256 = "1pd7axnr48bc5lqw3zax0cs3722m39pgmgjrkhq8fd30alw3xm2s"; + version = "0.1.7.2"; + sha256 = "0rwffb74kafd4284h649p1q7n38hajvbdq6p0l1z93dl7jindiqg"; libraryHaskellDepends = [ base binary @@ -302479,10 +303824,14 @@ self: { dap, directory, exceptions, + file-embed, filepath, ghc, + ghc-boot, + ghc-boot-th, ghci, haskeline, + haskell-debugger-view, hie-bios, implicit-hie, mtl, @@ -302505,8 +303854,8 @@ self: { }: mkDerivation { pname = "haskell-debugger"; - version = "0.9.0.0"; - sha256 = "1fla0w681lv9v64aglyyg4i4s83fzcs836cm3xj4a4jviv9m3psg"; + version = "0.10.1.0"; + sha256 = "0jqnbrv9a7k1lpmvkdzmc88wz576m9f6cag5in4s65y6akna6mh5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -302521,9 +303870,13 @@ self: { cryptohash-sha1 directory exceptions + file-embed filepath ghc + ghc-boot + ghc-boot-th ghci + haskell-debugger-view hie-bios mtl prettyprinter @@ -302579,13 +303932,38 @@ self: { text unordered-containers ]; - description = "A step-through machine-interface debugger for GHC Haskell"; + description = "A step-through debugger for GHC Haskell"; license = lib.licensesSpdx."BSD-3-Clause"; hydraPlatforms = lib.platforms.none; mainProgram = "hdb"; } ) { }; + haskell-debugger-view = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + text, + }: + mkDerivation { + pname = "haskell-debugger-view"; + version = "0.1.0.0"; + sha256 = "0kfpkpbw3m2z7qr0fibsacqcfiiczawhml6hvr25i7czrg4vnk4a"; + libraryHaskellDepends = [ + base + bytestring + containers + text + ]; + description = "Custom debug visualization instances for @haskell-debugger@"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + haskell-disque = callPackage ( { mkDerivation, @@ -314476,10 +315854,8 @@ self: { }: mkDerivation { pname = "haxr"; - version = "3000.11.5.1"; - sha256 = "1r5ipm1qzlkxk1xc9hv86kli5aa4nw7i9a6n42ixkcspwb8fjhzd"; - revision = "1"; - editedCabalFile = "0m9x1cs789qs7k3zc197zri1nbh6g1y05xraq5a1k10s0xs5sjdy"; + version = "3000.11.6"; + sha256 = "0i5nvksznsixnqjrp1bgz68xhjqbzc84zqzjjvs6g1v18fbbk2fy"; libraryHaskellDepends = [ array base @@ -318563,13 +319939,10 @@ self: { directory, exceptions, filepath, - generic-lens, hedgehog, http-conduit, - hw-prelude, lifted-async, lifted-base, - microlens, mmorph, monad-control, mtl, @@ -318592,8 +319965,8 @@ self: { }: mkDerivation { pname = "hedgehog-extras"; - version = "0.10.0.0"; - sha256 = "10mmvxvr64s7j6zil4ygk1l74iask96r7k2cgv59l1zkfgji44hx"; + version = "0.10.1.0"; + sha256 = "04m51s11485war8ngyhywjnrb60fsn8fikrxz3bqzlib6k4mb7yz"; libraryHaskellDepends = [ aeson aeson-pretty @@ -318606,13 +319979,10 @@ self: { directory exceptions filepath - generic-lens hedgehog http-conduit - hw-prelude lifted-async lifted-base - microlens mmorph monad-control mtl @@ -318650,6 +320020,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Supplemental library for hedgehog"; license = lib.licensesSpdx."Apache-2.0"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -327326,6 +328698,55 @@ self: { } ) { }; + higher-order-freer-monad = callPackage ( + { + mkDerivation, + base, + freer-base-classes, + ftcqueue, + }: + mkDerivation { + pname = "higher-order-freer-monad"; + version = "0.1.0.0"; + sha256 = "1ccy1as170bc87a88m4aqldrfjz1yrd19bsybbj0kkabha2ka7dy"; + libraryHaskellDepends = [ + base + freer-base-classes + ftcqueue + ]; + testHaskellDepends = [ + base + freer-base-classes + ftcqueue + ]; + description = "This package is used by package yaftee"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + + higher-order-open-union = callPackage ( + { + mkDerivation, + base, + freer-base-classes, + }: + mkDerivation { + pname = "higher-order-open-union"; + version = "0.1.0.1"; + sha256 = "1bdd8fli1kxr58q02na15vyk18n3cya10ns4p964pdsw23374d0k"; + libraryHaskellDepends = [ + base + freer-base-classes + ]; + testHaskellDepends = [ + base + freer-base-classes + ]; + description = "This package is used by package yaftee"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + higherorder = callPackage ( { mkDerivation, base }: mkDerivation { @@ -331070,8 +332491,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.50.2"; - sha256 = "04rc39c2vvs0pxsabk5fm5d7ldrgn1ahkbqqw296zra94mcc600w"; + version = "1.50.3"; + sha256 = "0qiii5gdsw0x1dkxsws481mx49fg2013l6y0vsza281ziryzwcm2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -331625,8 +333046,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.50.2"; - sha256 = "1x070rs92n1y0l07x4lvg77x5k5sclafm1iissfd17dbg5d84383"; + version = "1.50.3"; + sha256 = "1z0k0mp64vnlz3k66csz7i3vpns3lhy2mg8k6p2lznivr4hfzph1"; libraryHaskellDepends = [ aeson aeson-pretty @@ -331892,10 +333313,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.50.2"; - sha256 = "1g9ygyj99mzr8x3xh4zyrqpivv4c35cadybgg0ihjxpvmz7vlz4n"; - revision = "1"; - editedCabalFile = "0n32y9p0z5vvsgpv601vqqir8qm0fkhppvn7aqmhy2450xgzcdrh"; + version = "1.50.3"; + sha256 = "1wm2v7z57z16wb0a068bwrdwhaaq8rf8mzhl347z60nb3y0ihnk5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -332030,8 +333449,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.50.2"; - sha256 = "1hmqcnpc2wdkp2aysdy1872vcmji00b1s2rpv08fk8pcqsa3892v"; + version = "1.50.3"; + sha256 = "0p5hd9rg99ilv9gnd3k1xcnp6m4ndfin1v4ah898b741ib5chj4s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -332103,8 +333522,8 @@ self: { }: mkDerivation { pname = "hlex"; - version = "1.0.0"; - sha256 = "1qanm8n368ps64hfr19j43hrkbwlgmfdyf4xldx25lzrgn56qaxk"; + version = "1.0.1"; + sha256 = "06phc2b8y9xwa0kmmxcmjvnhd60wmwhd4izj7020zda65rbk9fal"; libraryHaskellDepends = [ base regex-tdfa @@ -335607,8 +337026,8 @@ self: { }: mkDerivation { pname = "hmp3-ng"; - version = "2.17.0"; - sha256 = "131mwn1vcyd2q73cj00vx8silhnacb9nbiba20c6i95kgsblnm0s"; + version = "2.17.1"; + sha256 = "03dgsy25rsy3yxisr71nrc7gbwh3k6ms3sbsbf4gh4i66pjv8gz3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -337069,6 +338488,69 @@ self: { } ) { }; + hoauth2_2_15_0 = callPackage ( + { + mkDerivation, + aeson, + base, + base64, + binary, + binary-instances, + bytestring, + containers, + crypton, + data-default, + exceptions, + hspec, + hspec-discover, + http-conduit, + http-types, + memory, + microlens, + text, + transformers, + uri-bytestring, + uri-bytestring-aeson, + }: + mkDerivation { + pname = "hoauth2"; + version = "2.15.0"; + sha256 = "1l8jp07vp1sx02bkg6799pb4gqbbp0rych8kqccinjawv6w3zbag"; + libraryHaskellDepends = [ + aeson + base + base64 + binary + binary-instances + bytestring + containers + crypton + data-default + exceptions + http-conduit + http-types + memory + microlens + text + transformers + uri-bytestring + uri-bytestring-aeson + ]; + testHaskellDepends = [ + aeson + base + binary + hspec + http-conduit + uri-bytestring + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell OAuth2 authentication client"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + hoauth2-demo = callPackage ( { mkDerivation, @@ -337154,8 +338636,8 @@ self: { }: mkDerivation { pname = "hoauth2-providers"; - version = "0.8.0"; - sha256 = "11y4lbp81spa7wky834l7i0fkqq3b529zn7divz5x9ar0jnnpnaj"; + version = "0.9.0"; + sha256 = "0rkmns6kqf0gvzc607vzr9gcws5v0axngbyb4zxkbhf09491d1hs"; libraryHaskellDepends = [ aeson base @@ -337205,8 +338687,8 @@ self: { }: mkDerivation { pname = "hoauth2-providers-tutorial"; - version = "0.8.0"; - sha256 = "1b9sjwirkjwl3w54y9pq4i07xp3spsm7zxknf9xilw4jgg9mmncz"; + version = "0.9.0"; + sha256 = "06vvg3ri0bxhjj4v2b91z6320jlhckd3b976zpc06mc94mwn66bx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -337248,8 +338730,8 @@ self: { }: mkDerivation { pname = "hoauth2-tutorial"; - version = "0.8.0"; - sha256 = "0w7fa1gyslng19sxk3xnvy1bvy0r2gannypvlv9hi86hinwx525j"; + version = "0.9.0"; + sha256 = "1kh3qc9pmpf13w6qxxrfw8ycz9xk5nzk9jy770l2jskmg0j3gym4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -341847,8 +343329,140 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.38.2"; - sha256 = "1g47rf3pglfkjyk3qfz6wvjp0zh16s4qhayqyyzxg91aqq3fqqd6"; + version = "0.38.3"; + sha256 = "0zzx5zwak1qrlnrc0lj1n5qccvdl8zxvdppxd8f3y562nrl81s1r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + base + bifunctors + bytestring + Cabal + containers + crypton + deepseq + directory + filepath + Glob + http-client + http-client-tls + http-types + infer-license + mtl + pretty + scientific + text + transformers + unordered-containers + vector + yaml + ]; + executableHaskellDepends = [ + aeson + base + bifunctors + bytestring + Cabal + containers + crypton + deepseq + directory + filepath + Glob + http-client + http-client-tls + http-types + infer-license + mtl + pretty + scientific + text + transformers + unordered-containers + vector + yaml + ]; + testHaskellDepends = [ + aeson + base + bifunctors + bytestring + Cabal + containers + crypton + deepseq + directory + filepath + Glob + hspec + http-client + http-client-tls + http-types + HUnit + infer-license + interpolate + mockery + mtl + pretty + QuickCheck + scientific + template-haskell + temporary + text + transformers + unordered-containers + vcr + vector + yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A modern format for Haskell packages"; + license = lib.licenses.mit; + mainProgram = "hpack"; + } + ) { }; + + hpack_0_39_0 = callPackage ( + { + mkDerivation, + aeson, + base, + bifunctors, + bytestring, + Cabal, + containers, + crypton, + deepseq, + directory, + filepath, + Glob, + hspec, + hspec-discover, + http-client, + http-client-tls, + http-types, + HUnit, + infer-license, + interpolate, + mockery, + mtl, + pretty, + QuickCheck, + scientific, + template-haskell, + temporary, + text, + transformers, + unordered-containers, + vcr, + vector, + yaml, + }: + mkDerivation { + pname = "hpack"; + version = "0.39.0"; + sha256 = "0cjjjw5zr0j64350i7kc6g5k6f2nkffwi206vbgwmblmxjqmq02p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -341937,6 +343551,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "A modern format for Haskell packages"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "hpack"; } ) { }; @@ -346085,8 +347700,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-instrumentation-auto"; - version = "0.1.0.2"; - sha256 = "1w4xq79phbbhjjp9q5pj7wlsdp0nrlfdhqpc9yh0vlaqag93cc6d"; + version = "0.1.0.3"; + sha256 = "082crbi4hhnlyb5qm49v5955ws95skiq0ih7p17425nfsp68kndd"; libraryHaskellDepends = [ base bytestring @@ -353307,6 +354922,31 @@ self: { } ) { }; + hsmrc = callPackage ( + { + mkDerivation, + base, + bytestring, + text, + }: + mkDerivation { + pname = "hsmrc"; + version = "0.1.1"; + sha256 = "11xydr0l8gr049gwaqc6dzk0ql9rwql3l34r35my69gz3aq39bfv"; + revision = "1"; + editedCabalFile = "18p39bw5lwmx634y2icmm1sv35r4332qgsjz3bh673w8nyvid174"; + libraryHaskellDepends = [ + base + bytestring + text + ]; + description = "Library for Marc21 bibliographic records"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + hsmtpclient = callPackage ( { mkDerivation, @@ -356733,6 +358373,8 @@ self: { ]; description = "SSH protocol implementation"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -360511,8 +362153,8 @@ self: { }: mkDerivation { pname = "http-directory"; - version = "0.1.11"; - sha256 = "1ny5qcwx56f5zb1s8cmwj2gc5xk6rck9cxirjrcp58ry6d6dmvl6"; + version = "0.1.12"; + sha256 = "1m571hwllb1xa5qwb9amjhjvxm64shyabxaqbs8jlgi9aj5wl4sg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -361804,6 +363446,40 @@ self: { } ) { }; + http-semantics_0_4_0 = callPackage ( + { + mkDerivation, + array, + base, + bytestring, + case-insensitive, + http-types, + network, + network-byte-order, + time-manager, + utf8-string, + }: + mkDerivation { + pname = "http-semantics"; + version = "0.4.0"; + sha256 = "0wxw10432rgsmgns8vk4wv7km85ak0rbsc9b6yyw26awp1g0ch4x"; + libraryHaskellDepends = [ + array + base + bytestring + case-insensitive + http-types + network + network-byte-order + time-manager + utf8-string + ]; + description = "HTTP semantics library"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + http-server = callPackage ( { mkDerivation, @@ -362179,6 +363855,107 @@ self: { pname = "http2"; version = "5.3.10"; sha256 = "0rs21pgnmd0qcg1j360pm8r9c4hm18bcivhnq3krqjl32zb1frpl"; + revision = "1"; + editedCabalFile = "0vknnc3qfhlya9fk1alamdlpjxmh471aknh37mjbknq9rg9n93kw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array + async + base + bytestring + case-insensitive + containers + http-semantics + http-types + iproute + network + network-byte-order + network-control + stm + time-manager + unix-time + utf8-string + ]; + testHaskellDepends = [ + aeson + aeson-pretty + async + base + base16-bytestring + bytestring + crypton + directory + filepath + Glob + hspec + http-semantics + http-types + network + network-byte-order + network-run + random + text + typed-process + unordered-containers + vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + array + base + bytestring + case-insensitive + containers + criterion + network-byte-order + stm + ]; + description = "HTTP/2 library"; + license = lib.licenses.bsd3; + } + ) { }; + + http2_5_4_0 = callPackage ( + { + mkDerivation, + aeson, + aeson-pretty, + array, + async, + base, + base16-bytestring, + bytestring, + case-insensitive, + containers, + criterion, + crypton, + directory, + filepath, + Glob, + hspec, + hspec-discover, + http-semantics, + http-types, + iproute, + network, + network-byte-order, + network-control, + network-run, + random, + stm, + text, + time-manager, + typed-process, + unix-time, + unordered-containers, + utf8-string, + vector, + }: + mkDerivation { + pname = "http2"; + version = "5.4.0"; + sha256 = "09qj8afc0dfd769hs8lch14m5njacxfl2yncxlhxwbgxxs7zfgdq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -362235,6 +364012,7 @@ self: { ]; description = "HTTP/2 library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -362476,8 +364254,8 @@ self: { }: mkDerivation { pname = "http2-tls"; - version = "0.4.9"; - sha256 = "180l7fqddgrxjvqikrg1q2s5p3s2h4a4fsf23l3bn9fvirnswf4d"; + version = "0.5.1"; + sha256 = "08lcmnyrdpfj2lqnc7zm82qa8gr9s90qqg0vfghx9xzsa1g6c2l2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -362534,8 +364312,8 @@ self: { }: mkDerivation { pname = "http3"; - version = "0.1.1"; - sha256 = "0bzi8w3nz6yw5ab30674p062nvps55q9f0vpxdgqgnb22jim8jyj"; + version = "0.1.2"; + sha256 = "09s7n19aw4my7rrpjkrh4ql53282gjgfjkd2k1fn85xgz3y7jcbc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -371671,6 +373449,33 @@ self: { } ) { }; + id = callPackage ( + { + mkDerivation, + base, + lens, + mtl, + semigroupoids, + tagged, + transformers, + }: + mkDerivation { + pname = "id"; + version = "0.0.0.1"; + sha256 = "1kdz1mrk5j0vjr9mw9spafl3ir11q4n2ai5q108067i86jmx2qp7"; + libraryHaskellDepends = [ + base + lens + mtl + semigroupoids + tagged + transformers + ]; + description = "Id (f a) data type"; + license = lib.licenses.bsd3; + } + ) { }; + ide-backend = callPackage ( { mkDerivation, @@ -372362,6 +374167,57 @@ self: { } ) { }; + idn = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + criterion, + deepseq, + file-embed, + hspec, + hspec-discover, + primitive, + QuickCheck, + text, + vector, + vector-algorithms, + }: + mkDerivation { + pname = "idn"; + version = "0.1.2.0"; + sha256 = "0kpykvjmi71ixgqkndcxpxwwyb0fsdgcswzkgw9gwcz1yyk8c4zv"; + libraryHaskellDepends = [ + base + bytestring + containers + deepseq + file-embed + primitive + text + vector + vector-algorithms + ]; + testHaskellDepends = [ + base + hspec + QuickCheck + text + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base + criterion + deepseq + QuickCheck + text + ]; + description = "Pure Haskell IDN and Punycode implementation"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + idna = callPackage ( { mkDerivation, @@ -372707,7 +374563,7 @@ self: { } ) { }; - "if" = callPackage ( + _if = callPackage ( { mkDerivation, base }: mkDerivation { pname = "if"; @@ -373218,6 +375074,129 @@ self: { } ) { }; + ihaskell_0_13_0_0 = callPackage ( + { + mkDerivation, + aeson, + base, + base64-bytestring, + binary, + bytestring, + cmdargs, + containers, + directory, + exceptions, + filepath, + ghc, + ghc-boot, + ghc-parser, + ghc-paths, + ghc-syntax-highlighter, + haskeline, + hlint, + hspec, + hspec-contrib, + http-client, + http-client-tls, + HUnit, + ipython-kernel, + parsec, + process, + random, + raw-strings-qq, + setenv, + shelly, + split, + stm, + strict, + text, + time, + transformers, + unix, + unordered-containers, + utf8-string, + vector, + }: + mkDerivation { + pname = "ihaskell"; + version = "0.13.0.0"; + sha256 = "1fgwb54gi9kngw8n7214670vj4hpkf7s0z5zybnp33sz2y0jnnr6"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson + base + base64-bytestring + binary + bytestring + cmdargs + containers + directory + exceptions + filepath + ghc + ghc-boot + ghc-parser + ghc-paths + ghc-syntax-highlighter + haskeline + hlint + http-client + http-client-tls + ipython-kernel + parsec + process + random + shelly + split + stm + strict + text + time + transformers + unix + unordered-containers + utf8-string + vector + ]; + executableHaskellDepends = [ + aeson + base + bytestring + containers + directory + ghc + ipython-kernel + process + strict + text + transformers + unix + unordered-containers + ]; + testHaskellDepends = [ + aeson + base + directory + ghc + ghc-paths + hspec + hspec-contrib + HUnit + raw-strings-qq + setenv + shelly + text + transformers + ]; + description = "A Haskell backend kernel for the Jupyter project"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "ihaskell"; + } + ) { }; + ihaskell-aeson = callPackage ( { mkDerivation, @@ -373320,6 +375299,56 @@ self: { } ) { }; + ihaskell-dataframe = callPackage ( + { + mkDerivation, + base, + dataframe, + dataframe-hasktorch, + hasktorch, + ihaskell, + random, + random-shuffle, + text, + }: + mkDerivation { + pname = "ihaskell-dataframe"; + version = "0.1.0.0"; + sha256 = "1waqr8dc6dcz6r4qm62c8y2c52wr145zk3qd6l4a5rdgii20ybg6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + dataframe + dataframe-hasktorch + hasktorch + ihaskell + random + random-shuffle + text + ]; + executableHaskellDepends = [ + base + dataframe + dataframe-hasktorch + hasktorch + ihaskell + random + random-shuffle + text + ]; + testHaskellDepends = [ + base + dataframe + ihaskell + text + ]; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + mainProgram = "ihaskell-dataframe-exe"; + } + ) { }; + ihaskell-diagrams = callPackage ( { mkDerivation, @@ -377734,6 +379763,104 @@ self: { } ) { }; + inf-backprop_0_2_0_2 = callPackage ( + { + mkDerivation, + base, + combinatorial, + comonad, + composition, + data-fix, + deepseq, + doctest, + extra, + finite-typelits, + fixed-vector, + ghc-prim, + hashable, + indexed-list-literals, + isomorphism-class, + lens, + numhask, + optics, + primitive, + profunctors, + safe, + simple-expr, + Stream, + text, + transformers, + unordered-containers, + vector, + vector-sized, + }: + mkDerivation { + pname = "inf-backprop"; + version = "0.2.0.2"; + sha256 = "0nssr4j4gd3lf6asxvmf2qq9j8z6q5318kn0ky5r3kqmgdp54wfc"; + libraryHaskellDepends = [ + base + combinatorial + comonad + composition + data-fix + deepseq + extra + finite-typelits + fixed-vector + ghc-prim + hashable + indexed-list-literals + isomorphism-class + lens + numhask + optics + primitive + profunctors + safe + simple-expr + Stream + text + transformers + unordered-containers + vector + vector-sized + ]; + testHaskellDepends = [ + base + combinatorial + comonad + composition + data-fix + deepseq + doctest + extra + finite-typelits + fixed-vector + ghc-prim + hashable + indexed-list-literals + isomorphism-class + lens + numhask + optics + primitive + profunctors + safe + simple-expr + Stream + text + transformers + unordered-containers + vector + vector-sized + ]; + description = "Automatic differentiation and backpropagation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + inf-interval = callPackage ( { mkDerivation, @@ -380606,6 +382733,8 @@ self: { pname = "integration"; version = "0.2.1"; sha256 = "0bsqad6q4kc0wykswwqykcn6nd4wj6yd9dzpg075h2n1mmg3h9qc"; + revision = "1"; + editedCabalFile = "1lqmj7szzvmv1binfvg6fkvswwykxak3kqxrd0hw4fizk4i3knch"; libraryHaskellDepends = [ base parallel @@ -384203,6 +386332,59 @@ self: { } ) { }; + ipython-kernel_0_12_1_0 = callPackage ( + { + mkDerivation, + aeson, + base, + base16-bytestring, + binary, + bytestring, + containers, + cryptohash-sha256, + directory, + filepath, + parsec, + process, + temporary, + text, + transformers, + unordered-containers, + uuid, + zeromq4-haskell, + }: + mkDerivation { + pname = "ipython-kernel"; + version = "0.12.1.0"; + sha256 = "1rwi15dpji1alrslrdljgs384d3nw0mlq6yl27ffc0kd01kdz126"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson + base + base16-bytestring + binary + bytestring + containers + cryptohash-sha256 + directory + filepath + parsec + process + temporary + text + transformers + unordered-containers + uuid + zeromq4-haskell + ]; + description = "A library for creating kernels for IPython frontends"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + irc = callPackage ( { mkDerivation, @@ -387448,7 +389630,6 @@ self: { criterion, deepseq, directory, - dlist, filepath, happy, lazy-csv, @@ -387469,8 +389650,8 @@ self: { }: mkDerivation { pname = "jacinda"; - version = "3.3.0.4"; - sha256 = "1ma3aa4sx4ybqgkclfjh8yz0ql0av6qflddyfsp90jaky3ryw54h"; + version = "3.3.0.5"; + sha256 = "0msadmd9d7syjzr2lnxfa2gsplwdc17kgdxrh61h6i0k9crlgbdp"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -387481,7 +389662,6 @@ self: { containers deepseq directory - dlist filepath lazy-csv microlens @@ -388239,8 +390419,8 @@ self: { }: mkDerivation { pname = "java-adt"; - version = "1.0.20231204"; - sha256 = "055yrn1pvv35sl79djm4c7yb4354dmwisj5whcpynn20caq9nsy5"; + version = "1.0.20251105"; + sha256 = "1bkyjh2598i8c019gris124gswizybk5lynqmc1mbjb8lyqap3wa"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -398994,8 +401174,8 @@ self: { }: mkDerivation { pname = "keid-core"; - version = "0.1.10.0"; - sha256 = "1rq6fry1lwaqki4jr28nhvh27xfg3b3528dda4iahgvd8hq5zvpf"; + version = "0.1.11.0"; + sha256 = "1qwhmkanmqp0xrkn4mx8cgs1znyapjqhfysvpm5z6cccsysd7mwj"; libraryHaskellDepends = [ base binary @@ -399088,8 +401268,8 @@ self: { }: mkDerivation { pname = "keid-geometry"; - version = "0.1.1.3"; - sha256 = "1alzwzp70g6mlsisa0w5fw42wiq49j64nny75np458jkl1axif2x"; + version = "0.1.2.0"; + sha256 = "14zs82lajn228i8m6csklv7plkp50qyyd6cqgm3i14517mc88s9h"; libraryHaskellDepends = [ base geomancy @@ -399132,8 +401312,8 @@ self: { }: mkDerivation { pname = "keid-render-basic"; - version = "0.1.9.0"; - sha256 = "1iz6ciyi5qn4garrpr3xvl2bwvcvrjl8diyzw3cnd49p6zgs0kh3"; + version = "0.1.10.0"; + sha256 = "1kicl1c06yryq5wani4nnk7vl7q9idwhs15v2lx0xaw2yszz6v4x"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson @@ -399180,8 +401360,8 @@ self: { }: mkDerivation { pname = "keid-resource-gltf"; - version = "0.1.0.2"; - sha256 = "1z11nsjzzgrlbkmv6r2j7x6fwn22hw7x029yxjam20nnf4lqmzg6"; + version = "0.1.1.0"; + sha256 = "06f8scgk61jybqqiqpg8x1hbb2adlbxryr4lapypgdrqn9518nhb"; libraryHaskellDepends = [ base bytestring @@ -399253,6 +401433,8 @@ self: { pname = "keid-ui-dearimgui"; version = "0.1.3.2"; sha256 = "0wahzr2sjnggafymfyqr1h16rlhs8f01rbz8fg00arqxbgqsvlph"; + revision = "1"; + editedCabalFile = "1gq6rrj7i0jfpm9jv32d8934apym8awr7bjc79ah2cf8pw00n4r9"; libraryHaskellDepends = [ base binary @@ -399678,7 +401860,7 @@ self: { } ) { }; - keter_2_2_1 = callPackage ( + keter_2_3_0 = callPackage ( { mkDerivation, aeson, @@ -399686,6 +401868,7 @@ self: { async, attoparsec, base, + binary, blaze-builder, bytestring, case-insensitive, @@ -399702,6 +401885,7 @@ self: { http-types, HUnit, indexed-traversable, + keter-rate-limiting-plugin, lens, lifted-base, monad-logger, @@ -399737,8 +401921,8 @@ self: { }: mkDerivation { pname = "keter"; - version = "2.2.1"; - sha256 = "05mh9a5lvjyjzpfcgrbysn6yzzr20aplcrqk7ifknggy5lh4204l"; + version = "2.3.0"; + sha256 = "1aih6gp74xh1zw6yq8qr8k24w41j7jzzfnv2j67r099ihg60yi28"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -399747,6 +401931,7 @@ self: { async attoparsec base + binary blaze-builder bytestring case-insensitive @@ -399762,6 +401947,7 @@ self: { http-reverse-proxy http-types indexed-traversable + keter-rate-limiting-plugin lifted-base monad-logger mtl @@ -399796,6 +401982,7 @@ self: { filepath ]; testHaskellDepends = [ + aeson base bytestring conduit @@ -399803,14 +401990,17 @@ self: { http-conduit http-types HUnit + keter-rate-limiting-plugin lens monad-logger mtl stm tasty tasty-hunit + tls transformers unix + unordered-containers wai warp wreq @@ -402822,8 +405012,8 @@ self: { pname = "ktx-codec"; version = "0.0.2.1"; sha256 = "0cigkpvgx12py0i942sci359xsj87pa0bhgmmamhigynimbfspzr"; - revision = "1"; - editedCabalFile = "1rmwxa5ssn5y9k0d0cj1hxn6qdhpd2qab2dsbdzbhyrc68hf12a4"; + revision = "4"; + editedCabalFile = "0pqsxvgrjs48aqkbm8vq13ad5ab4kjpiw416p2sj134imxlylr62"; libraryHaskellDepends = [ base binary @@ -403526,8 +405716,8 @@ self: { }: mkDerivation { pname = "kvitable"; - version = "1.1.0.1"; - sha256 = "1zb2s4fkcsa097x1ch02j6z5k1ya733f74rrs85hcrr8vm1hdgc0"; + version = "1.1.1.0"; + sha256 = "03mk2hkv5c2rc5xpc23g66akahz719d9ialq2zfg81az32d84x79"; libraryHaskellDepends = [ base containers @@ -403548,7 +405738,6 @@ self: { ]; description = "Key/Value Indexed Table container and formatting library"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -406194,6 +408383,7 @@ self: { aeson, async, base, + base64-bytestring, bytestring, conduit, containers, @@ -406202,6 +408392,7 @@ self: { http-conduit, http-types, ollama-haskell, + openai, parsec, pdf-toolbox-document, tagsoup, @@ -406209,18 +408400,19 @@ self: { tasty-hunit, temporary, text, + time, + transformers, vector, }: mkDerivation { pname = "langchain-hs"; - version = "0.0.2.0"; - sha256 = "0gh3gmmppfms1jg5zaxksalh90675r4pl6lmz63szkpwl9rmc9kz"; - revision = "2"; - editedCabalFile = "0qk56yswclxrf903c34ifadd8ja2l3zxfc0b2vzlgf1x7zf4cikl"; + version = "0.0.3.0"; + sha256 = "1jj4pwrvs4q9qz8d4mi3ygkrvrxdx9hxddiyp81sn9zsqpvk4azy"; libraryHaskellDepends = [ aeson async base + base64-bytestring bytestring conduit containers @@ -406229,16 +408421,20 @@ self: { http-conduit http-types ollama-haskell + openai parsec pdf-toolbox-document tagsoup text + time + transformers vector ]; testHaskellDepends = [ aeson async base + base64-bytestring bytestring conduit containers @@ -406247,6 +408443,7 @@ self: { http-conduit http-types ollama-haskell + openai parsec pdf-toolbox-document tagsoup @@ -406254,6 +408451,8 @@ self: { tasty-hunit temporary text + time + transformers vector ]; description = "Haskell implementation of Langchain"; @@ -406286,8 +408485,8 @@ self: { }: mkDerivation { pname = "language-Modula2"; - version = "0.1.4.2"; - sha256 = "1mxf02hhhnf9n3yqxy6vzzgnvxwswqrfbx8kmwfk8mhbvwnn3ngf"; + version = "0.1.5"; + sha256 = "1m1iag8km2wlpg00423aggfv514r0kq0svrjhadag02krm2ncxd3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -408400,17 +410599,17 @@ self: { mkDerivation, base, deepseq, + hspec, lens, parsec-class, pretty, + process, QuickCheck, }: mkDerivation { pname = "language-nix"; - version = "2.2.0"; - sha256 = "1lq07311dg4a32zdp5bc20bw94g0c7pdzxdiwi2y4zbhd1944rzx"; - revision = "1"; - editedCabalFile = "0g4hq729bz128sf3ifd8rbfamwa8mqqcnhbc3qxnpz1myzvxhnjk"; + version = "2.3.0"; + sha256 = "03gvhaa82kd3nmpfjf5vlkzr6yjxl5whvy2z2xnskfl63q48qsra"; libraryHaskellDepends = [ base deepseq @@ -408419,6 +410618,15 @@ self: { pretty QuickCheck ]; + testHaskellDepends = [ + base + hspec + lens + parsec-class + pretty + process + QuickCheck + ]; description = "Data types and functions to represent the Nix language"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sternenseemann ]; @@ -408450,8 +410658,8 @@ self: { }: mkDerivation { pname = "language-oberon"; - version = "0.3.3.2"; - sha256 = "1gid56amx307lxffdn00xs3v9jjj5jgww7nl9xm9j6k98igqzhvd"; + version = "0.3.4"; + sha256 = "1v3p99lkvx3w8fmkd7cc81jz14vxqbp77jznm25wjbka4sidnzb2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -411499,8 +413707,8 @@ self: { }: mkDerivation { pname = "layoutz"; - version = "0.1.0.0"; - sha256 = "0hmqi5ly418nqbz8zzj9r5mvcndmympwh5zkxqipf9gj3swppy9z"; + version = "0.1.1.0"; + sha256 = "0jmahwgbf64axjqd13r6b51aqarxby6qv9k93hfvrdim3rwnjdw7"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base @@ -412291,6 +414499,7 @@ self: { bytestring, containers, crypton-connection, + data-default, hspec, hspec-discover, network, @@ -412298,11 +414507,12 @@ self: { semigroups, stm, text, + tls, }: mkDerivation { pname = "ldap-client-og"; - version = "0.4.0"; - sha256 = "06migywnmdd3d0cbkhs4y1v62wpa3p2s5pn5vgw269wyhxq3ph4a"; + version = "0.5.0"; + sha256 = "023wsfcl8vy2viwr4447s5yd27rr42l0v54xxdxzl4bx09zkp87l"; libraryHaskellDepends = [ asn1-encoding asn1-types @@ -412311,10 +414521,12 @@ self: { bytestring containers crypton-connection + data-default network semigroups stm text + tls ]; testHaskellDepends = [ base @@ -414865,89 +417077,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.5.8.0"; - sha256 = "08g15kzynync0kl9f247sifzqpkjyvigc5r31w2n3vivi3pdcafn"; - revision = "2"; - editedCabalFile = "0qcibmqkw96658fx3dcfy90k8w4a7xdvllb8h0hk14v0lwvi4cmm"; - 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"; - 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"; + version = "1.5.10.0"; + sha256 = "1x99355r4yds90vp6v3wkv00pvcs9041s29njnv16livfm8y4w1s"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -414994,7 +417125,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "frugal issue tracker"; license = lib.licensesSpdx."GPL-3.0-only"; - hydraPlatforms = lib.platforms.none; mainProgram = "lentil"; maintainers = [ lib.maintainers.rvl ]; } @@ -420506,6 +422636,83 @@ self: { } ) { }; + linear-base_0_6_0 = callPackage ( + { + mkDerivation, + base, + containers, + deepseq, + ghc-bignum, + ghc-prim, + hashable, + hashtables, + hedgehog, + inspection-testing, + linear-generics, + mmorph, + MonadRandom, + primitive, + random, + random-shuffle, + storable-tuple, + tasty, + tasty-bench, + tasty-hedgehog, + tasty-inspection-testing, + text, + transformers, + unordered-containers, + vector, + }: + mkDerivation { + pname = "linear-base"; + version = "0.6.0"; + sha256 = "0rjqzzrw513nrjf4fmq78mnnz63c1j7wgipqp273klx96iwznbk7"; + libraryHaskellDepends = [ + base + containers + ghc-bignum + ghc-prim + hashable + linear-generics + primitive + storable-tuple + text + transformers + vector + ]; + testHaskellDepends = [ + base + containers + hedgehog + inspection-testing + linear-generics + mmorph + tasty + tasty-hedgehog + tasty-inspection-testing + vector + ]; + benchmarkHaskellDepends = [ + base + containers + deepseq + hashable + hashtables + MonadRandom + random + random-shuffle + tasty-bench + unordered-containers + vector + ]; + doHaddock = false; + description = "Standard library for linear types"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + linear-circuit = callPackage ( { mkDerivation, @@ -425904,8 +428111,8 @@ self: { }: mkDerivation { pname = "llvm-pretty"; - version = "0.13.0.0"; - sha256 = "02r2n4yyjxjppk8b2zsk63iznv3gaw3bpb8cz0h8vb88h0836ycx"; + version = "0.13.1.0"; + sha256 = "0i2j1n6xfii2vm5s4jvh3cqa2x03bmz640n4jjlf6aywldmwx3hy"; libraryHaskellDepends = [ base containers @@ -425936,7 +428143,6 @@ self: { mkDerivation, array, base, - binary, bytestring, containers, directory, @@ -425948,7 +428154,6 @@ self: { HUnit, lens, llvm-pretty, - monadLib, mtl, optparse-applicative, pretty, @@ -425972,14 +428177,13 @@ self: { }: mkDerivation { pname = "llvm-pretty-bc-parser"; - version = "0.5.0.0"; - sha256 = "02aj89dhrh9fswfqnsvxh68xkwlmf52pzbm90kq0mcr0b5a3qvff"; + version = "0.5.1.0"; + sha256 = "1x0h735xkj5cxjx35040dv5ny5gnmnhs5z57w4hlpaj6sppsy7bg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base - binary bytestring containers fgl @@ -425990,15 +428194,11 @@ self: { utf8-string ]; executableHaskellDepends = [ - array base - binary bytestring - containers fgl fgl-visualize llvm-pretty - monadLib pretty pretty-show ]; @@ -431552,8 +433752,8 @@ self: { }: mkDerivation { pname = "lua"; - version = "2.3.3"; - sha256 = "0xvhfq8ms5wbchrscxaqf4a9panfnzgz5xdlg86790nydab2kals"; + version = "2.3.4"; + sha256 = "1zjjpknl37fp5dj0aj59csg5vby87x1s638nw7ip57j52vr7gv2l"; configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" @@ -435488,8 +437688,8 @@ self: { }: mkDerivation { pname = "makefile"; - version = "1.1.0.0"; - sha256 = "01swnw8fp2cx5z5xim9apia3yw48six61mhf6p3g0gp99w4i4ypd"; + version = "1.1.0.2"; + sha256 = "1abwscz1nx939v4fcmn11nyi9cbnk5a6mhgb4l6dzz3j8x118b1a"; libraryHaskellDepends = [ attoparsec base @@ -435615,8 +437815,8 @@ self: { }: mkDerivation { pname = "managed"; - version = "1.0.10"; - sha256 = "0ngpk6zkpnc9hl9a46pgkc8ii4d7y06xci52birc5vy1a2fwl8is"; + version = "1.0.11"; + sha256 = "0ppzf9551a9rqdjmx4ak7cq58n53z7p3k82g28mqmagzrjvirqdc"; libraryHaskellDepends = [ base transformers @@ -451226,6 +453426,67 @@ self: { } ) { }; + mlkem = callPackage ( + { + mkDerivation, + aeson, + base, + basement, + bytestring, + criterion, + cryptonite, + deepseq, + directory, + memory, + process, + tasty, + tasty-hunit, + tasty-quickcheck, + text, + zlib, + }: + mkDerivation { + pname = "mlkem"; + version = "0.1.0.0"; + sha256 = "0gvphqi5afipffr8xkl7km786lshqzrmkabf0dvii8bcmafiaf63"; + libraryHaskellDepends = [ + base + basement + cryptonite + deepseq + memory + ]; + testHaskellDepends = [ + aeson + base + basement + bytestring + cryptonite + deepseq + directory + memory + process + tasty + tasty-hunit + tasty-quickcheck + text + zlib + ]; + benchmarkHaskellDepends = [ + base + basement + criterion + cryptonite + deepseq + memory + ]; + description = "Module-Lattice-based Key-Encapsulation Mechanism"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + mltool = callPackage ( { mkDerivation, @@ -452065,21 +454326,24 @@ self: { containers, gigaparsec, hspec, + text, }: mkDerivation { pname = "mmzk-env"; - version = "0.1.1.1"; - sha256 = "02bcv8767bjrbbhnl89kcl63b7c9ajadickd84sr93xxdhjx0jfk"; + version = "0.1.2.0"; + sha256 = "1midm7qq8n4kpp2dhpfa7bzgp9fbhx76325yxx73slkmlgppvc2r"; libraryHaskellDepends = [ base containers gigaparsec + text ]; testHaskellDepends = [ base containers gigaparsec hspec + text ]; description = "Read environment variables into a user-defined data type"; license = lib.licensesSpdx."MIT"; @@ -452412,8 +454676,8 @@ self: { }: mkDerivation { pname = "mockcat"; - version = "0.5.3.0"; - sha256 = "0vizr1ah8dhxq04chbzz8n48f5m6l86gyi27yi9z74w72g12f7f7"; + version = "0.5.5.0"; + sha256 = "1ldwvz15s1nfb9jpx8kjmn1p5350k4nm1ay6lc539wpmxn6s1n34"; libraryHaskellDepends = [ base mtl @@ -452439,23 +454703,26 @@ self: { } ) { }; - mockcat_0_5_4_0 = callPackage ( + mockcat_0_6_0_0 = callPackage ( { mkDerivation, async, base, + hashable, hspec, mtl, + QuickCheck, template-haskell, text, transformers, unliftio, unliftio-core, + unordered-containers, }: mkDerivation { pname = "mockcat"; - version = "0.5.4.0"; - sha256 = "0nzrvavgrw04vz7hq0b55xq8163n8ml9wifscm0y577fq11ab827"; + version = "0.6.0.0"; + sha256 = "1bh8mwxc2l3l647anwkyw0wry3cscgf6dk00xz2mwjshsr7gl8p4"; libraryHaskellDepends = [ base mtl @@ -452468,13 +454735,16 @@ self: { testHaskellDepends = [ async base + hashable hspec mtl + QuickCheck template-haskell text transformers unliftio unliftio-core + unordered-containers ]; description = "Mock library for test in Haskell"; license = lib.licenses.mit; @@ -454531,8 +456801,8 @@ self: { }: mkDerivation { pname = "monad-effect"; - version = "0.2.0.0"; - sha256 = "0p2karn70ha1bf325in4mwhyb09vb7scrbsji7sy1lbrizq6d428"; + version = "0.2.1.0"; + sha256 = "0yrkn1vdz069r8cvxkfpdmrw6gpb4rlxipry9zx3si42qkznn2ay"; libraryHaskellDepends = [ async base @@ -454575,6 +456845,49 @@ self: { } ) { }; + monad-effect-logging = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + clock, + fast-logger, + lens, + monad-effect, + monad-logger, + primitive, + stm, + template-haskell, + text, + time, + }: + mkDerivation { + pname = "monad-effect-logging"; + version = "0.1.0.0"; + sha256 = "1xaaa76icrm39c6xw7y8gamajsa2q480f6djml32jgy6zq7q876a"; + libraryHaskellDepends = [ + aeson + base + bytestring + clock + fast-logger + lens + monad-effect + monad-logger + primitive + stm + template-haskell + text + time + ]; + description = "A flexible logging system utilizing the `monad-effect` effect system"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + monad-exception = callPackage ( { mkDerivation, @@ -457286,6 +459599,81 @@ self: { } ) { }; + monatone = callPackage ( + { + mkDerivation, + aeson, + base, + base64-bytestring, + binary, + bytestring, + containers, + deepseq, + directory, + file-io, + filepath, + mtl, + process, + QuickCheck, + tasty, + tasty-hunit, + tasty-quickcheck, + temporary, + text, + unordered-containers, + }: + mkDerivation { + pname = "monatone"; + version = "0.1.0.0"; + sha256 = "1i4fk1x40x2zmkpyfmps1jnjbzvamhxg97a6a1vpfwjd2hca32w1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + base + base64-bytestring + binary + bytestring + containers + deepseq + directory + file-io + filepath + mtl + text + unordered-containers + ]; + executableHaskellDepends = [ + aeson + base + base64-bytestring + bytestring + containers + filepath + mtl + text + ]; + testHaskellDepends = [ + base + bytestring + containers + directory + filepath + mtl + process + QuickCheck + tasty + tasty-hunit + tasty-quickcheck + temporary + text + ]; + description = "Pure Haskell library for audio metadata parsing and writing"; + license = lib.licensesSpdx."GPL-3.0-only"; + mainProgram = "monatone"; + } + ) { }; + mondo = callPackage ( { mkDerivation, @@ -458252,6 +460640,25 @@ self: { } ) { }; + monoidal-plugins = callPackage ( + { + mkDerivation, + base, + ghc, + }: + mkDerivation { + pname = "monoidal-plugins"; + version = "0.1.0.0"; + sha256 = "17wmsk7disaddijw3k8drs5bkglfqhhpzx83w7ls4lyksw7z3lw5"; + libraryHaskellDepends = [ + base + ghc + ]; + description = "A monoidal interface for aggregating GHC plugins"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + monoidmap = callPackage ( { mkDerivation, @@ -470516,8 +472923,8 @@ self: { }: mkDerivation { pname = "named-text"; - version = "1.2.1.0"; - sha256 = "079nlyhvwdbihlbxdskk8ny4kia7jz7fnw29y2jp576b4470zrgl"; + version = "1.2.2.0"; + sha256 = "1xlwfandp1xs71f7vmgkazrami9pqqsffndi8v7160b58grc1y6y"; libraryHaskellDepends = [ aeson base @@ -470544,7 +472951,6 @@ self: { ]; description = "A parameterized named text type and associated functionality"; license = lib.licensesSpdx."ISC"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -470912,8 +473318,8 @@ self: { }: mkDerivation { pname = "nanopass"; - version = "0.0.3.0"; - sha256 = "18fj3gwqvs2vyqgp6sv4h0hbp7jrwr7ik7kvgv9przbjk24caqsc"; + version = "0.0.3.1"; + sha256 = "0rjxfmh3a2rcfi21gcmjkv34mvhv7rdmncajynnxwjqvkxyc6m1y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -471579,8 +473985,8 @@ self: { }: mkDerivation { pname = "natural"; - version = "0.3.0.6"; - sha256 = "0bnqniczz0hzdlxn3l97k51jm8ivm06plj3khzcksf9al7269hzv"; + version = "0.3.0.7"; + sha256 = "0g39s1pimcfp4agxfa823x0crbnwlx825zpzf675bdjnczdn18jy"; libraryHaskellDepends = [ base lens @@ -473213,8 +475619,8 @@ self: { }: mkDerivation { pname = "net-mqtt"; - version = "0.8.6.2"; - sha256 = "0hz0rvwdl597vyah1smy0957dpx2w60h4mzv7c0kn2jmcaqab9gq"; + version = "0.8.6.3"; + sha256 = "05v12mdgvn3zd6cpimcdglgmi2cj85pyxlakhzx6z8a77klcyd3h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -473295,8 +475701,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "An MQTT Protocol Implementation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -473331,7 +475735,6 @@ self: { ]; description = "Optics for net-mqtt"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -473379,7 +475782,6 @@ self: { ]; description = "Make RPC calls via an MQTT broker"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "mqtt-rpc"; } ) { }; @@ -476196,6 +478598,30 @@ self: { } ) { }; + network-run_0_5_0 = callPackage ( + { + mkDerivation, + base, + bytestring, + network, + time-manager, + }: + mkDerivation { + pname = "network-run"; + version = "0.5.0"; + sha256 = "0y6wrg1cfl9yi68s6nkyv9dzxficnls73ksqr3a7w7h5jlz68p6y"; + libraryHaskellDepends = [ + base + bytestring + network + time-manager + ]; + description = "Simple network runner library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + network-server = callPackage ( { mkDerivation, @@ -477019,6 +479445,58 @@ self: { } ) { }; + network-uri-template = callPackage ( + { + mkDerivation, + base, + conduit, + containers, + hspec, + markdown-unlit, + megaparsec, + network-uri, + optparse-applicative, + prettyprinter, + prettyprinter-ansi-terminal, + text, + }: + mkDerivation { + pname = "network-uri-template"; + version = "0.1.1.4"; + sha256 = "0bvjjjmv4338jib5gw83qwjk3m1hkiaqjg06dj7gmvnyaag60jfy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + containers + megaparsec + network-uri + prettyprinter + text + ]; + executableHaskellDepends = [ + base + containers + optparse-applicative + prettyprinter + prettyprinter-ansi-terminal + text + ]; + testHaskellDepends = [ + base + conduit + containers + hspec + megaparsec + text + ]; + testToolDepends = [ markdown-unlit ]; + description = "Library for parsing and expanding URI Templates, as per RFC 6570"; + license = lib.licenses.agpl3Only; + mainProgram = "network-uri-template"; + } + ) { }; + network-voicetext = callPackage ( { mkDerivation, @@ -479228,6 +481706,35 @@ self: { } ) { }; + nix-cache-server = callPackage ( + { + mkDerivation, + base, + bytestring, + nix, + nix-serve-ng, + relude, + wai, + }: + mkDerivation { + pname = "nix-cache-server"; + version = "0.1.0.0"; + sha256 = "02l2ws47nzwaxkh119kfz64cl3f0bhn5k95n5jxgj9yk4djd910c"; + libraryHaskellDepends = [ + base + bytestring + nix + nix-serve-ng + relude + wai + ]; + description = "Nix binary cache server using nix-serve-ng"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + nix-delegate = callPackage ( { mkDerivation, @@ -480764,6 +483271,39 @@ self: { } ) { }; + no-recursion_0_3_0_0 = callPackage ( + { + mkDerivation, + base, + Cabal, + cabal-doctest, + doctest, + ghc, + }: + mkDerivation { + pname = "no-recursion"; + version = "0.3.0.0"; + sha256 = "01g5gg2jrq5p8frq722z4a60j8s69kgb2shz3rvvcm4da91v62l9"; + setupHaskellDepends = [ + base + Cabal + cabal-doctest + ]; + libraryHaskellDepends = [ + base + ghc + ]; + testHaskellDepends = [ + base + doctest + ]; + description = "A GHC plugin to remove support for recursion"; + license = "(AGPL-3.0-only WITH Universal-FOSS-exception-1.0 OR AGPL-3.0-only OR LicenseRef-commercial)"; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.sellout ]; + } + ) { }; + no-role-annots = callPackage ( { mkDerivation, @@ -483816,6 +486356,29 @@ self: { } ) { }; + nthese = callPackage ( + { + mkDerivation, + base, + semialign, + sop-core, + these, + }: + mkDerivation { + pname = "nthese"; + version = "0.1.0.1"; + sha256 = "1nf668pxflwh9rbrik6qqr6s4kci3i31735qz7pc2cqmi04wxzd3"; + libraryHaskellDepends = [ + base + semialign + sop-core + these + ]; + description = "A heterogeneous, n-ary generalisation of These"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + ntp-control = callPackage ( { mkDerivation, @@ -487731,7 +490294,7 @@ self: { } ) { }; - ogma-cli_1_10_0 = callPackage ( + ogma-cli_1_11_0 = callPackage ( { mkDerivation, aeson, @@ -487748,8 +490311,8 @@ self: { }: mkDerivation { pname = "ogma-cli"; - version = "1.10.0"; - sha256 = "1fli4xhdrzbzkwjidz5piif4hs0zscw4rs6z30d9gb2zf4kl5h4z"; + version = "1.11.0"; + sha256 = "0ba5y46p8gi7vjl62791cjxly6ik00bfjbzma6z4n8irnf2frdzy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -487847,7 +490410,7 @@ self: { } ) { }; - ogma-core_1_10_0 = callPackage ( + ogma-core_1_11_0 = callPackage ( { mkDerivation, aeson, @@ -487879,8 +490442,8 @@ self: { }: mkDerivation { pname = "ogma-core"; - version = "1.10.0"; - sha256 = "010bdip18i0vkhkg2yp1yb4691przni612nwfjz8wrcdxgxvnpz0"; + version = "1.11.0"; + sha256 = "0bx7rjddwxwqacy3mw59502dc9jwy88s1mya4yn6mp9a1k62ha7g"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson @@ -487960,7 +490523,7 @@ self: { } ) { }; - ogma-extra_1_10_0 = callPackage ( + ogma-extra_1_11_0 = callPackage ( { mkDerivation, aeson, @@ -487977,8 +490540,8 @@ self: { }: mkDerivation { pname = "ogma-extra"; - version = "1.10.0"; - sha256 = "0y2jmqnw1nfai225nl9x37klwynrwl2yz1352zix709cc0spma8i"; + version = "1.11.0"; + sha256 = "1az9v4zrwwfwpnqhdqcnr1bhyx3zkx2m372sp90f4v5m3gmk64mp"; libraryHaskellDepends = [ aeson base @@ -488044,7 +490607,7 @@ self: { } ) { }; - ogma-language-c_1_10_0 = callPackage ( + ogma-language-c_1_11_0 = callPackage ( { mkDerivation, alex, @@ -488060,8 +490623,8 @@ self: { }: mkDerivation { pname = "ogma-language-c"; - version = "1.10.0"; - sha256 = "0gamqxl9ajw1fnywx9wkip86xh6b9pgc6l5f80lvkw486g1qp5qf"; + version = "1.11.0"; + sha256 = "0qh8v892bf25cs8csrc0sa4li172v20zr1qfpq4q8apb2hz71bpb"; setupHaskellDepends = [ base Cabal @@ -488139,12 +490702,12 @@ self: { } ) { }; - ogma-language-copilot_1_10_0 = callPackage ( + ogma-language-copilot_1_11_0 = callPackage ( { mkDerivation, base }: mkDerivation { pname = "ogma-language-copilot"; - version = "1.10.0"; - sha256 = "14zx4n9xqd36rn8s6akv5f2rlpvamlg4704n0c0yg2zs6n95zxlw"; + version = "1.11.0"; + sha256 = "1d26p8qrdpisxgjs3ij09qkvs61p6ik18r311w3lbm1z6ryi3ifm"; libraryHaskellDepends = [ base ]; description = "Ogma: Runtime Monitor translator: Copilot Language Endpoints"; license = lib.licenses.asl20; @@ -488181,7 +490744,7 @@ self: { } ) { }; - ogma-language-csv_1_10_0 = callPackage ( + ogma-language-csv_1_11_0 = callPackage ( { mkDerivation, base, @@ -488194,8 +490757,8 @@ self: { }: mkDerivation { pname = "ogma-language-csv"; - version = "1.10.0"; - sha256 = "0j8w9r1618lqv922mdadvhgfyqjhmbh84giz8jwlx7dmqzk28a88"; + version = "1.11.0"; + sha256 = "0ba1y8shyanj97zlxpxpl158p5r9fy4x31zzx9mjxq0fglyi7fbs"; libraryHaskellDepends = [ base bytestring @@ -488316,7 +490879,7 @@ self: { } ) { }; - ogma-language-jsonspec_1_10_0 = callPackage ( + ogma-language-jsonspec_1_11_0 = callPackage ( { mkDerivation, aeson, @@ -488330,8 +490893,8 @@ self: { }: mkDerivation { pname = "ogma-language-jsonspec"; - version = "1.10.0"; - sha256 = "1f9ha1jbg3pgyjhjwdf6xyiwsmca29pgpg0zk2gljmw9q7ry4b9i"; + version = "1.11.0"; + sha256 = "0mwph8zw0jdx4dvg4agd2jry9cjm2x96bbpacs8g5g49lp41bd3j"; libraryHaskellDepends = [ aeson base @@ -488391,7 +490954,7 @@ self: { } ) { }; - ogma-language-lustre_1_10_0 = callPackage ( + ogma-language-lustre_1_11_0 = callPackage ( { mkDerivation, alex, @@ -488407,8 +490970,8 @@ self: { }: mkDerivation { pname = "ogma-language-lustre"; - version = "1.10.0"; - sha256 = "12s58r5g9q9c4jmwck97w8ff6567ncyh1kclvw0mcqpgk09cpvk2"; + version = "1.11.0"; + sha256 = "03ckm7555snxrzs45n81h1rmma3ahc5m5rh9yarkwns34n8a20xg"; setupHaskellDepends = [ base Cabal @@ -488478,7 +491041,7 @@ self: { } ) { }; - ogma-language-smv_1_10_0 = callPackage ( + ogma-language-smv_1_11_0 = callPackage ( { mkDerivation, alex, @@ -488494,8 +491057,8 @@ self: { }: mkDerivation { pname = "ogma-language-smv"; - version = "1.10.0"; - sha256 = "0cq0kdipn79wvhpfx51w52c78djki7dn7c12dl93w585r6f0spzp"; + version = "1.11.0"; + sha256 = "02zks4b679j4mjf624sf3kn2b4s9dfqiymkl9c8jhrimxvh20g49"; setupHaskellDepends = [ base Cabal @@ -488547,7 +491110,7 @@ self: { } ) { }; - ogma-language-xlsx_1_10_0 = callPackage ( + ogma-language-xlsx_1_11_0 = callPackage ( { mkDerivation, base, @@ -488558,8 +491121,8 @@ self: { }: mkDerivation { pname = "ogma-language-xlsx"; - version = "1.10.0"; - sha256 = "0n9i60kdm8blazgpq2swsdnpjryig6w7kykb9gws7hhlg5m16vkx"; + version = "1.11.0"; + sha256 = "0i8k5baqcl9gfqkzxg3pydr3gji6n1530zf7w2rfzwzda13mi7n1"; libraryHaskellDepends = [ base bytestring @@ -488602,7 +491165,7 @@ self: { } ) { }; - ogma-language-xmlspec_1_10_0 = callPackage ( + ogma-language-xmlspec_1_11_0 = callPackage ( { mkDerivation, base, @@ -488615,8 +491178,8 @@ self: { }: mkDerivation { pname = "ogma-language-xmlspec"; - version = "1.10.0"; - sha256 = "091b8gp7z0hnmcfzx5id3sybp87598zzhbhjw1nmhkszphyd2y7z"; + version = "1.11.0"; + sha256 = "0d9mqz7g996d0gn13l93fy3spvqqld35hllc6haimzm4pahyq7ai"; libraryHaskellDepends = [ base hxt @@ -488644,12 +491207,12 @@ self: { } ) { }; - ogma-spec_1_10_0 = callPackage ( + ogma-spec_1_11_0 = callPackage ( { mkDerivation, base }: mkDerivation { pname = "ogma-spec"; - version = "1.10.0"; - sha256 = "078npma0dkqlhwiqw75s9q6k3c4h2m6g4v1wpxgj1n9laz4bf1nn"; + version = "1.11.0"; + sha256 = "0wdhb4n9ngrxy5b8s89ms1m72ykp36vldslm8w66181icinn96d9"; libraryHaskellDepends = [ base ]; description = "Ogma: Runtime Monitor translator: JSON Frontend"; license = lib.licenses.asl20; @@ -491346,8 +493909,8 @@ self: { }: mkDerivation { pname = "openai"; - version = "2.1.0"; - sha256 = "07v6qwp32i6dmxavlcx1kg2jp4lcmp8ah4bf0q55ldbd4b1mc88q"; + version = "2.2.1"; + sha256 = "02y0hyamyar36xmlcyzlw2plxhmsjc5z3hm9ci1znzq72yp5k0p8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -494663,7 +497226,7 @@ self: { } ) { }; - opt-env-conf_0_11_0_0 = callPackage ( + opt-env-conf_0_13_0_0 = callPackage ( { mkDerivation, aeson, @@ -494684,11 +497247,12 @@ self: { text, validity, validity-containers, + validity-text, }: mkDerivation { pname = "opt-env-conf"; - version = "0.11.0.0"; - sha256 = "0krkdybvd3lkjmb6f3x5nmkqh4n025wz5qwmxr34y95ynr36393j"; + version = "0.13.0.0"; + sha256 = "0s7g5h3z0if85pgxcm1dshyqhnsrvjvfwgdf65jyhdhmnlkxws4a"; libraryHaskellDepends = [ aeson autodocodec @@ -494708,6 +497272,7 @@ self: { text validity validity-containers + validity-text ]; description = "Settings parsing for Haskell: command-line arguments, environment variables, and configuration values"; license = lib.licenses.lgpl3Only; @@ -497621,6 +500186,56 @@ self: { } ) { }; + os-string-compat = callPackage ( + { + mkDerivation, + base, + bytestring, + deepseq, + exceptions, + filepath, + os-string, + QuickCheck, + quickcheck-classes-base, + random, + tasty-bench, + }: + mkDerivation { + pname = "os-string-compat"; + version = "1.0.1"; + sha256 = "1kmjh2sqqp97iq7bnxa706daap87pczvcvz7gvm1ihydgv4lpk49"; + libraryHaskellDepends = [ + base + bytestring + exceptions + filepath + os-string + ]; + testHaskellDepends = [ + base + bytestring + deepseq + exceptions + filepath + os-string + QuickCheck + quickcheck-classes-base + ]; + benchmarkHaskellDepends = [ + base + bytestring + deepseq + exceptions + filepath + os-string + random + tasty-bench + ]; + description = "Compatibility layer for os-string"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + osc = callPackage ( { mkDerivation, @@ -501480,6 +504095,7 @@ self: { blaze-html, blaze-markup, containers, + ghc-lib-parser, ghc-syntax-highlighter, HaTeX, optics-core, @@ -501493,8 +504109,8 @@ self: { }: mkDerivation { pname = "pandoc-filter-indent"; - version = "0.3.2.0"; - sha256 = "0nhv38vpkjsy6fbidrfwh8n2pzs4ipb8l4dq9is0rjb36fahjmvg"; + version = "0.3.3.1"; + sha256 = "148zy51bxzlw20x6rqfbz93fb6y9abrnfc40nhg2rb56szyy43fb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -501527,6 +504143,7 @@ self: { base blaze-html blaze-markup + ghc-lib-parser ghc-syntax-highlighter HaTeX optics-core @@ -505025,7 +507642,6 @@ self: { constraints, containers, deepseq, - ghc-prim, hashable, hashtables, hedgehog, @@ -505045,15 +507661,14 @@ self: { }: mkDerivation { pname = "parameterized-utils"; - version = "2.1.10.0"; - sha256 = "1gr4q79sjp1b6456b249i9ysvd0pcl3acnimvsq6b6knj2zvkshk"; + version = "2.1.11.0"; + sha256 = "1fmwyh1ikc8q40fzfdvmkng65dxifacwk25l3x7akbw7qqcv08lb"; libraryHaskellDepends = [ base base-orphans constraints containers deepseq - ghc-prim hashable hashtables indexed-traversable @@ -505067,7 +507682,6 @@ self: { ]; testHaskellDepends = [ base - ghc-prim hashable hashtables hedgehog @@ -516397,7 +519011,6 @@ self: { hspec-discover, megaparsec, optparse-applicative, - prettyprinter, process, random, regex-pcre-builtin, @@ -516413,8 +519026,8 @@ self: { }: mkDerivation { pname = "phino"; - version = "0.0.0.45"; - sha256 = "1m2rq48mkwfy8r29y67mlx4dr65yv9yxfw5j82sawgn4jwhzvc0n"; + version = "0.0.0.49"; + sha256 = "076wv0s4hsqfhqsk1syn4gxbn99ad35a2iqavvjn9k51xs0hgad1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -516429,7 +519042,6 @@ self: { filepath megaparsec optparse-applicative - prettyprinter random regex-pcre-builtin scientific @@ -516452,7 +519064,6 @@ self: { hspec-core megaparsec optparse-applicative - prettyprinter process silently text @@ -529919,8 +532530,8 @@ self: { }: mkDerivation { pname = "poolboy"; - version = "0.4.1.0"; - sha256 = "0xzk9ibildpv90hzn6h5c82wl2aqn8j18628ld27pddw3xq7aq08"; + version = "0.5.0.0"; + sha256 = "1dfslmjs047g2xmpvryaa9gic6d7nqidk38kvs4bpqgg1rhwqq4k"; libraryHaskellDepends = [ base unliftio @@ -532090,6 +534701,75 @@ self: { } ) { }; + postgresql-binary_0_15 = callPackage ( + { + mkDerivation, + aeson, + base, + binary-parser, + bytestring, + bytestring-strict-builder, + containers, + criterion, + iproute, + mtl, + postgresql-libpq, + QuickCheck, + quickcheck-instances, + rerebase, + scientific, + tasty, + tasty-hunit, + tasty-quickcheck, + text, + time, + transformers, + unordered-containers, + uuid, + vector, + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.15"; + sha256 = "1h33igb63d6x572g6ah4kzk5yllf40y91mdkf73gdi8ci4znivc5"; + libraryHaskellDepends = [ + aeson + base + binary-parser + bytestring + bytestring-strict-builder + containers + iproute + mtl + scientific + text + time + transformers + unordered-containers + uuid + vector + ]; + testHaskellDepends = [ + aeson + iproute + postgresql-libpq + QuickCheck + quickcheck-instances + rerebase + tasty + tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + criterion + rerebase + ]; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + postgresql-common = callPackage ( { mkDerivation, @@ -543329,7 +546009,7 @@ self: { } ) { }; - prompt-hs_1_1_0_1 = callPackage ( + prompt-hs_1_1_0_2 = callPackage ( { mkDerivation, base, @@ -543339,8 +546019,8 @@ self: { }: mkDerivation { pname = "prompt-hs"; - version = "1.1.0.1"; - sha256 = "1x6h8cahb6rwdmk2w155gq2mqk4gl11qrsi96h1l0i0a6nzma9wh"; + version = "1.1.0.2"; + sha256 = "1wfq9glvfn3mgd2l1c6binv5vwlzy3rbv7h861m99qm47j2qljll"; libraryHaskellDepends = [ base microlens @@ -543788,8 +546468,8 @@ self: { pname = "proquint"; version = "0.1.0.0"; sha256 = "04hhvrrclyav0nhk6zqp9s58vxad8ndi6yw851qprd6h7wr57wg5"; - revision = "2"; - editedCabalFile = "1bhc2cz76fi3rrn36nrgzi531f3p18k3n7q5mp1xyjz3vv0b2h2d"; + revision = "3"; + editedCabalFile = "06gfq4g2ryncqrnhqc3dfwangav0m1hrxdr11z5k1433mzpzb28m"; libraryHaskellDepends = [ array base @@ -544743,8 +547423,8 @@ self: { }: mkDerivation { pname = "proto3-wire"; - version = "1.4.4"; - sha256 = "15r1irfld81j1mm3yr6lnbb74qlkskp2qcwxhicrdrj0w5nvb8vd"; + version = "1.4.5"; + sha256 = "0khwcn2wkbvgr643my5rwc2v959ypy831n3icp9jnhgmx8fj6lxm"; libraryHaskellDepends = [ base bytestring @@ -544768,6 +547448,7 @@ self: { base bytestring cereal + containers doctest QuickCheck tasty @@ -547441,39 +550122,60 @@ self: { pure-noise = callPackage ( { mkDerivation, + aeson, + aeson-pretty, base, + bytestring, deepseq, - mwc-random, + directory, + filepath, + JuicyPixels, + massiv, primitive, + random, tasty, tasty-bench, tasty-discover, + tasty-golden, tasty-hunit, tasty-quickcheck, + text, + typed-process, vector, }: mkDerivation { pname = "pure-noise"; - version = "0.2.0.0"; - sha256 = "05wp0nlvang8jfyzxi9b080d4dppn5fmj28dhwh5v65lrnh5fzzf"; + version = "0.2.1.1"; + sha256 = "03vwa4yg1shlv7h092a53nxfnp4qa0yi0c17jrv3nz3jdzac1qpr"; libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ + aeson + aeson-pretty base + bytestring + directory + filepath + JuicyPixels + massiv primitive tasty tasty-discover + tasty-golden tasty-hunit tasty-quickcheck + text + typed-process ]; testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ base deepseq - mwc-random + massiv primitive + random tasty tasty-bench vector @@ -550205,6 +552907,7 @@ self: { license = lib.licensesSpdx."MIT"; hydraPlatforms = lib.platforms.none; mainProgram = "qhs"; + broken = true; } ) { }; @@ -552159,8 +554862,8 @@ self: { }: mkDerivation { pname = "quic"; - version = "0.2.20"; - sha256 = "1kam5r9i9zvq3z1nandz38jm1nr8npghxpqrav3mr28rbnlwmd3k"; + version = "0.2.21"; + sha256 = "118ds282flakcdadvybn35bvr02dz2iqwg5c1m6d0gj51mmkb054"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -552965,8 +555668,8 @@ self: { }: mkDerivation { pname = "quickcheck-lockstep"; - version = "0.8.1"; - sha256 = "10x2yzr4pykgb8krassql1dl81vp78yx06ykswwy6cld46hq1d5h"; + version = "0.8.2"; + sha256 = "0lbpijrychl5z1garzs52nv7rnl34ll0sgqcb5znccafgnah04gd"; libraryHaskellDepends = [ base constraints @@ -557583,8 +560286,6 @@ self: { { mkDerivation, base, - Cabal, - cabal-doctest, data-functor-logistic, distributive, doctest, @@ -557596,13 +560297,8 @@ self: { }: mkDerivation { pname = "rank2classes"; - version = "1.5.4"; - sha256 = "03ibbfz0n88sv5nragvbnlm5rn3ljfycxk6pgz8wriylfs1l60bd"; - setupHaskellDepends = [ - base - Cabal - cabal-doctest - ]; + version = "1.5.5"; + sha256 = "0xbngg520d1r1lp3zsjgdvajz4i6x12ia9zyka8vivypiwcg7ll8"; libraryHaskellDepends = [ base data-functor-logistic @@ -557610,15 +560306,19 @@ self: { template-haskell transformers ]; + libraryToolDepends = [ markdown-unlit ]; testHaskellDepends = [ base data-functor-logistic distributive - doctest tasty tasty-hunit ]; - testToolDepends = [ markdown-unlit ]; + testToolDepends = [ + doctest + markdown-unlit + ]; + doHaddock = false; description = "standard type constructor class hierarchy, only with methods of rank 2 types"; license = lib.licenses.bsd3; } @@ -563953,8 +566653,8 @@ self: { }: mkDerivation { pname = "reference-counting"; - version = "0.1.0.0"; - sha256 = "1q0nnm4x1nw6hzymzaxg6rvsd9nwqnmxwrwmwphfa37lz4mcn2lr"; + version = "0.2.0.0"; + sha256 = "1ak2pa30lidaf06nw06blsckq4q76wyfgn4il6k7w8bgs04rcpwv"; libraryHaskellDepends = [ atomic-counter base @@ -564361,145 +567061,6 @@ self: { ) { }; reflex = 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.3.4"; - sha256 = "1qh2xbg4q2gif25hinz72j8ka2w976lccklknwgijxaayh92if4a"; - 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 - lens - 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; - maintainers = [ lib.maintainers.alexfmpe ]; - } - ) { }; - - reflex_0_9_4_0 = callPackage ( { mkDerivation, base, @@ -564633,7 +567194,6 @@ self: { ]; description = "Higher-order Functional Reactive Programming"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.alexfmpe ]; } ) { }; @@ -573002,8 +575562,8 @@ self: { }: mkDerivation { pname = "resource-registry"; - version = "0.1.1.0"; - sha256 = "0zwhnidckc9541sasvxlvysl7qjka1g9cq80h4lzv46kqwagmv9p"; + version = "0.2.0.0"; + sha256 = "1akvv9ydkg55q7vhnm6va2mb2cmyh29f38bkw0m3cv0wxhf3hm1d"; libraryHaskellDepends = [ base bimap @@ -574566,8 +577126,8 @@ self: { }: mkDerivation { pname = "retry-effectful"; - version = "0.1.0.0"; - sha256 = "0d9ja583y6vi4i1mcbyr85k7ffcnrzb23axnpl7khmbgiybwr85w"; + version = "0.1.0.1"; + sha256 = "0amz3qp2w7fjjh4plmspha9zmbqqgdfmsf8w94rzb00alsqfc6lw"; libraryHaskellDepends = [ base effectful-core @@ -577072,8 +579632,8 @@ self: { }: mkDerivation { pname = "rio"; - version = "0.1.23.0"; - sha256 = "089bj6wqh872iy64ivk2wq9g4zb1748kj1wrgk2aa1j5pfbh1cic"; + version = "0.1.24.0"; + sha256 = "1gyrcyqxvffw44r1dwxdnchccdf66xr1k81lq7lb97n1rh70kqy9"; libraryHaskellDepends = [ base bytestring @@ -578101,8 +580661,8 @@ self: { }: mkDerivation { pname = "rme"; - version = "0.1"; - sha256 = "1d4mrmyq9124l13skx3na5xwhqh90hj1bhydars0jyd9axllyx89"; + version = "0.1.1"; + sha256 = "0c7q0jwhlwsvy6prgwczabd039pza2zlvxddfiswcma4l1npszly"; libraryHaskellDepends = [ base containers @@ -578126,10 +580686,8 @@ self: { }: mkDerivation { pname = "rme-what4"; - version = "0.1"; - sha256 = "1ngcydw0ns0yxm393lwrw05jl0rmhhsh2jpr05nv9l0v71sbg087"; - revision = "1"; - editedCabalFile = "19l4p4c88m9hpxr6wpmfrk0rsk52wkfj0msj36bipjp1cdyxf7rz"; + version = "0.1.1"; + sha256 = "0px6id65hjk8cqphvs6lr05212w9d7i2hryv26v5ia40vh9nxhyf"; libraryHaskellDepends = [ base bv-sized @@ -578701,8 +581259,8 @@ self: { }: mkDerivation { pname = "roc-id"; - version = "0.2.0.5"; - sha256 = "1a70y8l45lyglq6rrxrp20jfpwg87gkga4wdxdf15nzh0p1a417f"; + version = "0.2.0.6"; + sha256 = "19wqi1p8d59y7961i5kvwy849f4napdz464xv5ar6b73ysi9vbnj"; libraryHaskellDepends = [ base MonadRandom @@ -581372,14 +583930,15 @@ self: { graphviz, hspec, regex-tdfa, + safe, simple-cmd, simple-cmd-args, unix, }: mkDerivation { pname = "rpmbuild-order"; - version = "0.4.12"; - sha256 = "16l3pxzqndjhnycpnn9jnxisp9mjdbyvglfpra1is07ssr0ckqn0"; + version = "0.4.13"; + sha256 = "0fvq1jxr7dc9r9yg0qxli9313gkb3ppf4cjb5hg16m7lzrn4nrld"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -581391,6 +583950,7 @@ self: { filepath graphviz regex-tdfa + safe simple-cmd ]; executableHaskellDepends = [ @@ -583060,8 +585620,8 @@ self: { }: mkDerivation { pname = "rzk"; - version = "0.7.6"; - sha256 = "0gr1ay9fg6iilc12jfi4ixmw5mgrhv36x1k12f96zk83ppwam765"; + version = "0.7.7"; + sha256 = "05hq5n9sm8vmp75f8a66apm0yaq26y5ip7sj25mpdcad6zmn2q3q"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ @@ -587447,8 +590007,8 @@ self: { }: mkDerivation { pname = "sayable"; - version = "1.2.5.0"; - sha256 = "05jf2423l85vwc98fxib9ahlq9w4zhan4912jmfk86gvhsd35hls"; + version = "1.2.6.0"; + sha256 = "10avl2p6bhh490cjngfvrbqydcagskfjy0xgd13msscmw50ghiqj"; libraryHaskellDepends = [ base bytestring @@ -587548,7 +590108,7 @@ self: { } ) { }; - sbp_6_3_0 = callPackage ( + sbp_6_3_2 = callPackage ( { mkDerivation, aeson, @@ -587577,8 +590137,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "6.3.0"; - sha256 = "0s8v31ivnsxm0wnxzbx4s1c0z5hfndkpq91fnfg0zq6bmlwc504w"; + version = "6.3.2"; + sha256 = "0fvdmflixagy971pv302aq9hfdjlphgvjymrnqkwndzjv2znldrh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -587764,7 +590324,7 @@ self: { } ) { inherit (pkgs) z3; }; - sbv_12_2 = callPackage ( + sbv_13_1 = callPackage ( { mkDerivation, array, @@ -587777,6 +590337,7 @@ self: { deepseq, directory, filepath, + Glob, haskell-src-exts, haskell-src-meta, libBF, @@ -587792,7 +590353,9 @@ self: { tasty-hunit, tasty-quickcheck, template-haskell, + temporary, text, + th-expand-syns, time, transformers, tree-view, @@ -587801,8 +590364,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "12.2"; - sha256 = "1ws5mnd2xv4k50pwwghm3yldir4a0p6r8pi6n7zsk7wcp7mxz5m3"; + version = "13.1"; + sha256 = "0f8ylqalxm4nlcdhw77ild18a9hamkvz9m1jz64vhx8xgln4n8ag"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array @@ -587826,6 +590389,7 @@ self: { syb template-haskell text + th-expand-syns time transformers tree-view @@ -587838,6 +590402,7 @@ self: { deepseq directory filepath + Glob mtl process QuickCheck @@ -587846,6 +590411,7 @@ self: { tasty-golden tasty-hunit tasty-quickcheck + temporary ]; testSystemDepends = [ z3 ]; benchmarkHaskellDepends = [ @@ -608062,7 +610628,7 @@ self: { } ) { }; - shakespeare_2_1_7_1 = callPackage ( + shakespeare_2_2_0 = callPackage ( { mkDerivation, aeson, @@ -608091,8 +610657,8 @@ self: { }: mkDerivation { pname = "shakespeare"; - version = "2.1.7.1"; - sha256 = "06fix8z3kjgl50k5srbixi100jx5rf050xbh9f564n4s5q2irbys"; + version = "2.2.0"; + sha256 = "07mka875c212iclbq6qh94c0axhdh1wwnsijld43ri4yfn6iqpjk"; libraryHaskellDepends = [ aeson base @@ -609388,6 +611954,61 @@ self: { } ) { }; + shelltestrunner_1_11 = callPackage ( + { + mkDerivation, + base, + cmdargs, + Diff, + directory, + filemanip, + filepath, + hspec, + hspec-contrib, + hspec-core, + HUnit, + parsec, + pretty-show, + process, + regex-tdfa, + safe, + test-framework, + test-framework-hunit, + utf8-string, + }: + mkDerivation { + pname = "shelltestrunner"; + version = "1.11"; + sha256 = "0ka1scq321dxdxqap2laph2c98s8323z2yd8zabl20v20a62yx5i"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base + cmdargs + Diff + directory + filemanip + filepath + hspec + hspec-contrib + hspec-core + HUnit + parsec + pretty-show + process + regex-tdfa + safe + test-framework + test-framework-hunit + utf8-string + ]; + description = "Easy, repeatable testing of CLI programs/commands"; + license = lib.licensesSpdx."GPL-3.0-or-later"; + hydraPlatforms = lib.platforms.none; + mainProgram = "shelltest"; + } + ) { }; + shellwords = callPackage ( { mkDerivation, @@ -612661,6 +615282,71 @@ self: { } ) { }; + simple-expr_0_2_0_2 = callPackage ( + { + mkDerivation, + base, + combinatorial, + composition, + data-fix, + doctest, + graphite, + graphviz, + hashable, + mtl, + numhask, + Stream, + text, + unicode-show, + unordered-containers, + vector, + vector-sized, + }: + mkDerivation { + pname = "simple-expr"; + version = "0.2.0.2"; + sha256 = "0ffb0rg166r2ynxih7r3ssq28rpax77rhqi9w0dcgjnblacnw1sk"; + libraryHaskellDepends = [ + base + combinatorial + composition + data-fix + graphite + graphviz + hashable + mtl + numhask + Stream + text + unicode-show + unordered-containers + vector + vector-sized + ]; + testHaskellDepends = [ + base + combinatorial + composition + data-fix + doctest + graphite + graphviz + hashable + mtl + numhask + Stream + text + unicode-show + unordered-containers + vector + vector-sized + ]; + description = "Minimalistic toolkit for simple mathematical expression"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + simple-firewire = callPackage ( { mkDerivation, @@ -613691,6 +616377,8 @@ self: { pname = "simple-sql-parser"; version = "0.8.0"; sha256 = "01mymjr3gbdpkd660vz2v024b8jvzbzwqznmdxf3j2xpbmy36svw"; + revision = "1"; + editedCabalFile = "0lp9kab0yj7fqdsyavgq31r15dfq55a19ahljxhryzb2v1ggxpny"; libraryHaskellDepends = [ base containers @@ -613718,8 +616406,6 @@ self: { ]; description = "A parser for SQL"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -616173,9 +618859,12 @@ self: { mkDerivation, base, cmdargs, + containers, deepseq, dlist, + exceptions, lens, + mtl, parallel-io, regex-pcre, semigroups, @@ -616186,16 +618875,19 @@ self: { }: mkDerivation { pname = "sizes"; - version = "2.4.1"; - sha256 = "1hz9ix8rp6av2rknqra5y2wk26vs5mwzjzqa52ya30yk0jnq80m2"; + version = "2.4.2"; + sha256 = "1pwbsh4lcksf52d59d40q4fic56w0dwfqf5llwzxxd2q8nygr02y"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base cmdargs + containers deepseq dlist + exceptions lens + mtl parallel-io regex-pcre semigroups @@ -623568,10 +626260,10 @@ self: { base, bytestring, conduit, + crc32c, criterion, data-default, deepseq, - digest, mtl, optparse-applicative, random, @@ -623584,17 +626276,15 @@ self: { }: mkDerivation { pname = "snappy-c"; - version = "0.1.1"; - sha256 = "1ds454nvw5ps0aq51ld7hjml4096z1zc7m7nvf9dc3wi0awzy43f"; - revision = "2"; - editedCabalFile = "1awpkbyfg43zwrxp3w1kfg3zdqfdf5mlmrqkbwam43rs555nwvr3"; + version = "0.1.2"; + sha256 = "0y23af1c7gyi1ypf0wvw618iph4w1rfxsa1dq6z9f0l4kx52qps9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring + crc32c data-default - digest mtl ]; librarySystemDepends = [ snappy ]; @@ -624429,8 +627119,8 @@ self: { pname = "soap"; version = "0.2.3.6"; sha256 = "0xmiabnx814rwdwrcipv0kja6ljgwqr4x58sa8s07nrs3ph8xz6d"; - revision = "3"; - editedCabalFile = "1p34yyxln56n75m7hha75p1qm73vjyxbm54lwq566ayqf7dikp2y"; + revision = "5"; + editedCabalFile = "11hm35pbvk6hxznkrk2q45qk1x28lsgcgynl067nr13rjp6skd2l"; libraryHaskellDepends = [ base bytestring @@ -624461,8 +627151,6 @@ self: { ]; description = "SOAP client tools"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -624482,8 +627170,8 @@ self: { pname = "soap-openssl"; version = "0.1.0.2"; sha256 = "03w389yhybzvc06gpxigibqga9mr7m41rkg1ki3n686j9xzm8210"; - revision = "3"; - editedCabalFile = "1nz8h4p94pn2kv65jbdybn9nf5djm9kycbpigk5gbh0ar52zgl4k"; + revision = "5"; + editedCabalFile = "03a8a0hyms2byh1djisjs7jb41rpjhlz29mc47ci27bhz0v3cmx8"; libraryHaskellDepends = [ base configurator @@ -624496,7 +627184,6 @@ self: { ]; description = "TLS-enabled SOAP transport (using openssl bindings)"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -624505,40 +627192,37 @@ self: { mkDerivation, base, configurator, - connection, + crypton-connection, + crypton-x509, + crypton-x509-store, + crypton-x509-validation, data-default, http-client, http-client-tls, soap, text, tls, - x509, - x509-store, - x509-validation, }: mkDerivation { pname = "soap-tls"; - version = "0.1.1.4"; - sha256 = "051shlb128lsacd2cjm4kpyqkmzdcwcj7ppl7l4n1k5j9g6k72yf"; - revision = "2"; - editedCabalFile = "06a65jphfn1nxcnm4r6gf12afxhd7cs6ax8kq22w4pai98jk3jwn"; + version = "0.2.0.0"; + sha256 = "0bi5pwv49bx0hpsamr6nk9nxzx6b1cyq9rd8g9hbmz44v3n9kyqr"; libraryHaskellDepends = [ base configurator - connection + crypton-connection + crypton-x509 + crypton-x509-store + crypton-x509-validation data-default http-client http-client-tls soap text tls - x509 - x509-store - x509-validation ]; description = "TLS-enabled SOAP transport (using tls package)"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -625363,6 +628047,67 @@ self: { } ) { }; + solana-staking-csvs_0_2_0_0 = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + cassava, + cmdargs, + cointracking-imports, + containers, + exceptions, + hedgehog, + http-client, + http-types, + mtl, + req, + scientific, + tasty, + tasty-hedgehog, + tasty-hunit, + text, + time, + }: + mkDerivation { + pname = "solana-staking-csvs"; + version = "0.2.0.0"; + sha256 = "14bw7rakigs3a3qi40jl2hf22a6d5id41zhcj5sk5yj59ba8a47m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + base + bytestring + cassava + cmdargs + cointracking-imports + containers + exceptions + http-client + http-types + mtl + req + scientific + text + time + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base + hedgehog + tasty + tasty-hedgehog + tasty-hunit + ]; + description = "Generate CSV Exports of your Solana Staking Rewards"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "solana-staking-csvs"; + } + ) { }; + solar = callPackage ( { mkDerivation, @@ -631369,8 +634114,8 @@ self: { }: mkDerivation { pname = "squeal-postgresql-qq"; - version = "0.1.4.0"; - sha256 = "11mzdng0828r5l00zxk7w9s24f3h666n5sin79rzhdraisqfv35j"; + version = "0.1.5.0"; + sha256 = "05isiwqwcl22w0gzwsjxdfbnkhiyxqjqkz95qp67m5nhbnfa061s"; libraryHaskellDepends = [ aeson base @@ -636421,10 +639166,8 @@ self: { }: mkDerivation { pname = "statistics"; - version = "0.16.3.0"; - sha256 = "1rx1dckaj54hzx03zqf4rz43hp80rxxgi8dp31rwy9qjckk4dv03"; - revision = "1"; - editedCabalFile = "1996zyq4n7c5zh36h3nhzx5xyd7z6fa3mqsldrgii56g7ixq1rkz"; + version = "0.16.4.0"; + sha256 = "0srx02a591kyim3khd99k8mjni03668b2774wjv7ifxyc8kw9jw2"; libraryHaskellDepends = [ aeson async @@ -637355,2196 +640098,8265 @@ self: { scientific word8 ]; - description = "A simple and high performance IO toolkit for Haskell"; - license = lib.licenses.bsd3; + description = "A simple and high performance IO toolkit for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { inherit (pkgs) libuv; }; + + steambrowser = callPackage ( + { + mkDerivation, + base, + directory, + parsec, + transformers, + }: + mkDerivation { + pname = "steambrowser"; + version = "0.1.0.0"; + sha256 = "071ial002ip6lsm422wf9xzq7ka70h4va67382smkbgiinbma5g4"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base + directory + parsec + transformers + ]; + description = "List and launch steam games from the cli"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "steambrowser"; + broken = true; + } + ) { }; + + steeloverseer = callPackage ( + { + mkDerivation, + aeson, + aeson-compat, + ansi-terminal, + async, + base, + bytestring, + containers, + directory, + exceptions, + filepath, + fsnotify, + hspec, + hspec-discover, + managed, + mtl, + optparse-applicative, + process, + regex-tdfa, + semigroups, + stm, + streaming, + text, + unix, + yaml, + }: + mkDerivation { + pname = "steeloverseer"; + version = "2.1.0.1"; + sha256 = "1zz30i6icz3pghrvcyvp8xfzdf3zn3zwqc53chpksb8mkm26fngp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + aeson-compat + ansi-terminal + async + base + bytestring + containers + exceptions + fsnotify + managed + mtl + process + regex-tdfa + semigroups + stm + streaming + text + unix + yaml + ]; + libraryToolDepends = [ hspec-discover ]; + executableHaskellDepends = [ + aeson-compat + async + base + bytestring + directory + exceptions + filepath + fsnotify + managed + mtl + optparse-applicative + regex-tdfa + semigroups + stm + streaming + text + yaml + ]; + executableToolDepends = [ hspec-discover ]; + testHaskellDepends = [ + aeson-compat + async + base + bytestring + exceptions + fsnotify + hspec + managed + mtl + regex-tdfa + semigroups + stm + streaming + text + yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A file watcher and development tool"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "sos"; + } + ) { }; + + stego-uuid = callPackage ( + { + mkDerivation, + base, + bytestring, + cryptonite, + memory, + random, + uuid, + }: + mkDerivation { + pname = "stego-uuid"; + version = "1.0.0.0"; + sha256 = "1czdfnfama0phsbgv1a55815gnnkrqm5wggw9n10g4lfl866qbyv"; + libraryHaskellDepends = [ + base + bytestring + cryptonite + memory + uuid + ]; + testHaskellDepends = [ + base + random + uuid + ]; + description = "Generator and verifier for steganographic numbers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stemmer = callPackage ( + { mkDerivation, base }: + mkDerivation { + pname = "stemmer"; + version = "0.5.2"; + sha256 = "1pg6bk9p1agip8nqzvdpw1hjjf0nwq9fmr58750wda6il7nljx3m"; + libraryHaskellDepends = [ base ]; + description = "Haskell bindings to the Snowball stemming library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stemmer-german = callPackage ( + { + mkDerivation, + base, + text, + }: + mkDerivation { + pname = "stemmer-german"; + version = "0.1.1.1"; + sha256 = "037dw03zb4xdfbzp8js04ymrxii7rsin7pwiansa9khb29w2jqsn"; + revision = "1"; + editedCabalFile = "0pvghdxgd56yjm33lrzk6343lklnfdw77g30vhbfddwwdx1ifx2v"; + libraryHaskellDepends = [ + base + text + ]; + description = "Extract the stem of a German inflected word form"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + step-function = callPackage ( + { + mkDerivation, + base, + containers, + deepseq, + QuickCheck, + }: + mkDerivation { + pname = "step-function"; + version = "0.2.1"; + sha256 = "1izshxrfhidvdhmnyrnqx2lqv2qjpisjdrxa687yywswcd4nlf9g"; + revision = "2"; + editedCabalFile = "1vrlv163yl2997lsas5qj1d5jp563dzy78mdhfp3bd57lvjz396r"; + libraryHaskellDepends = [ + base + containers + deepseq + QuickCheck + ]; + testHaskellDepends = [ + base + QuickCheck + ]; + description = "Staircase functions or piecewise constant functions"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + + stepwise = callPackage ( + { + mkDerivation, + base, + containers, + mtl, + }: + mkDerivation { + pname = "stepwise"; + version = "1.0.2"; + sha256 = "059k8g3wb4hkxk42vm83vv6kh3igrpf7fc97xvn3qai5rx3jmgqf"; + libraryHaskellDepends = [ + base + containers + mtl + ]; + license = "LGPL"; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stern-brocot = callPackage ( + { + mkDerivation, + alg, + base, + criterion, + smallcheck, + tasty, + tasty-smallcheck, + universe-base, + }: + mkDerivation { + pname = "stern-brocot"; + version = "0.1.0.0"; + sha256 = "0x3d6k1vbwa0gn41z3lq877l70mghq1gic37l6vg1v4s5cyx0w6m"; + libraryHaskellDepends = [ + alg + base + universe-base + ]; + testHaskellDepends = [ + base + smallcheck + tasty + tasty-smallcheck + universe-base + ]; + benchmarkHaskellDepends = [ + base + criterion + ]; + description = "Positive rational numbers represented as paths in the Stern-Brocot tree"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + + stgi = callPackage ( + { + mkDerivation, + ansi-terminal, + ansi-wl-pprint, + base, + containers, + deepseq, + parsers, + prettyprinter, + prettyprinter-ansi-terminal, + QuickCheck, + semigroups, + smallcheck, + tasty, + tasty-html, + tasty-hunit, + tasty-quickcheck, + tasty-rerun, + tasty-smallcheck, + template-haskell, + text, + th-lift, + transformers, + trifecta, + }: + mkDerivation { + pname = "stgi"; + version = "1.1"; + sha256 = "1kl2nxwm8r2pjciy5kmkf4mqqrrc8iy5i02h76xm0ysmwzndq1ck"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint + base + containers + deepseq + parsers + prettyprinter + prettyprinter-ansi-terminal + semigroups + template-haskell + text + th-lift + transformers + trifecta + ]; + executableHaskellDepends = [ + ansi-terminal + base + semigroups + text + ]; + testHaskellDepends = [ + ansi-wl-pprint + base + containers + deepseq + prettyprinter + QuickCheck + semigroups + smallcheck + tasty + tasty-html + tasty-hunit + tasty-quickcheck + tasty-rerun + tasty-smallcheck + template-haskell + text + ]; + description = "Educational implementation of the STG (Spineless Tagless G-machine)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "stgi-exe"; + broken = true; + } + ) { }; + + stickyKeysHotKey = callPackage ( + { mkDerivation, base }: + mkDerivation { + pname = "stickyKeysHotKey"; + version = "0.1.0.2"; + sha256 = "0iw1ia3sf4rwzbkcckbxzr288i6lbgv7vaaynyrkg2c17gjs492a"; + libraryHaskellDepends = [ base ]; + description = "get and set STICKYKEYS.SKF_HOTKEYACTIVE"; + license = lib.licenses.bsd3; + } + ) { }; + + stitch = callPackage ( + { + mkDerivation, + base, + Cabal, + containers, + criterion, + hspec, + text, + transformers, + }: + mkDerivation { + pname = "stitch"; + version = "0.6.0.0"; + sha256 = "1pk2snnvdn9f7xpnhgffzdqxps4spgvmcrbhjdfwpjxrlnxgviq9"; + revision = "1"; + editedCabalFile = "0w4d5m5682nv1aas7d47rk1ddgdxc3rvc0qz1dsmxkajfqi1axpk"; + libraryHaskellDepends = [ + base + containers + text + transformers + ]; + testHaskellDepends = [ + base + Cabal + hspec + text + ]; + benchmarkHaskellDepends = [ + base + criterion + ]; + description = "lightweight CSS DSL"; + license = lib.licenses.bsd3; + } + ) { }; + + stm_2_5_3_1 = callPackage ( + { + mkDerivation, + array, + base, + }: + mkDerivation { + pname = "stm"; + version = "2.5.3.1"; + sha256 = "1rrh4s07vav9mlhpqsq9r6r0gh3f4k8g1gjlx63ngkpdj59ldc7b"; + revision = "1"; + editedCabalFile = "1pfrf0r1f3hl9x3nxv5nja6hrflm72z3cls4x5vljnzmrp4mf6s2"; + libraryHaskellDepends = [ + array + base + ]; + description = "Software Transactional Memory"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + + stm-actor = callPackage ( + { + mkDerivation, + base, + hspec, + mtl, + stm, + stm-queue, + transformers, + unliftio-core, + }: + mkDerivation { + pname = "stm-actor"; + version = "0.3.1.1"; + sha256 = "0c94y6ancgv90nf2shskjlnkrsx9rcmz10jmcv4xxnmr2cvc16f3"; + libraryHaskellDepends = [ + base + mtl + stm + stm-queue + transformers + unliftio-core + ]; + testHaskellDepends = [ + base + hspec + mtl + stm + stm-queue + ]; + description = "A simplistic actor model based on STM"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stm-channelize = callPackage ( + { + mkDerivation, + base, + stm, + }: + mkDerivation { + pname = "stm-channelize"; + version = "0.1.1"; + sha256 = "1aj4zibq54ssbb7smkxjrjl24d9vccgjpl2b9261yqyg692cz9hm"; + libraryHaskellDepends = [ + base + stm + ]; + description = "Transactional I/O for duplex streams"; + license = lib.licenses.bsd3; + } + ) { }; + + stm-chans = callPackage ( + { + mkDerivation, + base, + stm, + }: + mkDerivation { + pname = "stm-chans"; + version = "3.0.0.9"; + sha256 = "0p9jq5fq3g77kf2kq807zrwqpw0z9a6zhw57h21wk4yb6zshs1ks"; + libraryHaskellDepends = [ + base + stm + ]; + description = "Additional types of channels for STM"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + + stm-chunked-queues = callPackage ( + { + mkDerivation, + async, + base, + HUnit, + stm, + tasty, + tasty-hunit, + }: + mkDerivation { + pname = "stm-chunked-queues"; + version = "0.1.0.0"; + sha256 = "0264air2mhwbya2sxskrh4z1bs8il7d9iv4vm6wyz8zxxc95v1nj"; + libraryHaskellDepends = [ + async + base + stm + ]; + testHaskellDepends = [ + async + base + HUnit + stm + tasty + tasty-hunit + ]; + description = "Chunked Communication Queues"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stm-conduit = callPackage ( + { + mkDerivation, + async, + base, + cereal, + cereal-conduit, + conduit, + conduit-extra, + directory, + doctest, + exceptions, + HUnit, + monad-loops, + QuickCheck, + resourcet, + stm, + stm-chans, + test-framework, + test-framework-hunit, + test-framework-quickcheck2, + transformers, + unliftio, + }: + mkDerivation { + pname = "stm-conduit"; + version = "4.0.1"; + sha256 = "0hhlxvpp7mah8dcvkknh6skx44jfk3092zz2w52zlr255bkmn3p8"; + revision = "1"; + editedCabalFile = "1iyk2wfkpyq3jn0lybgf21b95rmkzgpvr8m066j06z4xngcvab36"; + libraryHaskellDepends = [ + async + base + cereal + cereal-conduit + conduit + conduit-extra + directory + exceptions + monad-loops + resourcet + stm + stm-chans + transformers + unliftio + ]; + testHaskellDepends = [ + base + conduit + directory + doctest + HUnit + QuickCheck + resourcet + stm + stm-chans + test-framework + test-framework-hunit + test-framework-quickcheck2 + transformers + unliftio + ]; + description = "Introduces conduits to channels, and promotes using conduits concurrently"; + license = lib.licenses.bsd3; + } + ) { }; + + stm-containers = callPackage ( + { + mkDerivation, + base, + deferred-folds, + focus, + foldl, + free, + hashable, + list-t, + quickcheck-instances, + rerebase, + stm-hamt, + tasty, + tasty-hunit, + tasty-quickcheck, + transformers, + }: + mkDerivation { + pname = "stm-containers"; + version = "1.2.1.1"; + sha256 = "0w28l4pyp6pix17ybnf70mbs0b1k6nybsg631g1vh7mhpni68v15"; + libraryHaskellDepends = [ + base + deferred-folds + focus + hashable + list-t + stm-hamt + transformers + ]; + testHaskellDepends = [ + deferred-folds + focus + foldl + free + list-t + quickcheck-instances + rerebase + tasty + tasty-hunit + tasty-quickcheck + ]; + description = "Containers for STM"; + license = lib.licensesSpdx."MIT"; + maintainers = [ lib.maintainers.maralorn ]; + } + ) { }; + + stm-delay = callPackage ( + { + mkDerivation, + async, + base, + stm, + time, + }: + mkDerivation { + pname = "stm-delay"; + version = "0.1.1.2"; + sha256 = "0k60cpqzqy8c6xk5qw5135a7hlxnh670kb7fhjmz819hsi1n7vq5"; + libraryHaskellDepends = [ + base + stm + ]; + testHaskellDepends = [ + async + base + stm + time + ]; + description = "Updatable one-shot timer polled with STM"; + license = lib.licenses.bsd3; + } + ) { }; + + stm-extras = callPackage ( + { + mkDerivation, + base, + stm, + }: + mkDerivation { + pname = "stm-extras"; + version = "0.1.0.3"; + sha256 = "0pmpf1r8q1favrbgvrnggvs93vwvml79yfqbs4xjqnjsglahl8c8"; + libraryHaskellDepends = [ + base + stm + ]; + description = "Extra STM functions"; + license = lib.licenses.bsd3; + } + ) { }; + + stm-firehose = callPackage ( + { + mkDerivation, + base, + blaze-builder, + conduit, + hspec, + http-types, + HUnit, + resourcet, + stm, + stm-chans, + stm-conduit, + transformers, + wai, + wai-conduit, + warp, + }: + mkDerivation { + pname = "stm-firehose"; + version = "0.3.0.2"; + sha256 = "1y6pis2p93kmwlxzdlx1sc975wpdkswv3srrpl60wmxsgvxb66b5"; + libraryHaskellDepends = [ + base + blaze-builder + conduit + http-types + resourcet + stm + stm-chans + stm-conduit + transformers + wai + wai-conduit + warp + ]; + testHaskellDepends = [ + base + hspec + HUnit + stm + ]; + description = "Conduits and STM operations for fire hoses"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stm-hamt = callPackage ( + { + mkDerivation, + async, + base, + criterion, + deferred-folds, + focus, + free, + hashable, + list-t, + primitive, + primitive-extras, + QuickCheck, + quickcheck-instances, + random, + rebase, + rerebase, + tasty, + tasty-hunit, + tasty-quickcheck, + transformers, + }: + mkDerivation { + pname = "stm-hamt"; + version = "1.2.1.1"; + sha256 = "11k7a2fzgng23ggng1d4v3nhai0d1b3bkci56v7p2n0vdbr7w5d7"; + libraryHaskellDepends = [ + base + deferred-folds + focus + hashable + list-t + primitive + primitive-extras + transformers + ]; + testHaskellDepends = [ + deferred-folds + focus + QuickCheck + quickcheck-instances + rerebase + tasty + tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + async + criterion + focus + free + random + rebase + ]; + description = "STM-specialised Hash Array Mapped Trie"; + license = lib.licensesSpdx."MIT"; + } + ) { }; + + stm-incremental = callPackage ( + { + mkDerivation, + base, + hspec, + stm, + }: + mkDerivation { + pname = "stm-incremental"; + version = "0.1.1.0"; + sha256 = "15fymixnlbbdnpwqlnv83yzyx89a2x8y3h8d95xb4ad1d4fs79z3"; + libraryHaskellDepends = [ + base + stm + ]; + testHaskellDepends = [ + base + hspec + stm + ]; + description = "A library for constructing incremental computations"; + license = lib.licensesSpdx."MIT"; + } + ) { }; + + stm-io-hooks = callPackage ( + { + mkDerivation, + array, + base, + mtl, + stm, + }: + mkDerivation { + pname = "stm-io-hooks"; + version = "1.1.2"; + sha256 = "021s1ck8b09z6khaky2g8ymxf37hznqrl9n4sakb8j57mhliayvc"; + libraryHaskellDepends = [ + array + base + mtl + stm + ]; + description = "Launch your IO-actions from within the STM monad"; + license = lib.licenses.bsd3; + } + ) { }; + + stm-lifted = callPackage ( + { + mkDerivation, + base, + stm, + transformers, + }: + mkDerivation { + pname = "stm-lifted"; + version = "2.5.0.0"; + sha256 = "0zsah3s288cgb2h4gdjqvby1c3xp95nvgd561sdhigxcwlxk2658"; + libraryHaskellDepends = [ + base + stm + transformers + ]; + description = "Software Transactional Memory lifted to MonadIO"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stm-linkedlist = callPackage ( + { + mkDerivation, + base, + stm, + }: + mkDerivation { + pname = "stm-linkedlist"; + version = "0.1.0.0"; + sha256 = "1x65z38dx0qi55fmbarc1827wpl4j08m23nklq8854y7kqznf9kr"; + libraryHaskellDepends = [ + base + stm + ]; + description = "Mutable, doubly linked lists for STM"; + license = lib.licenses.bsd3; + } + ) { }; + + stm-orelse-io = callPackage ( + { + mkDerivation, + base, + stm, + }: + mkDerivation { + pname = "stm-orelse-io"; + version = "0.1"; + sha256 = "11v0xc5zlw641mf6r5k8lqhzxc4y9bsx3xivwmbkfniph0x7g5m4"; + libraryHaskellDepends = [ + base + stm + ]; + description = "Choose between the return value of an STM operation and an IO action"; + license = lib.licenses.bsd3; + } + ) { }; + + stm-promise = callPackage ( + { + mkDerivation, + base, + mtl, + process, + QuickCheck, + stm, + unix, + }: + mkDerivation { + pname = "stm-promise"; + version = "0.0.3.1"; + sha256 = "07wrbj88gwdbsczjr225g0z1ai1v13mdg71gl9qsmipqs0s0pfwc"; + libraryHaskellDepends = [ + base + mtl + process + stm + unix + ]; + testHaskellDepends = [ + base + QuickCheck + stm + ]; + description = "Simple STM Promises for IO computations and external processes"; + license = lib.licenses.lgpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stm-queue = callPackage ( + { + mkDerivation, + async, + base, + criterion, + deepseq, + hspec, + stm, + time, + }: + mkDerivation { + pname = "stm-queue"; + version = "0.2.0.0"; + sha256 = "0g4w5wv1wmhg2sj6pyq5bd0fi1b7zf99f1z0sjl3l8q0jwks16cy"; + libraryHaskellDepends = [ + base + stm + ]; + testHaskellDepends = [ + async + base + hspec + stm + ]; + benchmarkHaskellDepends = [ + async + base + criterion + deepseq + hspec + stm + time + ]; + description = "An implementation of a real-time concurrent queue"; + license = lib.licensesSpdx."MIT"; + } + ) { }; + + stm-queue-extras = callPackage ( + { + mkDerivation, + base, + stm, + stm-chans, + }: + mkDerivation { + pname = "stm-queue-extras"; + version = "0.2.0.0.1"; + sha256 = "1zb6i8dg11pshvb6rm5sqdsbq547h4ys6wlmh2ywcmks2ss7q100"; + libraryHaskellDepends = [ + base + stm + stm-chans + ]; + description = "Extra queue utilities for STM"; + license = lib.licenses.asl20; + } + ) { }; + + stm-sbchan = callPackage ( + { + mkDerivation, + base, + stm, + stm-tlist, + }: + mkDerivation { + pname = "stm-sbchan"; + version = "0.1"; + sha256 = "0fz4vfbyr848b32vbdm3pjj9gwi7wj39l3vsqmdpjnbfwvkw0y0s"; + libraryHaskellDepends = [ + base + stm + stm-tlist + ]; + description = "Bounded channel for STM where item sizes can vary"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + + stm-split = callPackage ( + { + mkDerivation, + base, + stm, + }: + mkDerivation { + pname = "stm-split"; + version = "0.0.2.1"; + sha256 = "06c41p01x62p79bzwryjxr34l7cj65gl227fwwsvd9l6ihk8grp8"; + libraryHaskellDepends = [ + base + stm + ]; + description = "TMVars, TVars and TChans with distinguished input and output side"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; + } + ) { }; + + stm-stats = callPackage ( + { + mkDerivation, + base, + containers, + stm, + template-haskell, + time, + }: + mkDerivation { + pname = "stm-stats"; + version = "0.2.0.0"; + sha256 = "0i8ky2l8lvh7nymxglvbifp0ylbyjw20p75avzb51zpzx6qkjkqa"; + libraryHaskellDepends = [ + base + containers + stm + template-haskell + time + ]; + description = "retry statistics for STM transactions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stm-supply = callPackage ( + { + mkDerivation, + async, + base, + concurrent-supply, + QuickCheck, + random, + Unique, + }: + mkDerivation { + pname = "stm-supply"; + version = "0.2.0.0"; + sha256 = "131q9y32120laylc0r1xz5pkmw69yky17vc621rlk5dcwnkasfgq"; + libraryHaskellDepends = [ + base + concurrent-supply + ]; + testHaskellDepends = [ + async + base + QuickCheck + random + Unique + ]; + description = "STM wrapper around Control.Concurrent.Supply."; + license = lib.licenses.bsd3; + } + ) { }; + + stm-tlist = callPackage ( + { + mkDerivation, + base, + stm, + }: + mkDerivation { + pname = "stm-tlist"; + version = "0.1.1"; + sha256 = "0ssr8phmm9m93kcp045jr0rcn1dxzz202cgyw1vzjl2ch55bcsy6"; + libraryHaskellDepends = [ + base + stm + ]; + description = "Mutable, singly-linked list in STM"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stmcontrol = callPackage ( + { + mkDerivation, + base, + haskell98, + mtl, + stm, + }: + mkDerivation { + pname = "stmcontrol"; + version = "0.1"; + sha256 = "0m42pgnvzqadqycq0qbml5da0zw7myc24y5vka1qydz7rdfyaa24"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base + haskell98 + mtl + stm + ]; + description = "Control communication among retrying transactions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + + stochastic = callPackage ( + { + mkDerivation, + base, + Chart, + Chart-cairo, + containers, + mtl, + random, + }: + mkDerivation { + pname = "stochastic"; + version = "0.1.1.1"; + sha256 = "0qssg3mmk4qz2p8isg70m278yi3mraigk7vrvahsfnx8kmx85f84"; + libraryHaskellDepends = [ + base + containers + mtl + random + ]; + testHaskellDepends = [ + base + Chart + Chart-cairo + containers + mtl + random + ]; + description = "Monadic composition of probabilistic functions and sampling"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stocks = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + containers, + http-conduit, + HUnit, + semigroups, + unordered-containers, + }: + mkDerivation { + pname = "stocks"; + version = "0.2.0.0"; + sha256 = "1rbspmxw81739hjzj5bd365zm9jqmsq5lv70d3wc8vvvf92zimi9"; + libraryHaskellDepends = [ + aeson + base + bytestring + containers + http-conduit + semigroups + unordered-containers + ]; + testHaskellDepends = [ + base + bytestring + HUnit + ]; + description = "Library for the IEX Trading API"; + license = lib.licenses.bsd3; + } + ) { }; + + stomp-conduit = callPackage ( + { + mkDerivation, + base, + conduit, + mime, + mtl, + resourcet, + stomp-queue, + stompl, + }: + mkDerivation { + pname = "stomp-conduit"; + version = "0.5.0"; + sha256 = "1mxfidkqqxswnbj2i4hjcbwppfpvl4a3x3jaki1swmw1qxhcqsk9"; + libraryHaskellDepends = [ + base + conduit + mime + mtl + resourcet + stomp-queue + stompl + ]; + description = "Stompl Conduit Client"; + license = "LGPL"; + } + ) { }; + + stomp-patterns = callPackage ( + { + mkDerivation, + base, + bytestring, + containers, + mime, + mtl, + split, + stomp-queue, + stompl, + time, + }: + mkDerivation { + pname = "stomp-patterns"; + version = "0.5.0"; + sha256 = "118r2v66nl3l5rh4sgb1kp886l63a266yiq4dr3m1c0wy4c2si97"; + libraryHaskellDepends = [ + base + bytestring + containers + mime + mtl + split + stomp-queue + stompl + time + ]; + description = "Stompl MOM Stomp Patterns"; + license = "LGPL"; + } + ) { }; + + stomp-queue = callPackage ( + { + mkDerivation, + attoparsec, + base, + bytestring, + conduit, + conduit-extra, + mime, + mtl, + network-conduit-tls, + resourcet, + split, + stompl, + time, + utf8-string, + }: + mkDerivation { + pname = "stomp-queue"; + version = "0.5.1"; + sha256 = "1hg9y90zw6blr54dq78cb111lxga6pfsy4llsn6hqqyyzsd5358l"; + libraryHaskellDepends = [ + attoparsec + base + bytestring + conduit + conduit-extra + mime + mtl + network-conduit-tls + resourcet + split + stompl + time + utf8-string + ]; + description = "Stompl Client Library"; + license = "LGPL"; + } + ) { }; + + stompl = callPackage ( + { + mkDerivation, + attoparsec, + base, + bytestring, + mime, + split, + text, + utf8-string, + word8, + }: + mkDerivation { + pname = "stompl"; + version = "0.6.0"; + sha256 = "07h5y6gw5zrypmm6s1p7yy3k309hph8jy3yf7mr4zb9dwzgcrl71"; + libraryHaskellDepends = [ + attoparsec + base + bytestring + mime + split + text + utf8-string + word8 + ]; + description = "Stomp Parser and Utilities"; + license = "LGPL"; + } + ) { }; + + stooq-api = callPackage ( + { + mkDerivation, + base, + bytestring, + cassava, + lens, + text, + time, + utf8-string, + vector, + wreq, + }: + mkDerivation { + pname = "stooq-api"; + version = "0.4.2.0"; + sha256 = "0cfhmicx1z4biscn65ya5brqm606dxfnbi30f67k2w4km5vhs3d8"; + libraryHaskellDepends = [ + base + bytestring + cassava + lens + text + time + utf8-string + vector + wreq + ]; + doHaddock = false; + description = "A simple wrapper around stooq.pl API for downloading market data."; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stopwatch = callPackage ( + { + mkDerivation, + base, + clock, + hspec, + hspec-discover, + transformers, + }: + mkDerivation { + pname = "stopwatch"; + version = "0.1.0.7"; + sha256 = "0vbbb60gi2cyi9nxf4xwxjfrx5kc614pgywkl65ayakrvn8ab2hp"; + libraryHaskellDepends = [ + base + clock + transformers + ]; + testHaskellDepends = [ + base + clock + hspec + ]; + testToolDepends = [ hspec-discover ]; + description = "A simple stopwatch utility"; + license = lib.licenses.bsd3; + } + ) { }; + + storable = callPackage ( + { + mkDerivation, + base, + mtl, + }: + mkDerivation { + pname = "storable"; + version = "0.1"; + sha256 = "10289mf3fskfpg0jwgzyhvg4arb0hcj3r94jngb3hlbidvf8k1jg"; + libraryHaskellDepends = [ + base + mtl + ]; + description = "Storable type class for variable-sized data"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + storable-complex = callPackage ( + { + mkDerivation, + base, + base-orphans, + }: + mkDerivation { + pname = "storable-complex"; + version = "0.2.3.0"; + sha256 = "0fnwbfmd5vsaaqvf9182qdcjrzcfjd1zhdyvjwzifbwvn6r9kx4s"; + libraryHaskellDepends = [ + base + base-orphans + ]; + description = "Storable instance for Complex"; + license = lib.licenses.bsd3; + } + ) { }; + + storable-endian = callPackage ( + { + mkDerivation, + base, + byteorder, + }: + mkDerivation { + pname = "storable-endian"; + version = "0.2.6.1"; + sha256 = "0icyf3w9hw2k5naxjsfvmykj98l94bz626qadz37r0wv22lsicff"; + libraryHaskellDepends = [ + base + byteorder + ]; + description = "Storable instances with endianness"; + license = lib.licenses.bsd3; + } + ) { }; + + storable-enum = callPackage ( + { + mkDerivation, + base, + prelude-compat, + }: + mkDerivation { + pname = "storable-enum"; + version = "0.0"; + sha256 = "01nllxm3fx9f1cxay80bwvmpawrwipk7d2c6xb1q5fr3iwnqqaa2"; + libraryHaskellDepends = [ + base + prelude-compat + ]; + description = "Wrapper that makes any Enum type Storable"; + license = lib.licenses.bsd3; + } + ) { }; + + storable-generic = callPackage ( + { + mkDerivation, + base, + storable-peek-poke, + template-haskell, + }: + mkDerivation { + pname = "storable-generic"; + version = "0.1.0.5"; + sha256 = "1hzxshar3iw5z8wnwkwmpn2sfjlvrm2cklq04f4drpm8gd10fzch"; + libraryHaskellDepends = [ + base + storable-peek-poke + template-haskell + ]; + testHaskellDepends = [ + base + storable-peek-poke + template-haskell + ]; + description = "Derive Storable instances with GHC.Generics"; + license = lib.licenses.bsd3; + } + ) { }; + + storable-hetero-list = callPackage ( + { + mkDerivation, + base, + hetero-parameter-list, + storable-peek-poke, + }: + mkDerivation { + pname = "storable-hetero-list"; + version = "0.1.0.4"; + sha256 = "12d32lwr4apnv8m5c2kh4n1zmka2vgcigziih4ndcal4m0sh1niz"; + libraryHaskellDepends = [ + base + hetero-parameter-list + storable-peek-poke + ]; + testHaskellDepends = [ + base + hetero-parameter-list + storable-peek-poke + ]; + description = "about Storable and Hetero list"; + license = lib.licenses.bsd3; + } + ) { }; + + storable-offset = callPackage ( + { mkDerivation, base }: + mkDerivation { + pname = "storable-offset"; + version = "0.1.0.0"; + sha256 = "0m0qmnnb07vhzs1ds7h4cfhba4rzb3abpijk8vjwncanfgg2g4pj"; + libraryHaskellDepends = [ base ]; + description = "Storable offsets for record fields"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + storable-peek-poke = callPackage ( + { + mkDerivation, + base, + typelevel-tools-yj, + }: + mkDerivation { + pname = "storable-peek-poke"; + version = "0.1.0.2"; + sha256 = "0pgssxp3fj4bmp9h8hy1w2lxhshqi1x030nhihllvy78kw757zgz"; + libraryHaskellDepends = [ + base + typelevel-tools-yj + ]; + testHaskellDepends = [ + base + typelevel-tools-yj + ]; + description = "class Sizable, Peek and Poke"; + license = lib.licenses.bsd3; + } + ) { }; + + storable-record = callPackage ( + { + mkDerivation, + base, + QuickCheck, + semigroups, + transformers, + utility-ht, + }: + mkDerivation { + pname = "storable-record"; + version = "0.0.7"; + sha256 = "1c1f58v13nxpq2ix30d2kpvsamk44apl6ms1a2pq54fkjk44didy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + QuickCheck + semigroups + transformers + utility-ht + ]; + description = "Elegant definition of Storable instances for records"; + license = lib.licensesSpdx."BSD-3-Clause"; + maintainers = [ lib.maintainers.thielema ]; + } + ) { }; + + storable-static-array = callPackage ( + { + mkDerivation, + array, + base, + tagged, + vector, + }: + mkDerivation { + pname = "storable-static-array"; + version = "0.6.1.0"; + sha256 = "0akdh6v2cdq38jw8v69bn3m50g6wxanh0plikq4hj5mfrkg6xsxm"; + libraryHaskellDepends = [ + array + base + tagged + vector + ]; + description = "Statically-sized array wrappers with Storable instances for FFI marshaling"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + storable-tuple = callPackage ( + { + mkDerivation, + base, + base-orphans, + storable-record, + utility-ht, + }: + mkDerivation { + pname = "storable-tuple"; + version = "0.1"; + sha256 = "0g2rhqxrl1yjvvqwxmfgflgyyrds0kkcvzjjmwk07mir8aj4yjq3"; + libraryHaskellDepends = [ + base + base-orphans + storable-record + utility-ht + ]; + description = "Storable instance for pairs and triples"; + license = lib.licensesSpdx."BSD-3-Clause"; + maintainers = [ lib.maintainers.thielema ]; + } + ) { }; + + storablevector = callPackage ( + { + mkDerivation, + base, + bytestring, + deepseq, + non-negative, + QuickCheck, + random, + sample-frame, + semigroups, + syb, + transformers, + unsafe, + utility-ht, + }: + mkDerivation { + pname = "storablevector"; + version = "0.2.13.2"; + sha256 = "03nq5930yjpdvnyh93pjxzh3xjsracnnzcyqc0j3yiwadggbjy35"; + revision = "1"; + editedCabalFile = "0rc3y0sw2lf92cxhrbpcypb7hp4s4cspj81ragcs6sxvf0jj79j2"; + libraryHaskellDepends = [ + base + deepseq + non-negative + QuickCheck + semigroups + syb + transformers + unsafe + utility-ht + ]; + testHaskellDepends = [ + base + bytestring + QuickCheck + random + utility-ht + ]; + benchmarkHaskellDepends = [ + base + deepseq + sample-frame + unsafe + utility-ht + ]; + description = "Fast, packed, strict storable arrays with a list interface like ByteString"; + license = lib.licensesSpdx."BSD-3-Clause"; + maintainers = [ lib.maintainers.thielema ]; + } + ) { }; + + storablevector-carray = callPackage ( + { + mkDerivation, + base, + carray, + storablevector, + utility-ht, + }: + mkDerivation { + pname = "storablevector-carray"; + version = "0.0"; + sha256 = "1cqgfddaldxj2yig39fr2smm23nfz52dvh5grf4zr222djm7043i"; + libraryHaskellDepends = [ + base + carray + storablevector + utility-ht + ]; + description = "Conversion between storablevector and carray"; + license = lib.licenses.bsd3; + } + ) { }; + + storablevector-streamfusion = callPackage ( + { + mkDerivation, + base, + storablevector, + stream-fusion, + utility-ht, + }: + mkDerivation { + pname = "storablevector-streamfusion"; + version = "0.0"; + sha256 = "1qgnakr01f28iarq1qd5x86919fj7zwf19nb80w7757l0dhdjb6m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + storablevector + stream-fusion + utility-ht + ]; + description = "Conversion between storablevector and stream-fusion lists with fusion"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + + store = callPackage ( + { + mkDerivation, + array, + async, + base, + base-orphans, + base64-bytestring, + bifunctors, + bytestring, + cereal, + cereal-vector, + clock, + containers, + contravariant, + criterion, + cryptohash-sha1, + deepseq, + directory, + filepath, + free, + ghc-prim, + hashable, + hspec, + hspec-discover, + hspec-smallcheck, + integer-gmp, + lifted-base, + monad-control, + mono-traversable, + nats, + network, + primitive, + resourcet, + safe, + smallcheck, + store-core, + syb, + template-haskell, + text, + th-lift, + th-lift-instances, + th-orphans, + th-reify-many, + th-utilities, + time, + transformers, + unordered-containers, + vector, + vector-binary-instances, + void, + weigh, + }: + mkDerivation { + pname = "store"; + version = "0.7.20"; + sha256 = "1ysp87fhqxw2rlcbhfba1z08j8ml7gq1a1ic6dcl5mdyxxmqywr0"; + libraryHaskellDepends = [ + array + async + base + base-orphans + base64-bytestring + bifunctors + bytestring + containers + contravariant + cryptohash-sha1 + deepseq + directory + filepath + free + ghc-prim + hashable + hspec + hspec-smallcheck + integer-gmp + lifted-base + monad-control + mono-traversable + nats + network + primitive + resourcet + safe + smallcheck + store-core + syb + template-haskell + text + th-lift + th-lift-instances + th-orphans + th-reify-many + th-utilities + time + transformers + unordered-containers + vector + void + ]; + testHaskellDepends = [ + array + async + base + base-orphans + base64-bytestring + bifunctors + bytestring + clock + containers + contravariant + cryptohash-sha1 + deepseq + directory + filepath + free + ghc-prim + hashable + hspec + hspec-smallcheck + integer-gmp + lifted-base + monad-control + mono-traversable + nats + network + primitive + resourcet + safe + smallcheck + store-core + syb + template-haskell + text + th-lift + th-lift-instances + th-orphans + th-reify-many + th-utilities + time + transformers + unordered-containers + vector + void + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + array + async + base + base-orphans + base64-bytestring + bifunctors + bytestring + cereal + cereal-vector + containers + contravariant + criterion + cryptohash-sha1 + deepseq + directory + filepath + free + ghc-prim + hashable + hspec + hspec-smallcheck + integer-gmp + lifted-base + monad-control + mono-traversable + nats + network + primitive + resourcet + safe + smallcheck + store-core + syb + template-haskell + text + th-lift + th-lift-instances + th-orphans + th-reify-many + th-utilities + time + transformers + unordered-containers + vector + vector-binary-instances + void + weigh + ]; + description = "Fast binary serialization"; + license = lib.licenses.mit; + } + ) { }; + + store-core = callPackage ( + { + mkDerivation, + base, + bytestring, + ghc-prim, + primitive, + text, + transformers, + }: + mkDerivation { + pname = "store-core"; + version = "0.4.4.7"; + sha256 = "1lxwl6zlmmdk62c35dwmx4xpcfvjx61is8ccmnr8i01i9l9i19b4"; + libraryHaskellDepends = [ + base + bytestring + ghc-prim + primitive + text + transformers + ]; + description = "Fast and lightweight binary serialization"; + license = lib.licenses.mit; + } + ) { }; + + store-streaming = callPackage ( + { + mkDerivation, + async, + base, + bytestring, + conduit, + free, + hspec, + hspec-discover, + hspec-smallcheck, + network, + resourcet, + smallcheck, + store, + store-core, + streaming-commons, + text, + transformers, + void, + }: + mkDerivation { + pname = "store-streaming"; + version = "0.2.0.5"; + sha256 = "07xpsa3m7vjlv01gfay23v5ycy8fcddv551vbgs5bkg8vn7a5gvk"; + libraryHaskellDepends = [ + async + base + bytestring + conduit + free + resourcet + store + store-core + streaming-commons + text + transformers + ]; + testHaskellDepends = [ + async + base + bytestring + conduit + free + hspec + hspec-smallcheck + network + resourcet + smallcheck + store + store-core + streaming-commons + text + transformers + void + ]; + testToolDepends = [ hspec-discover ]; + description = "Streaming interfaces for `store`"; + license = lib.licenses.mit; + } + ) { }; + + stp = callPackage ( + { + mkDerivation, + base, + containers, + regex-compat, + }: + mkDerivation { + pname = "stp"; + version = "0.1.0.1"; + sha256 = "1vg2w6iawqydg2n4k6m6pzfxr7sr10cx33aabyx6b9wp1i8xa5kl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + containers + ]; + executableHaskellDepends = [ + base + regex-compat + ]; + description = "Simple Theorem Prover"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "mu-test"; + broken = true; + } + ) { }; + + str = callPackage ( + { + mkDerivation, + base, + base16-bytestring, + bytestring, + Crypto, + hashable, + MissingH, + text, + utf8-string, + }: + mkDerivation { + pname = "str"; + version = "0.1.0.0"; + sha256 = "093bgzjj183g48gapmjvbrbp7ns7wfcf94ishgwy84gajpkyb6sr"; + libraryHaskellDepends = [ + base + base16-bytestring + bytestring + Crypto + hashable + MissingH + text + utf8-string + ]; + description = "A type class to abstract between many different string types"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere = callPackage ( + { + mkDerivation, + aeson, + aeson-pretty, + base, + bytestring, + containers, + hashable, + hspec, + hspec-discover, + lens, + template-haskell, + text, + unordered-containers, + }: + mkDerivation { + pname = "stratosphere"; + version = "0.60.0"; + sha256 = "0vp5m82h9axvvzqqxf4q5jxcjgym1b8h4x4y4a367bpiy7xk4kwf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + aeson-pretty + base + bytestring + containers + hashable + lens + template-haskell + text + unordered-containers + ]; + testHaskellDepends = [ + aeson + aeson-pretty + base + bytestring + containers + hashable + hspec + hspec-discover + lens + template-haskell + text + unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "EDSL for AWS CloudFormation"; + license = lib.licenses.mit; + } + ) { }; + + stratosphere_1_0_1 = callPackage ( + { + mkDerivation, + aeson, + aeson-pretty, + base, + bytestring, + containers, + mono-traversable, + sydtest, + sydtest-discover, + text, + }: + mkDerivation { + pname = "stratosphere"; + version = "1.0.1"; + sha256 = "19wq9bw655gm38nqzdnvcb18fynvymk0z9by3w0vh28sql8vw7yn"; + libraryHaskellDepends = [ + aeson + aeson-pretty + base + bytestring + containers + mono-traversable + text + ]; + testHaskellDepends = [ + aeson + aeson-pretty + base + bytestring + containers + mono-traversable + sydtest + sydtest-discover + text + ]; + description = "EDSL for AWS CloudFormation"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + } + ) { }; + + stratosphere-accessanalyzer = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-accessanalyzer"; + version = "1.0.1"; + sha256 = "1rlhd7b4dlb8dz8b30i5405f9yig16d1wgi1kzm2cbdj0vmazcci"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AccessAnalyzer"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-acmpca = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-acmpca"; + version = "1.0.1"; + sha256 = "18l77b4bpcscfrpch7w8vffrnfl10jcp83cnv5g9glnqazdrvlx4"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ACMPCA"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-aiops = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-aiops"; + version = "1.0.1"; + sha256 = "03fpmrmqvgqjaq2rrsnn1620h170fm0277bcwrxkkmi75ggfhydj"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AIOps"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-amazonmq = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-amazonmq"; + version = "1.0.1"; + sha256 = "1b86qfd382m356jbvb3fq93blrc94ic42q0fzkrzv6f3495xxaxs"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AmazonMQ"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-amplify = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-amplify"; + version = "1.0.1"; + sha256 = "1cn5zq8mwbxz02zh3iidmvh0jjy5c3dpym625hj7rx1bv8vmzhgm"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Amplify"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-amplifyuibuilder = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-amplifyuibuilder"; + version = "1.0.1"; + sha256 = "1w2r2yfij7rikc7d6jkli05kzvcs60bl9sm1cwqrna65b7qbw0d6"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AmplifyUIBuilder"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-apigateway = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-apigateway"; + version = "1.0.1"; + sha256 = "1vfgwqpdcgwhl3br8xahbhqkclbdy5bwrd02bkr1z7vqrlqn9bpr"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ApiGateway"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-apigatewayv2 = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-apigatewayv2"; + version = "1.0.1"; + sha256 = "0bl6piby50h9r2siivv42hdva1zf079w437g69b2jg56168xq66h"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ApiGatewayV2"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-appconfig = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-appconfig"; + version = "1.0.1"; + sha256 = "1vdi9hg4s0zmrr7vzq4qvadb6a11i0pglib9icy8d4f67vq67gh4"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AppConfig"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-appflow = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-appflow"; + version = "1.0.1"; + sha256 = "1dg9w1j9kk1p4wajd78vjrrx84qhsrinxxfagagvxgnr0q0d4mv7"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AppFlow"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-appintegrations = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-appintegrations"; + version = "1.0.1"; + sha256 = "0kkrj1in8vd3r8q8ypr854ahgfi46a18iz5fj78sadj5miii9c98"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AppIntegrations"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-applicationautoscaling = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-applicationautoscaling"; + version = "1.0.1"; + sha256 = "1ly1fzjqngndcgxamkdijpw1nd554mlw413s8w6c4gia3j271i0s"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ApplicationAutoScaling"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-applicationinsights = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-applicationinsights"; + version = "1.0.1"; + sha256 = "1lp4qrfchvypk6gqgzxzfhd8jzl1n9n14d9dd43r106537iy1kxv"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ApplicationInsights"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-applicationsignals = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-applicationsignals"; + version = "1.0.1"; + sha256 = "04l9v2n8yyakyp4mck2i2m5107px7hhfhii3ncwa0bn40fs7s5hj"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ApplicationSignals"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-appmesh = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-appmesh"; + version = "1.0.1"; + sha256 = "1psiavnfcgf8qd9v6zmf8l6br5956jc1qh439yrnbqnvwka5v1bw"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AppMesh"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-apprunner = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-apprunner"; + version = "1.0.1"; + sha256 = "14wxj20yvpgp0ndhnhark8ch4cldxi2sm1ffdms1f1rfa5q0jkwn"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AppRunner"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-appstream = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-appstream"; + version = "1.0.1"; + sha256 = "1yx47rc7ckpawbnfzdx4nwarmd605ggj9ri8fxxldgvydlhbh74p"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AppStream"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-appsync = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-appsync"; + version = "1.0.1"; + sha256 = "1ca590kkdxsq6jkxpsfh7ag7rsaif7cfrl3b8gfxly0nwxifcglz"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AppSync"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-apptest = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-apptest"; + version = "1.0.1"; + sha256 = "1dg3901p0vr2f75ifj85gwcmmhfpzib9dcb21prxkps1vyrfnqyp"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AppTest"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-aps = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-aps"; + version = "1.0.1"; + sha256 = "02v7lfmncan6h911pa1wipzk196b04gwf9ryb5ylsmnpw64f0iax"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS APS"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-arcregionswitch = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-arcregionswitch"; + version = "1.0.1"; + sha256 = "1m0xwnm1qy0ah1dy9inhappij8zravricp9afr1010n6xyd0p39c"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ARCRegionSwitch"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-arczonalshift = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-arczonalshift"; + version = "1.0.1"; + sha256 = "02hx2gyb0nvgb30bwsvcflb3329cvpfpzdkdnb1l5jsdz902izhi"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ARCZonalShift"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-ask = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-ask"; + version = "1.0.1"; + sha256 = "16pbjly42494zhj3v4g1plhpkgax7mfgjay06d5agmsi48xy02d8"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ASK"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-athena = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-athena"; + version = "1.0.1"; + sha256 = "0jy2gaaqbryn5nvp3lqwaqii75im1ybh39dcd45446gcfgxf93ks"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Athena"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-auditmanager = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-auditmanager"; + version = "1.0.1"; + sha256 = "1w9dhaz2k0aidx396dv84yszfhy7acb5sd394q2h5abjkqh6m4b1"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AuditManager"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-autoscaling = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-autoscaling"; + version = "1.0.1"; + sha256 = "1g0qmj15d0dfsvag5v8gb673hhmwfwjljyhh7il6q0isvaanf1b5"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AutoScaling"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-autoscalingplans = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-autoscalingplans"; + version = "1.0.1"; + sha256 = "0wj3yva75d5n32n30wkkzdb40fc1lmghknzc8dpwx09q8w7zgd4p"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS AutoScalingPlans"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-b2bi = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-b2bi"; + version = "1.0.1"; + sha256 = "08jjpww93jfakhzi8jjzxphs323pvfwnsps3q6lrclw8jc5qwkwl"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS B2BI"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-backup = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-backup"; + version = "1.0.1"; + sha256 = "1d7s8qmv8ggvrkghs07h9di3s3gd05kll8bxi8gj98qdd2qzw417"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Backup"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-backupgateway = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-backupgateway"; + version = "1.0.1"; + sha256 = "1s5bl2nz35p35687mn278wai240jspmns2p42mzpfnbcqbrd68xn"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS BackupGateway"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-batch = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-batch"; + version = "1.0.1"; + sha256 = "19inxlshf5z8g530w6d0d6h8s7rcv92zjdk9xja37ddl9ba27xw4"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Batch"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-bcmdataexports = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-bcmdataexports"; + version = "1.0.1"; + sha256 = "1xrxy74gsi3bqx29476ldh3z23dbjqm6gag5wagd4smf2ksdlzpg"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS BCMDataExports"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-bedrock = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-bedrock"; + version = "1.0.1"; + sha256 = "1prlarhqs86324zraizlf14hfcldv3yq22ab9nw4c4dj74dma9k9"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Bedrock"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-bedrockagentcore = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-bedrockagentcore"; + version = "1.0.1"; + sha256 = "0kk0dpd63pg0s54k6s4dm0yrd08rvsylkr3gnywi8brvip5lp4pz"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS BedrockAgentCore"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-billing = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-billing"; + version = "1.0.1"; + sha256 = "0ljim7k8p3kjkb7pqsiync0wa5qm2v7hyk9s6sm9m021kh1l5591"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Billing"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-billingconductor = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-billingconductor"; + version = "1.0.1"; + sha256 = "12cwqmc5z7vl75qn4gcmwq8fyh30dhi7bl8lh8jjmdrw58jhphny"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS BillingConductor"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-budgets = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-budgets"; + version = "1.0.1"; + sha256 = "03qk8vk3w11vvcbmcwzwk0vsx86lp50i320zcgdgbc3qszw2ddbm"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Budgets"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-cassandra = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-cassandra"; + version = "1.0.1"; + sha256 = "0r9n6rr77dfw2sjkhn4ir2v7qjxmf7hr7l2f6n1gs2nfmhqxglla"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Cassandra"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-ce = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-ce"; + version = "1.0.1"; + sha256 = "12w1pwdbhxlga7cvhpa3z2lzc5zsfc3l9a6a6gs1h9f9s51nsx2d"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CE"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-certificatemanager = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-certificatemanager"; + version = "1.0.1"; + sha256 = "0s5df7yd8f1zgyx39ypn2x1lf5hhf5b6jjg9w9zyqm4n94j5zzn4"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CertificateManager"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-chatbot = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-chatbot"; + version = "1.0.1"; + sha256 = "0kdxz4l6pklmdf38irm70mcw8rhz824l9fbc4jbmnqsrj10jdnir"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Chatbot"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-cleanrooms = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-cleanrooms"; + version = "1.0.1"; + sha256 = "0dxqdblx0g1hicfk7fzyc3z0jn6q8178vg57swrd27dw94kbaah7"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CleanRooms"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-cleanroomsml = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-cleanroomsml"; + version = "1.0.1"; + sha256 = "1yrci7r02kacgx6fi0pbkjchykk0a4mj7m6is9wnx5vpxknslvlv"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CleanRoomsML"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-cloud9 = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-cloud9"; + version = "1.0.1"; + sha256 = "1bfgnf4sifzva6nfk58l9d16ma2chvhxcnihg32w4yikjpayiq3h"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Cloud9"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-cloudformation = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-cloudformation"; + version = "1.0.1"; + sha256 = "0pq0qfxqzf56k4adfaf5nqfgk346102ipkvlqv8axpdwhkqlfkrh"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CloudFormation"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-cloudfront = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-cloudfront"; + version = "1.0.1"; + sha256 = "0bx639jmcips2s0rq44wxywqdk3id4ch1hy7n7phj31j23a3c2xm"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CloudFront"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-cloudtrail = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-cloudtrail"; + version = "1.0.1"; + sha256 = "0dgfxvzzv5vyphkdj9y1cnwykymby2r41140nrr9rn0sc163s25h"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CloudTrail"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-cloudwatch = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-cloudwatch"; + version = "1.0.1"; + sha256 = "1bfpbn9nlvw6m3x248wwlkx7cf1spq8px1jfs8frnb72lvmyhq1m"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CloudWatch"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-codeartifact = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-codeartifact"; + version = "1.0.1"; + sha256 = "1dw39ijfapva0ia7b452i73qi0xy6lm0r8wmp96spj7qaq34zlac"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CodeArtifact"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-codebuild = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-codebuild"; + version = "1.0.1"; + sha256 = "069g8j16pw1az8ayxr9fgb9rxhv9w0b2jc57nar1ihvp0zgknxjr"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CodeBuild"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-codecommit = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-codecommit"; + version = "1.0.1"; + sha256 = "0n9mnmdabv15qvhp3vg64c3gcmgpgnf8d9galmifvjvrbmwz3inm"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CodeCommit"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-codeconnections = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-codeconnections"; + version = "1.0.1"; + sha256 = "0m3m8kxkjsm1bjg8ldqnb2r4gr2vwf2p9mbwh2qggsz230bi7lp3"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CodeConnections"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-codedeploy = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-codedeploy"; + version = "1.0.1"; + sha256 = "0xrvhprwdmz76vzihfrw7gb3c9cjxvy6fwsdc8hk85xpar4dqbqr"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CodeDeploy"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-codeguruprofiler = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-codeguruprofiler"; + version = "1.0.1"; + sha256 = "0fbfgwvvbjpfv70k8z1gzjx3b4qsyqd3bvavgjcd92dsahj6i1rl"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CodeGuruProfiler"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-codegurureviewer = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-codegurureviewer"; + version = "1.0.1"; + sha256 = "0px11byzfzn1h8dmfi09svh0908dn7mywlkjajjbwszg6rgrafvw"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CodeGuruReviewer"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-codepipeline = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-codepipeline"; + version = "1.0.1"; + sha256 = "10ppzdvirbn3a7xs4q83n4y2lzmsmzrmj3diwgjgbxbfl8brhxq6"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CodePipeline"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-codestar = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-codestar"; + version = "1.0.1"; + sha256 = "0j46gsn126s1qgznr0p770sb80pp4cnmhr7ffdrcnjh0ddqvgl2a"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CodeStar"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-codestarconnections = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-codestarconnections"; + version = "1.0.1"; + sha256 = "1f4sda0kgbw0pd1xmwq0v06iv81sx1l3a6rz4b5xxwrkavfbrapz"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CodeStarConnections"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-codestarnotifications = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-codestarnotifications"; + version = "1.0.1"; + sha256 = "0b2jrzdgdnqyx3aab4c0lphg36yyhkqh7crr9qynb91qmlz2n7hy"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CodeStarNotifications"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-cognito = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-cognito"; + version = "1.0.1"; + sha256 = "0rbcz3zdcjzlgy4zyl76gcb05w20hk00mcgkkgf3f45p45f3ls6d"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Cognito"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-comprehend = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-comprehend"; + version = "1.0.1"; + sha256 = "0vjh4nag2cn47qjzb0hq2a39qm9h5w7zz7ghidf4aylhf44hj7ml"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Comprehend"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-config = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-config"; + version = "1.0.1"; + sha256 = "1dlmzy3sybfc41wijr9p7m466lhy0b8lfvsjcwm1cwx0z46br0hg"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Config"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-connect = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-connect"; + version = "1.0.1"; + sha256 = "1spszhn88yy50fiqnvxg7fhp4p2b2wh935sw38vcznfcda05k9nb"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Connect"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-connectcampaigns = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-connectcampaigns"; + version = "1.0.1"; + sha256 = "1xza42n9k53wj5cgz33y3a7kkb2d9dnsjkzpsrmqjnqx7dg0yzd4"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ConnectCampaigns"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-connectcampaignsv2 = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-connectcampaignsv2"; + version = "1.0.1"; + sha256 = "168r0m35rxgz4mas739dasm6cvqk6bhdc889y0z39037x2a8ir5b"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ConnectCampaignsV2"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-controltower = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-controltower"; + version = "1.0.1"; + sha256 = "0ma0iwc2164xjkv2fvirhbi77vpkmpq1pz8s021ya32ivysyii5z"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ControlTower"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-cur = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-cur"; + version = "1.0.1"; + sha256 = "005a4brbj0xys8rzyyy7jbgplmg5ans2ih5g5gk287x4c2rgdjgg"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CUR"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-customerprofiles = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-customerprofiles"; + version = "1.0.1"; + sha256 = "08swdvi7hj0yl9h7m7c2ijrx9jlii7zb4pxajb8gsia0037vyqza"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS CustomerProfiles"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-databrew = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-databrew"; + version = "1.0.1"; + sha256 = "0g81slnivc8nfddrf1f0sg5dcw7117g6vzy7z9bq158sv8fchxkr"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS DataBrew"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-datapipeline = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-datapipeline"; + version = "1.0.1"; + sha256 = "0xia4800k3zhr030fkq8bpbv9nyri9wszy291zawbs1z1d13adjz"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS DataPipeline"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-datasync = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-datasync"; + version = "1.0.1"; + sha256 = "0vs0h15xb3mz22kik6vdgn2v1mgh720gxcxl2ndzxqs7r0ky9ghy"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS DataSync"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-datazone = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-datazone"; + version = "1.0.1"; + sha256 = "09nbmlxzf8n7f3dnhzlrykvdcpdiwny3zjq0w1qpsna92x6ds3rg"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS DataZone"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-dax = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-dax"; + version = "1.0.1"; + sha256 = "00k201yz1xmfyi85d52csbzdyl1gqg6nb9ddpy365iaasj8kmwy9"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS DAX"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-deadline = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-deadline"; + version = "1.0.1"; + sha256 = "14v08l4yh6fk94j9m019n9vbpg72bqfk1s6lcfazjb7mhcncxb1p"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Deadline"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-detective = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-detective"; + version = "1.0.1"; + sha256 = "1x8x5hqd8jzc1lwcjl5gcy23xhr4cj5a5s6kan0wfkhzng470ai6"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Detective"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-devopsguru = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-devopsguru"; + version = "1.0.1"; + sha256 = "13vkgc9403r9x8zyzi80lbaxa44kk0s8mdxq12z56qmkaq3nrrxr"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS DevOpsGuru"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-directoryservice = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-directoryservice"; + version = "1.0.1"; + sha256 = "0gxgp558zhlmn7aky58w9mjbb78kv6vxm46dsh4md5y6s2szachx"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS DirectoryService"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-dlm = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-dlm"; + version = "1.0.1"; + sha256 = "1hbzbzhw22f3lk34pfwkgvnszixgdl6d5vlb0ds2sdxp969j3kja"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS DLM"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-dms = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-dms"; + version = "1.0.1"; + sha256 = "1pqlgy8f4s5h800ldsazyfdfbmylvpd63aq1nbw4sxcvbdng21k8"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS DMS"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-docdb = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-docdb"; + version = "1.0.1"; + sha256 = "0s68wn3x2j7vvkjjxsyx10lz81xca5ldlgdn0gwrfws3xq6h0hgr"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS DocDB"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-docdbelastic = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-docdbelastic"; + version = "1.0.1"; + sha256 = "0hnhgg1r6vzlw8n1jh4q4c6pibr41mdmshz51ap8hla97q9bqlpn"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS DocDBElastic"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-dsql = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-dsql"; + version = "1.0.1"; + sha256 = "15riws2nfyh6y41wv45rsw69w62dig5fmxy56waahxwa0nxl0s4j"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS DSQL"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-dynamodb = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-dynamodb"; + version = "1.0.1"; + sha256 = "09ds9i57zng4rsv8bs11m8i454am6bs5rf2dp5wrlgqx3qvy6rdb"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS DynamoDB"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-ec2 = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-ec2"; + version = "1.0.1"; + sha256 = "0h7jxqrag38y5gzms69gip9mdnv8hq1gkd197gvsr3in72f3mrxc"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS EC2"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-ecr = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-ecr"; + version = "1.0.1"; + sha256 = "0kk24xy6fdlxv0i10ic6plvgd6v0iygwd4dnn6ac62qbap250rkn"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ECR"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-ecs = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-ecs"; + version = "1.0.1"; + sha256 = "00j25gbg4k2fc7l4sy6sqy5qf8ylxihvwzw72mbspgplsjw5bhmp"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ECS"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-efs = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-efs"; + version = "1.0.1"; + sha256 = "02zn6lqci68fl671fbi66wqcvyn6342fswzl8rvfm6hawbyshx26"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS EFS"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-eks = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-eks"; + version = "1.0.1"; + sha256 = "0gxxv7al64yjz1r0fcyppdrrihvb0n76qmh3ivq0bslzlx3f3jfi"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS EKS"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-elasticache = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-elasticache"; + version = "1.0.1"; + sha256 = "07w1cd4z7k4iqald5vjpnd05dqifj63148abpdmsc1wkvk2lvpza"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ElastiCache"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-elasticbeanstalk = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-elasticbeanstalk"; + version = "1.0.1"; + sha256 = "1ri1vx71n3gfsy8wl2abbvf9x4avjn2hjfpyiw0631pfs2fz5bpn"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ElasticBeanstalk"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-elasticloadbalancing = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-elasticloadbalancing"; + version = "1.0.1"; + sha256 = "1ddzrlqamyyb1hpbnm3x3k69jp24v4z0bq0gmygsvn4bnxp6jh03"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ElasticLoadBalancing"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-elasticloadbalancingv2 = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-elasticloadbalancingv2"; + version = "1.0.1"; + sha256 = "187nyvlyvffxyx2cmxaknbsjy2g54c4r3ih4qm3z2is0465arpdl"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ElasticLoadBalancingV2"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-elasticsearch = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-elasticsearch"; + version = "1.0.1"; + sha256 = "02p2rl26ip70nr9x9kzykhva52d9698j8bpqr3qvblkb6hfagrbs"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Elasticsearch"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-emr = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-emr"; + version = "1.0.1"; + sha256 = "0kmgab1gkpslrnjs6nl0ainrn79hgjp3ar3x4sv0k6q7xfl9bbyz"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS EMR"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-emrcontainers = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-emrcontainers"; + version = "1.0.1"; + sha256 = "050kndgsfyzm1dg145hxsprfaypglg89gj1223rqwasb09fagq87"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS EMRContainers"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-emrserverless = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-emrserverless"; + version = "1.0.1"; + sha256 = "08c099qxbmfr2zxirs48cxinzfz4cadnxcq72p6k9y71q51fn0r0"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS EMRServerless"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-entityresolution = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-entityresolution"; + version = "1.0.1"; + sha256 = "1yy85b2n19w1ss2fnm6dv75b70vrs7ypycxgqd6k3lqgx4jdcigk"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS EntityResolution"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-events = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-events"; + version = "1.0.1"; + sha256 = "027qhj5xxmx4224r3ilz63y2zay1671dq4ciss10hw4bydm9adva"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Events"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-eventschemas = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-eventschemas"; + version = "1.0.1"; + sha256 = "1mkl41x5vqx9bz1hbiwpnk6kb06im3krpb5sn149z3x3w1xibk35"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS EventSchemas"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-evidently = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-evidently"; + version = "1.0.1"; + sha256 = "1hmiy17rm7kf1cmmiszqfcmhgnns1n1zzj1rgx0m14cxffsmnlq4"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Evidently"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-evs = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-evs"; + version = "1.0.1"; + sha256 = "0gvsw4zsslaasmxmx3slmc0dkx95wi3lf8wlp05hg81iwmk0yz15"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS EVS"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-finspace = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-finspace"; + version = "1.0.1"; + sha256 = "1i2nyy8fy50lm6prjy3ak0h4xr922bhss20q0g5vqs1yns0pxdm0"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS FinSpace"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-fis = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-fis"; + version = "1.0.1"; + sha256 = "033bxdkzlasc2bl2mib1q0v6y9fgm85cdp8shxbgb4p5v03fhhjk"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS FIS"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-fms = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-fms"; + version = "1.0.1"; + sha256 = "0gzg8ajan9rcxy5wgsd3pfrq6n3wg0zhm6885mkpmnagmbkn3ckp"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS FMS"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-forecast = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-forecast"; + version = "1.0.1"; + sha256 = "0c0sa5miipr9gfqhmx166g1x6da6f8d1y4db1q9wg8gzvyvl7jby"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Forecast"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-frauddetector = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-frauddetector"; + version = "1.0.1"; + sha256 = "1qncd8f4wpidc26dppj86gnxvkq656vx8w2hwx0fk0lh4nx5ybd5"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS FraudDetector"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-fsx = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-fsx"; + version = "1.0.1"; + sha256 = "0ax68braikl1sky6fcbmrm1vpa3cbcip7r2dj69vzqr4vk6x6cc2"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS FSx"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-gamelift = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-gamelift"; + version = "1.0.1"; + sha256 = "0czkndska3rjy433kw5a4z9b0n5jf89pznjn65z22j7073lym3am"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS GameLift"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-globalaccelerator = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-globalaccelerator"; + version = "1.0.1"; + sha256 = "1lyj4ybpqb8kfi5cajz5sy74w5wwg25sn9q6vvv78k1n6sj2919w"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS GlobalAccelerator"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-glue = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-glue"; + version = "1.0.1"; + sha256 = "1hi30xh86dhm4zy0p5x2l2105yw8w76fd8l56k5y3vdc10r36b26"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Glue"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-grafana = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-grafana"; + version = "1.0.1"; + sha256 = "0rn0g59l7ndfgwvy1g4csshh8vqpwp9kqi42bgvh1dw5zs32q20w"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Grafana"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-greengrass = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-greengrass"; + version = "1.0.1"; + sha256 = "06mf70kcb0yv3qlhfj7arsnk4zi950hvnlhs6drsmy0sx9hiw3hc"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Greengrass"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-greengrassv2 = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-greengrassv2"; + version = "1.0.1"; + sha256 = "1vrxk75r6gppkz8z4cjnbz0jjz3xjiddzvlklg9ic26pqik6k4rl"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS GreengrassV2"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-groundstation = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-groundstation"; + version = "1.0.1"; + sha256 = "0bi8275d1h9ws7bv2yj5r3lbfgp9mzsm7ccjv2qczm9z4xcvd890"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS GroundStation"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-guardduty = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-guardduty"; + version = "1.0.1"; + sha256 = "0n38prmn4xgngv0k7l1w2y4g3q3g1rs0na68p7a5jpa4sn82h3c1"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS GuardDuty"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-healthimaging = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-healthimaging"; + version = "1.0.1"; + sha256 = "13hm7awrmc60w6iv8zmsysds0npwnxxrl1cbfrbzkzl3148wfj86"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS HealthImaging"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-healthlake = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-healthlake"; + version = "1.0.1"; + sha256 = "0309a909k84mqvz98lxhlf7anpspi8hpp9jd3xi64s74b2jb7si8"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS HealthLake"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-iam = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-iam"; + version = "1.0.1"; + sha256 = "0ch1fj3kh40nbiv6hbadjamsg3jpq3r6rlgrcfr53q33z1436hyj"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IAM"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-identitystore = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-identitystore"; + version = "1.0.1"; + sha256 = "0017p30y13s61nqx0hzvhz890w07p6nm6sz78wacx9lfyagj65rb"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IdentityStore"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-imagebuilder = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-imagebuilder"; + version = "1.0.1"; + sha256 = "0l6am2xdzkk33crr2h4zicjlx401cc7qxyjkvs1qr3kfqfdfn1yn"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ImageBuilder"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-inspector = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-inspector"; + version = "1.0.1"; + sha256 = "191nwvxaffacs32nnpv8r9qzsrjbbmnl8bfrs9d7knr0sscjyyp3"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Inspector"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-inspectorv2 = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-inspectorv2"; + version = "1.0.1"; + sha256 = "07lmmjhzxz7ks4vgqibfx0r8dgnbznfi64a7hyr6pr8xh12cc81h"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS InspectorV2"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-internetmonitor = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-internetmonitor"; + version = "1.0.1"; + sha256 = "1n8kg4qfwhn3q8cwl7fj44xcz91bpn9q1f8vhz2jn7igkls368ln"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS InternetMonitor"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-invoicing = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-invoicing"; + version = "1.0.1"; + sha256 = "0ara1wlprs1sz63xqc4xm7nqlxsrcswy7x0vf2if7d25c995bmhh"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Invoicing"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-iot = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-iot"; + version = "1.0.1"; + sha256 = "1wlbh5krnyq9w5sfhi2zll3wzccg3j75i80qqipgsai46x30yqgg"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IoT"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-iotanalytics = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-iotanalytics"; + version = "1.0.1"; + sha256 = "04n8r379s8pyfnjcc5shvpj9vnb1x1s3ig5ivmcswqmlq3lh3pj2"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IoTAnalytics"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-iotcoredeviceadvisor = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-iotcoredeviceadvisor"; + version = "1.0.1"; + sha256 = "0w4jhdlbnqlaq6h022zhswl1fd99y769cva3hkf9iwc424w3nbq0"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IoTCoreDeviceAdvisor"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-iotevents = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-iotevents"; + version = "1.0.1"; + sha256 = "0sl6wq7kjjpg6617j5q8jicpn74sql2vnb640l4zkj9pmv380cq2"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IoTEvents"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-iotfleethub = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-iotfleethub"; + version = "1.0.1"; + sha256 = "011zyrx9xyfy77y3046jksnkrdwxr07qpqhcsns1iq0xs3f6h5wq"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IoTFleetHub"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-iotfleetwise = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-iotfleetwise"; + version = "1.0.1"; + sha256 = "1m5gcfyvq23vg4ki888kfmbn2g7d6c996nmcccvl4wvqfmr4szjy"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IoTFleetWise"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-iotsitewise = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-iotsitewise"; + version = "1.0.1"; + sha256 = "17913p8jbhbs4ajj05qxmyi49dddp6nm2sqjfm4h80w2wp69q9ba"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IoTSiteWise"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-iotthingsgraph = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-iotthingsgraph"; + version = "1.0.1"; + sha256 = "1im8lfz47si0k2p52nl13cfdh6rmm6fjfq7779cl7c2s3789ncqa"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IoTThingsGraph"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-iottwinmaker = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-iottwinmaker"; + version = "1.0.1"; + sha256 = "0n08yqrfv9znyjj5yfjr5qwgl7i6dggwxsblbrhb7xsz9nb3fg5b"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IoTTwinMaker"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-iotwireless = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-iotwireless"; + version = "1.0.1"; + sha256 = "1f5c0ga0b12m65m9qjlphdgjjind8b4qz2slg11glgl9hv058dvz"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IoTWireless"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-ivs = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-ivs"; + version = "1.0.1"; + sha256 = "0x4riciyk5g1zkxpz2wqkwf2zyijq3ivq0wzgyvp4nqnyls6fi86"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IVS"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-ivschat = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-ivschat"; + version = "1.0.1"; + sha256 = "1np2bxjvvdg4h10r6nifs9ssbg324hlzahbd87cywa33i8v62ix2"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS IVSChat"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-kafkaconnect = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-kafkaconnect"; + version = "1.0.1"; + sha256 = "1zkxsjs61gd9pj8k4y57kdaaajwkql6392w2088yiah5jh06515a"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS KafkaConnect"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-kendra = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-kendra"; + version = "1.0.1"; + sha256 = "1ncxn8rrwdfh2rf6i4m3fyc9g04xj475q6rg11yn6ykk2pvm54f0"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Kendra"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-kendraranking = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-kendraranking"; + version = "1.0.1"; + sha256 = "188qcm9h3g61jjmhyj3zwr52lnn2afmaws7k3kk6w7qkabjqj9s4"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS KendraRanking"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-kinesis = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-kinesis"; + version = "1.0.1"; + sha256 = "19xfrkmvajvmdb280j1rg6rdnlihk5qhl9z2d9bidami2vm87cp7"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Kinesis"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-kinesisanalytics = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-kinesisanalytics"; + version = "1.0.1"; + sha256 = "1xgcdsgja13w6p02kqd5r6d9575jzlhjqbkjaf07hr3m3vpbvbvw"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS KinesisAnalytics"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-kinesisanalyticsv2 = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-kinesisanalyticsv2"; + version = "1.0.1"; + sha256 = "1fn6ymlaaz428zjrssws59rd1294hmw36f505nwz0vs4qiqqh1l4"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS KinesisAnalyticsV2"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-kinesisfirehose = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-kinesisfirehose"; + version = "1.0.1"; + sha256 = "0bw3r5wdd85v7bl99pnfppgvfwn0jc2shqs1a0gfwa0hjkgl7hq9"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS KinesisFirehose"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-kinesisvideo = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-kinesisvideo"; + version = "1.0.1"; + sha256 = "1gxg361gffjz40h8yppi0jrip16l0kvmngdb54mcr99jyy8cjzlp"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS KinesisVideo"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-kms = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-kms"; + version = "1.0.1"; + sha256 = "1shwiq8l20zdx90r1gp2fidid5a0ahxsr30clm1x670h1rhnwlyr"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS KMS"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-lakeformation = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-lakeformation"; + version = "1.0.1"; + sha256 = "1fsmgmnn5rd0nzdxm99k036xwx4148cglv084lsryv2y2zbda4xz"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS LakeFormation"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-lambda = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-lambda"; + version = "1.0.1"; + sha256 = "1j2ppxi4iqh41ax17p91wbbqjayxb9nqbgr4qkm6g4bvswixslzs"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Lambda"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-launchwizard = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-launchwizard"; + version = "1.0.1"; + sha256 = "141fwmp0pggkf2l532jw2s9ybz1vgidvs33rqsiwqxf0ypr2mzxg"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS LaunchWizard"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-lex = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-lex"; + version = "1.0.1"; + sha256 = "17zdg2hw8cin4yisamcb0qmp2k72rmfyw0mimv7x47h9r6jnivsn"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Lex"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-licensemanager = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-licensemanager"; + version = "1.0.1"; + sha256 = "0rglv2a0ywhqv9x0hii5j4pf0iwq9r06f6y03lpznzpp1n26f744"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS LicenseManager"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-lightsail = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-lightsail"; + version = "1.0.1"; + sha256 = "1anfs7knc0xw0fflhhpncismvhks3xr92wvjry2xg34dxzan4hjg"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Lightsail"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-location = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-location"; + version = "1.0.1"; + sha256 = "18gy5rwnm4dj9yrilpc3dg1ps1ygrbfg38pmfnc94cks0afgakc2"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Location"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-logs = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-logs"; + version = "1.0.1"; + sha256 = "024xsqpajksvq9qrwj4zxnf7dcyi6x48gxm9i6h1dvksvk205vi2"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Logs"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-lookoutequipment = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-lookoutequipment"; + version = "1.0.1"; + sha256 = "03wlb0c8p0qc16d7cvpp2l74i6m5s4q0nfy7fa05j6kj9i6nyhdn"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS LookoutEquipment"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-lookoutmetrics = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-lookoutmetrics"; + version = "1.0.1"; + sha256 = "0xyzfz09y3d3zycky9q2r65whqsvbwg8ryqq1y6vcimn0jlr2jl7"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS LookoutMetrics"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-lookoutvision = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-lookoutvision"; + version = "1.0.1"; + sha256 = "1x6cj7bk8ada0s29rdsjd6nk4wnphl8iwqzfxd2ir2jbqm3mr92s"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS LookoutVision"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-m2 = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-m2"; + version = "1.0.1"; + sha256 = "1pjin6nrn4paxn9321ipydf9j076kcmy299q3fmhg33v0mx40jbj"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS M2"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-macie = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-macie"; + version = "1.0.1"; + sha256 = "1c3b5ha855jrwiv61zsdg9cydri4vh6d4gf5bjay02n2miafbmaj"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Macie"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-managedblockchain = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-managedblockchain"; + version = "1.0.1"; + sha256 = "04qrng9bbz7ws0wdbfzhzwqk9ynlvwbsxdgmnn433xyywlbzfx8p"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ManagedBlockchain"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-mediaconnect = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-mediaconnect"; + version = "1.0.1"; + sha256 = "03v8n5zwsnp6ri77zg2srm6986v00bnk2c4aw33crrrmblizmmbh"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS MediaConnect"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-mediaconvert = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-mediaconvert"; + version = "1.0.1"; + sha256 = "0k577mwi0p5i52h8kcpprlpm5ahx0gigcmqlws6cgr4l5shvd5dk"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS MediaConvert"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-medialive = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-medialive"; + version = "1.0.1"; + sha256 = "0ijrbj99kqzhw9k1lynm0h0xmrljdrrqjd3hw1196rmcbgi522n8"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS MediaLive"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-mediapackage = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-mediapackage"; + version = "1.0.1"; + sha256 = "1qw7327isccyxsw2b7w0vlpg7q96hrivfjxdk4b9i1hp4fv7w1x6"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS MediaPackage"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-mediapackagev2 = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-mediapackagev2"; + version = "1.0.1"; + sha256 = "1kxfsy83kph82cq1makalx92crnnxfnlmm5brffs10w8mdb34wmq"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS MediaPackageV2"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-mediastore = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-mediastore"; + version = "1.0.1"; + sha256 = "1xck1q9md54mjj4v420lbcfxxfpbj7y97xs3992j9x35k6xqm2c9"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS MediaStore"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-mediatailor = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-mediatailor"; + version = "1.0.1"; + sha256 = "0i3q10gyw5qwh6a8z2q4q2rmrja4ka9lyz4zvdqz74z4sxmz20nw"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS MediaTailor"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-memorydb = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-memorydb"; + version = "1.0.1"; + sha256 = "00pzsfwpcqswjssbnl206xgbn0rk99kbfs4nzq9vniq7zhbjs87z"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS MemoryDB"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-mpa = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-mpa"; + version = "1.0.1"; + sha256 = "00s9y2f11xjqq5kg2imvhrz912s44li4y1xdylyvnmyz171a6dkh"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS MPA"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-msk = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-msk"; + version = "1.0.1"; + sha256 = "1fzpzdv5swmzi91hjxkd27092h4672nwri6rsyy4n0paipr2wdch"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS MSK"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-mwaa = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-mwaa"; + version = "1.0.1"; + sha256 = "0yvzybs58ms7c054vb71mzp8ixca0b40j190b1633391ixhabpcx"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS MWAA"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-neptune = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-neptune"; + version = "1.0.1"; + sha256 = "1k02pr7j8qpcsw25sn1zi27bpc4r5wr42yvn358vvds4dgk1rwzy"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Neptune"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-neptunegraph = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-neptunegraph"; + version = "1.0.1"; + sha256 = "1f2p98kr3jzz9izbs3a86271fwlgj2lhcs7f43472p0v08m21n17"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS NeptuneGraph"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-networkfirewall = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-networkfirewall"; + version = "1.0.1"; + sha256 = "1i2flhhlrqy8w9p1zr884nm4lgp1z3dhzd0h7b52k4298whwgbj2"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS NetworkFirewall"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-networkmanager = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-networkmanager"; + version = "1.0.1"; + sha256 = "0b5qbaankk4931w2k5dajqi9hdjb527pj0c88nw0lmfihazqjkyi"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS NetworkManager"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-notifications = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-notifications"; + version = "1.0.1"; + sha256 = "1g1mzggmxnks8jf9fv7gf80b1gmdkqzbqbk1hlsw7mp8zqrdayyj"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Notifications"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-notificationscontacts = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-notificationscontacts"; + version = "1.0.1"; + sha256 = "05qhf2sh01f13id2pvpff932x9b5nm2v7i68wi7gmn20cmbppmh2"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS NotificationsContacts"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-oam = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-oam"; + version = "1.0.1"; + sha256 = "0xmk4c9zfbc815i343dj5g9xr7mk7bks5lmrackigg8ngivsndmf"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Oam"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-observabilityadmin = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-observabilityadmin"; + version = "1.0.1"; + sha256 = "1phlamcn06w8yln3k815aq35jc9x3zdd0n60bqa8vjszrmzm0bq1"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ObservabilityAdmin"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-odb = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-odb"; + version = "1.0.1"; + sha256 = "1i7y471ssbkg3v5sk7xdlrlbh8iq4sljl3sz3chjq4vqjrk38n0w"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS ODB"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-omics = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-omics"; + version = "1.0.1"; + sha256 = "0lx8c3xrgy975yfhapwwi9l2hyi9qi6023q2al6aqvhxifrizm16"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Omics"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-opensearchserverless = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-opensearchserverless"; + version = "1.0.1"; + sha256 = "1mpx12jxhim05abkrngxc9l03askip569qcd9bcyapxs2qszcc8c"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS OpenSearchServerless"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-opensearchservice = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-opensearchservice"; + version = "1.0.1"; + sha256 = "1f2ilw8qz26wwmmlrlaz8hb2wb9vp9rhcy07gcklmccnqgw41g6x"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS OpenSearchService"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-opsworks = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-opsworks"; + version = "1.0.1"; + sha256 = "1pq9bmc1bz0b0j4mk0ipg5l3bvszi3xl3xqrwybqih1ih8fpndbf"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS OpsWorks"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-organizations = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-organizations"; + version = "1.0.1"; + sha256 = "1q6irnpz3kpgs20q800d6a14ch2900vn4580qmsrrg1skzmg2jfz"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Organizations"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-osis = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-osis"; + version = "1.0.1"; + sha256 = "0q8xpg1wda7cjlk7ymzrzrv4pradfqns6yzfw06fvs8l8ixynf0k"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS OSIS"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-panorama = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-panorama"; + version = "1.0.1"; + sha256 = "0zz660cv36ia67isjcppypx745py6qh4a24vmfmijzrnickqgd31"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Panorama"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-paymentcryptography = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-paymentcryptography"; + version = "1.0.1"; + sha256 = "1vankd3w5aj7p4pnrpjdgfahhsi0mpc8ajpm467hqvij70jkcycx"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS PaymentCryptography"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-pcaconnectorad = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-pcaconnectorad"; + version = "1.0.1"; + sha256 = "1bwix9mdir2f99w0r09b1ww521gysdwfwsq0h1qc5zfcphkxihar"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS PCAConnectorAD"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-pcaconnectorscep = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-pcaconnectorscep"; + version = "1.0.1"; + sha256 = "13ymi8c5avmxw56bx62x5vhvzffxrng14g43blmr84c4mczkc0mw"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS PCAConnectorSCEP"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-pcs = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-pcs"; + version = "1.0.1"; + sha256 = "1g39qbvgac6wk4k8ckj3awc1svkxpqvz3jjbsnm93b341fvinvcn"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS PCS"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-personalize = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-personalize"; + version = "1.0.1"; + sha256 = "0whvrazir0z2j9llpgnn4ag2zg2nrm98qymwx2swy8zrvw0c53f9"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Personalize"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-pinpoint = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-pinpoint"; + version = "1.0.1"; + sha256 = "14jqbc25kxb0zq92vgvjb8qb9n8y14jj9hq6k46cp3hqlr3alf63"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Pinpoint"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-pinpointemail = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-pinpointemail"; + version = "1.0.1"; + sha256 = "0a40ib85rz9dqbp3md1d5rrrx5gcdz1zz6zlm2cgx0n5vzfa96zy"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS PinpointEmail"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-pipes = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-pipes"; + version = "1.0.1"; + sha256 = "172bb3sbwx1343lv89giw07z0sxijhp2vjiyjqprss7qp37414dj"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Pipes"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-proton = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-proton"; + version = "1.0.1"; + sha256 = "1dz94bzswdhxvj6rifm4i5rgddckhfmgrx0bcy92fwsjqxr997z8"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Proton"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-qbusiness = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-qbusiness"; + version = "1.0.1"; + sha256 = "10yfcmg9zfqklvzi3yjnahhqf78hmzbhlh46kmr62jmcshybq5km"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS QBusiness"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-qldb = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-qldb"; + version = "1.0.1"; + sha256 = "1fwyri6gwzy2g9bnaqjynj0k2bdxn3qpdv7if5nbcs05y6raa9rx"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS QLDB"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-quicksight = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-quicksight"; + version = "1.0.1"; + sha256 = "0ldpqyi79kp3kdbjcq235bchs93slfyrmc584779mvg6zxs65bvj"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS QuickSight"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-ram = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-ram"; + version = "1.0.1"; + sha256 = "04gw372qbxx6fy7w22b66r751g7w1dkifl4bzq7cg0nhk5ckxkia"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS RAM"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + + stratosphere-rbin = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: + mkDerivation { + pname = "stratosphere-rbin"; + version = "1.0.1"; + sha256 = "18pdhxzv7ci419jbk2yzkxmlzxj4f4p6kwrsjfinf7axxzljs9fi"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS Rbin"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; } - ) { inherit (pkgs) libuv; }; + ) { }; - steambrowser = callPackage ( + stratosphere-rds = callPackage ( { mkDerivation, + aeson, base, - directory, - parsec, - transformers, + stratosphere, }: mkDerivation { - pname = "steambrowser"; - version = "0.1.0.0"; - sha256 = "071ial002ip6lsm422wf9xzq7ka70h4va67382smkbgiinbma5g4"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ + pname = "stratosphere-rds"; + version = "1.0.1"; + sha256 = "0jgclx3b6ayy7974421nl4xi5kwhx6ifndy97r3ip4rnlqlwqzc2"; + libraryHaskellDepends = [ + aeson base - directory - parsec - transformers + stratosphere ]; - description = "List and launch steam games from the cli"; + description = "Stratosphere integration for AWS RDS"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - mainProgram = "steambrowser"; broken = true; } ) { }; - steeloverseer = callPackage ( + stratosphere-redshift = callPackage ( { mkDerivation, aeson, - aeson-compat, - ansi-terminal, - async, base, - bytestring, - containers, - directory, - exceptions, - filepath, - fsnotify, - hspec, - hspec-discover, - managed, - mtl, - optparse-applicative, - process, - regex-tdfa, - semigroups, - stm, - streaming, - text, - unix, - yaml, + stratosphere, }: mkDerivation { - pname = "steeloverseer"; - version = "2.1.0.1"; - sha256 = "1zz30i6icz3pghrvcyvp8xfzdf3zn3zwqc53chpksb8mkm26fngp"; - isLibrary = true; - isExecutable = true; + pname = "stratosphere-redshift"; + version = "1.0.1"; + sha256 = "15xsz2hsdkkifxspaikpwkzara3d951i93373np19yg5ljh1czzy"; libraryHaskellDepends = [ aeson - aeson-compat - ansi-terminal - async base - bytestring - containers - exceptions - fsnotify - managed - mtl - process - regex-tdfa - semigroups - stm - streaming - text - unix - yaml - ]; - libraryToolDepends = [ hspec-discover ]; - executableHaskellDepends = [ - aeson-compat - async - base - bytestring - directory - exceptions - filepath - fsnotify - managed - mtl - optparse-applicative - regex-tdfa - semigroups - stm - streaming - text - yaml - ]; - executableToolDepends = [ hspec-discover ]; - testHaskellDepends = [ - aeson-compat - async - base - bytestring - exceptions - fsnotify - hspec - managed - mtl - regex-tdfa - semigroups - stm - streaming - text - yaml + stratosphere ]; - testToolDepends = [ hspec-discover ]; - description = "A file watcher and development tool"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS Redshift"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - mainProgram = "sos"; + broken = true; } ) { }; - stego-uuid = callPackage ( + stratosphere-redshiftserverless = callPackage ( { mkDerivation, + aeson, base, - bytestring, - cryptonite, - memory, - random, - uuid, + stratosphere, }: mkDerivation { - pname = "stego-uuid"; - version = "1.0.0.0"; - sha256 = "1czdfnfama0phsbgv1a55815gnnkrqm5wggw9n10g4lfl866qbyv"; + pname = "stratosphere-redshiftserverless"; + version = "1.0.1"; + sha256 = "0hvpff9p0dag07kvd260gld9gbm1sn2sym5ll1plf928sdacixmj"; libraryHaskellDepends = [ + aeson base - bytestring - cryptonite - memory - uuid - ]; - testHaskellDepends = [ - base - random - uuid + stratosphere ]; - description = "Generator and verifier for steganographic numbers"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS RedshiftServerless"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; } ) { }; - stemmer = callPackage ( - { mkDerivation, base }: + stratosphere-refactorspaces = callPackage ( + { + mkDerivation, + aeson, + base, + stratosphere, + }: mkDerivation { - pname = "stemmer"; - version = "0.5.2"; - sha256 = "1pg6bk9p1agip8nqzvdpw1hjjf0nwq9fmr58750wda6il7nljx3m"; - libraryHaskellDepends = [ base ]; - description = "Haskell bindings to the Snowball stemming library"; - license = lib.licenses.bsd3; + pname = "stratosphere-refactorspaces"; + version = "1.0.1"; + sha256 = "140hrqd6h3h5hzg466av9hw09llhhz83llmzs9ahv2cj3xg48053"; + libraryHaskellDepends = [ + aeson + base + stratosphere + ]; + description = "Stratosphere integration for AWS RefactorSpaces"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; } ) { }; - stemmer-german = callPackage ( + stratosphere-rekognition = callPackage ( { mkDerivation, + aeson, base, - text, + stratosphere, }: mkDerivation { - pname = "stemmer-german"; - version = "0.1.1.1"; - sha256 = "037dw03zb4xdfbzp8js04ymrxii7rsin7pwiansa9khb29w2jqsn"; - revision = "1"; - editedCabalFile = "0pvghdxgd56yjm33lrzk6343lklnfdw77g30vhbfddwwdx1ifx2v"; + pname = "stratosphere-rekognition"; + version = "1.0.1"; + sha256 = "11rsi57w7fpy3mqy6qn7vbpsj7fgw18gn92ngbix9x0g8fzq42wq"; libraryHaskellDepends = [ + aeson base - text + stratosphere ]; - description = "Extract the stem of a German inflected word form"; + description = "Stratosphere integration for AWS Rekognition"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; } ) { }; - step-function = callPackage ( + stratosphere-resiliencehub = callPackage ( { mkDerivation, + aeson, base, - containers, - deepseq, - QuickCheck, + stratosphere, }: mkDerivation { - pname = "step-function"; - version = "0.2.1"; - sha256 = "1izshxrfhidvdhmnyrnqx2lqv2qjpisjdrxa687yywswcd4nlf9g"; - revision = "2"; - editedCabalFile = "1vrlv163yl2997lsas5qj1d5jp563dzy78mdhfp3bd57lvjz396r"; + pname = "stratosphere-resiliencehub"; + version = "1.0.1"; + sha256 = "0kw9xq37ksz6g5whwxyrac5s99piphf4vn0mrin5z62a3m6kpjkc"; libraryHaskellDepends = [ + aeson base - containers - deepseq - QuickCheck - ]; - testHaskellDepends = [ - base - QuickCheck + stratosphere ]; - description = "Staircase functions or piecewise constant functions"; - license = lib.licensesSpdx."BSD-3-Clause"; + description = "Stratosphere integration for AWS ResilienceHub"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - stepwise = callPackage ( + stratosphere-resourceexplorer2 = callPackage ( { mkDerivation, + aeson, base, - containers, - mtl, + stratosphere, }: mkDerivation { - pname = "stepwise"; - version = "1.0.2"; - sha256 = "059k8g3wb4hkxk42vm83vv6kh3igrpf7fc97xvn3qai5rx3jmgqf"; + pname = "stratosphere-resourceexplorer2"; + version = "1.0.1"; + sha256 = "1slbi6lq35h9zzqqr38h0y5a8kl0il7j3g1pcjbvarsnk0ga6zj5"; libraryHaskellDepends = [ + aeson base - containers - mtl + stratosphere ]; - license = "LGPL"; + description = "Stratosphere integration for AWS ResourceExplorer2"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; } ) { }; - stern-brocot = callPackage ( + stratosphere-resourcegroups = callPackage ( { mkDerivation, - alg, + aeson, base, - criterion, - smallcheck, - tasty, - tasty-smallcheck, - universe-base, + stratosphere, }: mkDerivation { - pname = "stern-brocot"; - version = "0.1.0.0"; - sha256 = "0x3d6k1vbwa0gn41z3lq877l70mghq1gic37l6vg1v4s5cyx0w6m"; + pname = "stratosphere-resourcegroups"; + version = "1.0.1"; + sha256 = "1qrya2z3rclhpzk8cjjqy499n98wv8ki9siqc314x9y8cv7alg39"; libraryHaskellDepends = [ - alg - base - universe-base - ]; - testHaskellDepends = [ - base - smallcheck - tasty - tasty-smallcheck - universe-base - ]; - benchmarkHaskellDepends = [ + aeson base - criterion + stratosphere ]; - description = "Positive rational numbers represented as paths in the Stern-Brocot tree"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS ResourceGroups"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - stgi = callPackage ( + stratosphere-robomaker = callPackage ( { mkDerivation, - ansi-terminal, - ansi-wl-pprint, + aeson, base, - containers, - deepseq, - parsers, - prettyprinter, - prettyprinter-ansi-terminal, - QuickCheck, - semigroups, - smallcheck, - tasty, - tasty-html, - tasty-hunit, - tasty-quickcheck, - tasty-rerun, - tasty-smallcheck, - template-haskell, - text, - th-lift, - transformers, - trifecta, + stratosphere, }: mkDerivation { - pname = "stgi"; - version = "1.1"; - sha256 = "1kl2nxwm8r2pjciy5kmkf4mqqrrc8iy5i02h76xm0ysmwzndq1ck"; - isLibrary = true; - isExecutable = true; + pname = "stratosphere-robomaker"; + version = "1.0.1"; + sha256 = "0wrvhjq70d3ag5jnacja6dmbz7xqag7r8mcf05xw5wk2nqpkm5mn"; libraryHaskellDepends = [ - ansi-wl-pprint - base - containers - deepseq - parsers - prettyprinter - prettyprinter-ansi-terminal - semigroups - template-haskell - text - th-lift - transformers - trifecta - ]; - executableHaskellDepends = [ - ansi-terminal - base - semigroups - text - ]; - testHaskellDepends = [ - ansi-wl-pprint + aeson base - containers - deepseq - prettyprinter - QuickCheck - semigroups - smallcheck - tasty - tasty-html - tasty-hunit - tasty-quickcheck - tasty-rerun - tasty-smallcheck - template-haskell - text + stratosphere ]; - description = "Educational implementation of the STG (Spineless Tagless G-machine)"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS RoboMaker"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - mainProgram = "stgi-exe"; broken = true; } ) { }; - stickyKeysHotKey = callPackage ( - { mkDerivation, base }: - mkDerivation { - pname = "stickyKeysHotKey"; - version = "0.1.0.2"; - sha256 = "0iw1ia3sf4rwzbkcckbxzr288i6lbgv7vaaynyrkg2c17gjs492a"; - libraryHaskellDepends = [ base ]; - description = "get and set STICKYKEYS.SKF_HOTKEYACTIVE"; - license = lib.licenses.bsd3; - } - ) { }; - - stitch = callPackage ( + stratosphere-rolesanywhere = callPackage ( { mkDerivation, + aeson, base, - Cabal, - containers, - criterion, - hspec, - text, - transformers, + stratosphere, }: mkDerivation { - pname = "stitch"; - version = "0.6.0.0"; - sha256 = "1pk2snnvdn9f7xpnhgffzdqxps4spgvmcrbhjdfwpjxrlnxgviq9"; - revision = "1"; - editedCabalFile = "0w4d5m5682nv1aas7d47rk1ddgdxc3rvc0qz1dsmxkajfqi1axpk"; + pname = "stratosphere-rolesanywhere"; + version = "1.0.1"; + sha256 = "1ig8p7p8v7wz1iila0srz790z5dc3kyf5mz8chxsrhqlm9fjmrng"; libraryHaskellDepends = [ + aeson base - containers - text - transformers - ]; - testHaskellDepends = [ - base - Cabal - hspec - text - ]; - benchmarkHaskellDepends = [ - base - criterion + stratosphere ]; - description = "lightweight CSS DSL"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS RolesAnywhere"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - stm_2_5_3_1 = callPackage ( + stratosphere-route53 = callPackage ( { mkDerivation, - array, + aeson, base, + stratosphere, }: mkDerivation { - pname = "stm"; - version = "2.5.3.1"; - sha256 = "1rrh4s07vav9mlhpqsq9r6r0gh3f4k8g1gjlx63ngkpdj59ldc7b"; - revision = "1"; - editedCabalFile = "1pfrf0r1f3hl9x3nxv5nja6hrflm72z3cls4x5vljnzmrp4mf6s2"; + pname = "stratosphere-route53"; + version = "1.0.1"; + sha256 = "04cbn75vsa5w58m2ly1j14clnxa57mivyqa8ka4hnzg5dhyz0c0m"; libraryHaskellDepends = [ - array + aeson base + stratosphere ]; - description = "Software Transactional Memory"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS Route53"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - stm-actor = callPackage ( + stratosphere-route53profiles = callPackage ( { mkDerivation, + aeson, base, - hspec, - mtl, - stm, - stm-queue, - transformers, - unliftio-core, + stratosphere, }: mkDerivation { - pname = "stm-actor"; - version = "0.3.1.1"; - sha256 = "0c94y6ancgv90nf2shskjlnkrsx9rcmz10jmcv4xxnmr2cvc16f3"; + pname = "stratosphere-route53profiles"; + version = "1.0.1"; + sha256 = "1lvvby8jnns1wk1nb759g7fwi1qb65qm9kiw0c208fsyvd03k7bf"; libraryHaskellDepends = [ + aeson base - mtl - stm - stm-queue - transformers - unliftio-core - ]; - testHaskellDepends = [ - base - hspec - mtl - stm - stm-queue + stratosphere ]; - description = "A simplistic actor model based on STM"; - license = lib.licensesSpdx."MIT"; + description = "Stratosphere integration for AWS Route53Profiles"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; } ) { }; - stm-channelize = callPackage ( + stratosphere-route53recoverycontrol = callPackage ( { mkDerivation, + aeson, base, - stm, + stratosphere, }: mkDerivation { - pname = "stm-channelize"; - version = "0.1.1"; - sha256 = "1aj4zibq54ssbb7smkxjrjl24d9vccgjpl2b9261yqyg692cz9hm"; + pname = "stratosphere-route53recoverycontrol"; + version = "1.0.1"; + sha256 = "0jpnq7spgsisjnm9g37rnxjpzpc8yjprk601jl0jprs23jdxlahb"; libraryHaskellDepends = [ + aeson base - stm + stratosphere ]; - description = "Transactional I/O for duplex streams"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS Route53RecoveryControl"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - stm-chans = callPackage ( + stratosphere-route53recoveryreadiness = callPackage ( { mkDerivation, + aeson, base, - stm, + stratosphere, }: mkDerivation { - pname = "stm-chans"; - version = "3.0.0.9"; - sha256 = "0p9jq5fq3g77kf2kq807zrwqpw0z9a6zhw57h21wk4yb6zshs1ks"; + pname = "stratosphere-route53recoveryreadiness"; + version = "1.0.1"; + sha256 = "11w24kbfnw0nbxlgvh5k11ywn95ln62yh9xxgfnlq4ivpnf79p05"; libraryHaskellDepends = [ + aeson base - stm + stratosphere ]; - description = "Additional types of channels for STM"; - license = lib.licensesSpdx."BSD-3-Clause"; + description = "Stratosphere integration for AWS Route53RecoveryReadiness"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - stm-chunked-queues = callPackage ( + stratosphere-route53resolver = callPackage ( { mkDerivation, - async, + aeson, base, - HUnit, - stm, - tasty, - tasty-hunit, + stratosphere, }: mkDerivation { - pname = "stm-chunked-queues"; - version = "0.1.0.0"; - sha256 = "0264air2mhwbya2sxskrh4z1bs8il7d9iv4vm6wyz8zxxc95v1nj"; + pname = "stratosphere-route53resolver"; + version = "1.0.1"; + sha256 = "124krxyk1n93ppnchbfqjjdgd98ns2bdzq97yr3vh026hv8sysjb"; libraryHaskellDepends = [ - async - base - stm - ]; - testHaskellDepends = [ - async + aeson base - HUnit - stm - tasty - tasty-hunit + stratosphere ]; - description = "Chunked Communication Queues"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS Route53Resolver"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; } ) { }; - stm-conduit = callPackage ( + stratosphere-rtbfabric = callPackage ( { mkDerivation, - async, + aeson, base, - cereal, - cereal-conduit, - conduit, - conduit-extra, - directory, - doctest, - exceptions, - HUnit, - monad-loops, - QuickCheck, - resourcet, - stm, - stm-chans, - test-framework, - test-framework-hunit, - test-framework-quickcheck2, - transformers, - unliftio, + stratosphere, }: mkDerivation { - pname = "stm-conduit"; - version = "4.0.1"; - sha256 = "0hhlxvpp7mah8dcvkknh6skx44jfk3092zz2w52zlr255bkmn3p8"; - revision = "1"; - editedCabalFile = "1iyk2wfkpyq3jn0lybgf21b95rmkzgpvr8m066j06z4xngcvab36"; + pname = "stratosphere-rtbfabric"; + version = "1.0.1"; + sha256 = "0f0kirrhnjl9h4n8z2fd1f3bwpj7pmwgqr3byjjvf3v0217nlysv"; libraryHaskellDepends = [ - async - base - cereal - cereal-conduit - conduit - conduit-extra - directory - exceptions - monad-loops - resourcet - stm - stm-chans - transformers - unliftio - ]; - testHaskellDepends = [ + aeson base - conduit - directory - doctest - HUnit - QuickCheck - resourcet - stm - stm-chans - test-framework - test-framework-hunit - test-framework-quickcheck2 - transformers - unliftio + stratosphere ]; - description = "Introduces conduits to channels, and promotes using conduits concurrently"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS RTBFabric"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - stm-containers = callPackage ( + stratosphere-rum = callPackage ( { mkDerivation, + aeson, base, - deferred-folds, - focus, - foldl, - free, - hashable, - list-t, - quickcheck-instances, - rerebase, - stm-hamt, - tasty, - tasty-hunit, - tasty-quickcheck, - transformers, + stratosphere, }: mkDerivation { - pname = "stm-containers"; - version = "1.2.1.1"; - sha256 = "0w28l4pyp6pix17ybnf70mbs0b1k6nybsg631g1vh7mhpni68v15"; + pname = "stratosphere-rum"; + version = "1.0.1"; + sha256 = "0gs13jad9clylr4f61y96vn8dzvm0z9y68s3ayzq7d2in83wxg58"; libraryHaskellDepends = [ + aeson base - deferred-folds - focus - hashable - list-t - stm-hamt - transformers - ]; - testHaskellDepends = [ - deferred-folds - focus - foldl - free - list-t - quickcheck-instances - rerebase - tasty - tasty-hunit - tasty-quickcheck + stratosphere ]; - description = "Containers for STM"; - license = lib.licensesSpdx."MIT"; - maintainers = [ lib.maintainers.maralorn ]; + description = "Stratosphere integration for AWS RUM"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - stm-delay = callPackage ( + stratosphere-s3 = callPackage ( { mkDerivation, - async, + aeson, base, - stm, - time, + stratosphere, }: mkDerivation { - pname = "stm-delay"; - version = "0.1.1.2"; - sha256 = "0k60cpqzqy8c6xk5qw5135a7hlxnh670kb7fhjmz819hsi1n7vq5"; + pname = "stratosphere-s3"; + version = "1.0.1"; + sha256 = "0ka9iyk8hz489ps0w3cy224awz9yz7zi95xxwkdd4d5skrybwr63"; libraryHaskellDepends = [ + aeson base - stm - ]; - testHaskellDepends = [ - async - base - stm - time + stratosphere ]; - description = "Updatable one-shot timer polled with STM"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS S3"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - stm-extras = callPackage ( + stratosphere-s3express = callPackage ( { mkDerivation, + aeson, base, - stm, + stratosphere, }: mkDerivation { - pname = "stm-extras"; - version = "0.1.0.3"; - sha256 = "0pmpf1r8q1favrbgvrnggvs93vwvml79yfqbs4xjqnjsglahl8c8"; + pname = "stratosphere-s3express"; + version = "1.0.1"; + sha256 = "0cz18v2qqbbmlbn19kdg65qmcylmv0nas0qzmr3qigr8q5a6gmhx"; libraryHaskellDepends = [ + aeson base - stm + stratosphere ]; - description = "Extra STM functions"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS S3Express"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - stm-firehose = callPackage ( + stratosphere-s3objectlambda = callPackage ( { mkDerivation, + aeson, base, - blaze-builder, - conduit, - hspec, - http-types, - HUnit, - resourcet, - stm, - stm-chans, - stm-conduit, - transformers, - wai, - wai-conduit, - warp, + stratosphere, }: mkDerivation { - pname = "stm-firehose"; - version = "0.3.0.2"; - sha256 = "1y6pis2p93kmwlxzdlx1sc975wpdkswv3srrpl60wmxsgvxb66b5"; + pname = "stratosphere-s3objectlambda"; + version = "1.0.1"; + sha256 = "0vq5ryxq6nsbi6hjq93rw9fpkv7gpfs13gzz266xdri2mq9bdzsa"; libraryHaskellDepends = [ + aeson base - blaze-builder - conduit - http-types - resourcet - stm - stm-chans - stm-conduit - transformers - wai - wai-conduit - warp - ]; - testHaskellDepends = [ - base - hspec - HUnit - stm + stratosphere ]; - description = "Conduits and STM operations for fire hoses"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS S3ObjectLambda"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; } ) { }; - stm-hamt = callPackage ( + stratosphere-s3outposts = callPackage ( { mkDerivation, - async, + aeson, base, - criterion, - deferred-folds, - focus, - free, - hashable, - list-t, - primitive, - primitive-extras, - QuickCheck, - quickcheck-instances, - random, - rebase, - rerebase, - tasty, - tasty-hunit, - tasty-quickcheck, - transformers, + stratosphere, }: mkDerivation { - pname = "stm-hamt"; - version = "1.2.1.1"; - sha256 = "11k7a2fzgng23ggng1d4v3nhai0d1b3bkci56v7p2n0vdbr7w5d7"; + pname = "stratosphere-s3outposts"; + version = "1.0.1"; + sha256 = "1zdj01bgipzx92rk4zjgd2nxdn0amhk3xpycrsks7vh7lpiyn4d1"; libraryHaskellDepends = [ + aeson base - deferred-folds - focus - hashable - list-t - primitive - primitive-extras - transformers - ]; - testHaskellDepends = [ - deferred-folds - focus - QuickCheck - quickcheck-instances - rerebase - tasty - tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - async - criterion - focus - free - random - rebase + stratosphere ]; - description = "STM-specialised Hash Array Mapped Trie"; - license = lib.licensesSpdx."MIT"; + description = "Stratosphere integration for AWS S3Outposts"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - stm-incremental = callPackage ( + stratosphere-s3tables = callPackage ( { mkDerivation, + aeson, base, - hspec, - stm, + stratosphere, }: mkDerivation { - pname = "stm-incremental"; - version = "0.1.1.0"; - sha256 = "15fymixnlbbdnpwqlnv83yzyx89a2x8y3h8d95xb4ad1d4fs79z3"; + pname = "stratosphere-s3tables"; + version = "1.0.1"; + sha256 = "123i8dh3zm7asqb9kkdw39pw8ryv678dyx47zz7qk413k8f9049f"; libraryHaskellDepends = [ + aeson base - stm - ]; - testHaskellDepends = [ - base - hspec - stm + stratosphere ]; - description = "A library for constructing incremental computations"; - license = lib.licensesSpdx."MIT"; + description = "Stratosphere integration for AWS S3Tables"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - stm-io-hooks = callPackage ( + stratosphere-sagemaker = callPackage ( { mkDerivation, - array, + aeson, base, - mtl, - stm, + stratosphere, }: mkDerivation { - pname = "stm-io-hooks"; - version = "1.1.2"; - sha256 = "021s1ck8b09z6khaky2g8ymxf37hznqrl9n4sakb8j57mhliayvc"; + pname = "stratosphere-sagemaker"; + version = "1.0.1"; + sha256 = "0r2q9crsvhbwvgcyq9lh068i2a1xd448k578pj50qhczcpf5l6a0"; libraryHaskellDepends = [ - array + aeson base - mtl - stm + stratosphere ]; - description = "Launch your IO-actions from within the STM monad"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS SageMaker"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - stm-lifted = callPackage ( + stratosphere-scheduler = callPackage ( { mkDerivation, + aeson, base, - stm, - transformers, + stratosphere, }: mkDerivation { - pname = "stm-lifted"; - version = "2.5.0.0"; - sha256 = "0zsah3s288cgb2h4gdjqvby1c3xp95nvgd561sdhigxcwlxk2658"; + pname = "stratosphere-scheduler"; + version = "1.0.1"; + sha256 = "1s5mncqps960f0r9088w8q7118xzz3s7bclxc0qqh421q4nh1lka"; libraryHaskellDepends = [ + aeson base - stm - transformers + stratosphere ]; - description = "Software Transactional Memory lifted to MonadIO"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS Scheduler"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; } ) { }; - stm-linkedlist = callPackage ( + stratosphere-sdb = callPackage ( { mkDerivation, + aeson, base, - stm, + stratosphere, }: mkDerivation { - pname = "stm-linkedlist"; - version = "0.1.0.0"; - sha256 = "1x65z38dx0qi55fmbarc1827wpl4j08m23nklq8854y7kqznf9kr"; + pname = "stratosphere-sdb"; + version = "1.0.1"; + sha256 = "0mlqa3wamqy3indgcbdgimray3gm1pimj8vgi871c2g93wmfbwvh"; libraryHaskellDepends = [ + aeson base - stm + stratosphere ]; - description = "Mutable, doubly linked lists for STM"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS SDB"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - stm-orelse-io = callPackage ( + stratosphere-secretsmanager = callPackage ( { mkDerivation, + aeson, base, - stm, + stratosphere, }: mkDerivation { - pname = "stm-orelse-io"; - version = "0.1"; - sha256 = "11v0xc5zlw641mf6r5k8lqhzxc4y9bsx3xivwmbkfniph0x7g5m4"; + pname = "stratosphere-secretsmanager"; + version = "1.0.1"; + sha256 = "0v10al3bp2p0977igk80y5vp55vhiajsggfz715a0sxcmsr5b26j"; libraryHaskellDepends = [ + aeson base - stm + stratosphere ]; - description = "Choose between the return value of an STM operation and an IO action"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS SecretsManager"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - stm-promise = callPackage ( + stratosphere-securityhub = callPackage ( { mkDerivation, + aeson, base, - mtl, - process, - QuickCheck, - stm, - unix, + stratosphere, }: mkDerivation { - pname = "stm-promise"; - version = "0.0.3.1"; - sha256 = "07wrbj88gwdbsczjr225g0z1ai1v13mdg71gl9qsmipqs0s0pfwc"; + pname = "stratosphere-securityhub"; + version = "1.0.1"; + sha256 = "0zlnjw7w7hqwh92nf282w2cbwka67hjsh20z6p0wil86ryp1jgz1"; libraryHaskellDepends = [ + aeson base - mtl - process - stm - unix - ]; - testHaskellDepends = [ - base - QuickCheck - stm + stratosphere ]; - description = "Simple STM Promises for IO computations and external processes"; - license = lib.licenses.lgpl3Only; + description = "Stratosphere integration for AWS SecurityHub"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; } ) { }; - stm-queue = callPackage ( + stratosphere-securitylake = callPackage ( { mkDerivation, - async, + aeson, base, - criterion, - deepseq, - hspec, - stm, - time, + stratosphere, }: mkDerivation { - pname = "stm-queue"; - version = "0.2.0.0"; - sha256 = "0g4w5wv1wmhg2sj6pyq5bd0fi1b7zf99f1z0sjl3l8q0jwks16cy"; + pname = "stratosphere-securitylake"; + version = "1.0.1"; + sha256 = "0bx2v6dllhq05ldpgw4w9krvqqwhzrnkdggji0hid7p8s0n4pakh"; libraryHaskellDepends = [ + aeson base - stm - ]; - testHaskellDepends = [ - async - base - hspec - stm - ]; - benchmarkHaskellDepends = [ - async - base - criterion - deepseq - hspec - stm - time + stratosphere ]; - description = "An implementation of a real-time concurrent queue"; - license = lib.licensesSpdx."MIT"; + description = "Stratosphere integration for AWS SecurityLake"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - stm-queue-extras = callPackage ( + stratosphere-servicecatalog = callPackage ( { mkDerivation, + aeson, base, - stm, - stm-chans, + stratosphere, }: mkDerivation { - pname = "stm-queue-extras"; - version = "0.2.0.0.1"; - sha256 = "1zb6i8dg11pshvb6rm5sqdsbq547h4ys6wlmh2ywcmks2ss7q100"; + pname = "stratosphere-servicecatalog"; + version = "1.0.1"; + sha256 = "0wbdxr206mw3kd4n6dmfisii2yihi8vfmk32wiy4vx7ya2wiz0r8"; libraryHaskellDepends = [ + aeson base - stm - stm-chans + stratosphere ]; - description = "Extra queue utilities for STM"; - license = lib.licenses.asl20; + description = "Stratosphere integration for AWS ServiceCatalog"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - stm-sbchan = callPackage ( + stratosphere-servicecatalogappregistry = callPackage ( { mkDerivation, + aeson, base, - stm, - stm-tlist, + stratosphere, }: mkDerivation { - pname = "stm-sbchan"; - version = "0.1"; - sha256 = "0fz4vfbyr848b32vbdm3pjj9gwi7wj39l3vsqmdpjnbfwvkw0y0s"; + pname = "stratosphere-servicecatalogappregistry"; + version = "1.0.1"; + sha256 = "00n9q198vhvq1cg7l9kvhalk4fgmf4694pc57q6aw9mpa1k0449l"; libraryHaskellDepends = [ + aeson base - stm - stm-tlist + stratosphere ]; - description = "Bounded channel for STM where item sizes can vary"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS ServiceCatalogAppRegistry"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - stm-split = callPackage ( + stratosphere-servicediscovery = callPackage ( { mkDerivation, + aeson, base, - stm, + stratosphere, }: mkDerivation { - pname = "stm-split"; - version = "0.0.2.1"; - sha256 = "06c41p01x62p79bzwryjxr34l7cj65gl227fwwsvd9l6ihk8grp8"; + pname = "stratosphere-servicediscovery"; + version = "1.0.1"; + sha256 = "119ky6jf7j7782dgxhpg5j37pk953pblrmr48i9gwcxj1rwwnjfq"; libraryHaskellDepends = [ + aeson base - stm + stratosphere ]; - description = "TMVars, TVars and TChans with distinguished input and output side"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.thielema ]; + description = "Stratosphere integration for AWS ServiceDiscovery"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - stm-stats = callPackage ( + stratosphere-ses = callPackage ( { mkDerivation, + aeson, base, - containers, - stm, - template-haskell, - time, + stratosphere, }: mkDerivation { - pname = "stm-stats"; - version = "0.2.0.0"; - sha256 = "0i8ky2l8lvh7nymxglvbifp0ylbyjw20p75avzb51zpzx6qkjkqa"; + pname = "stratosphere-ses"; + version = "1.0.1"; + sha256 = "1x9rzff4r36187ikki2d7nldji55ch960fa1n4lyvnylz80m4yqf"; libraryHaskellDepends = [ + aeson base - containers - stm - template-haskell - time + stratosphere ]; - description = "retry statistics for STM transactions"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS SES"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; } ) { }; - stm-supply = callPackage ( + stratosphere-shield = callPackage ( { mkDerivation, - async, + aeson, base, - concurrent-supply, - QuickCheck, - random, - Unique, + stratosphere, }: mkDerivation { - pname = "stm-supply"; - version = "0.2.0.0"; - sha256 = "131q9y32120laylc0r1xz5pkmw69yky17vc621rlk5dcwnkasfgq"; + pname = "stratosphere-shield"; + version = "1.0.1"; + sha256 = "0wy1l2x6b2pm55f0w2dgbvxw98y0fn5lcv94j1zak5sfzqqk2dj9"; libraryHaskellDepends = [ + aeson base - concurrent-supply - ]; - testHaskellDepends = [ - async - base - QuickCheck - random - Unique + stratosphere ]; - description = "STM wrapper around Control.Concurrent.Supply."; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS Shield"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - stm-tlist = callPackage ( + stratosphere-signer = callPackage ( { mkDerivation, + aeson, base, - stm, + stratosphere, }: mkDerivation { - pname = "stm-tlist"; - version = "0.1.1"; - sha256 = "0ssr8phmm9m93kcp045jr0rcn1dxzz202cgyw1vzjl2ch55bcsy6"; + pname = "stratosphere-signer"; + version = "1.0.1"; + sha256 = "0i26xyf400iljzxibdi9glay5c8qbslrw890hm5mr9bz9wf85k3s"; libraryHaskellDepends = [ + aeson base - stm + stratosphere ]; - description = "Mutable, singly-linked list in STM"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS Signer"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; } ) { }; - stmcontrol = callPackage ( + stratosphere-simspaceweaver = callPackage ( { mkDerivation, + aeson, base, - haskell98, - mtl, - stm, + stratosphere, }: mkDerivation { - pname = "stmcontrol"; - version = "0.1"; - sha256 = "0m42pgnvzqadqycq0qbml5da0zw7myc24y5vka1qydz7rdfyaa24"; - enableSeparateDataOutput = true; + pname = "stratosphere-simspaceweaver"; + version = "1.0.1"; + sha256 = "1vm7w4bipylgg3w7z2dcwkb5iz2zzl2qd7s1sld53crjxzqg52aa"; libraryHaskellDepends = [ + aeson base - haskell98 - mtl - stm + stratosphere ]; - description = "Control communication among retrying transactions"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS SimSpaceWeaver"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - stochastic = callPackage ( + stratosphere-smsvoice = callPackage ( { mkDerivation, + aeson, base, - Chart, - Chart-cairo, - containers, - mtl, - random, + stratosphere, }: mkDerivation { - pname = "stochastic"; - version = "0.1.1.1"; - sha256 = "0qssg3mmk4qz2p8isg70m278yi3mraigk7vrvahsfnx8kmx85f84"; + pname = "stratosphere-smsvoice"; + version = "1.0.1"; + sha256 = "1vhl13gxlacjrr1di6zfq5445vm2zybg8q29wqwhwb54jx7ral4h"; libraryHaskellDepends = [ + aeson base - containers - mtl - random - ]; - testHaskellDepends = [ - base - Chart - Chart-cairo - containers - mtl - random + stratosphere ]; - description = "Monadic composition of probabilistic functions and sampling"; - license = lib.licenses.gpl3Only; + description = "Stratosphere integration for AWS SMSVOICE"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; } ) { }; - stocks = callPackage ( + stratosphere-sns = callPackage ( { mkDerivation, aeson, base, - bytestring, - containers, - http-conduit, - HUnit, - semigroups, - unordered-containers, + stratosphere, }: mkDerivation { - pname = "stocks"; - version = "0.2.0.0"; - sha256 = "1rbspmxw81739hjzj5bd365zm9jqmsq5lv70d3wc8vvvf92zimi9"; + pname = "stratosphere-sns"; + version = "1.0.1"; + sha256 = "0h4j08pcby4a831g33m5d8x3swwz4rzxnli9dm02f9q0vdfbv712"; libraryHaskellDepends = [ aeson base - bytestring - containers - http-conduit - semigroups - unordered-containers - ]; - testHaskellDepends = [ - base - bytestring - HUnit + stratosphere ]; - description = "Library for the IEX Trading API"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS SNS"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - stomp-conduit = callPackage ( + stratosphere-sqs = callPackage ( { mkDerivation, + aeson, base, - conduit, - mime, - mtl, - resourcet, - stomp-queue, - stompl, + stratosphere, }: mkDerivation { - pname = "stomp-conduit"; - version = "0.5.0"; - sha256 = "1mxfidkqqxswnbj2i4hjcbwppfpvl4a3x3jaki1swmw1qxhcqsk9"; + pname = "stratosphere-sqs"; + version = "1.0.1"; + sha256 = "0nnvijyz095jz5492j9d2s1x1g07l1ch89zbzwqwab9ryw0irc10"; libraryHaskellDepends = [ + aeson base - conduit - mime - mtl - resourcet - stomp-queue - stompl + stratosphere ]; - description = "Stompl Conduit Client"; - license = "LGPL"; + description = "Stratosphere integration for AWS SQS"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - stomp-patterns = callPackage ( + stratosphere-ssm = callPackage ( { mkDerivation, + aeson, base, - bytestring, - containers, - mime, - mtl, - split, - stomp-queue, - stompl, - time, + stratosphere, }: mkDerivation { - pname = "stomp-patterns"; - version = "0.5.0"; - sha256 = "118r2v66nl3l5rh4sgb1kp886l63a266yiq4dr3m1c0wy4c2si97"; + pname = "stratosphere-ssm"; + version = "1.0.1"; + sha256 = "1d8gpm3wx837vfy73ab2g1nqzsvw67m16b3zzcm6r2zn9nvxpfgh"; libraryHaskellDepends = [ + aeson base - bytestring - containers - mime - mtl - split - stomp-queue - stompl - time + stratosphere ]; - description = "Stompl MOM Stomp Patterns"; - license = "LGPL"; + description = "Stratosphere integration for AWS SSM"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - stomp-queue = callPackage ( + stratosphere-ssmcontacts = callPackage ( { mkDerivation, - attoparsec, + aeson, base, - bytestring, - conduit, - conduit-extra, - mime, - mtl, - network-conduit-tls, - resourcet, - split, - stompl, - time, - utf8-string, + stratosphere, }: mkDerivation { - pname = "stomp-queue"; - version = "0.5.1"; - sha256 = "1hg9y90zw6blr54dq78cb111lxga6pfsy4llsn6hqqyyzsd5358l"; + pname = "stratosphere-ssmcontacts"; + version = "1.0.1"; + sha256 = "1zfgkzqyg3lalay9q7fzf2vmgbknzhp5m3j7pwx0vzvvqd9wkssy"; libraryHaskellDepends = [ - attoparsec + aeson base - bytestring - conduit - conduit-extra - mime - mtl - network-conduit-tls - resourcet - split - stompl - time - utf8-string + stratosphere ]; - description = "Stompl Client Library"; - license = "LGPL"; + description = "Stratosphere integration for AWS SSMContacts"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - stompl = callPackage ( + stratosphere-ssmguiconnect = callPackage ( { mkDerivation, - attoparsec, + aeson, base, - bytestring, - mime, - split, - text, - utf8-string, - word8, + stratosphere, }: mkDerivation { - pname = "stompl"; - version = "0.6.0"; - sha256 = "07h5y6gw5zrypmm6s1p7yy3k309hph8jy3yf7mr4zb9dwzgcrl71"; + pname = "stratosphere-ssmguiconnect"; + version = "1.0.1"; + sha256 = "14nxasm9kj8rwbzjq6jclpi9fawyi7zr7ygvsgpmvr852f7wr94g"; libraryHaskellDepends = [ - attoparsec + aeson base - bytestring - mime - split - text - utf8-string - word8 + stratosphere ]; - description = "Stomp Parser and Utilities"; - license = "LGPL"; + description = "Stratosphere integration for AWS SSMGuiConnect"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - stooq-api = callPackage ( + stratosphere-ssmincidents = callPackage ( { mkDerivation, + aeson, base, - bytestring, - cassava, - lens, - text, - time, - utf8-string, - vector, - wreq, + stratosphere, }: mkDerivation { - pname = "stooq-api"; - version = "0.4.2.0"; - sha256 = "0cfhmicx1z4biscn65ya5brqm606dxfnbi30f67k2w4km5vhs3d8"; + pname = "stratosphere-ssmincidents"; + version = "1.0.1"; + sha256 = "05sxv76viz9zd6n4mcp1ky4lnmgv7pk55g4ggg081vp8wkq6z2kc"; libraryHaskellDepends = [ + aeson base - bytestring - cassava - lens - text - time - utf8-string - vector - wreq + stratosphere ]; - doHaddock = false; - description = "A simple wrapper around stooq.pl API for downloading market data."; + description = "Stratosphere integration for AWS SSMIncidents"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; } ) { }; - stopwatch = callPackage ( + stratosphere-ssmquicksetup = callPackage ( { mkDerivation, + aeson, base, - clock, - hspec, - hspec-discover, - transformers, + stratosphere, }: mkDerivation { - pname = "stopwatch"; - version = "0.1.0.7"; - sha256 = "0vbbb60gi2cyi9nxf4xwxjfrx5kc614pgywkl65ayakrvn8ab2hp"; + pname = "stratosphere-ssmquicksetup"; + version = "1.0.1"; + sha256 = "0cazdklrv91qj32cpfd8f46f2hxvjvqz5xm2c17ssyafrsbfz7fs"; libraryHaskellDepends = [ + aeson base - clock - transformers - ]; - testHaskellDepends = [ - base - clock - hspec + stratosphere ]; - testToolDepends = [ hspec-discover ]; - description = "A simple stopwatch utility"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS SSMQuickSetup"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - storable = callPackage ( + stratosphere-sso = callPackage ( { mkDerivation, + aeson, base, - mtl, + stratosphere, }: mkDerivation { - pname = "storable"; - version = "0.1"; - sha256 = "10289mf3fskfpg0jwgzyhvg4arb0hcj3r94jngb3hlbidvf8k1jg"; + pname = "stratosphere-sso"; + version = "1.0.1"; + sha256 = "0wvyamibj2cjp1nvib9fn66gbalhzmrplzgzr6kyw2b9fq40lrb8"; libraryHaskellDepends = [ + aeson base - mtl + stratosphere ]; - description = "Storable type class for variable-sized data"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS SSO"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; } ) { }; - storable-complex = callPackage ( + stratosphere-stepfunctions = callPackage ( { mkDerivation, + aeson, base, - base-orphans, + stratosphere, }: mkDerivation { - pname = "storable-complex"; - version = "0.2.3.0"; - sha256 = "0fnwbfmd5vsaaqvf9182qdcjrzcfjd1zhdyvjwzifbwvn6r9kx4s"; + pname = "stratosphere-stepfunctions"; + version = "1.0.1"; + sha256 = "1lvfw2pn42dq8dvynhw3j6sis6hzihxk4irz86d414y245rgdx3p"; libraryHaskellDepends = [ + aeson base - base-orphans + stratosphere ]; - description = "Storable instance for Complex"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS StepFunctions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - storable-endian = callPackage ( + stratosphere-supportapp = callPackage ( { mkDerivation, + aeson, base, - byteorder, + stratosphere, }: mkDerivation { - pname = "storable-endian"; - version = "0.2.6.1"; - sha256 = "0icyf3w9hw2k5naxjsfvmykj98l94bz626qadz37r0wv22lsicff"; + pname = "stratosphere-supportapp"; + version = "1.0.1"; + sha256 = "0skrw2d93vp450ll39hydyq6da3xmv6znqc3k4nldc3idlnkd0xa"; libraryHaskellDepends = [ + aeson base - byteorder + stratosphere ]; - description = "Storable instances with endianness"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS SupportApp"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - storable-enum = callPackage ( + stratosphere-synthetics = callPackage ( { mkDerivation, + aeson, base, - prelude-compat, + stratosphere, }: mkDerivation { - pname = "storable-enum"; - version = "0.0"; - sha256 = "01nllxm3fx9f1cxay80bwvmpawrwipk7d2c6xb1q5fr3iwnqqaa2"; + pname = "stratosphere-synthetics"; + version = "1.0.1"; + sha256 = "1dxs2incr63j3lfb3zp1x2gh8rj03r10pvvm3wihk0qy04535m57"; libraryHaskellDepends = [ + aeson base - prelude-compat + stratosphere ]; - description = "Wrapper that makes any Enum type Storable"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS Synthetics"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - storable-generic = callPackage ( + stratosphere-systemsmanagersap = callPackage ( { mkDerivation, + aeson, base, - storable-peek-poke, - template-haskell, + stratosphere, }: mkDerivation { - pname = "storable-generic"; - version = "0.1.0.5"; - sha256 = "1hzxshar3iw5z8wnwkwmpn2sfjlvrm2cklq04f4drpm8gd10fzch"; + pname = "stratosphere-systemsmanagersap"; + version = "1.0.1"; + sha256 = "1lshjnhyv0ffhq4di5ppz90b2iwys67l81ga44aqg0z11kdl80x9"; libraryHaskellDepends = [ + aeson base - storable-peek-poke - template-haskell - ]; - testHaskellDepends = [ - base - storable-peek-poke - template-haskell + stratosphere ]; - description = "Derive Storable instances with GHC.Generics"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS SystemsManagerSAP"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - storable-hetero-list = callPackage ( + stratosphere-timestream = callPackage ( { mkDerivation, + aeson, base, - hetero-parameter-list, - storable-peek-poke, + stratosphere, }: mkDerivation { - pname = "storable-hetero-list"; - version = "0.1.0.4"; - sha256 = "12d32lwr4apnv8m5c2kh4n1zmka2vgcigziih4ndcal4m0sh1niz"; + pname = "stratosphere-timestream"; + version = "1.0.1"; + sha256 = "0jg18x0mz4jx545v2a8jqrvb28zi8jjc8lqdx7gl8iq39h3qll8h"; libraryHaskellDepends = [ + aeson base - hetero-parameter-list - storable-peek-poke - ]; - testHaskellDepends = [ - base - hetero-parameter-list - storable-peek-poke + stratosphere ]; - description = "about Storable and Hetero list"; - license = lib.licenses.bsd3; - } - ) { }; - - storable-offset = callPackage ( - { mkDerivation, base }: - mkDerivation { - pname = "storable-offset"; - version = "0.1.0.0"; - sha256 = "0m0qmnnb07vhzs1ds7h4cfhba4rzb3abpijk8vjwncanfgg2g4pj"; - libraryHaskellDepends = [ base ]; - description = "Storable offsets for record fields"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS Timestream"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; } ) { }; - storable-peek-poke = callPackage ( + stratosphere-transfer = callPackage ( { mkDerivation, + aeson, base, - typelevel-tools-yj, + stratosphere, }: mkDerivation { - pname = "storable-peek-poke"; - version = "0.1.0.2"; - sha256 = "0pgssxp3fj4bmp9h8hy1w2lxhshqi1x030nhihllvy78kw757zgz"; + pname = "stratosphere-transfer"; + version = "1.0.1"; + sha256 = "1b14n2pq3hhw7p2i1wih0h36xs836f03ibhjxgpqfn4v29sinz5p"; libraryHaskellDepends = [ + aeson base - typelevel-tools-yj - ]; - testHaskellDepends = [ - base - typelevel-tools-yj + stratosphere ]; - description = "class Sizable, Peek and Poke"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS Transfer"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - storable-record = callPackage ( + stratosphere-verifiedpermissions = callPackage ( { mkDerivation, + aeson, base, - QuickCheck, - semigroups, - transformers, - utility-ht, + stratosphere, }: mkDerivation { - pname = "storable-record"; - version = "0.0.7"; - sha256 = "1c1f58v13nxpq2ix30d2kpvsamk44apl6ms1a2pq54fkjk44didy"; - isLibrary = true; - isExecutable = true; + pname = "stratosphere-verifiedpermissions"; + version = "1.0.1"; + sha256 = "04n0hf1xhgvygwf830cxzc97lx3bc1py5imlsymhgv7fkrczxh1m"; libraryHaskellDepends = [ + aeson base - QuickCheck - semigroups - transformers - utility-ht + stratosphere ]; - description = "Elegant definition of Storable instances for records"; - license = lib.licensesSpdx."BSD-3-Clause"; - maintainers = [ lib.maintainers.thielema ]; + description = "Stratosphere integration for AWS VerifiedPermissions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - storable-static-array = callPackage ( + stratosphere-voiceid = callPackage ( { mkDerivation, - array, + aeson, base, - tagged, - vector, + stratosphere, }: mkDerivation { - pname = "storable-static-array"; - version = "0.6.1.0"; - sha256 = "0akdh6v2cdq38jw8v69bn3m50g6wxanh0plikq4hj5mfrkg6xsxm"; + pname = "stratosphere-voiceid"; + version = "1.0.1"; + sha256 = "13da5yn81ky8qcwjh50v181jg8pvkmcqc60195wg81qhhvxxi62c"; libraryHaskellDepends = [ - array + aeson base - tagged - vector + stratosphere ]; - description = "Statically-sized array wrappers with Storable instances for FFI marshaling"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS VoiceID"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; } ) { }; - storable-tuple = callPackage ( + stratosphere-vpclattice = callPackage ( { mkDerivation, + aeson, base, - base-orphans, - storable-record, - utility-ht, + stratosphere, }: mkDerivation { - pname = "storable-tuple"; - version = "0.1"; - sha256 = "0g2rhqxrl1yjvvqwxmfgflgyyrds0kkcvzjjmwk07mir8aj4yjq3"; + pname = "stratosphere-vpclattice"; + version = "1.0.1"; + sha256 = "0ml8ckq2v6qi7h38dy71g65binhrknhhl6y3rnyw54mq9qj0m8j3"; libraryHaskellDepends = [ + aeson base - base-orphans - storable-record - utility-ht + stratosphere ]; - description = "Storable instance for pairs and triples"; - license = lib.licensesSpdx."BSD-3-Clause"; - maintainers = [ lib.maintainers.thielema ]; + description = "Stratosphere integration for AWS VpcLattice"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - storablevector = callPackage ( + stratosphere-waf = callPackage ( { mkDerivation, + aeson, base, - bytestring, - deepseq, - non-negative, - QuickCheck, - random, - sample-frame, - semigroups, - syb, - transformers, - unsafe, - utility-ht, + stratosphere, }: mkDerivation { - pname = "storablevector"; - version = "0.2.13.2"; - sha256 = "03nq5930yjpdvnyh93pjxzh3xjsracnnzcyqc0j3yiwadggbjy35"; - revision = "1"; - editedCabalFile = "0rc3y0sw2lf92cxhrbpcypb7hp4s4cspj81ragcs6sxvf0jj79j2"; + pname = "stratosphere-waf"; + version = "1.0.1"; + sha256 = "1dal2gawyn93lab6nphsp6zhsny6f7fswdgvgrhvn0d79aj9bxkb"; libraryHaskellDepends = [ + aeson base - deepseq - non-negative - QuickCheck - semigroups - syb - transformers - unsafe - utility-ht - ]; - testHaskellDepends = [ - base - bytestring - QuickCheck - random - utility-ht - ]; - benchmarkHaskellDepends = [ - base - deepseq - sample-frame - unsafe - utility-ht + stratosphere ]; - description = "Fast, packed, strict storable arrays with a list interface like ByteString"; - license = lib.licensesSpdx."BSD-3-Clause"; - maintainers = [ lib.maintainers.thielema ]; + description = "Stratosphere integration for AWS WAF"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - storablevector-carray = callPackage ( + stratosphere-wafregional = callPackage ( { mkDerivation, + aeson, base, - carray, - storablevector, - utility-ht, + stratosphere, }: mkDerivation { - pname = "storablevector-carray"; - version = "0.0"; - sha256 = "1cqgfddaldxj2yig39fr2smm23nfz52dvh5grf4zr222djm7043i"; + pname = "stratosphere-wafregional"; + version = "1.0.1"; + sha256 = "029ai636953if1zf709lcgbjjj3x1i26iq3hs1dx3cv5qhsvs3is"; libraryHaskellDepends = [ + aeson base - carray - storablevector - utility-ht + stratosphere ]; - description = "Conversion between storablevector and carray"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS WAFRegional"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - storablevector-streamfusion = callPackage ( + stratosphere-wafv2 = callPackage ( { mkDerivation, + aeson, base, - storablevector, - stream-fusion, - utility-ht, + stratosphere, }: mkDerivation { - pname = "storablevector-streamfusion"; - version = "0.0"; - sha256 = "1qgnakr01f28iarq1qd5x86919fj7zwf19nb80w7757l0dhdjb6m"; - isLibrary = true; - isExecutable = true; + pname = "stratosphere-wafv2"; + version = "1.0.1"; + sha256 = "143zbch2z3ir7s84sg1isdb5bfdvhixk2x3y3plsn0d0w42dy91n"; libraryHaskellDepends = [ + aeson base - storablevector - stream-fusion - utility-ht + stratosphere ]; - description = "Conversion between storablevector and stream-fusion lists with fusion"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS WAFv2"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - store = callPackage ( + stratosphere-wisdom = callPackage ( { mkDerivation, - array, - async, + aeson, base, - base-orphans, - base64-bytestring, - bifunctors, - bytestring, - cereal, - cereal-vector, - clock, - containers, - contravariant, - criterion, - cryptohash-sha1, - deepseq, - directory, - filepath, - free, - ghc-prim, - hashable, - hspec, - hspec-discover, - hspec-smallcheck, - integer-gmp, - lifted-base, - monad-control, - mono-traversable, - nats, - network, - primitive, - resourcet, - safe, - smallcheck, - store-core, - syb, - template-haskell, - text, - th-lift, - th-lift-instances, - th-orphans, - th-reify-many, - th-utilities, - time, - transformers, - unordered-containers, - vector, - vector-binary-instances, - void, - weigh, + stratosphere, }: mkDerivation { - pname = "store"; - version = "0.7.20"; - sha256 = "1ysp87fhqxw2rlcbhfba1z08j8ml7gq1a1ic6dcl5mdyxxmqywr0"; + pname = "stratosphere-wisdom"; + version = "1.0.1"; + sha256 = "05zhhqfnpz504ybf6js8jsmilki8n4n70gwy10k12cclx8ik2y7j"; libraryHaskellDepends = [ - array - async - base - base-orphans - base64-bytestring - bifunctors - bytestring - containers - contravariant - cryptohash-sha1 - deepseq - directory - filepath - free - ghc-prim - hashable - hspec - hspec-smallcheck - integer-gmp - lifted-base - monad-control - mono-traversable - nats - network - primitive - resourcet - safe - smallcheck - store-core - syb - template-haskell - text - th-lift - th-lift-instances - th-orphans - th-reify-many - th-utilities - time - transformers - unordered-containers - vector - void - ]; - testHaskellDepends = [ - array - async - base - base-orphans - base64-bytestring - bifunctors - bytestring - clock - containers - contravariant - cryptohash-sha1 - deepseq - directory - filepath - free - ghc-prim - hashable - hspec - hspec-smallcheck - integer-gmp - lifted-base - monad-control - mono-traversable - nats - network - primitive - resourcet - safe - smallcheck - store-core - syb - template-haskell - text - th-lift - th-lift-instances - th-orphans - th-reify-many - th-utilities - time - transformers - unordered-containers - vector - void - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - array - async + aeson base - base-orphans - base64-bytestring - bifunctors - bytestring - cereal - cereal-vector - containers - contravariant - criterion - cryptohash-sha1 - deepseq - directory - filepath - free - ghc-prim - hashable - hspec - hspec-smallcheck - integer-gmp - lifted-base - monad-control - mono-traversable - nats - network - primitive - resourcet - safe - smallcheck - store-core - syb - template-haskell - text - th-lift - th-lift-instances - th-orphans - th-reify-many - th-utilities - time - transformers - unordered-containers - vector - vector-binary-instances - void - weigh + stratosphere ]; - description = "Fast binary serialization"; + description = "Stratosphere integration for AWS Wisdom"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - store-core = callPackage ( + stratosphere-workspaces = callPackage ( { mkDerivation, + aeson, base, - bytestring, - ghc-prim, - primitive, - text, - transformers, + stratosphere, }: mkDerivation { - pname = "store-core"; - version = "0.4.4.7"; - sha256 = "1lxwl6zlmmdk62c35dwmx4xpcfvjx61is8ccmnr8i01i9l9i19b4"; + pname = "stratosphere-workspaces"; + version = "1.0.1"; + sha256 = "0mc7rfrlq70qzi87zjrd7vsxw18hfc3ldp7bxwvb3qqsdi47rl3l"; libraryHaskellDepends = [ + aeson base - bytestring - ghc-prim - primitive - text - transformers + stratosphere ]; - description = "Fast and lightweight binary serialization"; + description = "Stratosphere integration for AWS WorkSpaces"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - store-streaming = callPackage ( + stratosphere-workspacesinstances = callPackage ( { mkDerivation, - async, + aeson, base, - bytestring, - conduit, - free, - hspec, - hspec-discover, - hspec-smallcheck, - network, - resourcet, - smallcheck, - store, - store-core, - streaming-commons, - text, - transformers, - void, + stratosphere, }: mkDerivation { - pname = "store-streaming"; - version = "0.2.0.5"; - sha256 = "07xpsa3m7vjlv01gfay23v5ycy8fcddv551vbgs5bkg8vn7a5gvk"; + pname = "stratosphere-workspacesinstances"; + version = "1.0.1"; + sha256 = "107852wb7imr4azbnrld54izvlgm3fqk63dclfcckniiv0pzq8ag"; libraryHaskellDepends = [ - async - base - bytestring - conduit - free - resourcet - store - store-core - streaming-commons - text - transformers - ]; - testHaskellDepends = [ - async + aeson base - bytestring - conduit - free - hspec - hspec-smallcheck - network - resourcet - smallcheck - store - store-core - streaming-commons - text - transformers - void + stratosphere ]; - testToolDepends = [ hspec-discover ]; - description = "Streaming interfaces for `store`"; + description = "Stratosphere integration for AWS WorkspacesInstances"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; - stp = callPackage ( + stratosphere-workspacesthinclient = callPackage ( { mkDerivation, + aeson, base, - containers, - regex-compat, + stratosphere, }: mkDerivation { - pname = "stp"; - version = "0.1.0.1"; - sha256 = "1vg2w6iawqydg2n4k6m6pzfxr7sr10cx33aabyx6b9wp1i8xa5kl"; - isLibrary = true; - isExecutable = true; + pname = "stratosphere-workspacesthinclient"; + version = "1.0.1"; + sha256 = "12cfnglkcrcqf6rhbcyy7gr1h4lcrbma7xrn9ca75988wdhkm7d8"; libraryHaskellDepends = [ + aeson base - containers - ]; - executableHaskellDepends = [ - base - regex-compat + stratosphere ]; - description = "Simple Theorem Prover"; - license = lib.licenses.bsd3; + description = "Stratosphere integration for AWS WorkSpacesThinClient"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - mainProgram = "mu-test"; broken = true; } ) { }; - str = callPackage ( + stratosphere-workspacesweb = callPackage ( { mkDerivation, + aeson, base, - base16-bytestring, - bytestring, - Crypto, - hashable, - MissingH, - text, - utf8-string, + stratosphere, }: mkDerivation { - pname = "str"; - version = "0.1.0.0"; - sha256 = "093bgzjj183g48gapmjvbrbp7ns7wfcf94ishgwy84gajpkyb6sr"; + pname = "stratosphere-workspacesweb"; + version = "1.0.1"; + sha256 = "19kzmgcb9zvjdns7lqyz66j676cb9981mpp7czxa1z2pvb5kf4d9"; libraryHaskellDepends = [ + aeson base - base16-bytestring - bytestring - Crypto - hashable - MissingH - text - utf8-string + stratosphere ]; - description = "A type class to abstract between many different string types"; + description = "Stratosphere integration for AWS WorkSpacesWeb"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; } ) { }; - stratosphere = callPackage ( + stratosphere-xray = callPackage ( { mkDerivation, aeson, - aeson-pretty, base, - bytestring, - containers, - hashable, - hspec, - hspec-discover, - lens, - template-haskell, - text, - unordered-containers, + stratosphere, }: mkDerivation { - pname = "stratosphere"; - version = "0.60.0"; - sha256 = "0vp5m82h9axvvzqqxf4q5jxcjgym1b8h4x4y4a367bpiy7xk4kwf"; - isLibrary = true; - isExecutable = true; + pname = "stratosphere-xray"; + version = "1.0.1"; + sha256 = "1i280xqpl6dsvavv0j21r94lyamfw50772g3adnbj98h78zpi8ys"; libraryHaskellDepends = [ aeson - aeson-pretty - base - bytestring - containers - hashable - lens - template-haskell - text - unordered-containers - ]; - testHaskellDepends = [ - aeson - aeson-pretty base - bytestring - containers - hashable - hspec - hspec-discover - lens - template-haskell - text - unordered-containers + stratosphere ]; - testToolDepends = [ hspec-discover ]; - description = "EDSL for AWS CloudFormation"; + description = "Stratosphere integration for AWS XRay"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -640323,8 +649135,8 @@ self: { }: mkDerivation { pname = "streaming-commons"; - version = "0.2.3.0"; - sha256 = "0mqyxdikd76q0ls5lz0bfdwzqhyvf8hwxl5x1c5lgfas3zwllf16"; + version = "0.2.3.1"; + sha256 = "0vnwlhzd616w1mx0fpaf0gahprd37qh91r7hv405hyc0c066rl9k"; libraryHaskellDepends = [ array async @@ -644478,8 +653290,8 @@ self: { }: mkDerivation { pname = "strong-path"; - version = "1.1.4.0"; - sha256 = "1gd24hfz01k78k67d28v9ypvrnbh5a41rk6dk26rmc5h5sxnrgf8"; + version = "1.2.0.0"; + sha256 = "14p82fgmi5bgf0yf6c27g1f4yp4alrb3446palpxkv58k5gzli14"; libraryHaskellDepends = [ base exceptions @@ -644502,8 +653314,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Strongly typed paths in Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -659709,8 +668519,8 @@ self: { }: mkDerivation { pname = "tasty-checklist"; - version = "1.0.6.0"; - sha256 = "1b5qikkbz4hxpj9w1vcfz1pigxs9576b84bp2p15bcrxpq80a0vq"; + version = "1.0.8.0"; + sha256 = "19mn4xfc8cvfcwgmfqh1pxsjv5wrsdxwxwsb9l8zflq3awvaq2g2"; libraryHaskellDepends = [ base containers @@ -659730,8 +668540,6 @@ self: { ]; description = "Check multiple items during a tasty test"; license = lib.licensesSpdx."ISC"; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -659844,7 +668652,7 @@ self: { } ) { }; - tasty-discover_5_1_0 = callPackage ( + tasty-discover_5_2_0 = callPackage ( { mkDerivation, ansi-terminal, @@ -659870,13 +668678,12 @@ self: { }: mkDerivation { pname = "tasty-discover"; - version = "5.1.0"; - sha256 = "0y6py4l63idqvvr063cnkqcl3wbsglk3bpizmlgbwmq4gq9aprif"; - revision = "1"; - editedCabalFile = "1bac8ll0im08w7n5hj43fkjpilcax9bz0kbq0nr690lh49ws2353"; + version = "5.2.0"; + sha256 = "1wnblzl6c094qacspldyfad6mcl3iy0xnqmbzail0gzz8517wix3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ + ansi-terminal base containers directory @@ -661290,8 +670097,8 @@ self: { }: mkDerivation { pname = "tasty-sugar"; - version = "2.2.2.1"; - sha256 = "009n17zzaxyw0gfy6jr3869bjd8qwadwwf2ya788kasa00qh8if2"; + version = "2.2.3.1"; + sha256 = "1zh2h6n75rsqr6xxdkvsbzb25gmg9zr2f3db3wg8s57zaz9sd2dj"; libraryHaskellDepends = [ base containers @@ -661325,7 +670132,6 @@ self: { doHaddock = false; description = "Tests defined by Search Using Golden Answer References"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -663650,6 +672456,8 @@ self: { pname = "template-haskell-lift"; version = "0.1.0.0"; sha256 = "09zilw0nbjmn1k688l058183rwa3br0fvh3x8jxqygjh3011w8ps"; + revision = "1"; + editedCabalFile = "072g7a9b2sp0vc3g48xqbrxfis1rizqakz0b8064hs0cbgj3xkgn"; libraryHaskellDepends = [ base template-haskell @@ -663696,6 +672504,8 @@ self: { pname = "template-haskell-quasiquoter"; version = "0.1.0.0"; sha256 = "06zm27d72faad2ln7xn7d3kmvy04hq663a1q75cp7yyyca7fgjhf"; + revision = "1"; + editedCabalFile = "1bjaz33byxl0x8rj4jvw7dqbjhmysmnx9cgjs29s5c8g5i1pq0ki"; libraryHaskellDepends = [ base template-haskell @@ -667533,8 +676343,8 @@ self: { }: mkDerivation { pname = "testcontainers-postgresql"; - version = "0.0.4"; - sha256 = "09pa6w7kksxn0dpg99m2f3lhplm1316g782i8gfjxwig84r7z0av"; + version = "0.2"; + sha256 = "0pb653vv5mv69h6i6dgrvhzsppr4cnz1v7p9v04jw3f2njlm4wqr"; libraryHaskellDepends = [ base testcontainers @@ -673464,7 +682274,9 @@ self: { ]; description = "Simple, IO-based library for Erlang-style thread supervision"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "threads-supervisor-example"; + broken = true; } ) { }; @@ -675972,8 +684784,8 @@ self: { }: mkDerivation { pname = "time-manager"; - version = "0.2.3"; - sha256 = "1s387nka1nxii026ly4awrz74acs4ci141mh3mvsz4j47cyw7dzf"; + version = "0.2.4"; + sha256 = "0w5n3wd1pv1f1wrmr7rjv21847zxflxq7q3vy891ncd0qppf7hpv"; libraryHaskellDepends = [ auto-update base @@ -676841,8 +685653,6 @@ self: { ]; description = "Efficient timeout with reset"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -678969,7 +687779,7 @@ self: { } ) { }; - tls_2_1_12 = callPackage ( + tls_2_1_13 = callPackage ( { mkDerivation, asn1-encoding, @@ -679005,8 +687815,8 @@ self: { }: mkDerivation { pname = "tls"; - version = "2.1.12"; - sha256 = "1lhv1c93qaj3mg5mdifjfzddcw6y5j0nzbyy22pqyad1j41lbm2g"; + version = "2.1.13"; + sha256 = "0d249apxcm39431vpjwamr145iz7i2q1fj4g89xg409hl3r2jadd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -680054,6 +688864,52 @@ self: { } ) { }; + todoist-sdk = callPackage ( + { + mkDerivation, + aeson, + base, + bytestring, + dotenv, + hspec, + hspec-discover, + microlens, + random, + req, + text, + transformers, + }: + mkDerivation { + pname = "todoist-sdk"; + version = "0.1.2.1"; + sha256 = "1ygqzy17x3p1kcyc7ygl2ygm1psj5xvcdcgcalwdkhpbk5c53h9k"; + libraryHaskellDepends = [ + aeson + base + bytestring + microlens + req + text + transformers + ]; + testHaskellDepends = [ + aeson + base + bytestring + dotenv + hspec + hspec-discover + random + text + transformers + ]; + testToolDepends = [ hspec-discover ]; + doHaddock = false; + description = "Unofficial Haskell SDK for the Todoist REST API"; + license = lib.licensesSpdx."MIT"; + } + ) { }; + todos = callPackage ( { mkDerivation, @@ -683448,6 +692304,38 @@ self: { } ) { }; + tracy-profiler = callPackage ( + { + mkDerivation, + base, + bytestring, + random, + text, + unliftio-core, + webcolor-labels, + }: + mkDerivation { + pname = "tracy-profiler"; + version = "0.1.2.1"; + sha256 = "1zd1gi7p22qg8l4d6nn0x2xmqvq7w0a0zfz4cr589qbrwda9fy52"; + libraryHaskellDepends = [ + base + bytestring + text + unliftio-core + webcolor-labels + ]; + testHaskellDepends = [ + base + random + text + unliftio-core + ]; + description = "Haskell bindings for Tracy frame profiler"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + trade-journal = callPackage ( @@ -690649,6 +699537,29 @@ self: { } ) { }; + _type = callPackage ( + { + mkDerivation, + base, + containers, + template-haskell, + }: + mkDerivation { + pname = "type"; + version = "0.2.0"; + sha256 = "13xkbj1nimgs9cm5mdqx52m1qzjgkzcxxjibqb1g8rmjgy17yj5m"; + libraryHaskellDepends = [ + base + containers + template-haskell + ]; + description = "Dynamic casting library with support for arbitrary rank type kinds"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + type-aligned = callPackage ( { mkDerivation, base }: mkDerivation { @@ -691375,6 +700286,25 @@ self: { } ) { }; + type-level-prng = callPackage ( + { + mkDerivation, + base, + defun-core, + }: + mkDerivation { + pname = "type-level-prng"; + version = "0.1.0"; + sha256 = "0yakpbslwd8lh59595ck7r8xlrcz47gihwf93626151f1w1gq60s"; + libraryHaskellDepends = [ + base + defun-core + ]; + description = "Type level pseudorandom number generators"; + license = lib.licenses.mit; + } + ) { }; + type-level-sets = callPackage ( { mkDerivation, @@ -694177,6 +703107,26 @@ self: { } ) { }; + typst-symbols_0_1_9_1 = callPackage ( + { + mkDerivation, + base, + text, + }: + mkDerivation { + pname = "typst-symbols"; + version = "0.1.9.1"; + sha256 = "0pqjdmyclljsybipcmyas4pifggndf47bvahnpcaflnw9db73j63"; + libraryHaskellDepends = [ + base + text + ]; + description = "Symbol and emoji lookup for typst language"; + license = lib.licensesSpdx."MIT"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + tyro = callPackage ( { mkDerivation, @@ -698888,6 +707838,28 @@ self: { } ) { }; + units-list = callPackage ( + { + mkDerivation, + base, + semigroupoids, + }: + mkDerivation { + pname = "units-list"; + version = "0.2.0.0"; + sha256 = "0kdi0j2s4ix3l8gwaxlzygxxq9q19hjk461p50gkv6pazydkfzjc"; + libraryHaskellDepends = [ + base + semigroupoids + ]; + testHaskellDepends = [ base ]; + description = "Extensible typed Dimensions"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + units-parser = callPackage ( { mkDerivation, @@ -702136,54 +711108,63 @@ self: { uri-templater = callPackage ( { mkDerivation, - ansi-wl-pprint, base, bytestring, - charset, containers, + cookie, dlist, - HTTP, + doctest, + flatparse, + http-api-data, + http-types, HUnit, mtl, - parsers, + prettyprinter, + prettyprinter-ansi-terminal, + tagged, template-haskell, text, time, - trifecta, + time-compat, unordered-containers, uuid-types, vector, }: mkDerivation { pname = "uri-templater"; - version = "0.3.1.0"; - sha256 = "1hj93jgn8xch9bw9fs76qsfqarb15csfy0ddnr1dxcq04vznbri1"; - revision = "2"; - editedCabalFile = "1fc0agzm3qasslhns64qbyhml31s1akib0mfaj2298iqm8075jyg"; + version = "1.0.0.1"; + sha256 = "12g2h83d1cklfr5gvag2523jrk995w0yl75bgn2sq6l85j11pcqc"; libraryHaskellDepends = [ - ansi-wl-pprint base bytestring - charset containers + cookie dlist - HTTP + flatparse + http-api-data + http-types mtl - parsers + prettyprinter + prettyprinter-ansi-terminal + tagged template-haskell text time - trifecta + time-compat unordered-containers uuid-types vector ]; testHaskellDepends = [ - ansi-wl-pprint base + doctest + http-api-data HUnit mtl + prettyprinter template-haskell + text + vector ]; description = "Parsing & Quasiquoting for RFC 6570 URI Templates"; license = lib.licenses.mit; @@ -703586,8 +712567,8 @@ self: { }: mkDerivation { pname = "utxorpc"; - version = "0.0.17.0"; - sha256 = "1jzb0v8gjy15b97a66gmjaxxf3mcxwigaavl5cnzga5z9kz8pyw1"; + version = "0.0.18.1"; + sha256 = "0gnbyj3r7faqvkaxfmbxxkcznl53jxrzbby3k1zpyigr3h61k4sp"; libraryHaskellDepends = [ base proto-lens @@ -703604,6 +712585,7 @@ self: { mkDerivation, aeson, base, + base16-bytestring, bytestring, case-insensitive, hspec, @@ -703625,8 +712607,8 @@ self: { }: mkDerivation { pname = "utxorpc-client"; - version = "0.0.2.0"; - sha256 = "1i9gzr4dlhy3j0x2mx9idgc16r0yz7qw72z6gc10s4vlbbrc1mnb"; + version = "0.0.4.1"; + sha256 = "06z8frfn26zz0mrzwh59bmwr2yi20k9vgygmi1qiv0zv3k5vhqrl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -703643,6 +712625,7 @@ self: { executableHaskellDepends = [ aeson base + base16-bytestring bytestring case-insensitive http2 @@ -703704,8 +712687,8 @@ self: { }: mkDerivation { pname = "utxorpc-server"; - version = "0.0.3.0"; - sha256 = "0a56c871ypq0rfjl8lc5xxzx0vqggx74anxkbymvrad7h0bhsjyz"; + version = "0.0.4.1"; + sha256 = "1h1fwgf2igs5ldckrq821viryhn8xqyyaj9blglf3j5ml7rm3z92"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -703756,7 +712739,7 @@ self: { description = "An SDK for UTxO RPC services"; license = lib.licensesSpdx."Apache-2.0"; hydraPlatforms = lib.platforms.none; - mainProgram = "server-example"; + mainProgram = "example"; } ) { }; @@ -711755,6 +720738,30 @@ self: { } ) { }; + vty-crossplatform_0_5_0_0 = callPackage ( + { + mkDerivation, + base, + vty, + vty-unix, + }: + mkDerivation { + pname = "vty-crossplatform"; + version = "0.5.0.0"; + sha256 = "0dikbxs6ykkwxzy9bjaarl9gqlnyg8s5gnp276072bw0d4f6z4rs"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + vty + vty-unix + ]; + description = "Cross-platform support for Vty"; + license = lib.licensesSpdx."BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + } + ) { }; + vty-examples = callPackage ( { mkDerivation, @@ -717178,6 +726185,8 @@ self: { ]; description = "A request rate limiting middleware using token buckets"; license = lib.licensesSpdx."Apache-2.0"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { }; @@ -717842,6 +726851,141 @@ self: { } ) { }; + warp_3_4_10 = callPackage ( + { + mkDerivation, + array, + async, + auto-update, + base, + bsb-http-chunked, + bytestring, + case-insensitive, + containers, + criterion, + crypton-x509, + directory, + ghc-prim, + hashable, + hspec, + hspec-discover, + http-client, + http-date, + http-types, + http2, + iproute, + network, + process, + QuickCheck, + recv, + simple-sendfile, + stm, + streaming-commons, + text, + time-manager, + unix, + vault, + wai, + word8, + }: + mkDerivation { + pname = "warp"; + version = "3.4.10"; + sha256 = "1w08v8wgagfmvc2aqy0w5cs6778z7d39xf9zkcc3cyr2la6bz1dj"; + revision = "1"; + editedCabalFile = "0328b9azvwffdgxim117p9gnjpkdxzd5sda0dci33g15aksgiixw"; + libraryHaskellDepends = [ + array + async + auto-update + base + bsb-http-chunked + bytestring + case-insensitive + containers + crypton-x509 + ghc-prim + hashable + http-date + http-types + http2 + iproute + network + recv + simple-sendfile + stm + streaming-commons + text + time-manager + unix + vault + wai + word8 + ]; + testHaskellDepends = [ + array + async + auto-update + base + bsb-http-chunked + bytestring + case-insensitive + containers + crypton-x509 + directory + ghc-prim + hashable + hspec + http-client + http-date + http-types + http2 + iproute + network + process + QuickCheck + recv + simple-sendfile + stm + streaming-commons + text + time-manager + unix + vault + wai + word8 + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + array + auto-update + base + bytestring + case-insensitive + containers + criterion + crypton-x509 + ghc-prim + hashable + http-date + http-types + network + recv + streaming-commons + text + time-manager + unix + vault + wai + word8 + ]; + description = "A fast, light-weight web server for WAI applications"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.alexfmpe ]; + } + ) { }; + warp-dynamic = callPackage ( { mkDerivation, @@ -718701,6 +727845,63 @@ self: { } ) { }; + waypoint = callPackage ( + { + mkDerivation, + base, + bytestring, + case-insensitive, + containers, + free, + hedgehog, + http-types, + profunctors, + tasty, + tasty-hedgehog, + tasty-hunit, + text, + time, + transformers, + uuid-types, + witherable, + }: + mkDerivation { + pname = "waypoint"; + version = "0.1"; + sha256 = "123rvxsn4viigf22ag5s4qs3yal0m3jw9q4bd4pjw53xdwz7dp4m"; + libraryHaskellDepends = [ + base + bytestring + containers + free + http-types + profunctors + text + time + transformers + uuid-types + witherable + ]; + testHaskellDepends = [ + base + bytestring + case-insensitive + containers + hedgehog + tasty + tasty-hedgehog + tasty-hunit + text + time + uuid-types + ]; + description = "Bidirectional URL path, URL query string and HTTP headers codecs"; + license = lib.licensesSpdx."Apache-2.0"; + hydraPlatforms = lib.platforms.none; + broken = true; + } + ) { }; + wcwidth = callPackage ( { mkDerivation, @@ -720354,6 +729555,47 @@ self: { } ) { }; + web3-tools = callPackage ( + { + mkDerivation, + base, + base16-bytestring, + bytestring, + crypton, + hspec, + hspec-discover, + memory, + QuickCheck, + secp256k1-haskell, + }: + mkDerivation { + pname = "web3-tools"; + version = "0.1.0.0"; + sha256 = "0yvw66v1k6xh2mrh32q38pn7syh3c2q69d60r0hszyy53mrhq8zv"; + libraryHaskellDepends = [ + base + bytestring + crypton + memory + secp256k1-haskell + ]; + testHaskellDepends = [ + base + base16-bytestring + bytestring + crypton + hspec + hspec-discover + memory + QuickCheck + secp256k1-haskell + ]; + testToolDepends = [ hspec-discover ]; + description = "Tools for working with Crypto/Web3"; + license = lib.licenses.mit; + } + ) { }; + webapi = callPackage ( { mkDerivation, @@ -721747,6 +730989,8 @@ self: { pname = "webgear-core"; version = "1.5.0"; sha256 = "1f5dy707rcb25n0w5ld210vczaa3az2y6xvg5jn7gwsxs23a8b3k"; + revision = "1"; + editedCabalFile = "0yrwdb3cnfqkhfasi7c5hhsaw44xvvsm0nmrkjyhz3fy2h9xpn4d"; libraryHaskellDepends = [ arrows base @@ -721947,6 +731191,8 @@ self: { pname = "webgear-server"; version = "1.5.0"; sha256 = "1srr5kblk1b59jyrkidh9js4yax8dvjyici283z25yk2lnqijc2y"; + revision = "1"; + editedCabalFile = "0wx2qlwkk6yxnpfxy9261fwn7xkykcll7636ls6kxvc5ybwyn5h6"; libraryHaskellDepends = [ aeson arrows @@ -723813,7 +733059,7 @@ self: { } ) { }; - what4_1_7 = callPackage ( + what4_1_7_2 = callPackage ( { mkDerivation, async, @@ -723834,7 +733080,6 @@ self: { exceptions, filepath, fingertree, - ghc-prim, hashable, hashtables, hedgehog, @@ -723870,17 +733115,14 @@ self: { transformers, unliftio, unordered-containers, - utf8-string, vector, versions, zenc, }: mkDerivation { pname = "what4"; - version = "1.7"; - sha256 = "1iba76c7zagxxgqvfxrsk92vayyhv1vjd6dd5wj242vps29jhb3v"; - revision = "1"; - editedCabalFile = "0d2xhwmgk20pqjh9xgdfyzwi9brckz71bdk8lr56q36nzmrkj0dl"; + version = "1.7.2"; + sha256 = "0mb9r3mzh3zmd8bs0d9km42xnqcxx2cbn8wmavbpklb9vmv6g3wi"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -723902,7 +733144,6 @@ self: { exceptions filepath fingertree - ghc-prim hashable hashtables io-streams @@ -723920,7 +733161,6 @@ self: { scientific stm template-haskell - temporary text th-lift th-lift-instances @@ -723928,7 +733168,6 @@ self: { transformers unliftio unordered-containers - utf8-string vector versions zenc @@ -724140,6 +733379,41 @@ self: { } ) { }; + which-embed = callPackage ( + { + mkDerivation, + base, + bytestring, + directory, + exceptions, + file-embed, + path, + path-io, + template-haskell, + unix, + which, + }: + mkDerivation { + pname = "which-embed"; + version = "0.1.0"; + sha256 = "1glzxask1lljz77dmz718zaplpcp5srzw6fjh8v7cdqgh8rj0dvv"; + libraryHaskellDepends = [ + base + bytestring + directory + exceptions + file-embed + path + path-io + template-haskell + unix + which + ]; + description = "which-embed"; + license = lib.licensesSpdx."Apache-2.0"; + } + ) { }; + while-lang-parser = callPackage ( { mkDerivation, @@ -725676,6 +734950,17 @@ self: { } ) { }; + _with = callPackage ( + { mkDerivation }: + mkDerivation { + pname = "with"; + version = "0.1.0"; + sha256 = "0jgm6w1xisyww81ak9rrrqmhgaiwdgk5rgvzax72rknzg9rb6701"; + description = "Simple open product type"; + license = lib.licenses.bsd3; + } + ) { }; + with-index = callPackage ( { mkDerivation, base }: mkDerivation { @@ -726397,8 +735682,8 @@ self: { }: mkDerivation { pname = "wled-json"; - version = "0.1.0.0"; - sha256 = "0xh243hacxi04bsaj6xmbdyixvz3n4x8jgiym9pn5fym547n6abk"; + version = "0.1.0.1"; + sha256 = "1riaw104i6y0jzfahz90a764a8rn15rldlkf94h9kpy747r0bxvf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -735004,10 +744289,8 @@ self: { }: mkDerivation { pname = "xnobar"; - version = "0.0.0.2"; - sha256 = "1cs9kp2h07dx39rzykmylv5fvmdyynwmyj7mlxy6n95bawz4z1f4"; - revision = "1"; - editedCabalFile = "1b34ifw8rnb19gjgksljxcxb54y0qskjwwka5ly8bq84ll756v6n"; + version = "1.0.0.0"; + sha256 = "0rf3308wiy2ilssshrv9y5w55rrhw0nxjgdq39scc78562dw7z2l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -735036,7 +744319,9 @@ self: { description = "Text-based notification server for XMobar"; license = lib.licensesSpdx."BSD-3-Clause"; badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; mainProgram = "Echo"; + broken = true; } ) { }; @@ -736176,6 +745461,231 @@ self: { } ) { }; + yaftee = callPackage ( + { + mkDerivation, + base, + ftcqueue, + higher-order-freer-monad, + higher-order-open-union, + }: + mkDerivation { + pname = "yaftee"; + version = "0.1.0.0"; + sha256 = "1ibxrl4d7dacvs1lsw5shngvw9l2v5h0kp12llypvxg56gg9dxdx"; + libraryHaskellDepends = [ + base + ftcqueue + higher-order-freer-monad + higher-order-open-union + ]; + testHaskellDepends = [ + base + ftcqueue + higher-order-freer-monad + higher-order-open-union + ]; + description = "Yet Another heFTy-inspired Extensible Effect"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + + yaftee-basic-monads = callPackage ( + { + mkDerivation, + base, + ftcqueue, + higher-order-freer-monad, + higher-order-open-union, + yaftee, + }: + mkDerivation { + pname = "yaftee-basic-monads"; + version = "0.1.0.0"; + sha256 = "01idl3k293x0bccr8xx7p56j33004rjc9fr5h9may4lss9nhrvxv"; + libraryHaskellDepends = [ + base + ftcqueue + higher-order-freer-monad + higher-order-open-union + yaftee + ]; + testHaskellDepends = [ + base + ftcqueue + higher-order-freer-monad + higher-order-open-union + yaftee + ]; + description = "Basic monads implemented on Yaftee"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + + yaftee-conduit = callPackage ( + { + mkDerivation, + base, + ftcqueue, + higher-order-freer-monad, + higher-order-open-union, + yaftee, + yaftee-basic-monads, + }: + mkDerivation { + pname = "yaftee-conduit"; + version = "0.1.0.0"; + sha256 = "1rhq31ybi0gjqk8h6jplm1fkchdibm60axq0nqa3j6y8iiyndncr"; + libraryHaskellDepends = [ + base + ftcqueue + higher-order-freer-monad + higher-order-open-union + yaftee + yaftee-basic-monads + ]; + testHaskellDepends = [ + base + ftcqueue + higher-order-freer-monad + higher-order-open-union + yaftee + yaftee-basic-monads + ]; + description = "Conduit implemented on Yaftee"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + + yaftee-conduit-bytestring = callPackage ( + { + mkDerivation, + array, + base, + bitarray-bs, + bytestring, + higher-order-freer-monad, + higher-order-open-union, + tools-yj, + typelevel-tools-yj, + yaftee, + yaftee-basic-monads, + yaftee-conduit, + }: + mkDerivation { + pname = "yaftee-conduit-bytestring"; + version = "0.1.0.1"; + sha256 = "0zrbhpaslwjs9y23r4g7mllfpjp5fsx6rrvxm80vwkwr5qp2n99i"; + libraryHaskellDepends = [ + array + base + bitarray-bs + bytestring + higher-order-freer-monad + higher-order-open-union + tools-yj + typelevel-tools-yj + yaftee + yaftee-basic-monads + yaftee-conduit + ]; + testHaskellDepends = [ + array + base + bitarray-bs + bytestring + higher-order-freer-monad + higher-order-open-union + tools-yj + typelevel-tools-yj + yaftee + yaftee-basic-monads + yaftee-conduit + ]; + description = "Yaftee Conduit tools for ByteString"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + + yaftee-conduit-bytestring-ft = callPackage ( + { + mkDerivation, + base, + bytestring-ft, + higher-order-open-union, + tools-yj, + typelevel-tools-yj, + yaftee, + yaftee-basic-monads, + yaftee-conduit, + }: + mkDerivation { + pname = "yaftee-conduit-bytestring-ft"; + version = "0.1.0.0"; + sha256 = "0k2dzyc2zhlndh1drfl6vx5plkciyh1n77jc44zqxpzkfdvl11nf"; + libraryHaskellDepends = [ + base + bytestring-ft + higher-order-open-union + tools-yj + typelevel-tools-yj + yaftee + yaftee-basic-monads + yaftee-conduit + ]; + testHaskellDepends = [ + base + bytestring-ft + higher-order-open-union + tools-yj + typelevel-tools-yj + yaftee + yaftee-basic-monads + yaftee-conduit + ]; + description = "Finger tree-based byte string tools for Yaftee Conduit"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + + yaftee-conduit-mono-traversable = callPackage ( + { + mkDerivation, + base, + higher-order-open-union, + mono-traversable, + tools-yj, + yaftee, + yaftee-basic-monads, + yaftee-conduit, + }: + mkDerivation { + pname = "yaftee-conduit-mono-traversable"; + version = "0.1.0.0"; + sha256 = "0q6kx82cpr4wp1b5hk8igqy15y30cg0xf1wwxnxjs67kn81c717q"; + libraryHaskellDepends = [ + base + higher-order-open-union + mono-traversable + tools-yj + yaftee + yaftee-basic-monads + yaftee-conduit + ]; + testHaskellDepends = [ + base + higher-order-open-union + mono-traversable + tools-yj + yaftee + yaftee-basic-monads + yaftee-conduit + ]; + description = "Mono traversable tools for Yaftee Conduit"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + yahoo-finance-api = callPackage ( { mkDerivation, @@ -741218,6 +750728,7 @@ self: { streaming-commons, template-haskell, text, + th-abstraction, time, transformers, unix-compat, @@ -741232,8 +750743,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.27.1"; - sha256 = "0v5pq8ks93b4rrxwl088izl8hrfalkbf3ssgxgqgjsl4x1r5n0kz"; + version = "1.6.28.1"; + sha256 = "072cj4kpv785y96d1y769fadgihw2pn0hz3bqhahin60lqq5bkwi"; libraryHaskellDepends = [ aeson attoparsec-aeson @@ -741298,6 +750809,7 @@ self: { streaming-commons template-haskell text + th-abstraction transformers unliftio wai @@ -749668,6 +759180,43 @@ self: { } ) { }; + zlib-core = callPackage ( + { + mkDerivation, + base, + c-enum, + c-struct, + exception-hierarchy, + primitive, + tools-yj, + zlib, + }: + mkDerivation { + pname = "zlib-core"; + version = "0.1.0.1"; + sha256 = "0qln41mdh2734ir0d3kz8gg5x7nd8db0wmn6jvqz0cd8z2632a88"; + libraryHaskellDepends = [ + base + c-enum + c-struct + exception-hierarchy + primitive + tools-yj + ]; + libraryPkgconfigDepends = [ zlib ]; + testHaskellDepends = [ + base + c-enum + c-struct + exception-hierarchy + primitive + tools-yj + ]; + description = "Thin wrapper for zlib"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { inherit (pkgs) zlib; }; + zlib-enum = callPackage ( { mkDerivation, @@ -749721,6 +759270,53 @@ self: { } ) { }; + zlib-yaftee = callPackage ( + { + mkDerivation, + base, + bytestring, + bytestring-ft, + higher-order-open-union, + primitive, + tools-yj, + yaftee, + yaftee-basic-monads, + yaftee-conduit, + zlib-core, + }: + mkDerivation { + pname = "zlib-yaftee"; + version = "0.1.0.0"; + sha256 = "04c1cgn7mch14n3d7v1jsylnqspd01zi591xxjwx5jphg71k5n35"; + libraryHaskellDepends = [ + base + bytestring + bytestring-ft + higher-order-open-union + primitive + tools-yj + yaftee + yaftee-basic-monads + yaftee-conduit + zlib-core + ]; + testHaskellDepends = [ + base + bytestring + bytestring-ft + higher-order-open-union + primitive + tools-yj + yaftee + yaftee-basic-monads + yaftee-conduit + zlib-core + ]; + description = "Zlib wrapper built on Yaftee"; + license = lib.licensesSpdx."BSD-3-Clause"; + } + ) { }; + zm = callPackage ( { mkDerivation, diff --git a/pkgs/development/interpreters/emilua/default.nix b/pkgs/development/interpreters/emilua/default.nix index 4b4c9e0c0aac5..344713d4e341d 100644 --- a/pkgs/development/interpreters/emilua/default.nix +++ b/pkgs/development/interpreters/emilua/default.nix @@ -97,7 +97,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/development/interpreters/perl/CVE-2024-56406.patch b/pkgs/development/interpreters/perl/CVE-2024-56406.patch deleted file mode 100644 index 3960d17e65199..0000000000000 --- a/pkgs/development/interpreters/perl/CVE-2024-56406.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit 385e8759c3ff1e7f7f996bd4ea391074d61d48c1 -Author: Karl Williamson -AuthorDate: 2024-12-18 18:25:29 -0700 -Commit: Steve Hay -CommitDate: 2025-03-30 11:59:51 +0100 - - CVE-2024-56406: Heap-buffer-overflow with tr// - - This was due to underallocating needed space. If the translation forces - something to become UTF-8 that is initially bytes, that UTF-8 could - now require two bytes where previously a single one would do. - - (cherry picked from commit f93109c8a6950aafbd7488d98e112552033a3686) - -diff --git a/op.c b/op.c -index 3fc23eca49a..aeee88e0335 100644 ---- a/op.c -+++ b/op.c -@@ -6649,6 +6649,7 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *repl) - * same time. But otherwise one crosses before the other */ - if (t_cp < 256 && r_cp_end > 255 && r_cp != t_cp) { - can_force_utf8 = TRUE; -+ max_expansion = MAX(2, max_expansion); - } - } - diff --git a/pkgs/development/interpreters/perl/CVE-2025-40909.patch b/pkgs/development/interpreters/perl/CVE-2025-40909.patch deleted file mode 100644 index 984c56e871ffb..0000000000000 --- a/pkgs/development/interpreters/perl/CVE-2025-40909.patch +++ /dev/null @@ -1,408 +0,0 @@ -From 918bfff86ca8d6d4e4ec5b30994451e0bd74aba9 Mon Sep 17 00:00:00 2001 -From: Leon Timmermans -Date: Fri, 23 May 2025 15:40:41 +0200 -Subject: [PATCH] CVE-2025-40909: Clone dirhandles without fchdir - -This uses fdopendir and dup to dirhandles. This means it won't change -working directory during thread cloning, which prevents race conditions -that can happen if a third thread is active at the same time. ---- - Configure | 6 ++ - Cross/config.sh-arm-linux | 1 + - Cross/config.sh-arm-linux-n770 | 1 + - Porting/Glossary | 5 ++ - Porting/config.sh | 1 + - config_h.SH | 6 ++ - configure.com | 1 + - plan9/config_sh.sample | 1 + - sv.c | 91 +---------------------------- - t/op/threads-dirh.t | 104 +-------------------------------- - win32/config.gc | 1 + - win32/config.vc | 1 + - 12 files changed, 28 insertions(+), 191 deletions(-) - -diff --git a/Configure b/Configure -index 44c12ced4014..7a13249caa96 100755 ---- a/Configure -+++ b/Configure -@@ -478,6 +478,7 @@ d_fd_set='' - d_fds_bits='' - d_fdclose='' - d_fdim='' -+d_fdopendir='' - d_fegetround='' - d_ffs='' - d_ffsl='' -@@ -13344,6 +13345,10 @@ esac - set i_fcntl - eval $setvar - -+: see if fdopendir exists -+set fdopendir d_fdopendir -+eval $inlibc -+ - : see if fork exists - set fork d_fork - eval $inlibc -@@ -25052,6 +25057,7 @@ d_flockproto='$d_flockproto' - d_fma='$d_fma' - d_fmax='$d_fmax' - d_fmin='$d_fmin' -+d_fdopendir='$d_fdopendir' - d_fork='$d_fork' - d_fp_class='$d_fp_class' - d_fp_classify='$d_fp_classify' -diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux -index bfa0b00d5f0f..9e056539198b 100644 ---- a/Cross/config.sh-arm-linux -+++ b/Cross/config.sh-arm-linux -@@ -212,6 +212,7 @@ d_fd_macros='define' - d_fd_set='define' - d_fdclose='undef' - d_fdim='undef' -+d_fdopendir=undef - d_fds_bits='undef' - d_fegetround='define' - d_ffs='undef' -diff --git a/Cross/config.sh-arm-linux-n770 b/Cross/config.sh-arm-linux-n770 -index 47ad5c37e3fd..365e4c4f9671 100644 ---- a/Cross/config.sh-arm-linux-n770 -+++ b/Cross/config.sh-arm-linux-n770 -@@ -211,6 +211,7 @@ d_fd_macros='define' - d_fd_set='define' - d_fdclose='undef' - d_fdim='undef' -+d_fdopendir=undef - d_fds_bits='undef' - d_fegetround='define' - d_ffs='undef' -diff --git a/Porting/Glossary b/Porting/Glossary -index bb505c653b0b..8b2965ca99c6 100644 ---- a/Porting/Glossary -+++ b/Porting/Glossary -@@ -947,6 +947,11 @@ d_fmin (d_fmin.U): - This variable conditionally defines the HAS_FMIN symbol, which - indicates to the C program that the fmin() routine is available. - -+d_fdopendir (d_fdopendir.U): -+ This variable conditionally defines the HAS_FORK symbol, which -+ indicates that the fdopen routine is available to open a -+ directory descriptor. -+ - d_fork (d_fork.U): - This variable conditionally defines the HAS_FORK symbol, which - indicates to the C program that the fork() routine is available. -diff --git a/Porting/config.sh b/Porting/config.sh -index a921f7e1c79a..6231ea0f31ea 100644 ---- a/Porting/config.sh -+++ b/Porting/config.sh -@@ -223,6 +223,7 @@ d_fd_macros='define' - d_fd_set='define' - d_fdclose='undef' - d_fdim='define' -+d_fdopendir='define' - d_fds_bits='define' - d_fegetround='define' - d_ffs='define' -diff --git a/config_h.SH b/config_h.SH -index da0f2dbcd7b7..5a0f81cf2011 100755 ---- a/config_h.SH -+++ b/config_h.SH -@@ -142,6 +142,12 @@ sed <$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un - */ - #$d_fcntl HAS_FCNTL /**/ - -+/* HAS_FDOPENDIR: -+ * This symbol, if defined, indicates that the fdopen routine is -+ * available to open a directory descriptor. -+ */ -+#$d_fdopendir HAS_FDOPENDIR /**/ -+ - /* HAS_FGETPOS: - * This symbol, if defined, indicates that the fgetpos routine is - * available to get the file position indicator, similar to ftell(). -diff --git a/configure.com b/configure.com -index 99527c180bfc..7c38711bb85d 100644 ---- a/configure.com -+++ b/configure.com -@@ -6010,6 +6010,7 @@ $ WC "d_fd_set='" + d_fd_set + "'" - $ WC "d_fd_macros='define'" - $ WC "d_fdclose='undef'" - $ WC "d_fdim='" + d_fdim + "'" -+$ WC "d_fdopendir='undef'" - $ WC "d_fds_bits='define'" - $ WC "d_fegetround='undef'" - $ WC "d_ffs='undef'" -diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample -index 636acbdf6db3..246bad954424 100644 ---- a/plan9/config_sh.sample -+++ b/plan9/config_sh.sample -@@ -212,6 +212,7 @@ d_fd_macros='undef' - d_fd_set='undef' - d_fdclose='undef' - d_fdim='undef' -+d_fdopendir=undef - d_fds_bits='undef' - d_fegetround='undef' - d_ffs='undef' -diff --git a/sv.c b/sv.c -index ae6d09dea28a..8a005b2d165b 100644 ---- a/sv.c -+++ b/sv.c -@@ -14096,15 +14096,6 @@ Perl_dirp_dup(pTHX_ DIR *const dp, CLONE_PARAMS *const param) - { - DIR *ret; - --#if defined(HAS_FCHDIR) && defined(HAS_TELLDIR) && defined(HAS_SEEKDIR) -- DIR *pwd; -- const Direntry_t *dirent; -- char smallbuf[256]; /* XXX MAXPATHLEN, surely? */ -- char *name = NULL; -- STRLEN len = 0; -- long pos; --#endif -- - PERL_UNUSED_CONTEXT; - PERL_ARGS_ASSERT_DIRP_DUP; - -@@ -14116,89 +14107,13 @@ Perl_dirp_dup(pTHX_ DIR *const dp, CLONE_PARAMS *const param) - if (ret) - return ret; - --#if defined(HAS_FCHDIR) && defined(HAS_TELLDIR) && defined(HAS_SEEKDIR) -+#ifdef HAS_FDOPENDIR - - PERL_UNUSED_ARG(param); - -- /* create anew */ -- -- /* open the current directory (so we can switch back) */ -- if (!(pwd = PerlDir_open("."))) return (DIR *)NULL; -- -- /* chdir to our dir handle and open the present working directory */ -- if (fchdir(my_dirfd(dp)) < 0 || !(ret = PerlDir_open("."))) { -- PerlDir_close(pwd); -- return (DIR *)NULL; -- } -- /* Now we should have two dir handles pointing to the same dir. */ -- -- /* Be nice to the calling code and chdir back to where we were. */ -- /* XXX If this fails, then what? */ -- PERL_UNUSED_RESULT(fchdir(my_dirfd(pwd))); -+ ret = fdopendir(dup(my_dirfd(dp))); - -- /* We have no need of the pwd handle any more. */ -- PerlDir_close(pwd); -- --#ifdef DIRNAMLEN --# define d_namlen(d) (d)->d_namlen --#else --# define d_namlen(d) strlen((d)->d_name) --#endif -- /* Iterate once through dp, to get the file name at the current posi- -- tion. Then step back. */ -- pos = PerlDir_tell(dp); -- if ((dirent = PerlDir_read(dp))) { -- len = d_namlen(dirent); -- if (len > sizeof(dirent->d_name) && sizeof(dirent->d_name) > PTRSIZE) { -- /* If the len is somehow magically longer than the -- * maximum length of the directory entry, even though -- * we could fit it in a buffer, we could not copy it -- * from the dirent. Bail out. */ -- PerlDir_close(ret); -- return (DIR*)NULL; -- } -- if (len <= sizeof smallbuf) name = smallbuf; -- else Newx(name, len, char); -- Move(dirent->d_name, name, len, char); -- } -- PerlDir_seek(dp, pos); -- -- /* Iterate through the new dir handle, till we find a file with the -- right name. */ -- if (!dirent) /* just before the end */ -- for(;;) { -- pos = PerlDir_tell(ret); -- if (PerlDir_read(ret)) continue; /* not there yet */ -- PerlDir_seek(ret, pos); /* step back */ -- break; -- } -- else { -- const long pos0 = PerlDir_tell(ret); -- for(;;) { -- pos = PerlDir_tell(ret); -- if ((dirent = PerlDir_read(ret))) { -- if (len == (STRLEN)d_namlen(dirent) -- && memEQ(name, dirent->d_name, len)) { -- /* found it */ -- PerlDir_seek(ret, pos); /* step back */ -- break; -- } -- /* else we are not there yet; keep iterating */ -- } -- else { /* This is not meant to happen. The best we can do is -- reset the iterator to the beginning. */ -- PerlDir_seek(ret, pos0); -- break; -- } -- } -- } --#undef d_namlen -- -- if (name && name != smallbuf) -- Safefree(name); --#endif -- --#ifdef WIN32 -+#elif defined(WIN32) - ret = win32_dirp_dup(dp, param); - #endif - -diff --git a/t/op/threads-dirh.t b/t/op/threads-dirh.t -index bb4bcfc14184..14c399ca19cd 100644 ---- a/t/op/threads-dirh.t -+++ b/t/op/threads-dirh.t -@@ -13,16 +13,12 @@ BEGIN { - skip_all_if_miniperl("no dynamic loading on miniperl, no threads"); - skip_all("runs out of memory on some EBCDIC") if $ENV{PERL_SKIP_BIG_MEM_TESTS}; - -- plan(6); -+ plan(1); - } - - use strict; - use warnings; - use threads; --use threads::shared; --use File::Path; --use File::Spec::Functions qw 'updir catdir'; --use Cwd 'getcwd'; - - # Basic sanity check: make sure this does not crash - fresh_perl_is <<'# this is no comment', 'ok', {}, 'crash when duping dirh'; -@@ -31,101 +27,3 @@ fresh_perl_is <<'# this is no comment', 'ok', {}, 'crash when duping dirh'; - async{}->join for 1..2; - print "ok"; - # this is no comment -- --my $dir; --SKIP: { -- skip "telldir or seekdir not defined on this platform", 5 -- if !$Config::Config{d_telldir} || !$Config::Config{d_seekdir}; -- my $skip = sub { -- chdir($dir); -- chdir updir; -- skip $_[0], 5 -- }; -- -- if(!$Config::Config{d_fchdir} && $^O ne "MSWin32") { -- $::TODO = 'dir handle cloning currently requires fchdir on non-Windows platforms'; -- } -- -- my @w :shared; # warnings accumulator -- local $SIG{__WARN__} = sub { push @w, $_[0] }; -- -- $dir = catdir getcwd(), "thrext$$" . int rand() * 100000; -- -- rmtree($dir) if -d $dir; -- mkdir($dir); -- -- # Create a dir structure like this: -- # $dir -- # | -- # `- toberead -- # | -- # +---- thrit -- # | -- # +---- rile -- # | -- # `---- zor -- -- chdir($dir); -- mkdir 'toberead'; -- chdir 'toberead'; -- {open my $fh, ">thrit" or &$skip("Cannot create file thrit")} -- {open my $fh, ">rile" or &$skip("Cannot create file rile")} -- {open my $fh, ">zor" or &$skip("Cannot create file zor")} -- chdir updir; -- -- # Then test that dir iterators are cloned correctly. -- -- opendir my $toberead, 'toberead'; -- my $start_pos = telldir $toberead; -- my @first_2 = (scalar readdir $toberead, scalar readdir $toberead); -- my @from_thread = @{; async { [readdir $toberead ] } ->join }; -- my @from_main = readdir $toberead; -- is join('-', sort @from_thread), join('-', sort @from_main), -- 'dir iterator is copied from one thread to another'; -- like -- join('-', "", sort(@first_2, @from_thread), ""), -- qr/(?join, 'undef', -- 'cloned dir iterator that points to the end of the directory' -- ; -- } -- -- # Make sure the cloning code can handle file names longer than 255 chars -- SKIP: { -- chdir 'toberead'; -- open my $fh, -- ">floccipaucinihilopilification-" -- . "pneumonoultramicroscopicsilicovolcanoconiosis-" -- . "lopadotemachoselachogaleokranioleipsanodrimypotrimmatosilphiokarabo" -- . "melitokatakechymenokichlepikossyphophattoperisteralektryonoptokephal" -- . "liokinklopeleiolagoiosiraiobaphetraganopterygon" -- or -- chdir updir, -- skip("OS does not support long file names (and I mean *long*)", 1); -- chdir updir; -- opendir my $dirh, "toberead"; -- my $test_name -- = "dir iterators can be cloned when the next fn > 255 chars"; -- while() { -- my $pos = telldir $dirh; -- my $fn = readdir($dirh); -- if(!defined $fn) { fail($test_name); last SKIP; } -- if($fn =~ 'lagoio') { -- seekdir $dirh, $pos; -- last; -- } -- } -- is length async { scalar readdir $dirh } ->join, 258, $test_name; -- } -- -- is scalar @w, 0, 'no warnings during all that' or diag @w; -- chdir updir; --} --rmtree($dir); -diff --git a/win32/config.gc b/win32/config.gc -index f8776188c09c..34aa8de6ed75 100644 ---- a/win32/config.gc -+++ b/win32/config.gc -@@ -199,6 +199,7 @@ d_fd_macros='define' - d_fd_set='define' - d_fdclose='undef' - d_fdim='undef' -+d_fdopendir='undef' - d_fds_bits='define' - d_fegetround='undef' - d_ffs='undef' -diff --git a/win32/config.vc b/win32/config.vc -index 619979e22b53..536085fe94e0 100644 ---- a/win32/config.vc -+++ b/win32/config.vc -@@ -199,6 +199,7 @@ d_fd_macros='define' - d_fd_set='define' - d_fdclose='undef' - d_fdim='undef' -+d_fdopendir='undef' - d_fds_bits='define' - d_fegetround='undef' - d_ffs='undef' diff --git a/pkgs/development/interpreters/perl/cross.patch b/pkgs/development/interpreters/perl/cross.patch index e0f05ede90d02..46ed70bbeb7c5 100644 --- a/pkgs/development/interpreters/perl/cross.patch +++ b/pkgs/development/interpreters/perl/cross.patch @@ -7,15 +7,15 @@ ExtUtils::MakeMaker JSON::PP Data::Dumper -Updated for perl v5.38.0 by stig@stig.io +Updated for perl v5.40.0 by marcus@means.no --- -diff --git a/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements.pm b/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements.pm +diff --git a/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements/Range.pm b/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements/Range.pm index b0e83b0d2d..dab4907704 100644 ---- a/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements.pm -+++ b/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements.pm -@@ -86,21 +86,7 @@ sub new { +--- a/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements/Range.pm ++++ b/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements/Range.pm +@@ -52,21 +52,38 @@ # from version::vpp sub _find_magic_vstring { my $value = shift; @@ -31,13 +31,42 @@ index b0e83b0d2d..dab4907704 100644 - } - else { - $magic = $magic->MOREMAGIC; -- } -- } ++ ++ # B is not available in miniperl (it depends on XS), so try to load it safely ++ my $has_B = eval { require B; 1 }; ++ ++ if ($has_B) { ++ my $sv = B::svref_2object(\$value); ++ my $magic = ref($sv) eq 'B::PVMG' ? $sv->MAGIC : undef; ++ while ($magic) { ++ if ($magic->TYPE eq 'V') { ++ my $tvalue = $magic->PTR; ++ $tvalue =~ s/^v?(.+)$/v$1/; ++ return $tvalue; ++ } ++ $magic = $magic->MOREMAGIC; + } + } - return $tvalue; -+ return version::->parse($value)->stringify; ++ ++ # --- Fallback for miniperl --- ++ # Perl represents vstrings internally as sequences of bytes like "\x01\x02\x03" ++ # and only shows them as "v1.2.3" when printed. ++ # Try to detect that pattern heuristically. ++ use builtin qw/reftype/; ++ if (!ref($value) && reftype(\$value) eq 'VSTRING') { ++ return sprintf("v%vd", $value); ++ } ++ ++ # If it's already a "v1.2.3" string, just return it as is ++ if ($value =~ /^v\d+(?:\.\d+)*$/) { ++ return $value; ++ } ++ ++ return ''; } - - # safe if given an unblessed reference + + # Perl 5.10.0 didn't have "is_qv" in version.pm diff --git a/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm b/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm index 746abd63bc..c55d7cd2d0 100644 --- a/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm @@ -47,13 +76,13 @@ index 746abd63bc..c55d7cd2d0 100644 use strict; use warnings; +no warnings 'experimental::builtin'; - package CPAN::Meta::YAML; # git description: v1.68-2-gcc5324e + package CPAN::Meta::YAML; # git description: v1.75-3-g85169f1 # XXX-INGY is 5.8.1 too old/broken for utf8? # XXX-XDG Lancaster consensus was that it was sufficient until @@ -650,27 +651,29 @@ sub _dump_string { join '', map { "$_\n" } @lines; } - + -sub _has_internal_string_value { +# taken from cpan/JSON-PP/lib/JSON/PP.pm +sub _looks_like_number { @@ -72,7 +101,7 @@ index 746abd63bc..c55d7cd2d0 100644 + return 1 if $value * 0 == 0; + return -1; # inf/nan } - + sub _dump_scalar { my $string = $_[1]; my $is_key = $_[2]; @@ -95,8 +124,8 @@ index 746abd63bc..c55d7cd2d0 100644 $string =~ s/\\/\\\\/g; @@ -800,9 +803,6 @@ sub errstr { # Helper functions. Possibly not needed. - - + + -# Use to detect nv or iv -use B; - @@ -106,7 +135,7 @@ index 746abd63bc..c55d7cd2d0 100644 @@ -822,35 +822,8 @@ sub _can_flock { } } - + - -# XXX-INGY Is this core in 5.8.1? Can we remove this? -# XXX-XDG Scalar::Util 1.18 didn't land until 5.8.8, so we need this @@ -138,7 +167,7 @@ index 746abd63bc..c55d7cd2d0 100644 - } + *refaddr = *builtin::refaddr; } - + delete $CPAN::Meta::YAML::{refaddr}; diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm index 3604eae402..991f69d275 100644 @@ -148,16 +177,16 @@ index 3604eae402..991f69d275 100644 use strict; use warnings; +no warnings 'experimental::builtin'; - + package CPAN::Meta::Merge; - + our $VERSION = '2.150010'; - + use Carp qw/croak/; -use Scalar::Util qw/blessed/; +use builtin qw/blessed/; use CPAN::Meta::Converter 2.141170; - + sub _is_identical { diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm index d4e93fd8a5..809da68d02 100644 @@ -169,40 +198,27 @@ index d4e93fd8a5..809da68d02 100644 use warnings; +no warnings 'experimental::builtin'; package CPAN::Meta::Prereqs; - + our $VERSION = '2.150010'; -@@ -14,7 +15,6 @@ our $VERSION = '2.150010'; +@@ -14,7 +14,7 @@ our $VERSION = '2.150010'; #pod =cut - + use Carp qw(confess); -use Scalar::Util qw(blessed); ++use builtin qw(blessed); use CPAN::Meta::Requirements 2.121; - + #pod =method new -@@ -168,7 +168,12 @@ sub types_in { - sub with_merged_prereqs { - my ($self, $other) = @_; - -- my @other = blessed($other) ? $other : @$other; -+ eval 'require Scalar::Util'; -+ my @other = unless($@){ -+ Scalar::Util::blessed($other) ? $other : @$other; -+ }else{ -+ builtin::blessed($other) ? $other : @$other; -+ } - - my @prereq_objs = ($self, @other); - diff --git a/cpan/JSON-PP/lib/JSON/PP.pm b/cpan/JSON-PP/lib/JSON/PP.pm index fc8fcbc8f0..cda7b90c65 100644 --- a/cpan/JSON-PP/lib/JSON/PP.pm +++ b/cpan/JSON-PP/lib/JSON/PP.pm @@ -4,6 +4,7 @@ package JSON::PP; - + use 5.008; use strict; +no warnings 'experimental::builtin'; - + use Exporter (); BEGIN { our @ISA = ('Exporter') } diff --git a/dist/Data-Dumper/Dumper.pm b/dist/Data-Dumper/Dumper.pm @@ -210,34 +226,34 @@ index bb6d3caedb..0c2fde4743 100644 --- a/dist/Data-Dumper/Dumper.pm +++ b/dist/Data-Dumper/Dumper.pm @@ -11,6 +11,7 @@ package Data::Dumper; - + use strict; use warnings; +no warnings 'experimental::builtin'; - + #$| = 1; - + @@ -125,8 +126,7 @@ sub new { # Packed numeric addresses take less memory. Plus pack is faster than sprintf - + sub format_refaddr { - require Scalar::Util; - pack "J", Scalar::Util::refaddr(shift); + pack "J", builtin::refaddr(shift); }; - + # @@ -282,9 +282,8 @@ sub _dump { warn "WARNING(Freezer method call failed): $@" if $@; } - + - require Scalar::Util; - my $realpack = Scalar::Util::blessed($val); - my $realtype = $realpack ? Scalar::Util::reftype($val) : ref $val; + my $realpack = builtin::blessed($val); + my $realtype = $realpack ? builtin::reftype($val) : ref $val; $id = format_refaddr($val); - + # Note: By this point $name is always defined and of non-zero length. @@ -576,7 +575,7 @@ sub _dump { # here generates a different result. So there are actually "three" different @@ -248,3 +264,36 @@ index bb6d3caedb..0c2fde4743 100644 $out .= sprintf "v%vd", $val; } # \d here would treat "1\x{660}" as a safe decimal number +diff --git a/cpan/JSON-PP/lib/JSON/PP.pm b/cpan/JSON-PP/lib/JSON/PP.pm +index fc8fcbc8f0..cda7b90c65 100644 +--- a/cpan/JSON-PP/lib/JSON/PP.pm ++++ b/cpan/JSON-PP/lib/JSON/PP.pm +@@ -12,6 +12,6 @@ package JSON::PP; + + use Carp (); +-use Scalar::Util qw(blessed reftype refaddr); ++use builtin qw(blessed reftype refaddr); + #use Devel::Peek; + + +diff --git a/cpan/CPAN-Meta/lib/Parse/CPAN/Meta.pm b/cpan/CPAN-Meta/lib/Parse/CPAN/Meta.pm +--- a/cpan/CPAN-Meta/lib/Parse/CPAN/Meta.pm ++++ b/cpan/CPAN-Meta/lib/Parse/CPAN/Meta.pm +@@ -53,7 +53,8 @@ sub load_json_string { + my ($class, $string) = @_; + require Encode; + # load_json_string takes characters, decode_json expects bytes +- my $encoded = Encode::encode('UTF-8', $string, Encode::PERLQQ()); ++ my $encoded = $string; ++ utf8::encode($encoded); # Miniperl workaround + my $data = eval { $class->json_decoder()->can('decode_json')->($encoded) }; + croak $@ if $@; + return $data || {}; +@@ -122,7 +122,7 @@ sub _slurp { + open my $fh, "<:raw", "$_[0]" ## no critic + or die "can't open $_[0] for reading: $!"; + my $content = do { local $/; <$fh> }; +- $content = Encode::decode('UTF-8', $content, Encode::PERLQQ()); ++ utf8::decode($content); # Workaround for miniperl + return $content; + } diff --git a/pkgs/development/interpreters/perl/cross540.patch b/pkgs/development/interpreters/perl/cross540.patch deleted file mode 100644 index 0736c16d4f455..0000000000000 --- a/pkgs/development/interpreters/perl/cross540.patch +++ /dev/null @@ -1,224 +0,0 @@ -From: =?UTF-8?q?Christian=20K=C3=B6gler?= -Date: Mon, 10 Apr 2023 22:12:24 +0200 -Subject: [PATCH] miniperl compatible modules - -CPAN::Meta -ExtUtils::MakeMaker -JSON::PP -Data::Dumper - -Updated for perl v5.40.0 by marcus@means.no - ---- - - # safe if given an unblessed reference -diff --git a/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm b/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm -index 746abd63bc..c55d7cd2d0 100644 ---- a/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm -+++ b/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm -@@ -1,6 +1,7 @@ - use 5.008001; # sane UTF-8 support - use strict; - use warnings; -+no warnings 'experimental::builtin'; - package CPAN::Meta::YAML; # git description: v1.68-2-gcc5324e - # XXX-INGY is 5.8.1 too old/broken for utf8? - # XXX-XDG Lancaster consensus was that it was sufficient until -@@ -650,27 +651,29 @@ sub _dump_string { - join '', map { "$_\n" } @lines; - } - --sub _has_internal_string_value { -+# taken from cpan/JSON-PP/lib/JSON/PP.pm -+sub _looks_like_number { - my $value = shift; -- my $b_obj = B::svref_2object(\$value); # for round trip problem -- return $b_obj->FLAGS & B::SVf_POK(); -+ no warnings 'numeric'; -+ # if the utf8 flag is on, it almost certainly started as a string -+ return if utf8::is_utf8($value); -+ # detect numbers -+ # string & "" -> "" -+ # number & "" -> 0 (with warning) -+ # nan and inf can detect as numbers, so check with * 0 -+ return unless length((my $dummy = "") & $value); -+ return unless 0 + $value eq $value; -+ return 1 if $value * 0 == 0; -+ return -1; # inf/nan - } - - sub _dump_scalar { - my $string = $_[1]; - my $is_key = $_[2]; -- # Check this before checking length or it winds up looking like a string! -- my $has_string_flag = _has_internal_string_value($string); - return '~' unless defined $string; - return "''" unless length $string; -- if (Scalar::Util::looks_like_number($string)) { -- # keys and values that have been used as strings get quoted -- if ( $is_key || $has_string_flag ) { -- return qq['$string']; -- } -- else { -- return $string; -- } -+ if (_looks_like_number($string)) { -+ return qq['$string']; - } - if ( $string =~ /[\x00-\x09\x0b-\x0d\x0e-\x1f\x7f-\x9f\'\n]/ ) { - $string =~ s/\\/\\\\/g; -@@ -800,9 +803,6 @@ sub errstr { - # Helper functions. Possibly not needed. - - --# Use to detect nv or iv --use B; -- - # XXX-INGY Is flock CPAN::Meta::YAML's responsibility? - # Some platforms can't flock :-( - # XXX-XDG I think it is. When reading and writing files, we ought -@@ -822,35 +822,8 @@ sub _can_flock { - } - } - -- --# XXX-INGY Is this core in 5.8.1? Can we remove this? --# XXX-XDG Scalar::Util 1.18 didn't land until 5.8.8, so we need this --##################################################################### --# Use Scalar::Util if possible, otherwise emulate it -- --use Scalar::Util (); - BEGIN { -- local $@; -- if ( eval { Scalar::Util->VERSION(1.18); } ) { -- *refaddr = *Scalar::Util::refaddr; -- } -- else { -- eval <<'END_PERL'; --# Scalar::Util failed to load or too old --sub refaddr { -- my $pkg = ref($_[0]) or return undef; -- if ( !! UNIVERSAL::can($_[0], 'can') ) { -- bless $_[0], 'Scalar::Util::Fake'; -- } else { -- $pkg = undef; -- } -- "$_[0]" =~ /0x(\w+)/; -- my $i = do { no warnings 'portable'; hex $1 }; -- bless $_[0], $pkg if defined $pkg; -- $i; --} --END_PERL -- } -+ *refaddr = *builtin::refaddr; - } - - delete $CPAN::Meta::YAML::{refaddr}; -diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm -index 3604eae402..991f69d275 100644 ---- a/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm -+++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm -@@ -1,12 +1,13 @@ - use strict; - use warnings; -+no warnings 'experimental::builtin'; - - package CPAN::Meta::Merge; - - our $VERSION = '2.150010'; - - use Carp qw/croak/; --use Scalar::Util qw/blessed/; -+use builtin qw/blessed/; - use CPAN::Meta::Converter 2.141170; - - sub _is_identical { -diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm -index d4e93fd8a5..809da68d02 100644 ---- a/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm -+++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm -@@ -1,6 +1,7 @@ - use 5.006; - use strict; - use warnings; -+no warnings 'experimental::builtin'; - package CPAN::Meta::Prereqs; - - our $VERSION = '2.150010'; -@@ -14,7 +15,6 @@ our $VERSION = '2.150010'; - #pod =cut - - use Carp qw(confess); --use Scalar::Util qw(blessed); - use CPAN::Meta::Requirements 2.121; - - #pod =method new -@@ -168,7 +168,12 @@ sub types_in { - sub with_merged_prereqs { - my ($self, $other) = @_; - -- my @other = blessed($other) ? $other : @$other; -+ eval 'require Scalar::Util'; -+ my @other = unless($@){ -+ Scalar::Util::blessed($other) ? $other : @$other; -+ }else{ -+ builtin::blessed($other) ? $other : @$other; -+ } - - my @prereq_objs = ($self, @other); - -diff --git a/cpan/JSON-PP/lib/JSON/PP.pm b/cpan/JSON-PP/lib/JSON/PP.pm -index fc8fcbc8f0..cda7b90c65 100644 ---- a/cpan/JSON-PP/lib/JSON/PP.pm -+++ b/cpan/JSON-PP/lib/JSON/PP.pm -@@ -4,6 +4,7 @@ package JSON::PP; - - use 5.008; - use strict; -+no warnings 'experimental::builtin'; - - use Exporter (); - BEGIN { our @ISA = ('Exporter') } -diff --git a/dist/Data-Dumper/Dumper.pm b/dist/Data-Dumper/Dumper.pm -index bb6d3caedb..0c2fde4743 100644 ---- a/dist/Data-Dumper/Dumper.pm -+++ b/dist/Data-Dumper/Dumper.pm -@@ -11,6 +11,7 @@ package Data::Dumper; - - use strict; - use warnings; -+no warnings 'experimental::builtin'; - - #$| = 1; - -@@ -125,8 +126,7 @@ sub new { - # Packed numeric addresses take less memory. Plus pack is faster than sprintf - - sub format_refaddr { -- require Scalar::Util; -- pack "J", Scalar::Util::refaddr(shift); -+ pack "J", builtin::refaddr(shift); - }; - - # -@@ -282,9 +282,8 @@ sub _dump { - warn "WARNING(Freezer method call failed): $@" if $@; - } - -- require Scalar::Util; -- my $realpack = Scalar::Util::blessed($val); -- my $realtype = $realpack ? Scalar::Util::reftype($val) : ref $val; -+ my $realpack = builtin::blessed($val); -+ my $realtype = $realpack ? builtin::reftype($val) : ref $val; - $id = format_refaddr($val); - - # Note: By this point $name is always defined and of non-zero length. -@@ -576,7 +575,7 @@ sub _dump { - # here generates a different result. So there are actually "three" different - # implementations of Data::Dumper (kind of sort of) but we only test two. - elsif (!defined &_vstring -- and ref $ref eq 'VSTRING' || eval{Scalar::Util::isvstring($val)}) { -+ and ref $ref eq 'VSTRING') { - $out .= sprintf "v%vd", $val; - } - # \d here would treat "1\x{660}" as a safe decimal number diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 69d02530a90f0..8fc7b5dd07a3e 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -68,19 +68,10 @@ let in rec { - # Maint version - perl538 = callPackage ./interpreter.nix { - self = perl538; - version = "5.38.2"; - sha256 = "sha256-oKMVNEUet7g8fWWUpJdUOlTUiLyQygD140diV39AZV4="; - inherit passthruFun; - }; - - # Maint version - perl540 = callPackage ./interpreter.nix { - self = perl540; - version = "5.40.0"; - sha256 = "sha256-x0A0jzVzljJ6l5XT6DI7r9D+ilx4NfwcuroMyN/nFh8="; + perl5 = callPackage ./interpreter.nix { + self = perl5; + version = "5.42.0"; + sha256 = "sha256-4JPvGE1/mhuXl+JGUpb1VRCtttq4hCsMPtUzKWYwltw="; inherit passthruFun; }; } diff --git a/pkgs/development/interpreters/perl/fix-build-with-only-C-locale-5.40.0.patch b/pkgs/development/interpreters/perl/fix-build-with-only-C-locale-5.40.0.patch deleted file mode 100644 index 9f9e1e96f6194..0000000000000 --- a/pkgs/development/interpreters/perl/fix-build-with-only-C-locale-5.40.0.patch +++ /dev/null @@ -1,57 +0,0 @@ -From bd0ab509f890a6638bd5033ef58526f8c74f7e4b Mon Sep 17 00:00:00 2001 -From: Andrei Horodniceanu -Date: Wed, 4 Sep 2024 12:46:44 +0300 -Subject: [PATCH] locale.c: Fix compilation on platforms with only a C locale - -Signed-off-by: Andrei Horodniceanu ---- - AUTHORS | 1 + - locale.c | 16 ++++++++++++++++ - 2 files changed, 17 insertions(+) - -diff --git a/AUTHORS b/AUTHORS -index b2e0bf2043a9..b196b93bda13 100644 ---- a/AUTHORS -+++ b/AUTHORS -@@ -103,6 +103,7 @@ Andreas König - Andreas Marienborg - Andreas Schwab - Andreas Voegele -+Andrei Horodniceanu - Andrei Yelistratov - Andrej Borsenkow - Andrew Bettison -diff --git a/locale.c b/locale.c -index 168b94914318..d764b4b3c11e 100644 ---- a/locale.c -+++ b/locale.c -@@ -8963,6 +8963,7 @@ Perl_init_i18nl10n(pTHX_ int printwarn) - * categories into our internal indices. */ - if (map_LC_ALL_position_to_index[0] == LC_ALL_INDEX_) { - -+# ifdef PERL_LC_ALL_CATEGORY_POSITIONS_INIT - /* Use this array, initialized by a config.h constant */ - int lc_all_category_positions[] = PERL_LC_ALL_CATEGORY_POSITIONS_INIT; - STATIC_ASSERT_STMT( C_ARRAY_LENGTH(lc_all_category_positions) -@@ -8975,6 +8976,21 @@ Perl_init_i18nl10n(pTHX_ int printwarn) - map_LC_ALL_position_to_index[i] = - get_category_index(lc_all_category_positions[i]); - } -+# else -+ /* It is possible for both PERL_LC_ALL_USES_NAME_VALUE_PAIRS and -+ * PERL_LC_ALL_CATEGORY_POSITIONS_INIT not to be defined, e.g. on -+ * systems with only a C locale during ./Configure. Assume that this -+ * can only happen as part of some sort of bootstrapping so allow -+ * compilation to succeed by ignoring correctness. -+ */ -+ for (unsigned int i = 0; -+ i < C_ARRAY_LENGTH(map_LC_ALL_position_to_index); -+ i++) -+ { -+ map_LC_ALL_position_to_index[i] = 0; -+ } -+# endif -+ - } - - LOCALE_UNLOCK; diff --git a/pkgs/development/interpreters/perl/interpreter.nix b/pkgs/development/interpreters/perl/interpreter.nix index 16e6bd821d5ae..ee59b10344c5a 100644 --- a/pkgs/development/interpreters/perl/interpreter.nix +++ b/pkgs/development/interpreters/perl/interpreter.nix @@ -15,7 +15,7 @@ zlib, config, passthruFun, - perlAttr ? "perl${lib.versions.major version}${lib.versions.minor version}", + perlAttr ? "perl${lib.versions.major version}", enableThreading ? true, coreutils, makeWrapper, @@ -33,6 +33,13 @@ assert (enableCrypt -> (libxcrypt != null)); let crossCompiling = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); + commonPatches = [ + ./no-sys-dirs.patch + ] + ++ lib.optional stdenv.hostPlatform.isSunOS ./ld-shared.patch + ++ lib.optional stdenv.hostPlatform.isDarwin ./cpp-precomp.patch + ++ lib.optional crossCompiling ./cross.patch; + libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr"; libcInc = lib.getDev libc; libcLib = lib.getLib libc; @@ -71,27 +78,7 @@ stdenv.mkDerivation ( disallowedReferences = [ stdenv.cc ]; - patches = [ - ./CVE-2024-56406.patch - ./CVE-2025-40909.patch - ] - # Do not look in /usr etc. for dependencies. - ++ lib.optional ((lib.versions.majorMinor version) == "5.38") ./no-sys-dirs-5.38.0.patch - ++ lib.optional ((lib.versions.majorMinor version) == "5.40") ./no-sys-dirs-5.40.0.patch - - # Fix compilation on platforms with only a C locale: https://github.com/Perl/perl5/pull/22569 - ++ lib.optional (version == "5.40.0") ./fix-build-with-only-C-locale-5.40.0.patch - - ++ lib.optional stdenv.hostPlatform.isSunOS ./ld-shared.patch - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ./cpp-precomp.patch - ./sw_vers.patch - ] - # fixes build failure due to missing d_fdopendir/HAS_FDOPENDIR configure option - # https://github.com/arsv/perl-cross/pull/159 - ++ lib.optional (crossCompiling && (lib.versionAtLeast version "5.40.0")) ./cross-fdopendir.patch - ++ lib.optional (crossCompiling && (lib.versionAtLeast version "5.40.0")) ./cross540.patch - ++ lib.optional (crossCompiling && (lib.versionOlder version "5.40.0")) ./cross.patch; + patches = commonPatches; # This is not done for native builds because pwd may need to come from # bootstrap tools when building bootstrap perl. @@ -159,6 +146,7 @@ stdenv.mkDerivation ( "-Dinstallstyle=lib/perl5" "-Dlocincpth=${libcInc}/include" "-Dloclibpth=${libcLib}/lib" + "-Accflags=-D_GNU_SOURCE" ] ++ lib.optional stdenv.hostPlatform.isStatic "-Uusedl" ++ lib.optionals ((builtins.match ''5\.[0-9]*[13579]\..+'' version) != null) [ @@ -177,16 +165,20 @@ stdenv.mkDerivation ( configureScript = lib.optionalString (!crossCompiling) "${stdenv.shell} ./Configure"; # !canExecute cross uses miniperl which doesn't have this - postConfigure = lib.optionalString (!crossCompiling && stdenv.cc.targetPrefix != "") '' - substituteInPlace Makefile \ - --replace-fail "AR = ar" "AR = ${stdenv.cc.targetPrefix}ar" - ''; + postConfigure = + lib.optionalString (!crossCompiling && stdenv.cc.targetPrefix != "") '' + substituteInPlace Makefile \ + --replace-fail "AR = ar" "AR = ${stdenv.cc.targetPrefix}ar" + '' + + lib.optionalString crossCompiling '' + substituteInPlace miniperl_top --replace-fail '-I$top/lib' '-I$top/cpan/JSON-PP/lib -I$top/cpan/CPAN-Meta-YAML/lib -I$top/lib' + ''; dontAddStaticConfigureFlags = true; dontAddPrefix = !crossCompiling; - enableParallelBuilding = false; + enableParallelBuilding = true; # perl includes the build date, the uname of the build system and the # username of the build user in some files. @@ -237,6 +229,13 @@ stdenv.mkDerivation ( setupHook = ./setup-hook.sh; + env = { + # https://github.com/llvm/llvm-project/issues/152241 + NIX_CFLAGS_COMPILE = lib.optionalString ( + stdenv.hasCC && stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "21" + ) "-fno-strict-aliasing"; + }; + # copied from python passthru = let @@ -329,8 +328,14 @@ stdenv.mkDerivation ( rev = crossVersion; hash = "sha256-mG9ny+eXGBL4K/rXqEUPSbar+4Mq4IaQrGRFIHIyAAw="; }; - - # Patches are above!!! + patches = commonPatches ++ [ + # fixes build failure due to missing d_fdopendir/HAS_FDOPENDIR configure option + # https://github.com/arsv/perl-cross/pull/159 + ./cross-fdopendir.patch + # Add patchset for 5.42.0 - Can hopefully be removed once perl-cross is updated + # https://github.com/arsv/perl-cross/pull/164 + ./perl-5.42.0-cross.patch + ]; depsBuildBuild = [ buildPackages.stdenv.cc diff --git a/pkgs/development/interpreters/perl/no-sys-dirs-5.38.0.patch b/pkgs/development/interpreters/perl/no-sys-dirs-5.38.0.patch deleted file mode 100644 index c959730d14208..0000000000000 --- a/pkgs/development/interpreters/perl/no-sys-dirs-5.38.0.patch +++ /dev/null @@ -1,256 +0,0 @@ -diff --git a/Configure b/Configure -index e261cb9548..3bbbc4b9df 100755 ---- a/Configure -+++ b/Configure -@@ -108,15 +108,7 @@ if test -d c:/. || ( uname -a | grep -i 'os\(/\|\)2' 2>&1 ) 2>&1 >/dev/null ; th - fi - - : Proper PATH setting --paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' --paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" --paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" --paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" --paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" --paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" --paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" --paths="$paths /sbin /usr/sbin /usr/libexec" --paths="$paths /system/gnu_library/bin" -+paths='' - - for p in $paths - do -@@ -1455,8 +1447,7 @@ groupstype='' - i_whoami='' - : Possible local include directories to search. - : Set locincpth to "" in a hint file to defeat local include searches. --locincpth="/usr/local/include /opt/local/include /usr/gnu/include" --locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" -+locincpth="" - : - : no include file wanted by default - inclwanted='' -@@ -1470,17 +1461,12 @@ DEBUGGING='' - archobjs='' - libnames='' - : change the next line if compiling for Xenix/286 on Xenix/386 --xlibpth='/usr/lib/386 /lib/386' -+xlibpth='' - : Possible local library directories to search. --loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" --loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" -+loclibpth="" - - : general looking path for locating libraries --glibpth="/lib /usr/lib $xlibpth" --glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" --test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" --test -f /shlib/libc.so && glibpth="/shlib $glibpth" --test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" -+glibpth="" - - : Private path used by Configure to find libraries. Its value - : is prepended to libpth. This variable takes care of special -@@ -1515,8 +1501,6 @@ libswanted="cl pthread socket bind inet ndbm gdbm dbm db malloc dl ld" - libswanted="$libswanted sun m crypt sec util c cposix posix ucb bsd BSD" - : We probably want to search /usr/shlib before most other libraries. - : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. --glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` --glibpth="/usr/shlib $glibpth" - : Do not use vfork unless overridden by a hint file. - usevfork=false - -@@ -2581,7 +2565,6 @@ uname - zip - " - pth=`echo $PATH | sed -e "s/$p_/ /g"` --pth="$pth $sysroot/lib $sysroot/usr/lib" - for file in $loclist; do - eval xxx=\$$file - case "$xxx" in -@@ -5023,7 +5006,7 @@ esac - : Set private lib path - case "$plibpth" in - '') if ./mips; then -- plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib" -+ plibpth="$incpath/usr/lib" - fi;; - esac - case "$libpth" in -@@ -8860,13 +8843,8 @@ esac - echo " " - case "$sysman" in - '') -- syspath='/usr/share/man/man1 /usr/man/man1' -- syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" -- syspath="$syspath /usr/man/u_man/man1" -- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1" -- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" -- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1" -- sysman=`./loc . /usr/man/man1 $syspath` -+ syspath='' -+ sysman='' - ;; - esac - if $test -d "$sysman"; then -@@ -21500,9 +21478,10 @@ $rm_try tryp - case "$full_ar" in - '') full_ar=$ar ;; - esac -+full_ar=ar - - : Store the full pathname to the sed program for use in the C program --full_sed=$sed -+full_sed=sed - - : see what type gids are declared as in the kernel - echo " " -diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL -index ae647d5f06..9a05d66592 100644 ---- a/ext/Errno/Errno_pm.PL -+++ b/ext/Errno/Errno_pm.PL -@@ -135,12 +135,7 @@ sub get_files { - if ($dep =~ /(\S+errno\.h)/) { - push(@file, $1); - } -- } elsif ($^O eq 'linux' && -- $Config{gccversion} ne '' && -- $Config{gccversion} !~ /intel/i && -- # might be using, say, Intel's icc -- $linux_errno_h -- ) { -+ } elsif (0) { - push(@file, $linux_errno_h); - } elsif ($^O eq 'haiku') { - # hidden in a special place -diff --git a/hints/freebsd.sh b/hints/freebsd.sh -index 4d26835e99..c6d365d84d 100644 ---- a/hints/freebsd.sh -+++ b/hints/freebsd.sh -@@ -127,21 +127,21 @@ case "$osvers" in - objformat=`/usr/bin/objformat` - if [ x$objformat = xaout ]; then - if [ -e /usr/lib/aout ]; then -- libpth="/usr/lib/aout /usr/local/lib /usr/lib" -- glibpth="/usr/lib/aout /usr/local/lib /usr/lib" -+ libpth="" -+ glibpth="" - fi - lddlflags='-Bshareable' - else -- libpth="/usr/lib /usr/local/lib" -- glibpth="/usr/lib /usr/local/lib" -+ libpth="" -+ glibpth="" - ldflags="-Wl,-E " - lddlflags="-shared " - fi - cccdlflags='-DPIC -fPIC' - ;; - *) -- libpth="/usr/lib /usr/local/lib" -- glibpth="/usr/lib /usr/local/lib" -+ libpth="" -+ glibpth="" - ldflags="-Wl,-E " - lddlflags="-shared " - cccdlflags='-DPIC -fPIC' -diff --git a/hints/linux.sh b/hints/linux.sh -index e1508c7509..5a187c583a 100644 ---- a/hints/linux.sh -+++ b/hints/linux.sh -@@ -150,28 +150,6 @@ case "$optimize" in - ;; - esac - --# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries --# (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us --# where to look. We don't want gcc's own libraries, however, so we --# filter those out. --# This could be conditional on Ubuntu, but other distributions may --# follow suit, and this scheme seems to work even on rather old gcc's. --# This unconditionally uses gcc because even if the user is using another --# compiler, we still need to find the math library and friends, and I don't --# know how other compilers will cope with that situation. --# Morever, if the user has their own gcc earlier in $PATH than the system gcc, --# we don't want its libraries. So we try to prefer the system gcc --# Still, as an escape hatch, allow Configure command line overrides to --# plibpth to bypass this check. --if [ -x /usr/bin/gcc ] ; then -- gcc=/usr/bin/gcc --# clang also provides -print-search-dirs --elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then -- gcc=${cc:-cc} --else -- gcc=gcc --fi -- - case "$plibpth" in - '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries | - cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'` -@@ -208,32 +186,6 @@ case "$usequadmath" in - ;; - esac - --case "$libc" in --'') --# If you have glibc, then report the version for ./myconfig bug reporting. --# (Configure doesn't need to know the specific version since it just uses --# gcc to load the library for all tests.) --# We don't use __GLIBC__ and __GLIBC_MINOR__ because they --# are insufficiently precise to distinguish things like --# libc-2.0.6 and libc-2.0.7. -- for p in $plibpth -- do -- for trylib in libc.so.6 libc.so -- do -- if $test -e $p/$trylib; then -- libc=`ls -l $p/$trylib | awk '{print $NF}'` -- if $test "X$libc" != X; then -- break -- fi -- fi -- done -- if $test "X$libc" != X; then -- break -- fi -- done -- ;; --esac -- - if ${sh:-/bin/sh} -c exit; then - echo '' - echo 'You appear to have a working bash. Good.' -@@ -311,33 +263,6 @@ sparc*) - ;; - esac - --# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than --# true libraries. The scripts cause binding against static --# version of -lgdbm which is a bad idea. So if we have 'nm' --# make sure it can read the file --# NI-S 2003/08/07 --case "$nm" in -- '') ;; -- *) -- for p in $plibpth -- do -- if $test -r $p/libndbm.so; then -- if $nm $p/libndbm.so >/dev/null 2>&1 ; then -- echo 'Your shared -lndbm seems to be a real library.' -- _libndbm_real=1 -- break -- fi -- fi -- done -- if $test "X$_libndbm_real" = X; then -- echo 'Your shared -lndbm is not a real library.' -- set `echo X "$libswanted "| sed -e 's/ ndbm / /'` -- shift -- libswanted="$*" -- fi -- ;; --esac -- - # Linux on Synology. - if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then - # Tested on Synology DS213 and DS413 diff --git a/pkgs/development/interpreters/perl/no-sys-dirs-5.40.0.patch b/pkgs/development/interpreters/perl/no-sys-dirs.patch similarity index 100% rename from pkgs/development/interpreters/perl/no-sys-dirs-5.40.0.patch rename to pkgs/development/interpreters/perl/no-sys-dirs.patch diff --git a/pkgs/development/interpreters/perl/perl-5.42.0-cross.patch b/pkgs/development/interpreters/perl/perl-5.42.0-cross.patch new file mode 100644 index 0000000000000..66b536b6973df --- /dev/null +++ b/pkgs/development/interpreters/perl/perl-5.42.0-cross.patch @@ -0,0 +1,186 @@ +From b47ef629459076a5ccb3d0caf83ccfbb8ba0571b Mon Sep 17 00:00:00 2001 +From: Marcus Ramberg +Date: Wed, 3 Sep 2025 10:35:58 +0200 +Subject: [PATCH] patches for perl-5.42.0 + +--- + cnf/diffs/perl5-5.42.0/constant.patch | 1 + + cnf/diffs/perl5-5.42.0/dynaloader.patch | 1 + + cnf/diffs/perl5-5.42.0/findext.patch | 1 + + cnf/diffs/perl5-5.42.0/installscripts.patch | 1 + + cnf/diffs/perl5-5.42.0/liblist.patch | 80 +++++++++++++++++++++ + cnf/diffs/perl5-5.42.0/makemaker.patch | 1 + + cnf/diffs/perl5-5.42.0/posix-makefile.patch | 1 + + cnf/diffs/perl5-5.42.0/test-checkcase.patch | 1 + + cnf/diffs/perl5-5.42.0/test-makemaker.patch | 1 + + cnf/diffs/perl5-5.42.0/xconfig.patch | 1 + + 10 files changed, 89 insertions(+) + create mode 120000 cnf/diffs/perl5-5.42.0/constant.patch + create mode 120000 cnf/diffs/perl5-5.42.0/dynaloader.patch + create mode 120000 cnf/diffs/perl5-5.42.0/findext.patch + create mode 120000 cnf/diffs/perl5-5.42.0/installscripts.patch + create mode 100644 cnf/diffs/perl5-5.42.0/liblist.patch + create mode 120000 cnf/diffs/perl5-5.42.0/makemaker.patch + create mode 120000 cnf/diffs/perl5-5.42.0/posix-makefile.patch + create mode 120000 cnf/diffs/perl5-5.42.0/test-checkcase.patch + create mode 120000 cnf/diffs/perl5-5.42.0/test-makemaker.patch + create mode 120000 cnf/diffs/perl5-5.42.0/xconfig.patch + +diff --git a/cnf/diffs/perl5-5.42.0/constant.patch b/cnf/diffs/perl5-5.42.0/constant.patch +new file mode 120000 +index 0000000..065e198 +--- /dev/null ++++ b/cnf/diffs/perl5-5.42.0/constant.patch +@@ -0,0 +1 @@ ++../perl5-5.22.3/constant.patch +\ No newline at end of file +diff --git a/cnf/diffs/perl5-5.42.0/dynaloader.patch b/cnf/diffs/perl5-5.42.0/dynaloader.patch +new file mode 120000 +index 0000000..ffb73eb +--- /dev/null ++++ b/cnf/diffs/perl5-5.42.0/dynaloader.patch +@@ -0,0 +1 @@ ++../perl5-5.22.3/dynaloader.patch +\ No newline at end of file +diff --git a/cnf/diffs/perl5-5.42.0/findext.patch b/cnf/diffs/perl5-5.42.0/findext.patch +new file mode 120000 +index 0000000..9efbe5b +--- /dev/null ++++ b/cnf/diffs/perl5-5.42.0/findext.patch +@@ -0,0 +1 @@ ++../perl5-5.22.3/findext.patch +\ No newline at end of file +diff --git a/cnf/diffs/perl5-5.42.0/installscripts.patch b/cnf/diffs/perl5-5.42.0/installscripts.patch +new file mode 120000 +index 0000000..1c05e0f +--- /dev/null ++++ b/cnf/diffs/perl5-5.42.0/installscripts.patch +@@ -0,0 +1 @@ ++../perl5-5.36.0/installscripts.patch +\ No newline at end of file +diff --git a/cnf/diffs/perl5-5.42.0/liblist.patch b/cnf/diffs/perl5-5.42.0/liblist.patch +new file mode 100644 +index 0000000..5e6331f +--- /dev/null ++++ b/cnf/diffs/perl5-5.42.0/liblist.patch +@@ -0,0 +1,80 @@ ++When deciding which libraries are available, the original Configure uses ++shaky heuristics to physically locate library files. ++This is a very very bad thing to do, *especially* when cross-compiling, ++as said heiristics are likely to locate the host libraries, not the target ones. ++ ++The only real need for this test is to make sure it's safe to pass -llibrary ++to the compiler. So that's exactly what perl-cross does, pass -llibrary ++and see if it breaks things. ++ ++Note this is a part of MakeMaker, and only applies to module Makefiles. ++ ++ ++--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm +++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm ++@@ -20,9 +20,10 @@ ++ use File::Spec; ++ ++ sub ext { ++- if ( $^O eq 'VMS' ) { goto &_vms_ext; } ++- elsif ( $^O eq 'MSWin32' ) { goto &_win32_ext; } ++- else { goto &_unix_os2_ext; } +++ if ($Config{usemmldlt}){ goto &_ld_ext; } +++ elsif($^O eq 'VMS') { goto &_vms_ext; } +++ elsif($^O eq 'MSWin32') { goto &_win32_ext; } +++ else { goto &_unix_os2_ext; } ++ } ++ ++ sub _unix_os2_ext { ++@@ -661,4 +662,51 @@ ++ wantarray ? ( $lib, '', $ldlib, '', ( $give_libs ? \@flibs : () ) ) : $lib; ++ } ++ +++# A direct test for -l validity. +++# Because guessing real file names for -llib options when dealing +++# with a cross compiler is generally a BAD IDEA^tm. +++sub _ld_ext { +++ my($self,$potential_libs, $verbose, $give_libs) = @_; +++ $verbose ||= 0; +++ +++ if ($^O =~ 'os2' and $Config{perllibs}) { +++ # Dynamic libraries are not transitive, so we may need including +++ # the libraries linked against perl.dll again. +++ +++ $potential_libs .= " " if $potential_libs; +++ $potential_libs .= $Config{perllibs}; +++ } +++ return ("", "", "", "", ($give_libs ? [] : ())) unless $potential_libs; +++ warn "Potential libraries are '$potential_libs':\n" if $verbose; +++ +++ my($ld) = $Config{ld}; +++ my($ldflags) = $Config{ldflags}; +++ my($libs) = defined $Config{perllibs} ? $Config{perllibs} : $Config{libs}; +++ +++ my $try = 'try_mm.c'; +++ my $tryx = 'try_mm.x'; +++ open(TRY, '>', $try) || die "Can't create MakeMaker test file $try: $!\n"; +++ print TRY "int main(void) { return 0; }\n"; +++ close(TRY); +++ +++ my $testlibs = ''; +++ my @testlibs = (); +++ foreach my $thislib (split ' ', $potential_libs) { +++ $testlibs = join(' ', @testlibs); +++ if($thislib =~ /^-L/) { +++ push(@testlibs, $thislib); +++ next +++ }; +++ my $cmd = "$ld $ldflags -o $tryx $try $testlibs $thislib >/dev/null 2>&1"; +++ my $ret = system($cmd); +++ warn "Warning (mostly harmless): " . "No library found for $thislib\n" if $ret; +++ next if $ret; +++ push @testlibs, $thislib; +++ } +++ unlink($try); +++ unlink($tryx); +++ +++ return (join(' ', @testlibs), '', join(' ', @testlibs), ''); +++} +++ ++ 1; +diff --git a/cnf/diffs/perl5-5.42.0/makemaker.patch b/cnf/diffs/perl5-5.42.0/makemaker.patch +new file mode 120000 +index 0000000..d7bd609 +--- /dev/null ++++ b/cnf/diffs/perl5-5.42.0/makemaker.patch +@@ -0,0 +1 @@ ++../perl5-5.38.0/makemaker.patch +\ No newline at end of file +diff --git a/cnf/diffs/perl5-5.42.0/posix-makefile.patch b/cnf/diffs/perl5-5.42.0/posix-makefile.patch +new file mode 120000 +index 0000000..29463b7 +--- /dev/null ++++ b/cnf/diffs/perl5-5.42.0/posix-makefile.patch +@@ -0,0 +1 @@ ++../perl5-5.22.3/posix-makefile.patch +\ No newline at end of file +diff --git a/cnf/diffs/perl5-5.42.0/test-checkcase.patch b/cnf/diffs/perl5-5.42.0/test-checkcase.patch +new file mode 120000 +index 0000000..36c5186 +--- /dev/null ++++ b/cnf/diffs/perl5-5.42.0/test-checkcase.patch +@@ -0,0 +1 @@ ++../perl5-5.22.3/test-checkcase.patch +\ No newline at end of file +diff --git a/cnf/diffs/perl5-5.42.0/test-makemaker.patch b/cnf/diffs/perl5-5.42.0/test-makemaker.patch +new file mode 120000 +index 0000000..4e970ff +--- /dev/null ++++ b/cnf/diffs/perl5-5.42.0/test-makemaker.patch +@@ -0,0 +1 @@ ++../perl5-5.34.0/test-makemaker.patch +\ No newline at end of file +diff --git a/cnf/diffs/perl5-5.42.0/xconfig.patch b/cnf/diffs/perl5-5.42.0/xconfig.patch +new file mode 120000 +index 0000000..1c22c96 +--- /dev/null ++++ b/cnf/diffs/perl5-5.42.0/xconfig.patch +@@ -0,0 +1 @@ ++../perl5-5.41.3/xconfig.patch +\ No newline at end of file diff --git a/pkgs/development/interpreters/perl/sw_vers.patch b/pkgs/development/interpreters/perl/sw_vers.patch deleted file mode 100644 index 2e30dba929242..0000000000000 --- a/pkgs/development/interpreters/perl/sw_vers.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/hints/darwin.sh b/hints/darwin.sh -index afadf53..80b7533 100644 ---- a/hints/darwin.sh -+++ b/hints/darwin.sh -@@ -329,7 +329,7 @@ EOM - # sw_vers output what we want - # "ProductVersion: 10.10.5" "10.10" - # "ProductVersion: 10.11" "10.11" -- prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'` -+ prodvers="${MACOSX_DEPLOYMENT_TARGET:-10.12}" - case "$prodvers" in - 10.*) - add_macosx_version_min ccflags $prodvers diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 1e8b00c05cd5b..13ede05bf2b72 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -405,6 +405,10 @@ stdenv.mkDerivation (finalAttrs: { # backport fix for https://github.com/python/cpython/issues/95855 ./platform-triplet-detection.patch ] + ++ optionals (version == "3.13.10" || version == "3.14.1") [ + # https://github.com/python/cpython/issues/142218 + ./${lib.versions.majorMinor version}/gh-142218.patch + ] ++ optionals (stdenv.hostPlatform.isMinGW) ( let # https://src.fedoraproject.org/rpms/mingw-python3 diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index d1ac795c472f7..9c5dc4671b56a 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 = "9"; + patch = "11"; suffix = ""; }; - hash = "sha256-7V7zTNo2z6Lzo0DwfKx+eBT5HH88QR9tNWIyOoZsXGY="; + hash = "sha256-Fu3nu3zb+oldEbBkL6DlI/KR5khxlNU89tOzOMOhfqI="; }; }; @@ -91,10 +91,10 @@ sourceVersion = { major = "3"; minor = "14"; - patch = "0"; + patch = "2"; suffix = ""; }; - hash = "sha256-Ipna5ULTlc44g6ygDTyRAwfNaOCy9zNgmMjnt+7p8+k="; + hash = "sha256-zlQ6uFS8JWthtx6bJ/gx/9G/1gpHnWOfi+f5dXz1c+k="; inherit passthruFun; }; diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index b3c97de303179..0bba05d7330eb 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -138,6 +138,7 @@ in propagatedBuildInputs = [ installer ]; substitutions = { inherit pythonInterpreter pythonSitePackages; + python = python.interpreter; }; } ./pypa-install-hook.sh ) @@ -441,20 +442,6 @@ in } ./setuptools-build-hook.sh ) { }; - setuptoolsRustBuildHook = callPackage ( - { makePythonHook, setuptools-rust }: - makePythonHook { - name = "setuptools-rust-setup-hook"; - propagatedBuildInputs = [ setuptools-rust ]; - substitutions = { - pyLibDir = "${python}/lib/${python.libPrefix}"; - cargoBuildTarget = stdenv.hostPlatform.rust.rustcTargetSpec; - cargoLinkerVar = stdenv.hostPlatform.rust.cargoEnvVarTarget; - targetLinker = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; - }; - } ./setuptools-rust-hook.sh - ) { }; - unittestCheckHook = callPackage ( { makePythonHook }: makePythonHook { diff --git a/pkgs/development/interpreters/python/hooks/pypa-install-hook.sh b/pkgs/development/interpreters/python/hooks/pypa-install-hook.sh index f6d60be35d21b..54e6375bb8613 100644 --- a/pkgs/development/interpreters/python/hooks/pypa-install-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pypa-install-hook.sh @@ -8,7 +8,7 @@ pypaInstallPhase() { pushd dist >/dev/null for wheel in *.whl; do - @pythonInterpreter@ -m installer --prefix "$out" "$wheel" + @pythonInterpreter@ -m installer --prefix "$out" --executable "@python@" "$wheel" echo "Successfully installed $wheel" done diff --git a/pkgs/development/interpreters/python/passthrufun.nix b/pkgs/development/interpreters/python/passthrufun.nix index 451292d198e97..8b930de5f3945 100644 --- a/pkgs/development/interpreters/python/passthrufun.nix +++ b/pkgs/development/interpreters/python/passthrufun.nix @@ -141,7 +141,13 @@ rec { pythonAtLeast = lib.versionAtLeast pythonVersion; pythonOlder = lib.versionOlder pythonVersion; inherit hasDistutilsCxxPatch; - inherit pythonOnBuildForHost; + inherit + pythonOnBuildForBuild + pythonOnBuildForHost + pythonOnBuildForTarget + pythonOnHostForHost + pythonOnTargetForTarget + ; inherit pythonABITags; tests = callPackage ./tests.nix { diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index 55e86a8b9c369..914e4b354c49a 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -50,6 +50,7 @@ let if [ "$prg" = "${python.executable}" ]; then makeWrapper "${python.interpreter}" "$out/bin/$prg" \ --inherit-argv0 \ + --resolve-argv0 \ ${lib.optionalString (!permitUserSite) ''--set PYTHONNOUSERSITE "true"''} \ ${lib.concatStringsSep " " makeWrapperArgs} elif [ "$(readlink "$prg")" = "${python.executable}" ]; then diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 420c883e290c4..363397c70dca7 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -20,7 +20,6 @@ buildEnv, bundler, bundix, - cargo, rustPlatform, rustc, makeBinaryWrapper, @@ -100,7 +99,6 @@ let # - In $out/lib/libruby.so and/or $out/lib/libruby.dylib removeReferencesTo, jitSupport ? yjitSupport, - cargo, rustPlatform, rustc, yjitSupport ? yjitSupported, @@ -150,7 +148,6 @@ let ]) ++ ops yjitSupport [ rustPlatform.cargoSetupHook - cargo rustc ] ++ op useBaseRuby baseRuby; diff --git a/pkgs/development/interpreters/spidermonkey/140.nix b/pkgs/development/interpreters/spidermonkey/140.nix index 862aa494d2404..8187047403b70 100644 --- a/pkgs/development/interpreters/spidermonkey/140.nix +++ b/pkgs/development/interpreters/spidermonkey/140.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "140.5.0"; - hash = "sha512-QSI2oly+oXG9W9U15Fw7pAlXqU4fjdOrdCQeCqHEB1/LjTlLlhlZnWDOPkVj5xLIJfqL7EQXlPIpNWgC9ysoYQ=="; + version = "140.6.0"; + hash = "sha512-7WZle9Sy2UeRiSJh18DA2VC09jDRKrKKd32TOTQnRRqaoSXloB7hXyrA/zeNC+B0oIWD3P/TVgkRK6Tm+a2nmA=="; } diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 5251fdb8c7d6f..4ef2631b8d7df 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -49,6 +49,12 @@ mkDerivation rec { url = "https://github.com/supercollider/supercollider/commit/7d1f3fbe54e122889489a2f60bbc6cd6bb3bce28.patch"; hash = "sha256-gyE0B2qTbj0ppbLlYTMa2ooY3FHzzIrdrpWYr81Hy1Y="; }) + + # Fixes the build with GCC 15 + (fetchpatch { + url = "https://github.com/supercollider/supercollider/commit/edfac5e24959b12286938a9402326e521c2d2b63.patch"; + hash = "sha256-8DNCO5VEX6V0Q29A/v5tFC7u835bwNHvcNlZzmS0ADg="; + }) ]; postPatch = '' diff --git a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix index a364f7ea032cd..b3d5df6ac587f 100644 --- a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix +++ b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix @@ -23,6 +23,12 @@ stdenv.mkDerivation rec { url = "https://github.com/supercollider/sc3-plugins/commit/3dc56bf7fcc1f2261afc13f96da762b78bcbfa51.patch"; hash = "sha256-lvXvGunfmjt6i+XPog14IKdnH1Qk8vefxplSDkXXXHU="; }) + + # Fix build with GCC 15 + (fetchpatch2 { + url = "https://github.com/supercollider/sc3-plugins/commit/deaa55a7204bedf65a2000a463ae87a481bf3eb8.patch"; + hash = "sha256-d8+4ZmedAwVt/AlU/YKqQF+80shEa8DiPnvMwJtW/RM="; + }) ]; strictDeps = true; diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index b99eef4c4eca1..216f5807ea7d4 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -218,17 +218,20 @@ stdenv.mkDerivation { ++ lib.optional ( lib.versionAtLeast version "1.81" && lib.versionOlder version "1.88" && stdenv.cc.isClang ) ./fix-clang-target.patch - ++ lib.optional (lib.versionAtLeast version "1.86" && lib.versionOlder version "1.87") [ - # Backport fix for NumPy 2 support. - (fetchpatch { - name = "boost-numpy-2-compatibility.patch"; - url = "https://github.com/boostorg/python/commit/0474de0f6cc9c6e7230aeb7164af2f7e4ccf74bf.patch"; - stripLen = 1; - extraPrefix = "libs/python/"; - hash = "sha256-0IHK55JSujYcwEVOuLkwOa/iPEkdAKQlwVWR42p/X2U="; - }) - ] - ++ lib.optional (version == "1.87.0") [ + ++ + lib.optional (lib.versionAtLeast version "1.86" && lib.versionOlder version "1.87") + # Backport fix for NumPy 2 support. + ( + fetchpatch { + name = "boost-numpy-2-compatibility.patch"; + url = "https://github.com/boostorg/python/commit/0474de0f6cc9c6e7230aeb7164af2f7e4ccf74bf.patch"; + stripLen = 1; + extraPrefix = "libs/python/"; + hash = "sha256-0IHK55JSujYcwEVOuLkwOa/iPEkdAKQlwVWR42p/X2U="; + } + ) + + ++ lib.optionals (version == "1.87.0") [ # Fix operator<< for shared_ptr and intrusive_ptr # https://github.com/boostorg/smart_ptr/issues/115 (fetchpatch { @@ -404,4 +407,6 @@ stdenv.mkDerivation { "dev" ]; setOutputFlags = false; + + __structuredAttrs = true; } diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index 03cebad999426..46c34d0db20a7 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -26,6 +26,11 @@ stdenv.mkDerivation rec { hash = "sha256-fZNXkOmvCBwlxJX9E8LPzaR5KYNBjpY1jvbnMg7gY0Y="; }; + patches = [ + # Fix being unable to use Ipv6 link-local DNS servers. See: https://github.com/c-ares/c-ares/pull/997. + ./fix-link-local-dns-servers.patch + ]; + outputs = [ "out" "dev" diff --git a/pkgs/development/libraries/c-ares/fix-link-local-dns-servers.patch b/pkgs/development/libraries/c-ares/fix-link-local-dns-servers.patch new file mode 100644 index 0000000000000..07a5b5f2084c5 --- /dev/null +++ b/pkgs/development/libraries/c-ares/fix-link-local-dns-servers.patch @@ -0,0 +1,50 @@ +From 0fbeb87f65ad9e9e6cead10d778291db71489f34 Mon Sep 17 00:00:00 2001 +From: iucoen <68678186+iucoen@users.noreply.github.com> +Date: Thu, 5 Jun 2025 20:08:43 -0700 +Subject: [PATCH] Fix IPv6 link-local nameservers in /etc/resolv.conf (#997) + +There are two issues that broke link-local nameservers in resolv.conf +1. channel->sock_funcs needs to be initialized before +ares_init_by_sysconfig() +2. The aif_nametoindex and aif_indextoname function pointers were not +initlized at all. +--- + src/lib/ares_init.c | 4 ++-- + src/lib/ares_set_socket_functions.c | 2 ++ + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/lib/ares_init.c b/src/lib/ares_init.c +index ae78262a11..ce6181833c 100644 +--- a/src/lib/ares_init.c ++++ b/src/lib/ares_init.c +@@ -271,6 +271,8 @@ int ares_init_options(ares_channel_t **channelptr, + goto done; + } + ++ ares_set_socket_functions_def(channel); ++ + /* Initialize Server List */ + channel->servers = + ares_slist_create(channel->rand_state, server_sort_cb, server_destroy_cb); +@@ -346,8 +348,6 @@ int ares_init_options(ares_channel_t **channelptr, + goto done; + } + +- ares_set_socket_functions_def(channel); +- + /* Initialize the event thread */ + if (channel->optmask & ARES_OPT_EVENT_THREAD) { + ares_event_thread_t *e = NULL; +diff --git a/src/lib/ares_set_socket_functions.c b/src/lib/ares_set_socket_functions.c +index cfe434327d..9994e81df5 100644 +--- a/src/lib/ares_set_socket_functions.c ++++ b/src/lib/ares_set_socket_functions.c +@@ -127,6 +127,8 @@ ares_status_t + channel->sock_funcs.asendto = funcs->asendto; + channel->sock_funcs.agetsockname = funcs->agetsockname; + channel->sock_funcs.abind = funcs->abind; ++ channel->sock_funcs.aif_nametoindex = funcs->aif_nametoindex; ++ channel->sock_funcs.aif_indextoname = funcs->aif_indextoname; + } + + /* Implement newer versions here ...*/ \ No newline at end of file diff --git a/pkgs/development/libraries/c-blosc/1.nix b/pkgs/development/libraries/c-blosc/1.nix index 176fef8f60778..a84969e2a80b4 100644 --- a/pkgs/development/libraries/c-blosc/1.nix +++ b/pkgs/development/libraries/c-blosc/1.nix @@ -27,9 +27,14 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # backport patch for cmake 4 compatibility (fetchpatch { - url = "https://github.com/Blosc/c-blosc/commit/051b9d2cb9437e375dead8574f66d80ebce47bee.patch"; + url = "https://github.com/Blosc/c-blosc/commit/051b9d2cb9437e375dead8574f66d80ebce47bee.patch?full_index=1"; hash = "sha256-90dUd8KQqq+uVbngfoKF45rmFxbLVVgZjg0Xfc/vpcc="; }) + # backport patch for gcc 15 compatibility + (fetchpatch { + url = "https://github.com/Blosc/c-blosc/commit/774f6a0ebaa0c617f7f13ccf6bc89d17eba04654.patch?full_index=1"; + hash = "sha256-C5nwMXjmlxkBvN1/4fuGTgFANqTD/+ikxYPLo1fwm6Q="; + }) ]; # https://github.com/NixOS/nixpkgs/issues/144170 diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix index b91ec5dd5b6a1..23ed07441755d 100644 --- a/pkgs/development/libraries/db/db-4.8.nix +++ b/pkgs/development/libraries/db/db-4.8.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchurl, autoreconfHook, ... diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix index 77e9a1a04269c..c9e1a6bb1d1ee 100644 --- a/pkgs/development/libraries/db/db-5.3.nix +++ b/pkgs/development/libraries/db/db-5.3.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchurl, autoreconfHook, ... diff --git a/pkgs/development/libraries/db/db-6.0.nix b/pkgs/development/libraries/db/db-6.0.nix index f720ca1806392..a23ee5b936fcb 100644 --- a/pkgs/development/libraries/db/db-6.0.nix +++ b/pkgs/development/libraries/db/db-6.0.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchurl, autoreconfHook, ... diff --git a/pkgs/development/libraries/db/db-6.2.nix b/pkgs/development/libraries/db/db-6.2.nix index 2f573aaca1e9c..78c6cf4eb8a71 100644 --- a/pkgs/development/libraries/db/db-6.2.nix +++ b/pkgs/development/libraries/db/db-6.2.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchurl, autoreconfHook, ... diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index 9f411f1cd2a59..bbfd5820ffc5b 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchurl, autoreconfHook, cxxSupport ? true, @@ -29,7 +30,14 @@ stdenv.mkDerivation ( # configure checks to work incorrectly with clang 16. nativeBuildInputs = [ autoreconfHook ]; - patches = extraPatches; + patches = [ + (fetchpatch { + name = "gcc15.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/db/files/db-4.8.30-tls-configure.patch?id=1ae36006c79ef705252f5f7009e79f6add7dc353"; + hash = "sha256-OzQL+kgXtcvhvyleDLuH1abhY4Shb/9IXx4ZkeFbHOA="; + }) + ] + ++ extraPatches; outputs = [ "bin" @@ -75,6 +83,10 @@ stdenv.mkDerivation ( popd ''; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=incompatible-pointer-types" + ]; + configureFlags = [ (if cxxSupport then "--enable-cxx" else "--disable-cxx") (if compat185 then "--enable-compat185" else "--disable-compat185") diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index a8dc55ce3f863..7eae647efc8d4 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -8,7 +8,6 @@ pkg-config, perl, texinfo, - texinfo6, nasm, # You can fetch any upstream version using this derivation by specifying version and hash @@ -226,10 +225,10 @@ || buildSwscale, # Documentation options withDocumentation ? withHtmlDoc || withManPages || withPodDoc || withTxtDoc, - withHtmlDoc ? withHeadlessDeps, # HTML documentation pages - withManPages ? withHeadlessDeps, # Man documentation pages - withPodDoc ? withHeadlessDeps, # POD documentation pages - withTxtDoc ? withHeadlessDeps, # Text documentation pages + withHtmlDoc ? withHeadlessDeps && lib.versionAtLeast version "6", # HTML documentation pages + withManPages ? withHeadlessDeps && lib.versionAtLeast version "6", # Man documentation pages + withPodDoc ? withHeadlessDeps && lib.versionAtLeast version "6", # POD documentation pages + withTxtDoc ? withHeadlessDeps && lib.versionAtLeast version "6", # Text documentation pages # Whether a "doc" output will be produced. Note that withManPages does not produce # a "doc" output because its files go to "man". withDoc ? withDocumentation && (withHtmlDoc || withPodDoc || withTxtDoc), @@ -826,7 +825,7 @@ stdenv.mkDerivation ( ] ++ 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 (lib.versionAtLeast version "6") [ texinfo ] ++ optionals withCudaLLVM [ clang ] ++ optionals withCudaNVCC [ cuda_nvcc ]; diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 420837ce60a00..dee1e197dd6e1 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -98,7 +98,6 @@ stdenv.mkDerivation (finalAttrs: { ]; doInstallCheck = true; versionCheckProgram = "${placeholder "bin"}/bin/fc-list"; - versionCheckProgramArg = "--version"; installCheckPhase = '' runHook preInstallCheck diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 64b41a684c59a..2cce91e8115dd 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -59,11 +59,11 @@ in stdenv.mkDerivation rec { pname = "gnutls"; - version = "3.8.10"; + version = "3.8.11"; src = fetchurl { url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz"; - hash = "sha256-23+rfM55Hncn677yM0MByCHXmlUOxVye8Ja2ELA+trc="; + hash = "sha256-kb0jxKhuvGFS6BMD0gz2zq65e8j4QmbQ+uxuKfF7qiA="; }; outputs = [ diff --git a/pkgs/development/libraries/gpgme/test_t-verify_double-plaintext.patch b/pkgs/development/libraries/gpgme/test_t-verify_double-plaintext.patch deleted file mode 100644 index 8f866af0da918..0000000000000 --- a/pkgs/development/libraries/gpgme/test_t-verify_double-plaintext.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/tests/gpg/t-verify.c -+++ b/tests/gpg/t-verify.c -@@ -304,7 +304,7 @@ - err = gpgme_data_new (&text); - fail_if_err (err); - err = gpgme_op_verify (ctx, sig, NULL, text); -- if (gpgme_err_code (err) != GPG_ERR_BAD_DATA) -+ if (gpgme_err_code (err) == GPG_ERR_NO_ERROR) - { - fprintf (stderr, "%s:%i: Double plaintext message not detected\n", - PGM, __LINE__); ---- a/lang/python/tests/t-verify.py -+++ b/lang/python/tests/t-verify.py -@@ -142,7 +142,7 @@ - c.op_verify(sig, None, text) - except Exception as e: - assert type(e) == gpg.errors.GPGMEError -- assert e.getcode() == gpg.errors.BAD_DATA -+ assert e.getcode() != gpg.errors.NO_ERROR - else: - assert False, "Expected an error but got none." - -@@ -178,7 +178,7 @@ - try: - c.verify(double_plaintext_sig) - except gpg.errors.GPGMEError as e: -- assert e.getcode() == gpg.errors.BAD_DATA -+ assert e.getcode() != gpg.errors.NO_ERROR - else: - assert False, "Expected an error but got none." - diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 6b3e7463bef44..f2330c8cf20fc 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -322,6 +322,9 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "doc" enableDocumentation) (lib.mesonEnable "directfb" false) (lib.mesonEnable "lcevcdecoder" lcevcdecSupport) + (lib.mesonEnable "ldac" ldacbtSupport) + (lib.mesonEnable "webrtcdsp" webrtcAudioProcessingSupport) + (lib.mesonEnable "isac" webrtcAudioProcessingSupport) ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ "-Ddoc=disabled" # needs gstcuda to be enabled which is Linux-only diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix index 8ec391c601c94..d636207348627 100644 --- a/pkgs/development/libraries/hspell/default.nix +++ b/pkgs/development/libraries/hspell/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { version = "1.4"; }; - PERL_USE_UNSAFE_INC = "1"; + env.PERL_USE_UNSAFE_INC = "1"; src = fetchurl { url = "${meta.homepage}${name}.tar.gz"; @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { ]; strictDeps = true; + __structuredAttrs = true; meta = { description = "Hebrew spell checker"; diff --git a/pkgs/development/libraries/libcryptui/debian-patches.nix b/pkgs/development/libraries/libcryptui/debian-patches.nix new file mode 100644 index 0000000000000..d9114aecc770a --- /dev/null +++ b/pkgs/development/libraries/libcryptui/debian-patches.nix @@ -0,0 +1,26 @@ +# Generated by debian-patches.sh from debian-patches.txt +let + prefix = "https://sources.debian.org/data/main/libc/libcryptui/3.12.2-8/debian/patches"; +in +[ + { + url = "${prefix}/build-use-pkg-config-to-detect-gpgme.patch"; + sha256 = "1kvp30qrnnhnjma8vgi3acvjn74fzig1mdmkxn6xbdz2vj12wwns"; + } + { + url = "${prefix}/daemon-fix-conflicting-return-types.patch"; + sha256 = "1iqr58v1rmykq2z48sniixfvq2v0qaifdfihkq6is2a711fkigxp"; + } + { + url = "${prefix}/daemon-port-to-gcr-3.patch"; + sha256 = "1j1nbh03m4cqymhqiamndn3gmi7bdzv0srr90nhlgjhszmyg150g"; + } + { + url = "${prefix}/git_allow-gpg2-2.1.patch"; + sha256 = "1g93psg0cki4wnyymc59wchzhas3qqja7y46rbzdksp5wmfl51ap"; + } + { + url = "${prefix}/libcryptui-fix-logic-flaw-in-the-prompt-recipients-d.patch"; + sha256 = "1qnd6j2zk8gssj2fgrgikc05ccdv7sqabprykzxix7v8827sa56j"; + } +] diff --git a/pkgs/development/libraries/libcryptui/debian-patches.txt b/pkgs/development/libraries/libcryptui/debian-patches.txt new file mode 100644 index 0000000000000..575274ebf4258 --- /dev/null +++ b/pkgs/development/libraries/libcryptui/debian-patches.txt @@ -0,0 +1,6 @@ +libcryptui/3.12.2-8 +build-use-pkg-config-to-detect-gpgme.patch +daemon-fix-conflicting-return-types.patch +daemon-port-to-gcr-3.patch +git_allow-gpg2-2.1.patch +libcryptui-fix-logic-flaw-in-the-prompt-recipients-d.patch diff --git a/pkgs/development/libraries/libcryptui/default.nix b/pkgs/development/libraries/libcryptui/default.nix index a32a03de103c4..5a476aeba7955 100644 --- a/pkgs/development/libraries/libcryptui/default.nix +++ b/pkgs/development/libraries/libcryptui/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, autoreconfHook, gettext, pkg-config, @@ -13,7 +14,7 @@ gnupg, gpgme, dbus-glib, - libgnome-keyring, + gcr, }: stdenv.mkDerivation rec { @@ -25,10 +26,12 @@ stdenv.mkDerivation rec { sha256 = "0rh8wa5k2iwbwppyvij2jdxmnlfjbna7kbh2a5n7zw4nnjkx3ski"; }; - patches = [ - # based on https://gitlab.gnome.org/GNOME/libcryptui/-/commit/b05e301d1b264a5d8f07cb96e5edc243d99bff79.patch - # https://gitlab.gnome.org/GNOME/libcryptui/-/merge_requests/1 - ./fix-latest-gnupg.patch + patches = (lib.map fetchurl (import ./debian-patches.nix)) ++ [ + # Fix build with gpgme 2.0 + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libcryptui/-/raw/1-3.12.2+r71+ged4f890e-2/gpgme-2.0.patch"; + hash = "sha256-yftIixqVGUqn/VP0tfzPnhLPI7A/m61kVY5P1NDTIqQ="; + }) ]; nativeBuildInputs = [ @@ -45,7 +48,7 @@ stdenv.mkDerivation rec { gnupg gpgme dbus-glib - libgnome-keyring + gcr ]; propagatedBuildInputs = [ dbus-glib ]; diff --git a/pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch b/pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch deleted file mode 100644 index 19aa27b549c26..0000000000000 --- a/pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b05e301d1b264a5d8f07cb96e5edc243d99bff79 Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Fri, 10 Nov 2017 08:55:55 +0100 -Subject: [PATCH] Accept GnuPG 2.2.x as supported version - -https://bugzilla.gnome.org/show_bug.cgi?id=790152 ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 4486e7b2..be5b28b4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -95,7 +95,7 @@ AC_ARG_ENABLE(gpg-check, - DO_CHECK=$enableval, DO_CHECK=yes) - - if test "$DO_CHECK" = "yes"; then -- accepted_versions="1.2 1.4 2.0" -+ accepted_versions="1.2 1.4 2.0 2.2 2.3 2.4" - AC_PATH_PROGS(GNUPG, [gpg gpg2], no) - AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.]) - ok="no" --- -GitLab - diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index 5daa6063932f9..4b2bd41af972f 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -2,21 +2,32 @@ lib, stdenv, fetchurl, + meson, + ninja, + pkg-config, libdvdcss, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libdvdread"; - version = "6.1.3"; + version = "7.0.1"; src = fetchurl { - url = "http://get.videolan.org/libdvdread/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-zjVFSZeiCMvlDpEjLw5z+xrDRxllgToTuHMKjxihU2k="; + url = "http://get.videolan.org/libdvdread/${finalAttrs.version}/libdvdread-${finalAttrs.version}.tar.xz"; + hash = "sha256-Lj4EowXBXDljqgOuG5qDwdI5iAAD/PPd6YbTlDNV1Ac="; }; + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + buildInputs = [ libdvdcss ]; - NIX_LDFLAGS = "-ldvdcss"; + mesonFlags = [ + (lib.mesonEnable "libdvdcss" true) + ]; postInstall = '' ln -s dvdread $out/include/libdvdread @@ -29,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.wmertens ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 39802ed7c1c35..7af29dedd1ac2 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "libpng" + whenPatched "-apng"; - version = "1.6.50"; + version = "1.6.52"; src = fetchurl { url = "mirror://sourceforge/libpng/libpng-${finalAttrs.version}.tar.xz"; - hash = "sha256-TfOWUYYgp6o2UUQ+h9Gyhi5OiMrRNai5NCPgFwYjIwc="; + hash = "sha256-Nr1yYijsk6O2wi/bSelKZ7FvL+mzm3i3y2V3KWZmHMw="; }; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1" diff --git a/pkgs/development/libraries/medfile/default.nix b/pkgs/development/libraries/medfile/default.nix index 8f76a9676b5e9..b3624f93dd3c1 100644 --- a/pkgs/development/libraries/medfile/default.nix +++ b/pkgs/development/libraries/medfile/default.nix @@ -8,11 +8,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "medfile"; - version = "5.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://files.salome-platform.org/Salome/medfile/med-${finalAttrs.version}.tar.bz2"; - hash = "sha256-Jn520MZ+xRwQ4xmUhOwVCLqo1e2EXGKK32YFKdzno9Q="; + url = "https://files.salome-platform.org/Salome/medfile/med-${finalAttrs.version}.tar.gz"; + hash = "sha256-+PHtxodLxI2PPk6L4c9zee0xhybYq8aAToXoIVVbH6g="; + + # salome uses tiger-protect-waf (https://faq.o2switch.fr/cpanel/o2switch/tiger-protect-waf/), + # which blocks Nixpkgs's custom UA, 403 otherwise + # OpenSUSE does the same: https://github.com/bmwiedemann/openSUSE/blob/08303e6e850f0de37bfabbd184dae73009f3038b/packages/m/med-tools/med-tools.spec#L32 + curlOptsList = [ + "--user-agent" + "MozillaFirefox (really Nixpkgs, see https://github.com/NixOS/nixpkgs/pull/474599)" + ]; }; outputs = [ @@ -21,16 +29,7 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; - postPatch = '' - # Patch cmake and source files to work with hdf5 - substituteInPlace config/cmake_files/medMacros.cmake --replace-fail \ - "IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 12 OR NOT HDF_VERSION_RELEASE_REF GREATER 0)" \ - "IF (HDF5_VERSION VERSION_LESS 1.12.0)" - substituteInPlace src/*/*.c --replace-warn \ - "#if H5_VERS_MINOR > 12" \ - "#if H5_VERS_MINOR > 14" - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Some medfile test files #define _a, which # breaks system header files that use _a as a function parameter substituteInPlace tests/c/*.c \ diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index cef563d99f7af..efc54fd6fca01 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ngtcp2"; - version = "1.17.0"; + version = "1.18.0"; src = fetchurl { url = "https://github.com/ngtcp2/ngtcp2/releases/download/v${finalAttrs.version}/ngtcp2-${finalAttrs.version}.tar.bz2"; - hash = "sha256-j8hYGdFp5il4pODbNlVILOdJUafqsMdmc3tXoxQY2mE="; + hash = "sha256-E7r7bFCdv2pw2WBaLIkuE/WuuTZnOZWHeKhXvHDOH6c="; }; outputs = [ @@ -39,8 +39,10 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ # The examples try to link against `ngtcp2_crypto_ossl` and `ngtcp2` libraries. # This works in the dynamic case where the targets have the same name, but not here where they're suffixed with `_static`. - # Also, the examples depend on Linux-specific APIs, so we avoid them on FreeBSD too. - (lib.cmakeBool "ENABLE_LIB_ONLY" (stdenv.hostPlatform.isStatic || stdenv.hostPlatform.isFreeBSD)) + # Also, the examples depend on Linux-specific APIs, so we avoid them on FreeBSD/Cygwin too. + (lib.cmakeBool "ENABLE_LIB_ONLY" ( + stdenv.hostPlatform.isStatic || stdenv.hostPlatform.isFreeBSD || stdenv.hostPlatform.isCygwin + )) (lib.cmakeBool "ENABLE_SHARED_LIB" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "ENABLE_STATIC_LIB" stdenv.hostPlatform.isStatic) ]; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 452c234f646a9..bb71457fc37b4 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -310,6 +310,13 @@ effectiveStdenv.mkDerivation { url = "https://github.com/opencv/opencv/commit/dbb622b7f59c3f0e5bd3487252ef37cf72dcdcdb.patch"; hash = "sha256-MS9WizZQu0Gxw/daDDFmETxcDJYRTyhSq/xK0X5lAZM="; }) + # Backport upstream fix for reproducible builds + # https://github.com/opencv/opencv/pull/27962 + (fetchpatch { + name = "support-reproducible-builds.patch"; + url = "https://github.com/opencv/opencv/commit/7224bced8bff9d16d5e869d44f90f95ad8fdfe25.patch"; + hash = "sha256-DIlTQaIVWpPgJgPktY+0vd3BWJoS38YZn5aFS7DqsNM="; + }) ] ++ optionals enableCuda [ ./cuda_opt_flow.patch @@ -467,6 +474,7 @@ effectiveStdenv.mkDerivation { OpenBLAS = optionalString withOpenblas openblas_; cmakeFlags = [ + (cmakeBool "BUILD_INFO_SKIP_SYSTEM_VERSION" true) (cmakeBool "OPENCV_GENERATE_PKGCONFIG" true) (cmakeBool "WITH_OPENMP" true) (cmakeBool "BUILD_PROTOBUF" false) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 59dd8e187cca1..8aa898b1615c0 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -66,6 +66,7 @@ ffado, libselinux, libebur128, + bashNonInteractive, }: let @@ -133,6 +134,7 @@ stdenv.mkDerivation (finalAttrs: { lilv ncurses readline + bashNonInteractive ] ++ ( if enableSystemd then diff --git a/pkgs/development/libraries/protobuf/33.nix b/pkgs/development/libraries/protobuf/33.nix index 6365e5fac5a59..dec1aa836ed8d 100644 --- a/pkgs/development/libraries/protobuf/33.nix +++ b/pkgs/development/libraries/protobuf/33.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix ( { - version = "33.1"; - hash = "sha256-IW6wLkr/NwIZy5N8s+7Fe9CSexXgliW8QSlvmUD+g5Q="; + version = "33.2"; + hash = "sha256-SguWBa9VlE15C+eLzcqqusVLgx9kDyPXwYImSE75HCM="; } // args ) diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 11fa9ebff6c10..45b8fc5565c9d 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -106,7 +106,6 @@ stdenv.mkDerivation (finalAttrs: { versionCheckHook ]; versionCheckProgram = [ "${placeholder "out"}/bin/protoc" ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; env = lib.optionalAttrs (lib.versions.major version == "29") { diff --git a/pkgs/development/libraries/qgpgme/default.nix b/pkgs/development/libraries/qgpgme/default.nix new file mode 100644 index 0000000000000..c3dbe6800552a --- /dev/null +++ b/pkgs/development/libraries/qgpgme/default.nix @@ -0,0 +1,51 @@ +{ + cmake, + fetchurl, + gpgmepp, + lib, + qtbase, + stdenv, + which, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "qgpgme"; + version = "2.0.0"; + + src = fetchurl { + url = "mirror://gnupg/qgpgme/qgpgme-${finalAttrs.version}.tar.xz"; + hash = "sha256-FWRbJHXMphGOsu0zGzqNlELJ1AGcOEa6P20lMhtKYa0="; + }; + + patches = [ + ./includedir-absolute-path.patch + ]; + + outputs = [ + "out" + "dev" + ]; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + qtbase + ]; + + propagatedBuildInputs = [ + gpgmepp + ]; + + dontWrapQtApps = true; + + meta = { + changelog = "https://dev.gnupg.org/source/gpgmeqt/browse/master/NEWS;gpgmeqt-${finalAttrs.version}?as=remarkup"; + description = "Qt API bindings/wrapper for GPGME"; + homepage = "https://dev.gnupg.org/source/gpgmeqt/"; + license = lib.licenses.lgpl21Plus; + maintainers = [ lib.maintainers.dotlambda ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/development/libraries/qgpgme/includedir-absolute-path.patch b/pkgs/development/libraries/qgpgme/includedir-absolute-path.patch new file mode 100644 index 0000000000000..7b9543b6a9f69 --- /dev/null +++ b/pkgs/development/libraries/qgpgme/includedir-absolute-path.patch @@ -0,0 +1,13 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 0955b27..e648982 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -264,7 +264,7 @@ set_target_properties(${targetname} PROPERTIES + SOVERSION "${LIBQGPGME_SOVERSION}" + ) + +-target_include_directories(${targetname} INTERFACE "$") ++target_include_directories(${targetname} INTERFACE "$") + + if (${QT_MAJOR_VERSION} EQUAL 6) + set(config_suffix Qt6) diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 2236001ad9011..69381ff13e238 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -131,20 +131,6 @@ let makeSetupHook { name = "wrap-qt6-apps-hook"; propagatedBuildInputs = [ makeBinaryWrapper ]; - depsTargetTargetPropagated = [ - (onlyPluginsAndQml qtbase) - ] - ++ lib.optionals (lib.meta.availableOn stdenv.targetPlatform qtwayland) [ - (onlyPluginsAndQml qtwayland) - ]; - } ./hooks/wrap-qt-apps-hook.sh - ) { }; - - wrapQtAppsNoGuiHook = callPackage ( - { makeBinaryWrapper, qtbase }: - makeSetupHook { - name = "wrap-qt6-apps-no-gui-hook"; - propagatedBuildInputs = [ makeBinaryWrapper ]; depsTargetTargetPropagated = [ (onlyPluginsAndQml qtbase) ]; @@ -164,6 +150,7 @@ let } // lib.optionalAttrs config.allowAliases { full = throw "qt6.full has been removed. Please use individual packages instead."; # Added 2025-10-21 + wrapQtAppsNoGuiHook = lib.warn "wrapQtAppsNoGuiHook is deprecated, use wrapQtAppsHook instead" self.wrapQtAppsHook; }; baseScope = makeScopeWithSplicing' { diff --git a/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh index 44e48db7dad80..c70bf22759de1 100644 --- a/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh @@ -77,11 +77,10 @@ else # Only set up Qt once. fi qtPreHook() { - # Check that wrapQtAppsHook/wrapQtAppsNoGuiHook is used, or it is explicitly disabled. + # Check that wrapQtAppsHook is used, or it is explicitly disabled. if [[ -z "$__nix_wrapQtAppsHook" && -z "$dontWrapQtApps" ]]; then echo >&2 "Error: this derivation depends on qtbase, but no wrapping behavior was specified." - echo >&2 " - If this is a graphical application, add wrapQtAppsHook to nativeBuildInputs" - echo >&2 " - If this is a CLI application, add wrapQtAppsNoGuiHook to nativeBuildInputs" + echo >&2 " - If this is an application, add wrapQtAppsHook to nativeBuildInputs" echo >&2 " - If this is a library or you need custom wrapping logic, set dontWrapQtApps = true" exit 1 fi diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix index c27c96d5802e8..eb0564226cbf8 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix @@ -215,6 +215,9 @@ stdenv.mkDerivation rec { # allow translations to be found outside of install prefix, as is the case in our split builds ./allow-translations-outside-prefix.patch + # make internal find_package calls between Qt components work with split builds + ./use-cmake-path.patch + # always link to libraries by name in qmake-generated build scripts ./qmake-always-use-libname.patch # always explicitly list includedir in qmake-generated pkg-config files diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/use-cmake-path.patch b/pkgs/development/libraries/qt-6/modules/qtbase/use-cmake-path.patch new file mode 100644 index 0000000000000..4f5b48f189934 --- /dev/null +++ b/pkgs/development/libraries/qt-6/modules/qtbase/use-cmake-path.patch @@ -0,0 +1,60 @@ +diff --git a/cmake/QtConfig.cmake.in b/cmake/QtConfig.cmake.in +index 93f47570706..b00d398d671 100644 +--- a/cmake/QtConfig.cmake.in ++++ b/cmake/QtConfig.cmake.in +@@ -190,7 +190,6 @@ foreach(module ${__qt_umbrella_find_components}) + ${_qt_additional_packages_prefix_paths} + ${__qt_find_package_host_qt_path} + ${_qt_additional_host_packages_prefix_paths} +- ${__qt_use_no_default_path_for_qt_packages} + ) + endif() + +diff --git a/cmake/QtFindWrapHelper.cmake b/cmake/QtFindWrapHelper.cmake +index c43824b8234..7ef65eb0f36 100644 +--- a/cmake/QtFindWrapHelper.cmake ++++ b/cmake/QtFindWrapHelper.cmake +@@ -79,7 +79,6 @@ macro(qt_find_package_system_or_bundled _unique_prefix) + "${CMAKE_CURRENT_LIST_DIR}/.." + ${_qt_cmake_dir} + ${_qt_additional_packages_prefix_paths} +- ${${_unique_prefix}_qt_use_no_default_path_for_qt_packages} + ) + else() + # For the non-bundled case we will look for FindWrapSystemFoo.cmake module files, +diff --git a/cmake/QtModuleConfig.cmake.in b/cmake/QtModuleConfig.cmake.in +index e3af0299c57..2bbc06ddec3 100644 +--- a/cmake/QtModuleConfig.cmake.in ++++ b/cmake/QtModuleConfig.cmake.in +@@ -59,7 +59,6 @@ if (@INSTALL_CMAKE_NAMESPACE@@target@_FOUND + "${CMAKE_CURRENT_LIST_DIR}/.." + "${_qt_cmake_dir}" + ${_qt_additional_packages_prefix_paths} +- ${__qt_use_no_default_path_for_qt_packages} + ) + + if(NOT @INSTALL_CMAKE_NAMESPACE@@target_private@_FOUND) +diff --git a/cmake/QtModuleDependencies.cmake.in b/cmake/QtModuleDependencies.cmake.in +index 78ada0a7425..74659943a83 100644 +--- a/cmake/QtModuleDependencies.cmake.in ++++ b/cmake/QtModuleDependencies.cmake.in +@@ -23,7 +23,6 @@ if(NOT @INSTALL_CMAKE_NAMESPACE@_FOUND) + "${CMAKE_CURRENT_LIST_DIR}/.." + "${_qt_cmake_dir}" + ${_qt_additional_packages_prefix_paths} +- ${__qt_use_no_default_path_for_qt_packages} + ) + endif() + +diff --git a/cmake/QtPublicDependencyHelpers.cmake b/cmake/QtPublicDependencyHelpers.cmake +index b4a0342ad87..a7de8750485 100644 +--- a/cmake/QtPublicDependencyHelpers.cmake ++++ b/cmake/QtPublicDependencyHelpers.cmake +@@ -144,7 +144,6 @@ macro(_qt_internal_find_qt_dependencies target target_dep_list find_dependency_p + ${QT_BUILD_CMAKE_PREFIX_PATH} + ${${find_dependency_path_list}} + ${_qt_additional_packages_prefix_paths} +- ${__qt_use_no_default_path_for_qt_packages} + ) + if(NOT ${__qt_${target}_pkg}_FOUND) + list(APPEND __qt_${target}_missing_deps "${__qt_${target}_pkg}") diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix index 58271c82c9bad..07f95c2290280 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix @@ -10,6 +10,7 @@ lib, pkgsBuildBuild, replaceVars, + fetchpatch, }: qtModule { @@ -35,6 +36,25 @@ qtModule { }) # add version specific QML import path ./use-versioned-import-path.patch + + # fix common Plasma crasher + # FIXME: remove in 6.10.2 + (fetchpatch { + url = "https://github.com/qt/qtdeclarative/commit/9c6b2b78e9076f1c2676aa0c41573db9ca480654.diff"; + hash = "sha256-KMFurA9Q84qwuyBraU3ZdoFWs8uO3uoUcinfcfh/ps8="; + }) + + # https://qt-project.atlassian.net/browse/QTBUG-137440 + (fetchpatch { + name = "rb-dialogs-link-labsfolderlistmodel-into-quickdialogs2quickimpl.patch"; + url = "https://github.com/qt/qtdeclarative/commit/4047fa8c6017d8e214e6ec3ddbed622fd34058e4.patch"; + hash = "sha256-0a7a1AI8N35rqLY4M3aSruXXPBqz9hX2yT65r/xzfhc="; + }) + (fetchpatch { + name = "rb-quickcontrols-fix-controls-styles-linkage.patch"; + url = "https://github.com/qt/qtdeclarative/commit/aa805ed54d55479360e0e95964dcc09a858aeb28.patch"; + hash = "sha256-EDdsXRokHPQ5jflaVucOZP3WSopMjrAM39WZD1Hk/5I="; + }) ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 50528aa4e8231..471c427cbd8c6 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -27,17 +27,17 @@ in stdenv.mkDerivation rec { pname = "sqlite${lib.optionalString interactive "-interactive"}"; - version = "3.50.4"; + version = "3.51.1"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2025/sqlite-autoconf-${archiveVersion version}.tar.gz"; - hash = "sha256-o9tYehuS7l3awvZrPttBsm+chnJ1eC1Gw6CIl31qWxg="; + hash = "sha256-TyRFzXBHlyTTKtAV7H/Tf7tvYTABO9S/vIDDK+tCt+A="; }; docsrc = fetchurl { url = "https://sqlite.org/2025/sqlite-doc-${archiveVersion version}.zip"; - hash = "sha256-+KA89GFQAxDHp4XJ1vhhIayUZWAZgs3Kxt4MWYfb/C8="; + hash = "sha256-cygHoBzJ/K8ftBxw5Bam7dUVlXeI89Wud/7J2BtuIns="; }; outputs = [ diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 3002199f250bf..1669bbd253341 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -19,14 +19,14 @@ let }: stdenv.mkDerivation rec { inherit pname; - version = "3.50.4"; + version = "3.51.1"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2025/sqlite-src-${archiveVersion version}.zip"; - hash = "sha256-t7TcBg82BTkC+2WzRLu+1ZLmSyKRomrAb+d+7Al4UOk="; + hash = "sha256-D452WsjqfDbPjqm//dXBA1ZPSopjXyFfn3g7M4oT2XE="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index bfb7477d63238..a7e93cfedf102 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -1,5 +1,6 @@ { config, + fetchpatch, fetchurl, stdenv, unixODBC, @@ -60,6 +61,14 @@ ./mariadb-connector-odbc-unistd.patch ./mariadb-connector-odbc-musl.patch + + # Fix build with gcc15 + # https://github.com/mariadb-corporation/mariadb-connector-odbc/pull/63 + (fetchpatch { + name = "mariadb-connector-odbc-add-include-cstdint-gcc15.patch"; + url = "https://github.com/mariadb-corporation/mariadb-connector-odbc/commit/a3ced654db2ef93de0a818f2d66171f6084e5f2d.patch"; + hash = "sha256-GZITSryfRdAgNxZehasoBModGNZo575Dd5aokwNWzpY="; + }) ]; nativeBuildInputs = [ cmake ]; @@ -104,13 +113,22 @@ sqlite = stdenv.mkDerivation rec { pname = "sqlite-connector-odbc"; - version = "0.9993"; + version = "0.99991"; src = fetchurl { url = "http://www.ch-werner.de/sqliteodbc/sqliteodbc-${version}.tar.gz"; - sha256 = "0dgsj28sc7f7aprmdd0n5a1rmcx6pv7170c8dfjl0x1qsjxim6hs"; + hash = "sha256-TZStuNPN4fqUoorrDfzHvnMUW8383z1eIlQ02zHcilw="; }; + patches = [ + # Fix build with gcc15 + (fetchpatch { + name = "sqlite-connector-odbc-fix-incompatible-pointer-compilation-error.patch"; + url = "https://src.fedoraproject.org/rpms/sqliteodbc/raw/e3d93f5909c884fd8846b36b71ba67a3ad65da2a/f/sqliteodbc-0.99991-Fix-incompatible-pointer-compilation-error.patch"; + hash = "sha256-IAZDujEkAyU40sKa4GC+upURNt7vplCDAx91Eeny+bU="; + }) + ]; + buildInputs = [ unixODBC sqlite @@ -140,6 +158,7 @@ meta = { description = "ODBC driver for SQLite"; homepage = "http://www.ch-werner.de/sqliteodbc"; + changelog = "http://www.ch-werner.de/sqliteodbc/html/index.html#changelog"; license = lib.licenses.bsd2; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ vlstill ]; diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index be42ad4ec53ca..760e4918059b8 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "wayland-protocols"; - version = "1.45"; + version = "1.46"; doCheck = stdenv.hostPlatform == stdenv.buildPlatform @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/${finalAttrs.pname}/-/releases/${finalAttrs.version}/downloads/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-TSsqnj4JnQF9yBB78cM00nu4fZ5K/xmgyNhW0XzUHvA="; + hash = "sha256-/Q3gVqiV+ki9GqXwuN/u1FQQG4i8fhxhqVNCLrcdsWc="; }; postPatch = lib.optionalString finalAttrs.finalPackage.doCheck '' diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 28dc1346c7b05..9eecf781a3d1d 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -643,7 +643,6 @@ in dontUseCmakeConfigure = true; doInstallCheck = true; - versionCheckProgramArg = "--version"; propagatedBuildInputs = [ zip diff --git a/pkgs/development/misc/resholve/resholve-utils.nix b/pkgs/development/misc/resholve/resholve-utils.nix index cdcb11219875c..995e732631bd8 100644 --- a/pkgs/development/misc/resholve/resholve-utils.nix +++ b/pkgs/development/misc/resholve/resholve-utils.nix @@ -200,9 +200,6 @@ rec { ) )) } - '' - + lib.optionalString (partialSolution.interpreter != "none") '' - ${partialSolution.interpreter} -n $out ''; }; writeScriptBin = @@ -220,9 +217,6 @@ rec { } ) )} - '' - + lib.optionalString (partialSolution.interpreter != "none") '' - ${partialSolution.interpreter} -n $out/bin/${name} ''; }; mkDerivation = @@ -232,6 +226,7 @@ rec { version, passthru ? { }, solutions, + postResholve ? "", ... }@attrs: let @@ -286,6 +281,8 @@ rec { # LOGLEVEL="INFO"; preFixup = phraseSolutions solutions unresholved; + postFixup = postResholve; + # don't break the metadata... meta = unresholved.meta; } diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix index eccb1c7cf7d34..16c9924510e3e 100644 --- a/pkgs/development/misc/resholve/resholve.nix +++ b/pkgs/development/misc/resholve/resholve.nix @@ -42,7 +42,10 @@ python27.pkgs.buildPythonApplication { ]; makeWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ gawk ]}" + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ gawk ]) ]; postPatch = '' @@ -78,6 +81,8 @@ python27.pkgs.buildPythonApplication { }; }; + __structuredAttrs = true; + meta = { description = "Resolve external shell-script dependencies"; homepage = "https://github.com/abathur/resholve"; diff --git a/pkgs/development/misc/resholve/source.nix b/pkgs/development/misc/resholve/source.nix index d3a10f3052310..89277dee7e033 100644 --- a/pkgs/development/misc/resholve/source.nix +++ b/pkgs/development/misc/resholve/source.nix @@ -4,11 +4,11 @@ }: rec { - version = "0.10.6"; + version = "0.10.7"; rSrc = fetchFromGitHub { owner = "abathur"; repo = "resholve"; rev = "v${version}"; - hash = "sha256-iJEkfW60QO4nFp+ib2+DeDRsZviYFhWRQoBw1VAhzJY="; + hash = "sha256-aUhxaxniGcmFAawUTXa5QrWUSpw5NUoJO5y4INk5mQU="; }; } diff --git a/pkgs/development/misc/resholve/test.nix b/pkgs/development/misc/resholve/test.nix index 99fdb817db2bb..17124aeada6dd 100644 --- a/pkgs/development/misc/resholve/test.nix +++ b/pkgs/development/misc/resholve/test.nix @@ -25,6 +25,7 @@ rlwrap, gnutar, bc, + systemd, # override testing esh, getconf, @@ -48,7 +49,6 @@ nix-direnv, pdf2odt, pdfmm, - rancid, s0ix-selftest-tool, unix-privesc-check, wgnord, @@ -76,6 +76,9 @@ let gnutar bc msmtp + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + systemd ]; in rec { @@ -157,6 +160,9 @@ rec { inputs = [ ]; }; }; + postResholve = '' + echo "not a load-bearing test, just prove we exist" + ''; }; # demonstrate that we could use resholve in larger build module3 = stdenv.mkDerivation { @@ -218,6 +224,8 @@ rec { INTERP = "${bash}/bin/bash"; checkPhase = '' + echo removing parse tests matching no${stdenv.buildPlatform.uname.system} + rm tests/parse_*no${stdenv.buildPlatform.uname.system}.sh || true # ok if none exist patchShebangs . mkdir empty_lore touch empty_lore/{execers,wrappers} @@ -335,7 +343,6 @@ rec { // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit arch-install-scripts; inherit dgoss; - inherit rancid; inherit unix-privesc-check; inherit wgnord; inherit wsl-vpnkit; diff --git a/pkgs/development/perl-modules/ImageExifTool/default.nix b/pkgs/development/perl-modules/ImageExifTool/default.nix index caca8be2c14f6..f9f7adbfff810 100644 --- a/pkgs/development/perl-modules/ImageExifTool/default.nix +++ b/pkgs/development/perl-modules/ImageExifTool/default.nix @@ -3,8 +3,6 @@ fetchFromGitHub, gitUpdater, lib, - shortenPerlShebang, - stdenv, versionCheckHook, ArchiveZip, CompressRawLzma, @@ -27,8 +25,6 @@ buildPerlPackage rec { patchShebangs exiftool ''; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - propagatedBuildInputs = [ ArchiveZip CompressRawLzma @@ -36,10 +32,6 @@ buildPerlPackage rec { IOCompressBrotli ]; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/exiftool - ''; - doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "-ver"; diff --git a/pkgs/development/perl-modules/MusicBrainz-DiscID---ExtUtils-ParseXS-compat.patch b/pkgs/development/perl-modules/MusicBrainz-DiscID---ExtUtils-ParseXS-compat.patch new file mode 100644 index 0000000000000..f558f7c4dada4 --- /dev/null +++ b/pkgs/development/perl-modules/MusicBrainz-DiscID---ExtUtils-ParseXS-compat.patch @@ -0,0 +1,19 @@ +Patch from Fedora to fix ExtUtils::ParseXS ≥ 3.57: + + Unparseable XSUB parameter: 'offsets ...' in DiscID.xs, line 116 + +https://bugzilla-attachments.redhat.com/attachment.cgi?id=2089957 +https://bugzilla.redhat.com/show_bug.cgi?id=2364631 + +diff -up MusicBrainz-DiscID-0.06/DiscID.xs.orig MusicBrainz-DiscID-0.06/DiscID.xs +--- MusicBrainz-DiscID-0.06/DiscID.xs.orig 2025-05-15 14:01:31.501503137 +0200 ++++ MusicBrainz-DiscID-0.06/DiscID.xs 2025-05-15 14:02:10.538285963 +0200 +@@ -113,7 +113,7 @@ discid_get_track_length( disc, track_num + ## Provides the TOC of a known CD. + ## + int +-discid_put( disc, first_track, sectors, offsets ... ) ++discid_put( disc, first_track, sectors, offsets, ... ) + DiscId *disc + int first_track + int sectors diff --git a/pkgs/development/perl-modules/NetRemctl/default.nix b/pkgs/development/perl-modules/NetRemctl/default.nix index 78ee5dfdffcb1..7d51489a9b0e6 100644 --- a/pkgs/development/perl-modules/NetRemctl/default.nix +++ b/pkgs/development/perl-modules/NetRemctl/default.nix @@ -11,6 +11,7 @@ buildPerlModule { postPatch = '' cp -R tests/tap/perl/Test perl/t/lib + rm perl/t/backend/options.t cd perl ''; diff --git a/pkgs/development/perl-modules/Percona-Toolkit/default.nix b/pkgs/development/perl-modules/Percona-Toolkit/default.nix index 396e7951629d3..43794e71f105d 100644 --- a/pkgs/development/perl-modules/Percona-Toolkit/default.nix +++ b/pkgs/development/perl-modules/Percona-Toolkit/default.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, buildPerlPackage, - shortenPerlShebang, DBDmysql, DBI, IOSocketSSL, @@ -42,7 +41,6 @@ buildPerlPackage { nativeBuildInputs = [ git - shortenPerlShebang ]; buildInputs = [ @@ -64,10 +62,6 @@ buildPerlPackage { export HOME=$TMPDIR ''; - postInstall = '' - shortenPerlShebang $(grep -l "/bin/env perl" $out/bin/*) - ''; - meta = { description = "Collection of advanced command-line tools to perform a variety of MySQL and system tasks"; homepage = "https://www.percona.com/software/database-tools/percona-toolkit"; diff --git a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix index f74ebc2385708..022da985986d9 100644 --- a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix +++ b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix @@ -3,7 +3,6 @@ lib, fetchFromGitHub, buildPerlPackage, - shortenPerlShebang, LWP, LWPProtocolHttps, DataDump, @@ -22,16 +21,12 @@ buildPerlPackage rec { sha256 = "9Z4fv2B0AnwtYsp7h9phnRMmHtBOMObIJvK8DmKQRxs="; }; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ LWP LWPProtocolHttps DataDump JSON ]; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/youtube-viewer - ''; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index 97d0bbcce7ac4..afd42c8401822 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -1,9 +1,10 @@ PERL5LIB="$PERL5LIB${PERL5LIB:+:}$out/lib/perl5/site_perl" -perlFlags= +perlUseLibs='use lib' for i in $(IFS=:; echo $PERL5LIB); do - perlFlags="$perlFlags -I$i" + perlUseLibs="$perlUseLibs \"$i\"," done +perlUseLibs=$(echo "$perlUseLibs" | sed 's/,$/;/') oldPreConfigure="$preConfigure" preConfigure() { @@ -15,7 +16,7 @@ preConfigure() { first=$(dd if="$fn" count=2 bs=1 2> /dev/null) if test "$first" = "#!"; then echo "patching $fn..." - sed -i "$fn" -e "s|^#\!\(.*\bperl\b.*\)$|#\!\1$perlFlags|" + sed -i "$fn" -e "s|^#\!\(.*\bperl\b.*\)$|#\!\1\n$perlUseLibs|" fi fi done diff --git a/pkgs/development/perl-modules/strip-nondeterminism/default.nix b/pkgs/development/perl-modules/strip-nondeterminism/default.nix index b30d55851b082..039721faa1111 100644 --- a/pkgs/development/perl-modules/strip-nondeterminism/default.nix +++ b/pkgs/development/perl-modules/strip-nondeterminism/default.nix @@ -7,7 +7,6 @@ ArchiveZip, ArchiveCpio, SubOverride, - shortenPerlShebang, gitUpdater, }: @@ -29,7 +28,6 @@ buildPerlPackage rec { }; strictDeps = true; - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ shortenPerlShebang ]; buildInputs = [ ArchiveZip ArchiveCpio @@ -49,9 +47,6 @@ buildPerlPackage rec { # we don’t need the debhelper script rm $out/bin/dh_strip_nondeterminism rm $out/share/man/man1/dh_strip_nondeterminism.1 - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/strip-nondeterminism ''; installCheckPhase = '' @@ -60,8 +55,6 @@ buildPerlPackage rec { runHook postInstallCheck ''; - # running shortenPerlShebang in postBuild results in non-functioning binary 'exec format error' - doCheck = !stdenv.hostPlatform.isDarwin; doInstallCheck = true; passthru = { diff --git a/pkgs/development/php-packages/box/default.nix b/pkgs/development/php-packages/box/default.nix index 8d43a6d27127f..d288bdd8ce51f 100644 --- a/pkgs/development/php-packages/box/default.nix +++ b/pkgs/development/php-packages/box/default.nix @@ -20,7 +20,6 @@ php82.buildComposerProject2 (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/box-project/box/releases/tag/${finalAttrs.version}"; diff --git a/pkgs/development/php-packages/castor/default.nix b/pkgs/development/php-packages/castor/default.nix index 71b5ce0c09acf..52dbd874b5a4b 100644 --- a/pkgs/development/php-packages/castor/default.nix +++ b/pkgs/development/php-packages/castor/default.nix @@ -32,7 +32,6 @@ php.buildComposerProject2 (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index 91a29988a93b4..dc05187b4efba 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -50,7 +50,6 @@ php.buildComposerProject2 (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; # Hash used by ../../../build-support/php/pkgs/composer-phar.nix to # use together with the version from this package to keep the diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix index 29db90bd5a7ac..6229965848587 100644 --- a/pkgs/development/php-packages/grumphp/default.nix +++ b/pkgs/development/php-packages/grumphp/default.nix @@ -20,7 +20,6 @@ php.buildComposerProject2 (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/phpro/grumphp/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index f1a6c3fb7c156..893e38296d1e8 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -21,7 +21,6 @@ php.buildComposerProject2 (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/development/php-packages/phpinsights/default.nix b/pkgs/development/php-packages/phpinsights/default.nix index 9872955ffa43e..686ffc0ae3a25 100644 --- a/pkgs/development/php-packages/phpinsights/default.nix +++ b/pkgs/development/php-packages/phpinsights/default.nix @@ -22,7 +22,6 @@ php.buildComposerProject2 (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/development/php-packages/phpmd/default.nix b/pkgs/development/php-packages/phpmd/default.nix index 18a2adfd73fda..23d0a9a165046 100644 --- a/pkgs/development/php-packages/phpmd/default.nix +++ b/pkgs/development/php-packages/phpmd/default.nix @@ -22,7 +22,6 @@ php.buildComposerProject2 (finalAttrs: { vendorHash = "sha256-Vx5JolyOeCRst+wzqPB7bZopBa2LU7SOJmA4tEvWj1c="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 13b745d486d65..34104291c42d4 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -21,7 +21,6 @@ php.buildComposerProject2 (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/phpstan/phpstan/releases/tag/${finalAttrs.version}"; diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix index ca0e06e9cb16b..72a79eee851ac 100644 --- a/pkgs/development/php-packages/psalm/default.nix +++ b/pkgs/development/php-packages/psalm/default.nix @@ -35,7 +35,6 @@ php.buildComposerProject2 (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/vimeo/psalm/releases/tag/${finalAttrs.version}"; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 2706b731c80a8..ccbf466cf16f5 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -103,8 +103,10 @@ buildPythonPackage rec { optional-dependencies.speedups = [ aiodns - backports-zstd (if isPyPy then brotlicffi else brotli) + ] + ++ lib.optionals (pythonOlder "3.14") [ + backports-zstd ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 983c7e0dede49..35c72db050edc 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.16.4"; + version = "1.17.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-76tq2g3Q+uLJIGCADgv1wdwmrxWhDgL7S6v/FktHJeI="; + hash = "sha256-u+l1FwXF4PFId/AtRsU9EIheN349kO2oEKAW+bqhno4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/annotated-doc/default.nix b/pkgs/development/python-modules/annotated-doc/default.nix new file mode 100644 index 0000000000000..d3e9777a97e13 --- /dev/null +++ b/pkgs/development/python-modules/annotated-doc/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + uv-build, + pytestCheckHook, + typing-extensions, +}: + +buildPythonPackage rec { + pname = "annotated-doc"; + version = "0.0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "fastapi"; + repo = "annotated-doc"; + tag = version; + hash = "sha256-PFB+GqFRe5vF8xoWJPsXligSpzkUIt8TOqsmrKlfwyc="; + }; + + build-system = [ + uv-build + ]; + + nativeCheckInputs = [ + pytestCheckHook + typing-extensions + ]; + + pythonImportsCheck = [ + "annotated_doc" + ]; + + meta = { + description = "Document parameters, class attributes, return types, and variables inline, with Annotated"; + homepage = "https://github.com/fastapi/annotated-doc"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 6dce6afd27186..cb6bcffb7f5d2 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -74,7 +74,6 @@ buildPythonPackage rec { versionCheckHook writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; preCheck = '' # avoid coverage flags diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 77fa044a8dde9..7ab4bb8881770 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "4.11.0"; + version = "4.12.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = "anyio"; tag = version; - hash = "sha256-TOXg9J/Z2S5/X7OBgU+J0HZNB3BDluaWTqDiqp3O4ek="; + hash = "sha256-zFVvAK06HG40numRihLHBMKCI3d1wQvmEKk+EaBFVVU="; }; build-system = [ setuptools-scm ]; @@ -77,6 +77,9 @@ buildPythonPackage rec { pytestFlags = [ "-Wignore::trio.TrioDeprecationWarning" + # DeprecationWarning for asyncio.iscoroutinefunction is propagated from uvloop used internally + # https://github.com/agronholm/anyio/commit/e7bb0bd496b1ae0d1a81b86de72312d52e8135ed + "-Wignore::DeprecationWarning" ]; disabledTestMarks = [ diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index 54e37bf56a3bf..c7e0e5ef3a1c6 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "apsw"; - version = "3.48.0.0"; + version = "3.51.0.0"; pyproject = true; # https://github.com/rogerbinns/apsw/issues/548 src = fetchurl { url = "https://github.com/rogerbinns/apsw/releases/download/${version}/apsw-${version}.tar.gz"; - hash = "sha256-iwvUW6vOQu2EiUuYWVaz5D3ePSLrj81fmLxoGRaTzRk="; + hash = "sha256-8I1/HnGO9eOs9CUFwvN5BcpHtCxXD7qlF9WBA4E1Rls="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/argparse-manpage/default.nix b/pkgs/development/python-modules/argparse-manpage/default.nix index 1c59c8c8e6a4f..81c73582462d4 100644 --- a/pkgs/development/python-modules/argparse-manpage/default.nix +++ b/pkgs/development/python-modules/argparse-manpage/default.nix @@ -41,6 +41,11 @@ buildPythonPackage rec { "test_old_example_file_name" ]; + disabledTestPaths = [ + # network access to install setuptools, likely due to pip update + "tests/test_examples.py" + ]; + pythonImportsCheck = [ "argparse_manpage" ]; optional-dependencies = { diff --git a/pkgs/development/python-modules/asn1tools/default.nix b/pkgs/development/python-modules/asn1tools/default.nix index f5e1cac08acb6..fd3575e6bc774 100644 --- a/pkgs/development/python-modules/asn1tools/default.nix +++ b/pkgs/development/python-modules/asn1tools/default.nix @@ -50,7 +50,6 @@ buildPythonPackage rec { versionCheckHook ] ++ lib.concatAttrValues optional-dependencies; - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "asn1tools" ]; diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix index 6daa3d4713200..55f09d2d2c4e3 100644 --- a/pkgs/development/python-modules/astor/default.nix +++ b/pkgs/development/python-modules/astor/default.nix @@ -1,30 +1,42 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, pytestCheckHook, + unstableGitUpdater, }: -buildPythonPackage rec { +buildPythonPackage { pname = "astor"; - version = "0.8.1"; - format = "setuptools"; + version = "0.8.1-unstable-2024-03-30"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "0ppscdzzvxpznclkmhhj53iz314x3pfv4yc7c6gwxqgljgdgyvka"; + src = fetchFromGitHub { + owner = "berkerpeksag"; + repo = "astor"; + rev = "df09001112f079db54e7c5358fa143e1e63e74c4"; + hash = "sha256-VF+harl/q2yRU2yqN1Txud3YBNSeedQNw2SZNYQFsno="; }; - # disable tests broken with python3.6: https://github.com/berkerpeksag/astor/issues/89 + patches = [ + # https://github.com/berkerpeksag/astor/pull/233 + ./python314-compat.patch + ]; + + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # https://github.com/berkerpeksag/astor/issues/196 "test_convert_stdlib" - # https://github.com/berkerpeksag/astor/issues/212 - "test_huge_int" ]; + passthru.updateScript = unstableGitUpdater { + branch = "master"; + }; + meta = { description = "Library for reading, writing and rewriting python AST"; homepage = "https://github.com/berkerpeksag/astor"; diff --git a/pkgs/development/python-modules/astor/python314-compat.patch b/pkgs/development/python-modules/astor/python314-compat.patch new file mode 100644 index 0000000000000..e5af456483937 --- /dev/null +++ b/pkgs/development/python-modules/astor/python314-compat.patch @@ -0,0 +1,99 @@ +From d0b5563cc1e263f08df9312d89a7691167448f4d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Wed, 14 May 2025 19:52:30 +0200 +Subject: [PATCH] Fix compatibility with Python 3.14 (mostly) + +Fix the code and the test suite to work with Python 3.14, where +deprecated constant-like AST nodes were removed. Notably: + +1. Skip tests for deprecated nodes in Python 3.14. + +2. Use `ast.Constant` over `ast.Num` for non-deprecated code + in Python 3.6+. + +3. Check for `ast.Str` only in Python < 3.14, and handle `ast.Constant` + being used to represent a string instead. + +With these changes, all tests except for: + + tests/test_rtrip.py::RtripTestCase::test_convert_stdlib + +pass. However, this particular test also hanged for me with older Python +versions. + +Related to #217 +--- + astor/code_gen.py | 9 +++++++-- + tests/test_code_gen.py | 11 ++++++++--- + 2 files changed, 15 insertions(+), 5 deletions(-) + +diff --git a/astor/code_gen.py b/astor/code_gen.py +index b2bae12..4330f49 100644 +--- a/astor/code_gen.py ++++ b/astor/code_gen.py +@@ -692,6 +692,7 @@ def _handle_string_constant(self, node, value, is_joined=False): + current_line = ''.join(current_line) + + has_ast_constant = sys.version_info >= (3, 6) ++ has_ast_str = sys.version_info < (3, 14) + + if is_joined: + # Handle new f-strings. This is a bit complicated, because +@@ -700,7 +701,7 @@ def _handle_string_constant(self, node, value, is_joined=False): + + def recurse(node): + for value in node.values: +- if isinstance(value, ast.Str): ++ if has_ast_str and isinstance(value, ast.Str): + # Double up braces to escape them. + self.write(value.s.replace('{', '{{').replace('}', '}}')) + elif isinstance(value, ast.FormattedValue): +@@ -713,7 +714,11 @@ def recurse(node): + self.write(':') + recurse(value.format_spec) + elif has_ast_constant and isinstance(value, ast.Constant): +- self.write(value.value) ++ if isinstance(value.value, str): ++ # Double up braces to escape them. ++ self.write(value.value.replace('{', '{{').replace('}', '}}')) ++ else: ++ self.write(value.value) + else: + kind = type(value).__name__ + assert False, 'Invalid node %s inside JoinedStr' % kind +diff --git a/tests/test_code_gen.py b/tests/test_code_gen.py +index e828eb9..1825030 100644 +--- a/tests/test_code_gen.py ++++ b/tests/test_code_gen.py +@@ -28,7 +28,10 @@ def astorexpr(x): + return eval(astor.to_source(ast.Expression(body=x))) + + def astornum(x): +- return astorexpr(ast.Num(n=x)) ++ if sys.version_info >= (3, 6): ++ return astorexpr(ast.Constant(x)) ++ else: ++ return astorexpr(ast.Num(n=x)) + + class Comparisons(object): + +@@ -515,8 +518,8 @@ def test_deprecated_constants_as_name(self): + ast.Assign(targets=[ast.Name(id='spam')], value=ast.Name(id='None')), + "spam = None") + +- @unittest.skipUnless(sys.version_info >= (3, 4), +- "ast.NameConstant introduced in Python 3.4") ++ @unittest.skipUnless((3, 4) <= sys.version_info < (3, 14), ++ "ast.NameConstant introduced in Python 3.4, removed in 3.14") + def test_deprecated_name_constants(self): + self.assertAstEqualsSource( + ast.Assign(targets=[ast.Name(id='spam')], value=ast.NameConstant(value=True)), +@@ -530,6 +533,8 @@ def test_deprecated_name_constants(self): + ast.Assign(targets=[ast.Name(id='spam')], value=ast.NameConstant(value=None)), + "spam = None") + ++ @unittest.skipIf(sys.version_info >= (3, 14), ++ "Deprecated Constant nodes removed in Python 3.14") + def test_deprecated_constant_nodes(self): + self.assertAstEqualsSource( + ast.Assign(targets=[ast.Name(id='spam')], value=ast.Num(3)), diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 6507eeba8c62f..265e045d832fa 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "astroid"; - version = "3.3.11"; # Check whether the version is compatible with pylint + version = "4.0.1"; # Check whether the version is compatible with pylint pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = "astroid"; tag = "v${version}"; - hash = "sha256-lv+BQDYP7N4UGMf7XhB6HVDORPU0kZQPYveQWOcAqfQ="; + hash = "sha256-Ulifj+ym0j0LqhmKPfM8vVCjz71Gwd483ke3PkMnHb8="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/astropy-iers-data/default.nix b/pkgs/development/python-modules/astropy-iers-data/default.nix index c737ec1190f2a..0226f800834a7 100644 --- a/pkgs/development/python-modules/astropy-iers-data/default.nix +++ b/pkgs/development/python-modules/astropy-iers-data/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "astropy-iers-data"; - version = "0.2025.8.4.0.42.59"; + version = "0.2025.11.24.0.39.11"; pyproject = true; src = fetchFromGitHub { owner = "astropy"; repo = "astropy-iers-data"; tag = "v${version}"; - hash = "sha256-Izqm626PZzjnMNUzPW2x15ER7fn5f9+m2X434vXV/yo="; + hash = "sha256-B8568fGvS76igIlEWIbsTczQYqL0nPISM8rfUrF/DS4="; }; build-system = [ @@ -29,6 +29,7 @@ buildPythonPackage rec { doCheck = false; meta = { + changelog = "https://github.com/astropy/astropy-iers-data/releases/tag/${src.tag}"; description = "IERS data maintained by @astrofrog and astropy.utils.iers maintainers"; homepage = "https://github.com/astropy/astropy-iers-data"; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 0489821f7a82c..d07f43684f891 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -1,6 +1,6 @@ { lib, - fetchPypi, + fetchFromGitHub, buildPythonPackage, pythonOlder, @@ -55,14 +55,16 @@ buildPythonPackage rec { pname = "astropy"; - version = "7.1.0"; + version = "7.1.1"; pyproject = true; disabled = pythonOlder "3.11"; - src = fetchPypi { - inherit pname version; - hash = "sha256-yPJUMiKVsbjPJDA9bxVb9+/bbBKCiCuWbOMEDv+MU8U="; + src = fetchFromGitHub { + owner = "astropy"; + repo = "astropy"; + tag = "v${version}"; + hash = "sha256-cvwwTa6eJYncB2V6UCuBrQ5WRRvjgZF5/z4d7Z/uHc8="; }; env = lib.optionalAttrs stdenv.cc.isClang { @@ -159,6 +161,7 @@ buildPythonPackage rec { ''; meta = { + changelog = "https://docs.astropy.org/en/${src.tag}/changelog.html"; description = "Astronomy/Astrophysics library for Python"; homepage = "https://www.astropy.org"; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix index e260e2efdd59f..a1f257bc5c8b9 100644 --- a/pkgs/development/python-modules/asttokens/default.nix +++ b/pkgs/development/python-modules/asttokens/default.nix @@ -2,24 +2,25 @@ lib, astroid, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pytestCheckHook, - pythonOlder, setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage { pname = "asttokens"; - version = "3.0.0"; + version = "3.0.0-unstable-2025-11-08"; pyproject = true; - disabled = pythonOlder "3.8"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-Dc2Lqo1isMHRGLOZst26PEr/Jx0Nep4NTBaBx5A1u8c="; + src = fetchFromGitHub { + owner = "gristlabs"; + repo = "asttokens"; + rev = "f859c055e8453650e1987c5aefaaec36582d3a07"; + hash = "sha256-dHtKyd5rj1Y7m1vTL9toyQ+GLV5fBNUFNkBM9t4e8yM="; }; + env.SETUPTOOLS_SCM_PRETEND_VERSION = "3.0.0"; + build-system = [ setuptools-scm ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/async-lru/default.nix b/pkgs/development/python-modules/async-lru/default.nix index 2903446788fc1..3c0f1ded70aec 100644 --- a/pkgs/development/python-modules/async-lru/default.nix +++ b/pkgs/development/python-modules/async-lru/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + fetchpatch2, setuptools, typing-extensions, pytestCheckHook, @@ -23,6 +24,15 @@ buildPythonPackage rec { hash = "sha256-FJ1q6W9IYs0OSMZc+bI4v22hOAAWAv2OW3BAqixm8Hs="; }; + patches = [ + (fetchpatch2 { + # https://github.com/aio-libs/async-lru/issues/635 + name = "python314-compatibility.patch"; + url = "https://github.com/aio-libs/async-lru/commit/4df3785d3e5210ce6277b3137c4625cd73918088.patch"; + hash = "sha256-B9KCJPbiZTQJrnxC/7VI+jgr2PKfwOmS7naXZwKtF9c="; + }) + ]; + build-system = [ setuptools ]; dependencies = lib.optionals (pythonOlder "3.11") [ typing-extensions ]; diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix index fa02faf81a58e..42da2e01a42db 100644 --- a/pkgs/development/python-modules/attrs/default.nix +++ b/pkgs/development/python-modules/attrs/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "attrs"; - version = "25.3.0"; + version = "25.4.0"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-ddfO/H+1dnR7LIG0RC1NShzgkAlzUnwBHRAw/Tv0rxs="; + hash = "sha256-FtWWm4fwhZ7zOkizXVWsG+bkKuSdXoU7WX23DDXFfhE="; }; patches = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { postInstall = '' # Install tests as the tests output. mkdir $testout - cp -R conftest.py tests $testout + cp -R tests $testout ''; pythonImportsCheck = [ "attr" ]; diff --git a/pkgs/development/python-modules/auditwheel/default.nix b/pkgs/development/python-modules/auditwheel/default.nix index e722aa26f240f..fbd1a5925e3ee 100644 --- a/pkgs/development/python-modules/auditwheel/default.nix +++ b/pkgs/development/python-modules/auditwheel/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchPypi, setuptools-scm, pyelftools, @@ -20,8 +19,6 @@ buildPythonPackage rec { version = "6.5.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchPypi { inherit pname version; hash = "sha256-T7y9WFQFS7HdeHDbA3J7hxuWsYFH21cllWHAWGA5h9c="; diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index 22931621c8e8f..41a6ffba20017 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.58.0"; + version = "1.59.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; tag = "v${version}"; - hash = "sha256-rscE6eiJ2lbI/U20YRmcUj21PdB9nXpjfyBvu+msC/A="; + hash = "sha256-US8NHNEvYlYJMurXjvlySIdKIgKjAwIws8PmnPF0J6Q="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 26a928da8b485..ff59db6ac3d8d 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,7 +10,7 @@ pytest-rerunfailures, pytest-xdist, pytestCheckHook, - pythonOlder, + pythonAtLeast, pyyaml, setuptools, typing-extensions, @@ -18,16 +18,17 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.99.0"; + version = "1.103.0"; pyproject = true; - disabled = pythonOlder "3.7"; + # https://github.com/aws/serverless-application-model/issues/3831 + disabled = pythonAtLeast "3.14"; src = fetchFromGitHub { owner = "aws"; repo = "serverless-application-model"; tag = "v${version}"; - hash = "sha256-Y82qN2bmzE5Xqz2wSw9lWItsPbsRevLL7FlLN0FGKs0="; + hash = "sha256-FW7tmXsD4VfR/c6IJUCvsYPYLIisaEqAhD0sp9ufA/s="; }; postPatch = '' diff --git a/pkgs/development/python-modules/backoff/default.nix b/pkgs/development/python-modules/backoff/default.nix index 6c7ad6239018e..bcdd271792bcd 100644 --- a/pkgs/development/python-modules/backoff/default.nix +++ b/pkgs/development/python-modules/backoff/default.nix @@ -20,6 +20,11 @@ buildPythonPackage rec { hash = "sha256-g8bYGJ6Kw6y3BUnuoP1IAye5CL0geH5l7pTb3xxq7jI="; }; + patches = [ + # https://github.com/litl/backoff/pull/220 + ./python314-compat.patch + ]; + nativeBuildInputs = [ poetry-core ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/backoff/python314-compat.patch b/pkgs/development/python-modules/backoff/python314-compat.patch new file mode 100644 index 0000000000000..2393be2868fd5 --- /dev/null +++ b/pkgs/development/python-modules/backoff/python314-compat.patch @@ -0,0 +1,108 @@ +diff --git a/tests/test_backoff_async.py b/tests/test_backoff_async.py +index 226ef08..9298b5f 100644 +--- a/tests/test_backoff_async.py ++++ b/tests/test_backoff_async.py +@@ -692,7 +692,7 @@ def test_on_predicate_on_regular_function_without_event_loop(monkeypatch): + monkeypatch.setattr('time.sleep', lambda x: None) + + # Set default event loop to None. +- loop = asyncio.get_event_loop() ++ loop = asyncio.new_event_loop() + asyncio.set_event_loop(None) + + try: +@@ -716,7 +716,7 @@ def test_on_exception_on_regular_function_without_event_loop(monkeypatch): + monkeypatch.setattr('time.sleep', lambda x: None) + + # Set default event loop to None. +- loop = asyncio.get_event_loop() ++ loop = asyncio.new_event_loop() + asyncio.set_event_loop(None) + + try: + +From 401709d040df302cdf3cd4a7e0d7703c90ff2d9e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Edgar=20Ram=C3=ADrez-Mondrag=C3=B3n?= +Date: Thu, 17 Oct 2024 16:28:46 -0600 +Subject: [PATCH] Use `inspect.iscoroutinefunction` instead of + `asyncio.iscoroutinefunction` + +--- + backoff/_async.py | 13 +++++++------ + backoff/_decorator.py | 6 +++--- + 2 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/backoff/_async.py b/backoff/_async.py +index 82fd477..c24587c 100644 +--- a/backoff/_async.py ++++ b/backoff/_async.py +@@ -1,5 +1,6 @@ + # coding:utf-8 + import datetime ++import inspect + import functools + import asyncio + from datetime import timedelta +@@ -8,7 +9,7 @@ + + + def _ensure_coroutine(coro_or_func): +- if asyncio.iscoroutinefunction(coro_or_func): ++ if inspect.iscoroutinefunction(coro_or_func): + return coro_or_func + else: + @functools.wraps(coro_or_func) +@@ -47,10 +48,10 @@ def retry_predicate(target, wait_gen, predicate, + on_giveup = _ensure_coroutines(on_giveup) + + # Easy to implement, please report if you need this. +- assert not asyncio.iscoroutinefunction(max_tries) +- assert not asyncio.iscoroutinefunction(jitter) ++ assert not inspect.iscoroutinefunction(max_tries) ++ assert not inspect.iscoroutinefunction(jitter) + +- assert asyncio.iscoroutinefunction(target) ++ assert inspect.iscoroutinefunction(target) + + @functools.wraps(target) + async def retry(*args, **kwargs): +@@ -124,8 +125,8 @@ def retry_exception(target, wait_gen, exception, + giveup = _ensure_coroutine(giveup) + + # Easy to implement, please report if you need this. +- assert not asyncio.iscoroutinefunction(max_tries) +- assert not asyncio.iscoroutinefunction(jitter) ++ assert not inspect.iscoroutinefunction(max_tries) ++ assert not inspect.iscoroutinefunction(jitter) + + @functools.wraps(target) + async def retry(*args, **kwargs): +diff --git a/backoff/_decorator.py b/backoff/_decorator.py +index 77ed8c2..ca5d0ff 100644 +--- a/backoff/_decorator.py ++++ b/backoff/_decorator.py +@@ -1,5 +1,5 @@ + # coding:utf-8 +-import asyncio ++import inspect + import logging + import operator + from typing import Any, Callable, Iterable, Optional, Type, Union +@@ -98,7 +98,7 @@ def decorate(target): + log_level=giveup_log_level + ) + +- if asyncio.iscoroutinefunction(target): ++ if inspect.iscoroutinefunction(target): + retry = _async.retry_predicate + else: + retry = _sync.retry_predicate +@@ -198,7 +198,7 @@ def decorate(target): + log_level=giveup_log_level, + ) + +- if asyncio.iscoroutinefunction(target): ++ if inspect.iscoroutinefunction(target): + retry = _async.retry_exception + else: + retry = _sync.retry_exception diff --git a/pkgs/development/python-modules/backports-zstd/default.nix b/pkgs/development/python-modules/backports-zstd/default.nix index 412b35bcb9924..ec965af56c47f 100644 --- a/pkgs/development/python-modules/backports-zstd/default.nix +++ b/pkgs/development/python-modules/backports-zstd/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "backports-zstd"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { @@ -20,7 +20,7 @@ buildPythonPackage rec { postFetch = '' rm -r "$out/src/c/zstd" ''; - hash = "sha256-5t5ET8b65v4ArV9zrmu+kDXLG3QQRpMMZPSG+RRaCLk="; + hash = "sha256-qgPtLl8oPvM9XDlW72NNX1JqCxzcnLlHyUNNxU9e2PY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index 4051611691165..b32ee083f165e 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "beautifulsoup4"; - version = "4.13.4"; + version = "4.14.3"; pyproject = true; outputs = [ @@ -45,15 +45,15 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-27PE4c6uau/r2vJCMkcmDNBiQwpBDjjGbyuqUKhDcZU="; + hash = "sha256-YpKxxRhtNWu6Zp759/BRdXCZVlrZraXdYwvZ3l+n+4Y="; }; patches = [ - # backport test fix for behavior changes in libxml 2.14.3 + # Fix tests with python 3.13.10 / 3.14.1 (fetchpatch { - url = "https://git.launchpad.net/beautifulsoup/patch/?id=53d328406ec8c37c0edbd00ace3782be63e2e7e5"; + url = "https://git.launchpad.net/beautifulsoup/patch/?id=55f655ffb7ef03bdd1df0f013743831fe54e3c7a"; excludes = [ "CHANGELOG" ]; - hash = "sha256-RtavbpnfT6x0A8L3tAvCXwKUpty1ASPGJKdks7evBr8="; + hash = "sha256-DJl1pey0NdJH+SyBH9+y6gwUvQCmou0D9xcRAEV8OBw="; }) ]; diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix index 98e27dccac5b9..659f3523d5b3f 100644 --- a/pkgs/development/python-modules/blessed/default.nix +++ b/pkgs/development/python-modules/blessed/default.nix @@ -1,41 +1,46 @@ { lib, buildPythonPackage, - fetchPypi, - six, + fetchFromGitHub, + flit-core, wcwidth, - pytest, + six, + pytestCheckHook, mock, glibcLocales, }: -buildPythonPackage rec { +buildPythonPackage { pname = "blessed"; - version = "1.21.0"; - format = "setuptools"; + # We need https://github.com/jquast/blessed/pull/311 to fix 3.13 + version = "1.25-unstable-2025-12-05"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-7Oi7xHWKuRdkUvTjpxnXAIjrVzl5jNVYLJ4F8qKDN+w="; + src = fetchFromGitHub { + owner = "jquast"; + repo = "blessed"; + rev = "cee680ff7fb3ad31f42ae98582ba74629f1fd6b0"; + hash = "sha256-4K1W0LXJKkb2wKE6D+IkX3oI5KxkpKbO661W/VTHgts="; }; + build-system = [ flit-core ]; + + dependencies = [ + wcwidth + six + ]; + nativeCheckInputs = [ - pytest + pytestCheckHook mock glibcLocales ]; # Default tox.ini parameters not needed - checkPhase = '' + preCheck = '' rm tox.ini - pytest ''; - propagatedBuildInputs = [ - wcwidth - six - ]; - meta = { homepage = "https://github.com/jquast/blessed"; description = "Thin, practical wrapper around terminal capabilities in Python"; diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix index fb78ead78779e..6746fb5707fa0 100644 --- a/pkgs/development/python-modules/brotli/default.nix +++ b/pkgs/development/python-modules/brotli/default.nix @@ -10,18 +10,9 @@ buildPythonPackage rec { pname = "brotli"; - version = "1.2.0"; + inherit (brotli) version src; pyproject = true; - src = fetchFromGitHub { - owner = "google"; - repo = "brotli"; - tag = "v${version}"; - hash = "sha256-ePfllKdY12hOPuO9uHuXFZ3Bdib6BLD4ghiaeurJZ28="; - # .gitattributes is not correct or GitHub does not parse it correct and the archive is missing the test data - forceFetchGit = true; - }; - build-system = [ pkgconfig setuptools diff --git a/pkgs/development/python-modules/bump-my-version/default.nix b/pkgs/development/python-modules/bump-my-version/default.nix index e08b27a1a23c0..88b2e472c301f 100644 --- a/pkgs/development/python-modules/bump-my-version/default.nix +++ b/pkgs/development/python-modules/bump-my-version/default.nix @@ -76,8 +76,6 @@ buildPythonPackage rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; - __darwinAllowLocalNetworking = true; pythonImportsCheck = [ "bumpversion" ]; diff --git a/pkgs/development/python-modules/bundlewrap/default.nix b/pkgs/development/python-modules/bundlewrap/default.nix index 9d571b5ec1830..0aaeee1207217 100644 --- a/pkgs/development/python-modules/bundlewrap/default.nix +++ b/pkgs/development/python-modules/bundlewrap/default.nix @@ -54,7 +54,6 @@ buildPythonPackage { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/bw"; - versionCheckProgramArg = "--version"; enabledTestPaths = [ # only unit tests as integration tests need a OpenSSH client/server setup diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index 65f79584bd616..73920987827c7 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -2,23 +2,20 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, pytestCheckHook, }: buildPythonPackage rec { pname = "cachetools"; - version = "6.1.0"; + version = "6.2.2"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "tkem"; repo = "cachetools"; tag = "v${version}"; - hash = "sha256-o3Ice6w7Ovot+nsmTpsl/toosZuVbi9RvRGs07W4H0Y="; + hash = "sha256-seoyqkrRQpRiMd5GTEvenjirn173Hq40Zuk1u7TvMPI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/capturer/default.nix b/pkgs/development/python-modules/capturer/default.nix index 091fb30e75770..a7cdbb0017209 100644 --- a/pkgs/development/python-modules/capturer/default.nix +++ b/pkgs/development/python-modules/capturer/default.nix @@ -3,14 +3,16 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, humanfriendly, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "capturer"; version = "3.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "xolox"; @@ -19,7 +21,18 @@ buildPythonPackage rec { sha256 = "0fwrxa049gzin5dck7fvwhdp1856jrn0d7mcjcjsd7ndqvhgvjj1"; }; - propagatedBuildInputs = [ humanfriendly ]; + patches = [ + # https://github.com/xolox/python-capturer/pull/16 + (fetchpatch { + name = "python314-compat.patch"; + url = "https://github.com/xolox/python-capturer/commit/3d0a9a040ecaa78ce2d39ec76ff5084ee7be6653.patch"; + hash = "sha256-NW+X6wdXMHSLswO7M7/YeIyHu+EDYTLJE/mBkqyhKUM="; + }) + ]; + + build-system = [ setuptools ]; + + dependencies = [ humanfriendly ]; # hangs on darwin doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix index 9d635cd1c9bb6..670f51a6ea903 100644 --- a/pkgs/development/python-modules/cattrs/default.nix +++ b/pkgs/development/python-modules/cattrs/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "cattrs"; - version = "25.1.1"; + version = "25.3.0"; pyproject = true; src = fetchFromGitHub { owner = "python-attrs"; repo = "cattrs"; tag = "v${version}"; - hash = "sha256-kaB/UJcd4E4PUkz6mD53lXtmj4Z4P+Tuu7bSljYVOO4="; + hash = "sha256-6oQblSanvSZOMD5ossCP7fNjyxF54SRbU1cQrW1I5Ps="; }; build-system = [ diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index 2594796461759..61648a3a527f5 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -6,7 +6,6 @@ fetchFromGitHub, jschema-to-python, jsonpatch, - jsonschema, junit-xml, mock, networkx, @@ -18,11 +17,12 @@ sarif-om, setuptools, sympy, + typing-extensions, }: buildPythonPackage rec { pname = "cfn-lint"; - version = "1.38.3"; + version = "1.41.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,23 +31,19 @@ buildPythonPackage rec { owner = "aws-cloudformation"; repo = "cfn-lint"; tag = "v${version}"; - hash = "sha256-n3NHmbo3qRhP7oqUOokw8oGnNXo4rhRhuAgL66hvfog="; + hash = "sha256-AudCeFMbCQucANLLAknCKC7gzi0vvFh9c9k7ll0a1MM="; }; build-system = [ setuptools ]; dependencies = [ aws-sam-translator - jschema-to-python jsonpatch - jsonschema - junit-xml - networkx networkx pyyaml regex - sarif-om sympy + typing-extensions ]; optional-dependencies = { @@ -57,12 +53,7 @@ buildPythonPackage rec { jschema-to-python sarif-om ]; - full = [ - jschema-to-python - junit-xml - pydot - sarif-om - ]; + full = lib.concatAttrValues (lib.removeAttrs optional-dependencies [ "full" ]); }; nativeCheckInputs = [ @@ -70,19 +61,12 @@ buildPythonPackage rec { mock pytestCheckHook ] - ++ lib.concatAttrValues optional-dependencies; + ++ optional-dependencies.full; preCheck = '' export PATH=$out/bin:$PATH ''; - disabledTestPaths = [ - # tests fail starting on 2025-10-01 - # related: https://github.com/aws-cloudformation/cfn-lint/issues/4125 - "test/integration/test_quickstart_templates.py" - "test/integration/test_quickstart_templates_non_strict.py" - ]; - disabledTests = [ # Requires git directory "test_update_docs" diff --git a/pkgs/development/python-modules/ciso8601/default.nix b/pkgs/development/python-modules/ciso8601/default.nix index c788999d29278..d29d0f36a6cfa 100644 --- a/pkgs/development/python-modules/ciso8601/default.nix +++ b/pkgs/development/python-modules/ciso8601/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ciso8601"; - version = "2.3.2"; + version = "2.3.3"; pyproject = true; src = fetchFromGitHub { owner = "closeio"; repo = "ciso8601"; tag = "v${version}"; - hash = "sha256-oVnQ0vHhWs8spfOnJOgTJ6MAHcY8VGZHZ0E/T8JsKqE="; + hash = "sha256-14HiCn8BPALPaW53k118lHb5F4oG9mMNN6sdLdKB6v0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/clarabel/default.nix b/pkgs/development/python-modules/clarabel/default.nix index b21bf0cdab146..66891ba7decc4 100644 --- a/pkgs/development/python-modules/clarabel/default.nix +++ b/pkgs/development/python-modules/clarabel/default.nix @@ -5,6 +5,7 @@ fetchPypi, rustPlatform, libiconv, + cffi, numpy, scipy, nix-update-script, @@ -12,17 +13,17 @@ buildPythonPackage rec { pname = "clarabel"; - version = "0.10.0"; + version = "0.11.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-qKIQUFj9fbVHGL5TxIcVpQkQUAsQ/wuPU4BDTmnBChA="; + hash = "sha256-58QcR/Dlmuq5mu//nlivSodT7lJpu+7L1VJvxvQblZg="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-Ohbeavkayl6vMyYX9kVVLRddvVB9gWOxfzdWAOg+gac="; + hash = "sha256-Cmxbz1zPA/J7EeJhGfD4Zt+QvyJK6BOZ+YQAsf8H+is="; }; nativeBuildInputs = with rustPlatform; [ @@ -32,7 +33,8 @@ buildPythonPackage rec { buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; - propagatedBuildInputs = [ + dependencies = [ + cffi numpy scipy ]; diff --git a/pkgs/development/python-modules/clarifai-protocol/default.nix b/pkgs/development/python-modules/clarifai-protocol/default.nix index 17e76e1dba95a..d3036cb894ae4 100644 --- a/pkgs/development/python-modules/clarifai-protocol/default.nix +++ b/pkgs/development/python-modules/clarifai-protocol/default.nix @@ -18,23 +18,34 @@ let "x86_64-darwin" = "macosx_11_0_universal2"; }; - hashes = { - "39-x86_64-linux" = "sha256-uGbsxSHGfYVzRiy1YEkQMkJi2yPLdSj3fe3adp1WjP0="; - "310-x86_64-linux" = "sha256-1SO/1lpB3aRWisxFlt8K5lwFEOiDXjC4iQRai77L+8E="; - "311-x86_64-linux" = "sha256-99VdM1fAcuiblReWL5I8+H0psCKR00HYZr/wRGT7nd8="; - "312-x86_64-linux" = "sha256-bbggF4rGDrXOpSegreFHgK0H/z7xaR9hb7z6SYp7nlU="; - "313-x86_64-linux" = "sha256-M9/t7JgIjh7yiZeEq9K2tGQ4oLneVhXf0rUfL8p09Tg="; - "39-aarch64-linux" = "sha256-wuEncCbqWdqO72zovzHrmb34on73eaQgFBmQZdUnwkE="; - "310-aarch64-linux" = "sha256-uLHEEPcVakctNT428pNlaq0yKDpvMLynDP2lDobiebA="; - "311-aarch64-linux" = "sha256-d2A4mKP4Dlnm6J31wPyAHg8d5MjFF4wcREe5FVFeayU="; - "312-aarch64-linux" = "sha256-aW295fQogAjaVK6saHhduKsVsncIv4BsfRW6qHlyb3g="; - "313-aarch64-linux" = "sha256-mloW8TGkBJWXqO6xOqHhra3ZXuGQWf6dEGSrkdD0sb0="; - "39-darwin" = "sha256-uU9RGo5glYOPp8nEYqj4c1TB3Xa1KwrNWMqNDpJsSjY="; - "310-darwin" = "sha256-80U0geHKJLVhhmvHayXWHWaV9ifJjWtR9mbwCUDfPu0="; - "311-darwin" = "sha256-kM2YVzPa22QgIRV4zP4kcvTE8al/RW0Oo6lyxJl3JxU="; - "312-darwin" = "sha256-t4qbP5wqE8cgkvN+vG6zOeS+s5+U/GjmbeeHytIo9/o="; - "313-darwin" = "sha256-ds2kj87miODVUE8Lrjuzz8L+2HxaQ7jTxGQF0/Odrpg="; - }; + key = + if stdenv.hostPlatform.isDarwin then + "${pythonVersionNoDot}-darwin" + else + "${pythonVersionNoDot}-${stdenv.hostPlatform.system}"; + + hash = + { + "39-x86_64-linux" = "sha256-uGbsxSHGfYVzRiy1YEkQMkJi2yPLdSj3fe3adp1WjP0="; + "310-x86_64-linux" = "sha256-1SO/1lpB3aRWisxFlt8K5lwFEOiDXjC4iQRai77L+8E="; + "311-x86_64-linux" = "sha256-99VdM1fAcuiblReWL5I8+H0psCKR00HYZr/wRGT7nd8="; + "312-x86_64-linux" = "sha256-bbggF4rGDrXOpSegreFHgK0H/z7xaR9hb7z6SYp7nlU="; + "313-x86_64-linux" = "sha256-M9/t7JgIjh7yiZeEq9K2tGQ4oLneVhXf0rUfL8p09Tg="; + "314-x86_64-linux" = ""; + "39-aarch64-linux" = "sha256-wuEncCbqWdqO72zovzHrmb34on73eaQgFBmQZdUnwkE="; + "310-aarch64-linux" = "sha256-uLHEEPcVakctNT428pNlaq0yKDpvMLynDP2lDobiebA="; + "311-aarch64-linux" = "sha256-d2A4mKP4Dlnm6J31wPyAHg8d5MjFF4wcREe5FVFeayU="; + "312-aarch64-linux" = "sha256-aW295fQogAjaVK6saHhduKsVsncIv4BsfRW6qHlyb3g="; + "313-aarch64-linux" = "sha256-mloW8TGkBJWXqO6xOqHhra3ZXuGQWf6dEGSrkdD0sb0="; + "314-aarch64-linux" = ""; + "39-darwin" = "sha256-uU9RGo5glYOPp8nEYqj4c1TB3Xa1KwrNWMqNDpJsSjY="; + "310-darwin" = "sha256-80U0geHKJLVhhmvHayXWHWaV9ifJjWtR9mbwCUDfPu0="; + "311-darwin" = "sha256-kM2YVzPa22QgIRV4zP4kcvTE8al/RW0Oo6lyxJl3JxU="; + "312-darwin" = "sha256-t4qbP5wqE8cgkvN+vG6zOeS+s5+U/GjmbeeHytIo9/o="; + "313-darwin" = "sha256-ds2kj87miODVUE8Lrjuzz8L+2HxaQ7jTxGQF0/Odrpg="; + "314-darwin" = ""; + } + .key or (throw "clarifai-protocol: unsupported system/python (${key}) version combination"); in buildPythonPackage rec { pname = "clarifai-protocol"; @@ -49,12 +60,7 @@ buildPythonPackage rec { abi = "cp${pythonVersionNoDot}"; dist = "cp${pythonVersionNoDot}"; platform = systemToPlatform.${stdenv.hostPlatform.system} or (throw "unsupported system"); - hash = - if stdenv.hostPlatform.isDarwin then - hashes."${pythonVersionNoDot}-darwin" or (throw "unsupported system/python version combination") - else - hashes."${pythonVersionNoDot}-${stdenv.hostPlatform.system}" - or (throw "unsupported system/python version combination"); + inherit hash; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index 368589cac6ef0..47f53fb6580b0 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, importlib-metadata, pytestCheckHook, @@ -17,25 +16,16 @@ buildPythonPackage rec { pname = "click"; - version = "8.2.1"; + version = "8.3.1"; pyproject = true; src = fetchFromGitHub { owner = "pallets"; repo = "click"; tag = version; - hash = "sha256-3FfLKwpfkiGfY2+H2fQoZwLBqfPlV46xw2Bc4YEsyps="; + hash = "sha256-MbaIQJr6GbM8JwdbUkbeC8TqWN5dH82pFOqHwJE2PBA="; }; - patches = [ - # https://github.com/pallets/click/pull/2940 - (fetchpatch { - name = "fix-SystemExit-when-using-stdin.patch"; - url = "https://github.com/pallets/click/commit/93c6966eb3a575c2b600434d1cc9f4b3aee505ac.patch"; - hash = "sha256-DkVF0JnKbcsdAhgVjWJEDZZ8vr2sf6wba8P3SyRUy6o="; - }) - ]; - build-system = [ flit-core ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index 8fdb9ec23f123..048aca02e8566 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -2,34 +2,29 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, # build-system flit-core, # tests - psutil, pytestCheckHook, }: buildPythonPackage rec { pname = "cloudpickle"; - version = "3.1.1"; + version = "3.1.2"; pyproject = true; - disabled = pythonOlder "3.6"; - src = fetchFromGitHub { owner = "cloudpipe"; repo = "cloudpickle"; tag = "v${version}"; - hash = "sha256-e8kEznjuIrdjNsXwXJO3lcEEpiCR+UQzXnGrTarUb5E="; + hash = "sha256-BsCOEpNCNqq8PS+SdbzF1wq0LXEmtcHJs0pdt2qFw/w="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; nativeCheckInputs = [ - psutil pytestCheckHook ]; @@ -37,6 +32,7 @@ buildPythonPackage rec { disabledTestPaths = [ # ModuleNotFoundError: No module named 'psutil' + # (because _make_cwd_env() overwrites $PYTHONPATH) "tests/cloudpickle_test.py" ]; @@ -44,7 +40,7 @@ buildPythonPackage rec { changelog = "https://github.com/cloudpipe/cloudpickle/blob/${src.tag}/CHANGES.md"; description = "Extended pickling support for Python objects"; homepage = "https://github.com/cloudpipe/cloudpickle"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/cmsis-pack-manager/default.nix b/pkgs/development/python-modules/cmsis-pack-manager/default.nix index 16de23b159ddb..55728123534e1 100644 --- a/pkgs/development/python-modules/cmsis-pack-manager/default.nix +++ b/pkgs/development/python-modules/cmsis-pack-manager/default.nix @@ -15,19 +15,19 @@ buildPythonPackage rec { pname = "cmsis-pack-manager"; - version = "0.5.2"; + version = "0.6.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pyocd"; repo = "cmsis-pack-manager"; tag = "v${version}"; - hash = "sha256-PeyJf3TGUxv8/MKIQUgWrenrK4Hb+4cvtDA2h3r6kGg="; + hash = "sha256-kb0VSg89qglL6Q5kx1nEN1OW1GYoccBTITtPw2/dXTY="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-OBh5WWSekrqdLLmxEXS0LfPIfy4QWKYgO+8o6PYWjN4="; + hash = "sha256-yRNSFlEwFhfkSNjbFHipVZvJZ40pKbI9HhLtciws7nc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/coiled/default.nix b/pkgs/development/python-modules/coiled/default.nix index 2ae6894a190be..473fb1805490a 100644 --- a/pkgs/development/python-modules/coiled/default.nix +++ b/pkgs/development/python-modules/coiled/default.nix @@ -84,7 +84,6 @@ buildPythonPackage rec { nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Python client for coiled.io dask clusters"; diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index af2fdd133c1db..36d367e81759d 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.13.0"; + version = "7.13.1"; pyproject = true; src = fetchFromGitHub { owner = "coveragepy"; repo = "coveragepy"; tag = version; - hash = "sha256-2i01Jlk4oj/0WhoYE1BgeKKjZK3YpEOrGHEgNhTruR4="; + hash = "sha256-xdbgHUE+vbSiqLRDhd5G5u90VU5+TxLehAuwdhdGzBQ="; }; build-system = [ setuptools ]; @@ -47,27 +47,11 @@ buildPythonPackage rec { ''; disabledTests = [ - "test_doctest" - "test_files_up_one_level" - "test_get_encoded_zip_files" - "test_multi" - "test_no_duplicate_packages" - "test_zipfile" # tests expect coverage source to be there "test_all_our_source_files" - "test_metadata" - "test_more_metadata" "test_real_code_regions" ]; - disabledTestPaths = [ - "tests/test_debug.py" - "tests/test_plugins.py" - "tests/test_process.py" - "tests/test_report.py" - "tests/test_venv.py" - ]; - meta = { changelog = "https://github.com/coveragepy/coveragepy/blob/${src.tag}/CHANGES.rst"; description = "Code coverage measurement for Python"; diff --git a/pkgs/development/python-modules/crewai/default.nix b/pkgs/development/python-modules/crewai/default.nix index 3f2abc0258553..1d8f7560712a1 100644 --- a/pkgs/development/python-modules/crewai/default.nix +++ b/pkgs/development/python-modules/crewai/default.nix @@ -445,8 +445,6 @@ buildPythonPackage rec { "--override-ini=addopts=" ]; - versionCheckProgramArg = "--version"; - meta = { description = "Framework for orchestrating role-playing, autonomous AI agents"; homepage = "https://github.com/crewAIInc/crewAI"; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index d9b3a68715ae1..15016552b3d41 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.2"; + version = "46.0.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -31,12 +31,12 @@ buildPythonPackage rec { owner = "pyca"; repo = "cryptography"; tag = version; - hash = "sha256-gsEHKEYiMw2eliEpxwzFGDetOp77PivlMoBD3HBbbFA="; + hash = "sha256-6t7f/BaMkA24MY05B7aYa0myxnCjrCsh1qk6RgAjeQc="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-aCQzY2gBjVVwiqlqAxkH4y6yf4lqdQuSEnQSIjLPRJg="; + hash = "sha256-5ElDEl7MdcQfu/hy+POSBcvkNCFAMo6La5s6uRhZ/fM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cx-freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix index 48dacf09a5666..8fca41d9b161b 100644 --- a/pkgs/development/python-modules/cx-freeze/default.nix +++ b/pkgs/development/python-modules/cx-freeze/default.nix @@ -90,7 +90,6 @@ buildPythonPackage rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/cxfreeze"; - versionCheckProgramArg = "--version"; preCheck = '' rm -rf cx_Freeze diff --git a/pkgs/development/python-modules/cython/default.nix b/pkgs/development/python-modules/cython/default.nix index c7ccfa5295cce..796df1cad647b 100644 --- a/pkgs/development/python-modules/cython/default.nix +++ b/pkgs/development/python-modules/cython/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, gdb, - isPyPy, ncurses, numpy, pkg-config, @@ -16,31 +15,30 @@ buildPythonPackage rec { pname = "cython"; - version = "3.1.4"; + version = "3.1.6"; pyproject = true; src = fetchFromGitHub { owner = "cython"; repo = "cython"; tag = version; - hash = "sha256-qFj7w0fQY6X1oADLsAgwFefzx92/Pmgv9j5S6v0sdPg="; + hash = "sha256-OB9DsGabbn5pE+8Ru29D3Jp9Wu+gwlHYYy79x+M+HPI="; }; build-system = [ - pkg-config setuptools ]; + nativeBuildInputs = [ + pkg-config + ]; + nativeCheckInputs = [ gdb numpy ncurses ]; - env = lib.optionalAttrs (!isPyPy) { - LC_ALL = "en_US.UTF-8"; - }; - # https://github.com/cython/cython/issues/2785 # Temporary solution doCheck = false; diff --git a/pkgs/development/python-modules/dacite/default.nix b/pkgs/development/python-modules/dacite/default.nix index 9426692a2088a..ed4bc835a6346 100644 --- a/pkgs/development/python-modules/dacite/default.nix +++ b/pkgs/development/python-modules/dacite/default.nix @@ -2,16 +2,15 @@ lib, fetchFromGitHub, buildPythonPackage, - pythonOlder, pytestCheckHook, + pythonAtLeast, + setuptools, }: buildPythonPackage rec { pname = "dacite"; version = "1.9.2"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; + pyproject = true; src = fetchFromGitHub { owner = "konradhalas"; @@ -23,8 +22,14 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace "--benchmark-autosave --benchmark-json=benchmark.json" "" + '' + + lib.optionalString (pythonAtLeast "3.14") '' + substituteInPlace tests/core/test_union.py \ + --replace-fail "typing.Union[int, str]" "int | str" ''; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "dacite" ]; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 47bf61b9db098..cb7ae00121df4 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, # build-system setuptools, @@ -50,6 +51,12 @@ buildPythonPackage rec { hash = "sha256-oGBOt2ULLn0Kx1rOVNWaC3l1ECotMC2yNeCHya9Tx+s="; }; + # https://github.com/dask/dask/issues/12043 + postPatch = lib.optionalString (pythonAtLeast "3.14") '' + substituteInPlace dask/dataframe/dask_expr/tests/_util.py \ + --replace-fail "except AttributeError:" "except (AttributeError, pickle.PicklingError):" + ''; + build-system = [ setuptools setuptools-scm @@ -102,7 +109,6 @@ buildPythonPackage rec { ] ++ optional-dependencies.array ++ optional-dependencies.dataframe; - versionCheckProgramArg = "--version"; pytestFlags = [ # Rerun failed tests up to three times @@ -114,6 +120,11 @@ buildPythonPackage rec { "network" ]; + # https://github.com/dask/dask/issues/12042 + disabledTests = lib.optionals (pythonAtLeast "3.14") [ + "test_multiple_repartition_partition_size" + ]; + __darwinAllowLocalNetworking = true; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index 7a11e307b64ea..d5bb8918d91f7 100644 --- a/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -25,6 +25,12 @@ buildPythonPackage rec { hash = "sha256-AH/T6pa/CHtQNox67fqqs/BBnUcmThvbnSHug2p33qM="; }; + patches = [ + ./marshmallow-4.0-compat.patch + # https://github.com/lidatong/dataclasses-json/pull/565 + ./python-3.14-compat.patch + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace-fail 'documentation =' 'Documentation =' \ @@ -36,6 +42,8 @@ buildPythonPackage rec { poetry-dynamic-versioning ]; + pythonRelaxDeps = [ "marshmallow" ]; + dependencies = [ typing-inspect marshmallow @@ -46,6 +54,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # fails to deserialize None with marshmallow 4.0 + "test_deserialize" + ]; + disabledTestPaths = [ # fails with the following error and avoid dependency on mypy # mypy_main(None, text_io, text_io, [__file__], clean_exit=True) diff --git a/pkgs/development/python-modules/dataclasses-json/marshmallow-4.0-compat.patch b/pkgs/development/python-modules/dataclasses-json/marshmallow-4.0-compat.patch new file mode 100644 index 0000000000000..aafbb08b63ebf --- /dev/null +++ b/pkgs/development/python-modules/dataclasses-json/marshmallow-4.0-compat.patch @@ -0,0 +1,62 @@ +diff --git a/dataclasses_json/api.py b/dataclasses_json/api.py +index 3481e93..a19eb0a 100644 +--- a/dataclasses_json/api.py ++++ b/dataclasses_json/api.py +@@ -79,7 +79,6 @@ class DataClassJsonMixin(abc.ABC): + only=None, + exclude=(), + many: bool = False, +- context=None, + load_only=(), + dump_only=(), + partial: bool = False, +@@ -95,7 +94,6 @@ class DataClassJsonMixin(abc.ABC): + return Schema(only=only, + exclude=exclude, + many=many, +- context=context, + load_only=load_only, + dump_only=dump_only, + partial=partial, + +diff --git a/dataclasses_json/mm.py b/dataclasses_json/mm.py +index 9cfacf1..cecd3b0 100644 +--- a/dataclasses_json/mm.py ++++ b/dataclasses_json/mm.py +@@ -248,7 +248,7 @@ def build_type(type_, options, mixin, field, cls): + options['field_many'] = bool( + _is_supported_generic(field.type) and _is_collection( + field.type)) +- return fields.Nested(type_.schema(), **options) ++ return fields.Nested(type_.schema(), metadata=options) + else: + warnings.warn(f"Nested dataclass field {field.name} of type " + f"{field.type} detected in " + +From b5ea169f19cea0e346ba152c75ab49802f307e5e Mon Sep 17 00:00:00 2001 +From: Steven Packard +Date: Sat, 9 Apr 2022 03:37:52 -0400 +Subject: [PATCH] fix(mm): Replace deprecated Marshmallow Field parameters + +In Marshmallow 3.13.0, the `default` and `missing` parameters of the +`Field` object were deprecated and replaced with `dump_default` and +`load_default` respectively. + +fixes: #328 +--- + dataclasses_json/mm.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dataclasses_json/mm.py b/dataclasses_json/mm.py +index 9cfacf1d..b9e54d8e 100644 +--- a/dataclasses_json/mm.py ++++ b/dataclasses_json/mm.py +@@ -305,7 +305,7 @@ def schema(cls, mixin, infer_missing): + else: + type_ = field.type + options: typing.Dict[str, typing.Any] = {} +- missing_key = 'missing' if infer_missing else 'default' ++ missing_key = 'load_default' if infer_missing else 'dump_default' + if field.default is not MISSING: + options[missing_key] = field.default + elif field.default_factory is not MISSING: diff --git a/pkgs/development/python-modules/dataclasses-json/python-3.14-compat.patch b/pkgs/development/python-modules/dataclasses-json/python-3.14-compat.patch new file mode 100644 index 0000000000000..e09a5d91b4d56 --- /dev/null +++ b/pkgs/development/python-modules/dataclasses-json/python-3.14-compat.patch @@ -0,0 +1,145 @@ +From 20799887ff1d50dc6ca5d90bc1038ff5160b97f3 Mon Sep 17 00:00:00 2001 +From: "paul@iqmo.com" +Date: Tue, 19 Aug 2025 21:38:21 -0400 +Subject: [PATCH 3/8] fix 3.14 / PEP649, but maintain bw compat + +--- + dataclasses_json/core.py | 40 +++++++++++++++++++++++++++++- + dataclasses_json/undefined.py | 3 ++- + tests/test_undefined_parameters.py | 36 +++++++++++++++++++++++++++ + 3 files changed, 77 insertions(+), 2 deletions(-) + +diff --git a/dataclasses_json/core.py b/dataclasses_json/core.py +index 69f51a3a..313e2615 100644 +--- a/dataclasses_json/core.py ++++ b/dataclasses_json/core.py +@@ -18,6 +18,7 @@ + from uuid import UUID + + from typing_inspect import is_union_type # type: ignore ++import typing + + from dataclasses_json import cfg + from dataclasses_json.utils import (_get_type_cons, _get_type_origin, +@@ -44,6 +45,43 @@ + Set: frozenset, + }) + ++PEP649 = sys.version_info >= (3, 14) ++ ++if PEP649: ++ import inspect ++ ++def _safe_get_type_hints(c, **kwargs): ++ ++ if not PEP649: ++ # not running under PEP 649 (future/deferred annotations), ++ return typing.get_type_hints(c, include_extras=True, **kwargs) ++ ++ else: ++ if not isinstance(c, type): ++ # If we're passed an instance instead of a class, normalize to its type ++ c = c.__class__ ++ if "." not in getattr(c, "__qualname__", ""): ++ # If this is a *top-level class* (no "." in __qualname__), ++ # typing.get_type_hints works fine even under PEP 649. ++ return typing.get_type_hints(c, include_extras=True, **kwargs) ++ else: ++ # Otherwise, this is a *nested class* (defined inside another class or function), ++ # where typing.get_type_hints may fail under PEP 649. ++ ann = {} ++ ++ # First collect annotations from bases in the MRO ++ for base in reversed(c.__mro__[:-1]): ++ ann.update(inspect.get_annotations(base, format=inspect.Format.VALUE) or {}) ++ ++ # For the class itself, use FORWARDREF format to keep "Self"/recursive types intact ++ ann.update(inspect.get_annotations(c, format=inspect.Format.FORWARDREF) or {}) ++ ++ if ann: ++ return ann ++ else: ++ return {f.name: f.type for f in fields(c)} ++ ++ + + class _ExtendedEncoder(json.JSONEncoder): + def default(self, o) -> Json: +@@ -175,7 +213,7 @@ def _decode_dataclass(cls, kvs, infer_missing): + kvs = _handle_undefined_parameters_safe(cls, kvs, usage="from") + + init_kwargs = {} +- types = get_type_hints(cls) ++ types = _safe_get_type_hints(cls) + for field in fields(cls): + # The field should be skipped from being added + # to init_kwargs as it's not intended as a constructor argument. +diff --git a/dataclasses_json/undefined.py b/dataclasses_json/undefined.py +index cb8b2cfc..a94b4718 100644 +--- a/dataclasses_json/undefined.py ++++ b/dataclasses_json/undefined.py +@@ -7,6 +7,7 @@ + from typing import Any, Callable, Dict, Optional, Tuple, Union, Type, get_type_hints + from enum import Enum + ++from .core import _safe_get_type_hints + from marshmallow.exceptions import ValidationError # type: ignore + + from dataclasses_json.utils import CatchAllVar +@@ -248,7 +249,7 @@ def _catch_all_init(self, *args, **kwargs): + @staticmethod + def _get_catch_all_field(cls) -> Field: + cls_globals = vars(sys.modules[cls.__module__]) +- types = get_type_hints(cls, globalns=cls_globals) ++ types = _safe_get_type_hints(cls, globalns=cls_globals) + catch_all_fields = list( + filter(lambda f: types[f.name] == Optional[CatchAllVar], fields(cls))) + number_of_catch_all_fields = len(catch_all_fields) +diff --git a/tests/test_undefined_parameters.py b/tests/test_undefined_parameters.py +index bac711af..6bd33406 100644 +--- a/tests/test_undefined_parameters.py ++++ b/tests/test_undefined_parameters.py +@@ -221,6 +221,42 @@ class Boss: + assert json.loads(boss_json) == Boss.schema().dump(boss) + assert "".join(boss_json.replace('\n', '').split()) == "".join(Boss.schema().dumps(boss).replace('\n', '').split()) + ++@dataclass_json(undefined=Undefined.INCLUDE) ++@dataclass(frozen=True) ++class Minion2: ++ name: str ++ catch_all: CatchAll ++ ++@dataclass_json(undefined=Undefined.INCLUDE) ++@dataclass(frozen=True) ++class Boss2: ++ minions: List[Minion2] ++ catch_all: CatchAll ++ ++def test_undefined_parameters_catch_all_schema_roundtrip2(boss_json): ++ boss1 = Boss2.schema().loads(boss_json) ++ dumped_s = Boss2.schema().dumps(boss1) ++ boss2 = Boss2.schema().loads(dumped_s) ++ assert boss1 == boss2 ++ ++ ++def test_undefined_parameters_catch_all_schema_roundtrip(boss_json): ++ @dataclass_json(undefined=Undefined.INCLUDE) ++ @dataclass(frozen=True) ++ class Minion: ++ name: str ++ catch_all: CatchAll ++ ++ @dataclass_json(undefined=Undefined.INCLUDE) ++ @dataclass(frozen=True) ++ class Boss: ++ minions: List[Minion] ++ catch_all: CatchAll ++ ++ boss1 = Boss.schema().loads(boss_json) ++ dumped_s = Boss.schema().dumps(boss1) ++ boss2 = Boss.schema().loads(dumped_s) ++ assert boss1 == boss2 + + def test_undefined_parameters_catch_all_schema_roundtrip(boss_json): + @dataclass_json(undefined=Undefined.INCLUDE) + diff --git a/pkgs/development/python-modules/db-dtypes/default.nix b/pkgs/development/python-modules/db-dtypes/default.nix index 48aae1bd883a8..8d783a15c3b58 100644 --- a/pkgs/development/python-modules/db-dtypes/default.nix +++ b/pkgs/development/python-modules/db-dtypes/default.nix @@ -7,24 +7,29 @@ pandas, pyarrow, pytest8_3CheckHook, - pythonOlder, + pythonAtLeast, setuptools, }: buildPythonPackage rec { pname = "db-dtypes"; - version = "1.4.3"; + version = "1.4.4"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "googleapis"; repo = "python-db-dtypes-pandas"; tag = "v${version}"; - hash = "sha256-AyO/GwtExMWi4mB3OMtYPFvAVS/ylcBXGiGXgaScyCA="; + hash = "sha256-Aq/2yDyvUpLsGr+mmBDQpC9X1pWLpDtYD6qql2sgGNw="; }; + # https://github.com/googleapis/python-db-dtypes-pandas/pull/379 + postPatch = lib.optionalString (pythonAtLeast "3.14") '' + substituteInPlace tests/unit/test_date.py \ + --replace-fail '"year 10000 is out of range"' '"year must be in 1..9999, not 10000"' \ + --replace-fail '"day is out of range for month"' '"day 99 must be in range 1..28 for month 2 in year 2021"' + ''; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix index 87aac6af1762b..b0d90c7a5cdc7 100644 --- a/pkgs/development/python-modules/decorator/default.nix +++ b/pkgs/development/python-modules/decorator/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - enabledTestPaths = [ "tests/test.py " ]; + enabledTestPaths = [ "tests/test.py" ]; meta = { changelog = "https://github.com/micheles/decorator/blob/${src.tag}/CHANGES.md"; diff --git a/pkgs/development/python-modules/deid/default.nix b/pkgs/development/python-modules/deid/default.nix index d51a351a0ff9d..10cd9938b1305 100644 --- a/pkgs/development/python-modules/deid/default.nix +++ b/pkgs/development/python-modules/deid/default.nix @@ -62,7 +62,6 @@ buildPythonPackage rec { pytestCheckHook versionCheckHook ]; - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "deid" ]; diff --git a/pkgs/development/python-modules/deltalake/default.nix b/pkgs/development/python-modules/deltalake/default.nix index c5c8244675269..57ffacf002fb7 100644 --- a/pkgs/development/python-modules/deltalake/default.nix +++ b/pkgs/development/python-modules/deltalake/default.nix @@ -8,6 +8,8 @@ openssl, stdenv, libiconv, + opentelemetry-api, + opentelemetry-sdk, pkg-config, polars, pytestCheckHook, @@ -18,21 +20,22 @@ pandas, deprecated, azure-storage-blob, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "deltalake"; - version = "1.1.4"; + version = "1.2.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-LpeJUNQg4FC73LX2LjvpPTMctRarTJsWlM8aeIfGPiU="; + hash = "sha256-dqzkiWHeAbfXzEsaKyRiJx+0m/dIOMi9+gxjcuBT2QU="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-4VmNhUijQMC/Wazcx+uT7mQqD+wutXrBJ+HN3AyxQRw="; + hash = "sha256-MPwoGJ7xcsBRgaaM4jxhC6Vv2+Jhh0oYYtbji/Hc+vQ="; }; env.OPENSSL_NO_VENDOR = 1; @@ -51,25 +54,32 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config # openssl-sys needs this + writableTmpDirAsHomeHook ] ++ (with rustPlatform; [ cargoSetupHook maturinBuildHook ]); + optional-dependencies = { + pandas = [ pandas ]; + pyarrow = [ pyarrow ]; + }; + pythonImportsCheck = [ "deltalake" ]; nativeCheckInputs = [ - pytestCheckHook - pandas + azure-storage-blob + opentelemetry-api + opentelemetry-sdk polars + pytestCheckHook pytest-benchmark pytest-cov-stub pytest-mock pytest-timeout - azure-storage-blob - pyarrow - ]; + ] + ++ lib.concatAttrValues optional-dependencies; preCheck = '' # For paths in test to work, we have to be in python dir diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix index e79469d71ad46..d04dd0ec6a64a 100644 --- a/pkgs/development/python-modules/dill/default.nix +++ b/pkgs/development/python-modules/dill/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, python, - pythonOlder, setuptools, # passthru tests @@ -13,16 +12,14 @@ buildPythonPackage rec { pname = "dill"; - version = "0.4.0"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + version = "0.4.0-unstable-2025-11-09"; + pyproject = true; src = fetchFromGitHub { owner = "uqfoundation"; repo = "dill"; - tag = version; - hash = "sha256-RIyWTeIkK5cS4Fh3TK48XLa/EU9Iwlvcml0CTs5+Uh8="; + rev = "d948ecd748772f2812361982ec1496da0cd47b53"; + hash = "sha256-/A84BpZnwSwsEYqLL0Xdf8OjJtg1UMu6dig3QEN+n1A="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/distutils/default.nix b/pkgs/development/python-modules/distutils/default.nix index 33d0aed2d89ee..727b109d64bcf 100644 --- a/pkgs/development/python-modules/distutils/default.nix +++ b/pkgs/development/python-modules/distutils/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, setuptools-scm, setuptools, python, @@ -11,6 +12,7 @@ jaraco-envs, jaraco-path, jaraco-text, + libz, more-itertools, packaging, path, @@ -27,8 +29,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "pypa"; repo = "distutils"; - rev = "72837514c2b67081401db556be9aaaa43debe44f"; # correlate commit from setuptools version - hash = "sha256-Kx4Iudy9oZ0oQT96Meyq/m0k0BuexPLVxwvpNJehCW0="; + rev = "5ad8291ff2ad3e43583bc72a4c09299ca6134f09"; # correlate commit from setuptools version + hash = "sha256-3Mqpe/Goj3lQ6GEbX3DHWjdoh7XsFIg9WkOCK138OAo="; }; build-system = [ setuptools-scm ]; @@ -58,9 +60,19 @@ buildPythonPackage { pytestCheckHook ]; + checkInputs = [ + # https://github.com/pypa/distutils/blob/5ad8291ff2ad3e43583bc72a4c09299ca6134f09/distutils/tests/test_build_ext.py#L107 + libz + ]; + # jaraco-path depends ob pyobjc doCheck = !stdenv.hostPlatform.isDarwin; + disabledTests = lib.optionals (pythonAtLeast "3.14") [ + # AssertionError: assert '(?s:foo[^/]*)\\z' == '(?s:foo[^/]*)\\Z' + "test_glob_to_re" + ]; + meta = { description = "Distutils as found in cpython"; homepage = "https://github.com/pypa/distutils"; diff --git a/pkgs/development/python-modules/django-bootstrap3/default.nix b/pkgs/development/python-modules/django-bootstrap3/default.nix index 1f5db03385eda..b17f2681c8cf8 100644 --- a/pkgs/development/python-modules/django-bootstrap3/default.nix +++ b/pkgs/development/python-modules/django-bootstrap3/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, # build-system uv-build, @@ -17,24 +16,16 @@ buildPythonPackage rec { pname = "django-bootstrap3"; - version = "25.2"; + version = "25.3"; format = "pyproject"; src = fetchFromGitHub { owner = "zostera"; repo = "django-bootstrap3"; tag = "v${version}"; - hash = "sha256-TaB2PeBjmCNFuEZ+To2Q3C6zlFCaaTB70LxQWWb5AEo="; + hash = "sha256-OCr25Sc5fbL5ivrM2LpDAcTj8bPX4Q23Yj1j6jRG03U="; }; - 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 b316af4b37e4c..1e504aa7d2cbb 100644 --- a/pkgs/development/python-modules/django-bootstrap4/default.nix +++ b/pkgs/development/python-modules/django-bootstrap4/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, # build-system uv-build, @@ -20,24 +19,16 @@ buildPythonPackage rec { pname = "django-bootstrap4"; - version = "25.2"; + version = "25.3"; pyproject = true; src = fetchFromGitHub { owner = "zostera"; repo = "django-bootstrap4"; tag = "v${version}"; - hash = "sha256-+G9UHW4eUGl00A/kDj+iTP7ehjj/dwUENKffvGxE6/4="; + hash = "sha256-aayR9yXsC1Kt4PtlhhdnaPA5cqYuL4CV0UY1fvA/ntk="; }; - 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-cryptography/default.nix b/pkgs/development/python-modules/django-cryptography/default.nix index 02825509ebfeb..10c3810b22693 100644 --- a/pkgs/development/python-modules/django-cryptography/default.nix +++ b/pkgs/development/python-modules/django-cryptography/default.nix @@ -5,45 +5,52 @@ django-appconf, fetchFromGitHub, lib, - python, - pythonOlder, + pytestCheckHook, + pytest-django, setuptools, }: -buildPythonPackage rec { +buildPythonPackage { pname = "django-cryptography"; - version = "1.1"; - disabled = pythonOlder "3.7"; - format = "pyproject"; + version = "1.1-unstable-2024-02-16"; + pyproject = true; src = fetchFromGitHub { owner = "georgemarshall"; repo = "django-cryptography"; - tag = version; - hash = "sha256-C3E2iT9JdLvF+1g+xhZ8dPDjjh25JUxLAtTMnalIxPk="; + rev = "a5cde9beed707a14a2ef2f1f7f1fee172feb8b5e"; + hash = "sha256-Xj/fw8EapsYvVbZPRQ81yeE9QpIQ1TIuk+ASOCGh/Uc="; }; - nativeBuildInputs = [ setuptools ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace-fail "packages = django_cryptography" "packages = find:" + ''; + + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cryptography django django-appconf ]; - patches = [ - # See: https://github.com/georgemarshall/django-cryptography/pull/88 - ./fix-setup-cfg.patch - ]; - pythonImportsCheck = [ "django_cryptography" ]; - checkPhase = '' - runHook preCheck - ${python.interpreter} ./runtests.py - runHook postCheck + nativeCheckInputs = [ + pytest-django + pytestCheckHook + ]; + + preCheck = '' + export DJANGO_SETTINGS_MODULE=tests.settings ''; + disabledTests = [ + # self.assertEqual(len(errors), 1) - AssertionError: 0 != 1 + "test_field_checks" + ]; + meta = { homepage = "https://github.com/georgemarshall/django-cryptography"; description = "Set of primitives for performing cryptography in Django"; diff --git a/pkgs/development/python-modules/django-cryptography/fix-setup-cfg.patch b/pkgs/development/python-modules/django-cryptography/fix-setup-cfg.patch deleted file mode 100644 index 0cb7b9dba2aa0..0000000000000 --- a/pkgs/development/python-modules/django-cryptography/fix-setup-cfg.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/setup.cfg b/setup.cfg -index 865b4c3..577d917 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -35,7 +35,10 @@ project_urls = - Documentation = https://django-cryptography.readthedocs.io - - [options] --packages = django_cryptography -+packages = -+ django_cryptography -+ django_cryptography.core -+ django_cryptography.utils - python_requires = >=3.6 - include_package_data = True - install_requires = diff --git a/pkgs/development/python-modules/django-jinja2/default.nix b/pkgs/development/python-modules/django-jinja/default.nix similarity index 54% rename from pkgs/development/python-modules/django-jinja2/default.nix rename to pkgs/development/python-modules/django-jinja/default.nix index 0bbaf6e0699d2..20f88ca5ac2c9 100644 --- a/pkgs/development/python-modules/django-jinja2/default.nix +++ b/pkgs/development/python-modules/django-jinja/default.nix @@ -1,20 +1,24 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, + + # build-system + setuptools, + + # dependencies django, jinja2, - python, + + # tests + pytest-django, + pytestCheckHook, }: buildPythonPackage rec { pname = "django-jinja"; version = "2.11.0"; - - disabled = pythonOlder "3.8"; - - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "niwinz"; @@ -23,17 +27,34 @@ buildPythonPackage rec { hash = "sha256-0gkv9xinHux8TRiNBLl/JgcimXU3CzysxzGR2jn7OZ4="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ django jinja2 ]; - checkPhase = '' - runHook preCheck + nativeCheckInputs = [ + pytestCheckHook + pytest-django + ]; + + preCheck = '' + pushd testing + export DJANGO_SETTINGS_MODULE=settings + ''; - ${python.interpreter} testing/runtests.py + pytestFlagsArray = [ + "testapp/tests.py" + ]; + + disabledTests = lib.optionals (lib.versionAtLeast django.version "5.2") [ + # https://github.com/niwinz/django-jinja/issues/317 + "test_autoscape_with_form_errors" + ]; - runHook postCheck + postCheck = '' + popd ''; meta = { diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index 53db6d735155f..6d47d5a9ed89f 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -64,6 +64,7 @@ buildPythonPackage rec { homepage = "https://gitlab.com/mailman/django-mailman3"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ qyliss ]; - broken = lib.versionAtLeast django-allauth.version "65.0.0"; + broken = + lib.versionAtLeast django-allauth.version "65.0.0" || lib.versionAtLeast django.version "5.1"; }; } diff --git a/pkgs/development/python-modules/django-ninja/default.nix b/pkgs/development/python-modules/django-ninja/default.nix index f0424882f2772..758cc5fe33517 100644 --- a/pkgs/development/python-modules/django-ninja/default.nix +++ b/pkgs/development/python-modules/django-ninja/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "django-ninja"; - version = "1.4.3t"; + version = "1.4.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vitalik"; repo = "django-ninja"; tag = "v${version}"; - hash = "sha256-IiOj2fBuClHyIdn/r3XxKwO+DyrgahagUKrxp+YKZ4E="; + hash = "sha256-C54Y5Rmhk9trEeNhE+i3aeKcnoeUc6BqFbp3dzL9xjA="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/django-rest-registration/default.nix b/pkgs/development/python-modules/django-rest-registration/default.nix index 695da5c5470c9..bd3f7ff6e52c8 100644 --- a/pkgs/development/python-modules/django-rest-registration/default.nix +++ b/pkgs/development/python-modules/django-rest-registration/default.nix @@ -5,9 +5,10 @@ djangorestframework, fetchFromGitHub, pytest-django, + pytest-xdist, pytestCheckHook, pythonOlder, - jwt, + pyjwt, setuptools, }: @@ -35,16 +36,15 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-django - jwt + pytest-xdist + pyjwt ]; pythonImportsCheck = [ "rest_registration" ]; disabledTests = [ - # This test fails on Python 3.10 + # Failed: DID NOT RAISE "test_convert_html_to_text_fails" - # This test is broken and was removed after 0.7.3. Remove this line once version > 0.7.3 - "test_coreapi_autoschema_success" ]; meta = { diff --git a/pkgs/development/python-modules/django-scheduler/default.nix b/pkgs/development/python-modules/django-scheduler/default.nix index e7d768fb91d04..8c82c0078ee42 100644 --- a/pkgs/development/python-modules/django-scheduler/default.nix +++ b/pkgs/development/python-modules/django-scheduler/default.nix @@ -30,9 +30,9 @@ buildPythonPackage rec { dependencies = [ django + icalendar python-dateutil pytz - icalendar ]; nativeCheckInputs = [ @@ -44,6 +44,24 @@ buildPythonPackage rec { export DJANGO_SETTINGS_MODULE=tests.settings ''; + patches = [ + # Remove in Django 5.1 + # https://github.com/llazzaro/django-scheduler/pull/567 + ./index_together.patch + ]; + + postPatch = '' + # Remove in Django 5.1 + substituteInPlace tests/settings.py \ + --replace-fail "SHA1PasswordHasher" "PBKDF2PasswordHasher" + ''; + + disabledTests = lib.optionals (lib.versionAtLeast django.version "5.1") [ + # test_delete_event_authenticated_user - AssertionError: 302 != 200 + "test_delete_event_authenticated_user" + "test_event_creation_authenticated_user" + ]; + pythonImportsCheck = [ "schedule" ]; meta = { diff --git a/pkgs/development/python-modules/django-scheduler/index_together.patch b/pkgs/development/python-modules/django-scheduler/index_together.patch new file mode 100644 index 0000000000000..5777410eca676 --- /dev/null +++ b/pkgs/development/python-modules/django-scheduler/index_together.patch @@ -0,0 +1,65 @@ +From d691550163941db6dbcec2f347fee4d3941615a0 Mon Sep 17 00:00:00 2001 +From: Robin +Date: Wed, 1 Jan 2025 10:31:44 -0500 +Subject: [PATCH 1/2] Update calendars.py + +Django 5.1 ... index_together deprecated. +--- + schedule/models/calendars.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/schedule/models/calendars.py b/schedule/models/calendars.py +index 81f8a7de..d37097a7 100644 +--- a/schedule/models/calendars.py ++++ b/schedule/models/calendars.py +@@ -231,7 +231,7 @@ class CalendarRelation(models.Model): + class Meta: + verbose_name = _("calendar relation") + verbose_name_plural = _("calendar relations") +- index_together = [("content_type", "object_id")] ++ indexes = [models.Index(fields=["content_type", "object_id"])] + + def __str__(self): + return "{} - {}".format(self.calendar, self.content_object) + +From 768d2d3842ce6af8115741ef5758a72ab4659491 Mon Sep 17 00:00:00 2001 +From: Robin +Date: Wed, 1 Jan 2025 10:32:56 -0500 +Subject: [PATCH 2/2] Update events.py + +Django 5.1 .... index_together deprecated +--- + schedule/models/events.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/schedule/models/events.py b/schedule/models/events.py +index bf6fa5f1..bc9671c5 100644 +--- a/schedule/models/events.py ++++ b/schedule/models/events.py +@@ -92,7 +92,7 @@ class Event(models.Model): + class Meta: + verbose_name = _("event") + verbose_name_plural = _("events") +- index_together = (("start", "end"),) ++ indexes = [models.Index(fields=["start", "end"])] + + def __str__(self): + return gettext("%(title)s: %(start)s - %(end)s") % { +@@ -571,7 +571,7 @@ class EventRelation(models.Model): + class Meta: + verbose_name = _("event relation") + verbose_name_plural = _("event relations") +- index_together = [("content_type", "object_id")] ++ indexes = [models.Index(fields=["content_type", "object_id"])] + + def __str__(self): + return "{}({})-{}".format( +@@ -594,7 +594,7 @@ class Occurrence(models.Model): + class Meta: + verbose_name = _("occurrence") + verbose_name_plural = _("occurrences") +- index_together = (("start", "end"),) ++ indexes = [models.Index(fields=["start", "end"])] + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 342a300804322..37805cfe1e475 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -45,16 +45,16 @@ buildPythonPackage rec { pname = "django"; - version = "4.2.26"; + version = "4.2.27"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.8" || pythonAtLeast "3.13"; src = fetchFromGitHub { owner = "django"; repo = "django"; rev = "refs/tags/${version}"; - hash = "sha256-2NkkQcsY+BDvLGtvjYfGwgAK2S6LDbbcl7CwbwuF5a0="; + hash = "sha256-vdY85Ib2knRFLPmZZ6ojiD5R9diuvpVut1+nOVXSp0Y="; }; patches = [ diff --git a/pkgs/development/python-modules/django/5_2.nix b/pkgs/development/python-modules/django/5_2.nix index 005df4abe3067..9a5fa2ba43813 100644 --- a/pkgs/development/python-modules/django/5_2.nix +++ b/pkgs/development/python-modules/django/5_2.nix @@ -3,7 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, - pythonAtLeast, + fetchpatch, pythonOlder, replaceVars, @@ -63,6 +63,18 @@ buildPythonPackage rec { ./django_5_tests_pythonpath.patch # disable test that expects timezone issues ./django_5_disable_failing_tests.patch + + # 3.14.1/3.13.10 comapt + (fetchpatch { + # https://github.com/django/django/pull/20390 + url = "https://github.com/django/django/commit/5ca0f62213911a77dd4a62e843db7e420cc98b78.patch"; + hash = "sha256-SpVdbS4S5wqvrrUOoZJ7d2cIbtmgI0mvxwwCveSA068="; + }) + (fetchpatch { + # https://github.com/django/django/pull/20392 + url = "https://github.com/django/django/commit/9cc231e8243091519f5d627cd02ee40bbb853ced.patch"; + hash = "sha256-/aimmqxurMCCntraxOtybEq8qNgZgQWLD5Gxs/3pkIU="; + }) ] ++ lib.optionals withGdal [ (replaceVars ./django_5_set_geos_gdal_lib.patch { diff --git a/pkgs/development/python-modules/docstring-parser/default.nix b/pkgs/development/python-modules/docstring-parser/default.nix index dc5b6c33bbe17..7c432645e7b99 100644 --- a/pkgs/development/python-modules/docstring-parser/default.nix +++ b/pkgs/development/python-modules/docstring-parser/default.nix @@ -2,26 +2,23 @@ lib, buildPythonPackage, fetchFromGitHub, - poetry-core, + hatchling, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "docstring-parser"; - version = "0.16"; + version = "0.17.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "rr-"; repo = "docstring_parser"; tag = version; - hash = "sha256-xwV+mgCOC/MyCqGELkJVqQ3p2g2yw/Ieomc7k0HMXms="; + hash = "sha256-hR+i1HU/ZpN6I3a8k/Wv2OrXgB4ls/A5OHZRqxEZS78="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index 030da79204f72..57310f82d8c00 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - pythonOlder, cmake, ninja, duckdb, @@ -16,6 +15,7 @@ psutil, pyarrow, pybind11, + pytz, scikit-build-core, setuptools-scm, pytest-reraise, @@ -73,16 +73,11 @@ buildPythonPackage rec { ]; optional-dependencies = { - # Note: ipython and adbc_driver_manager currently excluded despite inclusion in upstream - # https://github.com/duckdb/duckdb-python/blob/v1.4.0/pyproject.toml#L44-L52 all = [ + # FIXME package adbc_driver_manager ipython fsspec numpy - ] - ++ lib.optionals (pythonOlder "3.14") [ - # https://github.com/duckdb/duckdb-python/blob/0ee500cfa35fc07bf81ed02e8ab6984ea1f665fd/pyproject.toml#L49-L51 - # adbc_driver_manager noted for migration to duckdb C source pandas pyarrow ]; @@ -105,6 +100,7 @@ buildPythonPackage rec { psutil pytest-reraise pytestCheckHook + pytz ] ++ optional-dependencies.all; diff --git a/pkgs/development/python-modules/dynaconf/default.nix b/pkgs/development/python-modules/dynaconf/default.nix index 362c964575199..eaa43423ad3b0 100644 --- a/pkgs/development/python-modules/dynaconf/default.nix +++ b/pkgs/development/python-modules/dynaconf/default.nix @@ -94,8 +94,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "dynaconf" ]; - versionCheckProgramArg = "--version"; - meta = { description = "Dynamic configurator for Python Project"; homepage = "https://github.com/dynaconf/dynaconf"; diff --git a/pkgs/development/python-modules/eradicate/default.nix b/pkgs/development/python-modules/eradicate/default.nix index c409deabb1494..0a6c9ef337369 100644 --- a/pkgs/development/python-modules/eradicate/default.nix +++ b/pkgs/development/python-modules/eradicate/default.nix @@ -2,24 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "eradicate"; - version = "3.0.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "3.0.1"; + pyproject = true; src = fetchFromGitHub { owner = "wemake-services"; repo = "eradicate"; tag = version; - hash = "sha256-V3g9qYM/TiOz83IMoUwu0CvFWBxB5Yk3Dy3G/Dz3vYw="; + hash = "sha256-D9V9PQ3HVmShmPgTInOJaVmujy1fQyQn6qYn/Pa0kMg="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "eradicate" ]; diff --git a/pkgs/development/python-modules/et-xmlfile/default.nix b/pkgs/development/python-modules/et-xmlfile/default.nix index 5167f6064fd24..6f025cb9d6cd1 100644 --- a/pkgs/development/python-modules/et-xmlfile/default.nix +++ b/pkgs/development/python-modules/et-xmlfile/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitLab, + fetchpatch, lxml, pytestCheckHook, pythonOlder, @@ -23,6 +24,14 @@ buildPythonPackage rec { hash = "sha256-JZ1fJ9o4/Z+9uSlaoq+pNpLSwl5Yv6BJCI1G7GOaQ1I="; }; + patches = [ + (fetchpatch { + # python 3.14 compat + url = "https://foss.heptapod.net/openpyxl/et_xmlfile/-/commit/73172a7ce6d819ce13e6706f9a1c6d50f1646dde.patch"; + hash = "sha256-PMtzIGtXJ/vp0VRmBodvyaG/Ptn2DwrTTC1EyLSChHU="; + }) + ]; + build-system = [ setuptools ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/eval-type-backport/default.nix b/pkgs/development/python-modules/eval-type-backport/default.nix index ab36c93c7773f..2e27ee3370d30 100644 --- a/pkgs/development/python-modules/eval-type-backport/default.nix +++ b/pkgs/development/python-modules/eval-type-backport/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { pname = "eval-type-backport"; - version = "0.2.2"; + version = "0.3.0"; format = "setuptools"; src = fetchFromGitHub { owner = "alexmojaki"; repo = "eval_type_backport"; tag = "v${version}"; - hash = "sha256-r+JiPBcU/6li9R/CQP0CKoWJiMgky03GKrMIsmaSJEk="; + hash = "sha256-K+FrgRyxCbrKHcrUaHEJWlLp2i0xes3HwXPN9ucioZY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 1f411adefc665..4b84afbc61756 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -22,24 +22,24 @@ buildPythonPackage rec { pname = "eventlet"; - version = "0.40.0"; + version = "0.40.3"; pyproject = true; src = fetchFromGitHub { owner = "eventlet"; repo = "eventlet"; tag = version; - hash = "sha256-fzCN+idYQ97nuDVfYn6VYQFBaaMxmnjWzFrmn+Aj+u4="; + hash = "sha256-yieyNx91jvKoh02zDFIEFk70yf3I27DWiumqoOjtdzQ="; }; pythonRelaxDeps = lib.optionals isPyPy [ "greenlet" ]; - nativeBuildInputs = [ + build-system = [ hatch-vcs hatchling ]; - propagatedBuildInputs = [ + dependencies = [ dnspython greenlet six @@ -78,7 +78,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "eventlet" ]; meta = { - changelog = "https://github.com/eventlet/eventlet/blob/v${version}/NEWS"; + changelog = "https://github.com/eventlet/eventlet/blob/${src.tag}/NEWS"; description = "Concurrent networking library for Python"; homepage = "https://github.com/eventlet/eventlet/"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix index 2e8cdbff1c702..a06c80e94365a 100644 --- a/pkgs/development/python-modules/exceptiongroup/default.nix +++ b/pkgs/development/python-modules/exceptiongroup/default.nix @@ -31,6 +31,12 @@ buildPythonPackage rec { doCheck = pythonAtLeast "3.11"; # infinite recursion with pytest + disabledTests = lib.optionals (pythonAtLeast "3.14") [ + # RecursionError not raised + "test_deep_split" + "test_deep_subgroup" + ]; + pythonImportsCheck = [ "exceptiongroup" ]; meta = { diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix index 840ee16d0b66b..5d1e75b7d8300 100644 --- a/pkgs/development/python-modules/executing/default.nix +++ b/pkgs/development/python-modules/executing/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, pythonAtLeast, pythonOlder, @@ -19,26 +18,16 @@ buildPythonPackage rec { pname = "executing"; - version = "2.2.0"; + version = "2.2.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "alexmojaki"; repo = "executing"; rev = "v${version}"; - hash = "sha256-2BT4VTZBAJx8Gk4qTTyhSoBMjJvKzmL4PO8IfTpN+2g="; + hash = "sha256-UlXuXBW9TmJ0xG/0yMdx8EDQDSzVgtsgFJIj/O7pmio="; }; - patches = [ - (fetchpatch { - name = "pytest-8.4.1-compat.patch"; - url = "https://github.com/alexmojaki/executing/commit/fae0dd2f4bd0e74b8a928e19407fd4167f4b2295.patch"; - hash = "sha256-ccYBeP4yXf3U4sRyeGUYhLz7QHbXFiMviQ1n+AIVMdo="; - }) - ]; - build-system = [ setuptools setuptools-scm @@ -59,9 +48,6 @@ buildPythonPackage rec { # if the test runs fast enough. That makes the test flaky when # running on slow systems or cross- / emulated building "test_many_source_for_filename_calls" - - # https://github.com/alexmojaki/executing/issues/91 - "test_exception_catching" ]; pythonImportsCheck = [ "executing" ]; diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 10e7b59fde18f..1ad50d73326c0 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -8,6 +8,7 @@ pdm-backend, # dependencies + annotated-doc, starlette, pydantic, typing-extensions, @@ -18,6 +19,7 @@ flask, inline-snapshot, passlib, + pwdlib, pyjwt, pytest-asyncio, pytestCheckHook, @@ -41,7 +43,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.116.1"; + version = "0.121.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -50,7 +52,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = "fastapi"; tag = version; - hash = "sha256-sd0SnaxuuF3Zaxx7rffn4ttBpRmWQoOtXln/amx9rII="; + hash = "sha256-uUUARIHY8VBoLfWfMvveapypqiB00cTTWpJ4fi9nvUo="; }; build-system = [ pdm-backend ]; @@ -61,6 +63,7 @@ buildPythonPackage rec { ]; dependencies = [ + annotated-doc starlette pydantic typing-extensions @@ -103,6 +106,7 @@ buildPythonPackage rec { flask inline-snapshot passlib + pwdlib pyjwt pytestCheckHook pytest-asyncio diff --git a/pkgs/development/python-modules/fastcrc/default.nix b/pkgs/development/python-modules/fastcrc/default.nix index 94c4fed846b03..478b9dcaee93f 100644 --- a/pkgs/development/python-modules/fastcrc/default.nix +++ b/pkgs/development/python-modules/fastcrc/default.nix @@ -10,13 +10,13 @@ }: let pname = "fastcrc"; - version = "0.3.2"; + version = "0.3.4"; src = fetchFromGitHub { owner = "overcat"; repo = "fastcrc"; tag = "v${version}"; - hash = "sha256-yLrv/zqsjgygJAIJtztwxlm4s9o9EBVsCyx1jUXd7hA="; + hash = "sha256-iBbYiF0y/3Cax4P9+/gKS6FUBqZ3BleCwnpItsVd7Ps="; }; in buildPythonPackage { @@ -32,7 +32,7 @@ buildPythonPackage { cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-9Vap8E71TkBIf4eIB2lapUqcMukdsHX4LR7U8AD77SU="; + hash = "sha256-VbS5xTqj+Flxxdg06MO34AZCVozlNgFvc+yKemEmCzs="; }; pythonImportsCheck = [ "fastcrc" ]; diff --git a/pkgs/development/python-modules/files-to-prompt/default.nix b/pkgs/development/python-modules/files-to-prompt/default.nix index 29d6fc79c16dc..b263f32ad06e3 100644 --- a/pkgs/development/python-modules/files-to-prompt/default.nix +++ b/pkgs/development/python-modules/files-to-prompt/default.nix @@ -31,8 +31,6 @@ buildPythonPackage rec { disabledTests = [ "test_binary_file_warning" ]; - versionCheckProgramArg = "--version"; - meta = { mainProgram = "files-to-prompt"; description = "Concatenate a directory full of files into a single prompt for use with LLMs"; diff --git a/pkgs/development/python-modules/fmpy/default.nix b/pkgs/development/python-modules/fmpy/default.nix index 7db322c17c397..99b7699ae935e 100644 --- a/pkgs/development/python-modules/fmpy/default.nix +++ b/pkgs/development/python-modules/fmpy/default.nix @@ -141,7 +141,6 @@ buildPythonPackage rec { nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; passthru = { # From sundials, build only the CVODE solver. C.f. diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix index d86c905581a78..88735e65ad028 100644 --- a/pkgs/development/python-modules/freezegun/default.nix +++ b/pkgs/development/python-modules/freezegun/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "freezegun"; - version = "1.5.4"; + version = "1.5.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eYuTcv3U2QfzPotqWLxk5oLZ/6jUlM5g94AZfugfrtE="; + hash = "sha256-rHdCpsxsJaLDXpKS39VUuJe1F9LewmiRoujevyBcuUo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index abdce30f6e72a..4f55ef6384bf7 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -10,7 +10,7 @@ psutil, pyftpdlib, pytestCheckHook, - pythonOlder, + pythonAtLeast, pytz, setuptools, six, @@ -21,7 +21,8 @@ buildPythonPackage rec { version = "2.4.16"; pyproject = true; - disabled = pythonOlder "3.8"; + # https://github.com/PyFilesystem/pyfilesystem2/issues/596 + disabled = pythonAtLeast "3.14"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index 9143470c44b08..231c0b27f051d 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -38,14 +38,14 @@ buildPythonPackage rec { pname = "fsspec"; - version = "2025.3.2"; + version = "2025.10.0"; pyproject = true; src = fetchFromGitHub { owner = "fsspec"; repo = "filesystem_spec"; tag = version; - hash = "sha256-FsgDILnnr+WApoTv/y1zVFSeBNysvkizdKtMeRegbfI="; + hash = "sha256-rIn2m3lRhlJwkB54X4sRT9JH+e4pIIEt7dPjnknczjs="; }; build-system = [ diff --git a/pkgs/development/python-modules/gb-io/default.nix b/pkgs/development/python-modules/gb-io/default.nix index 2bd51e80fa1c0..75241018e2b0b 100644 --- a/pkgs/development/python-modules/gb-io/default.nix +++ b/pkgs/development/python-modules/gb-io/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "gb-io"; - version = "0.3.6"; + version = "0.3.8"; pyproject = true; src = fetchFromGitHub { owner = "althonos"; repo = "gb-io.py"; rev = "v${version}"; - hash = "sha256-iLRXyiVji9q4C5YtBsTT9bklSueY9RlX7Kz4cu+hmpE="; + hash = "sha256-ArJTK6YcuyExIMBUYBxpr7TpKeVMF6Nk4ObAZLuOgJA="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -27,7 +27,7 @@ buildPythonPackage rec { src sourceRoot ; - hash = "sha256-miwCgZpaFVMaNJLUTYSGEkmg+uT7lbzJZnBa9yZqC8U="; + hash = "sha256-3mgvT8b4tpoUScs5yk6IbGBUJ/czu3XSdFXhfT/c5S8="; }; sourceRoot = src.name; diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix index 681fb725d2739..9372c189b5d36 100644 --- a/pkgs/development/python-modules/gcsfs/default.nix +++ b/pkgs/development/python-modules/gcsfs/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "gcsfs"; - version = "2025.3.2"; + version = "2025.10.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = "gcsfs"; tag = version; - hash = "sha256-aXBlj9ej3Ya7h4x/akl/iX6dDS/SgkkEsOQ2E9KmCDU="; + hash = "sha256-Co98M3zK839mIWhV1Sifyb9r0sy1BjX6stDIj/0ONYo="; }; build-system = [ diff --git a/pkgs/development/python-modules/geojson/default.nix b/pkgs/development/python-modules/geojson/default.nix index 86680fc01f2e4..4088d11c34b15 100644 --- a/pkgs/development/python-modules/geojson/default.nix +++ b/pkgs/development/python-modules/geojson/default.nix @@ -2,31 +2,22 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, setuptools, unittestCheckHook, }: buildPythonPackage rec { pname = "geojson"; - version = "3.1.0"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "jazzband"; repo = "geojson"; tag = version; - hash = "sha256-OL+7ntgzpA63ALQ8whhKRePsKxcp81PLuU1bHJvxN9U="; + hash = "sha256-0p8FW9alcWCSdi66wanS/F9IgO714WIRQIXvg3f9op8="; }; - patches = [ - (fetchpatch2 { - name = "dont-fail-with-python-313.patch"; - url = "https://github.com/jazzband/geojson/commit/c13afff339e6b78f442785cc95f0eb66ddab3e7b.patch?full_index=1"; - hash = "sha256-xdz96vzTA+zblJtCvXIZe5p51xJGM5eB/HAtCXgy5JA="; - }) - ]; - build-system = [ setuptools ]; pythonImportsCheck = [ "geojson" ]; diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix index d0c1bb7260aa1..ffa2cecf3973f 100644 --- a/pkgs/development/python-modules/gipc/default.nix +++ b/pkgs/development/python-modules/gipc/default.nix @@ -4,29 +4,21 @@ fetchFromGitHub, gevent, pytestCheckHook, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "gipc"; - version = "1.6.0"; + version = "1.8.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "jgehrcke"; repo = "gipc"; tag = version; - hash = "sha256-eYE7A1VDJ0NSshvdJKxPwGyVdW6BnyWoRSR1i1iTr8Y="; + hash = "sha256-P3soMA/EBMuhkXQsiLv9gnDBfo9XGosKnSMi+EZ0gaM="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace-fail "gevent>=1.5,<=23.9.1" "gevent>=1.5" - ''; - build-system = [ setuptools ]; dependencies = [ gevent ]; diff --git a/pkgs/development/python-modules/granian/default.nix b/pkgs/development/python-modules/granian/default.nix index 34144ff5a139f..df9ed11f79c72 100644 --- a/pkgs/development/python-modules/granian/default.nix +++ b/pkgs/development/python-modules/granian/default.nix @@ -91,9 +91,15 @@ buildPythonPackage rec { "test_rsgi_ws_scope" ]; - pythonImportsCheck = [ "granian" ]; + # This is a measure of last resort. Granian tests fully lock up + # on shutdown in >90% of cases, which makes the whole thing + # impossible to build without restarting it double digits + # numbers of times. The issue has not been fully identified, + # and upstream claims it does not exist. + # FIXME: root cause and fix this. + doCheck = false; - versionCheckProgramArg = "--version"; + pythonImportsCheck = [ "granian" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index 8e45bdfd03ead..b4e5d3bf8cadf 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch, replaceVars, graphviz-nox, xdg-utils, @@ -33,6 +34,11 @@ buildPythonPackage rec { graphviz = graphviz-nox; xdgutils = xdg-utils; }) + (fetchpatch { + # python314 compat; https://github.com/xflr6/graphviz/pull/238 + url = "https://github.com/xflr6/graphviz/commit/7e0fae6d28792a628a25cadd4ec1582c7351a7a3.patch"; + hash = "sha256-cZhNsQFi30uFpPXbEJHQ9eol7g6pdv6w8kp1GxLTBD4="; + }) ]; # Fontconfig error: Cannot load default config file diff --git a/pkgs/development/python-modules/graspologic-native/Cargo.lock b/pkgs/development/python-modules/graspologic-native/Cargo.lock index e2133ee8c5d53..1dcb0bef624b2 100644 --- a/pkgs/development/python-modules/graspologic-native/Cargo.lock +++ b/pkgs/development/python-modules/graspologic-native/Cargo.lock @@ -1,104 +1,99 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" +name = "anstream" +version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" dependencies = [ - "libc", + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", ] [[package]] -name = "ansi_term" -version = "0.12.1" +name = "anstyle" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] +checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" [[package]] -name = "atty" -version = "0.2.14" +name = "anstyle-parse" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" dependencies = [ - "hermit-abi", - "libc", - "winapi", + "utf8parse", ] [[package]] -name = "autocfg" -version = "1.3.0" +name = "anstyle-query" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2" +dependencies = [ + "windows-sys", +] [[package]] -name = "bumpalo" -version = "3.16.0" +name = "anstyle-wincon" +version = "3.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a" +dependencies = [ + "anstyle", + "once_cell_polyfill", + "windows-sys", +] [[package]] -name = "cc" -version = "1.0.104" +name = "autocfg" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[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 = "chrono" -version = "0.4.38" +name = "clap" +version = "4.5.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5" dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "wasm-bindgen", - "windows-targets", + "clap_builder", ] [[package]] -name = "clap" -version = "2.34.0" +name = "clap_builder" +version = "4.5.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a" dependencies = [ - "ansi_term", - "atty", - "bitflags", + "anstream", + "anstyle", + "clap_lex", "strsim", - "textwrap", - "unicode-width", - "vec_map", ] +[[package]] +name = "clap_lex" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d" + [[package]] name = "cli" -version = "0.1.0" +version = "0.1.1" dependencies = [ "clap", "network_partitions", @@ -107,16 +102,16 @@ dependencies = [ ] [[package]] -name = "core-foundation-sys" -version = "0.8.6" +name = "colorchoice" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" [[package]] name = "getrandom" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", "libc", @@ -125,9 +120,8 @@ dependencies = [ [[package]] name = "graspologic_native" -version = "1.2.1" +version = "1.2.5" dependencies = [ - "chrono", "network_partitions", "pyo3", "rand", @@ -135,242 +129,153 @@ dependencies = [ ] [[package]] -name = "hermit-abi" -version = "0.1.19" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "indoc" -version = "0.3.6" +version = "2.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" +checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706" dependencies = [ - "indoc-impl", - "proc-macro-hack", + "rustversion", ] [[package]] -name = "indoc-impl" -version = "0.3.6" +name = "is_terminal_polyfill" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", - "unindent", -] - -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "js-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" -dependencies = [ - "wasm-bindgen", -] +checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.177" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" [[package]] -name = "lock_api" -version = "0.4.12" +name = "memoffset" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", - "scopeguard", ] -[[package]] -name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" - [[package]] name = "network_partitions" version = "0.1.0" dependencies = [ - "chrono", "rand", "rand_xorshift", ] -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - [[package]] name = "once_cell" -version = "1.19.0" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core", -] +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] -name = "parking_lot_core" -version = "0.8.6" +name = "once_cell_polyfill" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi", -] +checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] -name = "paste" -version = "0.1.18" +name = "portable-atomic" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" -dependencies = [ - "paste-impl", - "proc-macro-hack", -] +checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" [[package]] -name = "paste-impl" -version = "0.1.18" +name = "ppv-lite86" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" dependencies = [ - "proc-macro-hack", + "zerocopy", ] -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.15.2" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d41d50a7271e08c7c8a54cd24af5d62f73ee3a6f6a314215281ebdec421d5752" +checksum = "e5203598f366b11a02b13aa20cab591229ff0a89fd121a308a5df751d5fc9219" dependencies = [ "cfg-if", "indoc", "libc", - "parking_lot", - "paste", + "memoffset", + "once_cell", + "portable-atomic", "pyo3-build-config", + "pyo3-ffi", "pyo3-macros", "unindent", ] [[package]] name = "pyo3-build-config" -version = "0.15.2" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "779239fc40b8e18bc8416d3a37d280ca9b9fb04bda54b98037bb6748595c2410" +checksum = "99636d423fa2ca130fa5acde3059308006d46f98caac629418e53f7ebb1e9999" dependencies = [ "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78f9cf92ba9c409279bc3305b5409d90db2d2c22392d443a87df3a1adad59e33" +dependencies = [ + "libc", + "pyo3-build-config", ] [[package]] name = "pyo3-macros" -version = "0.15.2" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b247e8c664be87998d8628e86f282c25066165f1f8dda66100c48202fdb93a" +checksum = "0b999cb1a6ce21f9a6b147dcf1be9ffedf02e0043aec74dc390f3007047cecd9" dependencies = [ + "proc-macro2", "pyo3-macros-backend", "quote", - "syn 1.0.109", + "syn", ] [[package]] name = "pyo3-macros-backend" -version = "0.15.2" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a8c2812c412e00e641d99eeb79dd478317d981d938aa60325dfa7157b607095" +checksum = "822ece1c7e1012745607d5cf0bcb2874769f0f7cb34c4cde03b9358eb9ef911a" dependencies = [ + "heck", "proc-macro2", "pyo3-build-config", "quote", - "syn 1.0.109", + "syn", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" dependencies = [ "proc-macro2", ] @@ -415,37 +320,22 @@ dependencies = [ ] [[package]] -name = "redox_syscall" -version = "0.2.16" +name = "rustversion" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "strsim" -version = "0.8.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "1.0.109" +version = "2.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea" dependencies = [ "proc-macro2", "quote", @@ -453,146 +343,57 @@ dependencies = [ ] [[package]] -name = "syn" -version = "2.0.69" +name = "target-lexicon" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201fcda3845c23e8212cd466bfebf0bd20694490fc0356ae8e428e0824a915a6" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] +checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c" [[package]] name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-width" -version = "0.1.13" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "unindent" -version = "0.1.11" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" +checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3" [[package]] -name = "vec_map" -version = "0.8.2" +name = "utf8parse" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.69", - "wasm-bindgen-shared", -] +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] -name = "wasm-bindgen-macro" -version = "0.2.92" +name = "windows-link" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.92" +name = "windows-sys" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.69", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" dependencies = [ "windows-targets", ] [[package]] name = "windows-targets" -version = "0.52.6" +version = "0.53.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" dependencies = [ + "windows-link", "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", @@ -605,48 +406,68 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.6" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" [[package]] name = "windows_aarch64_msvc" -version = "0.52.6" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" [[package]] name = "windows_i686_gnu" -version = "0.52.6" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" [[package]] name = "windows_i686_gnullvm" -version = "0.52.6" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" [[package]] name = "windows_i686_msvc" -version = "0.52.6" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" [[package]] name = "windows_x86_64_gnu" -version = "0.52.6" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.6" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" [[package]] name = "windows_x86_64_msvc" -version = "0.52.6" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" + +[[package]] +name = "zerocopy" +version = "0.8.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/pkgs/development/python-modules/graspologic-native/default.nix b/pkgs/development/python-modules/graspologic-native/default.nix index dee8820252226..e191f6dd00222 100644 --- a/pkgs/development/python-modules/graspologic-native/default.nix +++ b/pkgs/development/python-modules/graspologic-native/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "graspologic-native"; - version = "1.2.1"; + version = "1.2.5"; pyproject = true; src = fetchFromGitHub { owner = "graspologic-org"; repo = "graspologic-native"; tag = version; - hash = "sha256-fgiBUzYBerYX59uj+I0Yret94vA+FpQK+MckskCBqj4="; + hash = "sha256-JIFg+JIxRKXgWLAGgOyKZTe2gXa8wZW5pEubTBLqwmQ="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix index e5826164a6a1d..d119bdf1169fa 100644 --- a/pkgs/development/python-modules/hatchling/default.nix +++ b/pkgs/development/python-modules/hatchling/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "hatchling"; - version = "1.27.0"; + version = "1.28.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-lxwpbZgZq7OBERL8UsepdRyNOBiY82Uzuxb5eR6UH9Y="; + hash = "sha256-TVCwKuzmiSuM0LPObILLIYWU0+xYNtvedb9BohqwBMg="; }; # listed in backend/pyproject.toml diff --git a/pkgs/development/python-modules/html5lib/default.nix b/pkgs/development/python-modules/html5lib/default.nix index fb6e80b449950..990ccacb4fbcc 100644 --- a/pkgs/development/python-modules/html5lib/default.nix +++ b/pkgs/development/python-modules/html5lib/default.nix @@ -1,47 +1,48 @@ { lib, buildPythonPackage, - fetchPypi, - fetchpatch, + fetchFromGitHub, + setuptools, six, webencodings, - mock, pytest-expect, pytestCheckHook, + unstableGitUpdater, }: -buildPythonPackage rec { +buildPythonPackage { pname = "html5lib"; - version = "1.1"; - format = "setuptools"; + version = "1.1-unstable-2024-02-21"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f"; + src = fetchFromGitHub { + owner = "html5lib"; + repo = "html5lib-python"; + rev = "fd4f032bc090d44fb11a84b352dad7cbee0a4745"; + hash = "sha256-Hyte1MEqlrD2enfunK1qtm3FJlUDqmhSyrCjo7VaBgA="; }; patches = [ - # Fix compatibility with pytest 6. - # Will be included in the next release after 1.1. - (fetchpatch { - url = "https://github.com/html5lib/html5lib-python/commit/2c19b9899ab3a3e8bd0ca35e5d78544334204169.patch"; - hash = "sha256-VGCeB6o2QO/skeCZs8XLPfgEYVOSRL8cCpG7ajbZWEs="; - }) + # https://github.com/html5lib/html5lib-python/pull/583 + ./python314-compat.patch ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ six webencodings ]; - # latest release not compatible with pytest 6 - doCheck = false; nativeCheckInputs = [ - mock pytest-expect pytestCheckHook ]; + passthru.updateScript = unstableGitUpdater { + branch = "master"; + }; + meta = { homepage = "https://github.com/html5lib/html5lib-python"; downloadPage = "https://github.com/html5lib/html5lib-python/releases"; diff --git a/pkgs/development/python-modules/html5lib/python314-compat.patch b/pkgs/development/python-modules/html5lib/python314-compat.patch new file mode 100644 index 0000000000000..5351032f1232b --- /dev/null +++ b/pkgs/development/python-modules/html5lib/python314-compat.patch @@ -0,0 +1,26 @@ +From 379f9476c2a5ee370cd7ec856ee9092cace88499 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Wed, 30 Oct 2024 15:44:40 +0100 +Subject: [PATCH] Avoid ast.Str on Python 3.8+ + +It has been deprecated since Python 3.8 and was removed from Python 3.14+. +--- + setup.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 30ee0575..62272c18 100644 +--- a/setup.py ++++ b/setup.py +@@ -93,8 +93,9 @@ def default_environment(): + if (len(a.targets) == 1 and + isinstance(a.targets[0], ast.Name) and + a.targets[0].id == "__version__" and +- isinstance(a.value, ast.Str)): +- version = a.value.s ++ ((sys.version_info >= (3, 8) and isinstance(a.value, ast.Constant)) or ++ isinstance(a.value, ast.Str))): ++ version = a.value.value if sys.version_info >= (3, 8) else a.value.s + + setup(name='html5lib', + version=version, diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index 3382c25bf6258..f586d6deeab42 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -8,8 +8,6 @@ hatch-fancy-pypi-readme, h11, h2, - pproxy, - pytest-asyncio, pytest-httpbin, pytest-trio, pytestCheckHook, @@ -54,8 +52,6 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - pproxy - pytest-asyncio pytest-httpbin pytest-trio pytestCheckHook diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index dfe3b11274027..181bd6a2f6768 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "hypothesis"; - version = "6.136.9"; + version = "6.145.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis"; tag = "hypothesis-python-${version}"; - hash = "sha256-Q1wxIJwAYKZ0x6c85CJSGgcdKw9a3xFw8YpJROElSNU="; + hash = "sha256-xyUR3yY2tmF4LGhZRUlv6fdcfVyVWwukodA0WIW0bXU="; }; # I tried to package sphinx-selective-exclude, but it throws diff --git a/pkgs/development/python-modules/incremental/default.nix b/pkgs/development/python-modules/incremental/default.nix index dd15dca3079d2..eb28003c170ac 100644 --- a/pkgs/development/python-modules/incremental/default.nix +++ b/pkgs/development/python-modules/incremental/default.nix @@ -1,10 +1,10 @@ { buildPythonPackage, - click, fetchFromGitHub, + hatchling, lib, + packaging, pythonOlder, - setuptools, tomli, twisted, }: @@ -12,25 +12,19 @@ let incremental = buildPythonPackage rec { pname = "incremental"; - version = "24.7.2"; + version = "24.11.0"; pyproject = true; src = fetchFromGitHub { owner = "twisted"; repo = "incremental"; tag = "incremental-${version}"; - hash = "sha256-5MlIKUaBUwLTet23Rjd2Opf5e54LcHuZDowcGon0lOE="; + hash = "sha256-GkTCQYGrgCUzizSgKhWeqJ25pfaYA7eUJIHt0q/iO0E="; }; - # From upstream's pyproject.toml: - # "Keep this aligned with the project dependencies." - build-system = dependencies; + build-system = [ hatchling ]; - dependencies = [ setuptools ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - - optional-dependencies = { - scripts = [ click ]; - }; + dependencies = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; # escape infinite recursion with twisted doCheck = false; @@ -50,10 +44,11 @@ let pythonImportsCheck = [ "incremental" ]; meta = { - changelog = "https://github.com/twisted/incremental/blob/${src.rev}/NEWS.rst"; + changelog = "https://github.com/twisted/incremental/blob/${src.tag}/NEWS.rst"; homepage = "https://github.com/twisted/incremental"; description = "Small library that versions your Python projects"; license = lib.licenses.mit; + mainProgram = "incremental"; maintainers = with lib.maintainers; [ dotlambda ]; }; }; diff --git a/pkgs/development/python-modules/installer/cross.patch b/pkgs/development/python-modules/installer/cross.patch new file mode 100644 index 0000000000000..3e7f185f041d3 --- /dev/null +++ b/pkgs/development/python-modules/installer/cross.patch @@ -0,0 +1,67 @@ +diff --git a/src/installer/__main__.py b/src/installer/__main__.py +index 51014b9..45682d0 100644 +--- a/src/installer/__main__.py ++++ b/src/installer/__main__.py +@@ -30,6 +30,13 @@ def _get_main_parser() -> argparse.ArgumentParser: + type=str, + help="override prefix to install packages to", + ) ++ parser.add_argument( ++ "--executable", ++ metavar="path", ++ default=sys.executable, ++ type=str, ++ help="#! executable to install scripts with (default=sys.executable)", ++ ) + parser.add_argument( + "--compile-bytecode", + action="append", +@@ -86,7 +93,7 @@ def _main(cli_args: Sequence[str], program: Optional[str] = None) -> None: + with WheelFile.open(args.wheel) as source: + destination = SchemeDictionaryDestination( + scheme_dict=_get_scheme_dict(source.distribution, prefix=args.prefix), +- interpreter=sys.executable, ++ interpreter=args.executable, + script_kind=get_launcher_kind(), + bytecode_optimization_levels=bytecode_levels, + destdir=args.destdir, +@@ -94,5 +101,6 @@ def _main(cli_args: Sequence[str], program: Optional[str] = None) -> None: + installer.install(source, destination, {}) + + ++ + if __name__ == "__main__": # pragma: no cover + _main(sys.argv[1:], "python -m installer") +diff --git a/tests/test_main.py b/tests/test_main.py +index 391a13d..d7b4192 100644 +--- a/tests/test_main.py ++++ b/tests/test_main.py +@@ -53,6 +53,28 @@ def test_main_prefix(fancy_wheel, tmp_path): + } + + ++def test_main_executable(fancy_wheel, tmp_path): ++ destdir = tmp_path / "dest" ++ ++ main( ++ [ ++ str(fancy_wheel), ++ "-d", ++ str(destdir), ++ "--executable", ++ "/monty/python3.x", ++ ], ++ "python -m installer", ++ ) ++ ++ installed_scripts = destdir.rglob("bin/*") ++ ++ for f in installed_scripts: ++ with f.open("rb") as fp: ++ shebang = fp.readline() ++ assert shebang == b"#!/monty/python3.x\n" ++ ++ + def test_main_no_pyc(fancy_wheel, tmp_path): + destdir = tmp_path / "dest" + diff --git a/pkgs/development/python-modules/installer/default.nix b/pkgs/development/python-modules/installer/default.nix index 3d2069370eb46..17ba8a94749af 100644 --- a/pkgs/development/python-modules/installer/default.nix +++ b/pkgs/development/python-modules/installer/default.nix @@ -21,11 +21,17 @@ buildPythonPackage rec { hash = "sha256-thHghU+1Alpay5r9Dc3v7ATRFfYKV8l9qR0nbGOOX/A="; }; - patches = lib.optionals (pythonAtLeast "3.13") [ - # Fix compatibility with Python 3.13 - # https://github.com/pypa/installer/pull/201 - ./python313-compat.patch - ]; + patches = + lib.optionals (pythonAtLeast "3.13") [ + # Fix compatibility with Python 3.13 + # https://github.com/pypa/installer/pull/201 + ./python313-compat.patch + ] + ++ [ + # Add -m flag to installer to correctly support cross + # https://github.com/pypa/installer/pull/258 + ./cross.patch + ]; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix index be5f60fd0287c..77f77a7e47ad1 100644 --- a/pkgs/development/python-modules/invoke/default.nix +++ b/pkgs/development/python-modules/invoke/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "invoke"; - version = "2.2.0"; + version = "2.2.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-7my7EBrxqFnH/oTyomTAWQILDLf+NTX5QkMAq1aPa9U="; + hash = "sha256-UVv0m0pIkyt5sCRZA0jaIvOcSULf+ZGtH7i4uuob5wc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index bd0bd4544c106..f92475f19fe1e 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -36,12 +36,16 @@ buildPythonPackage rec { pname = "ipython"; - version = "9.5.0"; + version = "9.7.0"; + outputs = [ + "out" + "man" + ]; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-EpxEuUH+bZuC02/Hp8GBJ92x1vAvePhn9ALi463eMRM="; + hash = "sha256-X23ojJBaVmxqnWxACo/tVKY44fdUPReq4lURMyFrHk4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/j2lint/default.nix b/pkgs/development/python-modules/j2lint/default.nix index bb777d5bb660b..b8c82e86f4712 100644 --- a/pkgs/development/python-modules/j2lint/default.nix +++ b/pkgs/development/python-modules/j2lint/default.nix @@ -32,7 +32,6 @@ buildPythonPackage rec { pytestCheckHook versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { homepage = "https://github.com/aristanetworks/j2lint"; diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 65ee7b942b3cc..658a63c8ed852 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -2,7 +2,7 @@ lib, stdenv, buildPythonPackage, - pythonOlder, + pythonAtLeast, fetchFromGitHub, # build-system @@ -21,8 +21,6 @@ buildPythonPackage rec { version = "0.19.2"; pyproject = true; - disabled = pythonOlder "3.6"; - src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi"; @@ -57,6 +55,20 @@ buildPythonPackage rec { "test_dict_completion" ]; + disabledTestPaths = lib.optionals (pythonAtLeast "3.14") [ + # Jedi.api.environment.InvalidPythonEnvironment: The python binary is potentially unsafe + "test/test_inference/test_sys_path.py::test_venv_and_pths" + "test/test_api/test_environment.py::test_create_environment_venv_path" + "test/test_api/test_environment.py::test_create_environment_executable" + # can't find system env nor venv + "test/test_api/test_environment.py::test_find_system_environments" + "test/test_api/test_environment.py::test_scanning_venvs" + # https://github.com/davidhalter/jedi/issues/2064 + "test/test_api/test_interpreter.py::test_string_annotation" + # type repr mismatch: Union[Type, int] vs Type | int + "test/test_inference/test_mixed.py::test_compiled_signature_annotation_string" + ]; + meta = { description = "Autocompletion tool for Python that can be used for text editors"; homepage = "https://github.com/davidhalter/jedi"; diff --git a/pkgs/development/python-modules/jellyfish/Cargo.lock b/pkgs/development/python-modules/jellyfish/Cargo.lock index b8e2482409238..47b4d56322d74 100644 --- a/pkgs/development/python-modules/jellyfish/Cargo.lock +++ b/pkgs/development/python-modules/jellyfish/Cargo.lock @@ -1,12 +1,12 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[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", @@ -17,46 +17,63 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" + +[[package]] +name = "cc" +version = "1.2.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35900b6c8d709fb1d854671ae27aeaa9eec2f8b01b364e1619a40da3e6fe2afe" +dependencies = [ + "find-msvc-tools", + "shlex", +] [[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 = "csv" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf" +checksum = "52cd9d68cf7efc6ddfaaee42e7288d3a99d613d4b50f76ce9827ae0c6e14f938" dependencies = [ "csv-core", "itoa", "ryu", - "serde", + "serde_core", ] [[package]] name = "csv-core" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +checksum = "704a3c26996a80471189265814dbc2c257598b96b8a7feae2d31ace646bb9782" dependencies = [ "memchr", ] +[[package]] +name = "find-msvc-tools" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" + [[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]] @@ -67,19 +84,22 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[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 = "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 = "jellyfish" -version = "1.1.2" +version = "1.2.1" dependencies = [ "ahash", "csv", @@ -92,15 +112,15 @@ dependencies = [ [[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 = "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" @@ -122,32 +142,31 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.2" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[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.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.22.6" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f402062616ab18202ae8319da13fa4279883a2b8a9d9f83f20dbade813ce1884" +checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383" dependencies = [ - "cfg-if", "indoc", "libc", "memoffset", @@ -161,19 +180,19 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.22.6" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b14b5775b5ff446dd1056212d778012cbe8a0fbffd368029fd9e25b514479c38" +checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f" dependencies = [ - "once_cell", + "python3-dll-a", "target-lexicon", ] [[package]] name = "pyo3-ffi" -version = "0.22.6" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ab5bcf04a2cdcbb50c7d6105de943f543f9ed92af55818fd17b660390fc8636" +checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105" dependencies = [ "libc", "pyo3-build-config", @@ -181,9 +200,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.22.6" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fd24d897903a9e6d80b968368a34e1525aeb719d568dba8b3d4bfa5dc67d453" +checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -193,9 +212,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.22.6" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c011a03ba1e50152b4b394b479826cad97e7a21eb52df179cd91ac411cbfbe" +checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf" dependencies = [ "heck", "proc-macro2", @@ -204,52 +223,79 @@ dependencies = [ "syn", ] +[[package]] +name = "python3-dll-a" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d381ef313ae70b4da5f95f8a4de773c6aa5cd28f73adec4b4a31df70b66780d8" +dependencies = [ + "cc", +] + [[package]] name = "quote" -version = "1.0.38" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" 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 = "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 = "serde" -version = "1.0.217" +name = "serde_core" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" +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", "syn", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "smallvec" -version = "1.13.2" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "syn" -version = "2.0.95" +version = "2.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" +checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea" dependencies = [ "proc-macro2", "quote", @@ -258,15 +304,15 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.16" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" +checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c" [[package]] name = "tinyvec" -version = "1.8.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8" +checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" dependencies = [ "tinyvec_macros", ] @@ -279,15 +325,15 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "unicode-ident" -version = "1.0.14" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "unicode-normalization" -version = "0.1.24" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8" dependencies = [ "tinyvec", ] @@ -300,9 +346,9 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unindent" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" +checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3" [[package]] name = "version_check" @@ -311,25 +357,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +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 = "wit-bindgen" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" [[package]] name = "zerocopy" -version = "0.7.35" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.35" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix index 39a96abbe2617..e442e9d87f9d0 100644 --- a/pkgs/development/python-modules/jellyfish/default.nix +++ b/pkgs/development/python-modules/jellyfish/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "jellyfish"; - version = "1.1.2"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jamesturk"; repo = "jellyfish"; - rev = version; - hash = "sha256-xInjoTXYgZuHyvyKm+N4PAwHozE5BOkxoYhRzZnPs3Q="; + rev = "v${version}"; + hash = "sha256-jKz7FYzV66TUkJZfWDTy8GXmTZ6SU5jEdtkjYLDfS/8="; }; cargoDeps = rustPlatform.importCargoLock { diff --git a/pkgs/development/python-modules/jiter/Cargo.lock b/pkgs/development/python-modules/jiter/Cargo.lock index 8d4e23c2c22be..b2a86580589f2 100644 --- a/pkgs/development/python-modules/jiter/Cargo.lock +++ b/pkgs/development/python-modules/jiter/Cargo.lock @@ -17,9 +17,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" dependencies = [ "memchr", ] @@ -74,9 +74,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.2.41" +version = "1.2.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7" +checksum = "35900b6c8d709fb1d854671ae27aeaa9eec2f8b01b364e1619a40da3e6fe2afe" dependencies = [ "find-msvc-tools", "jobserver", @@ -119,18 +119,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.50" +version = "4.5.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2cfd7bf8a6017ddaa4e32ffe7403d547790db06bd171c1c53926faab501623" +checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.50" +version = "4.5.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4c05b9e80c5ccd3a7ef080ad7b6ba7d6fc00a985b8b157197075677c82c7a0" +checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a" dependencies = [ "anstyle", "clap_lex", @@ -270,7 +270,7 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "fuzz" -version = "0.11.1" +version = "0.12.0" dependencies = [ "indexmap", "jiter", @@ -343,13 +343,13 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.16" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" +checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -369,7 +369,7 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jiter" -version = "0.11.1" +version = "0.12.0" dependencies = [ "ahash", "bitvec", @@ -387,7 +387,7 @@ dependencies = [ [[package]] name = "jiter-python" -version = "0.11.1" +version = "0.12.0" dependencies = [ "jiter", "pyo3", @@ -405,9 +405,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.81" +version = "0.3.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305" +checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65" dependencies = [ "once_cell", "wasm-bindgen", @@ -460,12 +460,6 @@ dependencies = [ "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.6" @@ -563,23 +557,24 @@ checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" [[package]] name = "proc-macro2" -version = "1.0.102" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e0f6df8eaa422d97d72edcd152e1451618fed47fabbdbd5a8864167b1d4aff7" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.26.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383" +checksum = "37a6df7eab65fc7bee654a421404947e10a0f7085b6951bf2ea395f4659fb0cf" dependencies = [ "indoc", "libc", "memoffset", "num-bigint", + "num-traits", "once_cell", "portable-atomic", "pyo3-build-config", @@ -590,9 +585,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.26.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f" +checksum = "f77d387774f6f6eec64a004eac0ed525aab7fa1966d94b42f743797b3e395afb" dependencies = [ "python3-dll-a", "target-lexicon", @@ -600,9 +595,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.26.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105" +checksum = "2dd13844a4242793e02df3e2ec093f540d948299a6a77ea9ce7afd8623f542be" dependencies = [ "libc", "pyo3-build-config", @@ -610,9 +605,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.26.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded" +checksum = "eaf8f9f1108270b90d3676b8679586385430e5c0bb78bb5f043f95499c821a71" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -622,9 +617,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.26.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf" +checksum = "70a3b2274450ba5288bc9b8c1b69ff569d1d61189d4bff38f8d22e03d17f932b" dependencies = [ "heck", "proc-macro2", @@ -644,9 +639,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.41" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" dependencies = [ "proc-macro2", ] @@ -791,9 +786,9 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "syn" -version = "2.0.108" +version = "2.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917" +checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea" dependencies = [ "proc-macro2", "quote", @@ -824,9 +819,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "unindent" @@ -872,9 +867,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.104" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d" +checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" dependencies = [ "cfg-if", "once_cell", @@ -883,25 +878,11 @@ dependencies = [ "wasm-bindgen-shared", ] -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19" -dependencies = [ - "bumpalo", - "log", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - [[package]] name = "wasm-bindgen-macro" -version = "0.2.104" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119" +checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -909,31 +890,31 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.104" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7" +checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" dependencies = [ + "bumpalo", "proc-macro2", "quote", "syn", - "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.104" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1" +checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" dependencies = [ "unicode-ident", ] [[package]] name = "web-sys" -version = "0.3.81" +version = "0.3.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120" +checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/pkgs/development/python-modules/jiter/default.nix b/pkgs/development/python-modules/jiter/default.nix index ce44681e80aa1..5ee0d5846d896 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.11.1"; + version = "0.12.0"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "jiter"; tag = "v${version}"; - hash = "sha256-/OSLwqSy/CkAFv0hn1zED70MRsWV8/NTrSfqP7OSRFc="; + hash = "sha256-d87RUXKEmZXxVQZnAvjwRKSP6F3Z+kXxg/LdY2l9B+k="; }; postPatch = '' diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 362fa5077ad9a..a849ed0b91fd6 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "joblib"; - version = "1.5.1"; + version = "1.5.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9PhuNR85/j0NMqnyw9ivHuTOwoWq/LJwA92lIFV2tEQ="; + hash = "sha256-P6pcOQVLLwPKVH2psvUv3mfAYkDDGFPzBq6pfxNke1U="; }; nativeBuildInputs = [ setuptools ]; @@ -53,11 +53,6 @@ buildPythonPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_dispatch_multiprocessing" # test_dispatch_multiprocessing is broken only on Darwin. - ] - ++ lib.optionals (pythonAtLeast "3.12") [ - # deprecation warnings with python3.12 https://github.com/joblib/joblib/issues/1478 - "test_main_thread_renamed_no_warning" - "test_background_thread_parallelism" ]; meta = { diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix index ae7d77d47edac..41f803ad4ab96 100644 --- a/pkgs/development/python-modules/jupyter-server/default.nix +++ b/pkgs/development/python-modules/jupyter-server/default.nix @@ -1,6 +1,5 @@ { lib, - pythonOlder, stdenv, buildPythonPackage, fetchPypi, @@ -35,14 +34,13 @@ buildPythonPackage rec { pname = "jupyter-server"; - version = "2.16.0"; + version = "2.17.0"; pyproject = true; - disabled = pythonOlder "3.9"; src = fetchPypi { pname = "jupyter_server"; inherit version; - hash = "sha256-ZdS0T98ty73+CqGs5KhC1Kr3RqK3sWgTTVqu01Yht/Y="; + hash = "sha256-w46omFZpZMiItHcq4e1Y7KhFkuiCUdLPxNFx+B9+mdU="; }; build-system = [ diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index b703b620eae26..cca87a91652d4 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -138,7 +138,6 @@ buildPythonPackage rec { versionCheckHook virtualenv ]; - versionCheckProgramArg = "--version"; disabledTests = [ # Tries to install older versions through pip diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 3789ffb1311b8..c886b68a480a0 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -99,7 +99,6 @@ buildPythonPackage rec { # Tests that use a Jupyter notebook require $HOME to be writable writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; preCheck = '' substituteInPlace tests/functional/contents_manager/test_async_and_sync_contents_manager_are_in_sync.py \ diff --git a/pkgs/development/python-modules/keymap-drawer/default.nix b/pkgs/development/python-modules/keymap-drawer/default.nix index fffc10aa82529..bece9396dd9f7 100644 --- a/pkgs/development/python-modules/keymap-drawer/default.nix +++ b/pkgs/development/python-modules/keymap-drawer/default.nix @@ -59,7 +59,6 @@ buildPythonPackage { pythonImportsCheck = [ "keymap_drawer" ]; versionCheckProgram = "${placeholder "out"}/bin/keymap"; - versionCheckProgramArg = "--version"; passthru.tests = callPackages ./tests { # Explicitly pass the correctly scoped package. diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 0aa328f530911..f08c690823ef5 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -19,17 +19,21 @@ buildPythonPackage rec { pname = "keyring"; - version = "25.6.0"; + version = "25.7.0"; pyproject = true; - disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "jaraco"; repo = "keyring"; tag = "v${version}"; - hash = "sha256-qu9HAlZMLlIVs8c9ClzWUljezhrt88gu1kouklMNxMY="; + hash = "sha256-v9s28vwx/5DJRa3dQyS/mdZppfvFcfBtafjBRi2c1oQ="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"coherent.licensed",' "" + ''; + build-system = [ setuptools-scm ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/kornia-rs/Cargo.lock b/pkgs/development/python-modules/kornia-rs/Cargo.lock index 66a5b60cfafcb..78401674a0005 100644 --- a/pkgs/development/python-modules/kornia-rs/Cargo.lock +++ b/pkgs/development/python-modules/kornia-rs/Cargo.lock @@ -19,9 +19,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.99" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100" +checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" [[package]] name = "arbitrary" @@ -60,9 +60,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "av1-grain" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3efb2ca85bc610acfa917b5aaa36f3fcbebed5b3182d7f877b02531c4b80c8" +checksum = "8cfddb07216410377231960af4fcab838eaa12e013417781b78bd95ee22077f8" dependencies = [ "anyhow", "arrayvec", @@ -89,18 +89,23 @@ checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" [[package]] name = "bincode" -version = "1.3.3" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +checksum = "36eaf5d7b090263e8150820482d5d93cd964a81e4019913c972f4edcc6edb740" dependencies = [ + "bincode_derive", "serde", + "unty", ] [[package]] -name = "bit_field" -version = "0.10.3" +name = "bincode_derive" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e4b40c7323adcfc0a41c4b88143ed58346ff65a288fc144329c5c45e05d70c6" +checksum = "bf95709a440f45e986983918d0e8a1f30a9b1df04918fc828670606804ac3c09" +dependencies = [ + "virtue", +] [[package]] name = "bitflags" @@ -110,9 +115,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.9.3" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34efbcccd345379ca2868b2b2c9d3782e9cc58ba87bc7d79d5b53d9c9ae6f25d" +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" [[package]] name = "bitstream-io" @@ -143,18 +148,18 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" [[package]] name = "bytemuck" -version = "1.23.2" +version = "1.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677" +checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.10.1" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f154e572231cb6ba2bd1176980827e3d5dc04cc183a75dea38109fbdd672d29" +checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" dependencies = [ "proc-macro2", "quote", @@ -175,10 +180,11 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "cc" -version = "1.2.34" +version = "1.2.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42bc4aea80032b7bf409b0bc7ccad88853858911b7713a8062fdc0623867bedc" +checksum = "35900b6c8d709fb1d854671ae27aeaa9eec2f8b01b364e1619a40da3e6fe2afe" dependencies = [ + "find-msvc-tools", "jobserver", "libc", "shlex", @@ -196,15 +202,9 @@ dependencies = [ [[package]] name = "cfg-if" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" - -[[package]] -name = "circular-buffer" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23bdce1da528cadbac4654b5632bfcd8c6c63e25b1d42cea919a95958790b51d" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "cmake" @@ -227,12 +227,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e8f1e641542c07631228b1e0dc04b69ae3c1d58ef65d5691a439711d805c698" -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - [[package]] name = "cpufeatures" version = "0.2.17" @@ -284,9 +278,9 @@ checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" [[package]] name = "crypto-common" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" dependencies = [ "generic-array", "typenum", @@ -316,15 +310,15 @@ checksum = "69dde51e8fef5e12c1d65e0929b03d66e4c0c18282bc30ed2ca050ad6f44dd82" [[package]] name = "doc-comment" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +checksum = "780955b8b195a21ab8e4ac6b60dd1dbdcec1dc6c51c0617964b08c81785e12c9" [[package]] name = "document-features" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d" +checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61" dependencies = [ "litrs", ] @@ -340,13 +334,20 @@ dependencies = [ [[package]] name = "dyn-stack" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490bd48eb68fffcfed519b4edbfd82c69cbe741d175b84f0e0cbe8c57cbe0bdd" +checksum = "1c4713e43e2886ba72b8271aa66c93d722116acf7a75555cce11dcde84388fe8" dependencies = [ "bytemuck", + "dyn-stack-macros", ] +[[package]] +name = "dyn-stack-macros" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d926b4d407d372f141f93bb444696142c29d32962ccbd3531117cf3aa0bfa9" + [[package]] name = "either" version = "1.15.0" @@ -411,26 +412,11 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" -[[package]] -name = "exr" -version = "1.73.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83197f59927b46c04a183a619b7c29df34e63e63c7869320862268c0ef687e0" -dependencies = [ - "bit_field", - "half", - "lebe", - "miniz_oxide", - "rayon-core", - "smallvec", - "zune-inflate", -] - [[package]] name = "faer" -version = "0.20.2" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2b19b8c3570ea226e507fe3dbae2aa9d7e0f16676abd35ea3adeeb9f90f7b5d" +checksum = "c23c499be0d3ad8167878497cd114ec5ff356556652c651eb5f209a1579032d2" dependencies = [ "bytemuck", "coe-rs", @@ -472,16 +458,39 @@ dependencies = [ [[package]] name = "fast_image_resize" -version = "5.2.2" +version = "5.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80af28351fb3cb22f67880126f65034892e7b414d3be3d6b0aa85d79ecf0c" +checksum = "d372ab3252d8f162d858d675a3d88a8c33ba24a6238837c50c8851911c7e89cd" dependencies = [ + "bytemuck", "cfg-if", "document-features", + "image", "num-traits", + "rayon", "thiserror 1.0.69", ] +[[package]] +name = "fax" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f05de7d48f37cd6730705cbca900770cab77a89f413d23e100ad7fad7795a0ab" +dependencies = [ + "fax_derive", +] + +[[package]] +name = "fax_derive" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "fdeflate" version = "0.3.7" @@ -491,6 +500,12 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "find-msvc-tools" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" + [[package]] name = "fixed" version = "1.29.0" @@ -506,9 +521,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.1.2" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d" +checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" dependencies = [ "crc32fast", "miniz_oxide", @@ -526,7 +541,7 @@ version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab96b703d31950f1aeddded248bc95543c9efc7ac9c4a21fda8703a83ee35451" dependencies = [ - "dyn-stack 0.13.0", + "dyn-stack 0.13.2", "gemm-c32", "gemm-c64", "gemm-common", @@ -546,7 +561,7 @@ version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6db9fd9f40421d00eea9dd0770045a5603b8d684654816637732463f4073847" dependencies = [ - "dyn-stack 0.13.0", + "dyn-stack 0.13.2", "gemm-common", "num-complex", "num-traits", @@ -561,7 +576,7 @@ version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfcad8a3d35a43758330b635d02edad980c1e143dc2f21e6fd25f9e4eada8edf" dependencies = [ - "dyn-stack 0.13.0", + "dyn-stack 0.13.2", "gemm-common", "num-complex", "num-traits", @@ -577,7 +592,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a352d4a69cbe938b9e2a9cb7a3a63b7e72f9349174a2752a558a8a563510d0f3" dependencies = [ "bytemuck", - "dyn-stack 0.13.0", + "dyn-stack 0.13.2", "half", "libm", "num-complex", @@ -597,7 +612,7 @@ version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cff95ae3259432f3c3410eaa919033cd03791d81cebd18018393dc147952e109" dependencies = [ - "dyn-stack 0.13.0", + "dyn-stack 0.13.2", "gemm-common", "gemm-f32", "half", @@ -615,7 +630,7 @@ version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc8d3d4385393304f407392f754cd2dc4b315d05063f62cf09f47b58de276864" dependencies = [ - "dyn-stack 0.13.0", + "dyn-stack 0.13.2", "gemm-common", "num-complex", "num-traits", @@ -630,7 +645,7 @@ version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35b2a4f76ce4b8b16eadc11ccf2e083252d8237c1b589558a49b0183545015bd" dependencies = [ - "dyn-stack 0.13.0", + "dyn-stack 0.13.2", "gemm-common", "num-complex", "num-traits", @@ -677,48 +692,39 @@ checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", "libc", - "wasi 0.11.1+wasi-snapshot-preview1", + "wasi", ] [[package]] name = "getrandom" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "libc", "r-efi", - "wasi 0.14.3+wasi-0.2.4", -] - -[[package]] -name = "gif" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae047235e33e2829703574b54fdec96bfbad892062d97fed2f76022287de61b" -dependencies = [ - "color_quant", - "weezl", + "wasip2", ] [[package]] name = "half" -version = "2.6.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9" +checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b" dependencies = [ "bytemuck", "cfg-if", "crunchy", "num-traits", + "zerocopy", ] [[package]] name = "hashbrown" -version = "0.15.5" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" +checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" [[package]] name = "heck" @@ -728,48 +734,29 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "image" -version = "0.25.6" +version = "0.25.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db35664ce6b9810857a38a906215e75a9c879f0696556a39f59c62829710251a" +checksum = "529feb3e6769d234375c4cf1ee2ce713682b8e76538cb13f9fc23e1400a591e7" dependencies = [ "bytemuck", "byteorder-lite", - "color_quant", - "exr", - "gif", - "image-webp", + "moxcms", "num-traits", - "png", - "qoi", "ravif", "rayon", - "rgb", - "tiff", - "zune-core", - "zune-jpeg", -] - -[[package]] -name = "image-webp" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525e9ff3e1a4be2fbea1fdf0e98686a6d98b4d8f937e1bf7402245af1909e8c3" -dependencies = [ - "byteorder-lite", - "quick-error", ] [[package]] name = "imgref" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0263a3d970d5c054ed9312c0057b4f3bde9c0b33836d3637361d4a9e6e7a408" +checksum = "e7c5cedc30da3a610cac6b4ba17597bdf7152cf974e8aab3afb3d54455e371c8" [[package]] name = "indexmap" -version = "2.11.0" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2481980430f9f78649238835720ddccc57e52df14ffce1c6f37391d61b563e9" +checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f" dependencies = [ "equivalent", "hashbrown", @@ -777,9 +764,12 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.6" +version = "2.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" +checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706" +dependencies = [ + "rustversion", +] [[package]] name = "interpolate_name" @@ -807,16 +797,10 @@ version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" dependencies = [ - "getrandom 0.3.3", + "getrandom 0.3.4", "libc", ] -[[package]] -name = "jpeg-decoder" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00810f1d8b74be64b13dbf3db89ac67740615d6c891f0e7b6179326533011a07" - [[package]] name = "jpeg-encoder" version = "0.6.1" @@ -846,57 +830,56 @@ dependencies = [ [[package]] name = "kornia-3d" -version = "0.1.9" +version = "0.1.10" dependencies = [ "bincode", "faer", "serde", - "thiserror 2.0.16", + "thiserror 2.0.17", ] [[package]] name = "kornia-icp" -version = "0.1.9" +version = "0.1.10" dependencies = [ "faer", "kiddo", "kornia-3d", "log", - "thiserror 2.0.16", + "thiserror 2.0.17", ] [[package]] name = "kornia-image" -version = "0.1.9" +version = "0.1.10" dependencies = [ "kornia-tensor", "num-traits", - "thiserror 2.0.16", + "thiserror 2.0.17", ] [[package]] name = "kornia-imgproc" -version = "0.1.9" +version = "0.1.10" dependencies = [ "fast_image_resize", "kornia-image", "kornia-tensor", "num-traits", "rayon", - "thiserror 2.0.16", + "thiserror 2.0.17", ] [[package]] name = "kornia-io" -version = "0.1.9" +version = "0.1.10" dependencies = [ - "circular-buffer", - "image", "jpeg-encoder", "kornia-image", + "kornia-tensor", "log", "png", - "thiserror 2.0.16", + "thiserror 2.0.17", "tiff", "turbojpeg", "zune-jpeg", @@ -904,7 +887,7 @@ dependencies = [ [[package]] name = "kornia-py" -version = "0.1.9" +version = "0.1.10" dependencies = [ "kornia-3d", "kornia-icp", @@ -917,10 +900,10 @@ dependencies = [ [[package]] name = "kornia-tensor" -version = "0.1.9" +version = "0.1.10" dependencies = [ "num-traits", - "thiserror 2.0.16", + "thiserror 2.0.17", ] [[package]] @@ -929,17 +912,11 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "lebe" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" - [[package]] name = "libc" -version = "0.2.175" +version = "0.2.177" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" +checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" [[package]] name = "libfuzzer-sys" @@ -959,15 +936,15 @@ checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" [[package]] name = "litrs" -version = "0.4.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5e54036fe321fd421e10d732f155734c4e4afd610dd556d9a82833ab3ee0bed" +checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092" [[package]] name = "log" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" [[package]] name = "loop9" @@ -1016,9 +993,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.5" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "memoffset" @@ -1029,12 +1006,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - [[package]] name = "miniz_oxide" version = "0.8.9" @@ -1045,6 +1016,16 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "moxcms" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fbdd3d7436f8b5e892b8b7ea114271ff0fa00bc5acae845d53b07d498616ef6" +dependencies = [ + "num-traits", + "pxfm", +] + [[package]] name = "nano-gemm" version = "0.1.3" @@ -1138,12 +1119,11 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "nom" -version = "7.1.3" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405" dependencies = [ "memchr", - "minimal-lexical", ] [[package]] @@ -1165,11 +1145,11 @@ dependencies = [ [[package]] name = "nu-ansi-term" -version = "0.50.1" +version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399" +checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.52.0", + "windows-sys", ] [[package]] @@ -1236,9 +1216,9 @@ dependencies = [ [[package]] name = "numpy" -version = "0.24.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cfbf3f0feededcaa4d289fe3079b03659e85c5b5a177f4ba6fb01ab4fb3e39" +checksum = "9b2dba356160b54f5371b550575b78130a54718b4c6e46b3f33a6da74a27e78b" dependencies = [ "libc", "ndarray", @@ -1258,9 +1238,9 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "ordered-float" -version = "5.0.0" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2c1f9f56e534ac6a9b8a4600bdf0f530fb393b5f393e7b4d03489c3cf0c3f01" +checksum = "7f4779c6901a562440c3786d08192c6fbda7c1c2060edd10006b05ee35d10f2d" dependencies = [ "num-traits", ] @@ -1273,20 +1253,19 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pest" -version = "2.8.1" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1db05f56d34358a8b1066f67cbb203ee3e7ed2ba674a6263a1d5ec6db2204323" +checksum = "989e7521a040efde50c3ab6bbadafbe15ab6dc042686926be59ac35d74607df4" dependencies = [ "memchr", - "thiserror 2.0.16", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.8.1" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb056d9e8ea77922845ec74a1c4e8fb17e7c218cc4fc11a15c5d25e189aa40bc" +checksum = "187da9a3030dbafabbbfb20cb323b976dc7b7ce91fcd84f2f74d6e31d378e2de" dependencies = [ "pest", "pest_generator", @@ -1294,9 +1273,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.8.1" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e404e638f781eb3202dc82db6760c8ae8a1eeef7fb3fa8264b2ef280504966" +checksum = "49b401d98f5757ebe97a26085998d6c0eecec4995cad6ab7fc30ffdf4b052843" dependencies = [ "pest", "pest_meta", @@ -1307,9 +1286,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.8.1" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd1101f170f5903fde0914f899bb503d9ff5271d7ba76bbb70bea63690cc0d5" +checksum = "72f27a2cfee9f9039c4d86faa5af122a0ac3851441a34865b8a043b46be0065a" dependencies = [ "pest", "sha2", @@ -1366,9 +1345,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.101" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" dependencies = [ "unicode-ident", ] @@ -1418,6 +1397,15 @@ dependencies = [ "version_check", ] +[[package]] +name = "pxfm" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3cbdf373972bf78df4d3b518d07003938e2c7d1fb5891e55f9cb6df57009d84" +dependencies = [ + "num-traits", +] + [[package]] name = "py_literal" version = "0.4.0" @@ -1433,11 +1421,10 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.24.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5203598f366b11a02b13aa20cab591229ff0a89fd121a308a5df751d5fc9219" +checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383" dependencies = [ - "cfg-if", "indoc", "libc", "memoffset", @@ -1451,19 +1438,18 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.24.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99636d423fa2ca130fa5acde3059308006d46f98caac629418e53f7ebb1e9999" +checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f" dependencies = [ - "once_cell", - "target-lexicon 0.13.2", + "target-lexicon 0.13.3", ] [[package]] name = "pyo3-ffi" -version = "0.24.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78f9cf92ba9c409279bc3305b5409d90db2d2c22392d443a87df3a1adad59e33" +checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105" dependencies = [ "libc", "pyo3-build-config", @@ -1471,9 +1457,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.24.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b999cb1a6ce21f9a6b147dcf1be9ffedf02e0043aec74dc390f3007047cecd9" +checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -1483,9 +1469,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.24.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "822ece1c7e1012745607d5cf0bcb2874769f0f7cb34c4cde03b9358eb9ef911a" +checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf" dependencies = [ "heck", "proc-macro2", @@ -1494,15 +1480,6 @@ dependencies = [ "syn", ] -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] - [[package]] name = "quick-error" version = "2.0.1" @@ -1511,9 +1488,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quote" -version = "1.0.40" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" dependencies = [ "proc-macro2", ] @@ -1616,11 +1593,11 @@ dependencies = [ [[package]] name = "raw-cpuid" -version = "11.5.0" +version = "11.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df7ab838ed27997ba19a4664507e6f82b41fe6e20be42929332156e5e85146" +checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186" dependencies = [ - "bitflags 2.9.3", + "bitflags 2.10.0", ] [[package]] @@ -1690,18 +1667,28 @@ checksum = "1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc" [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "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.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -1766,15 +1753,15 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "sorted-vec" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee66d25213bcbd4feb55704c0c8eee3f95d022c693dab42d796e1b8f23666d9a" +checksum = "19f58d7b0190c7f12df7e8be6b79767a0836059159811b869d5ab55721fe14d0" [[package]] name = "syn" -version = "2.0.106" +version = "2.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6" +checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea" dependencies = [ "proc-macro2", "quote", @@ -1787,7 +1774,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01198a2debb237c62b6826ec7081082d951f46dbb64b0e8c7649a452230d1dfc" dependencies = [ - "bitflags 2.9.3", + "bitflags 2.10.0", "byteorder", "enum-as-inner", "libc", @@ -1816,9 +1803,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "target-lexicon" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a" +checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c" [[package]] name = "thiserror" @@ -1831,11 +1818,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.16" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" dependencies = [ - "thiserror-impl 2.0.16", + "thiserror-impl 2.0.17", ] [[package]] @@ -1851,9 +1838,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.16" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", @@ -1871,13 +1858,16 @@ dependencies = [ [[package]] name = "tiff" -version = "0.9.1" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" +checksum = "af9605de7fee8d9551863fd692cce7637f548dbd9db9180fcc07ccc6d26c336f" dependencies = [ + "fax", "flate2", - "jpeg-decoder", + "half", + "quick-error", "weezl", + "zune-jpeg", ] [[package]] @@ -1997,9 +1987,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" [[package]] name = "ucd-trie" @@ -2009,9 +1999,9 @@ checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" [[package]] name = "unicode-ident" -version = "1.0.18" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "unindent" @@ -2019,6 +2009,12 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3" +[[package]] +name = "unty" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae" + [[package]] name = "v_frame" version = "0.3.9" @@ -2038,9 +2034,9 @@ checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" [[package]] name = "version-compare" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" +checksum = "03c2856837ef78f57382f06b2b8563a2f512f7185d732608fd9176cb3b8edf0e" [[package]] name = "version_check" @@ -2048,6 +2044,12 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +[[package]] +name = "virtue" +version = "0.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "051eb1abcf10076295e815102942cc58f9d5e3b4560e46e53c21e8ff6f3af7b1" + [[package]] name = "walkdir" version = "2.5.0" @@ -2065,45 +2067,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] -name = "wasi" -version = "0.14.3+wasi-0.2.4" +name = "wasip2" +version = "1.0.1+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51ae83037bdd272a9e28ce236db8c07016dd0d50c27038b3f407533c030c95" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" dependencies = [ "wit-bindgen", ] [[package]] name = "wasm-bindgen" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" dependencies = [ "cfg-if", "once_cell", "rustversion", "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" -dependencies = [ - "bumpalo", - "log", - "proc-macro2", - "quote", - "syn", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2111,39 +2100,39 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" dependencies = [ + "bumpalo", "proc-macro2", "quote", "syn", - "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" dependencies = [ "unicode-ident", ] [[package]] name = "weezl" -version = "0.1.10" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a751b3277700db47d3e574514de2eced5e54dc8a5436a3bf7a0b248b2cee16f3" +checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88" [[package]] name = "winapi-util" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0978bf7171b3d90bac376700cb56d606feb40f251a475a5d6634613564460b22" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.60.2", + "windows-sys", ] [[package]] @@ -2155,7 +2144,7 @@ dependencies = [ "windows-collections", "windows-core", "windows-future", - "windows-link", + "windows-link 0.1.3", "windows-numerics", ] @@ -2176,7 +2165,7 @@ checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" dependencies = [ "windows-implement", "windows-interface", - "windows-link", + "windows-link 0.1.3", "windows-result", "windows-strings", ] @@ -2188,15 +2177,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" dependencies = [ "windows-core", - "windows-link", + "windows-link 0.1.3", "windows-threading", ] [[package]] name = "windows-implement" -version = "0.60.0" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", @@ -2205,9 +2194,9 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.59.1" +version = "0.59.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", @@ -2220,6 +2209,12 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + [[package]] name = "windows-numerics" version = "0.2.0" @@ -2227,7 +2222,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" dependencies = [ "windows-core", - "windows-link", + "windows-link 0.1.3", ] [[package]] @@ -2236,7 +2231,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" dependencies = [ - "windows-link", + "windows-link 0.1.3", ] [[package]] @@ -2245,58 +2240,16 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" dependencies = [ - "windows-link", + "windows-link 0.1.3", ] [[package]] name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" -dependencies = [ - "windows-targets 0.53.3", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.53.3" +version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-link", - "windows_aarch64_gnullvm 0.53.0", - "windows_aarch64_msvc 0.53.0", - "windows_i686_gnu 0.53.0", - "windows_i686_gnullvm 0.53.0", - "windows_i686_msvc 0.53.0", - "windows_x86_64_gnu 0.53.0", - "windows_x86_64_gnullvm 0.53.0", - "windows_x86_64_msvc 0.53.0", + "windows-link 0.2.1", ] [[package]] @@ -2305,105 +2258,9 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6" dependencies = [ - "windows-link", + "windows-link 0.1.3", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnu" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_i686_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" - [[package]] name = "winnow" version = "0.7.13" @@ -2415,24 +2272,24 @@ dependencies = [ [[package]] name = "wit-bindgen" -version = "0.45.0" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052283831dbae3d879dc7f51f3d92703a316ca49f91540417d38591826127814" +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" [[package]] name = "zerocopy" -version = "0.8.26" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" +checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.26" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" +checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" dependencies = [ "proc-macro2", "quote", @@ -2445,20 +2302,11 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" -[[package]] -name = "zune-inflate" -version = "0.2.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" -dependencies = [ - "simd-adler32", -] - [[package]] name = "zune-jpeg" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1f7e205ce79eb2da3cd71c5f55f3589785cb7c79f6a03d1c8d1491bda5d089" +checksum = "29ce2c8a9384ad323cf564b67da86e21d3cfdff87908bc1223ed5c99bc792713" dependencies = [ "zune-core", ] diff --git a/pkgs/development/python-modules/kornia-rs/default.nix b/pkgs/development/python-modules/kornia-rs/default.nix index ae318af5a3ca2..86de2432268f1 100644 --- a/pkgs/development/python-modules/kornia-rs/default.nix +++ b/pkgs/development/python-modules/kornia-rs/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "kornia-rs"; - version = "0.1.9"; + version = "0.1.10"; pyproject = true; src = fetchFromGitHub { owner = "kornia"; repo = "kornia-rs"; tag = "v${version}"; - hash = "sha256-0Id1Iyd/xyqSqFvg/TXnlX1DgMUWuMS9KbtDXduwU+Y="; + hash = "sha256-rC5NqyQah3D4tGLefS4cSIXA3+gQ0+4RNcXOcEYxryg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index ecb9fa3e0a28e..de50526c0ae0a 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -3,14 +3,12 @@ stdenv, buildPythonPackage, fetchFromGitHub, - callPackage, cargo, hypothesmith, + isPy313, libcst, libiconv, pytestCheckHook, - python, - pythonOlder, pyyaml, pyyaml-ft, rustPlatform, @@ -58,7 +56,7 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; dependencies = [ - (if pythonOlder "3.13" then pyyaml else pyyaml-ft) + (if isPy313 then pyyaml-ft else pyyaml) ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index 22d760edd6a50..e75482ac7cee8 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -3,24 +3,20 @@ stdenv, buildPythonPackage, colorama, - exceptiongroup, fetchFromGitHub, + fetchpatch, flit-core, freezegun, pytest-mypy-plugins, pytest-xdist, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "loguru"; version = "0.7.3"; - pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "Delgan"; repo = "loguru"; @@ -28,6 +24,14 @@ buildPythonPackage rec { hash = "sha256-tccEzzs9TtFAZM9s43cskF9llc81Ng28LqedjLiE1m4="; }; + patches = [ + (fetchpatch { + # python 3.14 compat + url = "https://github.com/Delgan/loguru/commit/84023e2bd8339de95250470f422f096edcb8f7b7.patch"; + hash = "sha256-yXRSwI7Yjm1myL20EoU/jVuEdadmbMlCpP19YKn1MAU="; + }) + ]; + build-system = [ flit-core ]; nativeCheckInputs = [ @@ -36,8 +40,7 @@ buildPythonPackage rec { colorama freezegun pytest-mypy-plugins - ] - ++ lib.optional (pythonOlder "3.10") exceptiongroup; + ]; disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_multiprocessing.py" ]; diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix index 2384cf0b5e511..a9f3869d284e6 100644 --- a/pkgs/development/python-modules/lz4/default.nix +++ b/pkgs/development/python-modules/lz4/default.nix @@ -4,31 +4,26 @@ fetchFromGitHub, pkgconfig, psutil, + pytest-cov-stub, pytestCheckHook, python, - pythonOlder, setuptools, setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage { pname = "lz4"; - version = "4.4.4"; + version = "4.4.4-unstable-2025-10-21"; pyproject = true; - disabled = pythonOlder "3.5"; - - # get full repository in order to run tests src = fetchFromGitHub { owner = "python-lz4"; repo = "python-lz4"; - tag = "v${version}"; - hash = "sha256-RoM2U47T5WLepJlbJhJAeqKRP8Zf3twndqmMSViI5Z8="; + rev = "59b2d8176072bdee50d38cc68ec65c33b928a980"; + hash = "sha256-2D30n5j5r4+gcrjEXPu+WpZ4QsugCPyC1xCZuJIPcI0="; }; - postPatch = '' - sed -i '/pytest-cov/d' setup.py - ''; + env.SETUPTOOLS_SCM_PRETEND_VERSION = "4.4.4"; build-system = [ pkgconfig @@ -45,6 +40,7 @@ buildPythonPackage rec { nativeCheckInputs = [ psutil + pytest-cov-stub pytestCheckHook ]; @@ -60,7 +56,6 @@ buildPythonPackage rec { meta = { description = "LZ4 Bindings for Python"; homepage = "https://github.com/python-lz4/python-lz4"; - changelog = "https://github.com/python-lz4/python-lz4/releases/tag/${src.tag}"; license = lib.licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/manim/default.nix b/pkgs/development/python-modules/manim/default.nix index e3fe76eddce3b..3e5cdfc308b7b 100644 --- a/pkgs/development/python-modules/manim/default.nix +++ b/pkgs/development/python-modules/manim/default.nix @@ -263,7 +263,6 @@ buildPythonPackage rec { pytestCheckHook versionCheckHook ]; - versionCheckProgramArg = "--version"; # about 55 of ~600 tests failing mostly due to demand for display disabledTests = import ./failing_tests.nix; diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 24e51364669b2..9cea49c6c6466 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -81,7 +81,6 @@ buildPythonPackage rec { nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Reactive Python notebook that's reproducible, git-friendly, and deployable as scripts or apps"; diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index 259813eb918ef..23854dc060bca 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "markdown"; - version = "3.9.0"; + version = "3.10.0"; pyproject = true; src = fetchFromGitHub { owner = "Python-Markdown"; repo = "markdown"; tag = version; - hash = "sha256-wrDS7ajP031YKejD9Y83xg5bMl8ihBMSVZGov+1Y7Kg="; + hash = "sha256-GqYmlSNCJ8qLz4uJBJJAkiMwa+Q96f1S0jPuHrHwqpE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/pkgs/development/python-modules/marshmallow-polyfield/default.nix index bb2a4231dc7f2..c1b33f6e239c2 100644 --- a/pkgs/development/python-modules/marshmallow-polyfield/default.nix +++ b/pkgs/development/python-modules/marshmallow-polyfield/default.nix @@ -35,6 +35,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "marshmallow" ]; meta = { + # https://github.com/Bachmann1234/marshmallow-polyfield/issues/45 + broken = true; description = "Extension to Marshmallow to allow for polymorphic fields"; homepage = "https://github.com/Bachmann1234/marshmallow-polyfield"; license = lib.licenses.asl20; diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index 4c065eb081de0..a5aa9ee8713df 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -3,27 +3,38 @@ stdenv, buildPythonPackage, fetchFromGitHub, + pythonOlder, + + # build-system flit-core, - packaging, + + # dependencies + backports-datetime-fromisoformat, + typing-extensions, + + # tests pytestCheckHook, simplejson, }: buildPythonPackage rec { pname = "marshmallow"; - version = "3.26.1"; + version = "4.1.0"; pyproject = true; src = fetchFromGitHub { owner = "marshmallow-code"; repo = "marshmallow"; tag = version; - hash = "sha256-l5pEhv8D6jRlU24SlsGQEkXda/b7KUdP9mAqrZCbl38="; + hash = "sha256-h1wkeJbJY/0K3Vpxz+Bc2/2PDWgOMqropG0XMBzAOq8="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ packaging ]; + dependencies = lib.optionals (pythonOlder "3.11") [ + backports-datetime-fromisoformat + typing-extensions + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index f75b9ba52faf2..60db42babc152 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -101,7 +101,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Handy tool to trash your metadata"; diff --git a/pkgs/development/python-modules/mcdreforged/default.nix b/pkgs/development/python-modules/mcdreforged/default.nix index c561b1b914b32..7d3c239b1a276 100644 --- a/pkgs/development/python-modules/mcdreforged/default.nix +++ b/pkgs/development/python-modules/mcdreforged/default.nix @@ -52,8 +52,6 @@ buildPythonPackage rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; - passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/development/python-modules/mcp/default.nix b/pkgs/development/python-modules/mcp/default.nix index a1561ed3d4f08..1a0519f1e2ed8 100644 --- a/pkgs/development/python-modules/mcp/default.nix +++ b/pkgs/development/python-modules/mcp/default.nix @@ -15,6 +15,7 @@ jsonschema, pydantic, pydantic-settings, + pyjwt, python-multipart, sse-starlette, starlette, @@ -41,14 +42,14 @@ buildPythonPackage rec { pname = "mcp"; - version = "1.15.0"; + version = "1.25.0"; pyproject = true; src = fetchFromGitHub { owner = "modelcontextprotocol"; repo = "python-sdk"; tag = "v${version}"; - hash = "sha256-pvbrNkGfQaZX95JZyYXuuH2gMzWouuGXjaDxPyKW0Zw="; + hash = "sha256-fSQCvKaNMeCzguM2tcTJJlAeZQmzSJmbfEK35D8pQcs="; }; postPatch = lib.optionalString stdenv.buildPlatform.isDarwin '' @@ -79,6 +80,7 @@ buildPythonPackage rec { jsonschema pydantic pydantic-settings + pyjwt python-multipart sse-starlette starlette diff --git a/pkgs/development/python-modules/mercantile/default.nix b/pkgs/development/python-modules/mercantile/default.nix index 0c825469ed6e6..7b465d78510d4 100644 --- a/pkgs/development/python-modules/mercantile/default.nix +++ b/pkgs/development/python-modules/mercantile/default.nix @@ -40,7 +40,6 @@ buildPythonPackage rec { pytestCheckHook versionCheckHook ]; - versionCheckProgramArg = "--version"; disabledTests = [ # AssertionError CLI exists with non-zero error code diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix index 2e4f36b1dc166..08be1bf506e2e 100644 --- a/pkgs/development/python-modules/mezzanine/default.nix +++ b/pkgs/development/python-modules/mezzanine/default.nix @@ -68,6 +68,8 @@ buildPythonPackage rec { ]; meta = { + # not updated to django 5.x + broken = lib.versionAtLeast django.version "5"; description = "Content management platform built using the Django framework"; mainProgram = "mezzanine-project"; longDescription = '' diff --git a/pkgs/development/python-modules/mike/default.nix b/pkgs/development/python-modules/mike/default.nix index c334aef04cd84..eb48339a27f0c 100644 --- a/pkgs/development/python-modules/mike/default.nix +++ b/pkgs/development/python-modules/mike/default.nix @@ -46,7 +46,6 @@ buildPythonPackage rec { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/mkdocs/click-8.3.0-compat.patch b/pkgs/development/python-modules/mkdocs/click-8.3.0-compat.patch new file mode 100644 index 0000000000000..5cfabfd9ec262 --- /dev/null +++ b/pkgs/development/python-modules/mkdocs/click-8.3.0-compat.patch @@ -0,0 +1,25 @@ +diff --git a/mkdocs/__main__.py b/mkdocs/__main__.py +index c8d40969..3432ff40 100644 +--- a/mkdocs/__main__.py ++++ b/mkdocs/__main__.py +@@ -253,8 +253,8 @@ def cli(): + @cli.command(name="serve") + @click.option('-a', '--dev-addr', help=dev_addr_help, metavar='') + @click.option('-o', '--open', 'open_in_browser', help=serve_open_help, is_flag=True) +-@click.option('--no-livereload', 'livereload', flag_value=False, help=no_reload_help) +-@click.option('--livereload', 'livereload', flag_value=True, default=True, hidden=True) ++@click.option('--no-livereload', is_flag=True, help=no_reload_help) ++@click.option('--livereload', is_flag=True, hidden=True) + @click.option('--dirtyreload', 'build_type', flag_value='dirty', hidden=True) + @click.option('--dirty', 'build_type', flag_value='dirty', help=serve_dirty_help) + @click.option('-c', '--clean', 'build_type', flag_value='clean', help=serve_clean_help) +@@ -268,6 +268,9 @@ def serve_command(**kwargs): + """Run the builtin development server.""" + from mkdocs.commands import serve + ++ kwargs['livereload'] = kwargs['livereload'] or not kwargs['no_livereload'] ++ del kwargs['no_livereload'] ++ + _enable_warnings() + serve.serve(**kwargs) + diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix index b90abe5ad3b3a..8f822f09b579d 100644 --- a/pkgs/development/python-modules/mkdocs/default.nix +++ b/pkgs/development/python-modules/mkdocs/default.nix @@ -48,6 +48,11 @@ buildPythonPackage rec { hash = "sha256-JQSOgV12iYE6FubxdoJpWy9EHKFxyKoxrm/7arCn9Ak="; }; + patches = [ + # https://github.com/mkdocs/mkdocs/pull/4065 + ./click-8.3.0-compat.patch + ]; + build-system = [ hatchling # babel, setuptools required as "build hooks" diff --git a/pkgs/development/python-modules/morecantile/default.nix b/pkgs/development/python-modules/morecantile/default.nix index e9f4650acb189..c013377c3143f 100644 --- a/pkgs/development/python-modules/morecantile/default.nix +++ b/pkgs/development/python-modules/morecantile/default.nix @@ -47,7 +47,6 @@ buildPythonPackage rec { rasterio versionCheckHook ]; - versionCheckProgramArg = "--version"; disabledTests = [ # AssertionError CLI exists with non-zero error code diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 6cfaac43bcfd5..66700ea2fae81 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -59,8 +59,6 @@ buildPythonPackage rec { versionCheckHook ]; - versionCheckProgramArg = "--version"; - pythonImportsCheck = [ "mypy_boto3_builder" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix index 7e900e6b6ee7b..652c276534b76 100644 --- a/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/pkgs/development/python-modules/nest-asyncio/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, - pythonOlder, + pythonAtLeast, setuptools, setuptools-scm, }: @@ -13,8 +13,6 @@ buildPythonPackage rec { version = "1.6.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "erdewit"; repo = "nest_asyncio"; @@ -22,13 +20,17 @@ buildPythonPackage rec { hash = "sha256-5I5WItOl1QpyI4OXZgZf8GiQ7Jlo+SJbDicIbernaU4="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; nativeCheckInputs = [ pytestCheckHook ]; + disabledTestPaths = lib.optionals (pythonAtLeast "3.14") [ + "tests/nest_test.py::NestTest::test_timeout" + ]; + pythonImportsCheck = [ "nest_asyncio" ]; meta = { diff --git a/pkgs/development/python-modules/nh3/default.nix b/pkgs/development/python-modules/nh3/default.nix index 67a4295c7b2f1..1fc3c27e27a5c 100644 --- a/pkgs/development/python-modules/nh3/default.nix +++ b/pkgs/development/python-modules/nh3/default.nix @@ -9,12 +9,12 @@ }: let pname = "nh3"; - version = "0.2.21"; + version = "0.3.2"; src = fetchFromGitHub { owner = "messense"; repo = "nh3"; rev = "v${version}"; - hash = "sha256-DskjcKjdz1HmKzmA568zRCjh4UK1/LBD5cSIu7Rfwok="; + hash = "sha256-2D8ZLmVRA+SuMqeUsSXyY+0zlgqp7TSRyQuJMjmRVFk="; }; in buildPythonPackage { @@ -24,7 +24,7 @@ buildPythonPackage { cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-1Ytca/GiHidR8JOcz+DydN6N/iguLchbP8Wnrd/0NTk="; + hash = "sha256-dN6zdwMGh8stgDuGiO+T/ZZ3/3P9Wu/gUw5gHJ1pPGA="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index 70f5a96196be8..3f41e2b621b28 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -17,23 +17,25 @@ # optional-dependencies crc32c, + pyzstd, # tests msgpack, pytestCheckHook, importlib-metadata, + zstd, }: buildPythonPackage rec { pname = "numcodecs"; - version = "0.16.1"; + version = "0.16.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-xH8g1lZFRWjGtGl84CCB5ru1EvGYc4xqVvr+gCnJf7E="; + hash = "sha256-U9cFhl+q8KeSfJc683d1MgAcj7tlPeEZwehEYIYU15k="; }; build-system = [ @@ -51,6 +53,7 @@ buildPythonPackage rec { optional-dependencies = { crc32c = [ crc32c ]; msgpack = [ msgpack ]; + pyzstd = [ pyzstd ]; # zfpy = [ zfpy ]; }; @@ -61,6 +64,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook importlib-metadata + zstd ] ++ lib.concatAttrValues optional-dependencies; diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix index 7bbd7781cb837..778bcdbc6f213 100644 --- a/pkgs/development/python-modules/numpy/2.nix +++ b/pkgs/development/python-modules/numpy/2.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, python, numpy_2, pythonAtLeast, @@ -60,7 +61,7 @@ let in buildPythonPackage rec { pname = "numpy"; - version = "2.3.4"; + version = "2.3.5"; pyproject = true; disabled = pythonOlder "3.11"; @@ -70,15 +71,28 @@ buildPythonPackage rec { repo = "numpy"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-MfL7UQeSuxJIEQzY/0LIuScyBCilINt8e+zAeUNPmH0="; + hash = "sha256-CMgJmsjPLgMCWN2iJk0OzcKIlnRRcayrTAns51S4B6k="; }; - patches = lib.optionals python.hasDistutilsCxxPatch [ - # We patch cpython/distutils to fix https://bugs.python.org/issue1222585 - # Patching of numpy.distutils is needed to prevent it from undoing the - # patch to distutils. - ./numpy-distutils-C++.patch - ]; + patches = + lib.optionals python.hasDistutilsCxxPatch [ + # We patch cpython/distutils to fix https://bugs.python.org/issue1222585 + # Patching of numpy.distutils is needed to prevent it from undoing the + # patch to distutils. + ./numpy-distutils-C++.patch + ] + ++ + lib.optionals + (pythonAtLeast "3.14" && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) + [ + # don't assert RecursionError in monster dtype test + # see https://github.com/numpy/numpy/pull/30375 + (fetchpatch2 { + url = "https://github.com/numpy/numpy/commit/eeaf04662e07cc8e2041f3e25bbd3698949a0c02.patch?full_index=1"; + excludes = [ ".github/workflows/macos.yml" ]; + hash = "sha256-bLPLExlKnX18MXhbZxzCHniaAE0yTSyK9WuQyFyYHOI="; + }) + ]; postPatch = '' # remove needless reference to full Python path stored in built wheel diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix index 7adf333d2f28c..61517a7a5ab75 100644 --- a/pkgs/development/python-modules/openapi-core/default.nix +++ b/pkgs/development/python-modules/openapi-core/default.nix @@ -40,6 +40,13 @@ buildPythonPackage rec { hash = "sha256-Q7Z6bq8TztNm2QLL7g23rOGnXVfiTDjquHAhcSWYlC4="; }; + postPatch = '' + # https://github.com/python-openapi/openapi-core/issues/1009 + substituteInPlace tests/unit/extensions/test_factories.py \ + --replace-fail 'assert test_model_class.__dataclass_fields__["name"].type == str(Any)' \ + 'assert str(test_model_class.__dataclass_fields__["name"].type) == str(Any)' + ''; + build-system = [ poetry-core ]; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index 07ee8fa12d60e..ee240ced4d4d5 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -101,7 +101,6 @@ buildPythonPackage rec { ] ++ fakeredis.optional-dependencies.lua ++ optional-dependencies.optional; - versionCheckProgramArg = "--version"; disabledTests = [ # ValueError: Transform failed with error code 525: error creating static canvas/context for image server diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index 7c5216a98dabb..eeffe9bfe5df8 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.11.3"; + version = "3.11.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "ijl"; repo = "orjson"; tag = version; - hash = "sha256-oTrmDYmUHXMKxgxzBIStw7nnWXcyH9ir0ohnbX4bdjU="; + hash = "sha256-LK3Up6bAWZkou791nrA9iHlgfDLbk196iTn3CBfeyYc="; }; patches = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ @@ -49,7 +49,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-y6FmK1RR1DAswVoTlnl19CmoYXAco1dY7lpV/KTypzE="; + hash = "sha256-TdZtbb9zR0T+0eauEgRVrDKN2eyCNfEQCJziPlKPWpI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/outlines-core/Cargo.lock b/pkgs/development/python-modules/outlines-core/Cargo.lock index 20b287a1c984a..fb6bba097780a 100644 --- a/pkgs/development/python-modules/outlines-core/Cargo.lock +++ b/pkgs/development/python-modules/outlines-core/Cargo.lock @@ -2,41 +2,38 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "addr2line" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" -dependencies = [ - "gimli", -] - [[package]] name = "adler2" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "aho-corasick" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" dependencies = [ "memchr", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "autocfg" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "aws-lc-rs" -version = "1.13.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fcc8f365936c834db5514fc45aee5b1202d677e6b40e48468aaaa8183ca8c7" +checksum = "5932a7d9d28b0d2ea34c6b3779d35e3dd6f6345317c34e73438c4f1f29144151" dependencies = [ "aws-lc-sys", "zeroize", @@ -44,9 +41,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.29.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61b1d86e7705efe1be1b569bab41d4fa1e14e220b60a160f78de2db687add079" +checksum = "1826f2e4cfc2cd19ee53c42fbf68e2f81ec21108e0b7ecf6a71cf062137360fc" dependencies = [ "bindgen", "cc", @@ -55,21 +52,6 @@ dependencies = [ "fs_extra", ] -[[package]] -name = "backtrace" -version = "0.3.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" -dependencies = [ - "addr2line", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-targets 0.52.6", -] - [[package]] name = "base64" version = "0.13.1" @@ -104,44 +86,35 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.69.5" +version = "0.72.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" +checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" dependencies = [ - "bitflags 2.9.1", + "bitflags", "cexpr", "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", + "itertools 0.13.0", "log", "prettyplease", "proc-macro2", "quote", "regex", - "rustc-hash 1.1.0", + "rustc-hash", "shlex", "syn", - "which", ] [[package]] name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.9.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" [[package]] name = "bumpalo" -version = "3.17.0" +version = "3.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" +checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" [[package]] name = "byteorder" @@ -157,10 +130,11 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "cc" -version = "1.2.23" +version = "1.2.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766" +checksum = "35900b6c8d709fb1d854671ae27aeaa9eec2f8b01b364e1619a40da3e6fe2afe" dependencies = [ + "find-msvc-tools", "jobserver", "libc", "shlex", @@ -177,9 +151,9 @@ 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 = "cfg_aliases" @@ -222,9 +196,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" dependencies = [ "cfg-if", ] @@ -376,27 +350,23 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" -[[package]] -name = "errno" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18" -dependencies = [ - "libc", - "windows-sys 0.59.0", -] - [[package]] name = "esaxx-rs" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" +[[package]] +name = "find-msvc-tools" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" + [[package]] name = "flate2" -version = "1.1.1" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece" +checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" dependencies = [ "crc32fast", "miniz_oxide", @@ -410,9 +380,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" dependencies = [ "percent-encoding", ] @@ -493,41 +463,35 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] [[package]] name = "getrandom" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "js-sys", "libc", "r-efi", - "wasi 0.14.2+wasi-0.2.4", + "wasip2", "wasm-bindgen", ] -[[package]] -name = "gimli" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" - [[package]] name = "glob" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" +checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" [[package]] name = "hashbrown" -version = "0.15.3" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" +checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" [[package]] name = "heck" @@ -550,19 +514,10 @@ dependencies = [ "rustls", "serde", "serde_json", - "thiserror 2.0.12", + "thiserror 2.0.17", "ureq", ] -[[package]] -name = "home" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" -dependencies = [ - "windows-sys 0.59.0", -] - [[package]] name = "http" version = "1.3.1" @@ -605,18 +560,20 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" [[package]] name = "hyper" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" +checksum = "1744436df46f0bde35af3eda22aeaba453aada65d8f1c171cd8a5f59030bd69f" dependencies = [ + "atomic-waker", "bytes", "futures-channel", - "futures-util", + "futures-core", "http", "http-body", "httparse", "itoa", "pin-project-lite", + "pin-utils", "smallvec", "tokio", "want", @@ -624,11 +581,10 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.5" +version = "0.27.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" +checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" dependencies = [ - "futures-util", "http", "hyper", "hyper-util", @@ -637,22 +593,26 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", - "webpki-roots 0.26.11", + "webpki-roots 1.0.4", ] [[package]] name = "hyper-util" -version = "0.1.11" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2" +checksum = "52e9a2a24dc5c6821e71a7030e1e14b7b632acac55c40e9d2e082c621261bb56" dependencies = [ + "base64 0.22.1", "bytes", "futures-channel", + "futures-core", "futures-util", "http", "http-body", "hyper", + "ipnet", "libc", + "percent-encoding", "pin-project-lite", "socket2", "tokio", @@ -662,9 +622,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" +checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" dependencies = [ "displaydoc", "potential_utf", @@ -675,9 +635,9 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" +checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" dependencies = [ "displaydoc", "litemap", @@ -688,11 +648,10 @@ dependencies = [ [[package]] name = "icu_normalizer" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" +checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" dependencies = [ - "displaydoc", "icu_collections", "icu_normalizer_data", "icu_properties", @@ -703,42 +662,38 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" +checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" [[package]] name = "icu_properties" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2549ca8c7241c82f59c80ba2a6f415d931c5b58d24fb8412caa1a1f02c49139a" +checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99" dependencies = [ - "displaydoc", "icu_collections", "icu_locale_core", "icu_properties_data", "icu_provider", - "potential_utf", "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8197e866e47b68f8f7d95249e172903bec06004b18b2937f1095d40a0c57de04" +checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899" [[package]] name = "icu_provider" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" +checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" dependencies = [ "displaydoc", "icu_locale_core", - "stable_deref_trait", - "tinystr", "writeable", "yoke", "zerofrom", @@ -754,9 +709,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" dependencies = [ "idna_adapter", "smallvec", @@ -775,9 +730,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.9.0" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" +checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f" dependencies = [ "equivalent", "hashbrown", @@ -798,9 +753,12 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.6" +version = "2.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" +checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706" +dependencies = [ + "rustversion", +] [[package]] name = "ipnet" @@ -809,19 +767,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" [[package]] -name = "itertools" -version = "0.11.0" +name = "iri-string" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397" dependencies = [ - "either", + "memchr", + "serde", ] [[package]] name = "itertools" -version = "0.12.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" dependencies = [ "either", ] @@ -843,19 +802,19 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jobserver" -version = "0.1.33" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" dependencies = [ - "getrandom 0.3.3", + "getrandom 0.3.4", "libc", ] [[package]] name = "js-sys" -version = "0.3.77" +version = "0.3.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65" dependencies = [ "once_cell", "wasm-bindgen", @@ -867,55 +826,43 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "libc" -version = "0.2.172" +version = "0.2.177" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" +checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" [[package]] name = "libloading" -version = "0.8.7" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a793df0d7afeac54f95b471d3af7f0d4fb975699f972341a4b76988d49cdf0c" +checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" dependencies = [ "cfg-if", - "windows-targets 0.53.0", + "windows-link", ] [[package]] name = "libredox" -version = "0.1.3" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb" dependencies = [ - "bitflags 2.9.1", + "bitflags", "libc", ] -[[package]] -name = "linux-raw-sys" -version = "0.4.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" - [[package]] name = "litemap" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" +checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" [[package]] name = "log" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" [[package]] name = "lru-slab" @@ -925,9 +872,9 @@ checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" [[package]] name = "macro_rules_attribute" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13" +checksum = "65049d7923698040cd0b1ddcced9b0eb14dd22c5f86ae59c3740eab64a676520" dependencies = [ "macro_rules_attribute-proc_macro", "paste", @@ -935,15 +882,15 @@ dependencies = [ [[package]] name = "macro_rules_attribute-proc_macro" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" +checksum = "670fdfda89751bc4a84ac13eaa63e205cf0fd22b4c9a5fbfa085b63c1f1d3a30" [[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" @@ -954,12 +901,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -968,39 +909,41 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ "adler2", + "simd-adler32", ] [[package]] name = "mio" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" +checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.52.0", + "wasi", + "windows-sys 0.61.2", ] [[package]] name = "monostate" -version = "0.1.14" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafe1be9d0c75642e3e50fedc7ecadf1ef1cbce6eb66462153fc44245343fbee" +checksum = "3341a273f6c9d5bef1908f17b7267bbab0e95c9bf69a0d4dcf8e9e1b2c76ef67" dependencies = [ "monostate-impl", "serde", + "serde_core", ] [[package]] name = "monostate-impl" -version = "0.1.14" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c402a4092d5e204f32c9e155431046831fa712637043c58cb73bc6bc6c9663b5" +checksum = "e4db6d5580af57bf992f59068d4ea26fd518574ff48d7639b255a36f9de6e7e9" dependencies = [ "proc-macro2", "quote", @@ -1023,15 +966,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" -[[package]] -name = "object" -version = "0.36.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" -dependencies = [ - "memchr", -] - [[package]] name = "once_cell" version = "1.21.3" @@ -1040,11 +974,11 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "onig" -version = "6.4.0" +version = "6.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" +checksum = "336b9c63443aceef14bea841b899035ae3abe89b7c486aaf4c5bd8aafedac3f0" dependencies = [ - "bitflags 1.3.2", + "bitflags", "libc", "once_cell", "onig_sys", @@ -1052,9 +986,9 @@ dependencies = [ [[package]] name = "onig_sys" -version = "69.8.1" +version = "69.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" +checksum = "c7f86c6eef3d6df15f23bcfb6af487cbd2fed4e5581d58d5bf1f5f8b7f6727dc" dependencies = [ "cc", "pkg-config", @@ -1068,7 +1002,7 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "outlines-core" -version = "0.2.11" +version = "0.0.0" dependencies = [ "bincode", "hf-hub", @@ -1076,11 +1010,11 @@ dependencies = [ "pyo3", "regex", "regex-automata", - "rustc-hash 2.1.1", + "rustc-hash", "serde", "serde-pyobject", "serde_json", - "thiserror 2.0.12", + "thiserror 2.0.17", "tokenizers", ] @@ -1092,9 +1026,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "percent-encoding" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pin-project-lite" @@ -1116,15 +1050,15 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "portable-atomic" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" +checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" [[package]] name = "potential_utf" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585" +checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" dependencies = [ "zerovec", ] @@ -1140,9 +1074,9 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.32" +version = "0.2.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6" +checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", "syn", @@ -1150,18 +1084,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.95" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.23.5" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7778bffd85cf38175ac1f545509665d0b9b92a198ca7941f131f85f7a4f9a872" +checksum = "e5203598f366b11a02b13aa20cab591229ff0a89fd121a308a5df751d5fc9219" dependencies = [ "cfg-if", "indoc", @@ -1177,19 +1111,20 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.23.5" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94f6cbe86ef3bf18998d9df6e0f3fc1050a8c5efa409bf712e661a4366e010fb" +checksum = "99636d423fa2ca130fa5acde3059308006d46f98caac629418e53f7ebb1e9999" dependencies = [ "once_cell", + "python3-dll-a", "target-lexicon", ] [[package]] name = "pyo3-ffi" -version = "0.23.5" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f1b4c431c0bb1c8fb0a338709859eed0d030ff6daa34368d3b152a63dfdd8d" +checksum = "78f9cf92ba9c409279bc3305b5409d90db2d2c22392d443a87df3a1adad59e33" dependencies = [ "libc", "pyo3-build-config", @@ -1197,9 +1132,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.23.5" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc2201328f63c4710f68abdf653c89d8dbc2858b88c5d88b0ff38a75288a9da" +checksum = "0b999cb1a6ce21f9a6b147dcf1be9ffedf02e0043aec74dc390f3007047cecd9" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -1209,9 +1144,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.23.5" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fca6726ad0f3da9c9de093d6f116a93c1a38e417ed73bf138472cf4064f72028" +checksum = "822ece1c7e1012745607d5cf0bcb2874769f0f7cb34c4cde03b9358eb9ef911a" dependencies = [ "heck", "proc-macro2", @@ -1220,21 +1155,30 @@ dependencies = [ "syn", ] +[[package]] +name = "python3-dll-a" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d381ef313ae70b4da5f95f8a4de773c6aa5cd28f73adec4b4a31df70b66780d8" +dependencies = [ + "cc", +] + [[package]] name = "quinn" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8" +checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" dependencies = [ "bytes", "cfg_aliases", "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 2.1.1", + "rustc-hash", "rustls", "socket2", - "thiserror 2.0.12", + "thiserror 2.0.17", "tokio", "tracing", "web-time", @@ -1242,20 +1186,20 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.12" +version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e" +checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" dependencies = [ "bytes", - "getrandom 0.3.3", + "getrandom 0.3.4", "lru-slab", - "rand 0.9.1", + "rand 0.9.2", "ring", - "rustc-hash 2.1.1", + "rustc-hash", "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.12", + "thiserror 2.0.17", "tinyvec", "tracing", "web-time", @@ -1263,32 +1207,32 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.12" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4e529991f949c5e25755532370b8af5d114acae52326361d68d47af64aa842" +checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" dependencies = [ "cfg_aliases", "libc", "once_cell", "socket2", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] name = "quote" -version = "1.0.40" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" dependencies = [ "proc-macro2", ] [[package]] name = "r-efi" -version = "5.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" [[package]] name = "rand" @@ -1303,9 +1247,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ "rand_chacha 0.9.0", "rand_core 0.9.3", @@ -1346,14 +1290,14 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ - "getrandom 0.3.3", + "getrandom 0.3.4", ] [[package]] name = "rayon" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" dependencies = [ "either", "rayon-core", @@ -1372,9 +1316,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -1393,9 +1337,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.1" +version = "1.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" dependencies = [ "aho-corasick", "memchr", @@ -1405,9 +1349,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.9" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" dependencies = [ "aho-corasick", "memchr", @@ -1416,15 +1360,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.5" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" [[package]] name = "reqwest" -version = "0.12.15" +version = "0.12.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb" +checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f" dependencies = [ "base64 0.22.1", "bytes", @@ -1436,16 +1380,12 @@ dependencies = [ "hyper", "hyper-rustls", "hyper-util", - "ipnet", "js-sys", "log", - "mime", - "once_cell", "percent-encoding", "pin-project-lite", "quinn", "rustls", - "rustls-pemfile", "rustls-pki-types", "serde", "serde_json", @@ -1455,14 +1395,14 @@ dependencies = [ "tokio-rustls", "tokio-util", "tower", + "tower-http", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.26.11", - "windows-registry", + "webpki-roots 1.0.4", ] [[package]] @@ -1479,42 +1419,17 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - [[package]] name = "rustc-hash" version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" -[[package]] -name = "rustix" -version = "0.38.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" -dependencies = [ - "bitflags 2.9.1", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.59.0", -] - [[package]] name = "rustls" -version = "0.23.27" +version = "0.23.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321" +checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f" dependencies = [ "aws-lc-rs", "log", @@ -1526,20 +1441,11 @@ dependencies = [ "zeroize", ] -[[package]] -name = "rustls-pemfile" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" -dependencies = [ - "rustls-pki-types", -] - [[package]] name = "rustls-pki-types" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" +checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a" dependencies = [ "web-time", "zeroize", @@ -1547,9 +1453,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.3" +version = "0.103.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435" +checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52" dependencies = [ "aws-lc-rs", "ring", @@ -1559,9 +1465,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "ryu" @@ -1571,28 +1477,38 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ + "serde_core", "serde_derive", ] [[package]] name = "serde-pyobject" -version = "0.5.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bb5418e5b2eb469c0e8e6eb2c9de96aa1db5e2e04f25560de78e02bb746aa6" +checksum = "4c485853a65e1a5f2db72e818ec4c7548a39614fabdd988f5e3504071453b7d7" dependencies = [ "pyo3", "serde", ] +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -1601,15 +1517,16 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.140" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "indexmap", "itoa", "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -1630,29 +1547,32 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + [[package]] name = "slab" -version = "0.4.9" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] +checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" [[package]] name = "smallvec" -version = "1.15.0" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "socket2" -version = "0.5.9" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef" +checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.60.2", ] [[package]] @@ -1680,9 +1600,9 @@ dependencies = [ [[package]] name = "stable_deref_trait" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "strsim" @@ -1698,9 +1618,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.101" +version = "2.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" +checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea" dependencies = [ "proc-macro2", "quote", @@ -1729,9 +1649,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.16" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" +checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c" [[package]] name = "thiserror" @@ -1744,11 +1664,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.12" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" dependencies = [ - "thiserror-impl 2.0.12", + "thiserror-impl 2.0.17", ] [[package]] @@ -1764,9 +1684,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.12" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", @@ -1775,9 +1695,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" +checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" dependencies = [ "displaydoc", "zerovec", @@ -1785,9 +1705,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71" +checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" dependencies = [ "tinyvec_macros", ] @@ -1824,7 +1744,7 @@ dependencies = [ "serde", "serde_json", "spm_precompiled", - "thiserror 2.0.12", + "thiserror 2.0.17", "unicode-normalization-alignments", "unicode-segmentation", "unicode_categories", @@ -1832,24 +1752,23 @@ dependencies = [ [[package]] name = "tokio" -version = "1.45.0" +version = "1.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2513ca694ef9ede0fb23fe71a4ee4107cb102b9dc1930f6d0fd77aae068ae165" +checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" dependencies = [ - "backtrace", "bytes", "libc", "mio", "pin-project-lite", "socket2", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] name = "tokio-rustls" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" +checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" dependencies = [ "rustls", "tokio", @@ -1857,9 +1776,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.15" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df" +checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594" dependencies = [ "bytes", "futures-core", @@ -1883,6 +1802,24 @@ dependencies = [ "tower-service", ] +[[package]] +name = "tower-http" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" +dependencies = [ + "bitflags", + "bytes", + "futures-util", + "http", + "http-body", + "iri-string", + "pin-project-lite", + "tower", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" version = "0.3.3" @@ -1907,9 +1844,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.33" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" +checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" dependencies = [ "once_cell", ] @@ -1922,9 +1859,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "unicode-ident" -version = "1.0.18" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "unicode-normalization-alignments" @@ -1943,9 +1880,9 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" +checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" [[package]] name = "unicode_categories" @@ -1992,13 +1929,14 @@ dependencies = [ [[package]] name = "url" -version = "2.5.4" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" +checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" dependencies = [ "form_urlencoded", "idna", "percent-encoding", + "serde", ] [[package]] @@ -2024,50 +1962,37 @@ dependencies = [ [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] -name = "wasi" -version = "0.14.2+wasi-0.2.4" +name = "wasip2" +version = "1.0.1+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" dependencies = [ - "wit-bindgen-rt", + "wit-bindgen", ] [[package]] name = "wasm-bindgen" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" dependencies = [ "cfg-if", "once_cell", "rustversion", "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" -dependencies = [ - "bumpalo", - "log", - "proc-macro2", - "quote", - "syn", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.50" +version = "0.4.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" +checksum = "551f88106c6d5e7ccc7cd9a16f312dd3b5d36ea8b4954304657d5dfba115d4a0" dependencies = [ "cfg-if", "js-sys", @@ -2078,9 +2003,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2088,22 +2013,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" dependencies = [ + "bumpalo", "proc-macro2", "quote", "syn", - "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" dependencies = [ "unicode-ident", ] @@ -2123,9 +2048,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.77" +version = "0.3.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" +checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1" dependencies = [ "js-sys", "wasm-bindgen", @@ -2147,30 +2072,18 @@ version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" dependencies = [ - "webpki-roots 1.0.0", + "webpki-roots 1.0.4", ] [[package]] name = "webpki-roots" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2853738d1cc4f2da3a225c18ec6c3721abb31961096e9dbf5ab35fa88b19cfdb" +checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e" dependencies = [ "rustls-pki-types", ] -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - [[package]] name = "winapi" version = "0.3.9" @@ -2195,64 +2108,53 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-link" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" - -[[package]] -name = "windows-registry" -version = "0.4.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3" -dependencies = [ - "windows-result", - "windows-strings", - "windows-targets 0.53.0", -] +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] -name = "windows-result" -version = "0.3.3" +name = "windows-sys" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b895b5356fc36103d0f64dd1e94dfa7ac5633f1c9dd6e80fe9ec4adef69e09d" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-link", + "windows-targets 0.48.5", ] [[package]] -name = "windows-strings" -version = "0.3.1" +name = "windows-sys" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-link", + "windows-targets 0.52.6", ] [[package]] name = "windows-sys" -version = "0.48.0" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] name = "windows-sys" -version = "0.52.0" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.53.5", ] [[package]] name = "windows-sys" -version = "0.59.0" +version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-targets 0.52.6", + "windows-link", ] [[package]] @@ -2288,18 +2190,19 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.53.0" +version = "0.53.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" dependencies = [ - "windows_aarch64_gnullvm 0.53.0", - "windows_aarch64_msvc 0.53.0", - "windows_i686_gnu 0.53.0", - "windows_i686_gnullvm 0.53.0", - "windows_i686_msvc 0.53.0", - "windows_x86_64_gnu 0.53.0", - "windows_x86_64_gnullvm 0.53.0", - "windows_x86_64_msvc 0.53.0", + "windows-link", + "windows_aarch64_gnullvm 0.53.1", + "windows_aarch64_msvc 0.53.1", + "windows_i686_gnu 0.53.1", + "windows_i686_gnullvm 0.53.1", + "windows_i686_msvc 0.53.1", + "windows_x86_64_gnu 0.53.1", + "windows_x86_64_gnullvm 0.53.1", + "windows_x86_64_msvc 0.53.1", ] [[package]] @@ -2316,9 +2219,9 @@ checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_gnullvm" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" [[package]] name = "windows_aarch64_msvc" @@ -2334,9 +2237,9 @@ checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_aarch64_msvc" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" [[package]] name = "windows_i686_gnu" @@ -2352,9 +2255,9 @@ checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnu" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" [[package]] name = "windows_i686_gnullvm" @@ -2364,9 +2267,9 @@ checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_gnullvm" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" [[package]] name = "windows_i686_msvc" @@ -2382,9 +2285,9 @@ checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_i686_msvc" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" [[package]] name = "windows_x86_64_gnu" @@ -2400,9 +2303,9 @@ checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnu" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" [[package]] name = "windows_x86_64_gnullvm" @@ -2418,9 +2321,9 @@ checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_gnullvm" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" [[package]] name = "windows_x86_64_msvc" @@ -2436,32 +2339,28 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "windows_x86_64_msvc" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] -name = "wit-bindgen-rt" -version = "0.39.0" +name = "wit-bindgen" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" -dependencies = [ - "bitflags 2.9.1", -] +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" [[package]] name = "writeable" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" +checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" [[package]] name = "yoke" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" +checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" dependencies = [ - "serde", "stable_deref_trait", "yoke-derive", "zerofrom", @@ -2469,9 +2368,9 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" +checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", @@ -2481,18 +2380,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.25" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb" +checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.25" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef" +checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" dependencies = [ "proc-macro2", "quote", @@ -2522,15 +2421,15 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.8.1" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" [[package]] name = "zerotrie" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" +checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" dependencies = [ "displaydoc", "yoke", @@ -2539,9 +2438,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.2" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428" +checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" dependencies = [ "yoke", "zerofrom", @@ -2550,9 +2449,9 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" +checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/development/python-modules/outlines-core/default.nix b/pkgs/development/python-modules/outlines-core/default.nix index 9458754864439..24811b5bc9baa 100644 --- a/pkgs/development/python-modules/outlines-core/default.nix +++ b/pkgs/development/python-modules/outlines-core/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pname = "outlines-core"; - version = "0.2.11"; + version = "0.2.13"; pyproject = true; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "dottxt-ai"; repo = "outlines-core"; tag = version; - hash = "sha256-lLMTHFytJT2MhnzT0RlRCaSBPijA81fjxUqx4IGfVo8="; + hash = "sha256-mfw/cOLZPRcL3HWmrm/SyA0zDCPWr5F19EWIUdNu9jM="; }; cargoDeps = rustPlatform.importCargoLock { diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index fdc623ef775b8..508e9821cdd17 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -63,7 +63,7 @@ let pandas = buildPythonPackage rec { pname = "pandas"; - version = "2.3.1"; + version = "2.3.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -72,7 +72,7 @@ let owner = "pandas-dev"; repo = "pandas"; tag = "v${version}"; - hash = "sha256-xvdiWjJ5uHfrzXB7c4cYjFjZ6ue5i7qzb4tAEPJMAV0="; + hash = "sha256-jY1uM9HmJzoFk26ilbtzJnxAsQhmXS19r73JcFeFWRQ="; }; # A NOTE regarding the Numpy version relaxing: Both Numpy versions 1.x & diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index 5e6bb7b713277..655af74fc3b6f 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -88,7 +88,6 @@ buildPythonPackage rec { ++ optional-dependencies.azure ++ optional-dependencies.s3 ++ optional-dependencies.gcs; - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "papermill" ]; diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix index b7248d9a1b413..f38a202970609 100644 --- a/pkgs/development/python-modules/parso/default.nix +++ b/pkgs/development/python-modules/parso/default.nix @@ -1,34 +1,31 @@ { lib, buildPythonPackage, - fetchPypi, - pythonAtLeast, - pythonOlder, + fetchFromGitHub, + setuptools, pytestCheckHook, }: buildPythonPackage rec { pname = "parso"; - version = "0.8.4"; - format = "setuptools"; - disabled = pythonOlder "3.6"; + version = "0.8.5"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-6zp7WCQPuZCZo0VXHe7MD5VA6l9N0v4UwqmdaygauS0="; + src = fetchFromGitHub { + owner = "davidhalter"; + repo = "parso"; + tag = "v${version}"; + hash = "sha256-faSXCrOkybLr0bboF/8rPV/Humq8s158A3UOpdlYi0I="; }; - nativeCheckInputs = [ pytestCheckHook ]; + build-system = [ setuptools ]; - disabledTests = lib.optionals (pythonAtLeast "3.10") [ - # python changed exception message format in 3.10, 3.10 not yet supported - "test_python_exception_matches" - ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = { description = "Python Parser"; homepage = "https://parso.readthedocs.io/en/latest/"; - changelog = "https://github.com/davidhalter/parso/blob/master/CHANGELOG.rst"; + changelog = "https://github.com/davidhalter/parso/blob/${src.tag}/CHANGELOG.rst"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/pdm-backend/default.nix b/pkgs/development/python-modules/pdm-backend/default.nix index 98c808f960b66..a30a0c5b9479b 100644 --- a/pkgs/development/python-modules/pdm-backend/default.nix +++ b/pkgs/development/python-modules/pdm-backend/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pdm-backend"; - version = "2.4.5"; + version = "2.4.6"; pyproject = true; src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm-backend"; tag = version; - hash = "sha256-tXgojVE/Bh2OVeMG/P5aCK5HEeUhiypUjTrS4yOwvZU="; + hash = "sha256-lR3ZxwPvyv/Ffez6cfz8Gzc6h4PeqmgsTGNEVv9K+tU="; }; env.PDM_BUILD_SCM_VERSION = version; diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix index b2839e36177e4..b6472c24528d6 100644 --- a/pkgs/development/python-modules/pendulum/default.nix +++ b/pkgs/development/python-modules/pendulum/default.nix @@ -27,21 +27,21 @@ buildPythonPackage rec { pname = "pendulum"; - version = "3.1.0"; + version = "3.1.0-unstable-2025-10-28"; pyproject = true; src = fetchFromGitHub { owner = "sdispater"; repo = "pendulum"; - tag = version; - hash = "sha256-ZjQaN5vT1+3UxwLNNsUmU4gSs6reUl90VSEumS0sEGY="; + rev = "2982f25feaad2e58ad1530d3b53cc30fc1c82bd6"; + hash = "sha256-1ULvlWLZx3z5eGmWJfrN46x0ohJ+mAxipm6l6rykGPY="; }; cargoRoot = "rust"; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; sourceRoot = "${src.name}/rust"; - hash = "sha256-F5bCuvI8DcyeUTS7UyYBixCjuGFKGOXPw8HLVlYKuxA="; + hash = "sha256-Ozg+TW/woJsqmbmyDsgdMua3Lmnn+KBvBhd9kVik3XY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/periodiq/default.nix b/pkgs/development/python-modules/periodiq/default.nix index 39ce3b00fca8b..67af1c29893ca 100644 --- a/pkgs/development/python-modules/periodiq/default.nix +++ b/pkgs/development/python-modules/periodiq/default.nix @@ -45,7 +45,6 @@ buildPythonPackage rec { pytest-mock versionCheckHook ]; - versionCheckProgramArg = "--version"; enabledTestPaths = [ "tests/unit" ]; diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index a84ad25d1aeba..0554f3ed8d683 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -4,8 +4,7 @@ buildPythonPackage, build, click, - fetchPypi, - fetchpatch, + fetchFromGitHub, pep517, pip, pytest-xdist, @@ -20,33 +19,22 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "7.4.1"; + version = "7.5.1-unstable-2025-11-08"; pyproject = true; - disabled = pythonOlder "3.8"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-hkgm9Qc4ZEUOJNvuuFzjkgzfsJhIo9aev1N7Uh8UvMk="; + src = fetchFromGitHub { + owner = "jazzband"; + repo = "pip-tools"; + rev = "785ed5e30f4c86c24141898553a356402b142adf"; + hash = "sha256-2mYUjLqrpN/sjR79t/ZIfpvVXAgpk/tpZWFcT/6e7uk="; }; patches = [ ./fix-setup-py-bad-syntax-detection.patch - - # Backport click 8.2 + 8.3 compatibility from 7.5.1 - # We can't update to 7.5.1 because of https://github.com/jazzband/pip-tools/issues/2231, - # which breaks home-assisstant-chip-wheels. - (fetchpatch { - url = "https://github.com/jazzband/pip-tools/commit/c7f128e7c533033c2436b52c972eee521fe3890c.diff"; - excludes = [ "pyproject.toml" ]; - hash = "sha256-cIFAE/VKyyDWVQktPtPPuxY85DtTvH6pK539WD2cDn4="; - }) - (fetchpatch { - url = "https://github.com/jazzband/pip-tools/commit/816ee196c543be53ddba0ea33fb4c7e84217b3b3.diff"; - hash = "sha256-3GTUNWoy/AmpWv7NUCWIZ+coxb1vUgg6CZhwh6FehZo="; - }) ]; + env.SETUPTOOLS_SCM_PRETEND_VERSION = "7.5.1"; + build-system = [ setuptools-scm ]; dependencies = [ @@ -80,6 +68,7 @@ buildPythonPackage rec { "test_bad_setup_file" # Assertion error "test_compile_recursive_extras" + "test_compile_build_targets_setuptools_no_wheel_dep" "test_combine_different_extras_of_the_same_package" "test_diff_should_not_uninstall" "test_cli_compile_all_extras_with_multiple_packages" diff --git a/pkgs/development/python-modules/propcache/default.nix b/pkgs/development/python-modules/propcache/default.nix index b07c062c96fb4..6402596f8333f 100644 --- a/pkgs/development/python-modules/propcache/default.nix +++ b/pkgs/development/python-modules/propcache/default.nix @@ -10,11 +10,12 @@ pytestCheckHook, pythonOlder, setuptools, + tomli, }: buildPythonPackage rec { pname = "propcache"; - version = "0.3.2"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,18 +24,21 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "propcache"; tag = "v${version}"; - hash = "sha256-G8SLIZaJUu3uwyFicrQF+PjKp3vsUh/pNUsmDpnnAAg="; + hash = "sha256-7HQUOggbFC7kWcXqatLeCTNJqo0fW9FRCy8UkYL6wvM="; }; postPatch = '' substituteInPlace packaging/pep517_backend/_backend.py \ - --replace "Cython ~= 3.0.12" Cython + --replace "Cython ~=" "Cython >=" ''; build-system = [ cython expandvars setuptools + ] + ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/protobuf/6.nix b/pkgs/development/python-modules/protobuf/6.nix index bba5b5da6dacb..16e959977440a 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.33.1"; + version = "6.33.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-l/ZXV+jQmHDeb9lzrt25L4VDVgcjXSCy3+2TQF0AyFs="; + hash = "sha256-Vtw3DJH7uKyFvBNYLJ43NWlmiikKouZqWQwqDTXdueQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index dac2afcd346fc..d1d2f609d6524 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "psutil"; - version = "7.1.2"; + version = "7.1.3"; pyproject = true; inherit stdenv; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "giampaolo"; repo = "psutil"; tag = "release-${version}"; - hash = "sha256-LyGnLrq+SzCQmz8/P5DOugoNEyuH0IC7uIp8UAPwH0U="; + hash = "sha256-vMGUoiPr+QIe1N+I++d/DM9i2jeHTI68npGoJ2vKF10="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyannote-metrics/default.nix b/pkgs/development/python-modules/pyannote-metrics/default.nix index 717811aa2a107..1a62250667d8d 100644 --- a/pkgs/development/python-modules/pyannote-metrics/default.nix +++ b/pkgs/development/python-modules/pyannote-metrics/default.nix @@ -65,7 +65,6 @@ buildPythonPackage rec { pytestCheckHook versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Toolkit for reproducible evaluation, diagnostic, and error analysis of speaker diarization systems"; diff --git a/pkgs/development/python-modules/pyannote-pipeline/default.nix b/pkgs/development/python-modules/pyannote-pipeline/default.nix index ecd4c17af84eb..8b53f3f9e1504 100644 --- a/pkgs/development/python-modules/pyannote-pipeline/default.nix +++ b/pkgs/development/python-modules/pyannote-pipeline/default.nix @@ -63,7 +63,6 @@ buildPythonPackage rec { pytestCheckHook versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Tunable pipelines"; diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index da0a64a1498fb..95d6683bc2b9a 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -97,55 +97,67 @@ buildPythonPackage rec { find "$PWD/pyarrow/src/arrow" -type f -name '*.h' -exec cp {} "$pyarrow_include/arrow/python" \; ''; - pytestFlagsArray = [ - # A couple of tests are missing fixture imports, luckily pytest offers a - # clean solution. - "--fixtures pyarrow/tests/conftest.py" - # Deselect a single test because pyarrow prints a 2-line error message where - # only a single line is expected. The additional line of output comes from - # the glog library which is an optional dependency of arrow-cpp that is - # enabled in nixpkgs. - # Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11393 - "--deselect=pyarrow/tests/test_memory.py::test_env_var" - # these tests require access to s3 via the internet - "--deselect=pyarrow/tests/test_fs.py::test_resolve_s3_region" - "--deselect=pyarrow/tests/test_fs.py::test_s3_real_aws" - "--deselect=pyarrow/tests/test_fs.py::test_s3_real_aws_region_selection" - "--deselect=pyarrow/tests/test_fs.py::test_s3_options" + disabledTestPaths = [ + # These tests require access to s3 via the internet. + "pyarrow/tests/test_fs.py::test_resolve_s3_region" + "pyarrow/tests/test_fs.py::test_s3_finalize" + "pyarrow/tests/test_fs.py::test_s3_finalize_region_resolver" + "pyarrow/tests/test_fs.py::test_s3_real_aws" + "pyarrow/tests/test_fs.py::test_s3_real_aws_region_selection" + "pyarrow/tests/test_fs.py::test_s3_options" # Flaky test - "--deselect=pyarrow/tests/test_flight.py::test_roundtrip_errors" - "--deselect=pyarrow/tests/test_pandas.py::test_threaded_pandas_import" - # Flaky test, works locally but not on Hydra - "--deselect=pyarrow/tests/test_csv.py::TestThreadedCSVTableRead::test_cancellation" - # expects arrow-cpp headers to be bundled - "--deselect=pyarrow/tests/test_cpp_internals.py::test_pyarrow_include" + "pyarrow/tests/test_flight.py::test_roundtrip_errors" + "pyarrow/tests/test_pandas.py::test_threaded_pandas_import" + # Flaky test, works locally but not on Hydra. + "pyarrow/tests/test_csv.py::TestThreadedCSVTableRead::test_cancellation" + # expects arrow-cpp headers to be bundled. + "pyarrow/tests/test_cpp_internals.py::test_pyarrow_include" + # Searches for TZDATA in /usr. + "pyarrow/tests/test_orc.py::test_example_using_json" + # AssertionError: assert 'Europe/Monaco' == 'Europe/Paris' + "pyarrow/tests/test_types.py::test_dateutil_tzinfo_to_string" + # These fail with xxx_fixture not found. + # xxx = unary_func, unary_agg_func, varargs_agg_func + "pyarrow/tests/test_substrait.py::test_udf_via_substrait" + "pyarrow/tests/test_substrait.py::test_scalar_aggregate_udf_basic" + "pyarrow/tests/test_substrait.py::test_hash_aggregate_udf_basic" + "pyarrow/tests/test_udf.py::test_hash_agg_basic" + "pyarrow/tests/test_udf.py::test_hash_agg_empty" + "pyarrow/tests/test_udf.py::test_input_lifetime" + "pyarrow/tests/test_udf.py::test_scalar_agg_basic" + "pyarrow/tests/test_udf.py::test_scalar_agg_empty" + "pyarrow/tests/test_udf.py::test_scalar_agg_varargs" + "pyarrow/tests/test_udf.py::test_scalar_input" + "pyarrow/tests/test_udf.py::test_scalar_udf_context" + "pyarrow/tests/test_udf.py::test_udf_array_unary" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Requires loopback networking - "--deselect=pyarrow/tests/test_ipc.py::test_socket_" - "--deselect=pyarrow/tests/test_flight.py::test_never_sends_data" - "--deselect=pyarrow/tests/test_flight.py::test_large_descriptor" - "--deselect=pyarrow/tests/test_flight.py::test_large_metadata_client" - "--deselect=pyarrow/tests/test_flight.py::test_none_action_side_effect" - # fails to compile - "--deselect=pyarrow/tests/test_cython.py::test_cython_api" + # Requires loopback networking. + "pyarrow/tests/test_ipc.py::test_socket_" + "pyarrow/tests/test_flight.py::test_never_sends_data" + "pyarrow/tests/test_flight.py::test_large_descriptor" + "pyarrow/tests/test_flight.py::test_large_metadata_client" + "pyarrow/tests/test_flight.py::test_none_action_side_effect" + # Fails to compile. + "pyarrow/tests/test_cython.py::test_cython_api" ] ++ lib.optionals (pythonAtLeast "3.11") [ # Repr output is printing number instead of enum name so these tests fail - "--deselect=pyarrow/tests/test_fs.py::test_get_file_info" + "pyarrow/tests/test_fs.py::test_get_file_info" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - # this test requires local networking - "--deselect=pyarrow/tests/test_fs.py::test_filesystem_from_uri_gcs" + # This test requires local networking. + "pyarrow/tests/test_fs.py::test_filesystem_from_uri_gcs" ]; disabledTests = [ "GcsFileSystem" ]; preCheck = '' + export PARQUET_TEST_DATA="${arrow-cpp.PARQUET_TEST_DATA}" shopt -s extglob rm -r pyarrow/!(conftest.py|tests) mv pyarrow/conftest.py pyarrow/tests/parent_conftest.py - substituteInPlace pyarrow/tests/conftest.py --replace ..conftest .parent_conftest + substituteInPlace pyarrow/tests/conftest.py --replace-fail ..conftest .parent_conftest '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # OSError: [Errno 24] Too many open files diff --git a/pkgs/development/python-modules/pydantic-core/default.nix b/pkgs/development/python-modules/pydantic-core/default.nix index 27d6186d5e4d5..c59679649a88b 100644 --- a/pkgs/development/python-modules/pydantic-core/default.nix +++ b/pkgs/development/python-modules/pydantic-core/default.nix @@ -1,84 +1,74 @@ { - stdenv, lib, buildPythonPackage, fetchFromGitHub, cargo, rustPlatform, rustc, - libiconv, typing-extensions, pytestCheckHook, hypothesis, + inline-snapshot, + pytest-benchmark, + pytest-run-parallel, pytest-timeout, pytest-mock, dirty-equals, pydantic, + typing-inspection, }: let pydantic-core = buildPythonPackage rec { pname = "pydantic-core"; - version = "2.33.2"; + version = "2.41.5"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-core"; tag = "v${version}"; - hash = "sha256-2jUkd/Y92Iuq/A31cevqjZK4bCOp+AEC/MAnHSt2HLY="; + hash = "sha256-oIYHLSep8tWOXEaUybXG8Gv9WBoPGQ1Aj7QyqYksvMw="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-MY6Gxoz5Q7nCptR+zvdABh2agfbpqOtfTtor4pmkb9c="; + hash = "sha256-Kvc0a34C6oGc9oS/iaPaazoVUWn5ABUgrmPa/YocV+Y="; }; nativeBuildInputs = [ cargo rustPlatform.cargoSetupHook - rustc - ]; - - build-system = [ rustPlatform.maturinBuildHook - typing-extensions + rustc ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - dependencies = [ typing-extensions ]; pythonImportsCheck = [ "pydantic_core" ]; - # escape infinite recursion with pydantic via dirty-equals + # escape infinite recursion with pydantic via inline-snapshot doCheck = false; - passthru.tests.pytest = pydantic-core.overrideAttrs { doCheck = true; }; + passthru.tests.pytest = pydantic-core.overridePythonAttrs { doCheck = true; }; nativeCheckInputs = [ pytestCheckHook hypothesis + inline-snapshot pytest-timeout dirty-equals + pytest-benchmark pytest-mock - ]; - - disabledTests = [ - # RecursionError: maximum recursion depth exceeded while calling a Python object - "test_recursive" - ]; - - disabledTestPaths = [ - # no point in benchmarking in nixpkgs build farm - "tests/benchmarks" + pytest-run-parallel + typing-inspection ]; meta = { - changelog = "https://github.com/pydantic/pydantic-core/releases/tag/v${version}"; + changelog = "https://github.com/pydantic/pydantic-core/releases/tag/${src.tag}"; description = "Core validation logic for pydantic written in rust"; homepage = "https://github.com/pydantic/pydantic-core"; license = lib.licenses.mit; - maintainers = pydantic.meta.maintainers; + inherit (pydantic.meta) maintainers; }; }; in diff --git a/pkgs/development/python-modules/pydantic-extra-types/default.nix b/pkgs/development/python-modules/pydantic-extra-types/default.nix index bd3f62e8f9284..62cbec9652096 100644 --- a/pkgs/development/python-modules/pydantic-extra-types/default.nix +++ b/pkgs/development/python-modules/pydantic-extra-types/default.nix @@ -6,6 +6,7 @@ hatchling, pydantic, typing-extensions, + cron-converter, semver, pendulum, phonenumbers, @@ -13,19 +14,20 @@ pymongo, python-ulid, pytz, + tzdata, pytestCheckHook, }: buildPythonPackage rec { pname = "pydantic-extra-types"; - version = "2.10.5"; + version = "2.10.6"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-extra-types"; tag = "v${version}"; - hash = "sha256-05yGIAgN/sW+Nj7F720ZAHeMz/AyvwHMfzp4OdLREe4="; + hash = "sha256-g2a7tfldt39RCZxd9ta/JTPYnfZTTsLE6kA2fuo3fFg="; }; build-system = [ hatchling ]; @@ -37,6 +39,7 @@ buildPythonPackage rec { optional-dependencies = { all = [ + cron-converter pendulum phonenumbers pycountry @@ -44,7 +47,9 @@ buildPythonPackage rec { python-ulid pytz semver + tzdata ]; + cron = [ cron-converter ]; phonenumbers = [ phonenumbers ]; pycountry = [ pycountry ]; semver = [ semver ]; @@ -52,6 +57,15 @@ buildPythonPackage rec { pendulum = [ pendulum ]; }; + pytestFlags = [ + "-Wignore::DeprecationWarning" + ]; + + disabledTests = [ + # https://github.com/pydantic/pydantic-extra-types/issues/346 + "test_json_schema" + ]; + pythonImportsCheck = [ "pydantic_extra_types" ]; nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.all; diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index 6cb1b950e9231..2047ef5c4388e 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -1,8 +1,9 @@ { lib, + python, buildPythonPackage, fetchFromGitHub, - pythonOlder, + fetchpatch, # build-system hatchling, @@ -20,27 +21,30 @@ dirty-equals, jsonschema, pytestCheckHook, - pytest-codspeed, pytest-mock, pytest-run-parallel, - eval-type-backport, - rich, }: buildPythonPackage rec { pname = "pydantic"; - version = "2.11.7"; + version = "2.12.4"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic"; tag = "v${version}"; - hash = "sha256-5EQwbAqRExApJvVUJ1C6fsEC1/rEI6/bQEQkStqgf/Q="; + hash = "sha256-CHJahAgs+vQQzhIZjP+6suvbmRrGZI0H5UxoXg4I90o="; }; + patches = lib.optionals (lib.versionAtLeast python.version "3.14.1") [ + # Fix build with python 3.14.1 + (fetchpatch { + url = "https://github.com/pydantic/pydantic/commit/53cb5f830207dd417d20e0e55aab2e6764f0d6fc.patch"; + hash = "sha256-Y1Ob1Ei0rrw0ua+0F5L2iE2r2RdpI9DI2xuiu9pLr5Y="; + }) + ]; + postPatch = '' sed -i "/--benchmark/d" pyproject.toml ''; @@ -65,18 +69,11 @@ buildPythonPackage rec { cloudpickle dirty-equals jsonschema - pytest-codspeed pytest-mock pytest-run-parallel pytestCheckHook - rich ] - ++ lib.concatAttrValues optional-dependencies - ++ lib.optionals (pythonOlder "3.10") [ eval-type-backport ]; - - preCheck = '' - export HOME=$(mktemp -d) - ''; + ++ lib.concatAttrValues optional-dependencies; disabledTestPaths = [ "tests/benchmarks" 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 deleted file mode 100644 index 1e1f407dbc193..0000000000000 --- a/pkgs/development/python-modules/pygame-ce/0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch +++ /dev/null @@ -1,151 +0,0 @@ -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 1f132ab7fab0c..ed120e12e7613 100644 --- a/pkgs/development/python-modules/pygame-ce/default.nix +++ b/pkgs/development/python-modules/pygame-ce/default.nix @@ -62,11 +62,8 @@ buildPythonPackage rec { ); }) - # Can be removed with the next SDL3 bump. + # Can be removed after the SDL 3.4.0 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 f7ecc1ccb3305..6b488f0c880a0 100644 --- a/pkgs/development/python-modules/pygame-ce/skip-rle-tests.patch +++ b/pkgs/development/python-modules/pygame-ce/skip-rle-tests.patch @@ -2,14 +2,6 @@ diff --git a/test/surface_test.py b/test/surface_test.py index c2c91f4f5..58d916de8 100644 --- a/test/surface_test.py +++ b/test/surface_test.py -@@ -404,6 +404,7 @@ class SurfaceTypeTest(unittest.TestCase): - finally: - pygame.display.quit() - -+ @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() diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix index 701b6dc3a7fd7..bed2e9d702a38 100644 --- a/pkgs/development/python-modules/pyhamcrest/default.nix +++ b/pkgs/development/python-modules/pyhamcrest/default.nix @@ -7,15 +7,12 @@ numpy, pytest-xdist, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "pyhamcrest"; version = "2.1.0"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchFromGitHub { owner = "hamcrest"; @@ -24,12 +21,17 @@ buildPythonPackage rec { hash = "sha256-VkfHRo4k8g9/QYG4r79fXf1NXorVdpUKUgVrbV2ELMU="; }; + patches = [ + # https://github.com/hamcrest/PyHamcrest/pull/270 + ./python314-compat.patch + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace 'dynamic = ["version"]' 'version = "${version}"' ''; - nativeBuildInputs = [ + build-system = [ hatch-vcs hatchling ]; diff --git a/pkgs/development/python-modules/pyhamcrest/python314-compat.patch b/pkgs/development/python-modules/pyhamcrest/python314-compat.patch new file mode 100644 index 0000000000000..18f990723b33c --- /dev/null +++ b/pkgs/development/python-modules/pyhamcrest/python314-compat.patch @@ -0,0 +1,130 @@ +From bfe0ff68d1b1c9601a7a4bf4b6ce8aded1ea0c9e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mark=C3=A9ta=20Cal=C3=A1bkov=C3=A1?= + +Date: Wed, 24 Sep 2025 12:33:18 +0200 +Subject: [PATCH 1/2] use `asyncio.new_event_loop` in tests for compatibility + with Python 3.14 + +--- + tests/hamcrest_unit_test/core/future_test.py | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/tests/hamcrest_unit_test/core/future_test.py b/tests/hamcrest_unit_test/core/future_test.py +index 7963d9e..147286e 100644 +--- a/tests/hamcrest_unit_test/core/future_test.py ++++ b/tests/hamcrest_unit_test/core/future_test.py +@@ -40,13 +40,13 @@ async def test(): + await resolved(raise_exception()), + ) + +- asyncio.get_event_loop().run_until_complete(test()) ++ asyncio.new_event_loop().run_until_complete(test()) + + def testDoesNotMatchIfActualIsNotAFuture(self): + async def test(): + self.assert_does_not_match("Not a future", future_raising(TypeError), 23) + +- asyncio.get_event_loop().run_until_complete(test()) ++ asyncio.new_event_loop().run_until_complete(test()) + + def testDoesNotMatchIfFutureIsNotDone(self): + future = asyncio.Future() +@@ -69,7 +69,7 @@ async def test(): + expected_message, future_raising(TypeError), await resolved(raise_exception()) + ) + +- asyncio.get_event_loop().run_until_complete(test()) ++ asyncio.new_event_loop().run_until_complete(test()) + + def testMatchesIfFutureHasASubclassOfTheExpectedException(self): + async def test(): +@@ -79,7 +79,7 @@ async def test(): + await resolved(raise_exception()), + ) + +- asyncio.get_event_loop().run_until_complete(test()) ++ asyncio.new_event_loop().run_until_complete(test()) + + def testDoesNotMatchIfFutureDoesNotHaveException(self): + async def test(): +@@ -87,7 +87,7 @@ async def test(): + "No exception", future_raising(ValueError), await resolved(no_exception()) + ) + +- asyncio.get_event_loop().run_until_complete(test()) ++ asyncio.new_event_loop().run_until_complete(test()) + + def testDoesNotMatchExceptionIfRegularExpressionDoesNotMatch(self): + async def test(): +@@ -102,7 +102,7 @@ async def test(): + await resolved(raise_exception()), + ) + +- asyncio.get_event_loop().run_until_complete(test()) ++ asyncio.new_event_loop().run_until_complete(test()) + + def testMatchesRegularExpressionToStringifiedException(self): + async def test(): +@@ -118,7 +118,7 @@ async def test(): + await resolved(raise_exception(3, 1, 4)), + ) + +- asyncio.get_event_loop().run_until_complete(test()) ++ asyncio.new_event_loop().run_until_complete(test()) + + def testMachesIfExceptionMatchesAdditionalMatchers(self): + async def test(): +@@ -128,7 +128,7 @@ async def test(): + await resolved(raise_exception_with_properties(prip="prop")), + ) + +- asyncio.get_event_loop().run_until_complete(test()) ++ asyncio.new_event_loop().run_until_complete(test()) + + def testDoesNotMatchIfAdditionalMatchersDoesNotMatch(self): + async def test(): +@@ -143,7 +143,7 @@ async def test(): + await resolved(raise_exception_with_properties(prip="prop")), + ) + +- asyncio.get_event_loop().run_until_complete(test()) ++ asyncio.new_event_loop().run_until_complete(test()) + + def testDoesNotMatchIfNeitherPatternOrMatcherMatch(self): + async def test(): +@@ -162,4 +162,4 @@ async def test(): + await resolved(raise_exception_with_properties(prip="prop")), + ) + +- asyncio.get_event_loop().run_until_complete(test()) ++ asyncio.new_event_loop().run_until_complete(test()) + +From 5f5ca0424cc9315504e8445cae2076e55764859b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mark=C3=A9ta=20Cal=C3=A1bkov=C3=A1?= + +Date: Wed, 24 Sep 2025 12:58:33 +0200 +Subject: [PATCH 2/2] create loop in asyncio.Future + +--- + tests/hamcrest_unit_test/core/future_test.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/hamcrest_unit_test/core/future_test.py b/tests/hamcrest_unit_test/core/future_test.py +index 147286e..3ddde49 100644 +--- a/tests/hamcrest_unit_test/core/future_test.py ++++ b/tests/hamcrest_unit_test/core/future_test.py +@@ -49,11 +49,11 @@ async def test(): + asyncio.new_event_loop().run_until_complete(test()) + + def testDoesNotMatchIfFutureIsNotDone(self): +- future = asyncio.Future() ++ future = asyncio.Future(loop=asyncio.new_event_loop()) + self.assert_does_not_match("Unresolved future", future_raising(TypeError), future) + + def testDoesNotMatchIfFutureIsCancelled(self): +- future = asyncio.Future() ++ future = asyncio.Future(loop=asyncio.new_event_loop()) + future.cancel() + self.assert_does_not_match("Cancelled future", future_raising(TypeError), future) + + diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index 1612eec397912..be35eeaa96a1b 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -9,21 +9,18 @@ poetry-core, pylint-plugin-utils, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "pylint-django"; - version = "2.6.1"; + version = "2.6.1-unstable-2025-11-09"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint-django"; - tag = "v${version}"; - hash = "sha256-9b0Sbo6E036UmUmP/CVPrS9cxxKtkMMZtqJsI53g4sU="; + rev = "e40d785abbf26af0738c14247fb4ac0aa7265b24"; + hash = "sha256-INQSQjubcwQwspaxevXQOF92L2K9WRLMLYsP18Ffhos="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 78cfec1a22be9..698da478fcedb 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "pylint"; - version = "3.3.7"; + version = "4.0.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "pylint-dev"; repo = "pylint"; tag = "v${version}"; - hash = "sha256-EMLnwFurIhTdUJqy9/DLTuucDhlmA5fCPZZ6TA87nEU="; + hash = "sha256-DzS5ORhFWmA+eEhGDdpXdHLgWTfw198S7pQueBk44Cw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyproject-api/default.nix b/pkgs/development/python-modules/pyproject-api/default.nix index 7e2a9abcd07f6..8af34616e46e5 100644 --- a/pkgs/development/python-modules/pyproject-api/default.nix +++ b/pkgs/development/python-modules/pyproject-api/default.nix @@ -20,23 +20,18 @@ # tests pytest-mock, pytestCheckHook, - setuptools, - virtualenv, - wheel, }: buildPythonPackage rec { pname = "pyproject-api"; - version = "1.9.1"; - format = "pyproject"; - - disabled = pythonOlder "3.8"; + version = "1.10.0"; + pyproject = true; src = fetchFromGitHub { owner = "tox-dev"; repo = "pyproject-api"; tag = version; - hash = "sha256-Bf/FG5BNKbV3lfebEHFJ3cy80L1mWTYLXJfqPUzeNXc="; + hash = "sha256-fWlGGVjB43NPfBRFfOWqZUDQuqOdrFP7jsqq9xOfvaw="; }; outputs = [ @@ -44,31 +39,23 @@ buildPythonPackage rec { "doc" ]; - nativeBuildInputs = [ + build-system = [ hatchling hatch-vcs + ]; + nativeBuildInputs = [ # docs sphinxHook furo sphinx-autodoc-typehints ]; - propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + dependencies = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; nativeCheckInputs = [ pytest-mock pytestCheckHook - setuptools - virtualenv - wheel - ]; - - disabledTests = [ - # requires eol python2 interpreter - "test_can_build_on_python_2" - # different formatting for version specifier - "test_setuptools_prepare_metadata_for_build_wheel" ]; pythonImportsCheck = [ "pyproject_api" ]; diff --git a/pkgs/development/python-modules/pyscaffoldext-django/default.nix b/pkgs/development/python-modules/pyscaffoldext-django/default.nix index 41cccd86c7a18..320d62eb7302c 100644 --- a/pkgs/development/python-modules/pyscaffoldext-django/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-django/default.nix @@ -2,18 +2,14 @@ lib, buildPythonPackage, fetchPypi, + + # build-system setuptools, setuptools-scm, - wheel, + + # dependencies django, pyscaffold, - configupdater, - pre-commit, - pytest, - pytest-cov, - pytest-xdist, - tox, - virtualenv, }: buildPythonPackage rec { @@ -26,29 +22,19 @@ buildPythonPackage rec { hash = "sha256-5yzF3VK/9VlCSrRsRJWX4arr9n34G2R6O5A51jTpLhg="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm - wheel ]; - propagatedBuildInputs = [ + dependencies = [ django pyscaffold ]; - optional-dependencies = { - testing = [ - configupdater - pre-commit - pytest - pytest-cov - pytest-xdist - setuptools-scm - tox - virtualenv - ]; - }; + pythonRelaxDeps = [ "django" ]; + + doCheck = false; # tests require git checkout pythonImportsCheck = [ "pyscaffoldext.django" ]; diff --git a/pkgs/development/python-modules/pystemmer/default.nix b/pkgs/development/python-modules/pystemmer/default.nix index 64a793ae4a12b..39c0cfa07056d 100644 --- a/pkgs/development/python-modules/pystemmer/default.nix +++ b/pkgs/development/python-modules/pystemmer/default.nix @@ -40,9 +40,10 @@ buildPythonPackage rec { export PYSTEMMER_SYSTEM_LIBSTEMMER="${lib.getDev libstemmer}/include" ''; - env.NIX_CFLAGS_COMPILE = toString [ "-I${lib.getDev libstemmer}/include" ]; - - NIX_CFLAGS_LINK = [ "-L${libstemmer}/lib" ]; + env = { + NIX_CFLAGS_COMPILE = toString [ "-I${lib.getDev libstemmer}/include" ]; + NIX_CFLAGS_LINK = toString [ "-L${libstemmer}/lib" ]; + }; pythonImportsCheck = [ "Stemmer" ]; @@ -52,6 +53,8 @@ buildPythonPackage rec { runHook postCheck ''; + __structuredAttrs = true; + meta = { description = "Snowball stemming algorithms, for information retrieval"; downloadPage = "https://github.com/snowballstem/pystemmer"; diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index bd8838b0f84e8..0b060ebe243ee 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pytest-asyncio"; - version = "1.2.0"; # N.B.: when updating, tests bleak and aioesphomeapi tests + version = "1.3.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-27FCV7zgFGe/Q0fkYyh5Z05foVGhbKBRPTH4UK/tW5A="; + hash = "sha256-MWKMJkvxdvuOyxE8rNlf15j7C+MwJibnNsbfS0biKwo="; }; outputs = [ @@ -31,12 +31,13 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - dependencies = [ - backports-asyncio-runner - ] - ++ lib.optionals (pythonOlder "3.13") [ - typing-extensions - ]; + dependencies = + lib.optionals (pythonOlder "3.11") [ + backports-asyncio-runner + ] + ++ lib.optionals (pythonOlder "3.13") [ + typing-extensions + ]; postInstall = '' mkdir $testout diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix index 065649d70b487..5bddec13f2952 100644 --- a/pkgs/development/python-modules/pytest-benchmark/default.nix +++ b/pkgs/development/python-modules/pytest-benchmark/default.nix @@ -15,18 +15,19 @@ pythonAtLeast, pythonOlder, setuptools, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "pytest-benchmark"; - version = "5.1.0"; + version = "5.2.3"; pyproject = true; src = fetchFromGitHub { owner = "ionelmc"; repo = "pytest-benchmark"; tag = "v${version}"; - hash = "sha256-4fD9UfZ6jtY7Gx/PVzd1JNWeQNz+DJ2kQmCku2TgxzI="; + hash = "sha256-qjgP9H3WUYFm1xamOqhGk5YJQv94QfyJvrRoltHJHHc="; }; build-system = [ setuptools ]; @@ -55,30 +56,25 @@ buildPythonPackage rec { mercurial nbmake pytestCheckHook + writableTmpDirAsHomeHook ] ++ lib.concatAttrValues optional-dependencies; preCheck = '' export PATH="$out/bin:$PATH" - export HOME=$(mktemp -d) ''; - disabledTests = - lib.optionals (pythonOlder "3.12") [ - # AttributeError: 'PluginImportFixer' object has no attribute 'find_spec' - "test_compare_1" - "test_compare_2" - "test_regression_checks" - "test_regression_checks_inf" - "test_rendering" - ] - ++ lib.optionals (pythonAtLeast "3.13") [ - # argparse usage changes mismatches test artifact - "test_help" - ]; + disabledTests = lib.optionals (pythonOlder "3.12") [ + # AttributeError: 'PluginImportFixer' object has no attribute 'find_spec' + "test_compare_1" + "test_compare_2" + "test_regression_checks" + "test_regression_checks_inf" + "test_rendering" + ]; meta = { - changelog = "https://github.com/ionelmc/pytest-benchmark/blob/${src.rev}/CHANGELOG.rst"; + changelog = "https://github.com/ionelmc/pytest-benchmark/blob/${src.tag}/CHANGELOG.rst"; description = "Pytest fixture for benchmarking code"; homepage = "https://github.com/ionelmc/pytest-benchmark"; license = lib.licenses.bsd2; diff --git a/pkgs/development/python-modules/pytest-codspeed/default.nix b/pkgs/development/python-modules/pytest-codspeed/default.nix index 0de2195da0fc4..4b3eebde01195 100644 --- a/pkgs/development/python-modules/pytest-codspeed/default.nix +++ b/pkgs/development/python-modules/pytest-codspeed/default.nix @@ -3,9 +3,6 @@ buildPythonPackage, cffi, fetchFromGitHub, - filelock, - hatchling, - importlib-metadata, pytest-benchmark, pytest-cov-stub, pytest-xdist, @@ -44,16 +41,16 @@ buildPythonPackage rec { popd ''; - build-system = [ hatchling ]; + build-system = [ + cffi + setuptools + ]; buildInputs = [ pytest ]; dependencies = [ cffi - filelock - importlib-metadata rich - setuptools ]; optional-dependencies = { diff --git a/pkgs/development/python-modules/pytest-describe/default.nix b/pkgs/development/python-modules/pytest-describe/default.nix index 436740349ae38..a8635b38d0f28 100644 --- a/pkgs/development/python-modules/pytest-describe/default.nix +++ b/pkgs/development/python-modules/pytest-describe/default.nix @@ -4,18 +4,18 @@ fetchFromGitHub, # build-system - setuptools, + uv-build, # dependencies pytest, # tests - pytest7CheckHook, + pytestCheckHook, }: let pname = "pytest-describe"; - version = "2.2.0"; + version = "3.0.0"; in buildPythonPackage { inherit pname version; @@ -25,15 +25,14 @@ buildPythonPackage { owner = "pytest-dev"; repo = "pytest-describe"; tag = version; - hash = "sha256-ih0XkYOtB+gwUsgo1oSti2460P3gq3tR+UsyRlzMjLE="; + hash = "sha256-rMO+Hkz3iWFML8UUq4aDl+t7epzqXmYGZrgRB9OYf6w="; }; - build-system = [ setuptools ]; + build-system = [ uv-build ]; buildInputs = [ pytest ]; - # test_fixture breaks with pytest 8.4 - nativeCheckInputs = [ pytest7CheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = { description = "Describe-style plugin for the pytest framework"; diff --git a/pkgs/development/python-modules/pytest-subprocess/default.nix b/pkgs/development/python-modules/pytest-subprocess/default.nix index d3dfb50783335..7110f205387c8 100644 --- a/pkgs/development/python-modules/pytest-subprocess/default.nix +++ b/pkgs/development/python-modules/pytest-subprocess/default.nix @@ -3,6 +3,8 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + pythonAtLeast, + fetchpatch, setuptools, pytest, pytestCheckHook, @@ -28,6 +30,16 @@ buildPythonPackage rec { hash = "sha256-3vBYOk/P78NOjAbs3fT6py5QOOK3fX+AKtO4j5vxZfk="; }; + patches = lib.optionals (pythonAtLeast "3.13") [ + (fetchpatch { + # python 3.14 compat + # the patch however breaks 3.12: + # https://github.com/aklajnert/pytest-subprocess/issues/192 + url = "https://github.com/aklajnert/pytest-subprocess/commit/be30d9a94ba45afb600717e3fcd95b8b2ff2c60e.patch"; + hash = "sha256-TYk/Zu2MF+ROEKTgZI1rzA2MlW2it++xElfGZS0Dn5s="; + }) + ]; + build-system = [ setuptools ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index 55fcd3b061620..39826f6418c5e 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -60,6 +60,8 @@ buildPythonPackage rec { "test_internal_errors_propagate_to_controller" # https://github.com/pytest-dev/pytest-xdist/issues/985 "test_workqueue_ordered_by_size" + # https://github.com/pytest-dev/pytest-xdist/issues/1248 + "test_workqueue_ordered_by_input" ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index fa680ba04b924..a9f0c71dbe7ba 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -4,7 +4,6 @@ click, fetchFromGitHub, ipython, - mock, pytestCheckHook, setuptools, sh, @@ -12,32 +11,35 @@ buildPythonPackage rec { pname = "python-dotenv"; - version = "1.1.1"; + version = "1.2.1"; pyproject = true; src = fetchFromGitHub { owner = "theskumar"; repo = "python-dotenv"; tag = "v${version}"; - hash = "sha256-GeN6/pnqhm7TTP+H9bKhJat6EwEl2EPl46mNSJWwFKk="; + hash = "sha256-YOwe/MHIyGdt6JqiwXwYi1cYxyPkGsBdUhjoG2Ks0y0="; }; build-system = [ setuptools ]; - dependencies = [ click ]; + optional-dependencies.cli = [ click ]; nativeCheckInputs = [ ipython - mock pytestCheckHook sh - ]; + ] + ++ lib.concatAttrValues optional-dependencies; - disabledTests = [ "cli" ]; + preCheck = '' + export PATH="$out/bin:$PATH" + ''; pythonImportsCheck = [ "dotenv" ]; meta = { + changelog = "https://github.com/theskumar/python-dotenv/blob/${src.tag}/CHANGELOG.md"; description = "Add .env support to your django/flask apps in development and deployments"; mainProgram = "dotenv"; homepage = "https://github.com/theskumar/python-dotenv"; diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 06b1493032c8c..92e1c37b53583 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -114,7 +114,6 @@ buildPythonPackage rec { writableTmpDirAsHomeHook ] ++ optional-dependencies.all; - versionCheckProgramArg = "--version"; disabledTests = [ # avoid dependencies on many Qt things just to run one singular test diff --git a/pkgs/development/python-modules/python3-application/default.nix b/pkgs/development/python-modules/python3-application/default.nix index 3101e29049d19..212a90f2bede7 100644 --- a/pkgs/development/python-modules/python3-application/default.nix +++ b/pkgs/development/python-modules/python3-application/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, fetchFromGitHub, gitUpdater, + setuptools, zope-interface, twisted, }: @@ -22,6 +23,8 @@ buildPythonPackage rec { hash = "sha256-79Uu9zaBIuuc+1O5Y7Vp4Qg2/aOrwvmdi5G/4AvL+T4="; }; + build-system = [ setuptools ]; + dependencies = [ zope-interface twisted diff --git a/pkgs/development/python-modules/quart-trio/default.nix b/pkgs/development/python-modules/quart-trio/default.nix new file mode 100644 index 0000000000000..67170265ca708 --- /dev/null +++ b/pkgs/development/python-modules/quart-trio/default.nix @@ -0,0 +1,65 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + + # build-system + pdm-backend, + + # dependencies + exceptiongroup, + hypercorn, + quart, + trio, + + # tests + pytest-cov-stub, + pytest-trio, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "quart-trio"; + version = "0.12.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pgjones"; + repo = "quart-trio"; + tag = version; + hash = "sha256-n41XATex20iw3ZYxud/5cTdx+F6tTQQJmP91TIw2xJo="; + }; + + build-system = [ + pdm-backend + ]; + + dependencies = [ + hypercorn + quart + trio + ] + ++ hypercorn.optional-dependencies.trio + ++ lib.optionals (pythonOlder "3.11") [ + exceptiongroup + ]; + + pythonImportsCheck = [ + "quart_trio" + ]; + + nativeCheckInputs = [ + pytest-cov-stub + pytest-trio + pytestCheckHook + ]; + + meta = { + description = "Quart-Trio is an extension for Quart to support the Trio event loop"; + homepage = "https://github.com/pgjones/quart-trio"; + changelog = "https://github.com/pgjones/quart-trio/blob/${src.tag}/CHANGELOG.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 91036cf45c076..ade8f0740fa1e 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.14.1"; + version = "3.14.3"; pyproject = true; src = fetchFromGitHub { owner = "maxbachmann"; repo = "RapidFuzz"; tag = "v${version}"; - hash = "sha256-p+Z2c+PBNdjfaRjZErWwWgihzuddV14PgTHE3NVNHs8="; + hash = "sha256-DOXeZaD21Qsum4brBlMSFcBAUbNEOgCXc6AqEboP1e4="; }; patches = [ @@ -37,6 +37,11 @@ buildPythonPackage rec { }) ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "Cython >=3.1.6, <3.2.0" "Cython >=3.1.6" + ''; + build-system = [ cmake cython diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index dd0af137a3dfc..30161b345ed16 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -98,7 +98,6 @@ buildPythonPackage rec { shapely versionCheckHook ]; - versionCheckProgramArg = "--version"; preCheck = '' rm -r rasterio # prevent importing local rasterio diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix index 144f78733233c..a7eb959a5cb5e 100644 --- a/pkgs/development/python-modules/reflex/default.nix +++ b/pkgs/development/python-modules/reflex/default.nix @@ -105,7 +105,6 @@ buildPythonPackage rec { writableTmpDirAsHomeHook versionCheckHook ]; - versionCheckProgramArg = "--version"; disabledTests = [ # Tests touch network diff --git a/pkgs/development/python-modules/rembg/default.nix b/pkgs/development/python-modules/rembg/default.nix index 3bd6757f9a5cd..089f0516f1d52 100644 --- a/pkgs/development/python-modules/rembg/default.nix +++ b/pkgs/development/python-modules/rembg/default.nix @@ -84,7 +84,6 @@ buildPythonPackage rec { # not running python tests, as they require network access nativeCheckInputs = lib.optionals withCli [ versionCheckHook ]; - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "rembg" ]; diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 15ed639a7cfaf..b22e2001e8df0 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "rich"; - version = "14.1.0"; + version = "14.2.0"; pyproject = true; src = fetchFromGitHub { owner = "Textualize"; repo = "rich"; tag = "v${version}"; - hash = "sha256-44L3eVf/gI0FlOlxzJ7/+A1jN6ILkeVEelaru1Io20U="; + hash = "sha256-oQbxRbZnVr/Ln+i/hpBw5FlpUp3gcp/7xsxi6onPkn8="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 7cb580d1d6616..b0fbb26d7bb5f 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -45,7 +45,6 @@ buildPythonPackage rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/rncp"; - versionCheckProgramArg = "--version"; meta = { description = "Cryptography-based networking stack for wide-area networks"; diff --git a/pkgs/development/python-modules/rpds-py/default.nix b/pkgs/development/python-modules/rpds-py/default.nix index ce050584c31a4..6a44c859e5f72 100644 --- a/pkgs/development/python-modules/rpds-py/default.nix +++ b/pkgs/development/python-modules/rpds-py/default.nix @@ -12,18 +12,18 @@ buildPythonPackage rec { pname = "rpds-py"; - version = "0.25.0"; + version = "0.28.0"; pyproject = true; src = fetchPypi { pname = "rpds_py"; inherit version; - hash = "sha256-TZdmG/WEjdnl633tSA3sz50yzizVALiKJqy/e9KGSYU="; + hash = "sha256-q9TfIEhaCYPiyjNKIWJJthhtbjwWJ+EGZRlD29t5Guo="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-0wMmhiUjXY5DaA43l7kBKE7IX1UoEFZBJ8xnafVlU60="; + hash = "sha256-mhFAV3KTVIUG/hU524cyeLv3sELv8wMtx820kPWeftE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index 2183e41fef237..9e5e8e1e39486 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -47,7 +47,6 @@ buildPythonPackage rec { redisTestHook versionCheckHook ]; - versionCheckProgramArg = "--version"; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/ruamel-yaml-clib/default.nix b/pkgs/development/python-modules/ruamel-yaml-clib/default.nix index 924ae50182203..8602efb9ca324 100644 --- a/pkgs/development/python-modules/ruamel-yaml-clib/default.nix +++ b/pkgs/development/python-modules/ruamel-yaml-clib/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "ruamel-yaml-clib"; - version = "0.2.12"; + version = "0.2.14"; pyproject = true; src = fetchhg { url = "http://hg.code.sf.net/p/ruamel-yaml-clib/code"; rev = version; - hash = "sha256-VKiNt2WJttVjMR0z4bvdSYKOZqycRONCSPQacAy5PYo="; + hash = "sha256-fy+nzq/L3OKGujf6ExDowdxTWDnZGzVnDxL2e5t0Xcs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ruamel-yaml/default.nix b/pkgs/development/python-modules/ruamel-yaml/default.nix index 88939784ccef7..4e7cc9b1b8012 100644 --- a/pkgs/development/python-modules/ruamel-yaml/default.nix +++ b/pkgs/development/python-modules/ruamel-yaml/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "ruamel-yaml"; - version = "0.18.14"; + version = "0.18.16"; pyproject = true; src = fetchPypi { pname = "ruamel.yaml"; inherit version; - hash = "sha256-cie3aq7DZN8Vk2cw7799crMMC3mx1Xi7uOPcstgfUrc="; + hash = "sha256-puWHUS88mYsiJdaKofNREcKfrRSu1WGibnP6tynsXlo="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index 1aae2aafb6f99..b4425990e528a 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { __structuredAttrs = true; pname = "scikit-learn"; - version = "1.7.1"; + version = "1.7.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -34,16 +34,16 @@ buildPythonPackage rec { src = fetchPypi { pname = "scikit_learn"; inherit version; - hash = "sha256-JLPx6XakZlqnTuD8qsK4/Mxq53yOB6sl2jum0ykrmAI="; + hash = "sha256-IOnkns0TBZjxyjih2FCQ4aYAFHucAvpvFdactT2Wj9o="; }; postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "Cython>=3.0.10,<3.2.0" "Cython>=3.0.10" + substituteInPlace meson.build --replace-fail \ "run_command('sklearn/_build_utils/version.py', check: true).stdout().strip()," \ "'${version}'," - substituteInPlace pyproject.toml \ - --replace-fail "numpy>=2,<2.3.0" numpy \ - --replace-fail "scipy>=1.8.0,<1.16.0" scipy ''; buildInputs = [ diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 7526dc01c6ba8..c5b1f9d3a3f6c 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -106,6 +106,7 @@ buildPythonPackage { # that override globally the `numpy` attribute to point to `numpy_1`. postPatch = '' substituteInPlace pyproject.toml \ + --replace-fail "Cython>=3.0.8,<3.2.0" "Cython>=3.0.8" \ --replace-fail "numpy>=2.0.0,<2.6" numpy ''; diff --git a/pkgs/development/python-modules/scspell/default.nix b/pkgs/development/python-modules/scspell/default.nix index b2ab97e7c88e6..4d85c77e9a925 100644 --- a/pkgs/development/python-modules/scspell/default.nix +++ b/pkgs/development/python-modules/scspell/default.nix @@ -31,8 +31,6 @@ buildPythonPackage rec { writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; - pythonImportsCheck = [ "scspell" ]; meta = { diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 8e1c429a260fd..94fc196b980cf 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -67,14 +67,14 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "2.43.0"; + version = "2.44.0"; pyproject = true; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-python"; tag = version; - hash = "sha256-ua/ojnyKZXnc1li65EMmPzhmY2Pu8B7A/NXlBzzPyRQ="; + hash = "sha256-i2rd4JFcGYToWMJeOuHaCKnwKtC/LFrpnWCf1taGqhc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix index d7ff9f54ee3cc..a4f2997eac7c3 100644 --- a/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchPypi, maturin, @@ -11,8 +12,10 @@ setuptools, setuptools-rust, setuptools-scm, + replaceVars, + python, + targetPackages, }: - buildPythonPackage rec { pname = "setuptools-rust"; version = "1.12.0"; @@ -40,6 +43,23 @@ buildPythonPackage rec { doCheck = false; + # integrate the setup hook to set up the build environment for cross compilation + # this hook is automatically propagated to consumers using setuptools-rust as build-system + # + # Only include the setup hook if python.pythonOnTargetForTarget is not empty. + # python.pythonOnTargetForTarget is not always available, for example in + # pkgsLLVM.python3.pythonOnTargetForTarget. cross build with pkgsLLVM should not be affected. + setupHook = + if python.pythonOnTargetForTarget == { } then + null + else + replaceVars ./setuptools-rust-hook.sh { + pyLibDir = "${python.pythonOnTargetForTarget}/lib/${python.pythonOnTargetForTarget.libPrefix}"; + cargoBuildTarget = stdenv.targetPlatform.rust.rustcTargetSpec; + cargoLinkerVar = stdenv.targetPlatform.rust.cargoEnvVarTarget; + targetLinker = "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc"; + }; + passthru.tests = { pyo3 = maturin.tests.pyo3.override { format = "setuptools"; diff --git a/pkgs/development/interpreters/python/hooks/setuptools-rust-hook.sh b/pkgs/development/python-modules/setuptools-rust/setuptools-rust-hook.sh similarity index 100% rename from pkgs/development/interpreters/python/hooks/setuptools-rust-hook.sh rename to pkgs/development/python-modules/setuptools-rust/setuptools-rust-hook.sh diff --git a/pkgs/development/python-modules/sphinx-autoapi/default.nix b/pkgs/development/python-modules/sphinx-autoapi/default.nix index 482218520a27d..0f762f5b0b367 100644 --- a/pkgs/development/python-modules/sphinx-autoapi/default.nix +++ b/pkgs/development/python-modules/sphinx-autoapi/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "sphinx-autoapi"; - version = "3.6.0"; + version = "3.6.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "readthedocs"; repo = "sphinx-autoapi"; tag = "v${version}"; - hash = "sha256-pDfGNpDyrU4q48ZHKqfN8OrxKICfIhac2qMJDB1iE0I="; + hash = "sha256-dafrvrTl4bVBBaAhTCIPVrSA1pdNlbT5Rou3T//fmKQ="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix index c18b168e12a30..dd4a5debced65 100644 --- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix +++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix @@ -10,7 +10,7 @@ let pname = "sphinx-autodoc-typehints"; - version = "3.4.0"; + version = "3.5.2"; in buildPythonPackage { @@ -20,7 +20,7 @@ buildPythonPackage { src = fetchPypi { pname = "sphinx_autodoc_typehints"; inherit version; - hash = "sha256-oknrcmSdBbS4fUKgykIln1UEmg/xVTk0FGP1nkslasU="; + hash = "sha256-X81KPreqiUJMHi4yvtymbtw4NnVpyRaagPSz6TQXH9s="; }; pythonRelaxDeps = [ "sphinx" ]; diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 19f4810b86f47..99dc8cc3bb060 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -37,6 +37,7 @@ pytestCheckHook, pytest-xdist, typing-extensions, + writableTmpDirAsHomeHook, # reverse dependencies to test breathe, @@ -97,11 +98,19 @@ buildPythonPackage rec { pytestCheckHook pytest-xdist typing-extensions + writableTmpDirAsHomeHook ]; - preCheck = '' - export HOME=$TMPDIR - ''; + disabledTestPaths = lib.optionals isPyPy [ + # internals are asserted which are sightly different in PyPy + "tests/test_extensions/test_ext_autodoc.py" + "tests/test_extensions/test_ext_autodoc_autoclass.py" + "tests/test_extensions/test_ext_autodoc_autofunction.py" + "tests/test_extensions/test_ext_autodoc_automodule.py" + "tests/test_extensions/test_ext_autodoc_preserve_defaults.py" + "tests/test_util/test_util_inspect.py" + "tests/test_util/test_util_typing.py" + ]; disabledTests = [ # requires network access @@ -124,8 +133,6 @@ buildPythonPackage rec { "test_document_toc_only" # Assertion error "test_gettext_literalblock_additional" - # requires cython_0, but fails miserably on 3.11 - "test_cython" # Could not fetch remote image: http://localhost:7777/sphinx.png "test_copy_images" # ModuleNotFoundError: No module named 'fish_licence.halibut' @@ -138,22 +145,20 @@ buildPythonPackage rec { "test_load_mappings_cache_update" "test_load_mappings_cache_revert_update" ] - ++ lib.optionals (pythonAtLeast "3.12") [ - # https://github.com/sphinx-doc/sphinx/issues/12430 - "test_autodoc_type_aliases" + ++ lib.optionals (pythonAtLeast "3.14") [ + "test_autodoc_special_members" + "test_is_invalid_builtin_class" + "test_autosummary_generate_content_for_module_imported_members" ] ++ lib.optionals isPyPy [ # PyPy has not __builtins__ which get asserted # https://doc.pypy.org/en/latest/cpython_differences.html#miscellaneous "test_autosummary_generate_content_for_module" "test_autosummary_generate_content_for_module_skipped" - # internals are asserted which are sightly different in PyPy - "test_autodoc_inherited_members_None" - "test_automethod_for_builtin" - "test_builtin_function" - "test_isattributedescriptor" - "test_methoddescriptor" - "test_partialfunction" + # Struct vs struct.Struct + "test_restify" + "test_stringify_annotation" + "test_stringify_type_union_operator" ]; passthru.tests = { diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix index dd9625a6b2f38..177711a41367f 100644 --- a/pkgs/development/python-modules/spsdk/default.nix +++ b/pkgs/development/python-modules/spsdk/default.nix @@ -132,7 +132,6 @@ buildPythonPackage rec { versionCheckHook writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; disabledTests = [ # Missing rotk private key diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 9c55660d9f665..cc4c819b85d79 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "sqlalchemy"; - version = "2.0.44"; + version = "2.0.45"; pyproject = true; disabled = pythonOlder "3.7"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "sqlalchemy"; tag = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-XjmSMgFOMYzJ5IR7tDImj37mM7qhiesKsaBerfzxL4g="; + hash = "sha256-ZAiRR456KkSdXkCiy+TXjdeOJwrLlmVxJfl1x8/XHIs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sqlfmt/default.nix b/pkgs/development/python-modules/sqlfmt/default.nix index 84d8df135054f..8ddfa6df9c675 100644 --- a/pkgs/development/python-modules/sqlfmt/default.nix +++ b/pkgs/development/python-modules/sqlfmt/default.nix @@ -66,7 +66,6 @@ buildPythonPackage rec { writableTmpDirAsHomeHook ] ++ lib.concatAttrValues optional-dependencies; - versionCheckProgramArg = "--version"; disabledTestPaths = [ # TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr' diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index b7c735ba12ecf..eefb859040132 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -28,16 +28,14 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.47.2"; + version = "0.50.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "encode"; repo = "starlette"; tag = version; - hash = "sha256-FseSZrLWuNaLro2iLMcfiCrbx2Gz8+aEmLaSk/+PgN4="; + hash = "sha256-8REOizYQQkyLZwV4/yRiNGmGV07V0NNky7gtiAdWa7o="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index b9df2fc2bfda6..176abf758267c 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -35,6 +35,11 @@ buildPythonPackage rec { ] ++ lib.concatAttrValues optional-dependencies; + # Tests against stdlib behavior which changed in https://github.com/python/cpython/pull/139070 + disabledTests = [ + "test_wrap_multiword_non_wide" + ]; + meta = { description = "Pretty-print tabular data"; mainProgram = "tabulate"; diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix index 605c370659ac3..9b4a0f9812485 100644 --- a/pkgs/development/python-modules/tenacity/default.nix +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + fetchpatch, pytest-asyncio, pytestCheckHook, pythonOlder, @@ -22,6 +23,18 @@ buildPythonPackage rec { hash = "sha256-EWnTdsKX5944jRi0SBdg1Hiw6Zp3fK06nIblVvS2l8s="; }; + patches = [ + (fetchpatch { + url = "https://github.com/jd/tenacity/commit/eed7d785e667df145c0e3eeddff59af64e4e860d.patch"; + includes = [ + "tenacity/__init__.py" + "tests/test_asyncio.py" + "tests/test_issue_478.py" + ]; + hash = "sha256-TMhBjRmG7pBP3iKq83RQzkV9yO2TEcA+3mo9cz6daxs="; + }) + ]; + build-system = [ setuptools-scm ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix index 09ff9cdfe8a98..3c4d65d2bf835 100644 --- a/pkgs/development/python-modules/tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorboard/default.nix @@ -69,7 +69,6 @@ buildPythonPackage rec { nativeCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/tensorflow/tensorboard/blob/${version}/RELEASE.md"; diff --git a/pkgs/development/python-modules/tiktoken/Cargo.lock b/pkgs/development/python-modules/tiktoken/Cargo.lock index cde04e361bb09..5073ae5c848c0 100644 --- a/pkgs/development/python-modules/tiktoken/Cargo.lock +++ b/pkgs/development/python-modules/tiktoken/Cargo.lock @@ -1,21 +1,21 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "aho-corasick" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" dependencies = [ "memchr", ] [[package]] name = "autocfg" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "bit-set" @@ -34,21 +34,15 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] name = "bstr" -version = "1.11.3" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0" +checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" dependencies = [ "memchr", "regex-automata", "serde", ] -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - [[package]] name = "fancy-regex" version = "0.13.0" @@ -68,21 +62,24 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "indoc" -version = "2.0.6" +version = "2.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" +checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706" +dependencies = [ + "rustversion", +] [[package]] name = "libc" -version = "0.2.171" +version = "0.2.177" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" +checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" [[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" @@ -101,26 +98,25 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "portable-atomic" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" +checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" [[package]] name = "proc-macro2" -version = "1.0.94" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.22.6" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f402062616ab18202ae8319da13fa4279883a2b8a9d9f83f20dbade813ce1884" +checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383" dependencies = [ - "cfg-if", "indoc", "libc", "memoffset", @@ -134,19 +130,18 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.22.6" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b14b5775b5ff446dd1056212d778012cbe8a0fbffd368029fd9e25b514479c38" +checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f" dependencies = [ - "once_cell", "target-lexicon", ] [[package]] name = "pyo3-ffi" -version = "0.22.6" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ab5bcf04a2cdcbb50c7d6105de943f543f9ed92af55818fd17b660390fc8636" +checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105" dependencies = [ "libc", "pyo3-build-config", @@ -154,9 +149,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.22.6" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fd24d897903a9e6d80b968368a34e1525aeb719d568dba8b3d4bfa5dc67d453" +checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -166,9 +161,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.22.6" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c011a03ba1e50152b4b394b479826cad97e7a21eb52df179cd91ac411cbfbe" +checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf" dependencies = [ "heck", "proc-macro2", @@ -179,18 +174,18 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.40" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" dependencies = [ "proc-macro2", ] [[package]] name = "regex" -version = "1.11.1" +version = "1.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" dependencies = [ "aho-corasick", "memchr", @@ -200,9 +195,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.9" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" dependencies = [ "aho-corasick", "memchr", @@ -211,30 +206,45 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.5" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" [[package]] name = "rustc-hash" -version = "1.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" + +[[package]] +name = "rustversion" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", +] + +[[package]] +name = "serde_core" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -243,9 +253,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.100" +version = "2.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" +checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea" dependencies = [ "proc-macro2", "quote", @@ -254,13 +264,13 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.16" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" +checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c" [[package]] name = "tiktoken" -version = "0.9.0" +version = "0.12.0" dependencies = [ "bstr", "fancy-regex", @@ -271,9 +281,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.18" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "unindent" diff --git a/pkgs/development/python-modules/tiktoken/default.nix b/pkgs/development/python-modules/tiktoken/default.nix index 049ba55b32b49..79f4b359716bc 100644 --- a/pkgs/development/python-modules/tiktoken/default.nix +++ b/pkgs/development/python-modules/tiktoken/default.nix @@ -16,10 +16,10 @@ }: let pname = "tiktoken"; - version = "0.9.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - hash = "sha256-0Cpcpqk44EkOH/lXvEjIsHjIjLg5d74WJbH9iqx5LF0="; + hash = "sha256-sYun7isJOGOXj8sU90s3B83I1NTTg2hTzn7GB3ITmTE="; }; postPatch = '' cp ${./Cargo.lock} Cargo.lock @@ -48,7 +48,7 @@ buildPythonPackage { src postPatch ; - hash = "sha256-MfTTRbSM+KgrYrWHYlJkGDc1qn3oulalDJM+huTaJ0g="; + hash = "sha256-daIKasW/lwYwIqMs3KvCDJWAoMn1CkPRpNqhl1jKpYY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index 47b4c3e35439c..0d2c114d78958 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -70,7 +70,6 @@ buildPythonPackage rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/toggl"; - versionCheckProgramArg = "--version"; disabledTests = [ "integration" diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix index 050c44c6fe8f5..2325976d499f7 100644 --- a/pkgs/development/python-modules/toolz/default.nix +++ b/pkgs/development/python-modules/toolz/default.nix @@ -8,23 +8,26 @@ buildPythonPackage rec { pname = "toolz"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-LIbj2aBHmKxVZ5O87YOIFilqLwhQF2ZOSZXLQKEEegI="; + hash = "sha256-J6XHcNBowRDZ7ZMj8k8VQ+g7LzAKaHt4kcGm1Wtpe1s="; }; - build-system = [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"setuptools-git-versioning >=2.0",' "" \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + ''; - nativeCheckInputs = [ pytestCheckHook ]; - - disabledTests = [ - # https://github.com/pytoolz/toolz/issues/577 - "test_inspect_wrapped_property" + build-system = [ + setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; + meta = { homepage = "https://github.com/pytoolz/toolz"; changelog = "https://github.com/pytoolz/toolz/releases/tag/${version}"; diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix index a3db28de640c9..ea2ba29af13bf 100644 --- a/pkgs/development/python-modules/tornado/default.nix +++ b/pkgs/development/python-modules/tornado/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "tornado"; - version = "6.5.1"; + version = "6.5.2"; pyproject = true; src = fetchFromGitHub { owner = "tornadoweb"; repo = "tornado"; tag = "v${version}"; - hash = "sha256-CtmIjPKxKC0T8PGQW1wIAJm/+XxMzZXVZyZxV56sZME="; + hash = "sha256-jy/HnMY459yZX3HW9V61/ZSSanCJEZakBU/2pocGc/s="; }; build-system = [ setuptools ]; @@ -38,14 +38,6 @@ buildPythonPackage rec { # additional tests that have extra dependencies, run slowly, or produce more output than a simple pass/fail # https://github.com/tornadoweb/tornado/blob/v6.2.0/maint/test/README "maint/test" - - # AttributeError: 'TestIOStreamWebMixin' object has no attribute 'io_loop' - "tornado/test/iostream_test.py" - ]; - - disabledTests = [ - # Exception: did not get expected log message - "test_unix_socket_bad_request" ]; pythonImportsCheck = [ "tornado" ]; diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 702a53d16b259..8d14f48a2268c 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -5,10 +5,7 @@ pythonOlder, packaging, pluggy, - py, - six, virtualenv, - toml, tomli, filelock, hatchling, @@ -20,31 +17,27 @@ cachetools, testers, tox, + typing-extensions, }: buildPythonPackage rec { pname = "tox"; - version = "4.28.4"; - format = "pyproject"; + version = "4.32.0"; + pyproject = true; src = fetchFromGitHub { owner = "tox-dev"; repo = "tox"; tag = version; - hash = "sha256-EKJsFf4LvfDi3OL6iNhKEBl5zlpdLET9RkfHEP7E9xU="; + hash = "sha256-n2tKjT0t8bm6iatukKKcGw0PC+5EJrQEABMIAumRaqE="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "packaging>=22" "packaging" - ''; - - nativeBuildInputs = [ + build-system = [ hatchling hatch-vcs ]; - propagatedBuildInputs = [ + dependencies = [ cachetools chardet colorama @@ -52,13 +45,13 @@ buildPythonPackage rec { packaging platformdirs pluggy - py pyproject-api - six - toml virtualenv ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ++ lib.optionals (pythonOlder "3.11") [ + tomli + typing-extensions + ]; doCheck = false; # infinite recursion via devpi-client diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix index d04f2c2b46ea8..2c9e1c759c675 100644 --- a/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -54,6 +54,16 @@ buildPythonPackage rec { url = "https://github.com/tpm2-software/tpm2-pytss/commit/afdee627d0639eb05711a2191f2f76e460793da9.patch?full_index=1"; hash = "sha256-Y6drcBg4gnbSvnCGw69b42Q/QfLI3u56BGRUEkpdB0M="; }) + # Fix build with gcc15 by using c99 for preprocessing + # The first patch is needed to apply the second; it doesn't affect us + (fetchpatch { + url = "https://github.com/tpm2-software/tpm2-pytss/commit/55d28b259f1a68f60c937ea8be7815685d32757f.patch"; + hash = "sha256-sGxUyQ2W2Jl9ROSt1w0E0dVTgFPAmYWlNgcpHcTVv90="; + }) + (fetchpatch { + url = "https://github.com/tpm2-software/tpm2-pytss/commit/61d00b4dcca131b3f03f674ceabf4260bdbd6a61.patch"; + hash = "sha256-0dwfyW0Fi5FkzYnaMOb2ua9O6eyCnMgJqT09tTT56vY="; + }) ] ++ lib.optionals isCross [ # pytss will regenerate files from headers of tpm2-tss. diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix index 09a4e2d944ac2..086c2590a8ad8 100644 --- a/pkgs/development/python-modules/traitlets/default.nix +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -1,8 +1,8 @@ { lib, buildPythonPackage, - fetchPypi, - pythonOlder, + fetchFromGitHub, + pythonAtLeast, # build-system hatchling, @@ -16,16 +16,16 @@ buildPythonPackage rec { pname = "traitlets"; version = "5.14.3"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-ntBXnTUCyUtLNzKsEgN1zalvkjEUUihH3ks7uYuWtrc="; + src = fetchFromGitHub { + owner = "ipython"; + repo = "traitlets"; + tag = "v${version}"; + hash = "sha256-lWtgzXW1ffzl1jkFaq99X0dU8agulUMHaghsYKX+8Dk="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; nativeCheckInputs = [ argcomplete @@ -36,6 +36,11 @@ buildPythonPackage rec { disabledTests = [ # https://github.com/ipython/traitlets/issues/902 "test_complete_custom_completers" + ] + ++ lib.optionals (pythonAtLeast "3.14") [ + # https://github.com/ipython/traitlets/issues/925 + "test_complete_simple_app" + "test_complete_subcommands_subapp1" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 24bac8624a52a..67d769273cad8 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -36,7 +36,7 @@ let in buildPythonPackage rec { pname = "trio"; - version = "0.31.0"; + version = "0.32.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "python-trio"; repo = "trio"; tag = "v${version}"; - hash = "sha256-cl1GstWVHDD3nWx835k2hnswt/+AnoTLXjxVIfLP6Es="; + hash = "sha256-kZKP5TFg9M+NCx9V9B0qNbGiwZtBPtgVKgZYjX5w1ok="; }; build-system = [ setuptools ]; @@ -63,13 +63,15 @@ buildPythonPackage rec { nativeCheckInputs = [ astor - jedi pyopenssl pytestCheckHook pytest-trio' pyyaml trustme - ]; + ] + # jedi has no compatibility with python 3.14 yet + # https://github.com/davidhalter/jedi/issues/2064 + ++ lib.optional (pythonOlder "3.14") jedi; preCheck = '' export HOME=$TMPDIR diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix index 2b5ec73544c38..a13f3db23913f 100644 --- a/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/pkgs/development/python-modules/trove-classifiers/default.nix @@ -10,13 +10,13 @@ let self = buildPythonPackage rec { pname = "trove-classifiers"; - version = "2025.9.11.17"; + version = "2025.11.14.15"; pyproject = true; src = fetchPypi { pname = "trove_classifiers"; inherit version; - hash = "sha256-kxyphBpenJQIvCrme1DSis+FvvViGbVoYIdt0fLQJN0="; + hash = "sha256-a2D0nUC72JW8YdjcQU/C8ihtcOty7SNUjbjPlPYoBMo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 4078baca698ab..35cfabc35dc10 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -5,6 +5,7 @@ pythonAtLeast, pythonOlder, fetchPypi, + fetchpatch, python, # build-system @@ -56,9 +57,7 @@ buildPythonPackage rec { pname = "twisted"; version = "25.5.0"; - format = "pyproject"; - - disabled = pythonOlder "3.6"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -66,15 +65,30 @@ buildPythonPackage rec { hash = "sha256-HesnI1jLa+Hj6PxvnIs2946w+nwiM9Lb4R7G/uBOoxY="; }; + patches = [ + (fetchpatch { + # https://github.com/twisted/twisted/pull/12508 + url = "https://github.com/twisted/twisted/commit/ef6160aa2595adfba0c71da6db65b7a7252f23e9.patch"; + hash = "sha256-zHkEWT0lvWf86RlkzU5Wx6R5ear04cfpxB7wjgdpw5c="; + }) + # https://github.com/twisted/twisted/pull/12511 + ./python314-urljoin-compat.patch + (fetchpatch { + # https://github.com/twisted/twisted/pull/12551 + url = "https://github.com/twisted/twisted/commit/b1173fa307a9752eedd63890113eb610c3cca4a0.patch"; + hash = "sha256-DWEygdo1b8uQOeFLy0/zcRNuuKJdSsF7cQM7RH04Puw="; + }) + ]; + __darwinAllowLocalNetworking = true; - nativeBuildInputs = [ + build-system = [ hatchling hatch-fancy-pypi-readme incremental ]; - propagatedBuildInputs = [ + dependencies = [ attrs automat constantly diff --git a/pkgs/development/python-modules/twisted/python314-urljoin-compat.patch b/pkgs/development/python-modules/twisted/python314-urljoin-compat.patch new file mode 100644 index 0000000000000..dbae3bf605fab --- /dev/null +++ b/pkgs/development/python-modules/twisted/python314-urljoin-compat.patch @@ -0,0 +1,13 @@ +diff --git a/src/twisted/web/client.py b/src/twisted/web/client.py +index d3cd11fb84..5f18965759 100644 +--- a/src/twisted/web/client.py ++++ b/src/twisted/web/client.py +@@ -220,7 +220,7 @@ def _urljoin(base, url): + """ + base, baseFrag = urldefrag(base) + url, urlFrag = urldefrag(urljoin(base, url)) +- return urljoin(url, b"#" + (urlFrag or baseFrag)) ++ return urljoin(url, b"#" + (urlFrag or baseFrag)).strip(b"#") + + + def _makeGetterFactory(url, factoryFactory, contextFactory=None, *args, **kwargs): diff --git a/pkgs/development/python-modules/typer-slim/default.nix b/pkgs/development/python-modules/typer-slim/default.nix new file mode 100644 index 0000000000000..55c736320c78b --- /dev/null +++ b/pkgs/development/python-modules/typer-slim/default.nix @@ -0,0 +1,90 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + + # build-system + pdm-backend, + + # dependencies + click, + typing-extensions, + + # optional-dependencies + rich, + shellingham, + + # tests + pytest-xdist, + pytestCheckHook, + writableTmpDirAsHomeHook, + procps, +}: + +buildPythonPackage rec { + pname = "typer-slim"; + version = "0.19.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "fastapi"; + repo = "typer"; + tag = version; + 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 = "typer-slim"; + + build-system = [ pdm-backend ]; + + dependencies = [ + click + typing-extensions + ]; + + optional-dependencies = { + standard = [ + rich + shellingham + ]; + }; + + nativeCheckInputs = [ + pytest-xdist + pytestCheckHook + writableTmpDirAsHomeHook + ] + ++ lib.concatAttrValues optional-dependencies + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + procps + ]; + + disabledTests = [ + "test_scripts" + # Likely related to https://github.com/sarugaku/shellingham/issues/35 + # fails also on Linux + "test_show_completion" + "test_install_completion" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + "test_install_completion" + ]; + + pythonImportsCheck = [ "typer" ]; + + meta = { + description = "Library for building CLI applications"; + homepage = "https://typer.tiangolo.com/"; + changelog = "https://github.com/tiangolo/typer/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ winpat ]; + }; +} diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index e8f4a22ca4fd0..6e1daa7b91e06 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -1,97 +1,20 @@ { lib, - stdenv, - buildPythonPackage, - fetchFromGitHub, - - # build-system - pdm-backend, - - # dependencies - click, - typing-extensions, - - # optional-dependencies - rich, - shellingham, - - # tests - pytest-xdist, - pytestCheckHook, - writableTmpDirAsHomeHook, - procps, - - # typer or typer-slim - package ? "typer", + mkPythonMetaPackage, + typer-slim, }: -buildPythonPackage rec { - pname = package; - version = "0.19.2"; - pyproject = true; - - src = fetchFromGitHub { - owner = "fastapi"; - repo = "typer"; - tag = version; - 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 ]; - - dependencies = [ - click - typing-extensions - ] - # typer includes the standard optional by default - # https://github.com/tiangolo/typer/blob/0.12.3/pyproject.toml#L71-L72 - ++ lib.optionals (package == "typer") optional-dependencies.standard; - - optional-dependencies = { - standard = [ - rich - shellingham - ]; - }; - - doCheck = package == "typer"; # tests expect standard dependencies - - nativeCheckInputs = [ - pytest-xdist - pytestCheckHook - writableTmpDirAsHomeHook - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - procps - ]; - - disabledTests = [ - "test_scripts" - # Likely related to https://github.com/sarugaku/shellingham/issues/35 - # fails also on Linux - "test_show_completion" - "test_install_completion" - ] - ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ - "test_install_completion" - ]; - - pythonImportsCheck = [ "typer" ]; - +mkPythonMetaPackage { + pname = "typer"; + inherit (typer-slim) version optional-dependencies; + dependencies = [ typer-slim ] ++ typer-slim.optional-dependencies.standard; meta = { - description = "Library for building CLI applications"; - homepage = "https://typer.tiangolo.com/"; - changelog = "https://github.com/tiangolo/typer/releases/tag/${version}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ winpat ]; + inherit (typer-slim.meta) + changelog + description + homepage + license + maintainers + ; }; } diff --git a/pkgs/development/python-modules/typing-inspect/default.nix b/pkgs/development/python-modules/typing-inspect/default.nix index 5d5e70f731087..16c8e8cba07e7 100644 --- a/pkgs/development/python-modules/typing-inspect/default.nix +++ b/pkgs/development/python-modules/typing-inspect/default.nix @@ -1,35 +1,34 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, typing-extensions, mypy-extensions, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "typing-inspect"; - version = "0.9.0"; + version = "0.9.0-unstable-2025-10-20"; format = "setuptools"; - src = fetchPypi { - inherit version; - pname = "typing_inspect"; - hash = "sha256-sj/EL/b272lU5IUsH7USzdGNvqAxNPkfhWqVzMlGH3g="; + src = fetchFromGitHub { + owner = "ilevkivskyi"; + repo = "typing_inspect"; + rev = "58c98c084ebeb45ee51935506ed1cc3449105fa9"; + hash = "sha256-uGGtV32TGckoM3JALNu2OjIE+gmzJc7VMJlQeKJVFd8="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ typing-extensions mypy-extensions ]; nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ - # https://github.com/ilevkivskyi/typing_inspect/issues/84 - "test_typed_dict_typing_extension" - ]; - pythonImportsCheck = [ "typing_inspect" ]; meta = { diff --git a/pkgs/development/python-modules/ufmt/default.nix b/pkgs/development/python-modules/ufmt/default.nix index 66fd09da6dabb..47f5117889948 100644 --- a/pkgs/development/python-modules/ufmt/default.nix +++ b/pkgs/development/python-modules/ufmt/default.nix @@ -60,7 +60,6 @@ buildPythonPackage rec { versionCheckHook ] ++ lib.concatAttrValues optional-dependencies; - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "ufmt" ]; diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index 5b130b5ffea91..d03fa46dab173 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, # build-system setuptools, @@ -26,6 +27,14 @@ buildPythonPackage rec { hash = "sha256-YapujmwTlmUfTQwHsuh01V+jqsBbTd0Q9adGNiE8Go0="; }; + patches = [ + (fetchpatch { + # python 3.14 compat + url = "https://github.com/lmfit/uncertainties/commit/633da70494ae6570cc69a910e1f6231538acf374.patch"; + hash = "sha256-P1LiIqA2p58bjupJaf18A6YxBeu+PNpueHACry24OwQ="; + }) + ]; + build-system = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index b8404d98e9887..30ab03edc6943 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -9,27 +9,34 @@ hatch-vcs, # optional-dependencies + backports-zstd, brotli, brotlicffi, + h2, pysocks, - zstandard, # tests + httpx, + pyopenssl, pytestCheckHook, + pytest-socket, pytest-timeout, + quart, + quart-trio, tornado, + trio, trustme, }: let self = buildPythonPackage rec { pname = "urllib3"; - version = "2.5.0"; + version = "2.6.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-P8R3M8fkGdS8P2s9wrT4kLt0OQajDVa6Slv6S7/5J2A="; + hash = "sha256-y5vO9aSzRdXaXRRdw+MINPWOgBiCjLxyTTC0y31NSfE="; }; build-system = [ @@ -39,23 +46,34 @@ let postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail ', "setuptools-scm>=8,<9"' "" + --replace-fail ', "setuptools-scm>=8,<10"' "" ''; optional-dependencies = { brotli = if isPyPy then [ brotlicffi ] else [ brotli ]; + h2 = [ h2 ]; socks = [ pysocks ]; - zstd = [ zstandard ]; + zstd = [ backports-zstd ]; }; nativeCheckInputs = [ + httpx + pyopenssl + pytest-socket pytest-timeout pytestCheckHook + quart + quart-trio tornado + trio trustme ] ++ lib.concatAttrValues optional-dependencies; + disabledTestMarks = [ + "requires_network" + ]; + # Tests in urllib3 are mostly timeout-based instead of event-based and # are therefore inherently flaky. On your own machine, the tests will # typically build fine, but on a loaded cluster such as Hydra random diff --git a/pkgs/development/python-modules/uv-build/default.nix b/pkgs/development/python-modules/uv-build/default.nix index e9111bd69b133..02db3b5064aed 100644 --- a/pkgs/development/python-modules/uv-build/default.nix +++ b/pkgs/development/python-modules/uv-build/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "uv-build"; - version = "0.9.7"; + version = "0.9.9"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = version; - hash = "sha256-I0Oe6vaH7iQh+Ubp5RIk8Ol6Ni7OPu8HKX0fqLdewyk="; + hash = "sha256-i9vdpHA9EfXmw5fhK1tTZG0T2zOlDbjPCGBIizvQzZw="; }; nativeBuildInputs = [ @@ -26,13 +26,13 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-K/RP7EA0VAAI8TGx+VwfKPmyT6+x4p3kekuoMZ0/egc="; + hash = "sha256-RZkIjHQElqrj+UAz+q6w1CYW3E5/YW9uy2E5KpKvw+w="; }; buildAndTestSubdir = "crates/uv-build"; # $src/.github/workflows/build-binaries.yml#L139 - maturinBuildFlags = [ "--profile=minimal-size" ]; + maturinBuildProfile = "minimal-size"; pythonImportsCheck = [ "uv_build" ]; diff --git a/pkgs/development/python-modules/uvicorn-worker/default.nix b/pkgs/development/python-modules/uvicorn-worker/default.nix index 320dee57a8531..28a680bc4ea3f 100644 --- a/pkgs/development/python-modules/uvicorn-worker/default.nix +++ b/pkgs/development/python-modules/uvicorn-worker/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "uvicorn-worker"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "Kludex"; repo = "uvicorn-worker"; tag = version; - hash = "sha256-a5L4H1Bym5Dx9/pGL/Vz6ZO699t/1Wmc1ExIb0t/ISc="; + hash = "sha256-qfk3lkHwuGbRWj4D65EontmEgKtk7ILq6gZCrxcrrJU="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index d9ff8740716bd..7735b19c1402f 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -18,16 +18,14 @@ buildPythonPackage rec { pname = "uvicorn"; - version = "0.35.0"; - disabled = pythonOlder "3.8"; - + version = "0.38.0"; pyproject = true; src = fetchFromGitHub { owner = "encode"; repo = "uvicorn"; tag = version; - hash = "sha256-6tuLL0KMggujYI97HSSBHjiLrePwEkxFHjq2HWl8kqE="; + hash = "sha256-A0YpFA/Oug5a37+33ac8++lh30jzRl48IhC8pflZ0S0="; }; outputs = [ diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index ed4c643c22455..31bbc7a7f2d72 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -2,9 +2,9 @@ lib, stdenv, buildPythonPackage, + pythonAtLeast, pythonOlder, fetchFromGitHub, - fetchpatch, # build-system cython, @@ -79,6 +79,10 @@ buildPythonPackage rec { "tests/test_fs_event.py::Test_UV_FS_EVENT_RENAME::test_fs_event_rename" # Broken: https://github.com/NixOS/nixpkgs/issues/160904 "tests/test_context.py::Test_UV_Context::test_create_ssl_server_manual_connection_lost" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && pythonAtLeast "3.14") [ + # https://github.com/MagicStack/uvloop/issues/709 + "tests/test_process.py::TestAsyncio_AIO_Process::test_cancel_post_init" ]; preCheck = '' diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index df7a53cac07f8..31d094589845d 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -1,12 +1,14 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + fetchpatch, + setuptools, pytest-httpbin, pytestCheckHook, - pythonOlder, pyyaml, six, + urllib3, yarl, wrapt, }: @@ -14,20 +16,31 @@ buildPythonPackage rec { pname = "vcrpy"; version = "7.0.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-F2ORrQQl7d4WgMWyBzjqPcf7lCUgpI0pk0SAUJhrOlA="; + src = fetchFromGitHub { + owner = "kevin1024"; + repo = "vcrpy"; + tag = "v${version}"; + hash = "sha256-uKVPU1DU0GcpRqPzPMSNTLLVetZeQjUMC9vcaGwy0Yk="; }; - propagatedBuildInputs = [ + patches = [ + (fetchpatch { + # python 3.14 compat + url = "https://github.com/kevin1024/vcrpy/commit/558c7fc625e66775da11ee406001f300e6188fb2.patch"; + hash = "sha256-keShvz8zwqkenEtQ+NAnGKwSLYGbtXfpfMP8Zje2p+o="; + }) + ]; + + build-system = [ setuptools ]; + + dependencies = [ pyyaml six - yarl + urllib3 wrapt + yarl ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 7d77263711a99..ca1667b4ca65d 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -3,29 +3,28 @@ buildPythonPackage, pythonOlder, isPyPy, - cython, distlib, - fetchPypi, + fetchFromGitHub, filelock, flaky, hatch-vcs, hatchling, platformdirs, - pytest-freezegun, pytest-mock, - pytest-timeout, pytestCheckHook, time-machine, }: buildPythonPackage rec { pname = "virtualenv"; - version = "20.33.1"; + version = "20.35.4"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-G0RHjZ4mGz+4uqXnSgyjvA4F8hqjYWe/nL+FDlQnZbg="; + src = fetchFromGitHub { + owner = "pypa"; + repo = "virtualenv"; + tag = version; + hash = "sha256-0PWIYU1/zXiOBUV/45rJsJwVlcqHeac68nRM2tvEPHo="; }; build-system = [ @@ -40,34 +39,21 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - cython flaky - pytest-freezegun pytest-mock - pytest-timeout pytestCheckHook ] ++ lib.optionals (!isPyPy) [ time-machine ]; - preCheck = '' - export HOME=$(mktemp -d) - ''; - disabledTestPaths = [ # Ignore tests which require network access "tests/unit/create/test_creator.py" - "tests/unit/seed/embed/test_bootstrap_link_via_app_data.py" + "tests/unit/create/via_global_ref/test_build_c_ext.py" ]; disabledTests = [ # Network access - "test_create_no_seed" "test_seed_link_via_app_data" - # Permission Error - "test_bad_exe_py_info_no_raise" - # https://github.com/pypa/virtualenv/issues/2933 - # https://github.com/pypa/virtualenv/issues/2939 - "test_py_info_cache_invalidation_on_py_info_change" ] ++ lib.optionals (pythonOlder "3.11") [ "test_help" ] ++ lib.optionals isPyPy [ diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index 9e81d3601b941..0cf349f2f859d 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -102,7 +102,6 @@ let nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { @@ -133,7 +132,6 @@ let nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; checkFlags = diff --git a/pkgs/development/python-modules/watchfiles/default.nix b/pkgs/development/python-modules/watchfiles/default.nix index b6dcbfd889e6d..0a85d55898a08 100644 --- a/pkgs/development/python-modules/watchfiles/default.nix +++ b/pkgs/development/python-modules/watchfiles/default.nix @@ -15,19 +15,19 @@ buildPythonPackage rec { pname = "watchfiles"; - version = "1.0.5"; + version = "1.1.1"; pyproject = true; src = fetchFromGitHub { owner = "samuelcolvin"; repo = "watchfiles"; tag = "v${version}"; - hash = "sha256-a6SHqYRNMGXNkVvwj9RpLj449dAQtWXO44v1ko5suaw="; + hash = "sha256-UlQnCYSNU9H4x31KenSfYExGun94ekrOCwajORemSco="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname src version; - hash = "sha256-2RMWxeOjitbEqer9+ETpMX9WxHEiPzVmEv7LpSiaRVg="; + hash = "sha256-6sxtH7KrwAWukPjLSMAebguPmeAHbC7YHOn1QiRPigs="; }; nativeBuildInputs = [ @@ -51,7 +51,6 @@ buildPythonPackage rec { pytestCheckHook versionCheckHook ]; - versionCheckProgramArg = "--version"; preCheck = '' rm -rf watchfiles diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index 47c6a12e51fb5..2e34422404f8d 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -76,7 +76,6 @@ buildPythonPackage rec { versionCheckHook writableTmpDirAsHomeHook ]; - versionCheckProgramArg = "--version"; disabledTests = [ # needs the Ahem font (fails on macOS) diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 012d46b52a069..5b501200dc825 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -2,27 +2,52 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonOlder, + + # build-system + setuptools, + setuptools-scm, + + # dependenices numpy, packaging, pandas, + + # optional-dependencies + bottleneck, + cartopy, + cftime, + dask, + fsspec, + h5netcdf, + matplotlib, + netcdf4, + numba, + numbagg, + opt-einsum, + pooch, + scipy, + seaborn, + sparse, + zarr, + + # tests + pytest-asyncio, pytestCheckHook, - pythonOlder, - setuptools, - setuptools-scm, }: buildPythonPackage rec { pname = "xarray"; - version = "2025.07.1"; + version = "2025.12.0"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "pydata"; repo = "xarray"; tag = "v${version}"; - hash = "sha256-UvBRGYZFkjxUYT+S4By+7xQZW6h0usQ26iFeJvWcxo0="; + hash = "sha256-7MTZ/0BbJb3mg2FHvtsV+v4TsgoxD0Tpco7J4DgT/hY="; }; postPatch = '' @@ -41,7 +66,38 @@ buildPythonPackage rec { pandas ]; + optional-dependencies = lib.fix (self: { + accel = [ + bottleneck + # flox + numba + numbagg + opt-einsum + scipy + ]; + io = [ + netcdf4 + h5netcdf + # pydap + scipy + zarr + fsspec + cftime + pooch + ]; + etc = [ sparse ]; + parallel = [ dask ] ++ dask.optional-dependencies.complete; + viz = [ + cartopy + matplotlib + # nc-time-axis + seaborn + ]; + complete = with self; accel ++ io ++ etc ++ parallel ++ viz; + }); + nativeCheckInputs = [ + pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix index 76aa9530071d4..ad246ee27365c 100644 --- a/pkgs/development/python-modules/yamlfix/default.nix +++ b/pkgs/development/python-modules/yamlfix/default.nix @@ -52,7 +52,6 @@ buildPythonPackage rec { writableTmpDirAsHomeHook versionCheckHook ]; - versionCheckProgramArg = "--version"; pythonImportsCheck = [ "yamlfix" ]; diff --git a/pkgs/development/python-modules/zenoh/default.nix b/pkgs/development/python-modules/zenoh/default.nix index a9d2eefb93713..8946bcc4b3ea9 100644 --- a/pkgs/development/python-modules/zenoh/default.nix +++ b/pkgs/development/python-modules/zenoh/default.nix @@ -9,19 +9,19 @@ buildPythonPackage rec { pname = "zenoh"; - version = "1.4.0"; # nixpkgs-update: no auto update + version = "1.6.2"; # nixpkgs-update: no auto update pyproject = true; src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-python"; rev = version; - hash = "sha256-X9AUjuJYA8j41JVS+ZLRYcQUzSRoGwmkNIH0UK5+QoU="; + hash = "sha256-GGqZGtHSCaPeO6wFFBxPjdjhsIdcgI1RJ4mZbGq4uzc="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src pname version; - hash = "sha256-Z6Wtor/aAdO1JUUafFEo9RdI7OXmsAD5MMtMUF6CZEg="; + hash = "sha256-2Hieow0+GzcNQmvqsJd+5bpE9RWUDbaBR9jah+O4GtI="; }; build-system = [ diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index ed00f0677ca1c..49baf1a63efaf 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -18,18 +18,21 @@ buildPythonPackage rec { pname = "zodb"; - version = "6.0.1"; + version = "6.1"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zodb"; tag = version; - hash = "sha256-2OK1ezHFEpOMOrpB8Nzf/6+4AlV3S7p11dQHkeMqhoo="; + hash = "sha256-O6mu4RWi5qNcPyIgre5+bk4ZGZOZdG1vIdc8HqbfcaQ="; }; - # remove broken test postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools ==" "setuptools >=" + + # remove broken test rm -vf src/ZODB/tests/testdocumentation.py ''; diff --git a/pkgs/development/python-modules/zope-cachedescriptors/default.nix b/pkgs/development/python-modules/zope-cachedescriptors/default.nix index 39403aa09ddfd..d78bf62bb4e4a 100644 --- a/pkgs/development/python-modules/zope-cachedescriptors/default.nix +++ b/pkgs/development/python-modules/zope-cachedescriptors/default.nix @@ -8,19 +8,19 @@ buildPythonPackage rec { pname = "zope-cachedescriptors"; - version = "5.1"; + version = "6.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.cachedescriptors"; tag = version; - hash = "sha256-2cb8XosPCAV2BfMisCN9mr0KIu5xcsLPIcPkmpeVT+k="; + hash = "sha256-PlezUzuO4P/BOVT6Ll8dYIKssC/glmVd8SCM0afgNC0="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools <= 75.6.0" setuptools + --replace-fail "setuptools ==" "setuptools >=" ''; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/zope-component/default.nix b/pkgs/development/python-modules/zope-component/default.nix index 81f90593b5282..4db532448b8c8 100644 --- a/pkgs/development/python-modules/zope-component/default.nix +++ b/pkgs/development/python-modules/zope-component/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, zope-event, zope-hookable, @@ -17,15 +17,21 @@ buildPythonPackage rec { pname = "zope-component"; - version = "6.0"; + version = "7.0"; pyproject = true; - src = fetchPypi { - pname = "zope.component"; - inherit version; - hash = "sha256-mgoEcq0gG5S0/mdBzprCwwuLsixRYHe/A2kt7E37aQY="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.component"; + tag = version; + hash = "sha256-3Hl2sm2M0we+fpdt4GSjAStLSAJ1c4Za1vfm9Bj8z8s="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools ==" "setuptools >=" + ''; + build-system = [ setuptools ]; dependencies = [ @@ -35,6 +41,7 @@ buildPythonPackage rec { ]; optional-dependencies = { + hook = [ ]; persistentregistry = [ persistent ]; security = [ zope-location diff --git a/pkgs/development/python-modules/zope-configuration/default.nix b/pkgs/development/python-modules/zope-configuration/default.nix index e56ebb23371d1..fad73639a8759 100644 --- a/pkgs/development/python-modules/zope-configuration/default.nix +++ b/pkgs/development/python-modules/zope-configuration/default.nix @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "zope-configuration"; - version = "6.0"; + version = "7.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.configuration"; tag = version; - hash = "sha256-dkEVIHaXk/oP4uYYzI1hgSnPZXBMDjDu97zmOXnj9NA="; + hash = "sha256-G87VAEqMxF5Y3LuDJnDcOox5+ngJuRhUGSj9K8c3mYY="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools < 74" "setuptools" + --replace-fail "setuptools ==" "setuptools >=" ''; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/zope-contenttype/default.nix b/pkgs/development/python-modules/zope-contenttype/default.nix index f53485b5462ae..e5f867ec3e903 100644 --- a/pkgs/development/python-modules/zope-contenttype/default.nix +++ b/pkgs/development/python-modules/zope-contenttype/default.nix @@ -8,19 +8,19 @@ buildPythonPackage rec { pname = "zope-contenttype"; - version = "5.2"; + version = "6.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.contenttype"; tag = version; - hash = "sha256-mY6LlJn44hUfXpxEa99U6FNcsV9xJbR5w/iIS6hG+m4="; + hash = "sha256-fEbFFc6/R/fv9q9diKVcEPH12hVt/kbyGyNXqM8xzWM="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools <= 75.6.0" setuptools + --replace-fail "setuptools ==" "setuptools >=" ''; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/zope-copy/default.nix b/pkgs/development/python-modules/zope-copy/default.nix index d92b4b1ebc1a6..453542bbec609 100644 --- a/pkgs/development/python-modules/zope-copy/default.nix +++ b/pkgs/development/python-modules/zope-copy/default.nix @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "zope-copy"; - version = "5.0"; + version = "6.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.copy"; tag = version; - hash = "sha256-uQUvfZGrMvtClXa8tLKZFYehbcBIRx7WQnumUrdQjIk="; + hash = "sha256-hYeLUSwAq5rK4TRngvNQGR4Fdimb2k5dHtFdptMVqPo="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools < 74" "setuptools" + --replace-fail "setuptools ==" "setuptools >=" ''; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/zope-deferredimport/default.nix b/pkgs/development/python-modules/zope-deferredimport/default.nix index 7f79f55b32b96..0fbd5e1477637 100644 --- a/pkgs/development/python-modules/zope-deferredimport/default.nix +++ b/pkgs/development/python-modules/zope-deferredimport/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, zope-proxy, unittestCheckHook, @@ -9,15 +9,21 @@ buildPythonPackage rec { pname = "zope-deferredimport"; - version = "5.0"; + version = "6.0"; pyproject = true; - src = fetchPypi { - pname = "zope.deferredimport"; - inherit version; - hash = "sha256-Orvw4YwfF2WRTs0dQbVJ5NBFshso5AZfsMHeCtc2ssM="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.deferredimport"; + tag = version; + hash = "sha256-7Q8+Cew5987+CjUOxqpwMFXWdw+/B28tOEXRYC0SRyI="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools ==" "setuptools >=" + ''; + build-system = [ setuptools ]; dependencies = [ zope-proxy ]; diff --git a/pkgs/development/python-modules/zope-deprecation/default.nix b/pkgs/development/python-modules/zope-deprecation/default.nix index d2f6adc39c59f..fe3010399a01b 100644 --- a/pkgs/development/python-modules/zope-deprecation/default.nix +++ b/pkgs/development/python-modules/zope-deprecation/default.nix @@ -3,31 +3,37 @@ buildPythonPackage, fetchFromGitHub, setuptools, - pytestCheckHook, + zope-testrunner, }: buildPythonPackage rec { pname = "zope-deprecation"; - version = "5.1"; + version = "6.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.deprecation"; tag = version; - hash = "sha256-5gqZuO3fGXkQl493QrvK7gl77mDteUp7tpo4DhSRI+o="; + hash = "sha256-N/+RtilRY/8NfhUjd/Y4T6dmZHt6PW4ofP1UE8Aj1e8="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools <= 75.6.0" "setuptools" + --replace-fail "setuptools ==" "setuptools >=" ''; build-system = [ setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ zope-testrunner ]; - enabledTestPaths = [ "src/zope/deprecation/tests.py" ]; + checkPhase = '' + runHook preCheck + + zope-testrunner --test-path=src + + runHook postCheck + ''; pythonImportsCheck = [ "zope.deprecation" ]; diff --git a/pkgs/development/python-modules/zope-dottedname/default.nix b/pkgs/development/python-modules/zope-dottedname/default.nix index 242aa87aa2abe..121e4e642bc76 100644 --- a/pkgs/development/python-modules/zope-dottedname/default.nix +++ b/pkgs/development/python-modules/zope-dottedname/default.nix @@ -1,22 +1,28 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, pytestCheckHook, }: buildPythonPackage rec { pname = "zope-dottedname"; - version = "6.0"; + version = "7.0"; pyproject = true; - src = fetchPypi { - pname = "zope.dottedname"; - inherit version; - hash = "sha256-28S4W/vzSx74jasWJSrG7xbZBDnyIjstCiYs9Bnq6QI="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.dottedname"; + tag = version; + hash = "sha256-bWURUr+BCQsMNBYqJD2+YPdfA+FWrJuBGypQ/c8w6kA="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools ==" "setuptools >=" + ''; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/zope-event/default.nix b/pkgs/development/python-modules/zope-event/default.nix index ee9ea2639f02e..61c26a9393552 100644 --- a/pkgs/development/python-modules/zope-event/default.nix +++ b/pkgs/development/python-modules/zope-event/default.nix @@ -8,16 +8,21 @@ buildPythonPackage rec { pname = "zope-event"; - version = "5.0"; + version = "6.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.event"; tag = version; - hash = "sha256-85jXSrploTcskdOBI84KGGf9Bno41ZTtT/TrbgmTxiA="; + hash = "sha256-1ZdhJwxzYsMT2s+z4MLR71cLFzIEmwE0KFilwg7BQ1E="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools ==" "setuptools >=" + ''; + build-system = [ setuptools ]; pythonImportsCheck = [ "zope.event" ]; diff --git a/pkgs/development/python-modules/zope-exceptions/default.nix b/pkgs/development/python-modules/zope-exceptions/default.nix index 8141e1a90165e..96f7aaf9ae260 100644 --- a/pkgs/development/python-modules/zope-exceptions/default.nix +++ b/pkgs/development/python-modules/zope-exceptions/default.nix @@ -2,31 +2,32 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, zope-interface, }: buildPythonPackage rec { pname = "zope-exceptions"; - version = "5.2"; + version = "6.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.exceptions"; tag = version; - hash = "sha256-jbzUUB6ifTfxiGEiyAmsDoDLyRVuZPgIsN8mCNJkv4Q="; + hash = "sha256-LLKS/O1sfrHRfEgbb3GO+/hBtIC9CvfNjorqiKTgujo="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools ==" "setuptools >=" + ''; + build-system = [ setuptools ]; dependencies = [ - setuptools zope-interface ]; diff --git a/pkgs/development/python-modules/zope-filerepresentation/default.nix b/pkgs/development/python-modules/zope-filerepresentation/default.nix index bd5fcb23d63e6..72757227cd691 100644 --- a/pkgs/development/python-modules/zope-filerepresentation/default.nix +++ b/pkgs/development/python-modules/zope-filerepresentation/default.nix @@ -10,19 +10,19 @@ buildPythonPackage rec { pname = "zope-filerepresentation"; - version = "6.1"; + version = "7.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.filerepresentation"; tag = version; - hash = "sha256-6J4munk2yyZ6e9rpU2Op+Gbf0OXGI6GpHjmpUZVRjsY="; + hash = "sha256-VWi00b7m+aKwkg/Gfzo5fJWMqdMqgowBpkqsYcEO2gY="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools <= 75.6.0" setuptools + --replace-fail "setuptools ==" "setuptools >=" ''; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/zope-hookable/default.nix b/pkgs/development/python-modules/zope-hookable/default.nix index bcc3adaa2b328..e0454193f299f 100644 --- a/pkgs/development/python-modules/zope-hookable/default.nix +++ b/pkgs/development/python-modules/zope-hookable/default.nix @@ -8,19 +8,19 @@ buildPythonPackage rec { pname = "zope-hookable"; - version = "7.0"; + version = "8.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.hookable"; tag = version; - hash = "sha256-qJJc646VSdNKors6Au4UAGvm7seFbvjEfpdqf//vJNE="; + hash = "sha256-5ps/H9bL2oN9IHxXzpWw/9uMLhwV+OpQ26kXlsP4hgw="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools<74" "setuptools" + --replace-fail "setuptools ==" "setuptools >=" ''; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/zope-i18nmessageid/default.nix b/pkgs/development/python-modules/zope-i18nmessageid/default.nix index ff6c15ac9746e..f236aae772a34 100644 --- a/pkgs/development/python-modules/zope-i18nmessageid/default.nix +++ b/pkgs/development/python-modules/zope-i18nmessageid/default.nix @@ -3,32 +3,25 @@ buildPythonPackage, fetchFromGitHub, setuptools, - zope-testrunner, unittestCheckHook, }: buildPythonPackage rec { pname = "zope-i18nmessageid"; - version = "7.0"; + version = "8.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.i18nmessageid"; tag = version; - hash = "sha256-rdTs1pNMKpPAR2CewXdg1KmI61Sw5r62OobYlJHsUaQ="; + hash = "sha256-lMHmKWwR9D9HW+paV1mDVAirOe0wBD8VrJ67NZoROtg="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "setuptools<74" "setuptools" - ''; - build-system = [ setuptools ]; nativeCheckInputs = [ unittestCheckHook - zope-testrunner ]; unittestFlagsArray = [ "src/zope/i18nmessageid" ]; diff --git a/pkgs/development/python-modules/zope-interface/default.nix b/pkgs/development/python-modules/zope-interface/default.nix index 3c5f5b0c478f4..59f156489e382 100644 --- a/pkgs/development/python-modules/zope-interface/default.nix +++ b/pkgs/development/python-modules/zope-interface/default.nix @@ -7,21 +7,16 @@ buildPythonPackage rec { pname = "zope-interface"; - version = "7.2"; + version = "8.0.1"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.interface"; tag = version; - hash = "sha256-WrS/YHkEmV1G/Scg0xpyu2uFVWTWnEpajqNDvGioVgc="; + hash = "sha256-IYtfd9mJLcwk3FGPWlD5PbrKdIwDQf1Thn6fWFa5Rpo="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "setuptools < 74" "setuptools" - ''; - build-system = [ setuptools ]; pythonImportsCheck = [ "zope.interface" ]; @@ -31,8 +26,8 @@ buildPythonPackage rec { pythonNamespaces = [ "zope" ]; meta = { - changelog = "https://github.com/zopefoundation/zope.interface/blob/${version}/CHANGES.rst"; - description = "Zope.Interface"; + changelog = "https://github.com/zopefoundation/zope.interface/blob/${src.tag}/CHANGES.rst"; + description = "Implementation of object interfaces, a mechanism for labeling objects as conforming to a given API or contract"; homepage = "https://github.com/zopefoundation/zope.interface"; license = lib.licenses.zpl21; maintainers = [ ]; diff --git a/pkgs/development/python-modules/zope-lifecycleevent/default.nix b/pkgs/development/python-modules/zope-lifecycleevent/default.nix index 6baee99659d9d..10e880d4a1fe7 100644 --- a/pkgs/development/python-modules/zope-lifecycleevent/default.nix +++ b/pkgs/development/python-modules/zope-lifecycleevent/default.nix @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "zope-lifecycleevent"; - version = "5.1"; + version = "6.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.lifecycleevent"; tag = version; - hash = "sha256-vTonbZSeQxnLA6y1wAnBpobEKAs+gaAYN25dx5Fla9k="; + hash = "sha256-HgxOUseRYc+mkwESUDqauoH2D2E4PL8XxM1C0FC35w8="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools <= 75.6.0" setuptools + --replace-fail "setuptools ==" "setuptools >=" ''; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/zope-location/default.nix b/pkgs/development/python-modules/zope-location/default.nix index 8b4ff8bf7e889..c4d05a2e06cee 100644 --- a/pkgs/development/python-modules/zope-location/default.nix +++ b/pkgs/development/python-modules/zope-location/default.nix @@ -8,21 +8,27 @@ zope-schema, zope-component, zope-configuration, + zope-copy, unittestCheckHook, }: buildPythonPackage rec { pname = "zope-location"; - version = "5.0"; + version = "6.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.location"; tag = version; - hash = "sha256-C8tQ4qqzkQx+iU+Pm3iCEchtqOZT/qcYFSzJWzqlhnI="; + hash = "sha256-s7HZda+U87P62elX/KbDp2o9zAplgFVmnedDI/uq2sk="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools ==" "setuptools >=" + ''; + build-system = [ setuptools ]; dependencies = [ @@ -34,18 +40,13 @@ buildPythonPackage rec { optional-dependencies = { zcml = [ zope-configuration ]; component = [ zope-component ]; + copy = [ zope-copy ]; }; pythonImportsCheck = [ "zope.location" ]; nativeCheckInputs = [ unittestCheckHook ]; - # prevent cirtular import - preCheck = '' - rm src/zope/location/tests/test_configure.py - rm src/zope/location/tests/test_pickling.py - ''; - unittestFlagsArray = [ "src/zope/location/tests" ]; pythonNamespaces = [ "zope" ]; diff --git a/pkgs/development/python-modules/zope-proxy/default.nix b/pkgs/development/python-modules/zope-proxy/default.nix index b480cdd9396ef..71f559e4423c8 100644 --- a/pkgs/development/python-modules/zope-proxy/default.nix +++ b/pkgs/development/python-modules/zope-proxy/default.nix @@ -8,21 +8,16 @@ buildPythonPackage rec { pname = "zope-proxy"; - version = "6.1"; + version = "7.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.proxy"; tag = version; - hash = "sha256-RgkUojCAfwAGv8Jek2Ucg0KMtPviwXjuiO70iisParM="; + hash = "sha256-1u9Yn6j8tBMmAZmb/0L/lZUE/yC0OP8K825QBixxKQM="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "setuptools<74" "setuptools" - ''; - build-system = [ setuptools ]; dependencies = [ zope-interface ]; diff --git a/pkgs/development/python-modules/zope-schema/default.nix b/pkgs/development/python-modules/zope-schema/default.nix index 739e55795cedc..dc72078d66b8c 100644 --- a/pkgs/development/python-modules/zope-schema/default.nix +++ b/pkgs/development/python-modules/zope-schema/default.nix @@ -11,16 +11,21 @@ buildPythonPackage rec { pname = "zope-schema"; - version = "7.0.1"; + version = "8.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.schema"; tag = version; - hash = "sha256-aUjlSgMfoKQdE0ta8jxNjh+L7OKkfOVvUWnvhx+QRsI="; + hash = "sha256-qZ7OWpDTBV/wT3FZBUhe6D4olCTBaYkilj+JSwjHKOU="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools ==" "setuptools >=" + ''; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/zope-security/default.nix b/pkgs/development/python-modules/zope-security/default.nix index 515709589bc27..85af161d70046 100644 --- a/pkgs/development/python-modules/zope-security/default.nix +++ b/pkgs/development/python-modules/zope-security/default.nix @@ -19,22 +19,25 @@ buildPythonPackage rec { pname = "zope-security"; - version = "7.3"; + version = "8.1"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.security"; tag = version; - hash = "sha256-p+9pCcBsCJY/V6vraVZHMr5VwYHFe217AbRVoSnDphs="; + hash = "sha256-qik1tuH0w0W21Md6YXc5csCbMrFifxaJvGgi2nB4FrI="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools<74" "setuptools" + --replace-fail "setuptools ==" "setuptools >=" ''; - build-system = [ setuptools ]; + build-system = [ + setuptools + zope-proxy + ]; dependencies = [ zope-component diff --git a/pkgs/development/python-modules/zope-size/default.nix b/pkgs/development/python-modules/zope-size/default.nix index 1077201a61bd4..8632f12c9a714 100644 --- a/pkgs/development/python-modules/zope-size/default.nix +++ b/pkgs/development/python-modules/zope-size/default.nix @@ -13,19 +13,19 @@ buildPythonPackage rec { pname = "zope-size"; - version = "5.1"; + version = "6.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.size"; tag = version; - hash = "sha256-9r7l3RgE9gvxJ2I5rFvNn/XIztecXW3GseGeM3MzfTU="; + hash = "sha256-jjI9NvfxnIWZrqDEpZ6FDlhDWZoqEUBliiyh+5PxOAg="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools <= 75.6.0" setuptools + --replace-fail "setuptools ==" "setuptools >=" ''; build-system = [ setuptools ]; @@ -35,14 +35,22 @@ buildPythonPackage rec { zope-interface ]; + optional-dependencies = { + zcml = [ + zope-component + zope-configuration + zope-security + ] + ++ zope-component.optional-dependencies.zcml + ++ zope-security.optional-dependencies.zcml; + }; + pythonImportsCheck = [ "zope.size" ]; nativeCheckInputs = [ unittestCheckHook - zope-component - zope-configuration - zope-security - ]; + ] + ++ lib.concatAttrValues optional-dependencies; unittestFlagsArray = [ "src/zope/size" ]; diff --git a/pkgs/development/python-modules/zope-testbrowser/default.nix b/pkgs/development/python-modules/zope-testbrowser/default.nix index 7e5c17e2e2c56..c1598c60ecabd 100644 --- a/pkgs/development/python-modules/zope-testbrowser/default.nix +++ b/pkgs/development/python-modules/zope-testbrowser/default.nix @@ -11,6 +11,7 @@ beautifulsoup4, soupsieve, wsgiproxy2, + legacy-cgi, mock, zope-testing, zope-testrunner, @@ -19,17 +20,20 @@ buildPythonPackage rec { pname = "zope-testbrowser"; - version = "7.0.1"; + version = "8.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.testbrowser"; tag = version; - hash = "sha256-GxSH3JBuQ3B4CeHzr58FEYv0gsTlUhlO/0CCHcTdOfg="; + hash = "sha256-CcNlK7EKYng0GKYTZ2U2slkyQ9wTqwzOXGHt9S5p3L0="; }; postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools ==" "setuptools >=" + # remove test that requires network access substituteInPlace src/zope/testbrowser/tests/test_doctests.py \ --replace-fail "suite.addTests(wire)" "" @@ -47,6 +51,7 @@ buildPythonPackage rec { beautifulsoup4 soupsieve wsgiproxy2 + legacy-cgi ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/zope-testing/default.nix b/pkgs/development/python-modules/zope-testing/default.nix index e95da7af7d887..4966f8e5224e5 100644 --- a/pkgs/development/python-modules/zope-testing/default.nix +++ b/pkgs/development/python-modules/zope-testing/default.nix @@ -9,19 +9,19 @@ buildPythonPackage rec { pname = "zope-testing"; - version = "5.1"; + version = "6.0"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.testing"; tag = version; - hash = "sha256-G9RfRsXSzQ92HeBF5dRTI+1XEz1HM3DuB0ypZ61uHfw="; + hash = "sha256-px1+lS1U0lmmQrXJuxFTsX3N8e2mj5Yhckfis5++EX8="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools <= 75.6.0" setuptools + --replace-fail "setuptools ==" "setuptools >=" ''; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/zope-testrunner/default.nix b/pkgs/development/python-modules/zope-testrunner/default.nix index 85ef9af02889b..6947177911c61 100644 --- a/pkgs/development/python-modules/zope-testrunner/default.nix +++ b/pkgs/development/python-modules/zope-testrunner/default.nix @@ -9,19 +9,19 @@ buildPythonPackage rec { pname = "zope-testrunner"; - version = "6.6.1"; + version = "8.1"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.testrunner"; tag = version; - hash = "sha256-cvZXQzbIUBq99P0FYSydG1tLNBMFTTvuMvqWGaNFhJc="; + hash = "sha256-MqlS/VkLAv9M1WtJ6t2nPMZPH+Cz5wfy2VhtCx/Fwmw="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools<74" "setuptools" + --replace-fail "setuptools ==" "setuptools >=" ''; build-system = [ setuptools ]; diff --git a/pkgs/development/r-modules/wrapper.nix b/pkgs/development/r-modules/wrapper.nix index 8d7445a50e970..e1b96aecfe28a 100644 --- a/pkgs/development/r-modules/wrapper.nix +++ b/pkgs/development/r-modules/wrapper.nix @@ -11,6 +11,11 @@ symlinkJoin { preferLocalBuild = true; allowSubstitutes = false; + outputs = [ + "out" + "man" + ]; + buildInputs = [ R ] ++ recommendedPackages ++ packages; paths = [ R ]; @@ -24,6 +29,8 @@ symlinkJoin { makeWrapper "${R}/bin/$exe" "$out/bin/$exe" \ --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE" done + + ln -s ${R.man} $man ''; # Make the list of recommended R packages accessible to other packages such as rpy2 diff --git a/pkgs/development/rocm-modules/6/llvm/default.nix b/pkgs/development/rocm-modules/6/llvm/default.nix index 63da17d84e4d2..c4ee2ce75d107 100644 --- a/pkgs/development/rocm-modules/6/llvm/default.nix +++ b/pkgs/development/rocm-modules/6/llvm/default.nix @@ -359,6 +359,14 @@ overrideLlvmPackagesRocm (s: { url = "https://github.com/llvm/llvm-project/commit/816fde1cbb700ebcc8b3df81fb93d675c04c12cd.patch"; relative = "clang"; }) + (fetchpatch { + # [PATCH] Reapply "[CUDA][HIP] Add a __device__ version of std::__glibcxx_assert_fail()" + # Fix errors with gcc15 + # https://github.com/ROCm/composable_kernel/issues/2887 + hash = "sha256-liowyS6FTsDhH8mJYXsanK7GEIlXFhd68GRDf/7Y6gg="; + url = "https://github.com/llvm/llvm-project/commit/8ec0552a7f1f50986dda6d13eae310d121d7e3ba.patch"; + relative = "clang"; + }) ] ++ old.patches ++ [ diff --git a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix b/pkgs/development/rocm-modules/6/rocm-runtime/default.nix index 94b520cf40497..809a094e2752a 100644 --- a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-runtime/default.nix @@ -79,6 +79,12 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/ROCm/ROCR-Runtime/commit/41bfc66aef437a5b349f71105fa4b907cc7e17d5.patch"; hash = "sha256-A7VhPR3eSsmjq2cTBSjBIz9i//WiNjoXm0EsRKtF+ns="; }) + # Fix build with gcc15 + (fetchpatch { + # [PATCH] rocr:Add missing cstdint include + url = "https://github.com/ROCm/ROCR-Runtime/commit/5cc61b714d5b59ed5405639a37a582d839e6ebe9.patch"; + hash = "sha256-IPxDShpoFB0PjCG+zwFbnW9IBTCG3G2o9sfITGs+bN4="; + }) # This causes a circular dependency, aqlprofile relies on hsa-runtime64 # which is part of rocm-runtime # Worked around by having rocprofiler load aqlprofile directly diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix index 2d6714b556880..d02c0cd492572 100644 --- a/pkgs/development/ruby-modules/bundler-app/default.nix +++ b/pkgs/development/ruby-modules/bundler-app/default.nix @@ -101,5 +101,6 @@ runCommand basicEnv.name cmdArgs '' lib.optionalString (basicEnv.gemType == "git" || basicEnv.gemType == "url") "bundler/" }gems/${basicEnv.name} \( -wholename "*/man/*.$section" -o -wholename "*/man/man$section/*.$section" \) -print -execdir mkdir -p $mandir \; -execdir cp '{}' $mandir \; done + compressManPages "''${!outputMan}" ''} '' diff --git a/pkgs/development/tools/analysis/clazy/default.nix b/pkgs/development/tools/analysis/clazy/default.nix index 5033f56d18f16..42f38f449283a 100644 --- a/pkgs/development/tools/analysis/clazy/default.nix +++ b/pkgs/development/tools/analysis/clazy/default.nix @@ -50,7 +50,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index 8929ff08c0a95..795db4d57dd55 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -35,7 +35,9 @@ stdenv.mkDerivation (finalAttrs: { # TODO: stdenv’s setup.sh should be aware of patch directories. It’s very # convenient to keep them in a separate directory but we can defer listing the # directory until derivation realization to avoid unnecessary Nix evaluations. - patches = lib.filesystem.listFilesRecursive ./patches; + patches = + lib.filesystem.listFilesRecursive ./patches + ++ lib.optionals stdenv.hostPlatform.isMusl (lib.filesystem.listFilesRecursive ./musl-patches); nativeBuildInputs = [ autoreconfHook diff --git a/pkgs/development/tools/build-managers/gnumake/musl-patches/0004-Fix-signatures-for-getenv-getopt.patch b/pkgs/development/tools/build-managers/gnumake/musl-patches/0004-Fix-signatures-for-getenv-getopt.patch new file mode 100644 index 0000000000000..f37b7a49e341b --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/musl-patches/0004-Fix-signatures-for-getenv-getopt.patch @@ -0,0 +1,50 @@ +From 776f707b5bb67d4c0c15f981b5a1b6d7f3a9cebc Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 22 Mar 2025 14:24:57 -0700 +Subject: [PATCH 4/5] Fix signatures for getenv/getopt + +GCC-15 complains about missing parameters, this gets found +out when using non-glibc ( e.g. musl ) C library + +Fixes +lib/fnmatch.c:124:14: error: conflicting types for 'getenv'; have 'char *(void)' +| 124 | extern char *getenv (); +| | ^~~~~~ + +src/getopt.c: Define parameters of getenv() and getopt(). +src/getopt.h: Ditto. +--- +Link: https://lists.gnu.org/archive/html/bug-make/2025-03/msg00032.html + src/getopt.c | 2 +- + src/getopt.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/getopt.c b/src/getopt.c +index 7a792de8..76251ccb 100644 +--- a/src/getopt.c ++++ b/src/getopt.c +@@ -202,7 +202,7 @@ static char *posixly_correct; + whose names are inconsistent. */ + + #ifndef getenv +-extern char *getenv (); ++extern char *getenv (const char *); + #endif + + static char * +diff --git a/src/getopt.h b/src/getopt.h +index df18ceeb..d8bb2263 100644 +--- a/src/getopt.h ++++ b/src/getopt.h +@@ -102,7 +102,7 @@ struct option + errors, only prototype getopt for the GNU C library. */ + extern int getopt (int argc, char *const *argv, const char *shortopts); + #else /* not __GNU_LIBRARY__ */ +-extern int getopt (); ++extern int getopt (int, char * const*, const char *); + #endif /* __GNU_LIBRARY__ */ + extern int getopt_long (int argc, char *const *argv, const char *shortopts, + const struct option *longopts, int *longind); +-- +2.51.2 + diff --git a/pkgs/development/tools/build-managers/gnumake/musl-patches/0005-Fix-signatures-for-getenv-getopt.patch b/pkgs/development/tools/build-managers/gnumake/musl-patches/0005-Fix-signatures-for-getenv-getopt.patch new file mode 100644 index 0000000000000..c594ba27c2a9c --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/musl-patches/0005-Fix-signatures-for-getenv-getopt.patch @@ -0,0 +1,34 @@ +From a4169ae60a7cb2c2bc788daa2c91441cc807acbc Mon Sep 17 00:00:00 2001 +From: Yureka +Date: Mon, 22 Dec 2025 20:53:31 +0100 +Subject: [PATCH 5/5] Fix signatures for getenv/getopt + +As the previous commit, this fixes GCC-15 complaining about mismatching +definitions with non-glibc (musl) C library. + +Fixes +lib/fnmatch.c:124:14: error: conflicting types for 'getenv'; have 'char *(void)' +| 124 | extern char *getenv (); +| | ^~~~~~ + +lib/fnmatch.c: Define parameters of getenv() +--- + lib/fnmatch.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/fnmatch.c b/lib/fnmatch.c +index 01da376b..cb1c856b 100644 +--- a/lib/fnmatch.c ++++ b/lib/fnmatch.c +@@ -121,7 +121,7 @@ USA. */ + whose names are inconsistent. */ + + # if !defined _LIBC && !defined getenv +-extern char *getenv (); ++extern char *getenv (const char *); + # endif + + # ifndef errno +-- +2.51.2 + diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index b2e6ef8bab509..d4d8981b31717 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -110,7 +110,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/luarocks"; - versionCheckProgramArg = "--version"; # unpack hook for src.rock and rockspec files setupHook = ./setup-hook.sh; diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/pkgs/development/tools/misc/sqitch/default.nix index bbd7bef633ef7..5e60898c76dc0 100644 --- a/pkgs/development/tools/misc/sqitch/default.nix +++ b/pkgs/development/tools/misc/sqitch/default.nix @@ -3,7 +3,6 @@ lib, perlPackages, makeWrapper, - shortenPerlShebang, mysqlSupport ? false, postgresqlSupport ? false, sqliteSupport ? false, @@ -25,7 +24,7 @@ stdenv.mkDerivation { pname = "sqitch"; version = sqitch.version; - nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + nativeBuildInputs = [ makeWrapper ]; src = sqitch; dontBuild = true; @@ -39,9 +38,6 @@ stdenv.mkDerivation { ln -s ${sqitch}/$d $out/$d fi done - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/sqitch ''; dontStrip = true; postFixup = '' diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index 49f1bf8c80181..00dd5a5811a59 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -38,6 +38,7 @@ let optional optionals optionalString + versionAtLeast versionOlder ; crossBuildTools = stdenv.hostPlatform != stdenv.buildPlatform; @@ -52,7 +53,12 @@ stdenv.mkDerivation { inherit hash; }; - patches = patches ++ optional crossBuildTools ./cross-tools-flags.patch; + patches = + patches + ++ optional ( + interactive && versionAtLeast version "7.2" + ) ./fix-test-suite-failures-with-perl-5.42.patch + ++ optional crossBuildTools ./cross-tools-flags.patch; postPatch = '' patchShebangs tp/maintain/regenerate_commands_perl_info.pl diff --git a/pkgs/development/tools/misc/texinfo/fix-glibc-2.34.patch b/pkgs/development/tools/misc/texinfo/fix-glibc-2.34.patch deleted file mode 100644 index 60f2e63b7ce03..0000000000000 --- a/pkgs/development/tools/misc/texinfo/fix-glibc-2.34.patch +++ /dev/null @@ -1,186 +0,0 @@ - -Patch by Vitezslav Crhonek -Source: https://src.fedoraproject.org/rpms/texinfo/c/9b2cca4817fa4bd8d520fed05e9560fc7183dcdf?branch=rawhide - -diff -up texinfo-6.8/gnulib/lib/cdefs.h.orig texinfo-6.8/gnulib/lib/cdefs.h ---- texinfo-6.8/gnulib/lib/cdefs.h.orig 2021-03-11 19:57:53.000000000 +0100 -+++ texinfo-6.8/gnulib/lib/cdefs.h 2021-07-19 12:26:46.985176475 +0200 -@@ -321,15 +321,15 @@ - - /* The nonnull function attribute marks pointer parameters that - must not be NULL. */ --#ifndef __attribute_nonnull__ -+#ifndef __nonnull - # if __GNUC_PREREQ (3,3) || __glibc_has_attribute (__nonnull__) --# define __attribute_nonnull__(params) __attribute__ ((__nonnull__ params)) -+# define __nonnull(params) __attribute__ ((__nonnull__ params)) - # else --# define __attribute_nonnull__(params) -+# define __nonnull(params) - # endif --#endif --#ifndef __nonnull --# define __nonnull(params) __attribute_nonnull__ (params) -+#elif !defined __GLIBC__ -+# undef __nonnull -+# define __nonnull(params) _GL_ATTRIBUTE_NONNULL (params) - #endif - - /* If fortification mode, we warn about unused results of certain -diff -up texinfo-6.8/gnulib/lib/libc-config.h.orig texinfo-6.8/gnulib/lib/libc-config.h ---- texinfo-6.8/gnulib/lib/libc-config.h.orig 2021-03-11 19:57:54.000000000 +0100 -+++ texinfo-6.8/gnulib/lib/libc-config.h 2021-07-19 12:27:58.810590975 +0200 -@@ -33,9 +33,9 @@ - #include - - /* On glibc this includes and and #defines -- _FEATURES_H, __WORDSIZE, and __set_errno. On FreeBSD 11 and -- DragonFlyBSD 5.9 it includes which defines __nonnull. -- Elsewhere it is harmless. */ -+ _FEATURES_H, __WORDSIZE, and __set_errno. On FreeBSD 11 it -+ includes which defines __nonnull. Elsewhere it -+ is harmless. */ - #include - - /* From glibc . */ -diff -up texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c ---- texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig 2021-03-11 19:57:54.000000000 +0100 -+++ texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c 2021-07-19 12:24:46.878419397 +0200 -@@ -192,7 +192,7 @@ DYNARRAY_NAME (free__array__) (struct DY - - /* Initialize a dynamic array object. This must be called before any - use of the object. */ --__attribute_nonnull__ ((1)) -+__nonnull ((1)) - static void - DYNARRAY_NAME (init) (struct DYNARRAY_STRUCT *list) - { -@@ -202,7 +202,7 @@ DYNARRAY_NAME (init) (struct DYNARRAY_ST - } - - /* Deallocate the dynamic array and its elements. */ --__attribute_maybe_unused__ __attribute_nonnull__ ((1)) -+__attribute_maybe_unused__ __nonnull ((1)) - static void - DYNARRAY_FREE (struct DYNARRAY_STRUCT *list) - { -@@ -213,7 +213,7 @@ DYNARRAY_FREE (struct DYNARRAY_STRUCT *l - } - - /* Return true if the dynamic array is in an error state. */ --__attribute_nonnull__ ((1)) -+__nonnull ((1)) - static inline bool - DYNARRAY_NAME (has_failed) (const struct DYNARRAY_STRUCT *list) - { -@@ -222,7 +222,7 @@ DYNARRAY_NAME (has_failed) (const struct - - /* Mark the dynamic array as failed. All elements are deallocated as - a side effect. */ --__attribute_nonnull__ ((1)) -+__nonnull ((1)) - static void - DYNARRAY_NAME (mark_failed) (struct DYNARRAY_STRUCT *list) - { -@@ -236,7 +236,7 @@ DYNARRAY_NAME (mark_failed) (struct DYNA - - /* Return the number of elements which have been added to the dynamic - array. */ --__attribute_nonnull__ ((1)) -+__nonnull ((1)) - static inline size_t - DYNARRAY_NAME (size) (const struct DYNARRAY_STRUCT *list) - { -@@ -245,7 +245,7 @@ DYNARRAY_NAME (size) (const struct DYNAR - - /* Return a pointer to the array element at INDEX. Terminate the - process if INDEX is out of bounds. */ --__attribute_nonnull__ ((1)) -+__nonnull ((1)) - static inline DYNARRAY_ELEMENT * - DYNARRAY_NAME (at) (struct DYNARRAY_STRUCT *list, size_t index) - { -@@ -257,7 +257,7 @@ DYNARRAY_NAME (at) (struct DYNARRAY_STRU - /* Return a pointer to the first array element, if any. For a - zero-length array, the pointer can be NULL even though the dynamic - array has not entered the failure state. */ --__attribute_nonnull__ ((1)) -+__nonnull ((1)) - static inline DYNARRAY_ELEMENT * - DYNARRAY_NAME (begin) (struct DYNARRAY_STRUCT *list) - { -@@ -267,7 +267,7 @@ DYNARRAY_NAME (begin) (struct DYNARRAY_S - /* Return a pointer one element past the last array element. For a - zero-length array, the pointer can be NULL even though the dynamic - array has not entered the failure state. */ --__attribute_nonnull__ ((1)) -+__nonnull ((1)) - static inline DYNARRAY_ELEMENT * - DYNARRAY_NAME (end) (struct DYNARRAY_STRUCT *list) - { -@@ -294,7 +294,7 @@ DYNARRAY_NAME (add__) (struct DYNARRAY_S - /* Add ITEM at the end of the array, enlarging it by one element. - Mark *LIST as failed if the dynamic array allocation size cannot be - increased. */ --__attribute_nonnull__ ((1)) -+__nonnull ((1)) - static inline void - DYNARRAY_NAME (add) (struct DYNARRAY_STRUCT *list, DYNARRAY_ELEMENT item) - { -@@ -348,8 +348,7 @@ DYNARRAY_NAME (emplace__) (struct DYNARR - /* Allocate a place for a new element in *LIST and return a pointer to - it. The pointer can be NULL if the dynamic array cannot be - enlarged due to a memory allocation failure. */ --__attribute_maybe_unused__ __attribute_warn_unused_result__ --__attribute_nonnull__ ((1)) -+__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1)) - static - /* Avoid inlining with the larger initialization code. */ - #if !(defined (DYNARRAY_ELEMENT_INIT) || defined (DYNARRAY_ELEMENT_FREE)) -@@ -373,7 +372,7 @@ DYNARRAY_NAME (emplace) (struct DYNARRAY - existing size, new elements are added (which can be initialized). - Otherwise, the list is truncated, and elements are freed. Return - false on memory allocation failure (and mark *LIST as failed). */ --__attribute_maybe_unused__ __attribute_nonnull__ ((1)) -+__attribute_maybe_unused__ __nonnull ((1)) - static bool - DYNARRAY_NAME (resize) (struct DYNARRAY_STRUCT *list, size_t size) - { -@@ -418,7 +417,7 @@ DYNARRAY_NAME (resize) (struct DYNARRAY_ - } - - /* Remove the last element of LIST if it is present. */ --__attribute_maybe_unused__ __attribute_nonnull__ ((1)) -+__attribute_maybe_unused__ __nonnull ((1)) - static void - DYNARRAY_NAME (remove_last) (struct DYNARRAY_STRUCT *list) - { -@@ -435,7 +434,7 @@ DYNARRAY_NAME (remove_last) (struct DYNA - - /* Remove all elements from the list. The elements are freed, but the - list itself is not. */ --__attribute_maybe_unused__ __attribute_nonnull__ ((1)) -+__attribute_maybe_unused__ __nonnull ((1)) - static void - DYNARRAY_NAME (clear) (struct DYNARRAY_STRUCT *list) - { -@@ -453,8 +452,7 @@ DYNARRAY_NAME (clear) (struct DYNARRAY_S - stored in *RESULT if LIST refers to an empty list. On success, the - pointer in *RESULT is heap-allocated and must be deallocated using - free. */ --__attribute_maybe_unused__ __attribute_warn_unused_result__ --__attribute_nonnull__ ((1, 2)) -+__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1, 2)) - static bool - DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list, - DYNARRAY_FINAL_TYPE *result) -@@ -485,8 +483,7 @@ DYNARRAY_NAME (finalize) (struct DYNARRA - have a sentinel at the end). If LENGTHP is not NULL, the array - length is written to *LENGTHP. *LIST is re-initialized and can be - reused. */ --__attribute_maybe_unused__ __attribute_warn_unused_result__ --__attribute_nonnull__ ((1)) -+__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1)) - static DYNARRAY_ELEMENT * - DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list, size_t *lengthp) - { diff --git a/pkgs/development/tools/misc/texinfo/fix-test-suite-failures-with-perl-5.42.patch b/pkgs/development/tools/misc/texinfo/fix-test-suite-failures-with-perl-5.42.patch new file mode 100644 index 0000000000000..59f89e16db271 --- /dev/null +++ b/pkgs/development/tools/misc/texinfo/fix-test-suite-failures-with-perl-5.42.patch @@ -0,0 +1,41 @@ +>From 1af3c9b91625e4d115ea979c45a75752b872c10f Mon Sep 17 00:00:00 2001 +From: Niko Tyni +Date: Sat, 13 Sep 2025 08:57:55 +0100 +Subject: [PATCH] Fix test suite failures with Perl 5.42 + +The precedence issues here were flagged by new diagnostics in Perl 5.42, +and the resulting warnings caused test failures. +--- + tp/Texinfo/Convert/Converter.pm | 2 +- + tp/Texinfo/Convert/LaTeX.pm | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm +index 5e14a9e..89e623b 100644 +--- a/tp/Texinfo/Convert/Converter.pm ++++ b/tp/Texinfo/Convert/Converter.pm +@@ -386,7 +386,7 @@ sub output_tree($$) + + my $fh; + my $encoded_output_file; +- if (! $output_file eq '') { ++ if ($output_file ne '') { + my $path_encoding; + ($encoded_output_file, $path_encoding) + = $self->encoded_output_file_name($output_file); +diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm +index ae947d1..f4ba076 100644 +--- a/tp/Texinfo/Convert/LaTeX.pm ++++ b/tp/Texinfo/Convert/LaTeX.pm +@@ -1085,7 +1085,7 @@ sub output($$) + + my $fh; + my $encoded_output_file; +- if (! $output_file eq '') { ++ if ($output_file ne '') { + my $path_encoding; + ($encoded_output_file, $path_encoding) + = $self->encoded_output_file_name($output_file); +-- +2.51.0 + diff --git a/pkgs/development/tools/misc/texinfo/packages.nix b/pkgs/development/tools/misc/texinfo/packages.nix index b385c25fe3d23..c7c49d7886434 100644 --- a/pkgs/development/tools/misc/texinfo/packages.nix +++ b/pkgs/development/tools/misc/texinfo/packages.nix @@ -65,11 +65,6 @@ let }; in { - texinfo6 = buildTexinfo { - version = "6.8"; - hash = "sha256-jrdT7Si8oh+PVsGhgDYq7XiSKb1i//WL+DaOm+tZ/sQ="; - patches = [ ./fix-glibc-2.34.patch ]; - }; texinfo7 = buildTexinfo { version = "7.2"; hash = "sha256-AynXeI++8RP6gsuAiJyhl6NEzg33ZG/gAJdMXXFDY6Y="; diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 06d66898f801a..61516c342af2e 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -135,10 +135,19 @@ rustPlatform.buildRustPackage (final: { }) ]; - postPatch = lib.optionalString webUISupport '' - substituteInPlace cli/loader/src/lib.rs \ - --replace-fail 'let emcc_name = if cfg!(windows) { "emcc.bat" } else { "emcc" };' 'let emcc_name = "${lib.getExe' emscripten "emcc"}";' - ''; + postPatch = + lib.optionalString webUISupport '' + substituteInPlace cli/loader/src/lib.rs \ + --replace-fail 'let emcc_name = if cfg!(windows) { "emcc.bat" } else { "emcc" };' 'let emcc_name = "${lib.getExe' emscripten "emcc"}";' + '' + # when building on static platforms: + # 1. remove the `libtree-sitter.$(SOEXT)` step from `all` + # 2. remove references to shared object files in the Makefile + + lib.optionalString stdenv.hostPlatform.isStatic '' + substituteInPlace ./Makefile \ + --replace-fail 'all: libtree-sitter.a libtree-sitter.$(SOEXT) tree-sitter.pc' 'all: libtree-sitter.a tree-sitter.pc' + sed -i '/^install:/,/^[^[:space:]]/ { /$(SOEXT/d; }' ./Makefile + ''; # Compile web assembly with emscripten. The --debug flag prevents us from # minifying the JavaScript; passing it allows us to side-step more Node @@ -151,8 +160,8 @@ rustPlatform.buildRustPackage (final: { postInstall = '' PREFIX=$out make install - ${lib.optionalString (!enableShared) "rm $out/lib/*.so{,.*}"} - ${lib.optionalString (!enableStatic) "rm $out/lib/*.a"} + ${lib.optionalString (!enableShared) "rm -f $out/lib/*.so{,.*}"} + ${lib.optionalString (!enableStatic) "rm -f $out/lib/*.a"} '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd tree-sitter \ diff --git a/pkgs/development/web/nodejs/sab-test-32bit.patch b/pkgs/development/web/nodejs/sab-test-32bit.patch new file mode 100644 index 0000000000000..c90e36b1df6c8 --- /dev/null +++ b/pkgs/development/web/nodejs/sab-test-32bit.patch @@ -0,0 +1,27 @@ +diff --git a/test/parallel/test-internal-util-construct-sab.js b/test/parallel/test-internal-util-construct-sab.js +index 5ff9b09f8e7d36..403b59809e47d2 100644 +--- a/test/parallel/test-internal-util-construct-sab.js ++++ b/test/parallel/test-internal-util-construct-sab.js +@@ -3,16 +3,20 @@ + + require('../common'); + const assert = require('assert'); ++const { kMaxLength } = require('buffer'); + const { isSharedArrayBuffer } = require('util/types'); + const { constructSharedArrayBuffer } = require('internal/util'); + + // We're testing that we can construct a SAB even when the global is not exposed. + assert.strictEqual(typeof SharedArrayBuffer, 'undefined'); + +-for (const length of [undefined, 0, 1, 2 ** 32]) { ++for (const length of [undefined, 0, 1, 2 ** 16]) { + assert(isSharedArrayBuffer(constructSharedArrayBuffer(length))); + } + +-for (const length of [-1, Number.MAX_SAFE_INTEGER + 1, 2 ** 64]) { ++// Specifically test the following cases: ++// - out-of-range allocation requests should not crash the process ++// - no int64 overflow ++for (const length of [-1, kMaxLength + 1, 2 ** 64]) { + assert.throws(() => constructSharedArrayBuffer(length), RangeError); + } diff --git a/pkgs/development/web/nodejs/v24-32bit.patch b/pkgs/development/web/nodejs/v24-32bit.patch new file mode 100644 index 0000000000000..f73a77c49d484 --- /dev/null +++ b/pkgs/development/web/nodejs/v24-32bit.patch @@ -0,0 +1,26 @@ +diff --git a/deps/v8/src/compiler/turboshaft/int64-lowering-reducer.h b/deps/v8/src/compiler/turboshaft/int64-lowering-reducer.h +index ee6fe95a603..58d091a0dc7 100644 +--- a/deps/v8/src/compiler/turboshaft/int64-lowering-reducer.h ++++ b/deps/v8/src/compiler/turboshaft/int64-lowering-reducer.h +@@ -637,7 +637,9 @@ class Int64LoweringReducer : public Next { + result = __ Word32CountLeadingZeros(high); + } + +- return __ Tuple(result, __ Word32Constant(0)); ++ // patched for arm build. see https://github.com/nodejs/node/issues/58458 ++ V result_ = result; ++ return __ Tuple(result_, __ Word32Constant(0)); + } + + V LowerCtz(V input) { +@@ -650,7 +652,9 @@ class Int64LoweringReducer : public Next { + result = __ Word32CountTrailingZeros(low); + } + +- return __ Tuple(result, __ Word32Constant(0)); ++ // patched for arm build. see https://github.com/nodejs/node/issues/58458 ++ V result_ = result; ++ return __ Tuple(result_, __ Word32Constant(0)); + } + + V LowerPopCount(V input) { \ No newline at end of file diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix index 4a2068abc0ebd..09ce2e3e28af5 100644 --- a/pkgs/development/web/nodejs/v24.nix +++ b/pkgs/development/web/nodejs/v24.nix @@ -67,5 +67,11 @@ buildNodejs { hash = "sha256-BBBShQwU20TSY8GtPehQ9i3AH4ZKUGIr8O0bRsgrpNo="; revert = true; }) + ] + ++ lib.optionals stdenv.is32bit [ + # see: https://github.com/nodejs/node/issues/58458 + ./v24-32bit.patch + # see: https://github.com/nodejs/node/issues/61025 + ./sab-test-32bit.patch ]; } diff --git a/pkgs/development/web/playwright/driver.nix b/pkgs/development/web/playwright/driver.nix index 66e3fb2a9c6bf..4ce10dfdd2355 100644 --- a/pkgs/development/web/playwright/driver.nix +++ b/pkgs/development/web/playwright/driver.nix @@ -122,9 +122,6 @@ let shopt -s extglob - mkdir -p "$out/lib" - cp -r packages/playwright/node_modules "$out/lib/node_modules" - mkdir -p "$out/lib/node_modules/playwright" cp -r packages/playwright/!(bundles|src|node_modules|.*) "$out/lib/node_modules/playwright" diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index e260175e7af86..f690f2a09ceb4 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -82,6 +82,12 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/OpenTTD/OpenTTD/commit/14fac2ad37bfb9cec56b4f9169d864f6f1c7b96e.patch"; hash = "sha256-L35ybnTKPO+HVP/7ZYzWM2mA+s1RAywhofSuzpy/6sc="; }) + + (fetchpatch { + name = "fix-GCC-15-due-to-missing-CRTP-usage.patch"; + url = "https://github.com/OpenTTD/OpenTTD/commit/db36e61807955c896267d6585de0577efd30465d.patch"; + hash = "sha256-wJqboBuB+gcn1UPoTlym9IaL7tXtdKEp/E474vG5rYk="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index 733aa62889576..9bd6351bd2b1f 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -45,6 +45,10 @@ stdenv.mkDerivation rec { pname = "lilypond"; version = "2.24.4"; + outputs = [ + "out" + "man" + ]; src = fetchzip { url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix index ed2917b369a6b..95bb75318e053 100644 --- a/pkgs/misc/lilypond/with-fonts.nix +++ b/pkgs/misc/lilypond/with-fonts.nix @@ -7,7 +7,12 @@ }: lib.appendToName "with-fonts" (symlinkJoin { - inherit (lilypond) meta name version; + inherit (lilypond) + pname + outputs + version + meta + ; paths = [ lilypond ] ++ openlilylib-fonts.all; @@ -15,7 +20,9 @@ lib.appendToName "with-fonts" (symlinkJoin { postBuild = '' for p in $out/bin/*; do - wrapProgram "$p" --set LILYPOND_DATADIR "$out/share/lilypond/${lilypond.version}" + wrapProgram "$p" --set LILYPOND_DATADIR "$out/share/lilypond/${lilypond.version}" done + + ln -s ${lilypond.man} $man ''; }) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index f8e39971851d1..611571f016d87 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -185,7 +185,6 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/os-specific/linux/freeipa/default.nix b/pkgs/os-specific/linux/freeipa/default.nix index c99bd7e9ddc9a..e2b10dc5df6ce 100644 --- a/pkgs/os-specific/linux/freeipa/default.nix +++ b/pkgs/os-specific/linux/freeipa/default.nix @@ -171,7 +171,6 @@ stdenv.mkDerivation rec { versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; - versionCheckProgramArg = "--version"; doInstallCheck = true; meta = { diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index 86c2567602104..9d0befcd7330e 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; makeFlags = [ "PREFIX=$(out)" - "-C src" + "--directory=src" ]; passthru.tests = { @@ -59,6 +59,8 @@ stdenv.mkDerivation rec { # outputs = [ "out" "dev" ]; + __structuredAttrs = true; + meta = { description = "Library for loading eBPF programs and reading and manipulating eBPF objects from user-space"; homepage = "https://github.com/libbpf/libbpf"; diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix index 19e62bd4a2f7d..2081ba8eacc26 100644 --- a/pkgs/os-specific/linux/lvm2/2_03.nix +++ b/pkgs/os-specific/linux/lvm2/2_03.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "2.03.35"; - hash = "sha256-6/KLNCdTXitavZmRzYObYWIqDb+4yG3w968fadyqg3E="; + version = "2.03.37"; + hash = "sha256-sCZWzDmi+GpwLEMtqw0DF+EhEfyp1iOhjxucP4e4ggA="; } diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix index b55d436ffcc47..d9fd4c131d682 100644 --- a/pkgs/os-specific/linux/lvm2/common.nix +++ b/pkgs/os-specific/linux/lvm2/common.nix @@ -143,8 +143,6 @@ stdenv.mkDerivation rec { } )) ./fix-stdio-usage.patch - # https://gitlab.com/lvmteam/lvm2/-/merge_requests/33 - ./fix-manpage-reproducibility.patch ]; doCheck = false; # requires root diff --git a/pkgs/os-specific/linux/lvm2/fix-manpage-reproducibility.patch b/pkgs/os-specific/linux/lvm2/fix-manpage-reproducibility.patch deleted file mode 100644 index 1e687f3630cc0..0000000000000 --- a/pkgs/os-specific/linux/lvm2/fix-manpage-reproducibility.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit 950f219ed287358df8c128f7e22989177a8de47c -Author: Arnout Engelen -Date: Mon Aug 25 15:55:44 2025 +0200 - - man: simplify vmautoactivation(7) - - Previously this was hard-coded to: "Autoactivation commands use a number - of temp files in /run/lvm (with the expectation that /run is cleared - between boots.)" - - Since c1bfc8737f08bf7558b2d788e9756f895cd9eaaa it was made more generic, - but on some systems this logic leads to "Autoactivation commands use a - number of temp files in /run/lvm (with the expectation that /var/run - is cleared between boots)." which I'd say adds more confusion than it - solves. - -diff --git a/man/lvmautoactivation.7_main b/man/lvmautoactivation.7_main -index e55943b29..9d429055c 100644 ---- a/man/lvmautoactivation.7_main -+++ b/man/lvmautoactivation.7_main -@@ -175,9 +175,7 @@ is reserved for udev output.) - . - Autoactivation commands use a number of temp files in - .I #DEFAULT_RUN_DIR# --(with the expectation that --.I #DEFAULT_PID_DIR# --is cleared between boots). -+(with the expectation that it is cleared between boots). - . - .TP - .B pvs_online diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index be125ae388626..92eb4968f95d6 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -27,12 +27,12 @@ }: stdenv.mkDerivation rec { - version = "1.1.5"; + version = "1.1.6"; pname = "nftables"; src = fetchurl { url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.xz"; - hash = "sha256-Ha8Q8yLhT9kKAXU4qvLANNfMHrHMQY3tR0RdcU6haNQ="; + hash = "sha256-NykxvahVazEGNqL5AgrccQ+bq2b0fv4M6Qv/gArCUww="; }; patches = [ diff --git a/pkgs/os-specific/linux/projecteur/default.nix b/pkgs/os-specific/linux/projecteur/default.nix index 30ae0ba4543d8..b6823f0dc433b 100644 --- a/pkgs/os-specific/linux/projecteur/default.nix +++ b/pkgs/os-specific/linux/projecteur/default.nix @@ -43,7 +43,6 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; meta = { description = "Linux/X11 application for the Logitech Spotlight device (and similar devices)"; diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index af643a8b6a672..1d1f61f7f6128 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -216,7 +216,6 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 3295bdbb68d6c..290bb4e1a1e0c 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -1,7 +1,7 @@ { newScope, lib, - python3, + python312, }: let @@ -13,7 +13,7 @@ let { callPackage = newScope self; - python3 = callPackage ./python.nix { inherit python3; }; + python3 = callPackage ./python.nix { python3 = python312; }; hyperkitty = callPackage ./hyperkitty.nix { }; diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix index ffa3b18ea88bb..c8fd7159f7178 100644 --- a/pkgs/servers/mail/mailman/python.nix +++ b/pkgs/servers/mail/mailman/python.nix @@ -26,6 +26,8 @@ lib.fix ( [1] 72a14ea563a3f5bf85db659349a533fe75a8b0ce [2] f931bc81d63f5cfda55ac73d754c87b3fd63b291 */ + # https://gitlab.com/mailman/hyperkitty/-/merge_requests/681 + django = super.django_4; django-allauth = super.django-allauth.overrideAttrs ( new: diff --git a/pkgs/servers/mail/public-inbox/default.nix b/pkgs/servers/mail/public-inbox/default.nix index ef1b07ef775a9..71dfb8b814068 100644 --- a/pkgs/servers/mail/public-inbox/default.nix +++ b/pkgs/servers/mail/public-inbox/default.nix @@ -39,7 +39,6 @@ PlackMiddlewareReverseProxy, PlackTestExternalServer, Xapian, - TestSimple13, TimeDate, URI, XMLTreePP, @@ -145,7 +144,6 @@ buildPerlPackage rec { xapian EmailMIME PlackTestExternalServer - TestSimple13 XMLTreePP ] ++ lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/servers/x11/xorg/darwin/dri/GL/internal/dri_interface.h b/pkgs/servers/x11/xorg/darwin/dri/GL/internal/dri_interface.h deleted file mode 100644 index b012570ae133c..0000000000000 --- a/pkgs/servers/x11/xorg/darwin/dri/GL/internal/dri_interface.h +++ /dev/null @@ -1,1409 +0,0 @@ -/* - * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. - * Copyright 2007-2008 Red Hat, Inc. - * (C) Copyright IBM Corporation 2004 - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * on the rights to use, copy, modify, merge, publish, distribute, sub - * license, and/or sell copies of the Software, and to permit persons to whom - * the Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL - * THE COPYRIGHT HOLDERS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE - * USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -/** - * \file dri_interface.h - * - * This file contains all the types and functions that define the interface - * between a DRI driver and driver loader. Currently, the most common driver - * loader is the XFree86 libGL.so. However, other loaders do exist, and in - * the future the server-side libglx.a will also be a loader. - * - * \author Kevin E. Martin - * \author Ian Romanick - * \author Kristian Høgsberg - */ - -#ifndef DRI_INTERFACE_H -#define DRI_INTERFACE_H - -/* For archs with no drm.h */ -#if defined(__APPLE__) || defined(__CYGWIN__) || defined(__GNU__) -#ifndef __NOT_HAVE_DRM_H -#define __NOT_HAVE_DRM_H -#endif -#endif - -#ifndef __NOT_HAVE_DRM_H -#include -#else -typedef unsigned int drm_context_t; -typedef unsigned int drm_drawable_t; -typedef struct drm_clip_rect drm_clip_rect_t; -#endif - -/** - * \name DRI interface structures - * - * The following structures define the interface between the GLX client - * side library and the DRI (direct rendering infrastructure). - */ -/*@{*/ -typedef struct __DRIdisplayRec __DRIdisplay; -typedef struct __DRIscreenRec __DRIscreen; -typedef struct __DRIcontextRec __DRIcontext; -typedef struct __DRIdrawableRec __DRIdrawable; -typedef struct __DRIconfigRec __DRIconfig; -typedef struct __DRIframebufferRec __DRIframebuffer; -typedef struct __DRIversionRec __DRIversion; - -typedef struct __DRIcoreExtensionRec __DRIcoreExtension; -typedef struct __DRIextensionRec __DRIextension; -typedef struct __DRIcopySubBufferExtensionRec __DRIcopySubBufferExtension; -typedef struct __DRIswapControlExtensionRec __DRIswapControlExtension; -typedef struct __DRIframeTrackingExtensionRec __DRIframeTrackingExtension; -typedef struct __DRImediaStreamCounterExtensionRec __DRImediaStreamCounterExtension; -typedef struct __DRItexOffsetExtensionRec __DRItexOffsetExtension; -typedef struct __DRItexBufferExtensionRec __DRItexBufferExtension; -typedef struct __DRIlegacyExtensionRec __DRIlegacyExtension; -typedef struct __DRIswrastExtensionRec __DRIswrastExtension; -typedef struct __DRIbufferRec __DRIbuffer; -typedef struct __DRIdri2ExtensionRec __DRIdri2Extension; -typedef struct __DRIdri2LoaderExtensionRec __DRIdri2LoaderExtension; -typedef struct __DRI2flushExtensionRec __DRI2flushExtension; -typedef struct __DRI2throttleExtensionRec __DRI2throttleExtension; - - -typedef struct __DRIimageLoaderExtensionRec __DRIimageLoaderExtension; -typedef struct __DRIimageDriverExtensionRec __DRIimageDriverExtension; - -/*@}*/ - - -/** - * Extension struct. Drivers 'inherit' from this struct by embedding - * it as the first element in the extension struct. - * - * We never break API in for a DRI extension. If we need to change - * the way things work in a non-backwards compatible manner, we - * introduce a new extension. During a transition period, we can - * leave both the old and the new extension in the driver, which - * allows us to move to the new interface without having to update the - * loader(s) in lock step. - * - * However, we can add entry points to an extension over time as long - * as we don't break the old ones. As we add entry points to an - * extension, we increase the version number. The corresponding - * #define can be used to guard code that accesses the new entry - * points at compile time and the version field in the extension - * struct can be used at run-time to determine how to use the - * extension. - */ -struct __DRIextensionRec { - const char *name; - int version; -}; - -/** - * The first set of extension are the screen extensions, returned by - * __DRIcore::getExtensions(). This entry point will return a list of - * extensions and the loader can use the ones it knows about by - * casting them to more specific extensions and advertising any GLX - * extensions the DRI extensions enables. - */ - -/** - * Used by drivers to indicate support for setting the read drawable. - */ -#define __DRI_READ_DRAWABLE "DRI_ReadDrawable" -#define __DRI_READ_DRAWABLE_VERSION 1 - -/** - * Used by drivers that implement the GLX_MESA_copy_sub_buffer extension. - */ -#define __DRI_COPY_SUB_BUFFER "DRI_CopySubBuffer" -#define __DRI_COPY_SUB_BUFFER_VERSION 1 -struct __DRIcopySubBufferExtensionRec { - __DRIextension base; - void (*copySubBuffer)(__DRIdrawable *drawable, int x, int y, int w, int h); -}; - -/** - * Used by drivers that implement the GLX_SGI_swap_control or - * GLX_MESA_swap_control extension. - */ -#define __DRI_SWAP_CONTROL "DRI_SwapControl" -#define __DRI_SWAP_CONTROL_VERSION 1 -struct __DRIswapControlExtensionRec { - __DRIextension base; - void (*setSwapInterval)(__DRIdrawable *drawable, unsigned int inteval); - unsigned int (*getSwapInterval)(__DRIdrawable *drawable); -}; - -/** - * Used by drivers that implement the GLX_MESA_swap_frame_usage extension. - */ -#define __DRI_FRAME_TRACKING "DRI_FrameTracking" -#define __DRI_FRAME_TRACKING_VERSION 1 -struct __DRIframeTrackingExtensionRec { - __DRIextension base; - - /** - * Enable or disable frame usage tracking. - * - * \since Internal API version 20030317. - */ - int (*frameTracking)(__DRIdrawable *drawable, GLboolean enable); - - /** - * Retrieve frame usage information. - * - * \since Internal API version 20030317. - */ - int (*queryFrameTracking)(__DRIdrawable *drawable, - int64_t * sbc, int64_t * missedFrames, - float * lastMissedUsage, float * usage); -}; - - -/** - * Used by drivers that implement the GLX_SGI_video_sync extension. - */ -#define __DRI_MEDIA_STREAM_COUNTER "DRI_MediaStreamCounter" -#define __DRI_MEDIA_STREAM_COUNTER_VERSION 1 -struct __DRImediaStreamCounterExtensionRec { - __DRIextension base; - - /** - * Wait for the MSC to equal target_msc, or, if that has already passed, - * the next time (MSC % divisor) is equal to remainder. If divisor is - * zero, the function will return as soon as MSC is greater than or equal - * to target_msc. - */ - int (*waitForMSC)(__DRIdrawable *drawable, - int64_t target_msc, int64_t divisor, int64_t remainder, - int64_t * msc, int64_t * sbc); - - /** - * Get the number of vertical refreshes since some point in time before - * this function was first called (i.e., system start up). - */ - int (*getDrawableMSC)(__DRIscreen *screen, __DRIdrawable *drawable, - int64_t *msc); -}; - - -#define __DRI_TEX_OFFSET "DRI_TexOffset" -#define __DRI_TEX_OFFSET_VERSION 1 -struct __DRItexOffsetExtensionRec { - __DRIextension base; - - /** - * Method to override base texture image with a driver specific 'offset'. - * The depth passed in allows e.g. to ignore the alpha channel of texture - * images where the non-alpha components don't occupy a whole texel. - * - * For GLX_EXT_texture_from_pixmap with AIGLX. - */ - void (*setTexOffset)(__DRIcontext *pDRICtx, GLint texname, - unsigned long long offset, GLint depth, GLuint pitch); -}; - - -/* Valid values for format in the setTexBuffer2 function below. These - * values match the GLX tokens for compatibility reasons, but we - * define them here since the DRI interface can't depend on GLX. */ -#define __DRI_TEXTURE_FORMAT_NONE 0x20D8 -#define __DRI_TEXTURE_FORMAT_RGB 0x20D9 -#define __DRI_TEXTURE_FORMAT_RGBA 0x20DA - -#define __DRI_TEX_BUFFER "DRI_TexBuffer" -#define __DRI_TEX_BUFFER_VERSION 2 -struct __DRItexBufferExtensionRec { - __DRIextension base; - - /** - * Method to override base texture image with the contents of a - * __DRIdrawable. - * - * For GLX_EXT_texture_from_pixmap with AIGLX. Deprecated in favor of - * setTexBuffer2 in version 2 of this interface - */ - void (*setTexBuffer)(__DRIcontext *pDRICtx, - GLint target, - __DRIdrawable *pDraw); - - /** - * Method to override base texture image with the contents of a - * __DRIdrawable, including the required texture format attribute. - * - * For GLX_EXT_texture_from_pixmap with AIGLX. - */ - void (*setTexBuffer2)(__DRIcontext *pDRICtx, - GLint target, - GLint format, - __DRIdrawable *pDraw); - /** - * Method to release texture buffer in case some special platform - * need this. - * - * For GLX_EXT_texture_from_pixmap with AIGLX. - */ - void (*releaseTexBuffer)(__DRIcontext *pDRICtx, - GLint target, - __DRIdrawable *pDraw); -}; - -/** - * Used by drivers that implement DRI2 - */ -#define __DRI2_FLUSH "DRI2_Flush" -#define __DRI2_FLUSH_VERSION 4 - -#define __DRI2_FLUSH_DRAWABLE (1 << 0) /* the drawable should be flushed. */ -#define __DRI2_FLUSH_CONTEXT (1 << 1) /* glFlush should be called */ - -enum __DRI2throttleReason { - __DRI2_THROTTLE_SWAPBUFFER, - __DRI2_THROTTLE_COPYSUBBUFFER, - __DRI2_THROTTLE_FLUSHFRONT -}; - -struct __DRI2flushExtensionRec { - __DRIextension base; - void (*flush)(__DRIdrawable *drawable); - - /** - * Ask the driver to call getBuffers/getBuffersWithFormat before - * it starts rendering again. - * - * \param drawable the drawable to invalidate - * - * \since 3 - */ - void (*invalidate)(__DRIdrawable *drawable); - - /** - * This function reduces the number of flushes in the driver by combining - * several operations into one call. - * - * It can: - * - throttle - * - flush a drawable - * - flush a context - * - * \param context the context - * \param drawable the drawable to flush - * \param flags a combination of _DRI2_FLUSH_xxx flags - * \param throttle_reason the reason for throttling, 0 = no throttling - * - * \since 4 - */ - void (*flush_with_flags)(__DRIcontext *ctx, - __DRIdrawable *drawable, - unsigned flags, - enum __DRI2throttleReason throttle_reason); -}; - - -/** - * Extension that the driver uses to request - * throttle callbacks. - */ - -#define __DRI2_THROTTLE "DRI2_Throttle" -#define __DRI2_THROTTLE_VERSION 1 - -struct __DRI2throttleExtensionRec { - __DRIextension base; - void (*throttle)(__DRIcontext *ctx, - __DRIdrawable *drawable, - enum __DRI2throttleReason reason); -}; - -/*@}*/ - -/** - * The following extensions describe loader features that the DRI - * driver can make use of. Some of these are mandatory, such as the - * getDrawableInfo extension for DRI and the DRI Loader extensions for - * DRI2, while others are optional, and if present allow the driver to - * expose certain features. The loader pass in a NULL terminated - * array of these extensions to the driver in the createNewScreen - * constructor. - */ - -typedef struct __DRIgetDrawableInfoExtensionRec __DRIgetDrawableInfoExtension; -typedef struct __DRIsystemTimeExtensionRec __DRIsystemTimeExtension; -typedef struct __DRIdamageExtensionRec __DRIdamageExtension; -typedef struct __DRIloaderExtensionRec __DRIloaderExtension; -typedef struct __DRIswrastLoaderExtensionRec __DRIswrastLoaderExtension; - - -/** - * Callback to getDrawableInfo protocol - */ -#define __DRI_GET_DRAWABLE_INFO "DRI_GetDrawableInfo" -#define __DRI_GET_DRAWABLE_INFO_VERSION 1 -struct __DRIgetDrawableInfoExtensionRec { - __DRIextension base; - - /** - * This function is used to get information about the position, size, and - * clip rects of a drawable. - */ - GLboolean (* getDrawableInfo) ( __DRIdrawable *drawable, - unsigned int * index, unsigned int * stamp, - int * x, int * y, int * width, int * height, - int * numClipRects, drm_clip_rect_t ** pClipRects, - int * backX, int * backY, - int * numBackClipRects, drm_clip_rect_t ** pBackClipRects, - void *loaderPrivate); -}; - -/** - * Callback to get system time for media stream counter extensions. - */ -#define __DRI_SYSTEM_TIME "DRI_SystemTime" -#define __DRI_SYSTEM_TIME_VERSION 1 -struct __DRIsystemTimeExtensionRec { - __DRIextension base; - - /** - * Get the 64-bit unadjusted system time (UST). - */ - int (*getUST)(int64_t * ust); - - /** - * Get the media stream counter (MSC) rate. - * - * Matching the definition in GLX_OML_sync_control, this function returns - * the rate of the "media stream counter". In practical terms, this is - * the frame refresh rate of the display. - */ - GLboolean (*getMSCRate)(__DRIdrawable *draw, - int32_t * numerator, int32_t * denominator, - void *loaderPrivate); -}; - -/** - * Damage reporting - */ -#define __DRI_DAMAGE "DRI_Damage" -#define __DRI_DAMAGE_VERSION 1 -struct __DRIdamageExtensionRec { - __DRIextension base; - - /** - * Reports areas of the given drawable which have been modified by the - * driver. - * - * \param drawable which the drawing was done to. - * \param rects rectangles affected, with the drawable origin as the - * origin. - * \param x X offset of the drawable within the screen (used in the - * front_buffer case) - * \param y Y offset of the drawable within the screen. - * \param front_buffer boolean flag for whether the drawing to the - * drawable was actually done directly to the front buffer (instead - * of backing storage, for example) - * \param loaderPrivate the data passed in at createNewDrawable time - */ - void (*reportDamage)(__DRIdrawable *draw, - int x, int y, - drm_clip_rect_t *rects, int num_rects, - GLboolean front_buffer, - void *loaderPrivate); -}; - -#define __DRI_SWRAST_IMAGE_OP_DRAW 1 -#define __DRI_SWRAST_IMAGE_OP_CLEAR 2 -#define __DRI_SWRAST_IMAGE_OP_SWAP 3 - -/** - * SWRast Loader extension. - */ -#define __DRI_SWRAST_LOADER "DRI_SWRastLoader" -#define __DRI_SWRAST_LOADER_VERSION 1 -struct __DRIswrastLoaderExtensionRec { - __DRIextension base; - - /* - * Drawable position and size - */ - void (*getDrawableInfo)(__DRIdrawable *drawable, - int *x, int *y, int *width, int *height, - void *loaderPrivate); - - /** - * Put image to drawable - */ - void (*putImage)(__DRIdrawable *drawable, int op, - int x, int y, int width, int height, - char *data, void *loaderPrivate); - - /** - * Get image from readable - */ - void (*getImage)(__DRIdrawable *readable, - int x, int y, int width, int height, - char *data, void *loaderPrivate); -}; - -/** - * Invalidate loader extension. The presence of this extension - * indicates to the DRI driver that the loader will call invalidate in - * the __DRI2_FLUSH extension, whenever the needs to query for new - * buffers. This means that the DRI driver can drop the polling in - * glViewport(). - * - * The extension doesn't provide any functionality, it's only use to - * indicate to the driver that it can use the new semantics. A DRI - * driver can use this to switch between the different semantics or - * just refuse to initialize if this extension isn't present. - */ -#define __DRI_USE_INVALIDATE "DRI_UseInvalidate" -#define __DRI_USE_INVALIDATE_VERSION 1 - -typedef struct __DRIuseInvalidateExtensionRec __DRIuseInvalidateExtension; -struct __DRIuseInvalidateExtensionRec { - __DRIextension base; -}; - -/** - * The remaining extensions describe driver extensions, immediately - * available interfaces provided by the driver. To start using the - * driver, dlsym() for the __DRI_DRIVER_EXTENSIONS symbol and look for - * the extension you need in the array. - */ -#define __DRI_DRIVER_EXTENSIONS "__driDriverExtensions" - -/** - * This symbol replaces the __DRI_DRIVER_EXTENSIONS symbol, and will be - * suffixed by "_drivername", allowing multiple drivers to be built into one - * library, and also giving the driver the chance to return a variable driver - * extensions struct depending on the driver name being loaded or any other - * system state. - * - * The function prototype is: - * - * const __DRIextension **__driDriverGetExtensions_drivername(void); - */ -#define __DRI_DRIVER_GET_EXTENSIONS "__driDriverGetExtensions" - -/** - * Tokens for __DRIconfig attribs. A number of attributes defined by - * GLX or EGL standards are not in the table, as they must be provided - * by the loader. For example, FBConfig ID or visual ID, drawable type. - */ - -#define __DRI_ATTRIB_BUFFER_SIZE 1 -#define __DRI_ATTRIB_LEVEL 2 -#define __DRI_ATTRIB_RED_SIZE 3 -#define __DRI_ATTRIB_GREEN_SIZE 4 -#define __DRI_ATTRIB_BLUE_SIZE 5 -#define __DRI_ATTRIB_LUMINANCE_SIZE 6 -#define __DRI_ATTRIB_ALPHA_SIZE 7 -#define __DRI_ATTRIB_ALPHA_MASK_SIZE 8 -#define __DRI_ATTRIB_DEPTH_SIZE 9 -#define __DRI_ATTRIB_STENCIL_SIZE 10 -#define __DRI_ATTRIB_ACCUM_RED_SIZE 11 -#define __DRI_ATTRIB_ACCUM_GREEN_SIZE 12 -#define __DRI_ATTRIB_ACCUM_BLUE_SIZE 13 -#define __DRI_ATTRIB_ACCUM_ALPHA_SIZE 14 -#define __DRI_ATTRIB_SAMPLE_BUFFERS 15 -#define __DRI_ATTRIB_SAMPLES 16 -#define __DRI_ATTRIB_RENDER_TYPE 17 -#define __DRI_ATTRIB_CONFIG_CAVEAT 18 -#define __DRI_ATTRIB_CONFORMANT 19 -#define __DRI_ATTRIB_DOUBLE_BUFFER 20 -#define __DRI_ATTRIB_STEREO 21 -#define __DRI_ATTRIB_AUX_BUFFERS 22 -#define __DRI_ATTRIB_TRANSPARENT_TYPE 23 -#define __DRI_ATTRIB_TRANSPARENT_INDEX_VALUE 24 -#define __DRI_ATTRIB_TRANSPARENT_RED_VALUE 25 -#define __DRI_ATTRIB_TRANSPARENT_GREEN_VALUE 26 -#define __DRI_ATTRIB_TRANSPARENT_BLUE_VALUE 27 -#define __DRI_ATTRIB_TRANSPARENT_ALPHA_VALUE 28 -#define __DRI_ATTRIB_FLOAT_MODE 29 -#define __DRI_ATTRIB_RED_MASK 30 -#define __DRI_ATTRIB_GREEN_MASK 31 -#define __DRI_ATTRIB_BLUE_MASK 32 -#define __DRI_ATTRIB_ALPHA_MASK 33 -#define __DRI_ATTRIB_MAX_PBUFFER_WIDTH 34 -#define __DRI_ATTRIB_MAX_PBUFFER_HEIGHT 35 -#define __DRI_ATTRIB_MAX_PBUFFER_PIXELS 36 -#define __DRI_ATTRIB_OPTIMAL_PBUFFER_WIDTH 37 -#define __DRI_ATTRIB_OPTIMAL_PBUFFER_HEIGHT 38 -#define __DRI_ATTRIB_VISUAL_SELECT_GROUP 39 -#define __DRI_ATTRIB_SWAP_METHOD 40 -#define __DRI_ATTRIB_MAX_SWAP_INTERVAL 41 -#define __DRI_ATTRIB_MIN_SWAP_INTERVAL 42 -#define __DRI_ATTRIB_BIND_TO_TEXTURE_RGB 43 -#define __DRI_ATTRIB_BIND_TO_TEXTURE_RGBA 44 -#define __DRI_ATTRIB_BIND_TO_MIPMAP_TEXTURE 45 -#define __DRI_ATTRIB_BIND_TO_TEXTURE_TARGETS 46 -#define __DRI_ATTRIB_YINVERTED 47 -#define __DRI_ATTRIB_FRAMEBUFFER_SRGB_CAPABLE 48 - -/* __DRI_ATTRIB_RENDER_TYPE */ -#define __DRI_ATTRIB_RGBA_BIT 0x01 -#define __DRI_ATTRIB_COLOR_INDEX_BIT 0x02 -#define __DRI_ATTRIB_LUMINANCE_BIT 0x04 -#define __DRI_ATTRIB_FLOAT_BIT 0x08 -#define __DRI_ATTRIB_UNSIGNED_FLOAT_BIT 0x10 - -/* __DRI_ATTRIB_CONFIG_CAVEAT */ -#define __DRI_ATTRIB_SLOW_BIT 0x01 -#define __DRI_ATTRIB_NON_CONFORMANT_CONFIG 0x02 - -/* __DRI_ATTRIB_TRANSPARENT_TYPE */ -#define __DRI_ATTRIB_TRANSPARENT_RGB 0x00 -#define __DRI_ATTRIB_TRANSPARENT_INDEX 0x01 - -/* __DRI_ATTRIB_BIND_TO_TEXTURE_TARGETS */ -#define __DRI_ATTRIB_TEXTURE_1D_BIT 0x01 -#define __DRI_ATTRIB_TEXTURE_2D_BIT 0x02 -#define __DRI_ATTRIB_TEXTURE_RECTANGLE_BIT 0x04 - -/** - * This extension defines the core DRI functionality. - */ -#define __DRI_CORE "DRI_Core" -#define __DRI_CORE_VERSION 1 - -struct __DRIcoreExtensionRec { - __DRIextension base; - - __DRIscreen *(*createNewScreen)(int screen, int fd, - unsigned int sarea_handle, - const __DRIextension **extensions, - const __DRIconfig ***driverConfigs, - void *loaderPrivate); - - void (*destroyScreen)(__DRIscreen *screen); - - const __DRIextension **(*getExtensions)(__DRIscreen *screen); - - int (*getConfigAttrib)(const __DRIconfig *config, - unsigned int attrib, - unsigned int *value); - - int (*indexConfigAttrib)(const __DRIconfig *config, int index, - unsigned int *attrib, unsigned int *value); - - __DRIdrawable *(*createNewDrawable)(__DRIscreen *screen, - const __DRIconfig *config, - unsigned int drawable_id, - unsigned int head, - void *loaderPrivate); - - void (*destroyDrawable)(__DRIdrawable *drawable); - - void (*swapBuffers)(__DRIdrawable *drawable); - - __DRIcontext *(*createNewContext)(__DRIscreen *screen, - const __DRIconfig *config, - __DRIcontext *shared, - void *loaderPrivate); - - int (*copyContext)(__DRIcontext *dest, - __DRIcontext *src, - unsigned long mask); - - void (*destroyContext)(__DRIcontext *context); - - int (*bindContext)(__DRIcontext *ctx, - __DRIdrawable *pdraw, - __DRIdrawable *pread); - - int (*unbindContext)(__DRIcontext *ctx); -}; - -/** - * Stored version of some component (i.e., server-side DRI module, kernel-side - * DRM, etc.). - * - * \todo - * There are several data structures that explicitly store a major version, - * minor version, and patch level. These structures should be modified to - * have a \c __DRIversionRec instead. - */ -struct __DRIversionRec { - int major; /**< Major version number. */ - int minor; /**< Minor version number. */ - int patch; /**< Patch-level. */ -}; - -/** - * Framebuffer information record. Used by libGL to communicate information - * about the framebuffer to the driver's \c __driCreateNewScreen function. - * - * In XFree86, most of this information is derrived from data returned by - * calling \c XF86DRIGetDeviceInfo. - * - * \sa XF86DRIGetDeviceInfo __DRIdisplayRec::createNewScreen - * __driUtilCreateNewScreen CallCreateNewScreen - * - * \bug This structure could be better named. - */ -struct __DRIframebufferRec { - unsigned char *base; /**< Framebuffer base address in the CPU's - * address space. This value is calculated by - * calling \c drmMap on the framebuffer handle - * returned by \c XF86DRIGetDeviceInfo (or a - * similar function). - */ - int size; /**< Framebuffer size, in bytes. */ - int stride; /**< Number of bytes from one line to the next. */ - int width; /**< Pixel width of the framebuffer. */ - int height; /**< Pixel height of the framebuffer. */ - int dev_priv_size; /**< Size of the driver's dev-priv structure. */ - void *dev_priv; /**< Pointer to the driver's dev-priv structure. */ -}; - - -/** - * This extension provides alternative screen, drawable and context - * constructors for legacy DRI functionality. This is used in - * conjunction with the core extension. - */ -#define __DRI_LEGACY "DRI_Legacy" -#define __DRI_LEGACY_VERSION 1 - -struct __DRIlegacyExtensionRec { - __DRIextension base; - - __DRIscreen *(*createNewScreen)(int screen, - const __DRIversion *ddx_version, - const __DRIversion *dri_version, - const __DRIversion *drm_version, - const __DRIframebuffer *frame_buffer, - void *pSAREA, int fd, - const __DRIextension **extensions, - const __DRIconfig ***driver_configs, - void *loaderPrivate); - - __DRIdrawable *(*createNewDrawable)(__DRIscreen *screen, - const __DRIconfig *config, - drm_drawable_t hwDrawable, - int renderType, const int *attrs, - void *loaderPrivate); - - __DRIcontext *(*createNewContext)(__DRIscreen *screen, - const __DRIconfig *config, - int render_type, - __DRIcontext *shared, - drm_context_t hwContext, - void *loaderPrivate); -}; - -/** - * This extension provides alternative screen, drawable and context - * constructors for swrast DRI functionality. This is used in - * conjunction with the core extension. - */ -#define __DRI_SWRAST "DRI_SWRast" -#define __DRI_SWRAST_VERSION 4 - -struct __DRIswrastExtensionRec { - __DRIextension base; - - __DRIscreen *(*createNewScreen)(int screen, - const __DRIextension **extensions, - const __DRIconfig ***driver_configs, - void *loaderPrivate); - - __DRIdrawable *(*createNewDrawable)(__DRIscreen *screen, - const __DRIconfig *config, - void *loaderPrivate); - - /* Since version 2 */ - __DRIcontext *(*createNewContextForAPI)(__DRIscreen *screen, - int api, - const __DRIconfig *config, - __DRIcontext *shared, - void *data); - - /** - * Create a context for a particular API with a set of attributes - * - * \since version 3 - * - * \sa __DRIdri2ExtensionRec::createContextAttribs - */ - __DRIcontext *(*createContextAttribs)(__DRIscreen *screen, - int api, - const __DRIconfig *config, - __DRIcontext *shared, - unsigned num_attribs, - const uint32_t *attribs, - unsigned *error, - void *loaderPrivate); - - /** - * createNewScreen() with the driver extensions passed in. - * - * \since version 4 - */ - __DRIscreen *(*createNewScreen2)(int screen, - const __DRIextension **loader_extensions, - const __DRIextension **driver_extensions, - const __DRIconfig ***driver_configs, - void *loaderPrivate); - -}; - -/** Common DRI function definitions, shared among DRI2 and Image extensions - */ - -typedef __DRIscreen * -(*__DRIcreateNewScreen2Func)(int screen, int fd, - const __DRIextension **extensions, - const __DRIextension **driver_extensions, - const __DRIconfig ***driver_configs, - void *loaderPrivate); - -typedef __DRIdrawable * -(*__DRIcreateNewDrawableFunc)(__DRIscreen *screen, - const __DRIconfig *config, - void *loaderPrivate); - -typedef __DRIcontext * -(*__DRIcreateContextAttribsFunc)(__DRIscreen *screen, - int api, - const __DRIconfig *config, - __DRIcontext *shared, - unsigned num_attribs, - const uint32_t *attribs, - unsigned *error, - void *loaderPrivate); - -typedef unsigned int -(*__DRIgetAPIMaskFunc)(__DRIscreen *screen); - -/** - * DRI2 Loader extension. - */ -#define __DRI_BUFFER_FRONT_LEFT 0 -#define __DRI_BUFFER_BACK_LEFT 1 -#define __DRI_BUFFER_FRONT_RIGHT 2 -#define __DRI_BUFFER_BACK_RIGHT 3 -#define __DRI_BUFFER_DEPTH 4 -#define __DRI_BUFFER_STENCIL 5 -#define __DRI_BUFFER_ACCUM 6 -#define __DRI_BUFFER_FAKE_FRONT_LEFT 7 -#define __DRI_BUFFER_FAKE_FRONT_RIGHT 8 -#define __DRI_BUFFER_DEPTH_STENCIL 9 /**< Only available with DRI2 1.1 */ -#define __DRI_BUFFER_HIZ 10 - -/* Inofficial and for internal use. Increase when adding a new buffer token. */ -#define __DRI_BUFFER_COUNT 11 - -struct __DRIbufferRec { - unsigned int attachment; - unsigned int name; - unsigned int pitch; - unsigned int cpp; - unsigned int flags; -}; - -#define __DRI_DRI2_LOADER "DRI_DRI2Loader" -#define __DRI_DRI2_LOADER_VERSION 3 -struct __DRIdri2LoaderExtensionRec { - __DRIextension base; - - __DRIbuffer *(*getBuffers)(__DRIdrawable *driDrawable, - int *width, int *height, - unsigned int *attachments, int count, - int *out_count, void *loaderPrivate); - - /** - * Flush pending front-buffer rendering - * - * Any rendering that has been performed to the - * \c __DRI_BUFFER_FAKE_FRONT_LEFT will be flushed to the - * \c __DRI_BUFFER_FRONT_LEFT. - * - * \param driDrawable Drawable whose front-buffer is to be flushed - * \param loaderPrivate Loader's private data that was previously passed - * into __DRIdri2ExtensionRec::createNewDrawable - */ - void (*flushFrontBuffer)(__DRIdrawable *driDrawable, void *loaderPrivate); - - - /** - * Get list of buffers from the server - * - * Gets a list of buffer for the specified set of attachments. Unlike - * \c ::getBuffers, this function takes a list of attachments paired with - * opaque \c unsigned \c int value describing the format of the buffer. - * It is the responsibility of the caller to know what the service that - * allocates the buffers will expect to receive for the format. - * - * \param driDrawable Drawable whose buffers are being queried. - * \param width Output where the width of the buffers is stored. - * \param height Output where the height of the buffers is stored. - * \param attachments List of pairs of attachment ID and opaque format - * requested for the drawable. - * \param count Number of attachment / format pairs stored in - * \c attachments. - * \param loaderPrivate Loader's private data that was previously passed - * into __DRIdri2ExtensionRec::createNewDrawable. - */ - __DRIbuffer *(*getBuffersWithFormat)(__DRIdrawable *driDrawable, - int *width, int *height, - unsigned int *attachments, int count, - int *out_count, void *loaderPrivate); -}; - -/** - * This extension provides alternative screen, drawable and context - * constructors for DRI2. - */ -#define __DRI_DRI2 "DRI_DRI2" -#define __DRI_DRI2_VERSION 4 - -#define __DRI_API_OPENGL 0 /**< OpenGL compatibility profile */ -#define __DRI_API_GLES 1 /**< OpenGL ES 1.x */ -#define __DRI_API_GLES2 2 /**< OpenGL ES 2.x */ -#define __DRI_API_OPENGL_CORE 3 /**< OpenGL 3.2+ core profile */ -#define __DRI_API_GLES3 4 /**< OpenGL ES 3.x */ - -#define __DRI_CTX_ATTRIB_MAJOR_VERSION 0 -#define __DRI_CTX_ATTRIB_MINOR_VERSION 1 -#define __DRI_CTX_ATTRIB_FLAGS 2 - -/** - * \requires __DRI2_ROBUSTNESS. - */ -#define __DRI_CTX_ATTRIB_RESET_STRATEGY 3 - -#define __DRI_CTX_FLAG_DEBUG 0x00000001 -#define __DRI_CTX_FLAG_FORWARD_COMPATIBLE 0x00000002 - -/** - * \requires __DRI2_ROBUSTNESS. - */ -#define __DRI_CTX_FLAG_ROBUST_BUFFER_ACCESS 0x00000004 - -/** - * \name Context reset strategies. - */ -/*@{*/ -#define __DRI_CTX_RESET_NO_NOTIFICATION 0 -#define __DRI_CTX_RESET_LOSE_CONTEXT 1 -/*@}*/ - -/** - * \name Reasons that __DRIdri2Extension::createContextAttribs might fail - */ -/*@{*/ -/** Success! */ -#define __DRI_CTX_ERROR_SUCCESS 0 - -/** Memory allocation failure */ -#define __DRI_CTX_ERROR_NO_MEMORY 1 - -/** Client requested an API (e.g., OpenGL ES 2.0) that the driver can't do. */ -#define __DRI_CTX_ERROR_BAD_API 2 - -/** Client requested an API version that the driver can't do. */ -#define __DRI_CTX_ERROR_BAD_VERSION 3 - -/** Client requested a flag or combination of flags the driver can't do. */ -#define __DRI_CTX_ERROR_BAD_FLAG 4 - -/** Client requested an attribute the driver doesn't understand. */ -#define __DRI_CTX_ERROR_UNKNOWN_ATTRIBUTE 5 - -/** Client requested a flag the driver doesn't understand. */ -#define __DRI_CTX_ERROR_UNKNOWN_FLAG 6 -/*@}*/ - -struct __DRIdri2ExtensionRec { - __DRIextension base; - - __DRIscreen *(*createNewScreen)(int screen, int fd, - const __DRIextension **extensions, - const __DRIconfig ***driver_configs, - void *loaderPrivate); - - __DRIcreateNewDrawableFunc createNewDrawable; - __DRIcontext *(*createNewContext)(__DRIscreen *screen, - const __DRIconfig *config, - __DRIcontext *shared, - void *loaderPrivate); - - /* Since version 2 */ - __DRIgetAPIMaskFunc getAPIMask; - - __DRIcontext *(*createNewContextForAPI)(__DRIscreen *screen, - int api, - const __DRIconfig *config, - __DRIcontext *shared, - void *data); - - __DRIbuffer *(*allocateBuffer)(__DRIscreen *screen, - unsigned int attachment, - unsigned int format, - int width, - int height); - void (*releaseBuffer)(__DRIscreen *screen, - __DRIbuffer *buffer); - - /** - * Create a context for a particular API with a set of attributes - * - * \since version 3 - * - * \sa __DRIswrastExtensionRec::createContextAttribs - */ - __DRIcreateContextAttribsFunc createContextAttribs; - - /** - * createNewScreen with the driver's extension list passed in. - * - * \since version 4 - */ - __DRIcreateNewScreen2Func createNewScreen2; -}; - - -/** - * This extension provides functionality to enable various EGLImage - * extensions. - */ -#define __DRI_IMAGE "DRI_IMAGE" -#define __DRI_IMAGE_VERSION 8 - -/** - * These formats correspond to the similarly named MESA_FORMAT_* - * tokens, except in the native endian of the CPU. For example, on - * little endian __DRI_IMAGE_FORMAT_XRGB8888 corresponds to - * MESA_FORMAT_XRGB8888, but MESA_FORMAT_XRGB8888_REV on big endian. - * - * __DRI_IMAGE_FORMAT_NONE is for images that aren't directly usable - * by the driver (YUV planar formats) but serve as a base image for - * creating sub-images for the different planes within the image. - * - * R8, GR88 and NONE should not be used with createImageFormName or - * createImage, and are returned by query from sub images created with - * createImageFromNames (NONE, see above) and fromPlane (R8 & GR88). - */ -#define __DRI_IMAGE_FORMAT_RGB565 0x1001 -#define __DRI_IMAGE_FORMAT_XRGB8888 0x1002 -#define __DRI_IMAGE_FORMAT_ARGB8888 0x1003 -#define __DRI_IMAGE_FORMAT_ABGR8888 0x1004 -#define __DRI_IMAGE_FORMAT_XBGR8888 0x1005 -#define __DRI_IMAGE_FORMAT_R8 0x1006 /* Since version 5 */ -#define __DRI_IMAGE_FORMAT_GR88 0x1007 -#define __DRI_IMAGE_FORMAT_NONE 0x1008 -#define __DRI_IMAGE_FORMAT_XRGB2101010 0x1009 -#define __DRI_IMAGE_FORMAT_ARGB2101010 0x100a -#define __DRI_IMAGE_FORMAT_SARGB8 0x100b - -#define __DRI_IMAGE_USE_SHARE 0x0001 -#define __DRI_IMAGE_USE_SCANOUT 0x0002 -#define __DRI_IMAGE_USE_CURSOR 0x0004 /* Depricated */ -#define __DRI_IMAGE_USE_LINEAR 0x0008 - - -/** - * Four CC formats that matches with WL_DRM_FORMAT_* from wayland_drm.h - * and GBM_FORMAT_* from gbm.h, used with createImageFromNames. - * - * \since 5 - */ - -#define __DRI_IMAGE_FOURCC_RGB565 0x36314752 -#define __DRI_IMAGE_FOURCC_ARGB8888 0x34325241 -#define __DRI_IMAGE_FOURCC_XRGB8888 0x34325258 -#define __DRI_IMAGE_FOURCC_ABGR8888 0x34324241 -#define __DRI_IMAGE_FOURCC_XBGR8888 0x34324258 -#define __DRI_IMAGE_FOURCC_YUV410 0x39565559 -#define __DRI_IMAGE_FOURCC_YUV411 0x31315559 -#define __DRI_IMAGE_FOURCC_YUV420 0x32315559 -#define __DRI_IMAGE_FOURCC_YUV422 0x36315559 -#define __DRI_IMAGE_FOURCC_YUV444 0x34325559 -#define __DRI_IMAGE_FOURCC_NV12 0x3231564e -#define __DRI_IMAGE_FOURCC_NV16 0x3631564e -#define __DRI_IMAGE_FOURCC_YUYV 0x56595559 - - -/** - * Queryable on images created by createImageFromNames. - * - * RGB and RGBA are may be usable directly as images but its still - * recommended to call fromPlanar with plane == 0. - * - * Y_U_V, Y_UV and Y_XUXV all requires call to fromPlanar to create - * usable sub-images, sampling from images return raw YUV data and - * color conversion needs to be done in the shader. - * - * \since 5 - */ - -#define __DRI_IMAGE_COMPONENTS_RGB 0x3001 -#define __DRI_IMAGE_COMPONENTS_RGBA 0x3002 -#define __DRI_IMAGE_COMPONENTS_Y_U_V 0x3003 -#define __DRI_IMAGE_COMPONENTS_Y_UV 0x3004 -#define __DRI_IMAGE_COMPONENTS_Y_XUXV 0x3005 - - -/** - * queryImage attributes - */ - -#define __DRI_IMAGE_ATTRIB_STRIDE 0x2000 -#define __DRI_IMAGE_ATTRIB_HANDLE 0x2001 -#define __DRI_IMAGE_ATTRIB_NAME 0x2002 -#define __DRI_IMAGE_ATTRIB_FORMAT 0x2003 /* available in versions 3+ */ -#define __DRI_IMAGE_ATTRIB_WIDTH 0x2004 /* available in versions 4+ */ -#define __DRI_IMAGE_ATTRIB_HEIGHT 0x2005 -#define __DRI_IMAGE_ATTRIB_COMPONENTS 0x2006 /* available in versions 5+ */ -#define __DRI_IMAGE_ATTRIB_FD 0x2007 /* available in versions - * 7+. Each query will return a - * new fd. */ - -enum __DRIYUVColorSpace { - __DRI_YUV_COLOR_SPACE_UNDEFINED = 0, - __DRI_YUV_COLOR_SPACE_ITU_REC601 = 0x327F, - __DRI_YUV_COLOR_SPACE_ITU_REC709 = 0x3280, - __DRI_YUV_COLOR_SPACE_ITU_REC2020 = 0x3281 -}; - -enum __DRISampleRange { - __DRI_YUV_RANGE_UNDEFINED = 0, - __DRI_YUV_FULL_RANGE = 0x3282, - __DRI_YUV_NARROW_RANGE = 0x3283 -}; - -enum __DRIChromaSiting { - __DRI_YUV_CHROMA_SITING_UNDEFINED = 0, - __DRI_YUV_CHROMA_SITING_0 = 0x3284, - __DRI_YUV_CHROMA_SITING_0_5 = 0x3285 -}; - -/** - * \name Reasons that __DRIimageExtensionRec::createImageFromTexture might fail - */ -/*@{*/ -/** Success! */ -#define __DRI_IMAGE_ERROR_SUCCESS 0 - -/** Memory allocation failure */ -#define __DRI_IMAGE_ERROR_BAD_ALLOC 1 - -/** Client requested an invalid attribute for a texture object */ -#define __DRI_IMAGE_ERROR_BAD_MATCH 2 - -/** Client requested an invalid texture object */ -#define __DRI_IMAGE_ERROR_BAD_PARAMETER 3 -/*@}*/ - -typedef struct __DRIimageRec __DRIimage; -typedef struct __DRIimageExtensionRec __DRIimageExtension; -struct __DRIimageExtensionRec { - __DRIextension base; - - __DRIimage *(*createImageFromName)(__DRIscreen *screen, - int width, int height, int format, - int name, int pitch, - void *loaderPrivate); - - __DRIimage *(*createImageFromRenderbuffer)(__DRIcontext *context, - int renderbuffer, - void *loaderPrivate); - - void (*destroyImage)(__DRIimage *image); - - __DRIimage *(*createImage)(__DRIscreen *screen, - int width, int height, int format, - unsigned int use, - void *loaderPrivate); - - GLboolean (*queryImage)(__DRIimage *image, int attrib, int *value); - - /** - * The new __DRIimage will share the content with the old one, see dup(2). - */ - __DRIimage *(*dupImage)(__DRIimage *image, void *loaderPrivate); - - /** - * Validate that a __DRIimage can be used a certain way. - * - * \since 2 - */ - GLboolean (*validateUsage)(__DRIimage *image, unsigned int use); - - /** - * Unlike createImageFromName __DRI_IMAGE_FORMAT is not but instead - * __DRI_IMAGE_FOURCC and strides are in bytes not pixels. Stride is - * also per block and not per pixel (for non-RGB, see gallium blocks). - * - * \since 5 - */ - __DRIimage *(*createImageFromNames)(__DRIscreen *screen, - int width, int height, int fourcc, - int *names, int num_names, - int *strides, int *offsets, - void *loaderPrivate); - - /** - * Create an image out of a sub-region of a parent image. This - * entry point lets us create individual __DRIimages for different - * planes in a planar buffer (typically yuv), for example. While a - * sub-image shares the underlying buffer object with the parent - * image and other sibling sub-images, the life times of parent and - * sub-images are not dependent. Destroying the parent or a - * sub-image doesn't affect other images. The underlying buffer - * object is free when no __DRIimage remains that references it. - * - * Sub-images may overlap, but rendering to overlapping sub-images - * is undefined. - * - * \since 5 - */ - __DRIimage *(*fromPlanar)(__DRIimage *image, int plane, - void *loaderPrivate); - - /** - * Create image from texture. - * - * \since 6 - */ - __DRIimage *(*createImageFromTexture)(__DRIcontext *context, - int target, - unsigned texture, - int depth, - int level, - unsigned *error, - void *loaderPrivate); - /** - * Like createImageFromNames, but takes a prime fd instead. - * - * \since 7 - */ - __DRIimage *(*createImageFromFds)(__DRIscreen *screen, - int width, int height, int fourcc, - int *fds, int num_fds, - int *strides, int *offsets, - void *loaderPrivate); - - /** - * Like createImageFromFds, but takes additional attributes. - * - * For EGL_EXT_image_dma_buf_import. - * - * \since 8 - */ - __DRIimage *(*createImageFromDmaBufs)(__DRIscreen *screen, - int width, int height, int fourcc, - int *fds, int num_fds, - int *strides, int *offsets, - enum __DRIYUVColorSpace color_space, - enum __DRISampleRange sample_range, - enum __DRIChromaSiting horiz_siting, - enum __DRIChromaSiting vert_siting, - unsigned *error, - void *loaderPrivate); -}; - - -/** - * This extension must be implemented by the loader and passed to the - * driver at screen creation time. The EGLImage entry points in the - * various client APIs take opaque EGLImage handles and use this - * extension to map them to a __DRIimage. At version 1, this - * extensions allows mapping EGLImage pointers to __DRIimage pointers, - * but future versions could support other EGLImage-like, opaque types - * with new lookup functions. - */ -#define __DRI_IMAGE_LOOKUP "DRI_IMAGE_LOOKUP" -#define __DRI_IMAGE_LOOKUP_VERSION 1 - -typedef struct __DRIimageLookupExtensionRec __DRIimageLookupExtension; -struct __DRIimageLookupExtensionRec { - __DRIextension base; - - __DRIimage *(*lookupEGLImage)(__DRIscreen *screen, void *image, - void *loaderPrivate); -}; - -/** - * This extension allows for common DRI2 options - */ -#define __DRI2_CONFIG_QUERY "DRI_CONFIG_QUERY" -#define __DRI2_CONFIG_QUERY_VERSION 1 - -typedef struct __DRI2configQueryExtensionRec __DRI2configQueryExtension; -struct __DRI2configQueryExtensionRec { - __DRIextension base; - - int (*configQueryb)(__DRIscreen *screen, const char *var, GLboolean *val); - int (*configQueryi)(__DRIscreen *screen, const char *var, GLint *val); - int (*configQueryf)(__DRIscreen *screen, const char *var, GLfloat *val); -}; - -/** - * Robust context driver extension. - * - * Existence of this extension means the driver can accept the - * \c __DRI_CTX_FLAG_ROBUST_BUFFER_ACCESS flag and the - * \c __DRI_CTX_ATTRIB_RESET_STRATEGY attribute in - * \c __DRIdri2ExtensionRec::createContextAttribs. - */ -#define __DRI2_ROBUSTNESS "DRI_Robustness" -#define __DRI2_ROBUSTNESS_VERSION 1 - -typedef struct __DRIrobustnessExtensionRec __DRIrobustnessExtension; -struct __DRIrobustnessExtensionRec { - __DRIextension base; -}; - -/** - * DRI config options extension. - * - * This extension provides the XML string containing driver options for use by - * the loader in supporting the driconf application. - */ -#define __DRI_CONFIG_OPTIONS "DRI_ConfigOptions" -#define __DRI_CONFIG_OPTIONS_VERSION 1 - -typedef struct __DRIconfigOptionsExtensionRec { - __DRIextension base; - const char *xml; -} __DRIconfigOptionsExtension; - -/** - * This extension provides a driver vtable to a set of common driver helper - * functions (driCoreExtension, driDRI2Extension) within the driver - * implementation, as opposed to having to pass them through a global - * variable. - * - * It is not intended to be public API to the actual loader, and the vtable - * layout may change at any time. - */ -#define __DRI_DRIVER_VTABLE "DRI_DriverVtable" -#define __DRI_DRIVER_VTABLE_VERSION 1 - -typedef struct __DRIDriverVtableExtensionRec { - __DRIextension base; - const struct __DriverAPIRec *vtable; -} __DRIDriverVtableExtension; - -/** - * Query renderer driver extension - * - * This allows the window system layer (either EGL or GLX) to query aspects of - * hardware and driver support without creating a context. - */ -#define __DRI2_RENDERER_QUERY "DRI_RENDERER_QUERY" -#define __DRI2_RENDERER_QUERY_VERSION 1 - -#define __DRI2_RENDERER_VENDOR_ID 0x0000 -#define __DRI2_RENDERER_DEVICE_ID 0x0001 -#define __DRI2_RENDERER_VERSION 0x0002 -#define __DRI2_RENDERER_ACCELERATED 0x0003 -#define __DRI2_RENDERER_VIDEO_MEMORY 0x0004 -#define __DRI2_RENDERER_UNIFIED_MEMORY_ARCHITECTURE 0x0005 -#define __DRI2_RENDERER_PREFERRED_PROFILE 0x0006 -#define __DRI2_RENDERER_OPENGL_CORE_PROFILE_VERSION 0x0007 -#define __DRI2_RENDERER_OPENGL_COMPATIBILITY_PROFILE_VERSION 0x0008 -#define __DRI2_RENDERER_OPENGL_ES_PROFILE_VERSION 0x0009 -#define __DRI2_RENDERER_OPENGL_ES2_PROFILE_VERSION 0x000a - -typedef struct __DRI2rendererQueryExtensionRec __DRI2rendererQueryExtension; -struct __DRI2rendererQueryExtensionRec { - __DRIextension base; - - int (*queryInteger)(__DRIscreen *screen, int attribute, unsigned int *val); - int (*queryString)(__DRIscreen *screen, int attribute, const char **val); -}; - -/** - * Image Loader extension. Drivers use this to allocate color buffers - */ - -enum __DRIimageBufferMask { - __DRI_IMAGE_BUFFER_BACK = (1 << 0), - __DRI_IMAGE_BUFFER_FRONT = (1 << 1) -}; - -struct __DRIimageList { - uint32_t image_mask; - __DRIimage *back; - __DRIimage *front; -}; - -#define __DRI_IMAGE_LOADER "DRI_IMAGE_LOADER" -#define __DRI_IMAGE_LOADER_VERSION 1 - -struct __DRIimageLoaderExtensionRec { - __DRIextension base; - - /** - * Allocate color buffers. - * - * \param driDrawable - * \param width Width of allocated buffers - * \param height Height of allocated buffers - * \param format one of __DRI_IMAGE_FORMAT_* - * \param stamp Address of variable to be updated when - * getBuffers must be called again - * \param loaderPrivate The loaderPrivate for driDrawable - * \param buffer_mask Set of buffers to allocate - * \param buffers Returned buffers - */ - int (*getBuffers)(__DRIdrawable *driDrawable, - unsigned int format, - uint32_t *stamp, - void *loaderPrivate, - uint32_t buffer_mask, - struct __DRIimageList *buffers); - - /** - * Flush pending front-buffer rendering - * - * Any rendering that has been performed to the - * fake front will be flushed to the front - * - * \param driDrawable Drawable whose front-buffer is to be flushed - * \param loaderPrivate Loader's private data that was previously passed - * into __DRIdri2ExtensionRec::createNewDrawable - */ - void (*flushFrontBuffer)(__DRIdrawable *driDrawable, void *loaderPrivate); -}; - -/** - * DRI extension. - */ - -#define __DRI_IMAGE_DRIVER "DRI_IMAGE_DRIVER" -#define __DRI_IMAGE_DRIVER_VERSION 1 - -struct __DRIimageDriverExtensionRec { - __DRIextension base; - - /* Common DRI functions, shared with DRI2 */ - __DRIcreateNewScreen2Func createNewScreen2; - __DRIcreateNewDrawableFunc createNewDrawable; - __DRIcreateContextAttribsFunc createContextAttribs; - __DRIgetAPIMaskFunc getAPIMask; -}; - -#endif diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 4f983ac010d65..86da7494d554d 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -144,6 +144,7 @@ xorg-cf-files, xorg-docs, xorgproto, + xorg-server, xorg-sgml-doctools, xprop, xrandr, @@ -154,6 +155,7 @@ xsm, xstdcmap, xtrans, + xvfb, xvinfo, xwininfo, xwud, @@ -228,6 +230,7 @@ self: with self; { xsm xstdcmap xtrans + xvfb xvinfo xwininfo xwud @@ -318,6 +321,7 @@ self: with self; { xcursorthemes = xcursor-themes; xorgcffiles = xorg-cf-files; xorgdocs = xorg-docs; + xorgserver = xorg-server; xorgsgmldoctools = xorg-sgml-doctools; # THIS IS A GENERATED FILE. DO NOT EDIT! @@ -2343,11 +2347,11 @@ self: with self; { }: stdenv.mkDerivation (finalAttrs: { pname = "xkbcomp"; - version = "1.4.7"; + version = "1.5.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xkbcomp-1.4.7.tar.xz"; - sha256 = "0xqzz209m9i43jbyrf2lh4xdbyhzzzn9mis2f2c32kplwla82a0a"; + url = "mirror://xorg/individual/app/xkbcomp-1.5.0.tar.xz"; + sha256 = "0q3092w42w9wyfr5zf3ymkmzlqr24z6kz6ypkinxnxh7c0k1zhra"; }; hardeningDisable = [ "bindnow" @@ -2490,64 +2494,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xorgserver = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - openssl, - libX11, - libXau, - libxcb, - xcbutil, - xcbutilwm, - xcbutilimage, - xcbutilkeysyms, - xcbutilrenderutil, - libXdmcp, - libXfixes, - libxkbfile, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xorg-server"; - version = "21.1.20"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-21.1.20.tar.xz"; - sha256 = "sha256-dpW8YYJLOoG2utL3iwVADKAVAD3kAtGzIhFxBbcC6Tc="; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - openssl - libX11 - libXau - libxcb - xcbutil - xcbutilwm - xcbutilimage - xcbutilkeysyms - xcbutilrenderutil - libXdmcp - libXfixes - libxkbfile - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "xorg-server" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xpr = callPackage ( { diff --git a/pkgs/servers/x11/xorg/dont-create-logdir-during-build.patch b/pkgs/servers/x11/xorg/dont-create-logdir-during-build.patch deleted file mode 100644 index 3675292f9c990..0000000000000 --- a/pkgs/servers/x11/xorg/dont-create-logdir-during-build.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- - hw/xfree86/Makefile.am | 1 - - hw/xfree86/Makefile.in | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am -index 9aeaea1..dcca3b8 100644 ---- a/hw/xfree86/Makefile.am -+++ b/hw/xfree86/Makefile.am -@@ -100,7 +100,6 @@ EXTRA_DIST = xorgconf.cpp - - # Without logdir, X will post an error on the terminal and will not start - install-data-local: -- $(AM_V_GEN)$(MKDIR_P) $(DESTDIR)$(logdir) - if CYGWIN - $(INSTALL_DATA) libXorg.exe.a $(DESTDIR)$(libdir)/libXorg.exe.a - endif -diff --git a/hw/xfree86/Makefile.in b/hw/xfree86/Makefile.in -index c4fceee..74da8f1 100644 ---- a/hw/xfree86/Makefile.in -+++ b/hw/xfree86/Makefile.in -@@ -1161,7 +1161,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-local \ - - # Without logdir, X will post an error on the terminal and will not start - install-data-local: -- $(AM_V_GEN)$(MKDIR_P) $(DESTDIR)$(logdir) - @CYGWIN_TRUE@ $(INSTALL_DATA) libXorg.exe.a $(DESTDIR)$(libdir)/libXorg.exe.a - - install-exec-hook: --- -2.25.4 - diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index e0eaa35c4ce5d..158a0f96bb466 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -76,6 +76,7 @@ $pcMap{"xkbfile"} = "libxkbfile"; $pcMap{"xmu"} = "libXmu"; $pcMap{"xmuu"} = "libXmu"; +$pcMap{"xorg-server"} = "xorgserver"; $pcMap{"xp"} = "libXp"; $pcMap{"xpm"} = "libXpm"; $pcMap{"xpresent"} = "libXpresent"; @@ -475,6 +476,7 @@ xorg-cf-files, xorg-docs, xorgproto, + xorg-server, xorg-sgml-doctools, xprop, xrandr, @@ -485,6 +487,7 @@ xsm, xstdcmap, xtrans, + xvfb, xvinfo, xwininfo, xwud, @@ -559,6 +562,7 @@ xsm xstdcmap xtrans + xvfb xvinfo xwininfo xwud @@ -649,6 +653,7 @@ xcursorthemes = xcursor-themes; xorgcffiles = xorg-cf-files; xorgdocs = xorg-docs; + xorgserver = xorg-server; xorgsgmldoctools = xorg-sgml-doctools; EOF diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 76d0b9fccf9c8..84ab6265f0f88 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -338,248 +338,6 @@ self: super: postPatch = lib.concatStrings (lib.mapAttrsToList patchIn layouts); }); - xorgserver = super.xorgserver.overrideAttrs ( - attrs_passed: - let - attrs = attrs_passed // { - buildInputs = attrs_passed.buildInputs ++ lib.optional (libdrm != null) libdrm.dev; - postPatch = '' - for i in dri3/*.c - do - sed -i -e "s|#include |#include |" $i - done - ''; - meta = attrs_passed.meta // { - mainProgram = "X"; - }; - }; - in - attrs - // ( - let - version = lib.getVersion attrs; - commonBuildInputs = attrs.buildInputs ++ [ - xorg.xtrans - xorg.libxcvt - ]; - commonPropagatedBuildInputs = [ - dbus - libGL - libGLU - xorg.libXext - xorg.libXfont - xorg.libXfont2 - libepoxy - libunwind - xorg.libxshmfence - xorg.pixman - xorg.xorgproto - zlib - ]; - # XQuartz requires two compilations: the first to get X / XQuartz, - # and the second to get Xvfb, Xnest, etc. - darwinOtherX = xorg.xorgserver.overrideAttrs (oldAttrs: { - configureFlags = oldAttrs.configureFlags ++ [ - "--disable-xquartz" - "--enable-xorg" - "--enable-xvfb" - "--enable-xnest" - "--enable-kdrive" - ]; - postInstall = ":"; # prevent infinite recursion - }); - - fpgit = - commit: sha256: name: - fetchpatch ( - { - url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/${commit}.diff"; - inherit sha256; - } - // lib.optionalAttrs (name != null) { - name = name + ".patch"; - } - ); - in - if (!isDarwin) then - { - outputs = [ - "out" - "dev" - ]; - patches = [ - # The build process tries to create the specified logdir when building. - # - # We set it to /var/log which can't be touched from inside the sandbox causing the build to hard-fail - ./dont-create-logdir-during-build.patch - ]; - buildInputs = commonBuildInputs ++ [ - libdrm - libgbm - mesa-gl-headers - dri-pkgconfig-stub - ]; - propagatedBuildInputs = - attrs.propagatedBuildInputs or [ ] - ++ [ xorg.libpciaccess ] - ++ commonPropagatedBuildInputs - ++ lib.optionals stdenv.hostPlatform.isLinux [ - udev - ]; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - prePatch = lib.optionalString stdenv.hostPlatform.isMusl '' - export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t" - ''; - configureFlags = [ - "--enable-kdrive" # not built by default - "--enable-xephyr" - "--enable-xcsecurity" # enable SECURITY extension - "--with-default-font-path=" - # there were only paths containing "${prefix}", - # and there are no fonts in this package anyway - "--with-xkb-bin-directory=${xorg.xkbcomp}/bin" - "--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb" - "--with-xkb-output=$out/share/X11/xkb/compiled" - "--with-log-dir=/var/log" - "--enable-glamor" - "--with-os-name=Nix" # r13y, embeds the build machine's kernel version otherwise - ] - ++ lib.optionals stdenv.hostPlatform.isMusl [ - "--disable-tls" - ]; - - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=array-bounds" - ]; - - postInstall = '' - rm -fr $out/share/X11/xkb/compiled # otherwise X will try to write in it - ( # assert() keeps runtime reference xorgserver-dev in xf86-video-intel and others - cd "$dev" - for f in include/xorg/*.h; do - sed "1i#line 1 \"${attrs.pname}-${attrs.version}/$f\"" -i "$f" - done - ) - ''; - passthru = attrs.passthru // { - inherit version; # needed by virtualbox guest additions - }; - } - else - { - nativeBuildInputs = attrs.nativeBuildInputs ++ [ - autoreconfHook - bootstrap_cmds - xorg.utilmacros - xorg.fontutil - ]; - buildInputs = commonBuildInputs ++ [ - bootstrap_cmds - automake - autoconf - mesa - ]; - propagatedBuildInputs = commonPropagatedBuildInputs ++ [ - xorg.libAppleWM - xorg.xorgproto - ]; - - patches = [ - # XQuartz patchset - (fetchpatch { - url = "https://github.com/XQuartz/xorg-server/commit/e88fd6d785d5be477d5598e70d105ffb804771aa.patch"; - sha256 = "1q0a30m1qj6ai924afz490xhack7rg4q3iig2gxsjjh98snikr1k"; - name = "use-cppflags-not-cflags.patch"; - }) - (fetchpatch { - url = "https://github.com/XQuartz/xorg-server/commit/75ee9649bcfe937ac08e03e82fd45d9e18110ef4.patch"; - sha256 = "1vlfylm011y00j8mig9zy6gk9bw2b4ilw2qlsc6la49zi3k0i9fg"; - name = "use-old-mitrapezoids-and-mitriangles-routines.patch"; - }) - (fetchpatch { - url = "https://github.com/XQuartz/xorg-server/commit/c58f47415be79a6564a9b1b2a62c2bf866141e73.patch"; - sha256 = "19sisqzw8x2ml4lfrwfvavc2jfyq2bj5xcf83z89jdxg8g1gdd1i"; - name = "revert-fb-changes-1.patch"; - }) - (fetchpatch { - url = "https://github.com/XQuartz/xorg-server/commit/56e6f1f099d2821e5002b9b05b715e7b251c0c97.patch"; - sha256 = "0zm9g0g1jvy79sgkvy0rjm6ywrdba2xjd1nsnjbxjccckbr6i396"; - name = "revert-fb-changes-2.patch"; - }) - ./darwin/bundle_main.patch - ./darwin/stub.patch - ]; - - postPatch = attrs.postPatch + '' - substituteInPlace hw/xquartz/mach-startup/stub.c \ - --subst-var-by XQUARTZ_APP "$out/Applications/XQuartz.app" - ''; - - configureFlags = [ - # note: --enable-xquartz is auto - "CPPFLAGS=-I${./darwin/dri}" - "--disable-libunwind" # libunwind on darwin is missing unw_strerror - "--disable-glamor" - "--with-default-font-path=" - "--with-apple-application-name=XQuartz" - "--with-apple-applications-dir=\${out}/Applications" - "--with-bundle-id-prefix=org.nixos.xquartz" - "--with-sha1=CommonCrypto" - "--with-xkb-bin-directory=${xorg.xkbcomp}/bin" - "--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb" - "--with-xkb-output=$out/share/X11/xkb/compiled" - "--without-dtrace" # requires Command Line Tools for Xcode - ]; - preConfigure = '' - mkdir -p $out/Applications - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error" - ''; - postInstall = '' - rm -fr $out/share/X11/xkb/compiled - - cp -rT ${darwinOtherX}/bin $out/bin - rm -f $out/bin/X - ln -s Xquartz $out/bin/X - - cp ${darwinOtherX}/share/man -rT $out/share/man - ''; - passthru = attrs.passthru // { - inherit version; - }; - } - ) - ); - - # xvfb is used by a bunch of things to run tests - # so try to reduce its reverse closure - xvfb = super.xorgserver.overrideAttrs (old: { - configureFlags = [ - "--enable-xvfb" - "--disable-xorg" - "--disable-xquartz" - "--disable-xwayland" - "--with-xkb-bin-directory=${xorg.xkbcomp}/bin" - "--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb" - "--with-xkb-output=$out/share/X11/xkb/compiled" - ] - ++ lib.optional stdenv.hostPlatform.isDarwin [ - "--without-dtrace" - ]; - - buildInputs = old.buildInputs ++ [ - dri-pkgconfig-stub - libdrm - libGL - mesa-gl-headers - xorg.pixman - xorg.libXfont2 - xorg.xtrans - xorg.libxcvt - xorg.libxshmfence - ]; - }); - xclock = addMainProgram super.xclock { }; xinit = diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 6477442a08e78..7a8740cb389e2 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -3,7 +3,7 @@ mirror://xorg/individual/app/xfd-1.1.4.tar.xz mirror://xorg/individual/app/xfs-1.2.2.tar.xz mirror://xorg/individual/app/xinit-1.4.4.tar.xz mirror://xorg/individual/app/xinput-1.6.4.tar.xz -mirror://xorg/individual/app/xkbcomp-1.4.7.tar.xz +mirror://xorg/individual/app/xkbcomp-1.5.0.tar.xz mirror://xorg/individual/app/xkbevd-1.1.6.tar.xz mirror://xorg/individual/app/xkbprint-1.0.7.tar.xz mirror://xorg/individual/app/xload-1.2.0.tar.xz @@ -55,4 +55,3 @@ mirror://xorg/individual/driver/xf86-video-vesa-2.6.0.tar.xz mirror://xorg/individual/driver/xf86-video-vmware-13.4.0.tar.xz mirror://xorg/individual/driver/xf86-video-voodoo-1.2.6.tar.xz mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-21.1.20.tar.xz diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix index 015872e3b2f7a..64d02ed4ff686 100644 --- a/pkgs/shells/bash/5.nix +++ b/pkgs/shells/bash/5.nix @@ -107,12 +107,9 @@ lib.warnIf (withDocs != null) }" ] ++ lib.optionals stdenv.hostPlatform.isCygwin [ - "--without-libintl-prefix" - "--without-libiconv-prefix" - "--with-installed-readline" "bash_cv_dev_stdin=present" "bash_cv_dev_fd=standard" - "bash_cv_termcap_lib=libncurses" + "gt_cv_func_printf_posix=yes" ] ++ lib.optionals (stdenv.hostPlatform.libc == "musl") [ "--disable-nls" @@ -136,15 +133,10 @@ lib.warnIf (withDocs != null) enableParallelBuilding = true; - makeFlags = lib.optionals stdenv.hostPlatform.isCygwin [ - "LOCAL_LDFLAGS=-Wl,--export-all,--out-implib,libbash.dll.a" - "SHOBJ_LIBS=-lbash" - ]; - doCheck = false; # Can't be enabled by default due to dependency cycle, use passthru.tests.withChecks instead postInstall = '' - ln -s bash "$out/bin/sh" + ln -s bash${stdenv.hostPlatform.extensions.executable} "$out/bin/sh" rm -f $out/lib/bash/Makefile.inc ''; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index f051ae6c7d44e..7f20b3b5de931 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1760,6 +1760,25 @@ runPhase() { fi } +definePhases() { + # only defines phases if it is not already defined + if [ -z "${phases[*]:-}" ]; then + phases="${prePhases[*]:-} unpackPhase patchPhase ${preConfigurePhases[*]:-} \ + configurePhase ${preBuildPhases[*]:-} buildPhase checkPhase \ + ${preInstallPhases[*]:-} installPhase ${preFixupPhases[*]:-} fixupPhase installCheckPhase \ + ${preDistPhases[*]:-} distPhase ${postPhases[*]:-}" + fi +} + +printPhases() { + definePhases + # one phase per line, to make it easy to consume with tools like xargs + # explicitly uses the same splitting as genericBuild + local phase + for phase in ${phases[*]}; do + printf '%s\n' "$phase" + done +} genericBuild() { # variable used by our gzip wrapper to add -n. @@ -1775,12 +1794,7 @@ genericBuild() { return fi - if [ -z "${phases[*]:-}" ]; then - phases="${prePhases[*]:-} unpackPhase patchPhase ${preConfigurePhases[*]:-} \ - configurePhase ${preBuildPhases[*]:-} buildPhase checkPhase \ - ${preInstallPhases[*]:-} installPhase ${preFixupPhases[*]:-} fixupPhase installCheckPhase \ - ${preDistPhases[*]:-} distPhase ${postPhases[*]:-}"; - fi + definePhases # The use of ${phases[*]} gives the correct behavior both with and # without structured attrs. This relies on the fact that each diff --git a/pkgs/stdenv/linux/bootstrap-files/aarch64-unknown-linux-musl.nix b/pkgs/stdenv/linux/bootstrap-files/aarch64-unknown-linux-musl.nix index c1a96e66013c6..3493721ba5da0 100644 --- a/pkgs/stdenv/linux/bootstrap-files/aarch64-unknown-linux-musl.nix +++ b/pkgs/stdenv/linux/bootstrap-files/aarch64-unknown-linux-musl.nix @@ -1,25 +1,21 @@ +# Autogenerated by maintainers/scripts/bootstrap-files/refresh-tarballs.bash as: +# $ ./refresh-tarballs.bash --targets=aarch64-unknown-linux-musl # -# Files came from this Hydra build: -# -# https://hydra.nixos.org/build/246470544 -# -# …which used nixpkgs revision dd5621df6dcb90122b50da5ec31c411a0de3e538 -# to instantiate: -# -# /nix/store/g480ass2vjmakaq03z7k2j95xnxh206a-stdenv-bootstrap-tools.drv -# -# …and then built: -# -# /nix/store/95lm0y33dayag4542s8bi83s31bw68dr-stdenv-bootstrap-tools -# +# Metadata: +# - nixpkgs revision: 8c29968b3a942f2903f90797f9623737c215737c +# - hydra build: https://hydra.nixos.org/job/nixpkgs/trunk/stdenvBootstrapTools.aarch64-unknown-linux-musl.build/latest +# - resolved hydra build: https://hydra.nixos.org/build/315356516 +# - instantiated derivation: /nix/store/zd9i77gp51l3chdkfyqhffzfnmbmf02y-stdenv-bootstrap-tools.drv +# - output directory: /nix/store/c3qpy1mlcrqklpak5lkgdy0l0kbsndl1-stdenv-bootstrap-tools +# - build time: Mon, 01 Dec 2025 18:29:46 +0000 { + bootstrapTools = import { + url = "http://tarballs.nixos.org/stdenv/aarch64-unknown-linux-musl/8c29968b3a942f2903f90797f9623737c215737c/bootstrap-tools.tar.xz"; + hash = "sha256-nw/PFVwYZG9oPuQSf760VSwKzHKKZA3r+XqDr8HLytg="; + }; busybox = import { - url = "http://tarballs.nixos.org/stdenv/aarch64-unknown-linux-musl/dd5621df6dcb90122b50da5ec31c411a0de3e538/busybox"; - sha256 = "sha256-WuOaun7U5enbOy8SuuCo6G1fbGwsO16jhy/oM8K0lAs="; + url = "http://tarballs.nixos.org/stdenv/aarch64-unknown-linux-musl/8c29968b3a942f2903f90797f9623737c215737c/busybox"; + hash = "sha256-ASctUeTLD/TC6aZHX9xuRsmlacwCDxt9zsb/gy6Ia1g="; executable = true; }; - bootstrapTools = import { - url = "http://tarballs.nixos.org/stdenv/aarch64-unknown-linux-musl/dd5621df6dcb90122b50da5ec31c411a0de3e538/bootstrap-tools.tar.xz"; - hash = "sha256-ZY9IMOmx1VOn6uoFDpdJbTnPX59TEkrVCzWNtjQ8/QE="; - }; } diff --git a/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-musl.nix b/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-musl.nix index 283b12b0d578f..fb9f4827b2989 100644 --- a/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-musl.nix +++ b/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-musl.nix @@ -2,20 +2,20 @@ # $ ./refresh-tarballs.bash --targets=x86_64-unknown-linux-musl # # Metadata: -# - nixpkgs revision: 125cefd4cf8f857e5ff1aceaef9230ba578a033d +# - nixpkgs revision: 8c29968b3a942f2903f90797f9623737c215737c # - hydra build: https://hydra.nixos.org/job/nixpkgs/trunk/stdenvBootstrapTools.x86_64-unknown-linux-musl.build/latest -# - resolved hydra build: https://hydra.nixos.org/build/247890807 -# - instantiated derivation: /nix/store/gqri9n85rsf2983r6m8lkz0h69k4n7xi-stdenv-bootstrap-tools.drv -# - output directory: /nix/store/b0x0qcbf1gsp50jzw52sbbgdp3jlwcjf-stdenv-bootstrap-tools -# - build time: Fri, 26 Jan 2024 22:09:22 +0000 +# - resolved hydra build: https://hydra.nixos.org/build/315356522 +# - instantiated derivation: /nix/store/783rl6mlrc2wpp9apclcvc8x7vwi842s-stdenv-bootstrap-tools.drv +# - output directory: /nix/store/f881dxkvjal4vflnznfbz7g6pn4q0c56-stdenv-bootstrap-tools +# - build time: Mon, 01 Dec 2025 18:29:47 +0000 { bootstrapTools = import { - url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-linux-musl/125cefd4cf8f857e5ff1aceaef9230ba578a033d/bootstrap-tools.tar.xz"; - hash = "sha256-t0W2MR7UwtPyYEGcRo9UOuXfaP4uUZKZXEmYGcBOuOA="; + url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-linux-musl/8c29968b3a942f2903f90797f9623737c215737c/bootstrap-tools.tar.xz"; + hash = "sha256-WwA4q0JNEdnSAhTwcPGIrwuOha33T0aRG7tR/YgA7L4="; }; busybox = import { - url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-linux-musl/125cefd4cf8f857e5ff1aceaef9230ba578a033d/busybox"; - hash = "sha256-0U2r3EU61oqhs+oyzFABIFTCVqXOWSP0qEtnyHwjzm0="; + url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-linux-musl/8c29968b3a942f2903f90797f9623737c215737c/busybox"; + hash = "sha256-XJTiB2U3KkP31G5s68Ho7wQY5yz72CZkLSarR+56zKw="; executable = true; }; } diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index d9f968c84300c..6a1507df734d1 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -47,21 +47,10 @@ rec { ''; }; - bootGCC = - (pkgs.gcc.cc.override { - enableLTO = false; - isl = null; - }).overrideAttrs - (old: { - patches = old.patches or [ ] ++ [ - (pkgs.fetchpatch { - # c++tools: Don't check --enable-default-pie. - # --enable-default-pie breaks bootstrap gcc otherwise, because libiberty.a is not found - url = "https://github.com/gcc-mirror/gcc/commit/3f1f99ef82a65d66e3aaa429bf4fb746b93da0db.patch"; - hash = "sha256-wKVuwrW22gSN1woYFYxsyVk49oYmbogIN6FWbU8cVds="; - }) - ]; - }); + bootGCC = pkgs.gcc.cc.override { + enableLTO = false; + isl = null; + }; bootBinutils = pkgs.binutils.bintools.override { withAllTargets = false; diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix index c11f93df0f5be..6a8297fea01fd 100644 --- a/pkgs/test/stdenv/default.nix +++ b/pkgs/test/stdenv/default.nix @@ -9,6 +9,9 @@ }: let + # tests can be based on builtins.derivation and bootstrapTools directly to minimize rebuilds + # see test 'make-symlinks-relative' in ./hooks.nix as an example. + bootstrapTools = stdenv.bootstrapTools; # early enough not to rebuild gcc but late enough to have patchelf earlyPkgs = stdenv.__bootPackages.stdenv.__bootPackages or pkgs; earlierPkgs = @@ -240,7 +243,7 @@ in import ./hooks.nix { stdenv = bootStdenv; pkgs = earlyPkgs; - inherit lib; + inherit bootstrapTools lib; } ); @@ -499,7 +502,7 @@ in import ./hooks.nix { stdenv = bootStdenvStructuredAttrsByDefault; pkgs = earlyPkgs; - inherit lib; + inherit bootstrapTools lib; } ); diff --git a/pkgs/test/stdenv/hooks.nix b/pkgs/test/stdenv/hooks.nix index aa138040d50fe..70daaf5d403e5 100644 --- a/pkgs/test/stdenv/hooks.nix +++ b/pkgs/test/stdenv/hooks.nix @@ -1,4 +1,5 @@ { + bootstrapTools, stdenv, pkgs, lib, @@ -28,36 +29,65 @@ [[ -e $out/share/man/small-man.1.gz ]] ''; }; - make-symlinks-relative = stdenv.mkDerivation { - name = "test-make-symlinks-relative"; - outputs = [ - "out" - "man" - ]; - buildCommand = '' - mkdir -p $out/{bar,baz} - mkdir -p $man/share/{x,y} - source1="$out/bar/foo" - destination1="$out/baz/foo" - source2="$man/share/x/file1" - destination2="$man/share/y/file2" - echo foo > $source1 - echo foo > $source2 - ln -s $source1 $destination1 - ln -s $source2 $destination2 - echo "symlink before patching: $(readlink $destination1)" - echo "symlink before patching: $(readlink $destination2)" - - _makeSymlinksRelativeInAllOutputs - - echo "symlink after patching: $(readlink $destination1)" - ([[ -e $destination1 ]] && echo "symlink isn't broken") || (echo "symlink is broken" && exit 1) - ([[ $(readlink $destination1) == "../bar/foo" ]] && echo "absolute symlink was made relative") || (echo "symlink was not made relative" && exit 1) - echo "symlink after patching: $(readlink $destination2)" - ([[ -e $destination2 ]] && echo "symlink isn't broken") || (echo "symlink is broken" && exit 1) - ([[ $(readlink $destination2) == "../x/file1" ]] && echo "absolute symlink was made relative") || (echo "symlink was not made relative" && exit 1) - ''; - }; + # test based on bootstrapTools to minimize rebuilds + make-symlinks-relative = + (derivation { + name = "test-make-symlinks-relative"; + system = stdenv.system; + builder = "${bootstrapTools}/bin/bash"; + initialPath = "${bootstrapTools}"; + outputs = [ + "out" + "out2" + ]; + args = [ + "-c" + '' + set -euo pipefail + . ${../../stdenv/generic/setup.sh} + . ${../../build-support/setup-hooks/make-symlinks-relative.sh} + + mkdir -p $out $out2 + + # create symlink targets + touch $out/target $out2/target + + # link within out + ln -s $out/target $out/linkToOut + + # link across different outputs + ln -s $out2/target $out/linkToOut2 + + # broken link + ln -s $out/does-not-exist $out/brokenLink + + # call hook + _makeSymlinksRelative + + # verify link within out became relative + echo "readlink linkToOut: $(readlink $out/linkToOut)" + if test "$(readlink $out/linkToOut)" != 'target'; then + echo "Expected relative link, got: $(readlink $out/linkToOut)" + exit 1 + fi + + # verify link across outputs is still absolute + if test "$(readlink $out/linkToOut2)" != "$out2/target"; then + echo "Expected absolute link, got: $(readlink $out/linkToOut2)" + exit 1 + fi + + # verify broken link was made relative + if test "$(readlink $out/brokenLink)" != 'does-not-exist'; then + echo "Expected relative broken link, got: $(readlink $out/brokenLink)" + exit 1 + fi + '' + ]; + }) + // { + meta = { }; + }; move-docs = stdenv.mkDerivation { name = "test-move-docs"; buildCommand = '' diff --git a/pkgs/tools/misc/pgbadger/default.nix b/pkgs/tools/misc/pgbadger/default.nix index 3d8d76c2b8866..8eab77a847cbe 100644 --- a/pkgs/tools/misc/pgbadger/default.nix +++ b/pkgs/tools/misc/pgbadger/default.nix @@ -7,8 +7,6 @@ nix-update-script, pgbadger, PodMarkdown, - shortenPerlShebang, - stdenv, testers, TextCSV_XS, which, @@ -29,13 +27,6 @@ buildPerlPackage rec { patchShebangs ./pgbadger ''; - # pgbadger has too many `-Idir` flags on its shebang line on Darwin, - # causing the build to fail when trying to generate the documentation. - # Rewrite the -I flags in `use lib` form. - preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang ./pgbadger - ''; - outputs = [ "out" ]; PERL_MM_OPT = "INSTALL_BASE=${placeholder "out"}"; @@ -46,8 +37,6 @@ buildPerlPackage rec { TextCSV_XS ]; - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ shortenPerlShebang ]; - nativeCheckInputs = [ bzip2 which diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index 1ebc5179bad78..bafb82fa50909 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -72,9 +72,35 @@ 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/466049 and + # https://gitlab.archlinux.org/archlinux/packaging/packages/openssh/-/issues/23 + (fetchpatch { + name = "pkcs11-fetchkey-error-to-debug.patch"; + url = "https://github.com/openssh/openssh-portable/commit/607f337637f2077b34a9f6f96fc24237255fe175.patch"; + hunks = [ "2-" ]; + hash = "sha256-rdvKL6/rwrdhGKlcmdy6fxVgJgaaRsmngX0KkShXAhQ="; + }) + (fetchpatch { + name = "pkcs11-fix-pinentry.patch"; + url = "https://github.com/openssh/openssh-portable/commit/434ba7684054c0637ce8f2486aaacafe65d9b8aa.patch"; + # only applies to Makefile.in (which doesn't have a date header) so no hunks= needed + hash = "sha256-3JQ3IJurngXclORrfC2Bx7xvmGA6w2nIh+eZ0zd0bLY="; + }) + # See discussion in https://github.com/NixOS/nixpkgs/issues/453782 and # https://github.com/openssh/openssh-portable/pull/602 - ./fix_pkcs11_tests.patch + (fetchpatch { + name = "pkcs11-tests-allow-module-path.patch"; + url = "https://github.com/openssh/openssh-portable/commit/5e7c3f33b2693b668ecfbac84b85f2c0c84410c2.patch"; + hunks = [ "2-" ]; + hash = "sha256-mGpRGXurg8K9Wp8qoojG5MQ+3sZW2XKy2z0RDXLHaEc="; + }) + (fetchpatch { + name = "ssh-agent-tests-increase-timeout.patch"; + url = "https://github.com/openssh/openssh-portable/commit/1fdc3c61194819c16063dc430eeb84b81bf42dcf.patch"; + hunks = [ "2-" ]; + hash = "sha256-b9YCOav32kY5VEvIG3W1fyD87HaQxof6Zwq9Oo+/Lac="; + }) ] ++ extraPatches; diff --git a/pkgs/tools/networking/openssh/fix_pkcs11_tests.patch b/pkgs/tools/networking/openssh/fix_pkcs11_tests.patch deleted file mode 100644 index c4459c8ee0e12..0000000000000 --- a/pkgs/tools/networking/openssh/fix_pkcs11_tests.patch +++ /dev/null @@ -1,51 +0,0 @@ -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/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index a681ff46aef86..3a39749b5a1c5 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -44,8 +44,14 @@ stdenv.mkDerivation rec { # Disable stack-related gnulib tests on x86_64-darwin because they have problems running under # Rosetta 2: test-c-stack hangs, test-sigsegv-catch-stackoverflow and test-sigaction fail. + # Disable all gnulib tests when building on Darwin due to test-nl_langinfo-mt failure + # known by upstream https://www.mail-archive.com/bug-gnulib@gnu.org/msg50806.html postPatch = - if + if stdenv.buildPlatform.isDarwin then + '' + sed -i 's:gnulib-tests::g' Makefile.in + '' + else if ((stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) || (stdenv.hostPlatform.isAarch32)) then '' diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index b0f1cbc803c9b..aab61444b5242 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -38,8 +38,9 @@ stdenv.mkDerivation { # Some gnulib tests fail # - on Musl: https://github.com/NixOS/nixpkgs/pull/228714 # - on x86_64-darwin: https://github.com/NixOS/nixpkgs/pull/228714#issuecomment-1576826330 + # - when building on Darwin (cross-compilation): test-nl_langinfo-mt fails postPatch = - if stdenv.hostPlatform.isMusl || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) then + if stdenv.hostPlatform.isMusl || stdenv.buildPlatform.isDarwin then '' sed -i 's:gnulib-tests::g' Makefile.in '' @@ -79,6 +80,11 @@ stdenv.mkDerivation { export MKDIR_P="mkdir -p" ''; + configureFlags = + # Work around build failure caused by the gnulib workaround for + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114870. remove after GCC 15 + lib.optional stdenv.hostPlatform.isCygwin "gl_cv_clean_version_stddef=yes"; + enableParallelBuilding = true; # Fix reference to sh in bootstrap-tools, and invoke grep via @@ -92,7 +98,7 @@ stdenv.mkDerivation { chmod +x $out/bin/egrep $out/bin/fgrep ''; - env = lib.optionalAttrs stdenv.hostPlatform.isMinGW { + env = lib.optionalAttrs (stdenv.hostPlatform.isMinGW || stdenv.hostPlatform.isCygwin) { NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; }; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 48b22d07c1447..40f1596302fe7 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -43,7 +43,6 @@ woff2, xxHash, makeWrapper, - shortenPerlShebang, useFixedHashes, asymptote, biber-ms, @@ -177,6 +176,7 @@ let "--disable-texlive" # do not build the texlive (TeX Live scripts) package "--disable-linked-scripts" # do not install the linked scripts "-C" # use configure cache to speed up + "CFLAGS=-std=gnu17" # fix build with gcc15 ] ++ withSystemLibs [ # see "from TL tree" vs. "Using installed" in configure output @@ -585,6 +585,18 @@ rec { "--with-ttfautohint" ]; + # GCC15 compataiblity patches + patches = [ + (fetchpatch { + url = "https://github.com/mgieseki/dvisvgm/commit/ebf66e3f59edf89e9d2b4fb7973b859e185eb034.patch"; + hash = "sha256-5dppK9saWOuIH4Pmv7Zk9vrRc81oK8qKZqkwCuOQhaY="; + }) + (fetchpatch { + url = "https://github.com/mgieseki/dvisvgm/commit/dcb5940dff7ca3084330119a4ff1472cd52ef6de.patch"; + hash = "sha256-rGTFeeLaWIon4O16x1wFxb3Wr020HdUR3BgrqB5r864="; + }) + ]; + # PDF handling requires mutool (from mupdf) since Ghostscript 10.01 postPatch = '' substituteInPlace src/PDFHandler.cpp \ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5267491438bcb..181e875e7708f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1618,6 +1618,7 @@ mapAliases { tet = throw "'tet' has been removed for lack of maintenance"; # Added 2025-10-12 tewi-font = throw "'tewi-font' has been removed because it was removed from upstream"; # Added 2025-12-18 texinfo4 = throw "'texinfo4' has been removed in favor of the latest version"; # Added 2025-06-08 + texinfo6 = throw "'texinfo6' has been removed in favor of the latest version"; # Added 2025-12-17 textual-paint = throw "'textual-paint' has been removed as it is broken"; # Added 2025-09-10 tezos-rust-libs = throw "ligo has been removed from nixpkgs for lack of maintenance"; # Added 2025-06-03 tf2pulumi = throw "'tf2pulumi' has been removed because upstream removed the repo. Consider using https://github.com/pulumi/pulumi-converter-terraform instead"; # Added 2025-12-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5c8e311f4ea6..200bb64670e8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2386,7 +2386,6 @@ with pkgs; pslSupport = true; zstdSupport = true; http3Support = true; - c-aresSupport = true; } // lib.optionalAttrs (!stdenv.hostPlatform.isStatic) { brotliSupport = true; @@ -3075,8 +3074,8 @@ with pkgs; nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { }; - nodejs = nodejs_22; - nodejs-slim = nodejs-slim_22; + nodejs = nodejs_24; + nodejs-slim = nodejs-slim_24; nodejs_20 = callPackage ../development/web/nodejs/v20.nix { }; nodejs-slim_20 = callPackage ../development/web/nodejs/v20.nix { enableNpm = false; }; @@ -4254,7 +4253,7 @@ with pkgs; gerbilPackages-unstable = pkgs.gerbil-support.gerbilPackages-unstable; # NB: don't recurseIntoAttrs for (unstable!) libraries glow-lang = pkgs.gerbilPackages-unstable.glow-lang; - default-gcc-version = 14; + default-gcc-version = 15; gcc = pkgs.${"gcc${toString default-gcc-version}"}; gccFun = callPackage ../development/compilers/gcc; gcc-unwrapped = gcc.cc; @@ -5055,7 +5054,6 @@ with pkgs; inherit (rustPackages) cargo - cargo-auditable cargo-auditable-cargo-wrapper clippy rustc @@ -5633,9 +5631,9 @@ with pkgs; python27Packages = python27.pkgs; python310Packages = python310.pkgs; python311Packages = python311.pkgs; - python312Packages = recurseIntoAttrs python312.pkgs; + python312Packages = python312.pkgs; python313Packages = recurseIntoAttrs python313.pkgs; - python314Packages = python314.pkgs; + python314Packages = recurseIntoAttrs python314.pkgs; python315Packages = python315.pkgs; pypyPackages = pypy.pkgs; pypy2Packages = pypy2.pkgs; @@ -6539,7 +6537,6 @@ with pkgs; texinfoPackages = callPackages ../development/tools/misc/texinfo/packages.nix { }; inherit (texinfoPackages) - texinfo6 texinfo7 ; texinfo = texinfo7; @@ -7106,8 +7103,6 @@ with pkgs; autoconf = buildPackages.autoconf269; }; - gpgme = callPackage ../development/libraries/gpgme { }; - grantlee = libsForQt5.callPackage ../development/libraries/grantlee { }; glib = callPackage ../by-name/gl/glib/package.nix ( @@ -8689,13 +8684,12 @@ with pkgs; ### DEVELOPMENT / PERL MODULES perlInterpreters = import ../development/interpreters/perl { inherit callPackage; }; - inherit (perlInterpreters) perl538 perl540; + inherit (perlInterpreters) perl5; - perl538Packages = recurseIntoAttrs perl538.pkgs; - perl540Packages = recurseIntoAttrs perl540.pkgs; + perl5Packages = recurseIntoAttrs perl5.pkgs; - perl = perl540; - perlPackages = perl540Packages; + perl = perl5; + perlPackages = perl5Packages; ack = perlPackages.ack; @@ -10758,6 +10752,7 @@ with pkgs; gimp2 = callPackage ../applications/graphics/gimp/2.0 { lcms = lcms2; + stdenv = if stdenv.cc.isGNU then gcc14Stdenv else stdenv; }; gimp2-with-plugins = callPackage ../applications/graphics/gimp/wrapper.nix { @@ -12069,7 +12064,7 @@ with pkgs; buildTypstPackage = callPackage ../build-support/build-typst-package.nix { }; - typstPackages = typst.packages; + typstPackages = recurseIntoAttrs typst.packages; ueberzug = with python3Packages; toPythonApplication ueberzug; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5488c550455b4..ed0ebb923fcf9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20,7 +20,6 @@ fetchFromGitHub, fetchFromGitLab, perl, - shortenPerlShebang, nixosTests, }: @@ -66,19 +65,22 @@ with self; args: buildPerlPackage ( { + # In case of cross-compilation, generated ./Build have host perl shebang, not build one + # so run it with build perl explicitly buildPhase = '' runHook preBuild - perl Build.PL --prefix=$out; ./Build build + perl Build.PL --prefix=$out; + perl ./Build build runHook postBuild ''; installPhase = '' runHook preInstall - ./Build install + perl ./Build install runHook postInstall ''; checkPhase = '' runHook preCheck - ./Build test + perl ./Build test runHook postCheck ''; } @@ -126,11 +128,7 @@ with self; "man" ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ FileNext ]; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/ack - ''; # tests fails on nixos and hydra because of different purity issues doCheck = false; @@ -1217,10 +1215,6 @@ with self; --replace-fail http://cpanmetadb.plackperl.org https://cpanmetadb.plackperl.org ''; propagatedBuildInputs = [ IOSocketSSL ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/cpanm - ''; meta = { description = "Get, unpack, build and install modules from CPAN"; homepage = "https://github.com/miyagawa/cpanminus"; @@ -1258,10 +1252,6 @@ with self; ParallelPipes locallib ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/cpm - ''; meta = { description = "Fast CPAN module installer"; homepage = "https://github.com/skaji/cpm"; @@ -1308,7 +1298,6 @@ with self; TextLayout ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ Wx ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; # Delete tests that fail when version env var is set, see # https://github.com/ChordPro/chordpro/issues/293 @@ -1317,7 +1306,6 @@ with self; ''; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/chordpro rm $out/bin/wxchordpro # Wx not supported on darwin ''; meta = { @@ -1873,10 +1861,10 @@ with self; AudioScan = buildPerlPackage { pname = "Audio-Scan"; - version = "1.10"; + version = "1.11"; src = fetchurl { - url = "https://github.com/Logitech/slimserver-vendor/raw/public/9.0/CPAN/Audio-Scan-1.10.tar.gz"; - hash = "sha256-Vqi/rnYKijmaWYwTFTyj88aMoDB2cCSHxHeR1bkfqSk="; + url = "https://github.com/Logitech/slimserver-vendor/raw/public/9.1/CPAN/Audio-Scan-1.11.tar.gz"; + hash = "sha256-G+0qaqP2c1w/UKuOmRawq/qKZjsWvZUzTAl5C6H6bUI="; }; buildInputs = [ pkgs.zlib @@ -2582,6 +2570,15 @@ with self; url = "mirror://cpan/authors/id/S/ST/STBEY/Bit-Vector-7.4.tar.gz"; hash = "sha256-PG2qZx/s+8Nfkqk4W1Y9ZfUN/Gvci0gF+e9GwNA1qSY="; }; + patches = [ + # Fix build with gcc15 + # https://rt.cpan.org/Public/Bug/Display.html?id=165142 + (fetchpatch { + name = "perl-bitvector-fix-bool-detection.patch"; + url = "https://src.fedoraproject.org/rpms/perl-Bit-Vector/raw/fe339c95e0da8a130c5bba5a975d37230178b59d/f/0001-Fix-bool-detection.patch"; + hash = "sha256-zC4/RMKhdFNEwNIorzuU76p8P/Lwgv1pF6Oi4MX4M1o="; + }) + ]; propagatedBuildInputs = [ CarpClan ]; meta = { description = "Efficient bit vector, set of integers and 'big int' math library"; @@ -2595,10 +2592,10 @@ with self; BKeywords = buildPerlPackage { pname = "B-Keywords"; - version = "1.27"; + version = "1.28"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.27.tar.gz"; - hash = "sha256-7xC5CF5nTqpBfMt9aS+2zZj3u2feKhJ+ujRX2K5YfP8="; + url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.28.tar.gz"; + hash = "sha256-nn62dpWSlIfGGq8trouvndoa2HYCu1oJTxB0SxJ2Xj4="; }; meta = { description = "Lists of reserved barewords and symbol names"; @@ -2731,63 +2728,6 @@ with self; }; }; - BSON = buildPerlPackage { - pname = "BSON"; - version = "1.12.2"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MO/MONGODB/BSON-v1.12.2.tar.gz"; - hash = "sha256-9GEsDDVDEHQbmattJkUSJoIxUMonEJsbORIy1c/dpts="; - }; - buildInputs = [ - JSONMaybeXS - PathTiny - TestDeep - TestFatal - ]; - propagatedBuildInputs = [ - CryptURandom - Moo - TieIxHash - boolean - namespaceclean - ]; - meta = { - description = "BSON serialization and deserialization (EOL)"; - homepage = "https://github.com/mongodb-labs/mongo-perl-bson"; - license = with lib.licenses; [ asl20 ]; - }; - }; - - BSONXS = buildPerlPackage { - pname = "BSON-XS"; - version = "0.8.4"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MO/MONGODB/BSON-XS-v0.8.4.tar.gz"; - hash = "sha256-KPfTOP14tvnJpggL6d4/XLI9iIuW6/b8v6zp8pZq6/k="; - }; - buildInputs = [ - ConfigAutoConf - JSONMaybeXS - PathTiny - TestDeep - TestFatal - TieIxHash - ]; - propagatedBuildInputs = [ - BSON - boolean - JSONXS - JSONPP - CpanelJSONXS - ]; - meta = { - description = "XS implementation of MongoDB's BSON serialization (EOL)"; - homepage = "https://github.com/mongodb-labs/mongo-perl-bson-xs"; - license = with lib.licenses; [ asl20 ]; - platforms = lib.platforms.linux; # configure phase fails with "ld: unknown option: -mmacosx-version-min=10.12" - }; - }; - BUtils = buildPerlPackage { pname = "B-Utils"; version = "0.27"; @@ -2797,6 +2737,10 @@ with self; }; propagatedBuildInputs = [ TaskWeaken ]; buildInputs = [ ExtUtilsDepends ]; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/utils/40walk.t + ''; meta = { description = "Helper functions for op tree manipulation"; homepage = "https://search.cpan.org/dist/B-Utils"; @@ -3382,7 +3326,6 @@ with self; buildInputs = [ ModuleBuildTiny TestLongString - TestSimple13 TestWWWMechanize TestWWWMechanizeCatalyst ]; @@ -3803,7 +3746,6 @@ with self; buildInputs = [ CatalystRuntime TestLongString - TestSimple13 TestWWWMechanize TestWWWMechanizeCatalyst ]; @@ -4177,7 +4119,6 @@ with self; buildInputs = [ CatalystRuntime TestLongString - TestSimple13 TestWWWMechanize TestWWWMechanizeCatalyst TextCSV @@ -4440,6 +4381,11 @@ with self; TestWarn ]; propagatedBuildInputs = [ HTMLParser ]; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/rt-84767.t + rm t/param_list_context.t + ''; meta = { description = "Handle Common Gateway Interface requests and responses"; homepage = "https://metacpan.org/module/CGI"; @@ -5295,6 +5241,12 @@ with self; url = "mirror://cpan/authors/id/K/KM/KMX/Class-Throwable-0.13.tar.gz"; hash = "sha256-3JoR4Nq1bcIg3qjJT+PEfbXn3Xwe0E3IF4qlu3v7vM4="; }; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/10_Class_Throwable_test.t + rm t/20_Class_Throwable_subException_test.t + rm t/35_Class_Throwable_sub_class_test.t + ''; meta = { description = "Minimal lightweight exception class"; license = with lib.licenses; [ @@ -6437,7 +6389,6 @@ with self; }; buildInputs = [ TestException - TestSimple13 ]; meta = { description = "Run code after a subroutine call, preserving the context the subroutine would have seen if it were the last statement in the caller"; @@ -6494,6 +6445,15 @@ with self; url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.57.tar.gz"; hash = "sha256-GSjkgDNUDhHr9VBpht0QGveNJCHSEPllmSI7FdUXFMY="; }; + patches = [ + # Fix build with gcc15 + # https://rt.cpan.org/Public/Bug/Display.html?id=158609 + (fetchpatch { + name = "perl-coro-c23.patch"; + url = "https://src.fedoraproject.org/rpms/perl-Coro/raw/7099f289e10ec5d4d5dbbabe6267257588417693/f/Coro-6.57-c23.patch"; + hash = "sha256-BnVE+E8taPfmAN+bsKK3AvesVrwi52GWUMa6TFJw3KY="; + }) + ]; propagatedBuildInputs = [ AnyEvent Guard @@ -6633,14 +6593,10 @@ with self; url = "mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Mini-1.111017.tar.gz"; hash = "sha256-8gQpO+JqyEGsyHBEoYjbD1kegIgTFseiiK7A7s4wYVU="; }; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ FileHomeDir LWPProtocolHttps ]; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/minicpan - ''; meta = { description = "Create a minimal mirror of CPAN"; @@ -7105,7 +7061,6 @@ with self; url = "mirror://cpan/authors/id/B/BA/BARTB/Crypt-HSXKPasswd-v3.6.tar.gz"; hash = "sha256-lZ3MX58BG/ALha0i31ZrerK/XqHTYrDeD7WuKfvEWLM="; }; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ Clone DateTime @@ -7120,9 +7075,6 @@ with self; TextUnidecode TypeTiny ]; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/hsxkpasswd - ''; meta = { description = "Secure memorable password generator"; @@ -7315,7 +7267,6 @@ with self; buildInputs = [ ModuleBuildTiny TestFatal - TestSimple13 ]; propagatedBuildInputs = [ CaptureTiny @@ -7575,10 +7526,6 @@ with self; LWP ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/pgplet - ''; doCheck = false; # test fails with 'No random source available!' meta = { @@ -9908,6 +9855,16 @@ with self; hash = "sha256-jZANTA50nzchh1KmZh+w01V6sfzMjeo4TLWHw4LeIZs="; }; + patches = [ + # Fix build with gcc15 + # https://github.com/bucardo/dbdpg/pull/148 + (fetchpatch { + name = "perl-dbdpg-fix-c23-compliance.patch"; + url = "https://github.com/bucardo/dbdpg/commit/8da04f9169d017469e3a12f08322e6bd88e8f239.patch"; + hash = "sha256-MpVpaZoRgN1ABk6F6hFZvo9IkQJX2frHDygOTa0wics="; + }) + ]; + buildInputs = [ pkgs.postgresql ]; propagatedBuildInputs = [ DBI ]; @@ -10049,7 +10006,6 @@ with self; }; buildInputs = [ DBIxClass - TestSimple13 ]; propagatedBuildInputs = [ DBDSQLite @@ -10218,6 +10174,10 @@ with self; SafeIsa TextBrew ]; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/ResultSet/Errors.t + ''; meta = { description = "Simplify the common case stuff for DBIx::Class"; homepage = "https://github.com/frioux/DBIx-Class-Helpers"; @@ -10603,10 +10563,6 @@ with self; CaptureTiny TestDifferences ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/* - ''; meta = { description = "Powerful fast feature-rich Perl source code profiler"; homepage = "https://code.google.com/p/perl-devel-nytprof"; @@ -10669,7 +10625,6 @@ with self; namespaceclean ]; buildInputs = [ - TestSimple13 TestWarnings ]; meta = { @@ -10697,10 +10652,10 @@ with self; DevelSize = buildPerlPackage { pname = "Devel-Size"; - version = "0.84"; + version = "0.85"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NW/NWCLARK/Devel-Size-0.84.tar.gz"; - hash = "sha256-2y5NZfaI2/WSc7XoIQGsPxpm9mWvsFlNzhaLhlCk0OQ="; + url = "mirror://cpan/authors/id/N/NW/NWCLARK/Devel-Size-0.85.tar.gz"; + hash = "sha256-KS+YsT7dGqSlROOlzx2fLXAZ91xzZNLo+oo16lRR5z4="; }; meta = { description = "Perl extension for finding the memory usage of Perl variables"; @@ -11031,10 +10986,6 @@ with self; TermUI YAMLTiny ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/dzil - ''; doCheck = false; meta = { description = "Distribution builder; installer not included"; @@ -11892,13 +11843,9 @@ with self; Throwable TryTiny ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; postPatch = '' patchShebangs --build util ''; - preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang util/sendmail - ''; meta = { description = "Library for sending email"; homepage = "https://github.com/rjbs/Email-Sender"; @@ -12261,10 +12208,10 @@ with self; Error = buildPerlModule { pname = "Error"; - version = "0.17029"; + version = "0.17030"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Error-0.17029.tar.gz"; - hash = "sha256-GiP3kTAyrtbUtoMhNzo4mcpmWQ9HJzkaCR7BnJW/etw="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Error-0.17030.tar.gz"; + hash = "sha256-NNOCJ2wPsNazg1W5TJajCxLYNNVmLrU/CI7iXj5xKSQ="; }; meta = { description = "Error/exception handling in an OO-ish way"; @@ -12282,6 +12229,13 @@ with self; url = "mirror://cpan/authors/id/M/ML/MLEHMANN/EV-4.34.tar.gz"; hash = "sha256-EhFoPc57Z3H0q3EMwVNxK913umFXoTKU0LtzSR/QZWA="; }; + patches = [ + (fetchpatch { + name = "EV-4.34-perl-5.42.patch"; + url = "https://free.nchc.org.tw/gentoo-portage/dev-perl/EV/files/EV-4.34-perl-5.42.patch"; + hash = "sha256-GiQ89pk3EZ3b6oxB7jDTY5C62qqKsZUjJ4Ag2JVwGFw="; + }) + ]; buildInputs = [ CanaryStability ]; propagatedBuildInputs = [ commonsense ]; meta = { @@ -14399,6 +14353,10 @@ with self; DirSelf TestFatal ]; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/eating_strict_error.t + ''; meta = { description = "Define functions and methods with parameter lists (\"subroutine signatures\")"; license = with lib.licenses; [ @@ -14462,10 +14420,10 @@ with self; FutureAsyncAwait = buildPerlModule { pname = "Future-AsyncAwait"; - version = "0.66"; + version = "0.70"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-0.66.tar.gz"; - hash = "sha256-xqD03kYr8yS1usoXddGZ7DJGo1jBPbm2Ssv82+bl7CE="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-0.70.tar.gz"; + hash = "sha256-hCiZBJyXf7IyaoCWkmRB5XvsqRK7K0kY1c4JDfTUprc="; }; buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ @@ -14795,10 +14753,6 @@ with self; url = "mirror://cpan/authors/id/T/TO/TORBIAK/App-Git-Autofixup-0.004007.tar.gz"; hash = "sha256-2pe/dnKAlbO27nHaGfC/GUMBsvRd9HietU23Tt0hCjs="; }; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/git-autofixup - ''; meta = { description = "Create fixup commits for topic branches"; license = with lib.licenses; [ artistic2 ]; @@ -15328,6 +15282,11 @@ with self; url = "mirror://cpan/authors/id/X/XA/XAOC/Gtk2-1.24993.tar.gz"; hash = "sha256-ScRDdDsu7+EadoACck9/akxI78lP8806VZ+357aTyWc="; }; + + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-std=gnu17"; + }; + patches = [ # Fix incompatible function pointer conversion (assigning `GdkNativeWindow` to `guint32`). ../development/perl-modules/Gtk2-fix-incompatible-pointer-conversion.patch @@ -15577,16 +15536,12 @@ with self; TermSk namespaceclean ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; patches = [ ../development/perl-modules/Hailo-fix-test-gld.patch ]; postPatch = '' patchShebangs bin ''; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/hailo - ''; meta = { description = "Pluggable Markov engine analogous to MegaHAL"; homepage = "https://github.com/hailo/hailo"; @@ -15606,7 +15561,6 @@ with self; hash = "sha256-vJpKo47JjwqYKJ41q/mhfC8qMjmiIJoymADglwqi4MU="; }; propagatedBuildInputs = [ HashMerge ]; - buildInputs = [ TestSimple13 ]; meta = { description = "Return difference between two hashes as a hash"; @@ -16692,25 +16646,6 @@ with self; }; }; - HTTPHeaderParserXS = buildPerlPackage { - pname = "HTTP-HeaderParser-XS"; - version = "0.20"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKSMITH/HTTP-HeaderParser-XS-0.20.tar.gz"; - hash = "sha256-qeAP/7PYmRoUqq/dxh1tFoxP8U4xSuPbstTaMAjXRu8="; - }; - meta = { - description = "XS extension for processing HTTP headers"; - license = with lib.licenses; [ - artistic1 - gpl1Plus - ]; - broken = - stdenv.hostPlatform.isi686 # loadable library and perl binaries are mismatched (got handshake key 0x7d40080, needed 0x7dc0080) - || stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.HTTPHeaderParserXS.x86_64-darwin - }; - }; - HTTPHeadersFast = buildPerlModule { pname = "HTTP-Headers-Fast"; version = "0.22"; @@ -17302,10 +17237,6 @@ with self; }; buildInputs = [ CanaryStability ]; propagatedBuildInputs = [ commonsense ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/treescan - ''; meta = { description = "Asynchronous/Advanced Input/Output"; license = with lib.licenses; [ @@ -17489,7 +17420,6 @@ with self; ]; buildInputs = [ ModuleBuildTiny - TestSimple13 ]; meta = { description = "Functions for working with IO::Handle like objects"; @@ -18448,8 +18378,7 @@ with self; ]; nativeBuildInputs = [ pkgs.makeWrapper - ] - ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; + ]; makeMakerFlags = [ "TEXMF=\${tex}" "NOMKTEXLSR" @@ -18457,11 +18386,6 @@ with self; # shebangs need to be patched before executables are copied to $out preBuild = '' patchShebangs bin/ - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - for file in bin/*; do - shortenPerlShebang "$file" - done ''; postInstall = '' for file in latexmlc latexmlmath latexmlpost ; do @@ -20841,22 +20765,23 @@ with self; MathPari = buildPerlPackage rec { pname = "Math-Pari"; - version = "2.030523"; + version = "2.030528"; nativeBuildInputs = [ pkgs.unzip ]; - pariversion = "2.1.7"; + pariversion = "2.3.5"; pari_tgz = fetchurl { - url = "https://pari.math.u-bordeaux.fr/pub/pari/OLD/2.1/pari-${pariversion}.tgz"; - hash = "sha256-kULyza8wg8iWLxpcK7Dp/okV99lJDAMxKsI2HH6hVfo="; + url = "https://pari.math.u-bordeaux.fr/pub/pari/OLD/2.3/pari-${pariversion}.tar.gz"; + hash = "sha256-R92uGvc7RHZmDSqJM4SDlJBnqX/7h1jILoGJ36TInYg="; }; + # Workaround build failure on -fno-common toolchains: # ld: libPARI/libPARI.a(compat.o):(.bss+0x8): multiple definition of # `overflow'; Pari.o:(.bss+0x80): first defined here env.NIX_CFLAGS_COMPILE = "-fcommon -Wno-error=implicit-int -Wno-error=implicit-function-declaration"; - preConfigure = "cp ${pari_tgz} pari-${pariversion}.tgz"; - makeMakerFlags = [ "pari_tgz=pari-${pariversion}.tgz" ]; + preConfigure = "cp ${pari_tgz} pari-${pariversion}.tar.gz"; + makeMakerFlags = [ "pari_tgz=pari-${pariversion}.tar.gz" ]; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILYAZ/modules/Math-Pari-2.030518.zip"; - hash = "sha256-3DiVWpaQvmuvqN4lJiEjd8Psn+jaXsAiY6nK+UtYu5E="; + url = "mirror://cpan/authors/id/I/IL/ILYAZ/modules/Math-Pari-2.030528.tar.gz"; + hash = "sha256-Z/dNIWxpY1qxxuo+J84ZdQqUorVgrnKIuy1s9xT85sg="; }; meta = { description = "Perl interface to PARI"; @@ -22023,6 +21948,10 @@ with self; TestDeep TestNoWarnings ]; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/20_parse_self.t + ''; meta = { description = "Find out what modules are used"; license = with lib.licenses; [ @@ -22948,47 +22877,6 @@ with self; }; }; - MongoDB = buildPerlPackage { - pname = "MongoDB"; - version = "2.2.2"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MO/MONGODB/MongoDB-v2.2.2.tar.gz"; - hash = "sha256-IBk1+S2slPOcNd5zZh6LJSQ55JbyKGV9uF/5MlfDJo8="; - }; - buildInputs = [ - JSONMaybeXS - PathTiny - TestDeep - TestFatal - TimeMoment - ]; - propagatedBuildInputs = [ - AuthenSASLSASLprep - AuthenSCRAM - BSON - IOSocketSSL - NetSSLeay - ClassXSAccessor - BSONXS - TypeTinyXS - MozillaCA - Moo - NetDNS - SafeIsa - SubQuote - TieIxHash - TypeTiny - UUIDURandom - boolean - namespaceclean - ]; - meta = { - description = "Official MongoDB Driver for Perl (EOL)"; - homepage = "https://github.com/mongodb-labs/mongo-perl-driver"; - license = with lib.licenses; [ asl20 ]; - }; - }; - MonitoringPlugin = buildPerlPackage { pname = "Monitoring-Plugin"; version = "0.40"; @@ -24142,7 +24030,6 @@ with self; buildInputs = [ ModuleBuildTiny TestFatal - TestSimple13 TestTableDriven ]; propagatedBuildInputs = [ @@ -24295,7 +24182,6 @@ with self; MooseXRoleParameterized TestFatal TestRequires - TestSimple13 ]; propagatedBuildInputs = [ Moose @@ -24394,7 +24280,6 @@ with self; buildInputs = [ ModuleBuildTiny TestFatal - TestSimple13 ]; propagatedBuildInputs = [ DateTime @@ -24420,7 +24305,6 @@ with self; buildInputs = [ ModuleBuildTiny TestFatal - TestSimple13 ]; propagatedBuildInputs = [ DateTimeXEasy @@ -24667,10 +24551,10 @@ with self; Mouse = buildPerlModule { pname = "Mouse"; - version = "2.5.10"; + version = "2.5.11"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.10.tar.gz"; - hash = "sha256-zo3COUYVOkZ/8JdlFn7iWQ9cUCEg9IotlEFzPzmqMu4="; + url = "mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.11.tar.gz"; + hash = "sha256-4qDQkwGQwhpES5YHk6ouNp7yih3QuPNIKXlfhqGRWVY="; }; buildInputs = [ ModuleBuildXSUtil @@ -24785,6 +24669,9 @@ with self; substituteInPlace Makefile.PL \ --replace-fail '`which pkg-config`' "'$PKG_CONFIG'" ''; + patches = [ + ../development/perl-modules/MusicBrainz-DiscID---ExtUtils-ParseXS-compat.patch + ]; doCheck = false; # The main test performs network access nativeBuildInputs = [ pkgs.pkg-config ]; propagatedBuildInputs = [ pkgs.libdiscid ]; @@ -25062,6 +24949,12 @@ with self; url = "mirror://cpan/authors/id/B/BA/BARNEY/Net-Amazon-S3-0.991.tar.gz"; hash = "sha256-+3r4umSUjRo/MdgJ13EFImiA8GmYrH8Rn4JITmijI9M="; }; + patches = [ + (fetchpatch { + url = "https://github.com/rustyconover/net-amazon-s3/commit/233cb0f2812c4f71b4fecd4058dbf34fe8d6824d.patch"; + hash = "sha256-lVx1CoAFY37KIkDdl2Inqb16aZ9D0lXt475/7LyjOLM="; + }) + ]; buildInputs = [ TestDeep TestException @@ -26565,10 +26458,10 @@ with self; ObjectPad = buildPerlModule { pname = "Object-Pad"; - version = "0.809"; + version = "0.821"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Object-Pad-0.809.tar.gz"; - hash = "sha256-EpUKZkwGB+o/ynSA82XfVNF0YpH0XrsO2AkXt0+xXvU="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Object-Pad-0.821.tar.gz"; + hash = "sha256-tdUF+PoWLg5r4q5YsPM0SUxPeRs6BA8va4kBTwSEUgw="; }; buildInputs = [ Test2Suite @@ -27628,21 +27521,11 @@ with self; PDL = buildPerlPackage { pname = "PDL"; - version = "2.025"; + version = "2.100"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETJ/PDL-2.025.tar.gz"; - hash = "sha256-G1oWfq0ndy2V2tJ/jrfQlRnSkVbu1TxvwUQVGUtaitY="; + url = "mirror://cpan/authors/id/E/ET/ETJ/PDL-2.100.tar.gz"; + hash = "sha256-iqpu35AlWj0LTQBH1icOESS/HhrNJBSATocxC2s5vkA="; }; - patchPhase = '' - substituteInPlace perldl.conf \ - --replace 'POSIX_THREADS_LIBS => undef' 'POSIX_THREADS_LIBS => "-L${pkgs.glibc.dev}/lib"' \ - --replace 'POSIX_THREADS_INC => undef' 'POSIX_THREADS_INC => "-I${pkgs.glibc.dev}/include"' \ - --replace 'WITH_MINUIT => undef' 'WITH_MINUIT => 0' \ - --replace 'WITH_SLATEC => undef' 'WITH_SLATEC => 0' \ - --replace 'WITH_HDF => undef' 'WITH_HDF => 0' \ - --replace 'WITH_GD => undef' 'WITH_GD => 0' \ - --replace 'WITH_PROJ => undef' 'WITH_PROJ => 0' - ''; # FIXME: Why are these libraries in `nativeBuildInputs`? nativeBuildInputs = with pkgs; [ @@ -27759,7 +27642,6 @@ with self; hash = "sha256-5c2V3j5DvOcHdRdidLqkBfMm/IdA3wBUu4FpdcyNNJs="; }; buildInputs = [ TestDeep ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ BKeywords ConfigTiny @@ -27777,8 +27659,10 @@ with self; Readonly StringFormat ]; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/perlcritic + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/20_policy_require_tidy_code.t + rm t/03_pragmas.t ''; meta = { description = "Critique Perl source code for best-practices"; @@ -27793,18 +27677,18 @@ with self; PerlCriticCommunity = buildPerlModule { pname = "Perl-Critic-Community"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DB/DBOOK/Perl-Critic-Community-v1.0.3.tar.gz"; - hash = "sha256-Ed3bt5F5/mIp8zPKOS+U/firXNmJzJfZk1IaidXEetU="; + url = "mirror://cpan/authors/id/D/DB/DBOOK/Perl-Critic-Community-v1.0.4.tar.gz"; + hash = "sha256-OzFiTqDPQ5K49Dl6UpUVJIgUohZml/GkU9WKtvES0gk="; }; buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ PPI PathTiny PerlCritic + PerlCriticPolicyPliceaseProhibitArrayAssignAref PerlCriticPolicyVariablesProhibitLoopOnHash - PerlCriticPulp ]; meta = { description = "Community-inspired Perl::Critic policies"; @@ -27832,6 +27716,21 @@ with self; }; }; + PerlCriticPolicyPliceaseProhibitArrayAssignAref = buildPerlPackage { + pname = "Perl-Critic-Policy-Plicease-ProhibitArrayAssignAref"; + version = "100.00"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Perl-Critic-Policy-Plicease-ProhibitArrayAssignAref-100.00.tar.gz"; + hash = "sha256-2LcyMNK4vyuAEE/Ap1jHSLn/N7CL+Buqc/jXCeIM/r4="; + }; + propagatedBuildInputs = [ PerlCritic ]; + meta = { + homepage = "https://metacpan.org/pod/Perl::Critic::Policy::Plicease::ProhibitArrayAssignAref"; + description = "Don't assign an anonymous arrayref to an array"; + license = lib.licenses.gpl3Plus; + }; + }; + PerlCriticPolicyVariablesProhibitLoopOnHash = buildPerlPackage { pname = "Perl-Critic-Policy-Variables-ProhibitLoopOnHash"; version = "0.008"; @@ -28087,10 +27986,10 @@ with self; PerlTidy = buildPerlPackage { pname = "Perl-Tidy"; - version = "20230912"; + version = "20250711"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20230912.tar.gz"; - hash = "sha256-DFeIjyBvmHd34WZA5yV0qgp3eEZxn44+0EE8NTJfVUA="; + url = "mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20250711.tar.gz"; + hash = "sha256-NHqpC8773itZDa9I04fvH9m3pzqZawQCafEatvuLpEg="; }; meta = { description = "Indent and reformat perl scripts"; @@ -28479,9 +28378,9 @@ with self; PodMarkdown URI ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/pls + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/02document-new.t ''; meta = { description = "Perl Language Server"; @@ -28603,10 +28502,12 @@ with self; TaskWeaken ]; - # Remove test that fails due to unexpected shebang after - # patchShebang. - preCheck = "rm t/03_document.t"; - + preCheck = " + # Remove test that fails due to unexpected shebang after patchShebang. + rm t/03_document.t + # Remove tests with hardcoded line numbers. + rm t/29_logical_filename.t + "; meta = { description = "Parse, Analyze and Manipulate Perl (without perl)"; homepage = "https://github.com/Perl-Critic/PPI"; @@ -29182,6 +29083,10 @@ with self; url = "mirror://cpan/authors/id/M/MA/MAREKR/Pod-Checker-1.75.tar.gz"; hash = "sha256-82O1dOxmCvbtvT5dTJ/8UVodRsvxx8ytmkbO0oh5wiE="; }; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/pod/podchkenc.t + ''; meta = { description = "Verifies POD documentation contents for compliance with the POD format specifications"; license = with lib.licenses; [ @@ -29292,6 +29197,10 @@ with self; }; propagatedBuildInputs = [ MixinLinewise ]; buildInputs = [ TestDeep ]; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/non-pod.t + ''; meta = { description = "Read a POD document as a series of trivial events"; homepage = "https://github.com/rjbs/Pod-Eventual"; @@ -29720,10 +29629,6 @@ with self; url = "mirror://cpan/authors/id/S/SY/SYP/App-rainbarf-1.4.tar.gz"; hash = "sha256-TxOa01+q8t4GI9wLsd2J+lpDHlSL/sh97hlM8OJcyX0="; }; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/rainbarf - ''; meta = { description = "CPU/RAM/battery stats chart bar for tmux (and GNU screen)"; homepage = "https://github.com/creaktive/rainbarf"; @@ -30171,6 +30076,10 @@ with self; AnyEvent DataSExpression ]; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/06.query.t + ''; meta = { description = "Asynchronous Remote Procedure Stack"; license = with lib.licenses; [ @@ -31194,13 +31103,6 @@ with self; patchShebangs script ''; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - for file in $out/bin/*; do - shortenPerlShebang $file - done - ''; - meta = { description = "SQL DDL transformations and more"; license = with lib.licenses; [ @@ -31288,7 +31190,6 @@ with self; TestRequires TestTCP ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ DataDump HTTPParserXS @@ -31297,9 +31198,6 @@ with self; NetServerSSPrefork IOSocketINET6 ]; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/starman - ''; doCheck = false; # binds to various TCP ports meta = { @@ -31329,10 +31227,10 @@ with self; StatisticsCaseResampling = buildPerlPackage { pname = "Statistics-CaseResampling"; - version = "0.15"; + version = "0.17"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SM/SMUELLER/Statistics-CaseResampling-0.15.tar.gz"; - hash = "sha256-hRxDvW8Q0yKJUipQxqIJw7JGz9PrVmdz5oYe2gSkkIc="; + url = "mirror://cpan/authors/id/S/SM/SMUELLER/Statistics-CaseResampling-0.17.tar.gz"; + hash = "sha256-buZtDu2BiC7E+kj//hY6BP2YxNVqwejNwUqfg70YObw="; }; meta = { description = "Efficient resampling and calculation of medians with confidence intervals"; @@ -31862,7 +31760,6 @@ with self; }; buildInputs = [ TestException - TestSimple13 TestTableDriven ]; propagatedBuildInputs = [ @@ -32026,6 +31923,11 @@ with self; url = "mirror://cpan/authors/id/R/RG/RGARCIA/Sub-Identify-0.14.tar.gz"; hash = "sha256-Bo0nIIZRTdHoQrakCxvtuv7mOQDlsIiQ72cAA53vrW8="; }; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/04codelocation-pureperl.t + rm t/04codelocation.t + ''; meta = { description = "Retrieve names of code references"; license = with lib.licenses; [ @@ -32280,6 +32182,10 @@ with self; url = "mirror://cpan/authors/id/D/DE/DEXTER/Symbol-Util-0.0203.tar.gz"; hash = "sha256-VbZh3SL5zpub5afgo/UomsAM0lTCHj2GAyiaVlrm3DI="; }; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/10use.t + ''; meta = { description = "Additional utils for Perl symbols manipulation"; license = with lib.licenses; [ @@ -32331,10 +32237,10 @@ with self; SyntaxKeywordTry = buildPerlModule { pname = "Syntax-Keyword-Try"; - version = "0.29"; + version = "0.30"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Syntax-Keyword-Try-0.29.tar.gz"; - hash = "sha256-zDIHGdNgjaqVFHQ6Q9rCvpnLjM2Ymx/vooUpDLHVnY8="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Syntax-Keyword-Try-0.30.tar.gz"; + hash = "sha256-8Gjwuccf/4/vbYqentaVHLelK5djIr2VUYHMXnsX5pI="; }; buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ XSParseKeyword ]; @@ -33368,7 +33274,6 @@ with self; IPCRun3 Test2Suite ]; - propagatedBuildInputs = [ TestSimple13 ]; meta = { description = "Fail if tests warn"; homepage = "https://metacpan.org/release/Test2-Plugin-NoWarnings"; @@ -33388,7 +33293,6 @@ with self; ScopeGuard SubInfo TermTable - TestSimple13 ]; meta = { description = "Distribution with a rich set of tools built upon the Test2 framework"; @@ -33501,6 +33405,10 @@ with self; hash = "sha256-/NzkHVcnOIFYGt9oCiCmrfUaTDt+McP2mGb7kQk3AoA="; }; propagatedBuildInputs = [ LogTrace ]; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/Test-Assertions.t + ''; meta = { description = "Simple set of building blocks for both unit and runtime testing"; license = with lib.licenses; [ gpl2Only ]; @@ -33596,6 +33504,14 @@ with self; ModuleRuntime TryTiny ]; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/runtests_die.t + rm t/runtests_die_empty.t + rm t/runtests_die_nearlyempty.t + rm t/runtests_result.t + rm t/todo.t + ''; meta = { description = "Easily create test classes in an xUnit/JUnit style"; license = with lib.licenses; [ @@ -33921,6 +33837,10 @@ with self; hash = "sha256-FWsT8Hdk92bYtFpDco8kOa+Bo1EmJUON6reDt4g+tTM="; }; propagatedBuildInputs = [ SubUplevel ]; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/return.t + ''; meta = { description = "Test exception-based code"; license = with lib.licenses; [ @@ -34302,6 +34222,11 @@ with self; url = "mirror://cpan/authors/id/L/LE/LEEJO/Test-LeakTrace-0.17.tar.gz"; hash = "sha256-d31k0pOPXqWGMA7vl+8D6stD1MGFPJw7EJHrMxFGeXA="; }; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/09_info_more.t + rm t/11_logfp.t + ''; meta = { description = "Traces memory leaks"; homepage = "https://metacpan.org/release/Test-LeakTrace"; @@ -34319,6 +34244,10 @@ with self; url = "mirror://cpan/authors/id/T/TM/TMOERTEL/Test-LectroTest-0.5001.tar.gz"; hash = "sha256-rCtPDZWJmvGhoex4TLdAsrkCVqvuEcg+eykRA+ye1zU="; }; + preCheck = '' + # Remove impure test + rm t/gens.t + ''; meta = { description = "Easy, automatic, specification-based tests"; license = with lib.licenses; [ @@ -34583,6 +34512,10 @@ with self; url = "mirror://cpan/authors/id/S/SY/SYP/Test-Mojibake-1.3.tar.gz"; hash = "sha256-j/51/5tpNSSIcn3Kc9uR+KoUtZ8voQTrdxfA1xpfGzM="; }; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/02-bad-source.t + ''; meta = { description = "Check your source for encoding misbehavior"; homepage = "https://github.com/creaktive/Test-Mojibake"; @@ -34795,6 +34728,13 @@ with self; TextDiff ]; buildInputs = [ TestPerlCritic ]; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/perltidy.t + rm t/list_files.t + rm t/exclude_files.t + rm t/exclude_perltidy.t + ''; meta = { description = "Check that all your files are tidy"; homepage = "https://metacpan.org/release/Test-PerlTidy"; @@ -35192,13 +35132,15 @@ with self; url = "mirror://cpan/authors/id/P/PL/PLICEASE/Test-Script-1.29.tar.gz"; hash = "sha256-iS5+bB6nsWcQkJlCz1wL2rcO7i79SqnBbqlS4rkPiVA="; }; - buildInputs = [ Test2Suite ]; - propagatedBuildInputs = [ CaptureTiny ProbePerl ]; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/test_script__script_compiles.t + ''; meta = { description = "Basic cross-platform tests for scripts"; license = with lib.licenses; [ @@ -35246,22 +35188,6 @@ with self; }; }; - TestSimple13 = buildPerlPackage { - pname = "Test-Simple"; - version = "1.302195"; - src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302195.tar.gz"; - hash = "sha256-s5C7I1kuC5Rsla27PDCxG8Y0ooayhHvmEa2SnFfjmmw="; - }; - meta = { - description = "Basic utilities for writing tests"; - license = with lib.licenses; [ - artistic1 - gpl1Plus - ]; - }; - }; - TestSnapshot = buildPerlPackage { pname = "Test-Snapshot"; version = "0.06"; @@ -35479,6 +35405,9 @@ with self; hash = "sha256-mMoy5/L16om4v7mgYJl389FT4kLi5RcFEmy5VPGga1c="; }; propagatedBuildInputs = [ SubUplevel ]; + # Tests fail because they hardcode line numbers which have been shifted due to the inclusion of + # libraries. + doCheck = false; meta = { description = "Perl extension to test methods for warnings"; license = with lib.licenses; [ @@ -35642,6 +35571,10 @@ with self; hash = "sha256-36phHnFGrZyXabW89oiUmXa4Ny3354ekC5M6FI2JIDk="; }; propagatedBuildInputs = [ XMLLibXML ]; + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/simple.t + ''; meta = { description = "Test XML and HTML content and structure with XPath expressions"; license = with lib.licenses; [ @@ -35739,15 +35672,15 @@ with self; TextBibTeX = buildPerlModule { pname = "Text-BibTeX"; - version = "0.89"; + version = "0.91"; buildInputs = [ CaptureTiny ConfigAutoConf ExtUtilsLibBuilder ]; src = fetchurl { - url = "mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.89.tar.gz"; - hash = "sha256-iKeOvwiOx1AvQBxaKxOMhiz1RYU0t3MiO786r0EiQZY="; + url = "mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.91.tar.gz"; + hash = "sha256-PwETz4/nHcdIRjbcjipYFjfsvMgtC+KbvUbQvz+M2zc="; }; # libbtparse.so: cannot open shared object file patches = [ ../development/perl-modules/TextBibTeX-use-lib.patch ]; @@ -36112,15 +36045,11 @@ with self; url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Text-Markdown-1.000031.tar.gz"; hash = "sha256-wZHG1ezrjLdcBWUZI2BmLSAtcWutB6IzxLMppChNxxs="; }; - nativeBuildInputs = [ shortenPerlShebang ]; nativeCheckInputs = [ ListMoreUtils TestDifferences TestException ]; - postInstall = '' - shortenPerlShebang $out/bin/Markdown.pl - ''; meta = { description = "Convert Markdown syntax to (X)HTML"; license = with lib.licenses; [ bsd3 ]; @@ -36487,9 +36416,11 @@ with self; url = "mirror://cpan/authors/id/G/GF/GFUJI/Test-Vars-0.015.tar.gz"; hash = "sha256-4Y3RWCcuTsmTnh37M8dDGrTnXGtAsoDDi16AT9pHGlQ="; }; - buildInputs = [ ModuleBuildTiny ]; - + preCheck = '' + # Remove tests with hardcoded line numbers. + rm t/03_warned.t + ''; meta = { description = "Detects unused variables in perl modules"; homepage = "https://github.com/houseabsolute/p5-Test-Vars"; @@ -37141,6 +37072,7 @@ with self; NIX_CFLAGS_COMPILE = toString [ "-Wno-error=implicit-int" "-Wno-error=incompatible-pointer-types" + "-std=gnu17" ]; }; doCheck = false; # Expects working X11. @@ -37805,10 +37737,10 @@ with self; VariableMagic = buildPerlPackage { pname = "Variable-Magic"; - version = "0.63"; + version = "0.64"; src = fetchurl { - url = "mirror://cpan/authors/id/V/VP/VPIT/Variable-Magic-0.63.tar.gz"; - hash = "sha256-ukCDssMf8mlPI3EzPVVMgmqvJLTZjQPki1tKQ6Kg5nk="; + url = "mirror://cpan/authors/id/V/VP/VPIT/Variable-Magic-0.64.tar.gz"; + hash = "sha256-n3hTJJyeo7TfkvtreQwDpgaA/AKfRMi/mJTczwGVFr0="; }; meta = { description = "Associate user-defined magic to variables from Perl"; @@ -38316,11 +38248,20 @@ with self; X11XCB = buildPerlPackage { pname = "X11-XCB"; - version = "0.20"; + version = "0.24"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZH/ZHMYLOVE/X11-XCB-0.20.tar.gz"; - hash = "sha256-rVY5Yd4gIlVOdZHvXLjZY0ngxzdxIYXkeFBViMZ6L9I="; + url = "mirror://cpan/authors/id/Z/ZH/ZHMYLOVE/X11-XCB-0.24.tar.gz"; + hash = "sha256-eIUZZzpDxHUecwYaiCG2WPyV8G1cGcnx3rtgX7ILoEU="; }; + patches = [ + # Fix "undefined symbol: xcb_composite_unredirect_window" + (fetchpatch { + url = "https://github.com/zhmylove/X11-XCB/commit/b78e33f7cdf8141b085a4f8773adda6c4a4870c3.patch"; + hash = "sha256-r1X/tGCALZOS35fNx/9udznNvLxC73o7M2U1MVqXcf0="; + revert = true; + excludes = [ "lib/X11/XCB.pm" ]; + }) + ]; env.AUTOMATED_TESTING = false; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ @@ -38440,11 +38381,7 @@ with self; url = "mirror://cpan/authors/id/S/SI/SIXTEASE/XML-Entities-1.0002.tar.gz"; hash = "sha256-wyqk8wlXPXZIqy5Bb2K2sgZS8q2c/T7sgv1REB/nMQ0="; }; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ LWP ]; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/download-entities.pl - ''; meta = { description = "Mapping of XML entities to Unicode"; license = with lib.licenses; [ @@ -38530,14 +38467,10 @@ with self; url = "mirror://cpan/authors/id/G/GR/GRANTM/XML-Filter-Sort-1.01.tar.gz"; hash = "sha256-UQWF85pJFszV+o1UXpYXnJHq9vx8l6QBp1aOhBFi+l8="; }; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; propagatedBuildInputs = [ XMLSAX XMLSAXWriter ]; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shortenPerlShebang $out/bin/xmlsort - ''; meta = { description = "SAX filter for sorting elements in XML"; license = with lib.licenses; [ @@ -39055,7 +38988,6 @@ with self; buildInputs = [ ExtUtilsDepends TestFatal - TestSimple13 ]; meta = { description = "Opaque, extensible XS pointer backed objects using sv_magic"; @@ -39090,10 +39022,10 @@ with self; XSParseSublike = buildPerlModule { pname = "XS-Parse-Sublike"; - version = "0.29"; + version = "0.37"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Sublike-0.29.tar.gz"; - hash = "sha256-UnX1w457gFe6cuzRzAcpO26TOadzdA51pse+lSAfHjw="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Sublike-0.37.tar.gz"; + hash = "sha256-c2UoyIjqe2phkQEeXVp4JOw4pWIFB95u9F5LxuHPDak="; }; buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ FileShareDir ]; @@ -39176,6 +39108,7 @@ with self; url = "mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.36.tar.gz"; hash = "sha256-Tc2dmzsM48ZaL/K5tMb/+LZJ/fJDv9fhiJVDvs25GlI="; }; + env.NIX_CFLAGS_COMPILE = "-std=gnu11"; meta = { description = "Fast, lightweight YAML loader and dumper"; homepage = "https://github.com/toddr/YAML-Syck"; @@ -39564,7 +39497,11 @@ with self; SubExporterUtil = self.SubExporter; version = self.Version; + BSON = throw "BSON has been removed"; # 2025-09-12 + BSONXS = throw "BSONXS has been removed"; # 2025-09-12 + GnuPG = throw "'GnuPG' has been removed"; # 2025-01-11 Gtk2GladeXML = throw "Gtk2GladeXML has been removed"; # 2022-01-15 + MongoDB = throw "MongoDB has been removed"; # 2025-09-12 pcscperl = throw "'pcscperl' has been renamed to 'ChipcardPCSC'"; # Added 2023-12-07 - GnuPG = throw "'GnuPG' has been removed"; # 2025-01-11 + HTTPHeaderParserXS = throw "HTTPHeaderParserXS has been removed"; # Added 2025-11-08 } diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 6d7646476f0c5..3faeeac9e10ff 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -444,6 +444,7 @@ mapAliases { sentry-sdk_2 = throw "'sentry-sdk_2' has been renamed to/replaced by 'sentry-sdk'"; # Converted to throw 2025-10-29 setuptools_dso = throw "'setuptools_dso' has been renamed to/replaced by 'setuptools-dso'"; # Converted to throw 2025-10-29 setuptools_scm = throw "'setuptools_scm' has been renamed to/replaced by 'setuptools-scm'"; # Converted to throw 2025-10-29 + setuptoolsRustBuildHook = lib.warn "setuptoolsRustBuildHook is deprecated. Instead, include 'setuptools-rust' via 'build-system'" setuptools-rust; # added 2025-12-07 setuptoolsTrial = throw "'setuptoolsTrial' has been renamed to/replaced by 'setuptools-trial'"; # Converted to throw 2025-10-29 sharkiqpy = throw "'sharkiqpy' has been renamed to/replaced by 'sharkiq'"; # Converted to throw 2025-10-29 shippai = throw "shippai has been removed because the upstream repository was archived in 2023"; # added 2025-07-09 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ed39d0590b69a..3d37154edde57 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -726,6 +726,8 @@ self: super: with self; { annexremote = callPackage ../development/python-modules/annexremote { }; + annotated-doc = callPackage ../development/python-modules/annotated-doc { }; + annotated-types = callPackage ../development/python-modules/annotated-types { }; annotatedyaml = callPackage ../development/python-modules/annotatedyaml { }; @@ -3979,7 +3981,7 @@ self: super: with self; { dj-static = callPackage ../development/python-modules/dj-static { }; # LTS with mainsteam support - django = self.django_4; + django = self.django_5; django-admin-datta = callPackage ../development/python-modules/django-admin-datta { }; @@ -4131,7 +4133,7 @@ self: super: with self; { django-ipware = callPackage ../development/python-modules/django-ipware { }; - django-jinja = callPackage ../development/python-modules/django-jinja2 { }; + django-jinja = callPackage ../development/python-modules/django-jinja { }; django-jquery-js = callPackage ../development/python-modules/django-jquery-js { }; @@ -10998,7 +11000,9 @@ self: super: with self; { numbagg = callPackage ../development/python-modules/numbagg { }; - numcodecs = callPackage ../development/python-modules/numcodecs { }; + numcodecs = callPackage ../development/python-modules/numcodecs { + inherit (pkgs) zstd; + }; numdifftools = callPackage ../development/python-modules/numdifftools { }; @@ -16045,6 +16049,8 @@ self: super: with self; { quart-schema = callPackage ../development/python-modules/quart-schema { }; + quart-trio = callPackage ../development/python-modules/quart-trio { }; + quaternion = callPackage ../development/python-modules/quaternion { }; qudida = callPackage ../development/python-modules/qudida { }; @@ -19419,7 +19425,7 @@ self: super: with self; { typer-shell = callPackage ../development/python-modules/typer-shell { }; - typer-slim = self.typer.override { package = "typer-slim"; }; + typer-slim = callPackage ../development/python-modules/typer-slim { }; types-aiobotocore = callPackage ../development/python-modules/types-aiobotocore { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 73baf1bc0cc0f..c6e9bab6d11db 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -76,7 +76,7 @@ makeScopeWithSplicing' { futuresql = callPackage ../development/libraries/futuresql { }; - qgpgme = callPackage ../development/libraries/gpgme { }; + qgpgme = callPackage ../development/libraries/qgpgme { }; grantlee = callPackage ../development/libraries/grantlee/5 { }; diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index c13b2585c3fc6..42d87e0f4d625 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -87,7 +87,7 @@ makeScopeWithSplicing' { }; qcoro = callPackage ../development/libraries/qcoro { }; qcustomplot = callPackage ../development/libraries/qcustomplot { }; - qgpgme = callPackage ../development/libraries/gpgme { }; + qgpgme = callPackage ../development/libraries/qgpgme { }; qhotkey = callPackage ../development/libraries/qhotkey { }; qmlbox2d = callPackage ../development/libraries/qmlbox2d { }; packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 67f379febf5ba..c99d79adccae0 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -549,11 +549,6 @@ let cabal2nix = released; cabal2nix-unstable = released; funcmp = released; - git-annex = [ - # for 9.10, test that using filepath (instead of filepath-bytestring) works. - compilerNames.ghc9102 - compilerNames.ghc9103 - ]; haskell-language-server = released; hoogle = released; hlint = lib.subtractLists [