diff --git a/.editorconfig b/.editorconfig
index 1d2259154e48..29e0a4aa8566 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -24,7 +24,7 @@ insert_final_newline = false
# see https://nixos.org/nixpkgs/manual/#chap-conventions
# Match json/lockfiles/markdown/nix/perl/python/ruby/shell/docbook files, set indent to spaces
-[*.{json,lock,md,nix,pl,pm,py,rb,sh,xml}]
+[*.{bash,json,lock,md,nix,pl,pm,py,rb,sh,xml}]
indent_style = space
# Match docbook files, set indent width of one
@@ -36,7 +36,7 @@ indent_size = 1
indent_size = 2
# Match perl/python/shell scripts, set indent width of four
-[*.{pl,pm,py,sh}]
+[*.{bash,pl,pm,py,sh}]
indent_size = 4
# Match gemfiles, set indent to spaces with width of two
diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md
index 4bb2b6e4f255..7b3522af17c8 100644
--- a/doc/languages-frameworks/vim.section.md
+++ b/doc/languages-frameworks/vim.section.md
@@ -234,9 +234,17 @@ Finally, there are some plugins that are also packaged in nodePackages because t
### Testing Neovim plugins {#testing-neovim-plugins}
-`nvimRequireCheck=MODULE` is a simple test which checks if Neovim can requires the lua module `MODULE` without errors. This is often enough to catch missing dependencies.
+#### neovimRequireCheck {#testing-neovim-plugins-neovim-require-check}
+`neovimRequireCheck` is a simple test which checks if Neovim can requires lua modules without errors. This is often enough to catch missing dependencies.
-This can be manually added through plugin definition overrides in the [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix).
+It accepts a single string for a module, or a list of module strings to test.
+- `nvimRequireCheck = MODULE;`
+- `nvimRequireCheck = [ MODULE1 MODULE2 ];`
+
+When `neovimRequireCheck` is not specified, we will search the plugin's directory for lua modules to attempt loading. This quick smoke test can catch obvious dependency errors that might be missed.
+The check hook will fail the build if any failures are detected to encourage inspecting the logs to identify potential issues.
+
+If you would like to only check a specific module, this can be manually added through plugin definition overrides in the [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix).
```nix
gitsigns-nvim = super.gitsigns-nvim.overrideAttrs {
@@ -244,6 +252,30 @@ This can be manually added through plugin definition overrides in the [overrides
nvimRequireCheck = "gitsigns";
};
```
+Some plugins will have lua modules that require a user configuration to function properly or can contain optional lua modules that we dont want to test requiring.
+We can skip specific modules using `nvimSkipModule`. Similar to `nvimRequireCheck`, it accepts a single string or a list of strings.
+- `nvimSkipModule = MODULE;`
+- `nvimSkipModule = [ MODULE1 MODULE2 ];`
+
+```nix
+ asyncrun-vim = super.asyncrun-vim.overrideAttrs {
+ nvimSkipModule = [
+ # vim plugin with optional toggleterm integration
+ "asyncrun.toggleterm"
+ "asyncrun.toggleterm2"
+ ];
+ };
+```
+
+In rare cases, we might not want to actually test loading lua modules for a plugin. In those cases, we can disable `neovimRequireCheck` with `doCheck = false;`.
+
+This can be manually added through plugin definition overrides in the [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix).
+```nix
+ vim-test = super.vim-test.overrideAttrs {
+ # Vim plugin with a test lua file
+ doCheck = false;
+ };
+```
### Plugin optional configuration {#vim-plugin-required-snippet}
diff --git a/doc/redirects.json b/doc/redirects.json
index 311ca1ff4af7..dc6e46a5688a 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -3760,6 +3760,9 @@
"testing-neovim-plugins": [
"index.html#testing-neovim-plugins"
],
+ "testing-neovim-plugins-neovim-require-check": [
+ "index.html#testing-neovim-plugins-neovim-require-check"
+ ],
"vim-plugin-required-snippet": [
"index.html#vim-plugin-required-snippet"
],
diff --git a/doc/stdenv/platform-notes.chapter.md b/doc/stdenv/platform-notes.chapter.md
index 63511e7e8b21..c7b0b664940e 100644
--- a/doc/stdenv/platform-notes.chapter.md
+++ b/doc/stdenv/platform-notes.chapter.md
@@ -87,31 +87,24 @@ When that happens, the one with the highest version is always used.
The following is a list of Xcode versions, the SDK version in Nixpkgs, and the attribute to use to add it.
Check your package’s documentation (platform support or installation instructions) to find which Xcode or SDK version to use.
-Generally, only the last SDK release for a major version is packaged (each _x_ in 10._x_ until 10.15 is considered a major version).
+Generally, only the last SDK release for a major version is packaged.
-| Xcode version | SDK version | Nixpkgs attribute |
-|--------------------|---------------------------------------------------|-------------------|
-| Varies by platform | 10.12.2 (x86_64-darwin)
11.3 (aarch64-darwin) | `apple-sdk` |
-| 8.0–8.3.3 | 10.12.2 | `apple-sdk_10_12` |
-| 9.0–9.4.1 | 10.13.2 | `apple-sdk_10_13` |
-| 10.0–10.3 | 10.14.6 | `apple-sdk_10_14` |
-| 11.0–11.7 | 10.15.6 | `apple-sdk_10_15` |
-| 12.0–12.5.1 | 11.3 | `apple-sdk_11` |
-| 13.0–13.4.1 | 12.3 | `apple-sdk_12` |
-| 14.0–14.3.1 | 13.3 | `apple-sdk_13` |
-| 15.0–15.4 | 14.4 | `apple-sdk_14` |
-| 16.0 | 15.0 | `apple-sdk_15` |
+| Xcode version | SDK version | Nixpkgs attribute |
+|--------------------|--------------------|------------------------------|
+| 12.0–12.5.1 | 11.3 | `apple-sdk_11` / `apple-sdk` |
+| 13.0–13.4.1 | 12.3 | `apple-sdk_12` |
+| 14.0–14.3.1 | 13.3 | `apple-sdk_13` |
+| 15.0–15.4 | 14.4 | `apple-sdk_14` |
+| 16.0 | 15.0 | `apple-sdk_15` |
#### Darwin Default SDK versions {#sec-darwin-troubleshooting-darwin-defaults}
-The current default versions of the deployment target (minimum version) and SDK are indicated by Darwin-specific attributes on the platform. Because of the ways that minimum version and SDK can be changed that are not visible to Nix, they should be treated as lower bounds.
+The current default version of the SDK and deployment target (minimum supported version) are indicated by the Darwin-specific platform attributes `darwinSdkVersion` and `darwinMinVersion`.
+Because of the ways that minimum version and SDK can be changed that are not visible to Nix, they should be treated as lower bounds.
If you need to parameterize over a specific version, create a function that takes the version as a parameter instead of relying on these attributes.
-- `darwinMinVersion` defaults to 10.12 on x86_64-darwin and 11.0 on aarch64-darwin.
- It sets the default deployment target.
-- `darwinSdkVersion` defaults to 10.12 on x86-64-darwin and 11.0 on aarch64-darwin.
- Only the major version determines the SDK version, resulting in the 10.12.2 and 11.3 SDKs being used on these platforms respectively.
+On macOS, the `darwinMinVersion` and `darwinSdkVersion` are always the same, and are currently set to 11.3.
#### `xcrun` cannot find a binary {#sec-darwin-troubleshooting-xcrun}
@@ -264,10 +257,10 @@ The legacy SDK provided two ways of overriding the default SDK.
These are both being phased out along with the legacy SDKs.
They have been updated to set up the new SDK for you, but you should replace them with doing that directly.
-- `pkgs.darwin.apple_sdk_11_0.callPackage` - this pattern was used to provide frameworks from the 11.0 SDK.
- It now adds the `apple-sdk_11` package to your derivation’s build inputs.
+- `pkgs.darwin.apple_sdk_11_0.callPackage` - this pattern was used to provide frameworks from the macOS 11 SDK.
+ It is now the same as `callPackage`.
- `overrideSDK` - this stdenv adapter would try to replace the frameworks used by your derivation and its transitive dependencies.
- It now adds the `apple-sdk_11` package for `11.0` or the `apple-sdk_12` package for `12.3`.
+ It now adds the `apple-sdk_12` package for `12.3` and does nothing for `11.0`.
If `darwinMinVersion` is specified, it will add `darwinMinVersionHook` with the specified minimum version.
No other SDK versions are supported.
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index d682eb815003..00f7f3523aa4 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -261,7 +261,7 @@ let
else null;
# The canonical name for this attribute is darwinSdkVersion, but some
# platforms define the old name "sdkVer".
- darwinSdkVersion = final.sdkVer or (if final.isAarch64 then "11.0" else "10.12");
+ darwinSdkVersion = final.sdkVer or "11.3";
darwinMinVersion = final.darwinSdkVersion;
darwinMinVersionVariable =
if final.isMacOS then "MACOSX_DEPLOYMENT_TARGET"
@@ -293,7 +293,7 @@ let
# to an emulator program. That is, if an emulator requires additional
# arguments, a wrapper should be used.
if pkgs.stdenv.hostPlatform.canExecute final
- then "${pkgs.execline}/bin/exec"
+ then lib.getExe (pkgs.writeShellScriptBin "exec" ''exec "$@"'')
else if final.isWindows
then "${wine}/bin/wine${optionalString (final.parsed.cpu.bits == 64) "64"}"
else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux && final.qemuArch != null
diff --git a/maintainers/scripts/bootstrap-files/refresh-tarballs.bash b/maintainers/scripts/bootstrap-files/refresh-tarballs.bash
index 87731089a9dd..999215622dd2 100755
--- a/maintainers/scripts/bootstrap-files/refresh-tarballs.bash
+++ b/maintainers/scripts/bootstrap-files/refresh-tarballs.bash
@@ -35,15 +35,15 @@ Synopsis:
This is usually done in the following cases:
1. Single target fix: current bootstrap files for a single target
- are problematic for some reason (target-specific bug). In this
- case we can refresh just that target as:
+ are problematic for some reason (target-specific bug). In this
+ case we can refresh just that target as:
- \$ $0 --commit --targets=i686-unknown-linux-gnu
+ \$ $0 --commit --targets=i686-unknown-linux-gnu
2. Routine refresh: all bootstrap files should be refreshed to avoid
- debugging problems that only occur on very old binaries.
+ debugging problems that only occur on very old binaries.
- \$ $0 --commit --all-targets
+ \$ $0 --commit --all-targets
To get help on uploading refreshed binaries to 'tarballs.nixos.org'
please have a look at .
@@ -232,50 +232,50 @@ for target in "${targets[@]}"; do
# - build time: ${build_time}
{
EOF
- for p in "${outpath}/on-server"/*; do
- fname=$(basename "$p")
- fnames+=("$fname")
- case "$fname" in
- bootstrap-tools.tar.xz) attr=bootstrapTools ;;
- busybox) attr=$fname ;;
- unpack.nar.xz) attr=unpack ;;
- *) die "Don't know how to map '$fname' to attribute name. Please update me."
- esac
+ for p in "${outpath}/on-server"/*; do
+ fname=$(basename "$p")
+ fnames+=("$fname")
+ case "$fname" in
+ bootstrap-tools.tar.xz) attr=bootstrapTools ;;
+ busybox) attr=$fname ;;
+ unpack.nar.xz) attr=unpack ;;
+ *) die "Don't know how to map '$fname' to attribute name. Please update me."
+ esac
- executable_arg=
- executable_nix=
- if [[ -x "$p" ]]; then
- executable_arg="--executable"
- executable_nix="executable = true;"
- fi
- unpack_nix=
- name_nix=
- if [[ $fname = *.nar.xz ]]; then
- unpack_nix="unpack = true;"
- name_nix="name = \"${fname%.nar.xz}\";"
- sri=$(nar_sri_get "$p" "${fname%.nar.xz}")
- [[ $? -ne 0 ]] && die "Failed to get hash of '$p'"
- else
- sha256=$(nix-prefetch-url $executable_arg --name "$fname" "file://$p")
- [[ $? -ne 0 ]] && die "Failed to get the hash for '$p'"
- sri=$(nix-hash --to-sri "sha256:$sha256")
- [[ $? -ne 0 ]] && die "Failed to convert '$sha256' hash to an SRI form"
- fi
+ executable_arg=
+ executable_nix=
+ if [[ -x "$p" ]]; then
+ executable_arg="--executable"
+ executable_nix="executable = true;"
+ fi
+ unpack_nix=
+ name_nix=
+ if [[ $fname = *.nar.xz ]]; then
+ unpack_nix="unpack = true;"
+ name_nix="name = \"${fname%.nar.xz}\";"
+ sri=$(nar_sri_get "$p" "${fname%.nar.xz}")
+ [[ $? -ne 0 ]] && die "Failed to get hash of '$p'"
+ else
+ sha256=$(nix-prefetch-url $executable_arg --name "$fname" "file://$p")
+ [[ $? -ne 0 ]] && die "Failed to get the hash for '$p'"
+ sri=$(nix-hash --to-sri "sha256:$sha256")
+ [[ $? -ne 0 ]] && die "Failed to convert '$sha256' hash to an SRI form"
+ fi
- # individual file entries
- cat < {
+ # individual file entries
+ cat < {
url = "http://tarballs.nixos.org/${s3_prefix}/${nixpkgs_revision}/$fname";
hash = "${sri}";$(
[[ -n ${executable_nix} ]] && printf "\n %s" "${executable_nix}"
[[ -n ${name_nix} ]] && printf "\n %s" "${name_nix}"
[[ -n ${unpack_nix} ]] && printf "\n %s" "${unpack_nix}"
-)
- };
+ )
+};
EOF
- done
- # footer
- cat < "${target_file}"
diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 39849d5d64c2..26afc66e61c7 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -4,8 +4,19 @@
-- The default PHP version has been updated to 8.3.
+- **This release of Nixpkgs requires macOS Big Sur 11.3 or newer, as announced in the 24.11 release notes.**
+ We cannot guarantee that packages will continue to work on older versions of macOS.
+ Future Nixpkgs releases will only support [macOS versions supported by Apple](https://endoflife.date/macos); this means that **Nixpkgs 25.11 will require macOS Sonoma 14 or newer**.
+ Users on old macOS versions should consider upgrading to a supported version (potentially using [OpenCore Legacy Patcher](https://dortania.github.io/OpenCore-Legacy-Patcher/) for old hardware) or installing NixOS.
+ If neither of those options are viable and you require new versions of software, [MacPorts](https://www.macports.org/) supports versions back to Mac OS X Snow Leopard 10.6.
+- GCC has been updated from GCC 13 to GCC 14.
+ This introduces some backwards‐incompatible changes; see the [upstream porting guide](https://gcc.gnu.org/gcc-14/porting_to.html) for details.
+
+- LLVM has been updated from LLVM 16 (on Darwin) and LLVM 18 (on other platforms) to LLVM 19.
+ This introduces some backwards‐incompatible changes; see the [upstream release notes](https://releases.llvm.org/) for details.
+
+- The default PHP version has been updated to 8.3.
## New Modules {#sec-release-25.05-new-modules}
diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix
index bc0f5d496afb..84cbdc8cf5f9 100644
--- a/nixos/modules/services/video/frigate.nix
+++ b/nixos/modules/services/video/frigate.nix
@@ -13,7 +13,6 @@ let
filterAttrsRecursive
hasPrefix
makeLibraryPath
- match
mkDefault
mkEnableOption
mkPackageOption
@@ -108,10 +107,6 @@ let
withCoralUSB = any (d: d.type == "edgetpu" && hasPrefix "usb" d.device or "") detectors;
withCoralPCI = any (d: d.type == "edgetpu" && hasPrefix "pci" d.device or "") detectors;
withCoral = withCoralPCI || withCoralUSB;
-
- # Provide ffmpeg-full for NVIDIA hardware acceleration
- ffmpegArgs = cfg.settings.ffmpeg.hwaccel_args or "";
- ffmpeg' = if match "/nvidia/" ffmpegArgs != null then pkgs.ffmpeg-full else pkgs.ffmpeg-headless;
in
{
@@ -571,7 +566,7 @@ in
path = with pkgs; [
# unfree:
# config.boot.kernelPackages.nvidiaPackages.latest.bin
- ffmpeg'
+ ffmpeg-headless
libva-utils
procps
radeontop
diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix
index 4aacd8e5a849..a9e7683c474b 100644
--- a/nixos/tests/prometheus-exporters.nix
+++ b/nixos/tests/prometheus-exporters.nix
@@ -219,7 +219,7 @@ let
succeed(
'echo \'${postData}\'> /tmp/data.json'
)
- succeed('sed -ie "s DATE $(date +%s) " /tmp/data.json')
+ succeed('sed -i -e "s DATE $(date +%s) " /tmp/data.json')
succeed(
"curl -sSfH 'Content-Type: application/json' -X POST --data @/tmp/data.json localhost:9103/collectd"
)
diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix
index bbb71ab8c836..8d709faedf94 100644
--- a/pkgs/applications/audio/fluidsynth/default.nix
+++ b/pkgs/applications/audio/fluidsynth/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "fluidsynth";
- version = "2.3.6";
+ version = "2.3.7";
src = fetchFromGitHub {
owner = "FluidSynth";
repo = "fluidsynth";
rev = "v${version}";
- hash = "sha256-bmA4eUh7MC4dXPsOOi9Q5jneSE5OGUWrztv+46LxaW0=";
+ hash = "sha256-4Jn8pyVPrTPYZGdPZB+8guxTbD6s/1OpmLJlioDQFMA=";
};
outputs = [ "out" "dev" "man" ];
diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index c22fe3ab0977..85fd36c3d86e 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -28,13 +28,15 @@ mkDerivation rec {
substituteInPlace fmit.pro --replace '$$FMITVERSIONGITPRO' '${version}'
'';
- preConfigure = ''
- qmakeFlags="$qmakeFlags \
- CONFIG+=${lib.optionalString alsaSupport "acs_alsa"} \
- CONFIG+=${lib.optionalString jackSupport "acs_jack"} \
- CONFIG+=${lib.optionalString portaudioSupport "acs_portaudio"} \
- PREFIXSHORTCUT=$out"
- '';
+ qmakeFlags = [
+ "PREFIXSHORTCUT=${placeholder "out"}"
+ ] ++ lib.optionals alsaSupport [
+ "CONFIG+=acs_alsa"
+ ] ++ lib.optionals jackSupport [
+ "CONFIG+=acs_jack"
+ ] ++ lib.optionals portaudioSupport [
+ "CONFIG+=acs_portaudio"
+ ];
meta = with lib; {
description = "Free Musical Instrument Tuner";
diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
index f18469f56588..3a8d251d1f7c 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/applications/audio/mpg123/default.nix
@@ -22,11 +22,11 @@ assert withConplay -> !libOnly;
stdenv.mkDerivation rec {
pname = "${lib.optionalString libOnly "lib"}mpg123";
- version = "1.32.8";
+ version = "1.32.9";
src = fetchurl {
url = "mirror://sourceforge/mpg123/mpg123-${version}.tar.bz2";
- hash = "sha256-/u4TdMeVQODkBd8LxF/eIK1nARQlw2GidZ4hRolKJ6c=";
+ hash = "sha256-A7YeQATpYLrPKs2toD7ZTTduaqsnpgFEe9SQjYQHspE=";
};
outputs = [ "out" "dev" "man" ] ++ lib.optional withConplay "conplay";
diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix
index 821cda32e977..4fd1d1fec9bd 100644
--- a/pkgs/applications/audio/snapcast/default.nix
+++ b/pkgs/applications/audio/snapcast/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config
-, alsa-lib, asio, avahi, boost179, flac, libogg, libvorbis, libopus, soxr
+, alsa-lib, asio, avahi, boost, flac, libogg, libvorbis, libopus, soxr
, IOKit, AudioToolbox
, aixlog, popl
, pulseaudioSupport ? false, libpulseaudio
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
# snapcast also supports building against tremor but as we have libogg, that's
# not needed
buildInputs = [
- boost179
+ boost
asio avahi flac libogg libvorbis libopus
aixlog popl soxr
] ++ lib.optional pulseaudioSupport libpulseaudio
diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix
index 286e26bdaad3..2c5ad98f64f5 100644
--- a/pkgs/applications/audio/sonic-pi/default.nix
+++ b/pkgs/applications/audio/sonic-pi/default.nix
@@ -105,6 +105,7 @@ stdenv.mkDerivation rec {
"-DUSE_SYSTEM_LIBS=ON"
"-DBUILD_IMGUI_INTERFACE=${if withImGui then "ON" else "OFF"}"
"-DWITH_QT_GUI_WEBENGINE=${if withTauWidget then "ON" else "OFF"}"
+ "-DAPP_INSTALL_ROOT=${placeholder "out"}/app"
];
doCheck = true;
@@ -136,9 +137,6 @@ stdenv.mkDerivation rec {
# Prebuild Ruby vendored dependencies and Qt docs
./linux-prebuild.sh -o
-
- # Append CMake flag depending on the value of $out
- cmakeFlags+=" -DAPP_INSTALL_ROOT=$out/app"
'';
postBuild = ''
diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix
index f2c3cc7a065f..d1764ee8f78a 100644
--- a/pkgs/applications/blockchains/zcash/default.nix
+++ b/pkgs/applications/blockchains/zcash/default.nix
@@ -1,4 +1,4 @@
-{ autoreconfHook, boost180, cargo, coreutils, curl, cxx-rs, db62, fetchFromGitHub
+{ autoreconfHook, boost, cargo, coreutils, curl, cxx-rs, db62, fetchFromGitHub
, git, hexdump, lib, libevent, libsodium, makeWrapper, rustPlatform
, pkg-config, Security, stdenv, testers, tl-expected, utf8cpp, util-linux, zcash, zeromq
}:
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec {
nativeBuildInputs = [ autoreconfHook cargo cxx-rs git hexdump makeWrapper pkg-config ];
buildInputs = [
- boost180
+ boost
db62
libevent
libsodium
@@ -56,7 +56,7 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec {
configureFlags = [
"--disable-tests"
- "--with-boost-libdir=${lib.getLib boost180}/lib"
+ "--with-boost-libdir=${lib.getLib boost}/lib"
"RUST_TARGET=${stdenv.hostPlatform.rust.rustcTargetSpec}"
];
diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix
index 7bae78f35e70..eb486eb0e339 100644
--- a/pkgs/applications/editors/emacs/make-emacs.nix
+++ b/pkgs/applications/editors/emacs/make-emacs.nix
@@ -11,6 +11,7 @@
, Xaw3d
, acl
, alsa-lib
+, apple-sdk
, autoreconfHook
, cairo
, dbus
@@ -51,7 +52,7 @@
, recurseIntoAttrs
, sigtool
, sqlite
-, substituteAll
+, replaceVars
, systemd
, tree-sitter
, texinfo
@@ -148,12 +149,12 @@ mkDerivation (finalAttrs: {
inherit src;
patches = patches fetchpatch ++ lib.optionals withNativeCompilation [
- (substituteAll {
- src = if lib.versionOlder finalAttrs.version "29"
+ (replaceVars (if lib.versionOlder finalAttrs.version "29"
then ./native-comp-driver-options-28.patch
else if lib.versionOlder finalAttrs.version "30"
then ./native-comp-driver-options.patch
- else ./native-comp-driver-options-30.patch;
+ else ./native-comp-driver-options-30.patch) {
+
backendPath = (lib.concatStringsSep " "
(builtins.map (x: ''"-B${x}"'') ([
# Paths necessary so the JIT compiler finds its libraries:
@@ -163,6 +164,9 @@ mkDerivation (finalAttrs: {
"${lib.getBin stdenv.cc.cc}/bin"
"${lib.getBin stdenv.cc.bintools}/bin"
"${lib.getBin stdenv.cc.bintools.bintools}/bin"
+ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ # The linker needs to know where to find libSystem on Darwin.
+ "${apple-sdk.sdkroot}/usr/lib"
])));
})
];
@@ -185,15 +189,15 @@ mkDerivation (finalAttrs: {
# Reduce closure size by cleaning the environment of the emacs dumper
''
substituteInPlace src/Makefile.in \
- --replace 'RUN_TEMACS = ./temacs' 'RUN_TEMACS = env -i ./temacs'
+ --replace-warn 'RUN_TEMACS = ./temacs' 'RUN_TEMACS = env -i ./temacs'
''
''
substituteInPlace lisp/international/mule-cmds.el \
- --replace /usr/share/locale ${gettext}/share/locale
+ --replace-warn /usr/share/locale ${gettext}/share/locale
for makefile_in in $(find . -name Makefile.in -print); do
- substituteInPlace $makefile_in --replace /bin/pwd pwd
+ substituteInPlace $makefile_in --replace-warn /bin/pwd pwd
done
''
diff --git a/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh b/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh
index 1808442327a1..d5bd1c515451 100644
--- a/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh
+++ b/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh
@@ -1,24 +1,136 @@
#shellcheck shell=bash
-# Setup hook for checking whether Python imports succeed
+# Setup hook for checking whether Lua imports succeed
echo "Sourcing neovim-require-check-hook.sh"
-neovimRequireCheckHook () {
+# Discover modules automatically if nvimRequireCheck is not set
+discover_modules() {
+ echo "Running module discovery in source directory..."
+
+ # Create unique lists so we can organize later
+ modules=()
+
+ while IFS= read -r lua_file; do
+ # Ignore certain infra directories
+ if [[ "$lua_file" =~ debug/|scripts?/|tests?/|spec/ || "$lua_file" =~ .*\meta.lua ]]; then
+ continue
+ # Ignore optional telescope and lualine modules
+ elif [[ "$lua_file" =~ ^lua/telescope/_extensions/(.+)\.lua || "$lua_file" =~ ^lua/lualine/(.+)\.lua ]]; then
+ continue
+ # Grab main module names
+ elif [[ "$lua_file" =~ ^lua/([^/]+)/init.lua$ ]]; then
+ echo "$lua_file"
+ modules+=("${BASH_REMATCH[1]}")
+ # Check other lua files
+ elif [[ "$lua_file" =~ ^lua/(.*)\.lua$ ]]; then
+ echo "$lua_file"
+ # Replace slashes with dots to form the module name
+ module_name="${BASH_REMATCH[1]//\//.}"
+ modules+=("$module_name")
+ elif [[ "$lua_file" =~ ^([^/.][^/]*)\.lua$ ]]; then
+ echo "$lua_file"
+ modules+=("${BASH_REMATCH[1]}")
+ fi
+ done < <(find "$src" -name '*.lua' | xargs -n 1 realpath --relative-to="$src")
+
+ nvimRequireCheck=("${modules[@]}")
+ echo "Discovered modules: ${nvimRequireCheck[*]}"
+
+ if [ "${#nvimRequireCheck[@]}" -eq 0 ]; then
+ echo "No valid Lua modules found; skipping check"
+ return 1
+ fi
+ return 0
+}
+
+# Run require checks on each module in nvimRequireCheck
+run_require_checks() {
+ echo "Starting require checks"
+ check_passed=false
+ failed_modules=()
+ successful_modules=()
+
+ export HOME="$TMPDIR"
+ local deps="${dependencies[*]}"
+ local checks="${nativeBuildInputs[*]}"
+ set +e
+ for name in "${nvimRequireCheck[@]}"; do
+ local skip=false
+ for module in "${nvimSkipModule[@]}"; do
+ if [[ "$module" == "$name" ]]; then
+ echo "$name is in list of modules to not check. Skipping..."
+ skip=true
+ break
+ fi
+ done
+
+ if [ "$skip" = false ]; then
+ echo "Attempting to require module: $name"
+ if @nvimBinary@ -es --headless -n -u NONE -i NONE --clean -V1 \
+ --cmd "set rtp+=$out,${deps// /,}" \
+ --cmd "set rtp+=$out,${checks// /,}" \
+ --cmd "lua require('$name')"; then
+ check_passed=true
+ successful_modules+=("$name")
+ echo "Successfully required module: $name"
+ else
+ echo "Failed to require module: $name"
+ failed_modules+=("$name")
+ fi
+ fi
+ done
+ set -e
+}
+
+# Define color codes
+GREEN="\033[0;32m"
+RED="\033[0;31m"
+NC="\033[0m" # No Color
+
+# Print summary of the require checks
+print_summary() {
+ echo -e "\n======================================================"
+ if [[ "$check_passed" == "true" ]]; then
+ echo -e "${GREEN}Require check succeeded for the following modules:${NC}"
+ for module in "${successful_modules[@]}"; do
+ echo -e " ${GREEN}- $module${NC}"
+ done
+ echo "All lua modules were checked."
+ else
+ echo -e "${RED}No successful require checks.${NC}"
+ fi
+
+ # Print any modules that failed with improved formatting and color
+ if [ "${#failed_modules[@]}" -gt 0 ]; then
+ echo -e "\n${RED}Require check failed for the following modules:${NC}"
+ for module in "${failed_modules[@]}"; do
+ echo -e " ${RED}- $module${NC}"
+ done
+ fi
+ echo "======================================================"
+
+ if [ "${#failed_modules[@]}" -gt 0 ]; then
+ return 1
+ fi
+}
+
+# Main entry point: orchestrates discovery, require checks, and summary
+neovimRequireCheckHook() {
echo "Executing neovimRequireCheckHook"
- if [ -n "$nvimRequireCheck" ]; then
- echo "Check whether the following module can be imported: $nvimRequireCheck"
-
- # editorconfig-checker-disable
- export HOME="$TMPDIR"
-
- local deps="${dependencies[*]}"
- @nvimBinary@ -es --headless -n -u NONE -i NONE --clean -V1 \
- --cmd "set rtp+=$out,${deps// /,}" \
- --cmd "lua require('$nvimRequireCheck')"
+ if [ "${nvimRequireCheck[*]}" = "" ]; then
+ echo "nvimRequireCheck is empty; entering discovery mode"
+ # Auto-discovery mode
+ if ! discover_modules; then
+ echo "No modules found during discovery; exiting hook"
+ return
+ fi
+ else
+ echo "nvimRequireCheck is pre-populated; entering manual check mode"
fi
+
+ run_require_checks
+ print_summary
}
echo "Using neovimRequireCheckHook"
appendToVar preDistPhases neovimRequireCheckHook
-
-
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index b5ff7ce37fef..7d7dd505f2b5 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -466,6 +466,13 @@ in
cmp-dictionary = super.cmp-dictionary.overrideAttrs (oa: {
nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
+ nvimSkipModule = [
+ # Test files
+ "cmp_dictionary.dict.external_spec"
+ "cmp_dictionary.dict.trie_spec"
+ "cmp_dictionary.lib.trie_spec"
+ "cmp_dictionary.lib.unknown_spec"
+ ];
});
cmp-digraphs = super.cmp-digraphs.overrideAttrs (oa: {
@@ -2897,6 +2904,10 @@ in
"snacks.terminal"
"snacks.win"
"snacks.words"
+ "snacks.debug"
+ "snacks.scratch"
+ # Optional trouble integration
+ "trouble.sources.profiler"
];
};
diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix
index 164245be176f..d1f7bf3440e2 100644
--- a/pkgs/applications/editors/vim/plugins/vim-utils.nix
+++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix
@@ -499,8 +499,15 @@ rec {
nativeBuildInputs =
oldAttrs.nativeBuildInputs or [ ]
++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
- vimCommandCheckHook
vimGenDocHook
+ ];
+
+ doCheck = oldAttrs.doCheck or true;
+
+ nativeCheckInputs =
+ oldAttrs.nativeCheckInputs or [ ]
+ ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+ vimCommandCheckHook
# many neovim plugins keep using buildVimPlugin
neovimRequireCheckHook
];
diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix
index a7a38e6f75ab..b660d5cc8c34 100644
--- a/pkgs/applications/graphics/processing/default.nix
+++ b/pkgs/applications/graphics/processing/default.nix
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
echo "tarring jdk"
tar --checkpoint=10000 -czf build/linux/jdk-17.0.8-${arch}.tgz ${jdk}
- cp ${ant}/lib/ant/lib/{ant.jar,ant-launcher.jar} app/lib/
+ cp ${ant.home}/lib/{ant.jar,ant-launcher.jar} app/lib/
mkdir -p core/library
ln -s ${jogl}/share/java/* core/library/
ln -s ${vaqua} app/lib/VAqua9.jar
diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers/default.nix b/pkgs/applications/kde/kdegraphics-thumbnailers/default.nix
index 6686f582d6d2..a8711164926c 100644
--- a/pkgs/applications/kde/kdegraphics-thumbnailers/default.nix
+++ b/pkgs/applications/kde/kdegraphics-thumbnailers/default.nix
@@ -1,5 +1,5 @@
{
- mkDerivation, lib, ghostscript, substituteAll,
+ mkDerivation, lib, ghostscript, replaceVars,
extra-cmake-modules, karchive, kio, libkexiv2, libkdcraw, kdegraphics-mobipocket
}:
@@ -15,9 +15,8 @@ mkDerivation {
patches = [
# Hardcode patches to Ghostscript so PDF thumbnails work OOTB.
# Intentionally not doing the same for dvips because TeX is big.
- (substituteAll {
+ (replaceVars ./gs-paths.patch {
gs = "${ghostscript}/bin/gs";
- src = ./gs-paths.patch;
})
];
}
diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix
index 78fc52996dc5..7593e33c4c15 100644
--- a/pkgs/applications/kde/marble.nix
+++ b/pkgs/applications/kde/marble.nix
@@ -18,7 +18,7 @@ mkDerivation {
protobuf_21 qtscript qtsvg qtquickcontrols qtwebengine shared-mime-info krunner kparts
knewstuff gpsd
];
- preConfigure = ''
- cmakeFlags+=" -DINCLUDE_INSTALL_DIR=''${!outputDev}/include"
- '';
+ cmakeFlags = [
+ "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include"
+ ];
}
diff --git a/pkgs/applications/misc/maliit-framework/default.nix b/pkgs/applications/misc/maliit-framework/default.nix
index 7093524fc04d..2d350d567e7c 100644
--- a/pkgs/applications/misc/maliit-framework/default.nix
+++ b/pkgs/applications/misc/maliit-framework/default.nix
@@ -66,9 +66,9 @@ mkDerivation rec {
wayland-scanner
];
- preConfigure = ''
- cmakeFlags+="-DQT5_PLUGINS_INSTALL_DIR=$out/$qtPluginPrefix"
- '';
+ cmakeFlags = [
+ "-DQT5_PLUGINS_INSTALL_DIR=${placeholder "out"}/$qtPluginPrefix"
+ ];
meta = with lib; {
description = "Core libraries of Maliit and server";
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 6a46a8ec82d2..5b75cec95a28 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -261,6 +261,25 @@ buildStdenv.mkDerivation {
hash = "sha256-2IpdSyye3VT4VB95WurnyRFtdN1lfVtYpgEiUVhfNjw=";
})
]
+ ++ [
+ # LLVM 19 turned on WASM reference types by default, exposing a bug
+ # that broke the Mozilla WASI build. Supposedly, it has been fixed
+ # upstream in LLVM, but the build fails in the same way for us even
+ # with LLVM 19 versions that contain the upstream patch.
+ #
+ # Apply the temporary patch Mozilla used to work around this bug
+ # for now until someone can investigate what’s going on here.
+ #
+ # TODO: Please someone figure out what’s up with this.
+ #
+ # See:
+ # See:
+ (fetchpatch {
+ name = "wasi-sdk-disable-reference-types.patch";
+ url = "https://hg.mozilla.org/integration/autoland/raw-rev/23a9f6555c7c";
+ hash = "sha256-CRywalJlRMFVLITEYXxpSq3jLPbUlWKNRHuKLwXqQfU=";
+ })
+ ]
++ extraPatches;
postPatch = ''
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 56314b66de49..f34bfdb6fc0f 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -19,7 +19,6 @@
, sndio
, libjack2
, speechd-minimal
-, removeReferencesTo
}:
## configurability of the wrapper itself
@@ -242,7 +241,7 @@ let
};
}));
- nativeBuildInputs = [ makeWrapper lndir jq removeReferencesTo ];
+ nativeBuildInputs = [ makeWrapper lndir jq ];
buildInputs = [ browser.gtk3 ];
@@ -417,9 +416,6 @@ let
passthru = { unwrapped = browser; };
disallowedRequisites = [ stdenv.cc ];
- postInstall = ''
- find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' +
- '';
meta = browser.meta // {
inherit (browser.meta) description;
mainProgram = launcherName;
diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index 891a4214fe78..048ba5a35496 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -28,12 +28,12 @@ stdenv.mkDerivation rec {
# /etc/{resolv.conf,hosts}, replace all references to `localhost'
# by their IPv4 equivalent.
find . \( -name \*.c -or -name \*.conf \) | \
- xargs sed -ie 's|\|127.0.0.1|g'
+ xargs sed -i -e 's|\|127.0.0.1|g'
# Make sure the tests don't rely on `/tmp', for the sake of chroot
# builds.
find . \( -iname \*test\*.c -or -name \*.conf \) | \
- xargs sed -ie "s|/tmp|$TMPDIR|g"
+ xargs sed -i -e "s|/tmp|$TMPDIR|g"
'';
# unfortunately, there's still a few failures with impure tests
diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index 7490066c7327..633e0d219f60 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -8,6 +8,7 @@
, alsa-lib
, faac
, faad2
+, fetchpatch
, ffmpeg
, glib
, openh264
@@ -85,6 +86,22 @@ stdenv.mkDerivation rec {
hash = "sha256-w+xyMNFmKylSheK0yAGl8J6MXly/HUjjAfR9Qq3s/kA=";
};
+ patches = [
+ # GCC 14 compatibility
+ (fetchpatch {
+ url = "https://github.com/FreeRDP/FreeRDP/commit/5b14b7cbdd36414f1838047f21502654bd32ebb1.patch";
+ hash = "sha256-EWLfmjGJGWA/sY2E2DnFKhPbzhOVbXZPCrV8i1XuSeY=";
+ })
+ (fetchpatch {
+ url = "https://github.com/FreeRDP/FreeRDP/commit/efa899d3deb8595a29fabb2a2251722f9d7e0d7f.patch";
+ hash = "sha256-hjqNexYq+3iO2L2L9wT2tWbHz0BEtl/y7jgQT4kpNIM=";
+ })
+ (fetchpatch {
+ url = "https://github.com/FreeRDP/FreeRDP/commit/0c20fac8f1deeeca3df93a6619542e5d9176f0f0.patch";
+ hash = "sha256-cEzNPteucoI5KoGEM3C6mg2kW9uWImPebZEV6nssexY=";
+ })
+ ];
+
postPatch = ''
export HOME=$TMP
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 32236f36a9b9..4c38daf0d779 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -48,6 +48,9 @@ stdenv.mkDerivation rec {
(lib.enableFeature enableOpenSSL "openssl")
(lib.enableFeature enableXXHash "xxhash")
(lib.enableFeature enableZstd "zstd")
+ # Feature detection does a runtime check which varies according to ipv6
+ # availability, so force it on to make reproducible, see #360152.
+ (lib.enableFeature true "ipv6")
"--with-nobody-group=nogroup"
# disable the included zlib explicitly as it otherwise still compiles and
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index efd3b01a7d16..438500f41cc0 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -461,7 +461,7 @@ in stdenv.mkDerivation (finalAttrs: {
"--enable-dbus"
"--enable-release-build"
"--enable-epm"
- "--with-ant-home=${getLib ant}/lib/ant"
+ "--with-ant-home=${ant.home}"
# Without these, configure does not finish
"--without-junit"
diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix
index b8b57857c02a..8e15dd6468b5 100644
--- a/pkgs/applications/science/misc/boinc/default.nix
+++ b/pkgs/applications/science/misc/boinc/default.nix
@@ -63,12 +63,14 @@ stdenv.mkDerivation rec {
preConfigure = ''
./_autosetup
- configureFlags="$configureFlags --sysconfdir=$out/etc"
'';
enableParallelBuilding = true;
- configureFlags = [ "--disable-server" ] ++ lib.optionals headless [ "--disable-manager" ];
+ configureFlags = [
+ "--disable-server"
+ "--sysconfdir=${placeholder "out"}/etc"
+ ] ++ lib.optionals headless [ "--disable-manager" ];
postInstall = ''
install --mode=444 -D 'client/scripts/boinc-client.service' "$out/etc/systemd/system/boinc.service"
diff --git a/pkgs/applications/science/physics/crystfel/default.nix b/pkgs/applications/science/physics/crystfel/default.nix
index a8f2b65b669f..5c29d9b6f4d5 100644
--- a/pkgs/applications/science/physics/crystfel/default.nix
+++ b/pkgs/applications/science/physics/crystfel/default.nix
@@ -31,7 +31,6 @@
, gtk3
, gdk-pixbuf
, argp-standalone
-, memorymappingHook
, withGui ? true
, withBitshuffle ? true
}:
@@ -211,8 +210,6 @@ stdenv.mkDerivation rec {
] ++ lib.optionals withGui [ gtk3 gdk-pixbuf ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
argp-standalone
- ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64) [
- memorymappingHook
]
++ lib.optionals withBitshuffle [ hdf5-external-filter-plugins ];
diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix
index dcf581f27a80..d0cb926af866 100644
--- a/pkgs/applications/terminal-emulators/mlterm/default.nix
+++ b/pkgs/applications/terminal-emulators/mlterm/default.nix
@@ -147,14 +147,14 @@ in stdenv.mkDerivation (finalAttrs: {
#bad configure.ac and Makefile.in everywhere
preConfigure = ''
- sed -ie 's;-L/usr/local/lib -R/usr/local/lib;;g' \
+ sed -i -e 's;-L/usr/local/lib -R/usr/local/lib;;g' \
main/Makefile.in \
tool/mlfc/Makefile.in \
tool/mlimgloader/Makefile.in \
tool/mlconfig/Makefile.in \
uitoolkit/libtype/Makefile.in \
uitoolkit/libotl/Makefile.in
- sed -ie 's;cd ..srcdir. && rm -f ...lang..gmo.*;;g' \
+ sed -i -e 's;cd ..srcdir. && rm -f ...lang..gmo.*;;g' \
tool/mlconfig/po/Makefile.in.in
#utmp and mlterm-fb
substituteInPlace configure.in \
diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix
index e8eac58e73f6..0e9cd4ddc59c 100644
--- a/pkgs/applications/version-management/monotone-viz/default.nix
+++ b/pkgs/applications/version-management/monotone-viz/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
];
preConfigure = ''
- configureFlags="$configureFlags --with-lablgtk-dir=$(echo ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2)"
+ appendToVar configureFlags "--with-lablgtk-dir=$(echo ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2)"
'';
postInstall = ''
diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix
index 147257dc3d5d..45f317e1b0d8 100644
--- a/pkgs/applications/version-management/sourcehut/default.nix
+++ b/pkgs/applications/version-management/sourcehut/default.nix
@@ -45,6 +45,7 @@ let
flask
sqlalchemy
];
+ disabledTests = [ "test_persist_selectable" ];
});
# flask-sqlalchemy 2.x requires flask 2.x
@@ -72,6 +73,7 @@ let
hash = "sha256-83doVvfdpymlAB0EbfrHmuoKE5B2LJbFq+AY2xGpnl4=";
})
];
+ nativeCheckInputs = oldAttrs.nativeCheckInputs or [] ++ [ self.pytest-xprocess ];
});
# sourcehut is not (yet) compatible with factory-boy 3.x
diff --git a/pkgs/applications/version-management/vcprompt/default.nix b/pkgs/applications/version-management/vcprompt/default.nix
index d2ef35c9b668..f831003c6fa3 100644
--- a/pkgs/applications/version-management/vcprompt/default.nix
+++ b/pkgs/applications/version-management/vcprompt/default.nix
@@ -14,9 +14,12 @@ stdenv.mkDerivation rec {
preConfigure = ''
autoconf
- makeFlags="$makeFlags PREFIX=$out"
'';
+ makeFlags = [
+ "PREFIX=${placeholder "out"}"
+ ];
+
meta = with lib; {
description = ''
A little C program that prints a short string with barebones information
diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix
index 374837b01b38..116f01837bc8 100644
--- a/pkgs/applications/video/kodi/unwrapped.nix
+++ b/pkgs/applications/video/kodi/unwrapped.nix
@@ -214,10 +214,10 @@ in stdenv.mkDerivation (finalAttrs: {
# Need these tools on the build system when cross compiling,
# hacky, but have found no other way.
CXX=$CXX_FOR_BUILD LD=ld make -C tools/depends/native/JsonSchemaBuilder
- cmakeFlags+=" -DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin"
+ appendToVar cmakeFlags "-DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin"
CXX=$CXX_FOR_BUILD LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker
- cmakeFlags+=" -DWITH_TEXTUREPACKER=$PWD/tools/depends/native/TexturePacker/bin"
+ appendToVar cmakeFlags "-DWITH_TEXTUREPACKER=$PWD/tools/depends/native/TexturePacker/bin"
'';
postPatch = ''
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index 18b3ec99229b..60adac3f764e 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -29,7 +29,8 @@ rec {
extract = args@{ pname, version, name ? null, postExtract ? "", src, ... }:
assert lib.assertMsg (name == null) "The `name` argument is deprecated. Use `pname` and `version` instead to construct the name.";
pkgs.runCommand "${pname}-${version}-extracted" {
- buildInputs = [ appimage-exec ];
+ nativeBuildInputs = [ appimage-exec ];
+ strictDeps = true;
} ''
appimage-exec.sh -x $out ${src}
${postExtract}
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 736494b5ee55..1d907aa31f48 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -343,10 +343,6 @@ stdenvNoCC.mkDerivation {
done
''
- + optionalString targetPlatform.isDarwin ''
- echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/libc-ldflags
- ''
-
##
## GNU specific extra strip flags
##
diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl
index 12d922770a8f..b620a89aee8f 100755
--- a/pkgs/build-support/buildenv/builder.pl
+++ b/pkgs/build-support/buildenv/builder.pl
@@ -77,7 +77,7 @@ for my $p (@pathsToLink) {
sub findFiles;
sub findFilesInDir {
- my ($relName, $target, $ignoreCollisions, $checkCollisionContents, $priority) = @_;
+ my ($relName, $target, $ignoreCollisions, $ignoreSingleFileOutputs, $checkCollisionContents, $priority) = @_;
opendir DIR, "$target" or die "cannot open `$target': $!";
my @names = readdir DIR or die;
@@ -85,7 +85,7 @@ sub findFilesInDir {
foreach my $name (@names) {
next if $name eq "." || $name eq "..";
- findFiles("$relName/$name", "$target/$name", $name, $ignoreCollisions, $checkCollisionContents, $priority);
+ findFiles("$relName/$name", "$target/$name", $name, $ignoreCollisions, $ignoreSingleFileOutputs, $checkCollisionContents, $priority);
}
}
@@ -115,11 +115,16 @@ sub prependDangling {
}
sub findFiles {
- my ($relName, $target, $baseName, $ignoreCollisions, $checkCollisionContents, $priority) = @_;
+ my ($relName, $target, $baseName, $ignoreCollisions, $ignoreSingleFileOutputs, $checkCollisionContents, $priority) = @_;
- # The store path must not be a file
+ # The store path must not be a file when not ignoreSingleFileOutputs
if (-f $target && isStorePath $target) {
- die "The store path $target is a file and can't be merged into an environment using pkgs.buildEnv!";
+ if ($ignoreSingleFileOutputs) {
+ warn "The store path $target is a file and can't be merged into an environment using pkgs.buildEnv";
+ return;
+ } else {
+ die "The store path $target is a file and can't be merged into an environment using pkgs.buildEnv!";
+ }
}
# Urgh, hacky...
@@ -188,8 +193,8 @@ sub findFiles {
}
}
- findFilesInDir($relName, $oldTarget, $ignoreCollisions, $checkCollisionContents, $oldPriority) unless $oldTarget eq "";
- findFilesInDir($relName, $target, $ignoreCollisions, $checkCollisionContents, $priority);
+ findFilesInDir($relName, $oldTarget, $ignoreCollisions, $ignoreSingleFileOutputs, $checkCollisionContents, $oldPriority) unless $oldTarget eq "";
+ findFilesInDir($relName, $target, $ignoreCollisions, $ignoreSingleFileOutputs, $checkCollisionContents, $priority);
$symlinks{$relName} = ["", $priority]; # denotes directory
}
@@ -199,12 +204,12 @@ my %done;
my %postponed;
sub addPkg {
- my ($pkgDir, $ignoreCollisions, $checkCollisionContents, $priority) = @_;
+ my ($pkgDir, $ignoreCollisions, $ignoreSingleFileOutputs, $checkCollisionContents, $priority) = @_;
return if (defined $done{$pkgDir});
$done{$pkgDir} = 1;
- findFiles("", $pkgDir, "", $ignoreCollisions, $checkCollisionContents, $priority);
+ findFiles("", $pkgDir, "", $ignoreCollisions, $ignoreSingleFileOutputs, $checkCollisionContents, $priority);
my $propagatedFN = "$pkgDir/nix-support/propagated-user-env-packages";
if (-e $propagatedFN) {
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix
index 5183a358ce70..e536467837c1 100644
--- a/pkgs/build-support/buildenv/default.nix
+++ b/pkgs/build-support/buildenv/default.nix
@@ -23,6 +23,9 @@ lib.makeOverridable
, # Whether to ignore collisions or abort.
ignoreCollisions ? false
+ # Whether to ignore outputs that are a single file instead of a directory.
+, ignoreSingleFileOutputs ? false
+
, # Whether to include closures of all input paths.
includeClosures ? false
@@ -51,6 +54,8 @@ lib.makeOverridable
, passthru ? {}
, meta ? {}
+, pname ? null
+, version ? null
}:
let
chosenOutputs = map (drv: {
@@ -75,8 +80,8 @@ let
(lib.remove null)
];
in runCommand name
- rec {
- inherit manifest ignoreCollisions checkCollisionContents passthru
+ (rec {
+ inherit manifest ignoreCollisions checkCollisionContents ignoreSingleFileOutputs passthru
meta pathsToLink extraPrefix postBuild
nativeBuildInputs buildInputs;
pkgs = builtins.toJSON chosenOutputs;
@@ -85,7 +90,11 @@ in runCommand name
allowSubstitutes = false;
# XXX: The size is somewhat arbitrary
passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else [ ];
- }
+ } // lib.optionalAttrs (pname != null) {
+ inherit pname;
+ } // lib.optionalAttrs (version != null) {
+ inherit version;
+ })
''
${buildPackages.perl}/bin/perl -w ${builder}
eval "$postBuild"
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 001123fe3d85..d9174df31a2a 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -629,6 +629,20 @@ stdenvNoCC.mkDerivation {
echo " -L${libcxx_solib}" >> $out/nix-support/cc-ldflags
''
+ ## Prevent clang from seeing /usr/include. There is a desire to achieve this
+ ## through alternate means because it breaks -sysroot and related functionality.
+ #
+ # This flag prevents global system header directories from
+ # leaking through on non‐NixOS Linux. However, on macOS, the
+ # SDK path is used as the sysroot, and forcing `-nostdlibinc`
+ # breaks `-isysroot` with an unwrapped compiler. As macOS has
+ # no `/usr/include`, there’s essentially no risk to dropping
+ # the flag there. See discussion in NixOS/nixpkgs#191152.
+ #
+ + optionalString ((cc.isClang or false) && !targetPlatform.isDarwin) ''
+ echo " -nostdlibinc" >> $out/nix-support/cc-cflags
+ ''
+
##
## Man page and info support
##
@@ -682,10 +696,6 @@ stdenvNoCC.mkDerivation {
done
''
- + optionalString targetPlatform.isDarwin ''
- echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/cc-cflags
- ''
-
+ optionalString targetPlatform.isAndroid ''
echo "-D__ANDROID_API__=${targetPlatform.androidSdkVersion}" >> $out/nix-support/cc-cflags
''
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index a838768b87d5..2463347be51b 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -26,7 +26,6 @@
, skopeo
, stdenv
, storeDir ? builtins.storeDir
-, substituteAll
, symlinkJoin
, tarsum
, util-linux
diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix
index 7b02b92b3c65..418e21b36c70 100644
--- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix
+++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix
@@ -3,7 +3,6 @@
runtimeShell,
stdenvNoCC,
callPackage,
- substituteAll,
writeShellScript,
makeWrapper,
dotnetCorePackages,
diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix
index d0766faeaaf6..4ef0bcc9db21 100644
--- a/pkgs/build-support/go/module.nix
+++ b/pkgs/build-support/go/module.nix
@@ -51,10 +51,6 @@
# Go build flags.
, GOFLAGS ? [ ]
- # Needed for buildFlags{,Array} warning
-, buildFlags ? "" # deprecated
-, buildFlagsArray ? "" # deprecated
-
, ...
}@args':
@@ -208,8 +204,6 @@ in
'');
buildPhase = args.buildPhase or (
- lib.warnIf (buildFlags != "" || buildFlagsArray != "")
- "`buildFlags`/`buildFlagsArray` are deprecated and will be removed in the 24.11 release. Use the `ldflags` and/or `tags` attributes instead of `buildFlags`/`buildFlagsArray`"
lib.warnIf (builtins.elem "-buildid=" ldflags)
"`-buildid=` is set by default as ldflag by buildGoModule"
''
@@ -227,12 +221,13 @@ in
buildGoDir() {
local cmd="$1" dir="$2"
- declare -ga buildFlagsArray
declare -a flags
- flags+=($buildFlags "''${buildFlagsArray[@]}")
flags+=(''${tags:+-tags=''${tags// /,}})
flags+=(''${ldflags:+-ldflags="$ldflags"})
flags+=("-p" "$NIX_BUILD_CORES")
+ if (( "''${NIX_DEBUG:-0}" >= 1 )); then
+ flags+=(-x)
+ fi
if [ "$cmd" = "test" ]; then
flags+=(-vet=off)
@@ -262,10 +257,6 @@ in
fi
}
- if (( "''${NIX_DEBUG:-0}" >= 1 )); then
- buildFlagsArray+=(-x)
- fi
-
if [ -z "$enableParallelBuilding" ]; then
export NIX_BUILD_CORES=1
fi
diff --git a/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash b/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash
index d1b8a25c949d..82d8aa20bca3 100644
--- a/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash
+++ b/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash
@@ -24,9 +24,9 @@ checkComposerValidate() {
setComposerRootVersion
if [ "1" == "${composerGlobal-}" ]; then
- global="global";
+ global="global";
else
- global="";
+ global="";
fi
command="composer ${global} validate --strict --quiet --no-interaction --no-check-all --no-check-lock"
diff --git a/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash b/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash
index 573b82c2baff..d61e683725da 100644
--- a/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash
+++ b/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash
@@ -22,9 +22,9 @@ setComposerEnvVariables() {
checkComposerValidate() {
if [ "1" == "${composerGlobal-}" ]; then
- global="global";
+ global="global";
else
- global="";
+ global="";
fi
command="composer ${global} validate --strict --quiet --no-interaction --no-check-all --no-check-lock"
diff --git a/pkgs/build-support/release/binary-tarball.nix b/pkgs/build-support/release/binary-tarball.nix
index aeaa8edb52be..17cea7678c04 100644
--- a/pkgs/build-support/release/binary-tarball.nix
+++ b/pkgs/build-support/release/binary-tarball.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation (
# Prefix hackery because of a bug in stdenv (it tries to `mkdir
# $prefix', which doesn't work due to the DESTDIR).
- configureFlags="--prefix=$prefix $configureFlags"
+ prependToVar configureFlags "--prefix=$prefix"
dontAddPrefix=1
prefix=$TMPDIR/inst$prefix
'';
diff --git a/pkgs/build-support/replace-vars/default.nix b/pkgs/build-support/replace-vars/default.nix
index a6fc94f4f376..0088279ad939 100644
--- a/pkgs/build-support/replace-vars/default.nix
+++ b/pkgs/build-support/replace-vars/default.nix
@@ -11,8 +11,8 @@
Any unmatched variable names in the file at the provided path will cause a build failure.
- Any remaining text that matches `@[A-Za-z_][0-9A-Za-z_'-]@` in the output after replacement
- has occurred will cause a build failure.
+ By default, any remaining text that matches `@[A-Za-z_][0-9A-Za-z_'-]@` in the output after replacement
+ has occurred will cause a build failure. Variables can be excluded from this check by passing "null" for them.
# Inputs
@@ -20,7 +20,8 @@
: The file in which to replace variables.
`attrs` (AttrsOf String)
- : Each entry in this set corresponds to a `--subst-var-by` entry in [`substitute`](https://nixos.org/manual/nixpkgs/stable/#fun-substitute).
+ : Each entry in this set corresponds to a `--subst-var-by` entry in [`substitute`](https://nixos.org/manual/nixpkgs/stable/#fun-substitute) or
+ null to keep it unchanged.
# Example
@@ -36,13 +37,19 @@ path: attrs:
let
# We use `--replace-fail` instead of `--subst-var-by` so that if the thing isn't there, we fail.
- subst-var-by = name: value: [
- "--replace-fail"
- (lib.escapeShellArg "@${name}@")
- (lib.escapeShellArg value)
- ];
+ subst-var-by =
+ name: value:
+ lib.optionals (value != null) [
+ "--replace-fail"
+ (lib.escapeShellArg "@${name}@")
+ (lib.escapeShellArg value)
+ ];
replacements = lib.concatLists (lib.mapAttrsToList subst-var-by attrs);
+
+ left-overs = map ({ name, ... }: name) (
+ builtins.filter ({ value, ... }: value == null) (lib.attrsToList attrs)
+ );
in
stdenvNoCC.mkDerivation {
@@ -62,13 +69,15 @@ stdenvNoCC.mkDerivation {
# Look for Nix identifiers surrounded by `@` that aren't substituted.
checkPhase =
let
- regex = lib.escapeShellArg "@[a-zA-Z_][0-9A-Za-z_'-]*@";
+ lookahead =
+ if builtins.length left-overs == 0 then "" else "(?!${builtins.concatStringsSep "|" left-overs}@)";
+ regex = lib.escapeShellArg "@${lookahead}[a-zA-Z_][0-9A-Za-z_'-]*@";
in
''
runHook preCheck
- if grep -qe ${regex} "$out"; then
+ if grep -Pqe ${regex} "$out"; then
echo The following look like unsubstituted Nix identifiers that remain in "$out":
- grep -oe ${regex} "$out"
+ grep -Poe ${regex} "$out"
echo Use the more precise '`substitute`' function if this check is in error.
exit 1
fi
diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix
index 51e9caac1ac3..65610612d6ce 100644
--- a/pkgs/build-support/rust/build-rust-package/default.nix
+++ b/pkgs/build-support/rust/build-rust-package/default.nix
@@ -128,8 +128,6 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg
cargoCheckFeatures = checkFeatures;
- patchRegistryDeps = ./patch-registry-deps;
-
nativeBuildInputs = nativeBuildInputs ++ lib.optionals auditable [
(buildPackages.cargo-auditable-cargo-wrapper.override {
inherit cargo cargo-auditable;
diff --git a/pkgs/build-support/rust/build-rust-package/patch-registry-deps/pkg-config b/pkgs/build-support/rust/build-rust-package/patch-registry-deps/pkg-config
deleted file mode 100644
index fbb094304587..000000000000
--- a/pkgs/build-support/rust/build-rust-package/patch-registry-deps/pkg-config
+++ /dev/null
@@ -1,8 +0,0 @@
-for dir in pkg-config-*; do
- [ -d "$dir" ] || continue
-
- echo "Patching pkg-config registry dep"
-
- substituteInPlace "$dir/src/lib.rs" \
- --replace '"/usr"' '"'"$NIX_STORE"'/"'
-done
diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix
index ba605adeb9a0..92b248882e6f 100644
--- a/pkgs/build-support/testers/default.nix
+++ b/pkgs/build-support/testers/default.nix
@@ -10,7 +10,7 @@
runCommandWith,
stdenv,
stdenvNoCC,
- substituteAll,
+ replaceVars,
testers,
}:
# Documentation is in doc/build-helpers/testers.chapter.md
@@ -24,7 +24,7 @@
testBuildFailure = drv: drv.overrideAttrs (orig: {
builder = buildPackages.bash;
args = [
- (substituteAll { coreutils = buildPackages.coreutils; src = ./expect-failure.sh; })
+ (replaceVars ./expect-failure.sh { coreutils = buildPackages.coreutils; })
orig.realBuilder or stdenv.shell
] ++ orig.args or ["-e" (orig.builder or ../../stdenv/generic/default-builder.sh)];
});
diff --git a/pkgs/by-name/ad/adns/darwin.patch b/pkgs/by-name/ad/adns/darwin.patch
new file mode 100644
index 000000000000..9c44f89d462e
--- /dev/null
+++ b/pkgs/by-name/ad/adns/darwin.patch
@@ -0,0 +1,21 @@
+diff --git a/configure.in b/configure.in
+index b753a5bb3e..ee7d546984 100644
+--- a/configure.in
++++ b/configure.in
+@@ -134,12 +134,12 @@
+ AC_SUBST(SHLIBFILE)
+ AC_SUBST(SHLIBSONAME)
+
+-SHLIBFORLINK='libadns.so'
+-SHLIBSONAME='$(SHLIBFORLINK).$(MAJOR)'
+-SHLIBFILE='$(SHLIBSONAME).$(MINOR)'
++SHLIBFORLINK='libadns.dylib'
++SHLIBSONAME='libadns.$(MAJOR).dylib'
++SHLIBFILE='libadns.$(MAJOR).$(MINOR).dylib'
+
+ SHLIBCC='$(CC) $(CFLAGS) -fpic'
+-MKSHLIB_1='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME) -o'
++MKSHLIB_1='$(CC) $(LDFLAGS) -shared -Wl,-install_name,$(libdir)/$(SHLIBFILE) -o'
+ MKSHLIB_2=''
+ MKSHLIB_3='-lc'
+
diff --git a/pkgs/by-name/ad/adns/package.nix b/pkgs/by-name/ad/adns/package.nix
index eeb6c07bf11d..70c04d94aadd 100644
--- a/pkgs/by-name/ad/adns/package.nix
+++ b/pkgs/by-name/ad/adns/package.nix
@@ -1,44 +1,48 @@
-{ stdenv, lib, fetchurl, gnum4, gitUpdater }:
+{
+ lib,
+ stdenv,
+ fetchurl,
+ gnum4,
+ autoreconfHook,
+ gitUpdater,
+}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "adns";
version = "1.6.1";
src = fetchurl {
urls = [
- "https://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-${version}.tar.gz"
- "mirror://gnu/adns/adns-${version}.tar.gz"
+ "https://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-${finalAttrs.version}.tar.gz"
+ "mirror://gnu/adns/adns-${finalAttrs.version}.tar.gz"
];
hash = "sha256-cTizeJt1Br1oP0UdT32FMHepGAO3s12G7GZ/D5zUAc0=";
};
- nativeBuildInputs = [ gnum4 ];
+ patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./darwin.patch ];
+
+ nativeBuildInputs = [
+ gnum4
+ autoreconfHook
+ ];
configureFlags = lib.optional stdenv.hostPlatform.isStatic "--disable-dynamic";
- preConfigure =
- lib.optionalString stdenv.hostPlatform.isDarwin "sed -i -e 's|-Wl,-soname=$(SHLIBSONAME)||' configure";
-
- # Autogenerated headers miss interdependencies in Makefile, fail parallel build:
- # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=51329
- enableParallelBuilding = false;
+ enableParallelBuilding = true;
# https://www.mail-archive.com/nix-dev@cs.uu.nl/msg01347.html for details.
doCheck = false;
- postInstall = let suffix = lib.versions.majorMinor version;
- in lib.optionalString stdenv.hostPlatform.isDarwin ''
- install_name_tool -id $out/lib/libadns.so.${suffix} $out/lib/libadns.so.${suffix}
- '';
+ doInstallCheck = true;
- # darwin executables fail, but I don't want to fail the 100-500 packages depending on this lib
- doInstallCheck = !stdenv.hostPlatform.isDarwin;
installCheckPhase = ''
- set -eo pipefail
+ runHook preInstallCheck
for prog in $out/bin/*; do
$prog --help > /dev/null && echo $(basename $prog) shows usage
done
+
+ runHook postInstallCheck
'';
passthru.updateScript = gitUpdater {
@@ -46,11 +50,15 @@ stdenv.mkDerivation rec {
rev-prefix = "adns-";
};
- meta = with lib; {
+ meta = {
homepage = "http://www.chiark.greenend.org.uk/~ian/adns/";
- description = "Asynchronous DNS Resolver Library";
- license = licenses.lgpl2;
+ description = "Asynchronous DNS resolver library";
+ license = [
+ lib.licenses.gpl3Plus
- platforms = platforms.unix;
+ # `adns.h` only
+ lib.licenses.lgpl2Plus
+ ];
+ platforms = lib.platforms.unix;
};
-}
+})
diff --git a/pkgs/by-name/an/ant/package.nix b/pkgs/by-name/an/ant/package.nix
index bedaa9b13949..073c14a0b57e 100644
--- a/pkgs/by-name/an/ant/package.nix
+++ b/pkgs/by-name/an/ant/package.nix
@@ -24,27 +24,27 @@ stdenv.mkDerivation (finalAttrs: {
};
installPhase = ''
- mkdir -p $out/bin $out/lib/ant
- mv * $out/lib/ant/
+ mkdir -p $out/bin $out/share/ant
+ mv * $out/share/ant/
# Get rid of the manual (35 MiB). Maybe we should put this in a
# separate output. Keep the antRun script since it's vanilla sh
# and needed for the task (but since we set ANT_HOME to
# a weird value, we have to move antRun to a weird location).
# Get rid of the other Ant scripts since we provide our own.
- mv $out/lib/ant/bin/antRun $out/bin/
- rm -rf $out/lib/ant/{manual,bin,WHATSNEW}
- mkdir $out/lib/ant/bin
- mv $out/bin/antRun $out/lib/ant/bin/
+ mv $out/share/ant/bin/antRun $out/bin/
+ rm -rf $out/share/ant/{manual,bin,WHATSNEW}
+ mkdir $out/share/ant/bin
+ mv $out/bin/antRun $out/share/ant/bin/
# Install ant-contrib.
unpackFile $contrib
- cp -p ant-contrib/ant-contrib-*.jar $out/lib/ant/lib/
+ cp -p ant-contrib/ant-contrib-*.jar $out/share/ant/lib/
cat >> $out/bin/ant <.sdk is a symlink.
src=Library/Developer/CommandLineTools/SDKs/MacOSX${lib.versions.majorMinor version}.sdk
- if [ ! -d $src ]; then
- src=Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
- fi
# Remove unwanted binaries, man pages, and folders from the SDK.
rm -rf $src/usr/bin $src/usr/share $src/System/Library/Perl
diff --git a/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix b/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix
index 840415d2e3b1..5a5cd345ec06 100644
--- a/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix
+++ b/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix
@@ -24,7 +24,6 @@ self: super: {
+ ''
echo "Removing the following dylibs from the libSystem reexported libraries list: ${lib.escapeShellArg (lib.concatStringsSep ", " removedDylibs)}"
for libSystem in libSystem.B.tbd libSystem.B_asan.tbd; do
- test ! -e usr/lib/$libSystem && continue # TODO: remove once the minimum SDK is 10.14 or newer.
tapi stubify --filetype=tbd-v5 usr/lib/$libSystem -o usr/lib/$libSystem # tbd-v5 is a JSON-based format.
jq --argjson libs ${lib.escapeShellArg (builtins.toJSON removedDylibs)} '
if .libraries then
diff --git a/pkgs/by-name/ap/apple-sdk/common/rewrite-sdk-paths.nix b/pkgs/by-name/ap/apple-sdk/common/rewrite-sdk-paths.nix
deleted file mode 100644
index 0eca6b8836b3..000000000000
--- a/pkgs/by-name/ap/apple-sdk/common/rewrite-sdk-paths.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ lib, sdkVersion }:
-
-let
- name = "MacOSX${lib.versions.majorMinor sdkVersion}.sdk";
-in
-self: super: {
- # Rewrite the stubs to point to dylibs in the SDK instead of at system locations. This is needed for umbrella
- # frameworks in older SDKs, which don’t also embed their stubs.
- buildPhase =
- super.buildPhase or ""
- + ''
- echo "Rewriting stubs to reference the SDK location in the store"
- find . -name '*.tbd' -type f -exec sed -E \
- -e "/^install-name/n; s|( \\|'\\|\"\\|\\[)/usr/|\1$sdkpath/${name}/usr/|g" \
- -e "/^install-name/n; s|( \\|'\\|\"\\|\\[)/System/|\1$sdkpath/${name}/System/|g" \
- -i {} \;
- '';
-}
diff --git a/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json b/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json
index 66700bbc07ad..e68c2643ab7c 100644
--- a/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json
+++ b/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json
@@ -1,716 +1,4 @@
{
- "10.12.2": {
- "CarbonHeaders": {
- "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=",
- "version": "18.1"
- },
- "CommonCrypto": {
- "hash": "sha256-1mCJjZLBMIftcsKC7Ihhzi6LRS3u7kJzh9/dy6MY1Hg=",
- "version": "60092.30.2"
- },
- "IOAudioFamily": {
- "hash": "sha256-5t3D44H/h0cUZqAjMi56BTbJD4o+R0xVdHJ1sZLYgNM=",
- "version": "205.11"
- },
- "IOBDStorageFamily": {
- "hash": "sha256-4NpWcqfkp3UxhKKAwomDK3zxQ9DagyYFUVoUcrHo1Rg=",
- "version": "18"
- },
- "IOCDStorageFamily": {
- "hash": "sha256-XOwdBFunLbwyasnTKQC6MRlXxGns07JvcAQc6AQ1Zt4=",
- "version": "56"
- },
- "IODVDStorageFamily": {
- "hash": "sha256-bbGzqJnenEL9hRyKMBif/381/ETO+yNYHhlnXXWLne0=",
- "version": "41.1"
- },
- "IOFWDVComponents": {
- "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=",
- "version": "208"
- },
- "IOFireWireAVC": {
- "hash": "sha256-rhZdjNoZ3OuHVLClhe9tMQU6qJs3IOHEqJ5TaNRJRnM=",
- "version": "424"
- },
- "IOFireWireFamily": {
- "hash": "sha256-adOI5uhd6QL4zpo4MK4ttmS1lcKseqmr68C1D/juGo0=",
- "version": "465"
- },
- "IOFireWireSBP2": {
- "hash": "sha256-5UWldDuSyAnRYjgIKllY4VNbxtAUawrlRS46+8FnbPs=",
- "version": "427"
- },
- "IOFireWireSerialBusProtocolTransport": {
- "hash": "sha256-a/xnnR2dUSWVMyTlkxJPa7cWk20RHl0Zh2Ot2pSEkF0=",
- "version": "252"
- },
- "IOGraphics": {
- "hash": "sha256-63XDVmEHu+KUdr06S7+RPi1BgLcAl4GZZRy+K96CvA0=",
- "version": "513.1"
- },
- "IOHIDFamily": {
- "hash": "sha256-BUDj89w4DrnsIxJZNIx3ZJ85c22HMchIVhJI7xREWTM=",
- "version": "870.31.1"
- },
- "IOKitUser": {
- "hash": "sha256-XJnOp5AtStXUim19GLev8MSM8iS5U8rRSnm7cNp/B80=",
- "version": "1324.30.13"
- },
- "IONetworkingFamily": {
- "hash": "sha256-dL1wSu72uzAAoMdgSjitXgHviioVIGdkDXqwY6HT5/g=",
- "version": "116.1.1"
- },
- "IOSerialFamily": {
- "hash": "sha256-ZcZ5F+a4u2AHThO5WyLn3/o42DR+YDBZKTy4P2EhHhk=",
- "version": "91"
- },
- "IOStorageFamily": {
- "hash": "sha256-IjsG/lgdtW04WH/5rb1QAT563Oy4O5fUrTGuA1kBrkY=",
- "version": "210.30.1"
- },
- "IOUSBFamily": {
- "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=",
- "version": "630.4.5"
- },
- "Libc": {
- "hash": "sha256-wyt5CJnNzk0MPC6pg2JAdiwIPxWFJsO9Yqa83vY+hLc=",
- "version": "1158.30.7"
- },
- "Libinfo": {
- "hash": "sha256-3Mu9lOkaQx5gmNPXzr67FnZvKWmQhryIPsN6k95TU18=",
- "version": "503.30.1"
- },
- "Libm": {
- "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=",
- "version": "2026"
- },
- "Libnotify": {
- "hash": "sha256-msGtbR53SHXjYN8i74gmkYWGkmqg+TcRO7TY/23XSFQ=",
- "version": "165.20.1"
- },
- "Librpcsvc": {
- "hash": "sha256-8e8E9TkRTAep3/miyqhF/mSkNdlym12W+AVhXF94+Bg=",
- "version": "26"
- },
- "Libsystem": {
- "hash": "sha256-FwI2aD3wSwES/sKkr014BdFLfsKeEefgS0Pne1FGOp0=",
- "version": "1238"
- },
- "OpenDirectory": {
- "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=",
- "version": "146"
- },
- "Security": {
- "hash": "sha256-Ya+ZO3bHNhQ+vZZx/lE7x+uMROHYWYKvm2ZZ1vClu3Q=",
- "version": "57740.31.2"
- },
- "architecture": {
- "hash": "sha256-gHUfKWc1uahI/IATafY1ppPAWnYUghOEXWK2lknAfrQ=",
- "version": "268"
- },
- "configd": {
- "hash": "sha256-i1UjnU7xBh7jCrGZxWMGrldzDrk2dDvjpthp/kq9OKo=",
- "version": "888.30.2"
- },
- "copyfile": {
- "hash": "sha256-pth+37uTfuFY94HuA4b/5GleDjidAuXVsBEQBUa3xCE=",
- "version": "138"
- },
- "dtrace": {
- "hash": "sha256-dK0N3l02241A5S1uvxZhqArHrTxd5Sd4JoAl6RBa8/8=",
- "version": "209.20.4"
- },
- "dyld": {
- "hash": "sha256-wyVsmqYgKLdMKZsLOHzOLag+mBnH0kNS6XAv4zuNTT4=",
- "version": "421.2"
- },
- "eap8021x": {
- "hash": "sha256-XSbzuNXyDJAADcnZed4Akmg1SK8P1IGrZitmhV3wzlo=",
- "version": "246.30.1"
- },
- "hfs": {
- "hash": "sha256-7ByUP59FXmmrxC5yJYUQxrkgt/vY7vZMl5JPQ0HfoS8=",
- "version": "366.30.3"
- },
- "launchd": {
- "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=",
- "version": "842.1.4"
- },
- "libclosure": {
- "hash": "sha256-hfXKQDRdgEDVyT+3v/EuQZyXNd0abD2tICYdQNfhtwY=",
- "version": "67"
- },
- "libdispatch": {
- "hash": "sha256-tj4+6V4FL/XVON13UH71schElTm4/IKtPJH/yoUgRY0=",
- "version": "703.30.5"
- },
- "libmalloc": {
- "hash": "sha256-q9zcUy8YTsRds6RYJMIUIY/MULQ19uKiNduMXP3D7hA=",
- "version": "116.30.3"
- },
- "libplatform": {
- "hash": "sha256-k9Pd+TJCrNS7K100og+6bLAZjV/0VUTy8SIOsc+SE6Q=",
- "version": "126.1.2"
- },
- "libpthread": {
- "hash": "sha256-FJaJO4lXIMAIwEmVF6mHE4ZZZoPI8ZIVuMKLojEsESE=",
- "version": "218.30.1"
- },
- "mDNSResponder": {
- "hash": "sha256-LYDkkmgyfWKK6AMINXyrXo5kw7+lxUcz+4Ckq9175vA=",
- "version": "765.30.11"
- },
- "objc4": {
- "hash": "sha256-WfhJo+/KPGr3/OuV5Kg2no48UR7VVVarh9TB3VFSCQ4=",
- "version": "706"
- },
- "ppp": {
- "hash": "sha256-eW62wL8C1GZ2+5aN0dTPsdoEu6FWf+6XEYv8OiEeMfY=",
- "version": "838"
- },
- "removefile": {
- "hash": "sha256-EJYU6eHggyRsezClEWkGJmgePIdtyF4rpFD4kSK5Czw=",
- "version": "45"
- },
- "xnu": {
- "hash": "sha256-pkELzbsWPtm9H31LaRkaVjkQpPDxG9E93TNS+K9nqhE=",
- "version": "3789.31.2"
- }
- },
- "10.13.2": {
- "CarbonHeaders": {
- "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=",
- "version": "18.1"
- },
- "CommonCrypto": {
- "hash": "sha256-3vx4HPlHP8PNi1GodeRh2iOEhyRBct3vX0Guc8060+I=",
- "version": "60118.30.2"
- },
- "IOAudioFamily": {
- "hash": "sha256-UG09Dc+up5cJKDHPpCmo11IsBchqZ72hVBPx8y+1klw=",
- "version": "206.5"
- },
- "IOBDStorageFamily": {
- "hash": "sha256-aaS5jWPRX4be8d3Rigq+kXzi9Zwbr8dHcNgcIz0n66o=",
- "version": "19"
- },
- "IOCDStorageFamily": {
- "hash": "sha256-U6v+Gj+IumU8Aha5+uf3yOU0Z4KMuBh7aXnJqiZ/abY=",
- "version": "58"
- },
- "IODVDStorageFamily": {
- "hash": "sha256-JLp4xN0Rdb2VpuXtVTODYNqQthDEZk+g/lvHRwJHQB4=",
- "version": "42"
- },
- "IOFWDVComponents": {
- "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=",
- "version": "208"
- },
- "IOFireWireAVC": {
- "hash": "sha256-4JS+oezknezxud2E2ojYdSx7A8Z9Q4rddetAoUMU1es=",
- "version": "425"
- },
- "IOFireWireFamily": {
- "hash": "sha256-+FPlhMN2h1iCg1GAqH8+MwHG3GIs4DvvE3QGABX+3Rg=",
- "version": "468"
- },
- "IOFireWireSBP2": {
- "hash": "sha256-5UWldDuSyAnRYjgIKllY4VNbxtAUawrlRS46+8FnbPs=",
- "version": "427"
- },
- "IOFireWireSerialBusProtocolTransport": {
- "hash": "sha256-a/xnnR2dUSWVMyTlkxJPa7cWk20RHl0Zh2Ot2pSEkF0=",
- "version": "252"
- },
- "IOGraphics": {
- "hash": "sha256-E0wDkVmSeEcyO6L6OeWEQuZ0Ggh7MUkfqeQ9uLUEK/g=",
- "version": "517.22"
- },
- "IOHIDFamily": {
- "hash": "sha256-9FhH53LyP1Yv2/afmr/lpNhl/GNFb/Yg+VpG5Ycg300=",
- "version": "1035.30.15"
- },
- "IOKitUser": {
- "hash": "sha256-LebulFJ4KJ5Vbcjj6SC70cmed/0vhCVYo5qDxCw85SE=",
- "version": "1445.31.1"
- },
- "IONetworkingFamily": {
- "hash": "sha256-gXGFCSn6JnHOVaRKhGXFYdvJBo/AGBMDrUdIcw/CwqI=",
- "version": "124.30.1"
- },
- "IOSerialFamily": {
- "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=",
- "version": "93"
- },
- "IOStorageFamily": {
- "hash": "sha256-Jo+0XlNi82KGksyrvUGyVPfmPMlTrDmZ75DT2lH66TY=",
- "version": "218.30.1"
- },
- "IOUSBFamily": {
- "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=",
- "version": "630.4.5"
- },
- "Libc": {
- "hash": "sha256-js2xU5dMF5j209F9Cufuq5WzqcyNusbJDyuPpMgYEZU=",
- "version": "1244.30.3"
- },
- "Libinfo": {
- "hash": "sha256-pVVLb8eOuLVc4HHGcgpl7dqT+Tg2xqKQIQroyLj5OEg=",
- "version": "517.30.1"
- },
- "Libm": {
- "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=",
- "version": "2026"
- },
- "Libnotify": {
- "hash": "sha256-nsWWqelTEP4nPJI3vG897zpSOxYOgpm8TUVJ04MrWU4=",
- "version": "172"
- },
- "Librpcsvc": {
- "hash": "sha256-8e8E9TkRTAep3/miyqhF/mSkNdlym12W+AVhXF94+Bg=",
- "version": "26"
- },
- "Libsystem": {
- "hash": "sha256-+VFJoiqEtXUcP8ERUxtrKwTWZmgdppr+0oPUxSgIF+c=",
- "version": "1252"
- },
- "OpenDirectory": {
- "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=",
- "version": "146"
- },
- "Security": {
- "hash": "sha256-W3bSTDCjj2ftq0wbDp+Z8QfD6TpF4p0fLrVjx2AmvfY=",
- "version": "58286.31.2"
- },
- "architecture": {
- "hash": "sha256-gHUfKWc1uahI/IATafY1ppPAWnYUghOEXWK2lknAfrQ=",
- "version": "268"
- },
- "configd": {
- "hash": "sha256-1YGIbAES4OONFtC2xxXWbM7Htlz2kKtFUULWqBB6fz0=",
- "version": "963.30.1"
- },
- "copyfile": {
- "hash": "sha256-CYTZwieSu1Fm9TLaaevfxDngAPRkEfewY+TgJrREed8=",
- "version": "146.30.2"
- },
- "dtrace": {
- "hash": "sha256-sgLSbCp9tYZ7ws2jgxB3NaAk+ijsIbmybsi0gkbZjFQ=",
- "version": "262"
- },
- "dyld": {
- "hash": "sha256-b1hM+iQl7ihRjHRL4Rcg5AHv5HSyKErVkTb+5KFF2P4=",
- "version": "519.2.2"
- },
- "eap8021x": {
- "hash": "sha256-KZsnzH5JiLfzY3zjMAlJRPCGY5EioW6aDJnMAemZJUY=",
- "version": "264.30.3"
- },
- "hfs": {
- "hash": "sha256-Ine8EFpW1kuNDn/r66abGyvYm+NSGI5TV3v/OlgyIME=",
- "version": "407.30.1"
- },
- "launchd": {
- "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=",
- "version": "842.1.4"
- },
- "libclosure": {
- "hash": "sha256-hfXKQDRdgEDVyT+3v/EuQZyXNd0abD2tICYdQNfhtwY=",
- "version": "67"
- },
- "libdispatch": {
- "hash": "sha256-rvsvtv9VncLxQHoURBBczrTaSgbw5827Qf2TxAPopqA=",
- "version": "913.30.4"
- },
- "libmalloc": {
- "hash": "sha256-VM5jHQYqDkoGmrQ2UugTu+XOLjd1YPqdfddzQkKfhiY=",
- "version": "140.1.1"
- },
- "libplatform": {
- "hash": "sha256-zQ3MYqQoMCsfgG6frwnG3LfKWwauTzgwhoADXVUiGR0=",
- "version": "161.20.1"
- },
- "libpthread": {
- "hash": "sha256-6NLKbnBXikSfqz0ZWF6MOIq/bQK/CmfQNvkNXCU6lcw=",
- "version": "301.30.1"
- },
- "mDNSResponder": {
- "hash": "sha256-anzilyXeGh8LL3cYvuLRdqGzhHUvSp9eILJWAltL18M=",
- "version": "878.30.4"
- },
- "objc4": {
- "hash": "sha256-+4o+EzD0YQhgfTg/W9SbVDol7wWUIFxVAVTGg4OVfHQ=",
- "version": "723"
- },
- "ppp": {
- "hash": "sha256-eUIFlYHsAPRrBS0TpTP1/TacaK8h/5QM2Xl1T46MdWc=",
- "version": "847"
- },
- "removefile": {
- "hash": "sha256-EJYU6eHggyRsezClEWkGJmgePIdtyF4rpFD4kSK5Czw=",
- "version": "45"
- },
- "xnu": {
- "hash": "sha256-x2k0KyNk4mIodXfYDHjaCKR1CsiE3HYBNN6p5SfGIMU=",
- "version": "4570.31.3"
- }
- },
- "10.14.6": {
- "CarbonHeaders": {
- "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=",
- "version": "18.1"
- },
- "CommonCrypto": {
- "hash": "sha256-hqsLaS7LEPu8t/bNuV4VUUbMteCetf3/o8e2X0iQvOo=",
- "version": "60118.250.2"
- },
- "IOAudioFamily": {
- "hash": "sha256-UG09Dc+up5cJKDHPpCmo11IsBchqZ72hVBPx8y+1klw=",
- "version": "206.5"
- },
- "IOBDStorageFamily": {
- "hash": "sha256-aaS5jWPRX4be8d3Rigq+kXzi9Zwbr8dHcNgcIz0n66o=",
- "version": "19"
- },
- "IOCDStorageFamily": {
- "hash": "sha256-U6v+Gj+IumU8Aha5+uf3yOU0Z4KMuBh7aXnJqiZ/abY=",
- "version": "58"
- },
- "IODVDStorageFamily": {
- "hash": "sha256-JLp4xN0Rdb2VpuXtVTODYNqQthDEZk+g/lvHRwJHQB4=",
- "version": "42"
- },
- "IOFWDVComponents": {
- "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=",
- "version": "208"
- },
- "IOFireWireAVC": {
- "hash": "sha256-EXGpObJVC0b9X3xxEXJScDlM6xygmK3MoCbng21XCmg=",
- "version": "426"
- },
- "IOFireWireFamily": {
- "hash": "sha256-a8zEWhwQTzgGKg75RBmDXb1pgJr602IxnPBTFkKEqSM=",
- "version": "473"
- },
- "IOFireWireSBP2": {
- "hash": "sha256-lpYBTL9TzreyxJn4J3vfuXoWMH/4y8FnNKk5YiuDgHI=",
- "version": "433"
- },
- "IOFireWireSerialBusProtocolTransport": {
- "hash": "sha256-4Y+5+5cJtolSrM3AUnnhSBS3RrKXbg9Kh1ynmllOA2E=",
- "version": "252.250.2"
- },
- "IOGraphics": {
- "hash": "sha256-QFT+h0gtc7SUf0HNciknG0aMOQXnsWCR25C04dgK1/A=",
- "version": "530.66"
- },
- "IOHIDFamily": {
- "hash": "sha256-DpYcxGLvk10iz5TG2SO8R+5obEJv+zLK56RzA/pH0KA=",
- "version": "1090.270.6"
- },
- "IOKitUser": {
- "hash": "sha256-QH2m6BCYtO2JDksH0TebrEldjjZdC4U9otVu/uUoyWY=",
- "version": "1483.260.4"
- },
- "IONetworkingFamily": {
- "hash": "sha256-M01+Bhf7CTJMA7StjSRFW6ffq7Qf/IOh7aM+JI3ONe8=",
- "version": "129.200.1"
- },
- "IOSerialFamily": {
- "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=",
- "version": "93"
- },
- "IOStorageFamily": {
- "hash": "sha256-X6s/IyApMQ7zo1wO7IpIk1e94tSsmvvT+fZHThMWv5Y=",
- "version": "218.260.1"
- },
- "IOUSBFamily": {
- "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=",
- "version": "630.4.5"
- },
- "Libc": {
- "hash": "sha256-mhhs8U/oZku9o2kqzLW4K8Xv9QbnKNBbBr+Q6NqC1vQ=",
- "version": "1272.250.1"
- },
- "Libinfo": {
- "hash": "sha256-DUbyWZI+n3WvftlI7aj60CoEHb9y18H1+FYiYQroVEE=",
- "version": "517.200.9"
- },
- "Libm": {
- "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=",
- "version": "2026"
- },
- "Libnotify": {
- "hash": "sha256-q0ns85I9Zwo5bZPN5JqjrJofY8/XLl+mbsRhyF1kx+o=",
- "version": "172.200.21"
- },
- "Librpcsvc": {
- "hash": "sha256-8e8E9TkRTAep3/miyqhF/mSkNdlym12W+AVhXF94+Bg=",
- "version": "26"
- },
- "Libsystem": {
- "hash": "sha256-Lo4S7fsepuYlRtXGcVvNTAlx/soabjvKEUuiO09htNs=",
- "version": "1252.250.1"
- },
- "OpenDirectory": {
- "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=",
- "version": "146"
- },
- "Security": {
- "hash": "sha256-uqSRU4Ft7+zMQ59FBS+Mu2JcWdbbuWP9/dFfo+Vkr5s=",
- "version": "58286.270.3.0.1"
- },
- "architecture": {
- "hash": "sha256-WGUNtFSBu9AuefHVEO3uB/JpKEGAgGFX/zRaaW4eYbI=",
- "version": "272.230.1"
- },
- "configd": {
- "hash": "sha256-Pg58INpZfdKXn1EPut2Kzghfjwxaz1Ex+u5KACA2O7g=",
- "version": "963.270.3"
- },
- "copyfile": {
- "hash": "sha256-gbxGQ8Wjt20++Bf+BkZT/R5dpsCnRo8+qUcerv5m7V8=",
- "version": "146.250.1"
- },
- "dtrace": {
- "hash": "sha256-ZbAaH2wmYlgLKtq0bpDoEInZiHMe5Bx84iUQC67ia0E=",
- "version": "284.250.4"
- },
- "dyld": {
- "hash": "sha256-5wtx+4pSAcNEwcE024XwIRorS3ZW/qmvfkY7UGe75ho=",
- "version": "655.1.1"
- },
- "eap8021x": {
- "hash": "sha256-9j+6Hw7w9wdLZxjdRwTACws2obg2/VCgl9ed4+Y4pPg=",
- "version": "264.250.6"
- },
- "hfs": {
- "hash": "sha256-/yf6z0VJkw2pPnVst2qgnSZfO6x9ot/cWT7Aewo3IZ4=",
- "version": "407.200.4"
- },
- "launchd": {
- "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=",
- "version": "842.1.4"
- },
- "libclosure": {
- "hash": "sha256-NHK+yc7M/wc6Sbk24LDejNjBrbcWIg9zrYHlnPXC/Yc=",
- "version": "73"
- },
- "libdispatch": {
- "hash": "sha256-b0WqX3qX/qhUi2l63BrNvaVq167SuIgYGPid92MJ32U=",
- "version": "1008.270.1"
- },
- "libmalloc": {
- "hash": "sha256-1ZvO0LGV4AkDSdtwqfPFgCUbpAVzfKS0msa58tL2WLA=",
- "version": "166.251.2"
- },
- "libplatform": {
- "hash": "sha256-xQqCf+/DpHu/JMbmOpy6jl3np0H7/m1NKWZ21YWaerE=",
- "version": "177.270.1"
- },
- "libpthread": {
- "hash": "sha256-+AuYgLTM5RO3+MbxeE86rPh9WbiTiAl2gHZOAaQRkec=",
- "version": "330.250.2"
- },
- "mDNSResponder": {
- "hash": "sha256-SlrC3LIOndY1DVJ26bnuYQwpLhkV1PHAMJeaE3bMDI4=",
- "version": "878.270.2"
- },
- "objc4": {
- "hash": "sha256-rzDiOE//rUnRyCHM/XUQs9IImKGIFN/0D0IZ7SeGp2s=",
- "version": "756.2"
- },
- "ppp": {
- "hash": "sha256-a0zTwevtC+AAyLV/0+rX9VN5BXc2vaZGArz83VZtiWs=",
- "version": "847.200.5"
- },
- "removefile": {
- "hash": "sha256-23+ivRTPKId9Is5NAwYmVgN7TX2+7v9NONs9u7DrGH4=",
- "version": "45.200.2"
- },
- "xnu": {
- "hash": "sha256-ZRgj214Mmvvcji4OdzRjK/7Xtpz7r69SFmzSvtZNhNU=",
- "version": "4903.270.47"
- }
- },
- "10.15.6": {
- "CarbonHeaders": {
- "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=",
- "version": "18.1"
- },
- "CommonCrypto": {
- "hash": "sha256-HKSRtTnJ6dH5j6Y+PRDQUcPyjwR70PEbRQu3hTM4G0A=",
- "version": "60165.120.1"
- },
- "IOAudioFamily": {
- "hash": "sha256-5lcK8nyjayLBw9j4PPVs8TWwOWcpggKkSXefVGl2rfA=",
- "version": "300.2"
- },
- "IOBDStorageFamily": {
- "hash": "sha256-aaS5jWPRX4be8d3Rigq+kXzi9Zwbr8dHcNgcIz0n66o=",
- "version": "19"
- },
- "IOCDStorageFamily": {
- "hash": "sha256-U6v+Gj+IumU8Aha5+uf3yOU0Z4KMuBh7aXnJqiZ/abY=",
- "version": "58"
- },
- "IODVDStorageFamily": {
- "hash": "sha256-JLp4xN0Rdb2VpuXtVTODYNqQthDEZk+g/lvHRwJHQB4=",
- "version": "42"
- },
- "IOFWDVComponents": {
- "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=",
- "version": "208"
- },
- "IOFireWireAVC": {
- "hash": "sha256-7H3WcZC/HuS9xsTNDWRqt+1JzUNK4ndvd4u2ru0GGRE=",
- "version": "428"
- },
- "IOFireWireFamily": {
- "hash": "sha256-hLtd3d5qOsYdnGpMaTSipu9bOIYEHz2rKzNAoJai4dI=",
- "version": "475"
- },
- "IOFireWireSBP2": {
- "hash": "sha256-pHY6okHHotfFjdNsLwRjQX7dWGolBelpD7MEDz4lafY=",
- "version": "434"
- },
- "IOFireWireSerialBusProtocolTransport": {
- "hash": "sha256-Jb70fanuJTNV4IVoKMtMA66oVDR0I/h3JSIymhlKTQU=",
- "version": "257"
- },
- "IOGraphics": {
- "hash": "sha256-sKnJ0MOhT+dFfmMD2gqYmySufh0I9vBI/swjqoCbSHc=",
- "version": "576.1"
- },
- "IOHIDFamily": {
- "hash": "sha256-esiEGEiggFMR7rha6+dYaqiwGM+TlZtLBe8LF/PF0D8=",
- "version": "1446.140.2"
- },
- "IOKitUser": {
- "hash": "sha256-rB5zfJwoBPMpqW5PDM6ppWW07Y2AGS3f0UzXdfPGYYE=",
- "version": "1726.140.1"
- },
- "IONetworkingFamily": {
- "hash": "sha256-T+aDA++nubTHdPpfdAEm6077eJuzsQXHUDEbdlthVBQ=",
- "version": "139.140.2"
- },
- "IOSerialFamily": {
- "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=",
- "version": "93"
- },
- "IOStorageFamily": {
- "hash": "sha256-vyIN7oru2PN7C4a6RBJomlYs4NaYzmCTBEuWiSXG41M=",
- "version": "238.120.1"
- },
- "IOUSBFamily": {
- "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=",
- "version": "630.4.5"
- },
- "Libc": {
- "hash": "sha256-FAifkHs2Kls2ym9/M56o4u2UZfdTKCnqxRbTXOIHyz8=",
- "version": "1353.100.2"
- },
- "Libinfo": {
- "hash": "sha256-syTH8dhWkSPgqRG7p528L7Xx1+ymmqHrCyhUykGhK9s=",
- "version": "538"
- },
- "Libm": {
- "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=",
- "version": "2026"
- },
- "Libnotify": {
- "hash": "sha256-7o4GNZde3MkCks2NJdNIXvvtMAOqGEA05M7S8o7j0XQ=",
- "version": "241.100.2"
- },
- "Librpcsvc": {
- "hash": "sha256-8e8E9TkRTAep3/miyqhF/mSkNdlym12W+AVhXF94+Bg=",
- "version": "26"
- },
- "Libsystem": {
- "hash": "sha256-RNkaoaRl6akbrgjagLd+ncZ2EAdjegIdy7Z/MINoTpc=",
- "version": "1281.100.1"
- },
- "OpenDirectory": {
- "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=",
- "version": "146"
- },
- "Security": {
- "hash": "sha256-dlNTEVkgTl3po7ty2wjatGTANBwegpZxBX1ByneqKRU=",
- "version": "59306.140.5"
- },
- "architecture": {
- "hash": "sha256-pIX9pEXE1Xjll9qwiWrMRwqw6G4g0isto/ALHsmkUSc=",
- "version": "279"
- },
- "configd": {
- "hash": "sha256-nKFDfyH1gQtFyda6HBq3E7Tp5EI4O5n/9GYQEFhMIdE=",
- "version": "1061.141.1"
- },
- "copyfile": {
- "hash": "sha256-nEfD/KUk7e32tw9buQYrsy/BAdAfgE9IObdV4nCm37M=",
- "version": "166.40.1"
- },
- "dtrace": {
- "hash": "sha256-dgJ7om5efUQyc9tP6cBeSpahORqV5bzEDcxcVu4TaDg=",
- "version": "338.100.1"
- },
- "dyld": {
- "hash": "sha256-YkFazM/cviJMwPVXHXP2irfgHtOueI2RNrMedWvkH0A=",
- "version": "750.6"
- },
- "eap8021x": {
- "hash": "sha256-/FsmD4mk/kwsocK8x8Gsk3yOBW3pZLcGHxnNcogqjhY=",
- "version": "292.40.2"
- },
- "hfs": {
- "hash": "sha256-vNo2Wd0n6tjG+xtA3OrwB/TOXvLxaLehEY/l9ZBS5Sw=",
- "version": "522.100.5"
- },
- "launchd": {
- "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=",
- "version": "842.1.4"
- },
- "libclosure": {
- "hash": "sha256-A3QTD6bqUy8ahH/XlMuidYNvT92ufeVpwPsZh4ZzQdk=",
- "version": "74"
- },
- "libdispatch": {
- "hash": "sha256-gd56s0C2dKbZoaGNXt3LBfXaEl5A744djFq3G9uoWws=",
- "version": "1173.100.2"
- },
- "libmalloc": {
- "hash": "sha256-1VhkXY8m6vVQ4aaxICtHVQtXDHNV2CsY9UUst0AioMY=",
- "version": "283.100.6"
- },
- "libplatform": {
- "hash": "sha256-Z4Lj9efT1bt6HMAMQvgMc33QdYzrBvieBjmw4W6H9YI=",
- "version": "220.100.1"
- },
- "libpthread": {
- "hash": "sha256-ZHxqq1qVRXPL0psAX+5bcuA5D/FjJnIcm+ctTkTGBJA=",
- "version": "416.100.3"
- },
- "mDNSResponder": {
- "hash": "sha256-CV3GBeO4Ly8/PbZ7Fq55diRzB00VsB2uTvjGo/tqf10=",
- "version": "1096.100.3"
- },
- "objc4": {
- "hash": "sha256-AJwPTnjJMBbSFDppvKyx92RdfmbmwQOvPnU0E0mU+jU=",
- "version": "787.1"
- },
- "ppp": {
- "hash": "sha256-DNmDigQqDKR1ghcn6GaKeDldp6thH2C6+uZKjC3EfkU=",
- "version": "862.140.2"
- },
- "removefile": {
- "hash": "sha256-bkxiq7OEFtEFPwSBi4OxmpRyKWYgeMhnokFfS7RPUnU=",
- "version": "48"
- },
- "xnu": {
- "hash": "sha256-Y/DTtpnT8JQZO5Ijr+tW0IrIOuECcJ+ZvFLCgwrFt2M=",
- "version": "6153.141.1"
- }
- },
"11.3": {
"CarbonHeaders": {
"hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=",
diff --git a/pkgs/by-name/ap/apple-sdk/metadata/versions.json b/pkgs/by-name/ap/apple-sdk/metadata/versions.json
index 608990bddd46..5a444c2c4eaa 100644
--- a/pkgs/by-name/ap/apple-sdk/metadata/versions.json
+++ b/pkgs/by-name/ap/apple-sdk/metadata/versions.json
@@ -1,24 +1,4 @@
{
- "10.12": {
- "url": "http://swcdn.apple.com/content/downloads/22/62/041-88607/wg8avdk0jo75k9a13gentz9stwqgrqmcv6/CLTools_SDK_OSX1012.pkg",
- "version": "10.12.2",
- "hash": "sha256-Jf2WIB9bY/rPwe0AOW3YWJY/6EqVe41yhezdTGOO3M8="
- },
- "10.13": {
- "url": "http://swcdn.apple.com/content/downloads/33/36/041-90419-A_7JJ4H9ZHO2/xs88ob5wjz6riz7g6764twblnvksusg4ps/CLTools_SDK_macOS1013.pkg",
- "version": "10.13.2",
- "hash": "sha256-8nd55fiJLfRWABAbMaHXjp6i20RqupmKedwmhb3S0/A="
- },
- "10.14": {
- "url": "http://swcdn.apple.com/content/downloads/41/57/061-26573-A_JMOA8GZGDR/lj8yrtu8dgs40fw9k8f5fkoviwkp0og6vs/CLTools_SDK_macOS1014.pkg",
- "version": "10.14.6",
- "hash": "sha256-NMNkycIl3AVZCw0ZpHNkaeYVS9LAZVSddHw5loL9dhk="
- },
- "10.15": {
- "url": "https://swcdn.apple.com/content/downloads/50/51/071-29699-A_YC8SX0OHH3/7479xojqghsvgtnt3dxjpnxuz9sjpmbmds/CLTools_macOSLMOS_SDK.pkg",
- "version": "10.15.6",
- "hash": "sha256-mPJQC+v4yNiOCKLQfhidB2WH2MMclSCP1odvOoGdVPw="
- },
"11": {
"url": "https://swcdn.apple.com/content/downloads/02/62/071-54303-A_EU2CL1YVT7/943i95dpeyi2ghlnj2mgyq3t202t5gf18b/CLTools_macOSNMOS_SDK.pkg",
"version": "11.3",
diff --git a/pkgs/by-name/ap/apple-sdk/package.nix b/pkgs/by-name/ap/apple-sdk/package.nix
index 31017a6a9ae5..779ed45260ec 100644
--- a/pkgs/by-name/ap/apple-sdk/package.nix
+++ b/pkgs/by-name/ap/apple-sdk/package.nix
@@ -9,12 +9,8 @@ in
substitute,
# Specifies the major version used for the SDK. Uses `hostPlatform.darwinSdkVersion` by default.
- darwinSdkMajorVersion ? (
- if lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11" then
- lib.versions.majorMinor stdenv.hostPlatform.darwinSdkVersion
- else
- lib.versions.major stdenv.hostPlatform.darwinSdkVersion
- ),
+ darwinSdkMajorVersion ? lib.versions.major stdenv.hostPlatform.darwinSdkVersion,
+
# Enabling bootstrap disables propagation. Defaults to `false` (meaning to propagate certain packages and `xcrun`)
# except in stage0 of the Darwin stdenv bootstrap.
enableBootstrap ? stdenv.name == "bootstrap-stage0-stdenv-darwin",
@@ -48,11 +44,6 @@ let
(callPackage ./common/propagate-inputs.nix { })
(callPackage ./common/propagate-xcrun.nix { })
]
- # Older SDKs do not include the libraries re-exported from umbrella frameworks in the umbrellas’ stubs, which causes
- # link failures for those libraries unless their paths have been rewritten to point to the store.
- ++ lib.optionals (lib.versionOlder sdkVersion "11.0") [
- (callPackage ./common/rewrite-sdk-paths.nix { inherit sdkVersion; })
- ]
# This has to happen last.
++ [
(callPackage ./common/run-build-phase-hooks.nix { })
@@ -97,9 +88,7 @@ stdenvNoCC.mkDerivation (
mkdir -p "$sdkpath"
cp -rd . "$sdkpath/${sdkName}"
- ${lib.optionalString (lib.versionAtLeast finalAttrs.version "11.0") ''
- ln -s "${sdkName}" "$sdkpath/MacOSX${sdkMajor}.sdk"
- ''}
+ ln -s "${sdkName}" "$sdkpath/MacOSX${sdkMajor}.sdk"
ln -s "${sdkName}" "$sdkpath/MacOSX.sdk"
runHook postInstall
@@ -116,9 +105,7 @@ stdenvNoCC.mkDerivation (
homepage = "https://developer.apple.com";
maintainers = lib.teams.darwin.members;
platforms = lib.platforms.darwin;
- badPlatforms =
- lib.optionals (lib.versionAtLeast sdkVersion "10.15") [ lib.systems.inspect.patterns.is32bit ]
- ++ lib.optionals (lib.versionOlder sdkVersion "11.0") [ lib.systems.inspect.patterns.isAarch ];
+ badPlatforms = [ lib.systems.inspect.patterns.is32bit ];
};
})
)
diff --git a/pkgs/by-name/ar/arangodb/package.nix b/pkgs/by-name/ar/arangodb/package.nix
index 5b965796de64..7af161c0a288 100644
--- a/pkgs/by-name/ar/arangodb/package.nix
+++ b/pkgs/by-name/ar/arangodb/package.nix
@@ -51,7 +51,7 @@ gcc10Stdenv.mkDerivation rec {
env.NIX_CFLAGS_COMPILE = "-Wno-error";
postPatch = ''
- sed -ie 's!/bin/echo!echo!' 3rdParty/V8/gypfiles/*.gypi
+ sed -i -e 's!/bin/echo!echo!' 3rdParty/V8/gypfiles/*.gypi
# with nixpkgs, it has no sense to check for a version update
substituteInPlace js/client/client.js --replace "require('@arangodb').checkAvailableVersions();" ""
diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix
index 4a1ecf3ce17a..f68c340e7c2c 100644
--- a/pkgs/by-name/au/audit/package.nix
+++ b/pkgs/by-name/au/audit/package.nix
@@ -1,50 +1,51 @@
-{ lib
-, stdenv
-, fetchurl
-, fetchpatch
-, autoreconfHook
-, bash
-, buildPackages
-, linuxHeaders
-, python3
-, swig
-, pkgsCross
+{
+ lib,
+ stdenv,
+ fetchurl,
+ fetchpatch,
+ autoreconfHook,
+ bash,
+ buildPackages,
+ linuxHeaders,
+ python3,
+ swig,
+ pkgsCross,
-# Enabling python support while cross compiling would be possible, but the
-# configure script tries executing python to gather info instead of relying on
-# python3-config exclusively
-, enablePython ? stdenv.hostPlatform == stdenv.buildPlatform,
+ # Enabling python support while cross compiling would be possible, but the
+ # configure script tries executing python to gather info instead of relying on
+ # python3-config exclusively
+ enablePython ? stdenv.hostPlatform == stdenv.buildPlatform,
}:
-
stdenv.mkDerivation (finalAttrs: {
pname = "audit";
- version = "4.0";
+ version = "4.0.2";
src = fetchurl {
url = "https://people.redhat.com/sgrubb/audit/audit-${finalAttrs.version}.tar.gz";
- hash = "sha256-v0ItQSard6kqTDrDneVHPyeNw941ck0lGKSMe+FdVNg=";
+ hash = "sha256-1dG11Q7kotDReHW8aua9an1bNNlVfqhHo5+uxTH6qgo=";
};
patches = [
(fetchpatch {
- name = "musl.patch";
- url = "https://github.com/linux-audit/audit-userspace/commit/64cb48e1e5137b8a389c7528e611617a98389bc7.patch";
- hash = "sha256-DN2F5w+2Llm80FZntH9dvdyT00pVBSgRu8DDFILyrlU=";
- })
- (fetchpatch {
- name = "musl.patch";
- url = "https://github.com/linux-audit/audit-userspace/commit/4192eb960388458c85d76e5e385cfeef48f02c79.patch";
- hash = "sha256-G6CJ9nBJSsTyJ0qq14PVo+YdInAvLLQtXcR25Q8V5/4=";
+ name = "static.patch";
+ url = "https://github.com/linux-audit/audit-userspace/commit/a89664b45c30a853a6f80b19730984bd78432142.patch";
+ hash = "sha256-HsaL9Bfo1MQ1JBKIS9ckNTapGk5eshjWWKh4M+e+Y9c=";
})
];
postPatch = ''
substituteInPlace bindings/swig/src/auditswig.i \
- --replace "/usr/include/linux/audit.h" \
- "${linuxHeaders}/include/linux/audit.h"
+ --replace-fail "/usr/include/linux/audit.h" \
+ "${linuxHeaders}/include/linux/audit.h"
'';
- outputs = [ "bin" "dev" "out" "man" ];
+ outputs = [
+ "bin"
+ "lib"
+ "dev"
+ "out"
+ "man"
+ ];
strictDeps = true;
@@ -52,13 +53,14 @@ stdenv.mkDerivation (finalAttrs: {
buildPackages.stdenv.cc
];
- nativeBuildInputs = [
- autoreconfHook
- ]
- ++ lib.optionals enablePython [
- python3
- swig
- ];
+ nativeBuildInputs =
+ [
+ autoreconfHook
+ ]
+ ++ lib.optionals enablePython [
+ python3
+ swig
+ ];
buildInputs = [
bash
diff --git a/pkgs/by-name/au/autopanosiftc/package.nix b/pkgs/by-name/au/autopanosiftc/package.nix
index 20874dd55e76..0391461be567 100644
--- a/pkgs/by-name/au/autopanosiftc/package.nix
+++ b/pkgs/by-name/au/autopanosiftc/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
patches = [
(fetchurl {
- url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch";
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch?id=dec60bb6900d6ebdaaa6aa1dcb845b30b739f9b5";
sha256 = "1bfcr5sps0ip9gl4jprji5jgf9wkczz6d2clsjjlbsy8r3ixi3lv";
})
];
diff --git a/pkgs/by-name/aw/aws-c-auth/package.nix b/pkgs/by-name/aw/aws-c-auth/package.nix
index 70aa863a7ce2..3fd269cb45c0 100644
--- a/pkgs/by-name/aw/aws-c-auth/package.nix
+++ b/pkgs/by-name/aw/aws-c-auth/package.nix
@@ -14,13 +14,14 @@
stdenv.mkDerivation rec {
pname = "aws-c-auth";
- version = "0.7.26";
+ # nixpkgs-update: no auto update
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-auth";
rev = "v${version}";
- hash = "sha256-02dy2xgMGWkLf+HyBztbkCcazfZNAMwpJPU2gGBPokY=";
+ hash = "sha256-wVHTfiAejAra8LnytxSJijUXHDmEwAj5D+wXOKq32B4=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/aw/aws-c-common/package.nix b/pkgs/by-name/aw/aws-c-common/package.nix
index 8166497efa50..c6210a1ea5a9 100644
--- a/pkgs/by-name/aw/aws-c-common/package.nix
+++ b/pkgs/by-name/aw/aws-c-common/package.nix
@@ -7,13 +7,14 @@
stdenv.mkDerivation rec {
pname = "aws-c-common";
- version = "0.9.27";
+ # nixpkgs-update: no auto update
+ version = "0.10.3";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
- hash = "sha256-VbF+R2LB5M2luOoQ/HsAOqk/ujHSW4QJC0OTzNnu9PM=";
+ hash = "sha256-sA6CsLLHh4Ce/+ffl4OhisMSgdrD+EmXvTNGSq7/vvk=";
};
nativeBuildInputs = [ cmake ];
@@ -32,8 +33,6 @@ stdenv.mkDerivation rec {
preCheck = let
ignoreTests = [
"promise_test_multiple_waiters"
- ] ++ lib.optionals stdenv.hostPlatform.isMusl [
- "sba_metrics" # https://github.com/awslabs/aws-c-common/issues/839
];
in ''
cat <CTestCustom.cmake
diff --git a/pkgs/by-name/aw/aws-c-compression/package.nix b/pkgs/by-name/aw/aws-c-compression/package.nix
index cb115f531f50..a63c41e26bda 100644
--- a/pkgs/by-name/aw/aws-c-compression/package.nix
+++ b/pkgs/by-name/aw/aws-c-compression/package.nix
@@ -7,13 +7,14 @@
stdenv.mkDerivation rec {
pname = "aws-c-compression";
- version = "0.2.19";
+ # nixpkgs-update: no auto update
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-compression";
rev = "v${version}";
- sha256 = "sha256-Zr1C47YaTkMlG7r2WtAkxRfjZRuBKeTXzNIGspdLap4=";
+ sha256 = "sha256-EjvOf2UMju6pycPdYckVxqQ34VOhrIIyvK+O3AVRED4=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/aw/aws-c-event-stream/package.nix b/pkgs/by-name/aw/aws-c-event-stream/package.nix
index 9b568b372141..2296f36efbeb 100644
--- a/pkgs/by-name/aw/aws-c-event-stream/package.nix
+++ b/pkgs/by-name/aw/aws-c-event-stream/package.nix
@@ -2,13 +2,14 @@
stdenv.mkDerivation rec {
pname = "aws-c-event-stream";
- version = "0.4.3";
+ # nixpkgs-update: no auto update
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
- hash = "sha256-xLgPFy+wFtUe3GawICrAHyji+mkfxC2jw7lsL+p7pl4=";
+ hash = "sha256-lg1qS/u5Fi8nt/tv2ekd8dgQ7rlrF3DrRxqidAoEywY=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/aw/aws-c-http/package.nix b/pkgs/by-name/aw/aws-c-http/package.nix
index ac35fd5d57b0..f02e2660cf40 100644
--- a/pkgs/by-name/aw/aws-c-http/package.nix
+++ b/pkgs/by-name/aw/aws-c-http/package.nix
@@ -11,13 +11,14 @@
stdenv.mkDerivation rec {
pname = "aws-c-http";
- version = "0.8.2";
+ # nixpkgs-update: no auto update
+ version = "0.9.2";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-http";
rev = "v${version}";
- hash = "sha256-86auAZGoaYIpoTVlB9uC+nKMNt1QRNor+/68B5D36r8=";
+ hash = "sha256-3nT64dFUcuwPfhQDwY5MTe/xPdr7XZMBpVL7V0y9tng=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/aw/aws-c-mqtt/package.nix b/pkgs/by-name/aw/aws-c-mqtt/package.nix
index 3eadad12ad03..cf1c5757b5e5 100644
--- a/pkgs/by-name/aw/aws-c-mqtt/package.nix
+++ b/pkgs/by-name/aw/aws-c-mqtt/package.nix
@@ -13,13 +13,14 @@
stdenv.mkDerivation rec {
pname = "aws-c-mqtt";
- version = "0.10.5";
+ # nixpkgs-update: no auto update
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-mqtt";
rev = "v${version}";
- hash = "sha256-PByF0P+4gwSQKk7qHc79p025TbWZ0QeFXqO2GOtuaII=";
+ hash = "sha256-gIoC3OG6VFzNH9/DjuC42eCIuN+w1AikaGAbx6ao8qQ=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/aw/aws-c-s3/package.nix b/pkgs/by-name/aw/aws-c-s3/package.nix
index 5c834da72cc4..07ca2d4a5051 100644
--- a/pkgs/by-name/aw/aws-c-s3/package.nix
+++ b/pkgs/by-name/aw/aws-c-s3/package.nix
@@ -14,13 +14,14 @@
stdenv.mkDerivation rec {
pname = "aws-c-s3";
- version = "0.6.0";
+ # nixpkgs-update: no auto update
+ version = "0.7.1";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-s3";
rev = "v${version}";
- hash = "sha256-qPVITirqhExIeayh6AWEyAXPlkUtk7gkIcmT/IpNisw=";
+ hash = "sha256-UE42U3UszobaUdo0ry9IlwTbSbGqmYkux19ILrVgUZY=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/aw/aws-c-sdkutils/package.nix b/pkgs/by-name/aw/aws-c-sdkutils/package.nix
index dc5dc02f6242..e7efa2e6a46b 100644
--- a/pkgs/by-name/aw/aws-c-sdkutils/package.nix
+++ b/pkgs/by-name/aw/aws-c-sdkutils/package.nix
@@ -7,13 +7,14 @@
stdenv.mkDerivation rec {
pname = "aws-c-sdkutils";
- version = "0.1.16";
+ # nixpkgs-update: no auto update
+ version = "0.2.1";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-sdkutils";
rev = "v${version}";
- hash = "sha256-ih7U2uP5FrBx6or1Rp/k+HWDE6evEZyNM//wsPxH9Qo=";
+ hash = "sha256-Z9c+uBiGMXW5v+khdNaElhno16ikBO4voTzwd2mP6rA=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/aw/aws-checksums/package.nix b/pkgs/by-name/aw/aws-checksums/package.nix
index f0a9a0cf665f..5a3df8c832fc 100644
--- a/pkgs/by-name/aw/aws-checksums/package.nix
+++ b/pkgs/by-name/aw/aws-checksums/package.nix
@@ -2,13 +2,14 @@
stdenv.mkDerivation rec {
pname = "aws-checksums";
- version = "0.1.18";
+ # nixpkgs-update: no auto update
+ version = "0.2.2";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-EhIVa8/IK4evGt4vYECunLpxrCMSOsr1RZ/8hFbRi9M=";
+ sha256 = "sha256-hiqV6FrOZ19YIxL3UKBuexLJwoC2mY7lqysnV7ze0gg=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/aw/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch b/pkgs/by-name/aw/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch
index 2b06ce0aec63..34f2434dbf9d 100644
--- a/pkgs/by-name/aw/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch
+++ b/pkgs/by-name/aw/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch
@@ -1,15 +1,17 @@
-From fd3f3a28e7fce7fe4e10ed2d7edc4bfda8ab27df Mon Sep 17 00:00:00 2001
+From b3a46b9a2a9f86ff416a0ff5f84882c0dedebd14 Mon Sep 17 00:00:00 2001
From: Jan Tojnar
Date: Sun, 9 Jan 2022 01:57:18 +0100
Subject: [PATCH] build: Make includedir properly overrideable
This is required by some package managers like Nix.
+
+Co-authored-by: Artturin
---
- CMakeLists.txt | 22 +++++++++++++---------
- 1 file changed, 13 insertions(+), 9 deletions(-)
+ CMakeLists.txt | 26 +++++++++++++++-----------
+ 1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ec6d172..6514c23 100644
+index 9f062ca..b28f13c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,6 +49,10 @@ if(${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
@@ -23,7 +25,7 @@ index ec6d172..6514c23 100644
if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 11)
endif()
-@@ -307,7 +311,7 @@ endif()
+@@ -329,7 +333,7 @@ endif()
target_include_directories(${PROJECT_NAME} PUBLIC
$
$
@@ -32,28 +34,32 @@ index ec6d172..6514c23 100644
aws_use_package(aws-c-http)
aws_use_package(aws-c-mqtt)
-@@ -324,14 +328,14 @@ aws_add_sanitizers(${PROJECT_NAME})
+@@ -346,16 +350,16 @@ aws_add_sanitizers(${PROJECT_NAME})
target_link_libraries(${PROJECT_NAME} PUBLIC ${DEP_AWS_LIBS})
-install(FILES ${AWS_CRT_HEADERS} DESTINATION "include/aws/crt" COMPONENT Development)
-install(FILES ${AWS_CRT_AUTH_HEADERS} DESTINATION "include/aws/crt/auth" COMPONENT Development)
+-install(FILES ${AWS_CRT_CHECKSUM_HEADERS} DESTINATION "include/aws/crt/checksum" COMPONENT Development)
-install(FILES ${AWS_CRT_CRYPTO_HEADERS} DESTINATION "include/aws/crt/crypto" COMPONENT Development)
-install(FILES ${AWS_CRT_IO_HEADERS} DESTINATION "include/aws/crt/io" COMPONENT Development)
-install(FILES ${AWS_CRT_IOT_HEADERS} DESTINATION "include/aws/iot" COMPONENT Development)
-install(FILES ${AWS_CRT_MQTT_HEADERS} DESTINATION "include/aws/crt/mqtt" COMPONENT Development)
-install(FILES ${AWS_CRT_HTTP_HEADERS} DESTINATION "include/aws/crt/http" COMPONENT Development)
-install(FILES ${AWS_CRT_ENDPOINT_HEADERS} DESTINATION "include/aws/crt/endpoints" COMPONENT Development)
+-install(FILES ${AWS_CRT_CBOR_HEADERS} DESTINATION "include/aws/crt/cbor" COMPONENT Development)
+install(FILES ${AWS_CRT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt" COMPONENT Development)
+install(FILES ${AWS_CRT_AUTH_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/auth" COMPONENT Development)
++install(FILES ${AWS_CRT_CHECKSUM_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/checksum" COMPONENT Development)
+install(FILES ${AWS_CRT_CRYPTO_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/crypto" COMPONENT Development)
+install(FILES ${AWS_CRT_IO_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/io" COMPONENT Development)
+install(FILES ${AWS_CRT_IOT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/iot" COMPONENT Development)
+install(FILES ${AWS_CRT_MQTT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/mqtt" COMPONENT Development)
+install(FILES ${AWS_CRT_HTTP_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/http" COMPONENT Development)
+install(FILES ${AWS_CRT_ENDPOINT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/endpoints" COMPONENT Development)
++install(FILES ${AWS_CRT_CBOR_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/cbor" COMPONENT Development)
install(
TARGETS ${PROJECT_NAME}
--
-2.42.0
+2.46.0
diff --git a/pkgs/by-name/aw/aws-crt-cpp/package.nix b/pkgs/by-name/aw/aws-crt-cpp/package.nix
index 534314443e4f..19c682e28216 100644
--- a/pkgs/by-name/aw/aws-crt-cpp/package.nix
+++ b/pkgs/by-name/aw/aws-crt-cpp/package.nix
@@ -17,7 +17,8 @@
stdenv.mkDerivation rec {
pname = "aws-crt-cpp";
- version = "0.26.12";
+ # nixpkgs-update: no auto update
+ version = "0.29.4";
outputs = [ "out" "dev" ];
@@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
owner = "awslabs";
repo = "aws-crt-cpp";
rev = "v${version}";
- sha256 = "sha256-mVihmcl24gFLnF3A/qLSvr2npOotMlBH7TqU5vOwI9g=";
+ sha256 = "sha256-Uv1BHM39f9soq7kziedqRhHqQ/xwnqcz++1UM5nuo8g=";
};
patches = [
diff --git a/pkgs/by-name/ba/bash-completion/package.nix b/pkgs/by-name/ba/bash-completion/package.nix
index 6408f0610ff6..0bd7356ea7d6 100644
--- a/pkgs/by-name/ba/bash-completion/package.nix
+++ b/pkgs/by-name/ba/bash-completion/package.nix
@@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
pname = "bash-completion";
- version = "2.14.0";
+ version = "2.15.0";
# Using fetchurl because fetchGithub or fetchzip will have trouble on
# e.g. APFS filesystems (macOS) because of non UTF-8 characters in some of the
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
# See discussion in https://github.com/NixOS/nixpkgs/issues/107768
src = fetchurl {
url = "https://github.com/scop/bash-completion/releases/download/${version}/bash-completion-${version}.tar.xz";
- sha256 = "sha256-XHSU+WgoCDLWrbWqGfdFpW8aed8xHlkzjF76b3KF4Wg=";
+ sha256 = "sha256-l2pi7mImlwKDzahey5x6Soj2JXTApvnoVhJpdt7PGgY=";
};
strictDeps = true;
diff --git a/pkgs/by-name/bc/bcftools/package.nix b/pkgs/by-name/bc/bcftools/package.nix
index 1e4483530238..c0ffa2c3fec2 100644
--- a/pkgs/by-name/bc/bcftools/package.nix
+++ b/pkgs/by-name/bc/bcftools/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
preCheck = ''
patchShebangs misc/
patchShebangs test/
- sed -ie 's|/bin/bash|${bash}/bin/bash|' test/test.pl
+ sed -i -e 's|/bin/bash|${bash}/bin/bash|' test/test.pl
'';
enableParallelBuilding = true;
diff --git a/pkgs/by-name/be/bear/package.nix b/pkgs/by-name/be/bear/package.nix
index 98e64fe535f5..d12fa91e31fe 100644
--- a/pkgs/by-name/be/bear/package.nix
+++ b/pkgs/by-name/be/bear/package.nix
@@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
# /usr/bin/env is used in test commands and embedded scripts.
find test -name '*.sh' \
- -exec sed -ie 's|/usr/bin/env|${coreutils}/bin/env|g' {} +
+ -exec sed -i -e 's|/usr/bin/env|${coreutils}/bin/env|g' {} +
'';
# Functional tests use loopback networking.
diff --git a/pkgs/by-name/bf/bfr/package.nix b/pkgs/by-name/bf/bfr/package.nix
index 6d67d4d20677..73f70edf8f7b 100644
--- a/pkgs/by-name/bf/bfr/package.nix
+++ b/pkgs/by-name/bf/bfr/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
patches =
[ (fetchurl {
- url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-misc/bfr/files/bfr-1.6-perl.patch";
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-misc/bfr/files/bfr-1.6-perl.patch?id=dec60bb6900d6ebdaaa6aa1dcb845b30b739f9b5";
sha256 = "1pk9jm3c1qzs727lh0bw61w3qbykaqg4jblywf9pvq5bypk88qfj";
})
];
diff --git a/pkgs/by-name/bi/bitmeter/package.nix b/pkgs/by-name/bi/bitmeter/package.nix
index 9ae4bd7e79fb..47210d5bbec5 100644
--- a/pkgs/by-name/bi/bitmeter/package.nix
+++ b/pkgs/by-name/bi/bitmeter/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
patches = [
(fetchurl {
- url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/bitmeter/files/bitmeter-1.2-fix-build-system.patch";
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/bitmeter/files/bitmeter-1.2-fix-build-system.patch?id=dec60bb6900d6ebdaaa6aa1dcb845b30b739f9b5";
sha256 = "021mz6933iw7mpk6b9cbjr8naj6smbq1hwqjszlyx72qbwrrid7k";
})
];
diff --git a/pkgs/by-name/bl/bluez/package.nix b/pkgs/by-name/bl/bluez/package.nix
index 4337cd90b519..bca591bb97e7 100644
--- a/pkgs/by-name/bl/bluez/package.nix
+++ b/pkgs/by-name/bl/bluez/package.nix
@@ -20,32 +20,25 @@
, gobject-introspection
, buildPackages
, installTests ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
+, gitUpdater
}:
stdenv.mkDerivation (finalAttrs: {
pname = "bluez";
- version = "5.78";
+ version = "5.79";
src = fetchurl {
url = "mirror://kernel/linux/bluetooth/bluez-${finalAttrs.version}.tar.xz";
- hash = "sha256-gw/tGRXF03W43g9eb0X83qDcxf9f+z0x227Q8A1zxeM=";
+ hash = "sha256-QWSlMDqfcccPSMA/9gvjQjG1aNk6mtXnmSjTTmqg6oo=";
};
patches = [
- # Upstream fix is wrong:
- # https://github.com/bluez/bluez/issues/843#issuecomment-2352696535
- (fetchurl {
- name = "basename.patch";
- url = "https://github.com/void-linux/void-packages/raw/187b45d47d93b6857a95cae10c2132d76e4955fc/srcpkgs/bluez/patches/basename.patch";
- hash = "sha256-Jb4u7rxIShDp1yUgaQVDJo2HJfZBzRoVlcDEWxooFgk=";
+ (fetchpatch {
+ name = "musl.patch";
+ url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=9d69dba21f1e46b34cdd8ae27fec11d0803907ee";
+ hash = "sha256-yMXPRPK8aT+luVoXNxx9zIa4c6E0BKYKS55DCfr8EQ0=";
})
- ] ++ lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64)
- # Disable one failing test with musl libc, also seen by alpine
- # https://github.com/bluez/bluez/issues/726
- (fetchurl {
- url = "https://git.alpinelinux.org/aports/plain/main/bluez/disable_aics_unit_testcases.patch?id=8e96f7faf01a45f0ad8449c1cd825db63a8dfd48";
- hash = "sha256-1PJkipqBO3qxxOqRFQKfpWlne1kzTCgtnTFYI1cFQt4=";
- });
+ ];
buildInputs = [
alsa-lib
@@ -168,6 +161,10 @@ stdenv.mkDerivation (finalAttrs: {
enableParallelBuilding = true;
+ passthru.updateScript = gitUpdater {
+ url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git";
+ };
+
meta = {
homepage = "https://www.bluez.org/";
description = "Official Linux Bluetooth protocol stack";
diff --git a/pkgs/by-name/ca/canon-cups-ufr2/package.nix b/pkgs/by-name/ca/canon-cups-ufr2/package.nix
index e39bcf05e427..6265f0c339ba 100644
--- a/pkgs/by-name/ca/canon-cups-ufr2/package.nix
+++ b/pkgs/by-name/ca/canon-cups-ufr2/package.nix
@@ -52,20 +52,20 @@ stdenv.mkDerivation rec {
(
cd $sourceRoot
tar -xf Sources/cnrdrvcups-lb-${version}-1.${suffix2}.tar.xz
- sed -ie "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-common-${version}/allgen.sh
- sed -ie "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-common-${version}/allgen.sh
- sed -ie "s@_bindir=/usr/bin@_bindir=$out/bin@" cnrdrvcups-common-${version}/allgen.sh
- sed -ie "s@/usr@$out@" cnrdrvcups-common-${version}/{{backend,rasterfilter}/Makefile.am,rasterfilter/cnrasterproc.h}
- sed -ie "s@etc/cngplp@$out/etc/cngplp@" cnrdrvcups-common-${version}/cngplp/Makefile.am
- sed -ie "s@usr/share/cngplp@$out/usr/share/cngplp@" cnrdrvcups-common-${version}/cngplp/src/Makefile.am
+ sed -i -e "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-common-${version}/allgen.sh
+ sed -i -e "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-common-${version}/allgen.sh
+ sed -i -e "s@_bindir=/usr/bin@_bindir=$out/bin@" cnrdrvcups-common-${version}/allgen.sh
+ sed -i -e "s@/usr@$out@" cnrdrvcups-common-${version}/{{backend,rasterfilter}/Makefile.am,rasterfilter/cnrasterproc.h}
+ sed -i -e "s@etc/cngplp@$out/etc/cngplp@" cnrdrvcups-common-${version}/cngplp/Makefile.am
+ sed -i -e "s@usr/share/cngplp@$out/usr/share/cngplp@" cnrdrvcups-common-${version}/cngplp/src/Makefile.am
patchShebangs cnrdrvcups-common-${version}
- sed -ie "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-lb-${version}/allgen.sh
- sed -ie "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-lb-${version}/allgen.sh
- sed -ie "s@_bindir=/usr/bin@_bindir=$out/bin@" cnrdrvcups-lb-${version}/allgen.sh
- sed -ie '/^cd \.\.\/cngplp/,/^cd files/{/^cd files/!{d}}' cnrdrvcups-lb-${version}/allgen.sh
- sed -ie "s@cd \.\./pdftocpca@cd pdftocpca@" cnrdrvcups-lb-${version}/allgen.sh
- sed -ie "s@/usr@$out@" cnrdrvcups-lb-${version}/pdftocpca/Makefile.am
+ sed -i -e "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-lb-${version}/allgen.sh
+ sed -i -e "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-lb-${version}/allgen.sh
+ sed -i -e "s@_bindir=/usr/bin@_bindir=$out/bin@" cnrdrvcups-lb-${version}/allgen.sh
+ sed -i -e '/^cd \.\.\/cngplp/,/^cd files/{/^cd files/!{d}}' cnrdrvcups-lb-${version}/allgen.sh
+ sed -i -e "s@cd \.\./pdftocpca@cd pdftocpca@" cnrdrvcups-lb-${version}/allgen.sh
+ sed -i -e "s@/usr@$out@" cnrdrvcups-lb-${version}/pdftocpca/Makefile.am
sed -i "/CNGPLPDIR/d" cnrdrvcups-lb-${version}/Makefile
patchShebangs cnrdrvcups-lb-${version}
)
diff --git a/pkgs/by-name/cb/cbmc/package.nix b/pkgs/by-name/cb/cbmc/package.nix
index fb360095c7bc..0b7200647536 100644
--- a/pkgs/by-name/cb/cbmc/package.nix
+++ b/pkgs/by-name/cb/cbmc/package.nix
@@ -11,13 +11,9 @@
makeWrapper,
perl,
substituteAll,
- substitute,
cudd,
fetchurl,
nix-update-script,
- apple-sdk,
- apple-sdk_10_15,
- darwinMinVersionHook,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -51,14 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
makeWrapper
];
- buildInputs =
- [ cadical ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [
- (darwinMinVersionHook "10.15")
- ]
- ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionOlder apple-sdk.version "10.15") [
- apple-sdk_10_15
- ];
+ buildInputs = [ cadical ];
# do not download sources
# link existing cadical instead
diff --git a/pkgs/by-name/cc/cctools/0003-Fix-utimensat-compatability-with-the-10.12-SDK.patch b/pkgs/by-name/cc/cctools/0003-Fix-utimensat-compatability-with-the-10.12-SDK.patch
deleted file mode 100644
index 4abe9ee863aa..000000000000
--- a/pkgs/by-name/cc/cctools/0003-Fix-utimensat-compatability-with-the-10.12-SDK.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 989ba5e30cefa0dd8990da158661713c4a21c0fe Mon Sep 17 00:00:00 2001
-From: Randy Eckenrode
-Date: Thu, 11 Apr 2024 18:05:34 -0400
-Subject: [PATCH 3/6] Fix utimensat compatability with the 10.12 SDK
-
----
- include/compat.h | 3 +++
- libstuff/writeout.c | 2 +-
- misc/lipo.c | 2 +-
- 3 files changed, 5 insertions(+), 2 deletions(-)
- create mode 100644 include/compat.h
-
-diff --git a/include/compat.h b/include/compat.h
-new file mode 100644
-index 0000000..8b1b866
---- /dev/null
-+++ b/include/compat.h
-@@ -0,0 +1,3 @@
-+#pragma once
-+#include
-+extern int utimensat(int dirfd, const char* pathname, const struct timespec times[_Nullable 2], int flags);
-diff --git a/libstuff/writeout.c b/libstuff/writeout.c
-index f904caa..03fa535 100644
---- a/libstuff/writeout.c
-+++ b/libstuff/writeout.c
-@@ -297,7 +297,7 @@ no_throttle:
- * have been zeroed out when the library was created. writeout
- * will not zero out the modification time in the filesystem.
- */
-- if (__builtin_available(macOS 10.12, *)) {
-+ if (__builtin_available(macOS 10.13, *)) {
- struct timespec times[2] = {0};
- memcpy(×[0], &toc_timespec, sizeof(struct timespec));
- memcpy(×[1], &toc_timespec, sizeof(struct timespec));
-diff --git a/misc/lipo.c b/misc/lipo.c
-index 04a3eca..887c049 100644
---- a/misc/lipo.c
-+++ b/misc/lipo.c
-@@ -607,7 +607,7 @@ unknown_flag:
- if(close(fd) == -1)
- system_fatal("can't close output file: %s",output_file);
- #ifndef __OPENSTEP__
-- if (__builtin_available(macOS 10.12, *)) {
-+ if (__builtin_available(macOS 10.13, *)) {
- time_result = utimensat(AT_FDCWD, output_file,
- output_times, 0);
- }
---
-2.45.2
-
diff --git a/pkgs/by-name/cc/cctools/meson.build b/pkgs/by-name/cc/cctools/meson.build
index c2261d98c958..bfb4f06285d7 100644
--- a/pkgs/by-name/cc/cctools/meson.build
+++ b/pkgs/by-name/cc/cctools/meson.build
@@ -28,26 +28,11 @@ target_prefix = get_option('target_prefix')
# Dependencies
cc = meson.get_compiler('c')
+libcxx = cc.find_library('c++')
libcodedirectory = cc.find_library('codedirectory')
libprunetrie = cc.find_library('prunetrie')
-# Feature tests
-# Add compatibility header for Darwin SDKs that don’t define `utimensat`.
-utimensat_test = '''
-#include
-#include
-int main(int argc, char* argv[]) {
- utimensat(AT_FDCWD, NULL, NULL, 0);
- return 0;
-}
-'''
-if host_machine.system() == 'darwin' and not cc.compiles(utimensat_test, name : 'supports utimensat')
- add_project_arguments('-include', 'compat.h', language : 'c')
- add_project_link_arguments('-undefined', 'dynamic_lookup', language : 'c')
-endif
-
-
incdirs = include_directories('include')
# Static libraries
@@ -454,6 +439,7 @@ install_man('man/nmedit.1')
otool = executable(
f'@target_prefix@otool',
c_args : ['-DEFI_SUPPORT'],
+ dependencies : [libcxx],
include_directories : incdirs,
install : true,
link_with : [libstuff],
@@ -553,7 +539,7 @@ install_man('man/strings.1')
strip = executable(
f'@target_prefix@strip',
c_args : ['-DTRIE_SUPPORT'],
- dependencies : [libcodedirectory, libprunetrie],
+ dependencies : [libcxx, libcodedirectory, libprunetrie],
include_directories : incdirs,
install : true,
link_with : [libstuff],
diff --git a/pkgs/by-name/cc/cctools/package.nix b/pkgs/by-name/cc/cctools/package.nix
index 0368a3c4a985..be2e3898cf75 100644
--- a/pkgs/by-name/cc/cctools/package.nix
+++ b/pkgs/by-name/cc/cctools/package.nix
@@ -5,7 +5,6 @@
buildPackages,
ld64,
llvm,
- memstreamHook,
meson,
ninja,
openssl,
@@ -73,9 +72,6 @@ stdenv.mkDerivation (finalAttrs: {
./0001-Fix-build-issues-with-misc-redo_prebinding.c.patch
# Use libcd_is_blob_a_linker_signature as defined in the libcodedirectory.h header
./0002-Rely-on-libcd_is_blob_a_linker_signature.patch
- # cctools uses availability checks for `utimensat`, but it checks the wrong version.
- # Also, provide a definition to avoid implicit function definition errors.
- ./0003-Fix-utimensat-compatability-with-the-10.12-SDK.patch
# Use the nixpkgs clang’s path as the prefix.
./0004-Use-nixpkgs-clang-with-the-assembler-driver.patch
# Make sure cctools can find ld64 in the store
@@ -102,9 +98,6 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace misc/libtool.c \
--subst-var-by targetPrefix '${targetPrefix}'
- # The version of this file distributed with cctools defines several CPU types missing from the 10.12 SDK.
- ln -s machine-cctools.h include/mach/machine.h
-
# Use libxar from nixpkgs
for cctool_src in misc/nm.c otool/print_bitcode.c; do
substituteInPlace $cctool_src \
@@ -130,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
ld64
llvm
- ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ memstreamHook ];
+ ];
mesonBuildType = "release";
diff --git a/pkgs/by-name/cd/cdrkit/cdrkit-1.1.11-fno-common.patch b/pkgs/by-name/cd/cdrkit/cdrkit-1.1.11-fno-common.patch
deleted file mode 100644
index c7db796cfcfc..000000000000
--- a/pkgs/by-name/cd/cdrkit/cdrkit-1.1.11-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/genisoimage/genisoimage.h
-+++ b/genisoimage/genisoimage.h
-@@ -377,7 +377,7 @@ extern int use_fileversion;
- extern int split_SL_component;
- extern int split_SL_field;
- extern char *trans_tbl;
--char *outfile;
-+extern char *outfile;
-
- #define JMAX 64 /* maximum Joliet file name length (spec) */
- #define JLONGMAX 103 /* out of spec Joliet file name length */
diff --git a/pkgs/by-name/cd/cdrkit/cdrkit-1.1.9-efi-boot.patch b/pkgs/by-name/cd/cdrkit/cdrkit-1.1.9-efi-boot.patch
deleted file mode 100644
index 45f910b03e66..000000000000
--- a/pkgs/by-name/cd/cdrkit/cdrkit-1.1.9-efi-boot.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-diff --git a/doc/icedax/tracknames.pl b/doc/icedax/tracknames.pl
-old mode 100755
-new mode 100644
-index 09f0fcf..801b89e
---- a/doc/icedax/tracknames.pl
-+++ b/doc/icedax/tracknames.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # A quick perl hack to get rename files pulled in with icedax.
- # by billo@billo.com
- #
-diff --git a/genisoimage/eltorito.c b/genisoimage/eltorito.c
-index b97bdf1..5d7c2d1 100644
---- a/genisoimage/eltorito.c
-+++ b/genisoimage/eltorito.c
-@@ -59,7 +59,7 @@ static void get_torito_desc(struct eltorito_boot_descriptor *boot_desc);
- static void fill_boot_desc(struct eltorito_defaultboot_entry *boot_desc_entry,
- struct eltorito_boot_entry_info *boot_entry);
- void get_boot_entry(void);
--void new_boot_entry(void);
-+void new_boot_entry();
- static int tvd_write(FILE *outfile);
-
-
-@@ -283,6 +283,7 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc)
- int i;
- int offset;
- struct eltorito_defaultboot_entry boot_desc_record;
-+ struct eltorito_sectionheader_entry section_header;
-
- memset(boot_desc, 0, sizeof (*boot_desc));
- boot_desc->type[0] = 0;
-@@ -317,7 +318,7 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc)
- */
- memset(&valid_desc, 0, sizeof (valid_desc));
- valid_desc.headerid[0] = 1;
-- valid_desc.arch[0] = EL_TORITO_ARCH_x86;
-+ valid_desc.arch[0] = first_boot_entry->arch;
-
- /*
- * we'll shove start of publisher id into id field,
-@@ -347,10 +348,53 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc)
- /* now write it to the virtual boot catalog */
- memcpy(de2->table, &valid_desc, 32);
-
-- for (current_boot_entry = first_boot_entry, offset = sizeof (valid_desc);
-- current_boot_entry != NULL;
-- current_boot_entry = current_boot_entry->next,
-- offset += sizeof (boot_desc_record)) {
-+ /* Fill the first entry, since it's special and already has the
-+ * matching header via the validation header... */
-+ offset = sizeof (valid_desc);
-+ current_boot_entry = first_boot_entry;
-+
-+ if (offset >= SECTOR_SIZE) {
-+#ifdef USE_LIBSCHILY
-+ comerrno(EX_BAD, "Too many El Torito boot entries\n");
-+#else
-+ fprintf(stderr, "Too many El Torito boot entries\n");
-+ exit(1);
-+#endif
-+ }
-+ fill_boot_desc(&boot_desc_record, current_boot_entry);
-+ memcpy(de2->table + offset, &boot_desc_record,
-+ sizeof (boot_desc_record));
-+
-+ offset += sizeof(boot_desc_record);
-+
-+ for (current_boot_entry = current_boot_entry->next;
-+ current_boot_entry != NULL;
-+ current_boot_entry = current_boot_entry->next) {
-+ struct eltorito_sectionheader_entry section_header;
-+
-+ if (offset >= SECTOR_SIZE) {
-+#ifdef USE_LIBSCHILY
-+ comerrno(EX_BAD,
-+ "Too many El Torito boot entries\n");
-+#else
-+ fprintf(stderr,
-+ "Too many El Torito boot entries\n");
-+ exit(1);
-+#endif
-+ }
-+
-+ memset(§ion_header, '\0', sizeof(section_header));
-+ if (current_boot_entry->next)
-+ section_header.headerid[0] = EL_TORITO_SECTION_HEADER;
-+ else
-+ section_header.headerid[0] = EL_TORITO_LAST_SECTION_HEADER;
-+
-+ section_header.arch[0] = current_boot_entry->arch;
-+ set_721(section_header.num_entries, 1);
-+
-+ memcpy(de2->table + offset, §ion_header,
-+ sizeof(section_header));
-+ offset += sizeof(section_header);
-
- if (offset >= SECTOR_SIZE) {
- #ifdef USE_LIBSCHILY
-@@ -365,6 +409,8 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc)
- fill_boot_desc(&boot_desc_record, current_boot_entry);
- memcpy(de2->table + offset, &boot_desc_record,
- sizeof (boot_desc_record));
-+ offset += sizeof (boot_desc_record);
-+
- }
- }/* get_torito_desc(... */
-
-diff --git a/genisoimage/genisoimage.c b/genisoimage/genisoimage.c
-index a5b0b46..8add1ac 100644
---- a/genisoimage/genisoimage.c
-+++ b/genisoimage/genisoimage.c
-@@ -47,6 +47,7 @@
-
- #include
- #include "genisoimage.h"
-+#include "iso9660.h"
- #include
- #include
- #include
-@@ -523,6 +524,8 @@ static const struct ld_option ld_options[] =
- '\0', NULL, "Set debug flag", ONE_DASH},
- {{"eltorito-boot", required_argument, NULL, 'b'},
- 'b', "FILE", "Set El Torito boot image name", ONE_DASH},
-+ {{"efi-boot", required_argument, NULL, 'e'},
-+ 'e', "FILE", "Set EFI boot image name", ONE_DASH},
- {{"eltorito-alt-boot", no_argument, NULL, OPTION_ALT_BOOT},
- '\0', NULL, "Start specifying alternative El Torito boot parameters", ONE_DASH},
- {{"sparc-boot", required_argument, NULL, 'B'},
-@@ -1502,6 +1505,7 @@ int main(int argc, char *argv[])
- all_files = 0;
- break;
- case 'b':
-+ case 'e':
- do_sort++; /* We sort bootcat/botimage */
- use_eltorito++;
- boot_image = optarg; /* pathname of the boot image */
-@@ -1517,6 +1521,10 @@ int main(int argc, char *argv[])
- #endif
- }
- get_boot_entry();
-+ if (c == 'e')
-+ current_boot_entry->arch = EL_TORITO_ARCH_EFI;
-+ else
-+ current_boot_entry->arch = EL_TORITO_ARCH_x86;
- current_boot_entry->boot_image = boot_image;
- break;
- case OPTION_ALT_BOOT:
-diff --git a/genisoimage/genisoimage.h b/genisoimage/genisoimage.h
-index bbedfb0..76e5e21 100644
---- a/genisoimage/genisoimage.h
-+++ b/genisoimage/genisoimage.h
-@@ -293,6 +293,7 @@ struct deferred_write {
- struct eltorito_boot_entry_info {
- struct eltorito_boot_entry_info *next;
- char *boot_image;
-+ char arch;
- int not_bootable;
- int no_emul_boot;
- int hard_disk_boot;
-diff --git a/genisoimage/iso9660.h b/genisoimage/iso9660.h
-index c74c2a9..c8b7a05 100644
---- a/genisoimage/iso9660.h
-+++ b/genisoimage/iso9660.h
-@@ -62,10 +62,14 @@ struct iso_volume_descriptor {
- #define EL_TORITO_ARCH_x86 0
- #define EL_TORITO_ARCH_PPC 1
- #define EL_TORITO_ARCH_MAC 2
-+#define EL_TORITO_ARCH_EFI 0xef
-
- #define EL_TORITO_BOOTABLE 0x88
- #define EL_TORITO_NOT_BOOTABLE 0
-
-+#define EL_TORITO_SECTION_HEADER 0x90
-+#define EL_TORITO_LAST_SECTION_HEADER 0x91
-+
- #define EL_TORITO_MEDIA_NOEMUL 0
- #define EL_TORITO_MEDIA_12FLOP 1
- #define EL_TORITO_MEDIA_144FLOP 2
-@@ -173,7 +177,7 @@ struct eltorito_validation_entry {
- struct eltorito_defaultboot_entry {
- char boot_id [ISODCL(1, 1)]; /* 711 */
- char boot_media [ISODCL(2, 2)];
-- char loadseg [ISODCL(3, 4)]; /* 711 */
-+ char loadseg [ISODCL(3, 4)]; /* 712 */
- char sys_type [ISODCL(5, 5)];
- char pad1 [ISODCL(6, 6)];
- char nsect [ISODCL(7, 8)];
-@@ -181,6 +185,14 @@ struct eltorito_defaultboot_entry {
- char pad2 [ISODCL(13, 32)];
- };
-
-+/* El Torito Section Header Entry in boot catalog */
-+struct eltorito_sectionheader_entry {
-+ char headerid [ISODCL(1, 1)]; /* 711 */
-+ char arch [ISODCL(2, 2)];
-+ char num_entries [ISODCL(3, 4)]; /* 711 */
-+ char id [ISODCL(5, 32)];
-+};
-+
- /*
- * XXX JS: The next two structures have odd lengths!
- * Some compilers (e.g. on Sun3/mc68020) padd the structures to even length.
diff --git a/pkgs/by-name/cd/cdrkit/include-path.patch b/pkgs/by-name/cd/cdrkit/include-path.patch
deleted file mode 100644
index c071e182d7f5..000000000000
--- a/pkgs/by-name/cd/cdrkit/include-path.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 57edba6..d06b6d9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,3 +1,4 @@
- PROJECT (cdrkit C)
-+INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/include)
- SUBDIRS(include genisoimage wodim libedc libhfs_iso libparanoia icedax libusal librols libunls readom netscsid 3rd-party/dirsplit)
-
diff --git a/pkgs/by-name/cd/cdrkit/package.nix b/pkgs/by-name/cd/cdrkit/package.nix
index 7aa400e51f07..14b51fcb9457 100644
--- a/pkgs/by-name/cd/cdrkit/package.nix
+++ b/pkgs/by-name/cd/cdrkit/package.nix
@@ -1,30 +1,30 @@
-{lib, stdenv, fetchurl, cmake, libcap, zlib, bzip2, perl}:
+{lib, stdenv, fetchFromGitLab, cmake, libcap, zlib, bzip2, perl, quilt}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "cdrkit";
- version = "1.1.11";
+ version = "1.1.11-3.5";
- src = fetchurl {
- url = "http://cdrkit.org/releases/cdrkit-${version}.tar.gz";
- sha256 = "1nj7iv3xrq600i37na9a5idd718piiiqbs4zxvpjs66cdrsk1h6i";
+ src = fetchFromGitLab {
+ domain = "salsa.debian.org";
+ owner = "debian";
+ repo = "cdrkit";
+ rev = "debian/9%${finalAttrs.version}";
+ hash = "sha256-T7WhztbpVvGegF6rTHGTkEALq+mcAtTerzDQ3f6Cq78=";
};
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [ cmake quilt ];
buildInputs = [ zlib bzip2 perl ] ++
lib.optionals stdenv.hostPlatform.isLinux [ libcap ];
- hardeningDisable = [ "format" ];
env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isMusl [
"-D__THROW="
] ++ lib.optionals stdenv.cc.isClang [
"-Wno-error=int-conversion"
- "-Wno-error=implicit-function-declaration"
]);
- # efi-boot-patch extracted from http://arm.koji.fedoraproject.org/koji/rpminfo?rpmID=174244
- patches = [ ./include-path.patch ./cdrkit-1.1.9-efi-boot.patch ./cdrkit-1.1.11-fno-common.patch ];
-
- postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+ postPatch = ''
+ QUILT_PATCHES=debian/patches quilt push -a
+ '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace libusal/scsi-mac-iokit.c \
--replace "IOKit/scsi-commands/SCSITaskLib.h" "IOKit/scsi/SCSITaskLib.h"
substituteInPlace genisoimage/sha256.c \
@@ -75,4 +75,4 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.unix;
};
-}
+})
diff --git a/pkgs/by-name/cl/cl-launch/package.nix b/pkgs/by-name/cl/cl-launch/package.nix
index 35cfd01ff925..02bd24da1c42 100644
--- a/pkgs/by-name/cl/cl-launch/package.nix
+++ b/pkgs/by-name/cl/cl-launch/package.nix
@@ -9,10 +9,13 @@ stdenv.mkDerivation rec {
};
preConfigure = ''
- export makeFlags="$makeFlags PREFIX='$out'"
mkdir -p "$out/bin"
'';
+ makeFlags = [
+ "PREFIX=${placeholder "out"}"
+ ];
+
preBuild = ''
sed -e 's/\t\t@/\t\t/g' -i Makefile
'';
diff --git a/pkgs/by-name/ct/ctpp2/package.nix b/pkgs/by-name/ct/ctpp2/package.nix
index 2d3b07e5e01f..eb5689ea107c 100644
--- a/pkgs/by-name/ct/ctpp2/package.nix
+++ b/pkgs/by-name/ct/ctpp2/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
patchPhase = ''
# include to fix undefined getcwd
- sed -ie 's//\n#include /' src/CTPP2FileSourceLoader.cpp
+ sed -i -e 's//\n#include /' src/CTPP2FileSourceLoader.cpp
'';
cmakeFlags = [
diff --git a/pkgs/by-name/cu/cuneiform/package.nix b/pkgs/by-name/cu/cuneiform/package.nix
index 9332b25babfb..6bad04b2e8f8 100644
--- a/pkgs/by-name/cu/cuneiform/package.nix
+++ b/pkgs/by-name/cu/cuneiform/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
sha256 = "19cmrlx4khn30qqrpyayn7bicg8yi0wpz1x1bvqqrbvr3kwldxyj";
})
(fetchurl {
- url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-text/cuneiform/files/cuneiform-1.1.0-gcc11.patch";
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-text/cuneiform/files/cuneiform-1.1.0-gcc11.patch?id=fd8e596c6a5eab634656e265c3da5241f5ceee8c";
sha256 = "14bp2f4dvlgxnpdza1rgszhkbxhp6p7lhgnb1s7c1x7vwdrx0ri7";
})
];
diff --git a/pkgs/by-name/da/daemontools/package.nix b/pkgs/by-name/da/daemontools/package.nix
index 491a03bb81e2..928d266bc3f1 100644
--- a/pkgs/by-name/da/daemontools/package.nix
+++ b/pkgs/by-name/da/daemontools/package.nix
@@ -24,12 +24,12 @@ stdenv.mkDerivation rec {
configurePhase = ''
cd daemontools-${version}
- sed -ie '1 s_$_ -include ${glibc.dev}/include/errno.h_' src/conf-cc
+ sed -i -e '1 s_$_ -include ${glibc.dev}/include/errno.h_' src/conf-cc
substituteInPlace src/Makefile \
--replace '/bin/sh' '${bash}/bin/bash -oxtrace'
- sed -ie "s_^PATH=.*_PATH=$src/daemontools-${version}/compile:''${PATH}_" src/rts.tests
+ sed -i -e "s_^PATH=.*_PATH=$src/daemontools-${version}/compile:''${PATH}_" src/rts.tests
cat ${glibc.dev}/include/errno.h
'';
diff --git a/pkgs/by-name/db/dbus_cplusplus/package.nix b/pkgs/by-name/db/dbus_cplusplus/package.nix
index 95dbdce239c7..107d7ca8a183 100644
--- a/pkgs/by-name/db/dbus_cplusplus/package.nix
+++ b/pkgs/by-name/db/dbus_cplusplus/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
(fetchurl {
name = "gcc-4.7.patch";
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/"
- + "dbus-c++/files/dbus-c++-0.9.0-gcc-4.7.patch";
+ + "dbus-c++/files/dbus-c++-0.9.0-gcc-4.7.patch?id=dec60bb6900d6ebdaaa6aa1dcb845b30b739f9b5";
sha256 = "0rwcz9pvc13b3yfr0lkifnfz0vb5q6dg240bzgf37ni4s8rpc72g";
})
(fetchpatch {
diff --git a/pkgs/by-name/dj/djvulibre/package.nix b/pkgs/by-name/dj/djvulibre/package.nix
index 584ede1831fb..5884c5ebecf9 100644
--- a/pkgs/by-name/dj/djvulibre/package.nix
+++ b/pkgs/by-name/dj/djvulibre/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sha256 = "1p1fiygq9ny8aimwc4vxwjc6k9ykgdsq1sq06slfbzalfvm0kl7w";
};
- outputs = [ "bin" "dev" "out" ];
+ outputs = [ "bin" "out" "dev" "lib" "man" ];
strictDeps = true;
nativeBuildInputs = [
diff --git a/pkgs/by-name/el/electricsheep/boost-1.85.patch b/pkgs/by-name/el/electricsheep/boost-1.85.patch
new file mode 100644
index 000000000000..e35b0a44d863
--- /dev/null
+++ b/pkgs/by-name/el/electricsheep/boost-1.85.patch
@@ -0,0 +1,96 @@
+From a8a7f4460b8f46ca752389f3e1fa43b5c95f2bac Mon Sep 17 00:00:00 2001
+From: Emily
+Date: Thu, 28 Nov 2024 05:56:34 +0000
+Subject: [PATCH] Remove use of deprecated ``
+
+This header was dropped in Boost 1.85.
+---
+ client_generic/Client/Player.cpp | 3 ---
+ client_generic/Client/lua_playlist.h | 3 ---
+ client_generic/ContentDecoder/graph_playlist.h | 4 +---
+ client_generic/TupleStorage/luastorage.cpp | 3 ---
+ 4 files changed, 1 insertion(+), 12 deletions(-)
+
+diff --git a/client_generic/Client/Player.cpp b/client_generic/Client/Player.cpp
+index 1f65d761..9726b014 100644
+--- a/client_generic/Client/Player.cpp
++++ b/client_generic/Client/Player.cpp
+@@ -60,7 +60,6 @@
+
+ #include "boost/filesystem/path.hpp"
+ #include "boost/filesystem/operations.hpp"
+-#include "boost/filesystem/convenience.hpp"
+
+ #if defined(MAC) || defined(WIN32)
+ #define HONOR_VBL_SYNC
+@@ -68,8 +67,6 @@
+
+ using boost::filesystem::path;
+ using boost::filesystem::exists;
+-using boost::filesystem::directory_iterator;
+-using boost::filesystem::extension;
+
+ using namespace DisplayOutput;
+
+diff --git a/client_generic/Client/lua_playlist.h b/client_generic/Client/lua_playlist.h
+index fbe5a333..511c86ee 100644
+--- a/client_generic/Client/lua_playlist.h
++++ b/client_generic/Client/lua_playlist.h
+@@ -17,13 +17,10 @@
+
+ #include "boost/filesystem/path.hpp"
+ #include "boost/filesystem/operations.hpp"
+-#include "boost/filesystem/convenience.hpp"
+ #include
+
+ using boost::filesystem::path;
+ using boost::filesystem::exists;
+-using boost::filesystem::directory_iterator;
+-using boost::filesystem::extension;
+
+
+ // Lua.
+diff --git a/client_generic/ContentDecoder/graph_playlist.h b/client_generic/ContentDecoder/graph_playlist.h
+index 1f0a6cd0..cc2672e2 100644
+--- a/client_generic/ContentDecoder/graph_playlist.h
++++ b/client_generic/ContentDecoder/graph_playlist.h
+@@ -13,13 +13,11 @@
+
+ #include "boost/filesystem/path.hpp"
+ #include "boost/filesystem/operations.hpp"
+-#include "boost/filesystem/convenience.hpp"
+
+ using boost::filesystem::path;
+ using boost::filesystem::exists;
+ using boost::filesystem::no_check;
+ using boost::filesystem::directory_iterator;
+-using boost::filesystem::extension;
+
+ namespace ContentDecoder
+ {
+@@ -116,7 +114,7 @@ class CGraphPlaylist : public CPlaylist
+ for( directory_iterator i( _dir ), end; i != end; ++i )
+ {
+ #warning TODO (Keffo#1#): Remove hardcoded extension...
+- if( extension(*i) != ".avi" )
++ if( i->extension().string() != ".avi" )
+ continue;
+
+ std::string file = i->string();
+diff --git a/client_generic/TupleStorage/luastorage.cpp b/client_generic/TupleStorage/luastorage.cpp
+index efbe8867..9b2ffa93 100644
+--- a/client_generic/TupleStorage/luastorage.cpp
++++ b/client_generic/TupleStorage/luastorage.cpp
+@@ -9,12 +9,9 @@
+
+ #include "boost/filesystem/path.hpp"
+ #include "boost/filesystem/operations.hpp"
+-#include "boost/filesystem/convenience.hpp"
+
+ using boost::filesystem::path;
+ using boost::filesystem::exists;
+-using boost::filesystem::directory_iterator;
+-using boost::filesystem::extension;
+
+ using namespace std;
+
diff --git a/pkgs/by-name/el/electricsheep/package.nix b/pkgs/by-name/el/electricsheep/package.nix
index 2f7038195b3e..88e09f983ee6 100644
--- a/pkgs/by-name/el/electricsheep/package.nix
+++ b/pkgs/by-name/el/electricsheep/package.nix
@@ -11,7 +11,7 @@
, pkg-config
, flam3
, libgtop
-, boost179
+, boost
, tinyxml
, libglut
, libGLU
@@ -30,6 +30,11 @@ stdenv.mkDerivation {
hash = "sha256-X3EZ1/VcLEU1GkZbskWSsqQWYTnsH3pbFDvDLpdLmcU=";
};
+ patches = [
+ #
+ ./boost-1.85.patch
+ ];
+
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [
@@ -41,7 +46,7 @@ stdenv.mkDerivation {
xorg.libXrender
flam3
libgtop
- boost179
+ boost
tinyxml
libglut
libGLU
diff --git a/pkgs/by-name/el/ell/package.nix b/pkgs/by-name/el/ell/package.nix
index 495c858c93a2..41e58b4cf308 100644
--- a/pkgs/by-name/el/ell/package.nix
+++ b/pkgs/by-name/el/ell/package.nix
@@ -9,7 +9,7 @@
stdenv.mkDerivation rec {
pname = "ell";
- version = "0.69";
+ version = "0.70";
outputs = [ "out" "dev" ];
separateDebugInfo = true;
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "https://git.kernel.org/pub/scm/libs/ell/ell.git";
rev = version;
- hash = "sha256-FOEVnpndbIufb8i6egBIoG1PC01WxtAlf3I47YqM+hk=";
+ hash = "sha256-2JPmS+OuK1cQyBRR0kDDWXBDUWUZuK/vsQ483GLu/S0=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/fl/fluxus/package.nix b/pkgs/by-name/fl/fluxus/package.nix
index dfa518c5c574..ef3bdce4407c 100644
--- a/pkgs/by-name/fl/fluxus/package.nix
+++ b/pkgs/by-name/fl/fluxus/package.nix
@@ -58,10 +58,8 @@ stdenv.mkDerivation {
"RacketInclude=${racket}/include/racket"
"RacketLib=${racket}/lib/racket"
"DESTDIR=build"
+ "Prefix=${placeholder "out"}"
];
- configurePhase = ''
- sconsFlags+=" Prefix=$out"
- '';
installPhase = ''
mkdir -p $out
cp -r build$out/* $out/
diff --git a/pkgs/by-name/fo/folks/package.nix b/pkgs/by-name/fo/folks/package.nix
index 777bef924662..ee07c5fcbf0a 100644
--- a/pkgs/by-name/fo/folks/package.nix
+++ b/pkgs/by-name/fo/folks/package.nix
@@ -90,11 +90,6 @@ stdenv.mkDerivation (finalAttrs: {
# occur inconsistently
doCheck = false;
- mesonCheckFlags = [
- # Prevents e-d-s add-contacts-stress-test from timing out
- "--timeout-multiplier" "4"
- ];
-
postPatch = lib.optionalString telepathySupport ''
patchShebangs tests/tools/manager-file.py
'';
diff --git a/pkgs/by-name/gl/globulation2/package.nix b/pkgs/by-name/gl/globulation2/package.nix
index a444f18335fc..a11dadb70dcd 100644
--- a/pkgs/by-name/gl/globulation2/package.nix
+++ b/pkgs/by-name/gl/globulation2/package.nix
@@ -51,11 +51,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ scons ];
buildInputs = [ libGLU libGL SDL SDL_ttf SDL_image zlib SDL_net speex libvorbis libogg boost fribidi bsdiff ];
- postConfigure = ''
- sconsFlags+=" BINDIR=$out/bin"
- sconsFlags+=" INSTALLDIR=$out/share/globulation2"
- sconsFlags+=" DATADIR=$out/share/globulation2/glob2"
- '';
+ sconsFlags = [
+ "BINDIR=${placeholder "out"}/bin"
+ "INSTALLDIR=${placeholder "out"}/share/globulation2"
+ "DATADIR=${placeholder "out"}/share/globulation2/glob2"
+ ];
NIX_LDFLAGS = "-lboost_system";
diff --git a/pkgs/by-name/gp/gpsd/package.nix b/pkgs/by-name/gp/gpsd/package.nix
index 4b9269ab6692..a259a22c940b 100644
--- a/pkgs/by-name/gp/gpsd/package.nix
+++ b/pkgs/by-name/gp/gpsd/package.nix
@@ -89,9 +89,6 @@ stdenv.mkDerivation rec {
sed -e "s|systemd_dir = .*|systemd_dir = '$out/lib/systemd/system'|" -i SConscript
export TAR=noop
substituteInPlace SConscript --replace "env['CCVERSION']" "env['CC']"
-
- sconsFlags+=" udevdir=$out/lib/udev"
- sconsFlags+=" python_libdir=$out/${python3Packages.python.sitePackages}"
'';
# - leapfetch=no disables going online at build time to fetch leap-seconds
@@ -102,6 +99,8 @@ stdenv.mkDerivation rec {
"gpsd_group=${gpsdGroup}"
"systemd=yes"
"xgps=${if guiSupport then "True" else "False"}"
+ "udevdir=${placeholder "out"}/lib/udev"
+ "python_libdir=${placeholder "out"}/${python3Packages.python.sitePackages}"
];
preCheck = ''
diff --git a/pkgs/by-name/gs/gsimplecal/package.nix b/pkgs/by-name/gs/gsimplecal/package.nix
index 224f2f359d77..df964954af11 100644
--- a/pkgs/by-name/gs/gsimplecal/package.nix
+++ b/pkgs/by-name/gs/gsimplecal/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
postPatch = ''
- sed -ie '/sys\/sysctl.h/d' src/Unique.cpp
+ sed -i -e '/sys\/sysctl.h/d' src/Unique.cpp
'';
enableParallelBuilding = true;
diff --git a/pkgs/by-name/gs/gss/package.nix b/pkgs/by-name/gs/gss/package.nix
index 1271c52a4a8c..18020cf425f9 100644
--- a/pkgs/by-name/gs/gss/package.nix
+++ b/pkgs/by-name/gs/gss/package.nix
@@ -1,6 +1,8 @@
{ lib
, stdenv
, fetchurl
+, autoreconfHook
+, gtk-doc
, withShishi ? !stdenv.hostPlatform.isDarwin
, shishi
}:
@@ -20,6 +22,8 @@ stdenv.mkDerivation rec {
rm tests/krb5context.c
'';
+ nativeBuildInputs = [ autoreconfHook gtk-doc ];
+
buildInputs = lib.optional withShishi shishi;
# ./stdint.h:89:5: error: expected value in expression
diff --git a/pkgs/by-name/gt/gt5/package.nix b/pkgs/by-name/gt/gt5/package.nix
index 68b0e3197162..378ede59e42c 100644
--- a/pkgs/by-name/gt/gt5/package.nix
+++ b/pkgs/by-name/gt/gt5/package.nix
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
sed 's/-o root -g root//' -i Makefile
'';
- preConfigure = ''
- makeFlags="$makeFlags PREFIX=$out"
- '';
+ makeFlags = [
+ "PREFIX=${placeholder "out"}"
+ ];
meta = {
description = "Diff-capable 'du' browser";
diff --git a/pkgs/by-name/ho/hol/package.nix b/pkgs/by-name/ho/hol/package.nix
index 883eb4331c9f..3f48a77478eb 100644
--- a/pkgs/by-name/ho/hol/package.nix
+++ b/pkgs/by-name/ho/hol/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
substituteInPlace $f --replace "\"/usr/bin/dot\"" "\"${graphviz}/bin/dot\""
done
- #sed -ie "/compute/,999 d" tools/build-sequence # for testing
+ #sed -i -e "/compute/,999 d" tools/build-sequence # for testing
poly < tools/smart-configure.sml
diff --git a/pkgs/by-name/hw/hwdata/package.nix b/pkgs/by-name/hw/hwdata/package.nix
index b03448f76288..bfe499f8e2f2 100644
--- a/pkgs/by-name/hw/hwdata/package.nix
+++ b/pkgs/by-name/hw/hwdata/package.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "hwdata";
- version = "0.388";
+ version = "0.389";
src = fetchFromGitHub {
owner = "vcrhonek";
repo = "hwdata";
rev = "v${version}";
- hash = "sha256-MTXRvqhzNI4afOWLWY6bvv84Q/MXVTsn0w9awRIDAEU=";
+ hash = "sha256-w8rN9T0GwElkLmNLzROQtd7CdY0DcuCRUWxFtA2ekJc=";
};
configureFlags = [ "--datadir=${placeholder "out"}/share" ];
diff --git a/pkgs/by-name/hy/hylafaxplus/config.site b/pkgs/by-name/hy/hylafaxplus/config.site
index 7c8014449216..aa66fad916b7 100644
--- a/pkgs/by-name/hy/hylafaxplus/config.site
+++ b/pkgs/by-name/hy/hylafaxplus/config.site
@@ -1,16 +1,16 @@
@config_maxgid@
-DIR_BIN="@out_@/bin"
-DIR_FONTMAP="@out_@/share/ghostscript/@ghostscript_version@"
-DIR_LIB="@out_@/lib"
-DIR_LIBDATA="@out_@/spool/etc"
-DIR_LIBEXEC="@out_@/spool/bin"
+DIR_BIN="@out@/bin"
+DIR_FONTMAP="@out@/share/ghostscript/@ghostscript_version@"
+DIR_LIB="@out@/lib"
+DIR_LIBDATA="@out@/spool/etc"
+DIR_LIBEXEC="@out@/spool/bin"
DIR_LOCKS=/var/lock
-DIR_MAN="@out_@/share/man"
-DIR_SBIN="@out_@/spool/bin"
-DIR_SPOOL="@out_@/spool"
+DIR_MAN="@out@/share/man"
+DIR_SBIN="@out@/spool/bin"
+DIR_SPOOL="@out@/spool"
FONTMAP="@ghostscript@/share/ghostscript/@ghostscript_version@"
PATH_AFM="@ghostscript@/share/ghostscript/fonts"
-PATH_DPSRIP="@out_@/spool/bin/ps2fax"
+PATH_DPSRIP="@out@/spool/bin/ps2fax"
PATH_EGETTY="@coreutils@/bin/false"
PATH_GSRIP="@ghostscript@/bin/gs"
PATH_IMPRIP="@coreutils@/bin/false"
diff --git a/pkgs/by-name/hy/hylafaxplus/package.nix b/pkgs/by-name/hy/hylafaxplus/package.nix
index 3c66ce8129f3..c2c6045ecc4b 100644
--- a/pkgs/by-name/hy/hylafaxplus/package.nix
+++ b/pkgs/by-name/hy/hylafaxplus/package.nix
@@ -3,7 +3,7 @@
, fakeroot
, fetchurl
, libfaketime
-, substituteAll
+, replaceVars
## runtime dependencies
, coreutils
, file
@@ -35,18 +35,14 @@ let
version = "7.0.9";
hash = "sha512-3OJwM4vFC9pzPozPobFLiNNx/Qnkl8BpNNziRUpJNBDLBxjtg/eDm3GnprS2hpt7VUoV4PCsFvp1hxhNnhlUwQ==";
- configSite = substituteAll {
- name = "${pname}-config.site";
- src = ./config.site;
+ configSite = replaceVars ./config.site {
config_maxgid = lib.optionalString (maxgid!=null) ''CONFIG_MAXGID=${builtins.toString maxgid}'';
ghostscript_version = ghostscript.version;
- out_ = "@out@"; # "out" will be resolved in post-install.sh
+ out = null; # "out" will be resolved in post-install.sh
inherit coreutils ghostscript libtiff;
};
- postPatch = substituteAll {
- name = "${pname}-post-patch.sh";
- src = ./post-patch.sh;
+ postPatch = replaceVars ./post-patch.sh {
inherit configSite;
maxuid = lib.optionalString (maxuid!=null) (builtins.toString maxuid);
faxcover_binpath = lib.makeBinPath
@@ -55,9 +51,7 @@ let
[stdenv.shellPackage coreutils findutils gnused gnugrep gawk];
};
- postInstall = substituteAll {
- name = "${pname}-post-install.sh";
- src = ./post-install.sh;
+ postInstall = replaceVars ./post-install.sh {
inherit fakeroot libfaketime;
};
diff --git a/pkgs/by-name/hy/hyx/package.nix b/pkgs/by-name/hy/hyx/package.nix
index e41f9bbfceb2..a33f619af291 100644
--- a/pkgs/by-name/hy/hyx/package.nix
+++ b/pkgs/by-name/hy/hyx/package.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, memstreamHook }:
+{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "hyx";
@@ -14,8 +14,6 @@ stdenv.mkDerivation rec {
--replace "-Wl,-z,relro,-z,now -fpic -pie" ""
'';
- buildInputs = lib.optional (stdenv.system == "x86_64-darwin") memstreamHook;
-
installPhase = ''
install -vD hyx $out/bin/hyx
'';
diff --git a/pkgs/by-name/io/io/package.nix b/pkgs/by-name/io/io/package.nix
index 0d522055d9ad..bba15590cf70 100644
--- a/pkgs/by-name/io/io/package.nix
+++ b/pkgs/by-name/io/io/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
# The Addon generation (AsyncRequest and a others checked) seems to have
# trouble with building on Virtual machines. Disabling them until it
# can be fully investigated.
- sed -ie \
+ sed -i -e \
"s/add_subdirectory(addons)/#add_subdirectory(addons)/g" \
CMakeLists.txt
# Bind Libs STATIC to avoid a segfault when relinking
diff --git a/pkgs/by-name/ip/iproute2/package.nix b/pkgs/by-name/ip/iproute2/package.nix
index 923a5cc8b309..cd9ca84ee08d 100644
--- a/pkgs/by-name/ip/iproute2/package.nix
+++ b/pkgs/by-name/ip/iproute2/package.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch
+{ lib, stdenv, fetchurl
, buildPackages, bison, flex, pkg-config
, db, iptables, elfutils, libmnl ,libbpf
, gitUpdater, pkgsStatic
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "iproute2";
- version = "6.11.0";
+ version = "6.12.0";
src = fetchurl {
url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz";
- hash = "sha256-H3lTmKBK6qzQao9qziz9kTwz+llTypnaroO7XFNGEcM=";
+ hash = "sha256-u9FB73tdASfMIVKEO6YfJ03DKBT6Pg8T59B6CAvvU9k=";
};
patches = [
@@ -19,21 +19,11 @@ stdenv.mkDerivation rec {
url = "https://lore.kernel.org/netdev/20240712191209.31324-1-contact@hacktivis.me/raw";
hash = "sha256-MX+P+PSEh6XlhoWgzZEBlOV9aXhJNd20Gi0fJCcSZ5E=";
})
- (fetchurl {
- name = "musl-msghdr.patch";
- url = "https://lore.kernel.org/netdev/20240712191209.31324-2-contact@hacktivis.me/raw";
- hash = "sha256-X5BYSZBxcvdjtX1069a1GfcpdoVd0loSAe4xTpbCipA=";
- })
(fetchurl {
name = "musl-basename.patch";
url = "https://lore.kernel.org/netdev/20240804161054.942439-1-dilfridge@gentoo.org/raw";
hash = "sha256-47obv6mIn/HO47lt47slpTAFDxiQ3U/voHKzIiIGCTM=";
})
- (fetchpatch {
- name = "musl-mst.patch";
- url = "https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/patch/?id=6a77abab92516e65f07f8657fc4e384c4541ce0e";
- hash = "sha256-19FzTDvgnmqVFBykVgXl4VIsHs8Cy9NWGOLpxifxVlI=";
- })
];
postPatch = ''
diff --git a/pkgs/by-name/iw/iwd/package.nix b/pkgs/by-name/iw/iwd/package.nix
index cdab250abd96..197ca133f13a 100644
--- a/pkgs/by-name/iw/iwd/package.nix
+++ b/pkgs/by-name/iw/iwd/package.nix
@@ -13,12 +13,12 @@
stdenv.mkDerivation rec {
pname = "iwd";
- version = "3.0";
+ version = "3.2";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
rev = version;
- hash = "sha256-pkren8mF0xg5yrkaIrMJ5auq+7w8VAldbgVflE2BmlM=";
+ hash = "sha256-8jIZu0jHo0jkJbD1Vs+ncEZDxO+KoaOXzkX+HiEI6rg=";
};
outputs = [ "out" "man" "doc" ]
diff --git a/pkgs/by-name/ju/jumpnbump/package.nix b/pkgs/by-name/ju/jumpnbump/package.nix
index b2f6a646c65f..b287f4835f26 100644
--- a/pkgs/by-name/ju/jumpnbump/package.nix
+++ b/pkgs/by-name/ju/jumpnbump/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
make -C menu PREFIX=$out all install
cp -r ${data}/* $out/share/jumpnbump/
rm $out/share/applications/jumpnbump-menu.desktop
- sed -ie 's+Exec=jumpnbump+Exec=jumpnbump-menu+' $out/share/applications/jumpnbump.desktop
+ sed -i -e 's+Exec=jumpnbump+Exec=jumpnbump-menu+' $out/share/applications/jumpnbump.desktop
'';
pythonPath = with python3Packages; [ pygobject3 pillow ];
diff --git a/pkgs/by-name/ju/justbuild/package.nix b/pkgs/by-name/ju/justbuild/package.nix
index 188275786501..d1541a961514 100644
--- a/pkgs/by-name/ju/justbuild/package.nix
+++ b/pkgs/by-name/ju/justbuild/package.nix
@@ -87,8 +87,8 @@ stdenv.mkDerivation rec {
postPatch =
''
- sed -ie 's|\./bin/just-mr.py|${python3}/bin/python3 ./bin/just-mr.py|' bin/bootstrap.py
- sed -ie 's|#!/usr/bin/env python3|#!${python3}/bin/python3|' bin/parallel-bootstrap-traverser.py
+ sed -i -e 's|\./bin/just-mr.py|${python3}/bin/python3 ./bin/just-mr.py|' bin/bootstrap.py
+ sed -i -e 's|#!/usr/bin/env python3|#!${python3}/bin/python3|' bin/parallel-bootstrap-traverser.py
jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf}"' etc/repos.json > etc/repos.json.patched
mv etc/repos.json.patched etc/repos.json
jq '.repositories.com_github_grpc_grpc.pkg_bootstrap.local_path = "${grpc}"' etc/repos.json > etc/repos.json.patched
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
mv etc/toolchain/CC/TARGETS.patched etc/toolchain/CC/TARGETS
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
- sed -ie 's|-Wl,-z,stack-size=8388608|-Wl,-stack_size,0x800000|' bin/bootstrap.py
+ sed -i -e 's|-Wl,-z,stack-size=8388608|-Wl,-stack_size,0x800000|' bin/bootstrap.py
'';
/*
diff --git a/pkgs/by-name/ko/kore/package.nix b/pkgs/by-name/ko/kore/package.nix
index 9105afa52071..9e2bea5aa541 100644
--- a/pkgs/by-name/ko/kore/package.nix
+++ b/pkgs/by-name/ko/kore/package.nix
@@ -1,8 +1,9 @@
-{ lib, stdenv, fetchFromGitHub, openssl, curl, postgresql, yajl }:
+{ lib, stdenv, fetchFromGitHub, openssl, curl, postgresql_16, yajl }:
stdenv.mkDerivation rec {
pname = "kore";
+ # TODO: Check on next update whether postgresql 17 is supported.
version = "4.2.3";
src = fetchFromGitHub {
@@ -12,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-p0M2P02xwww5EnT28VnEtj5b+/jkPW3YkJMuK79vp4k=";
};
- buildInputs = [ openssl curl postgresql yajl ];
+ buildInputs = [ openssl curl postgresql_16 yajl ];
makeFlags = [
"PREFIX=${placeholder "out"}"
diff --git a/pkgs/by-name/ko/koules/package.nix b/pkgs/by-name/ko/koules/package.nix
index a59199e949c8..df2962e1d277 100644
--- a/pkgs/by-name/ko/koules/package.nix
+++ b/pkgs/by-name/ko/koules/package.nix
@@ -37,13 +37,13 @@ stdenv.mkDerivation rec {
postPatch = ''
# We do not want to depend on that particular font to be available in the
# xserver, hence substitute it by a font which is always available
- sed -ie 's:-schumacher-clean-bold-r-normal--8-80-75-75-c-80-\*iso\*:fixed:' xlib/init.c
+ sed -i -e 's:-schumacher-clean-bold-r-normal--8-80-75-75-c-80-\*iso\*:fixed:' xlib/init.c
'';
preBuild = ''
cp xkoules.6 xkoules.man # else "make" will not succeed
- sed -ie "s:^SOUNDDIR\s*=.*:SOUNDDIR=$out/lib:" Makefile
- sed -ie "s:^KOULESDIR\s*=.*:KOULESDIR=$out:" Makefile
+ sed -i -e "s:^SOUNDDIR\s*=.*:SOUNDDIR=$out/lib:" Makefile
+ sed -i -e "s:^KOULESDIR\s*=.*:KOULESDIR=$out:" Makefile
'';
installPhase = ''
diff --git a/pkgs/by-name/ld/ld64/meson.build b/pkgs/by-name/ld/ld64/meson.build
index 84468e6f9938..c9068b75d026 100644
--- a/pkgs/by-name/ld/ld64/meson.build
+++ b/pkgs/by-name/ld/ld64/meson.build
@@ -25,48 +25,6 @@ openssl = dependency('openssl', version : '>=3.0')
xar = cc.find_library('xar')
-# Feature tests
-
-# macOS 10.12 does not support `DISPATCH_APPLY_AUTO`. Fortunately, `DISPATCH_APPLY_CURRENT_ROOT_QUEUE` has the
-# same value and was repurposed in subsequent releases as `DISPATCH_APPLY_AUTO`.
-dispatch_apply_auto_test = '''
-#include
-int main(int argc, char* argv[]) {
- dispatch_queue_t queue = DISPATCH_APPLY_AUTO;
- return 0;
-}
-'''
-if not cc.compiles(
- dispatch_apply_auto_test,
- args : '-Wno-unused-command-line-argument',
- name : 'supports DISPATCH_APPLY_AUTO',
-)
- add_project_arguments(
- '-include', 'dispatch/private.h',
- '-DDISPATCH_APPLY_AUTO=DISPATCH_APPLY_CURRENT_ROOT_QUEUE',
- '-DPRIVATE', # The required API is private on the 10.12 SDK.
- language: ['c', 'cpp'],
- )
-endif
-
-# The return type of `dispatch_get_global_queue` was changed in 10.14.
-# Use the older type if the SDK does not support it.
-dispatch_queue_global_test = '''
-#include
-int main(int argc, char* argv[]) {
- dispatch_queue_global_t queue = dispatch_get_global_queue(QOS_CLASS_USER_INITIATED, 0);
- return 0;
-}
-'''
-if not cc.compiles(
- dispatch_queue_global_test,
- args : '-Wno-unused-command-line-argument',
- name : 'supports dispatch_queue_global_t',
-)
- add_project_arguments('-Ddispatch_queue_global_t=dispatch_queue_t', language : ['c', 'cpp'])
-endif
-
-
# Generated files
compile_stubs_h = custom_target(
@@ -143,6 +101,11 @@ ld64 = executable(
dependencies : [libtapi, openssl, xar],
include_directories : incdirs,
install : true,
+ cpp_args : [
+ # Required for `_COMM_PAGE_CPU_CAPABILITIES64` in
+ # on `x86_64-darwin`
+ '-DPRIVATE',
+ ],
# These linker flags mirror those used in a release build of the Xcode project.
# See: https://github.com/apple-oss-distributions/ld64/blob/47f477cb721755419018f7530038b272e9d0cdea/ld64.xcodeproj/project.pbxproj#L1292-L1299.
link_args : [
diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix
index ce63bfad5e0d..074e92daa725 100644
--- a/pkgs/by-name/ld/ld64/package.nix
+++ b/pkgs/by-name/ld/ld64/package.nix
@@ -5,6 +5,7 @@
fetchFromGitHub,
fetchurl,
apple-sdk,
+ apple-sdk_14,
cctools,
darwin,
libtapi,
@@ -32,23 +33,11 @@ let
hash = "sha256-0ybVcwHuGEdThv0PPjYQc3SW0YVOyrM3/L9zG/l1Vtk=";
};
- dyld = fetchFromGitHub {
- owner = "apple-oss-distributions";
- repo = "dyld";
- rev = "dyld-1162";
- hash = "sha256-uyFg8QnnP6NWv5lAOTCiFZ0SnFOA/aO/kpjkyvILVsk=";
- };
+ dyld = apple-sdk_14.sourceRelease "dyld";
libdispatchPrivate = apple-sdk.sourceRelease "libdispatch";
- # First version with all the required definitions. This is used in preference to darwin.xnu to make it easier
- # to support Linux and because the version of darwin.xnu available on x86_64-darwin in the 10.12 SDK is too old.
- xnu = fetchFromGitHub {
- owner = "apple-oss-distributions";
- repo = "xnu";
- rev = "xnu-6153.11.26";
- hash = "sha256-dcnGcp7bIjQxeAn5pXt+mHSYEXb2Ad9Smhd/WUG4kb4=";
- };
+ xnu = apple-sdk.sourceRelease "xnu";
privateHeaders = stdenvNoCC.mkDerivation {
name = "ld64-deps-private-headers";
@@ -167,15 +156,12 @@ stdenv.mkDerivation (finalAttrs: {
python3
];
- buildInputs =
- [
- libtapi
- llvm
- openssl
- xar
- ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.dyld ]
- ++ lib.optionals stdenv.hostPlatform.isLinux [ libdispatch ];
+ buildInputs = [
+ libtapi
+ llvm
+ openssl
+ xar
+ ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libdispatch ];
# Note for overrides: ld64 cannot be built as a debug build because of UB in its iteration implementations,
# which trigger libc++ debug assertions due to trying to take the address of the first element of an emtpy vector.
diff --git a/pkgs/by-name/li/libetonyek/package.nix b/pkgs/by-name/li/libetonyek/package.nix
index 393f542a9ea9..ec7b9b4a82d1 100644
--- a/pkgs/by-name/li/libetonyek/package.nix
+++ b/pkgs/by-name/li/libetonyek/package.nix
@@ -3,8 +3,7 @@
, fetchFromGitHub
, autoreconfHook
, pkg-config
-# fails on older Boost due to https://github.com/boostorg/phoenix/issues/111
-, boost184
+, boost
, cppunit
, glm
, gperf
@@ -32,7 +31,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- boost184
+ boost
cppunit
glm
gperf
diff --git a/pkgs/by-name/li/libieee1284/package.nix b/pkgs/by-name/li/libieee1284/package.nix
index 377d56957123..b7adc4c312d9 100644
--- a/pkgs/by-name/li/libieee1284/package.nix
+++ b/pkgs/by-name/li/libieee1284/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
patches = [
(fetchurl {
name = "musl.patch";
- url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/libieee1284/files/libieee1284-0.2.11-don-t-blindly-assume-outb_p-to-be-available.patch";
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/libieee1284/files/libieee1284-0.2.11-don-t-blindly-assume-outb_p-to-be-available.patch?id=dec60bb6900d6ebdaaa6aa1dcb845b30b739f9b5";
hash = "sha256-sNu0OPBMa9GIwSu754noateF4FZC14f+8YRgYUl13KQ=";
})
];
diff --git a/pkgs/by-name/li/libjxl/package.nix b/pkgs/by-name/li/libjxl/package.nix
index 2bd30ddda8e2..6211023c59d8 100644
--- a/pkgs/by-name/li/libjxl/package.nix
+++ b/pkgs/by-name/li/libjxl/package.nix
@@ -104,6 +104,9 @@ stdenv.mkDerivation rec {
# Use our version of gtest
"-DJPEGXL_FORCE_SYSTEM_GTEST=ON"
+ "-DJPEGXL_ENABLE_SKCMS=OFF"
+ "-DJPEGXL_FORCE_SYSTEM_LCMS2=ON"
+
# TODO: Update this package to enable this (overridably via an option):
# Viewer tools for evaluation.
# "-DJPEGXL_ENABLE_VIEWERS=ON"
@@ -121,6 +124,12 @@ stdenv.mkDerivation rec {
# the second substitution fix regex for a2x script
# https://github.com/libjxl/libjxl/pull/3842
postPatch = ''
+ # Make sure we do not accidentally build against some of the vendored dependencies
+ # If it asks you to "run deps.sh to fetch the build dependencies", then you are probably missing a JPEGXL_FORCE_SYSTEM_* flag
+ shopt -s extglob
+ rm -rf third_party/!(sjpeg)/
+ shopt -u extglob
+
substituteInPlace plugins/gdk-pixbuf/jxl.thumbnailer \
--replace '/usr/bin/gdk-pixbuf-thumbnailer' "$out/libexec/gdk-pixbuf-thumbnailer-jxl"
substituteInPlace CMakeLists.txt \
diff --git a/pkgs/by-name/li/liblangtag/package.nix b/pkgs/by-name/li/liblangtag/package.nix
index 38f1cc03cac4..5684c18ae009 100644
--- a/pkgs/by-name/li/liblangtag/package.nix
+++ b/pkgs/by-name/li/liblangtag/package.nix
@@ -1,42 +1,28 @@
-{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, gtk-doc, gettext
+{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, autoconf-archive, gtk-doc, gettext
, pkg-config, glib, libxml2, gobject-introspection, gnome-common, unzip
}:
stdenv.mkDerivation rec {
pname = "liblangtag";
- version = "0.6.3";
+ version = "0.6.7";
# Artifact tarball contains lt-localealias.h needed for darwin
src = fetchurl {
url = "https://bitbucket.org/tagoh/liblangtag/downloads/${pname}-${version}.tar.bz2";
- sha256 = "sha256-HxKiCgLsOo0i5U3tuLaDpDycFgvaG6M3vxBgYHrnM70=";
+ hash = "sha256-Xta81K4/PAXJEuYvIWzRpEEjhGFH9ymkn7VmjaUeAw4=";
};
core_zip = fetchurl {
# please update if an update is available
- url = "http://www.unicode.org/Public/cldr/37/core.zip";
- sha256 = "0myswkvvaxvrz9zwq4zh65sygfd9n72cd5rk4pwacqba4nxgb4xs";
+ url = "http://www.unicode.org/Public/cldr/46/core.zip";
+ hash = "sha256-+86cInWGKtJmaPs0eD/mwznz2S3f61oQoXdftYGBoV0=";
};
language_subtag_registry = fetchurl {
- url = "http://www.iana.org/assignments/language-subtag-registry";
- sha256 = "0y9x5gra6jri4sk16f0dp69p06almnsl48rs85605f035kf539qm";
+ url = "https://web.archive.org/web/20241120202537id_/https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry";
+ hash = "sha256-xy94jbBKP0Ig7yOPutSviCA6uryx7PW2b1lBIPk2+6Q=";
};
- patches = [
- # Pull upstream fix for gcc-13 build compatibility
- (fetchpatch {
- name = "gcc-13-p1.patch";
- url = "https://bitbucket.org/tagoh/liblangtag/commits/0b6e9f4616a34146e7443c4e9a7197153645e40b/raw";
- hash = "sha256-69wJDVwDCP5OPHKoRn9WZNrvfCvmlX3SwtRmcpJHn2o=";
- })
- (fetchpatch {
- name = "gcc-13-p1.patch";
- url = "https://bitbucket.org/tagoh/liblangtag/commits/1497c4477d0fa0b7df1886951b953dd3cea54427/raw";
- hash = "sha256-k0Uaeg6YLxVze4fgf0kiyuiZJ5wh2Jq3h7cFPQPtwyo=";
- })
- ];
-
postPatch = ''
gtkdocize
cp "${core_zip}" data/core.zip
@@ -50,7 +36,7 @@ stdenv.mkDerivation rec {
"--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias";
buildInputs = [ gettext glib libxml2 gnome-common ];
- nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config unzip gobject-introspection ];
+ nativeBuildInputs = [ autoreconfHook autoconf-archive gtk-doc gettext pkg-config unzip gobject-introspection ];
meta = with lib; {
description = "Interface library to access tags for identifying languages";
diff --git a/pkgs/by-name/li/libmysqlconnectorcpp/package.nix b/pkgs/by-name/li/libmysqlconnectorcpp/package.nix
index 6eb9ff06f206..7668c9576f0d 100644
--- a/pkgs/by-name/li/libmysqlconnectorcpp/package.nix
+++ b/pkgs/by-name/li/libmysqlconnectorcpp/package.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
+ mysql80
];
buildInputs = [
@@ -25,6 +26,8 @@ stdenv.mkDerivation rec {
mysql80
];
+ strictDeps = true;
+
cmakeFlags = [
# libmysqlclient is shared library
"-DMYSQLCLIENT_STATIC_LINKING=false"
diff --git a/pkgs/by-name/li/libnats-c/package.nix b/pkgs/by-name/li/libnats-c/package.nix
index 5d641a386344..d5cbc6e5fdd0 100644
--- a/pkgs/by-name/li/libnats-c/package.nix
+++ b/pkgs/by-name/li/libnats-c/package.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "libnats";
- version = "3.8.2";
+ version = "3.9.1";
src = fetchFromGitHub {
owner = "nats-io";
repo = "nats.c";
rev = "v${version}";
- sha256 = "sha256-Tn88RRigL6C36AcFhUlLbLyqcqbBR8z6PKAQH4w/mYY=";
+ sha256 = "sha256-n6DKkUDNoxTJedrDc/i93Nw0Nq6PXWnFCcUQFL2BI30=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/li/libnvidia-container/package.nix b/pkgs/by-name/li/libnvidia-container/package.nix
index 9b3023813c3f..703943bc2d20 100644
--- a/pkgs/by-name/li/libnvidia-container/package.nix
+++ b/pkgs/by-name/li/libnvidia-container/package.nix
@@ -10,7 +10,6 @@
rpcsvc-proto,
libtirpc,
makeWrapper,
- substituteAll,
removeReferencesTo,
replaceVars,
go,
@@ -23,8 +22,8 @@ let
rev = modprobeVersion;
sha256 = "sha256-iBRMkvOXacs/llTtvc/ZC5i/q9gc8lMuUHxMbu8A+Kg=";
};
- modprobePatch = substituteAll {
- src = ./modprobe.patch;
+ modprobePatch = replaceVars ./modprobe.patch {
+
inherit modprobeVersion;
};
in
diff --git a/pkgs/by-name/li/libselinux/package.nix b/pkgs/by-name/li/libselinux/package.nix
index e77c15e7c7ec..4d5cbbb11e32 100644
--- a/pkgs/by-name/li/libselinux/package.nix
+++ b/pkgs/by-name/li/libselinux/package.nix
@@ -1,94 +1,134 @@
-{ lib, stdenv, fetchurl, buildPackages, pcre2, pkg-config, libsepol
-, enablePython ? !stdenv.hostPlatform.isStatic
-, swig ? null, python3 ? null, python3Packages
-, fts
+{
+ lib,
+ stdenv,
+ fetchurl,
+ fetchpatch,
+ buildPackages,
+ pcre2,
+ pkg-config,
+ libsepol,
+ enablePython ? false,
+ swig ? null,
+ python3 ? null,
+ python3Packages ? null,
+ fts,
}:
assert enablePython -> swig != null && python3 != null;
-stdenv.mkDerivation (rec {
- pname = "libselinux";
- version = "3.7";
- inherit (libsepol) se_url;
+stdenv.mkDerivation (
+ rec {
+ pname = "libselinux";
+ version = "3.7";
+ inherit (libsepol) se_url;
- outputs = [ "bin" "out" "dev" "man" ] ++ lib.optional enablePython "py";
+ outputs = [
+ "bin"
+ "out"
+ "dev"
+ "man"
+ ] ++ lib.optional enablePython "py";
- src = fetchurl {
- url = "${se_url}/${version}/libselinux-${version}.tar.gz";
- hash = "sha256-6gP0LROk+VdXmX26jPCyYyH6xdLxZEGLTMhWqS0rF70=";
- };
+ src = fetchurl {
+ url = "${se_url}/${version}/libselinux-${version}.tar.gz";
+ hash = "sha256-6gP0LROk+VdXmX26jPCyYyH6xdLxZEGLTMhWqS0rF70=";
+ };
- patches = [
- # Make it possible to disable shared builds (for pkgsStatic).
- #
- # We can't use fetchpatch because it processes includes/excludes
- # /after/ stripping the prefix, which wouldn't work here because
- # there would be no way to distinguish between
- # e.g. libselinux/src/Makefile and libsepol/src/Makefile.
- #
- # This is a static email, so we shouldn't have to worry about
- # normalizing the patch.
- (fetchurl {
- url = "https://lore.kernel.org/selinux/20211113141616.361640-1-hi@alyssa.is/raw";
- sha256 = "16a2s2ji9049892i15yyqgp4r20hi1hij4c1s4s8law9jsx65b3n";
- postFetch = ''
- mv "$out" $TMPDIR/patch
- ${buildPackages.patchutils_0_3_3}/bin/filterdiff \
- -i 'a/libselinux/*' --strip 1 <$TMPDIR/patch >"$out"
- '';
- })
+ patches = [
+ # Make it possible to disable shared builds (for pkgsStatic).
+ #
+ # We can't use fetchpatch because it processes includes/excludes
+ # /after/ stripping the prefix, which wouldn't work here because
+ # there would be no way to distinguish between
+ # e.g. libselinux/src/Makefile and libsepol/src/Makefile.
+ #
+ # This is a static email, so we shouldn't have to worry about
+ # normalizing the patch.
+ (fetchurl {
+ url = "https://lore.kernel.org/selinux/20211113141616.361640-1-hi@alyssa.is/raw";
+ hash = "sha256-dqxiupaJK4o00YERGWGIEIhM7sPelxBFQomAFKXQQpk=";
+ postFetch = ''
+ mv "$out" $TMPDIR/patch
+ ${buildPackages.patchutils_0_3_3}/bin/filterdiff \
+ -i 'a/libselinux/*' --strip 1 <$TMPDIR/patch >"$out"
+ '';
+ })
- (fetchurl {
- url = "https://git.yoctoproject.org/meta-selinux/plain/recipes-security/selinux/libselinux/0003-libselinux-restore-drop-the-obsolete-LSF-transitiona.patch?id=62b9c816a5000dc01b28e78213bde26b58cbca9d";
- sha256 = "sha256-RiEUibLVzfiRU6N/J187Cs1iPAih87gCZrlyRVI2abU=";
- })
- ];
+ (fetchurl {
+ url = "https://git.yoctoproject.org/meta-selinux/plain/recipes-security/selinux/libselinux/0003-libselinux-restore-drop-the-obsolete-LSF-transitiona.patch?id=62b9c816a5000dc01b28e78213bde26b58cbca9d";
+ hash = "sha256-RiEUibLVzfiRU6N/J187Cs1iPAih87gCZrlyRVI2abU=";
+ })
- nativeBuildInputs = [ pkg-config python3 ] ++ lib.optionals enablePython [
- python3Packages.pip
- python3Packages.setuptools
- python3Packages.wheel
- swig
- ];
- buildInputs = [ libsepol pcre2 fts ] ++ lib.optionals enablePython [ python3 ];
+ # libselinux: fix swig bindings for 4.3.0
+ (fetchpatch {
+ url = "https://github.com/SELinuxProject/selinux/commit/8e0e718bae53fff30831b92cd784151d475a20da.patch";
+ stripLen = 1;
+ hash = "sha256-8Nd6ketQ7/r5W0sRdheqyGWHJRZ1RfGC4ehTqnHau04=";
+ })
+ ];
- # drop fortify here since package uses it by default, leading to compile error:
- # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
- hardeningDisable = [ "fortify" ];
+ nativeBuildInputs =
+ [
+ pkg-config
+ python3
+ ]
+ ++ lib.optionals enablePython [
+ python3Packages.pip
+ python3Packages.setuptools
+ python3Packages.wheel
+ swig
+ ];
+ buildInputs = [
+ libsepol
+ pcre2
+ fts
+ ] ++ lib.optionals enablePython [ python3 ];
- env.NIX_CFLAGS_COMPILE = "-Wno-error -D_FILE_OFFSET_BITS=64";
+ # drop fortify here since package uses it by default, leading to compile error:
+ # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
+ hardeningDisable = [ "fortify" ];
- makeFlags = [
- "PREFIX=$(out)"
- "INCDIR=$(dev)/include/selinux"
- "INCLUDEDIR=$(dev)/include"
- "MAN3DIR=$(man)/share/man/man3"
- "MAN5DIR=$(man)/share/man/man5"
- "MAN8DIR=$(man)/share/man/man8"
- "SBINDIR=$(bin)/sbin"
- "SHLIBDIR=$(out)/lib"
+ env.NIX_CFLAGS_COMPILE = "-Wno-error -D_FILE_OFFSET_BITS=64";
- "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a"
- "ARCH=${stdenv.hostPlatform.linuxArch}"
- ] ++ lib.optionals (fts != null) [
- "FTS_LDLIBS=-lfts"
- ] ++ lib.optionals stdenv.hostPlatform.isStatic [
- "DISABLE_SHARED=y"
- ] ++ lib.optionals enablePython [
- "PYTHON=${python3.pythonOnBuildForHost.interpreter}"
- "PYTHONLIBDIR=$(py)/${python3.sitePackages}"
- "PYTHON_SETUP_ARGS=--no-build-isolation"
- ];
+ makeFlags =
+ [
+ "PREFIX=$(out)"
+ "INCDIR=$(dev)/include/selinux"
+ "INCLUDEDIR=$(dev)/include"
+ "MAN3DIR=$(man)/share/man/man3"
+ "MAN5DIR=$(man)/share/man/man5"
+ "MAN8DIR=$(man)/share/man/man8"
+ "SBINDIR=$(bin)/sbin"
+ "SHLIBDIR=$(out)/lib"
- preInstall = lib.optionalString enablePython ''
- mkdir -p $py/${python3.sitePackages}/selinux
- '';
+ "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a"
+ "ARCH=${stdenv.hostPlatform.linuxArch}"
+ ]
+ ++ lib.optionals (fts != null) [
+ "FTS_LDLIBS=-lfts"
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isStatic [
+ "DISABLE_SHARED=y"
+ ]
+ ++ lib.optionals enablePython [
+ "PYTHON=${python3.pythonOnBuildForHost.interpreter}"
+ "PYTHONLIBDIR=$(py)/${python3.sitePackages}"
+ "PYTHON_SETUP_ARGS=--no-build-isolation"
+ ];
- installTargets = [ "install" ] ++ lib.optional enablePython "install-pywrap";
+ preInstall = lib.optionalString enablePython ''
+ mkdir -p $py/${python3.sitePackages}/selinux
+ '';
- meta = removeAttrs libsepol.meta ["outputsToInstall"] // {
- description = "SELinux core library";
- };
-} // lib.optionalAttrs (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") {
- NIX_LDFLAGS = "--undefined-version";
-})
+ installTargets = [ "install" ] ++ lib.optional enablePython "install-pywrap";
+
+ meta = removeAttrs libsepol.meta [ "outputsToInstall" ] // {
+ description = "SELinux core library";
+ };
+ }
+ //
+ lib.optionalAttrs (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17")
+ {
+ NIX_LDFLAGS = "--undefined-version";
+ }
+)
diff --git a/pkgs/by-name/li/libsystemtap/package.nix b/pkgs/by-name/li/libsystemtap/package.nix
index c227f689074b..4f19cd1739bf 100644
--- a/pkgs/by-name/li/libsystemtap/package.nix
+++ b/pkgs/by-name/li/libsystemtap/package.nix
@@ -6,12 +6,12 @@
stdenv.mkDerivation {
pname = "libsystemtap";
- version = "5.1";
+ version = "5.2";
src = fetchgit {
url = "git://sourceware.org/git/systemtap.git";
- rev = "release-5.1";
- hash = "sha256-3rhDllsgYGfh1gb5frUrlkzdz57A6lcvBELtgvb5Q7M=";
+ rev = "release-5.2";
+ hash = "sha256-SUPNarZW8vdK9hQaI2kU+rfKWIPiXB4BvJvRNC1T9tU=";
};
dontBuild = true;
diff --git a/pkgs/by-name/li/libtirpc/package.nix b/pkgs/by-name/li/libtirpc/package.nix
index 1a1cf14c9ea8..369eddff60d5 100644
--- a/pkgs/by-name/li/libtirpc/package.nix
+++ b/pkgs/by-name/li/libtirpc/package.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libtirpc";
- version = "1.3.5";
+ version = "1.3.6";
src = fetchurl {
url = "http://git.linux-nfs.org/?p=steved/libtirpc.git;a=snapshot;h=refs/tags/libtirpc-${lib.replaceStrings ["."] ["-"] version};sf=tgz";
- hash = "sha256-bq2zfqfMJsJ6gezLCUTlNiRXJhFxFslY4iW+4kpOPVE=";
+ hash = "sha256-pTUfqnfHOQKCV0svKF/lo4hq1GlD/+YFjXP2CNygx9I=";
name = "${pname}-${version}.tar.gz";
};
diff --git a/pkgs/by-name/li/libtpms/package.nix b/pkgs/by-name/li/libtpms/package.nix
index 5ac368eea9f0..2ce39ffed0a7 100644
--- a/pkgs/by-name/li/libtpms/package.nix
+++ b/pkgs/by-name/li/libtpms/package.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "libtpms";
- version = "0.9.6";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "stefanberger";
repo = "libtpms";
rev = "v${version}";
- sha256 = "sha256-I2TYuOLwgEm6ofF2onWI7j2yu9wpXxNt7lJePSpF9VM=";
+ sha256 = "sha256-YKs/XYJ8UItOtSinl28/G9XFVzobFd4ZDKtClQDLXFk=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libvisual/package.nix b/pkgs/by-name/li/libvisual/package.nix
index 12fae974312b..407d10fb3f7a 100644
--- a/pkgs/by-name/li/libvisual/package.nix
+++ b/pkgs/by-name/li/libvisual/package.nix
@@ -1,51 +1,35 @@
{ lib
, stdenv
-, fetchurl
+, fetchFromGitHub
, fetchpatch
, SDL
, autoreconfHook
+, autoconf-archive
, glib
, pkg-config
}:
stdenv.mkDerivation rec {
pname = "libvisual";
- version = "0.4.1";
+ version = "0.4.2";
- src = fetchurl {
- url = "mirror://sourceforge/libvisual/${pname}-${version}.tar.gz";
- hash = "sha256-qhKHdBf3bTZC2fTHIzAjgNgzF1Y51jpVZB0Bkopd230=";
+ src = fetchFromGitHub {
+ owner = "Libvisual";
+ repo = "libvisual";
+ rev = "libvisual-${version}";
+ hash = "sha256-bDnpQODXB2Z6hezVoh7c6cklp6qpyDzVBAnwZD8Gros=";
};
+ sourceRoot = "${src.name}/libvisual";
+
outputs = [ "out" "dev" ];
- patches = [
- # pull upstream fix for SDL1 cross-compilation.
- # https://github.com/Libvisual/libvisual/pull/238
- (fetchpatch {
- name = "sdl-cross-prereq.patch";
- url = "https://github.com/Libvisual/libvisual/commit/7902d24aa1a552619a5738339b3823e90dd3b865.patch";
- hash = "sha256-84u8klHDAw/q4d+9L4ROAr7XsbXItHrhaEKkTEMSPcc=";
- # remove extra libvisual prefix
- stripLen = 1;
- # pull in only useful configure.ac changes.
- excludes = [ "Makefile.am" ];
- })
- (fetchpatch {
- name = "sdl-cross-pc.patch";
- url = "https://github.com/Libvisual/libvisual/commit/f79a2e8d21ad1d7fe26e2aa83cea4c9f48f9e392.patch";
- hash = "sha256-8c7SdLxXC8K9BAwj7DzozsZAcbs5l1xuBqky9LJ1MfM=";
- # remove extra libvisual prefix
- stripLen = 1;
- })
- ];
-
strictDeps = true;
- nativeBuildInputs = [ autoreconfHook pkg-config ];
+ nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config ];
buildInputs = [ SDL glib ];
configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
- # Remove once "sdl-cross-prereq.patch" patch above is removed.
+ # Remove when 0.5.x is published.
"--disable-lv-tool"
] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
"ac_cv_func_malloc_0_nonnull=yes"
diff --git a/pkgs/by-name/li/libwebsockets/package.nix b/pkgs/by-name/li/libwebsockets/package.nix
index 8cdcd9d19560..af028888b23b 100644
--- a/pkgs/by-name/li/libwebsockets/package.nix
+++ b/pkgs/by-name/li/libwebsockets/package.nix
@@ -5,7 +5,6 @@
, openssl
, zlib
, libuv
-, removeReferencesTo
# External poll is required for e.g. mosquitto, but discouraged by the maintainer.
, withExternalPoll ? false
}:
@@ -25,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl zlib libuv ];
- nativeBuildInputs = [ cmake removeReferencesTo ];
+ nativeBuildInputs = [ cmake ];
cmakeFlags = [
"-DLWS_WITH_PLUGINS=ON"
@@ -43,7 +42,6 @@ stdenv.mkDerivation rec {
);
postInstall = ''
- find "$out" -type f -exec remove-references-to -t ${stdenv.cc.cc} '{}' +
# Fix path that will be incorrect on move to "dev" output.
substituteInPlace "$out/lib/cmake/libwebsockets/LibwebsocketsTargets-release.cmake" \
--replace "\''${_IMPORT_PREFIX}" "$out"
diff --git a/pkgs/by-name/lo/localproxy/package.nix b/pkgs/by-name/lo/localproxy/package.nix
index f693bcb12c04..895f8796fe40 100644
--- a/pkgs/by-name/lo/localproxy/package.nix
+++ b/pkgs/by-name/lo/localproxy/package.nix
@@ -6,11 +6,11 @@
, openssl
, protobuf_21
, catch2
-, boost181
+, boost
, icu
}:
let
- boost = boost181.override { enableStatic = true; };
+ boost' = boost.override { enableStatic = true; };
protobuf = protobuf_21.override { enableShared = false; };
in
stdenv.mkDerivation (finalAttrs: {
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ cmake ];
- buildInputs = [ openssl protobuf catch2 boost icu ];
+ buildInputs = [ openssl protobuf catch2 boost' icu ];
postPatch = ''
sed -i '/set(OPENSSL_USE_STATIC_LIBS TRUE)/d' CMakeLists.txt
diff --git a/pkgs/by-name/lx/lxdvdrip/package.nix b/pkgs/by-name/lx/lxdvdrip/package.nix
index 32b533346dfd..fea6e319cc02 100644
--- a/pkgs/by-name/lx/lxdvdrip/package.nix
+++ b/pkgs/by-name/lx/lxdvdrip/package.nix
@@ -12,9 +12,12 @@ stdenv.mkDerivation rec {
postPatch = ''
sed -i -e s,/usr/local,$out, -e s,/etc,$out/etc,g Makefile
sed -i -e s,/usr/local,$out, mbuffer/Makefile
- makeFlags="$makeFlags PREFIX=$out"
'';
+ makeFlags = [
+ "PREFIX=${placeholder "out"}"
+ ];
+
preInstall = ''
mkdir -p $out/man/man1 $out/bin $out/share $out/etc
'';
diff --git a/pkgs/by-name/ma/man-db/package.nix b/pkgs/by-name/ma/man-db/package.nix
index 9bafa723dcf8..6b1a52dba42a 100644
--- a/pkgs/by-name/ma/man-db/package.nix
+++ b/pkgs/by-name/ma/man-db/package.nix
@@ -11,6 +11,7 @@
, nixosTests
, pkg-config
, stdenv
+, util-linuxMinimal
, zstd
}:
@@ -58,6 +59,7 @@ stdenv.mkDerivation rec {
"--with-systemdtmpfilesdir=${placeholder "out"}/lib/tmpfiles.d"
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
"--with-pager=less"
+ "--with-col=${util-linuxMinimal}/bin/col"
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
"ac_cv_func__set_invalid_parameter_handler=no"
"ac_cv_func_posix_fadvise=no"
diff --git a/pkgs/by-name/md/mdbook/package.nix b/pkgs/by-name/md/mdbook/package.nix
index 4734394cd7e7..d6cec841b3a3 100644
--- a/pkgs/by-name/md/mdbook/package.nix
+++ b/pkgs/by-name/md/mdbook/package.nix
@@ -9,7 +9,7 @@
installShellFiles,
}:
let
- version = "0.4.40";
+ version = "0.4.43";
in
rustPlatform.buildRustPackage {
inherit version;
@@ -19,10 +19,10 @@ rustPlatform.buildRustPackage {
owner = "rust-lang";
repo = "mdBook";
rev = "refs/tags/v${version}";
- hash = "sha256-GGQK2Mf3EK1rwBMzQkAzWAaK6Fh0Qqqf8dtDjZPxOMA=";
+ hash = "sha256-aADNcuIeDef9+a3NOWQxo6IRnKJ6AbkvE4GqvFbubyI=";
};
- cargoHash = "sha256-jriSQHn+Y+EWtwDJeMTAuCCHR7fEtWsErAxbG9a4pts=";
+ cargoHash = "sha256-8K72sJywMKxX/31SJuCEoacWvHrpkuwGGLXJ9MsDkTE=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/mj/mjpegtools/package.nix b/pkgs/by-name/mj/mjpegtools/package.nix
index 147c30fed4c5..ba500f04385c 100644
--- a/pkgs/by-name/mj/mjpegtools/package.nix
+++ b/pkgs/by-name/mj/mjpegtools/package.nix
@@ -16,9 +16,15 @@ stdenv.mkDerivation rec {
sha256 = "sha256-sYBTbX2ZYLBeACOhl7ANyxAJKaSaq3HRnVX0obIQ9Jo=";
};
- # Clang 16 defaults to C++17. `std::auto_ptr` has been removed from C++17, and the
- # `register` type class specifier is no longer allowed.
- patches = [ ./c++-17-fixes.patch ];
+ patches = [
+ # Clang 16 defaults to C++17. `std::auto_ptr` has been removed from C++17,
+ # and the `register` type class specifier is no longer allowed.
+ ./c++-17-fixes.patch
+
+ # Clang-19 errors out for dead code (in header) which accesses undefined
+ # class members
+ ./remove-subtract-and-union-debug.diff
+ ];
hardeningDisable = [ "format" ];
diff --git a/pkgs/by-name/mj/mjpegtools/remove-subtract-and-union-debug.diff b/pkgs/by-name/mj/mjpegtools/remove-subtract-and-union-debug.diff
new file mode 100644
index 000000000000..1d1ff88afcae
--- /dev/null
+++ b/pkgs/by-name/mj/mjpegtools/remove-subtract-and-union-debug.diff
@@ -0,0 +1,347 @@
+diff --git a/y4mdenoise/Region2D.hh b/y4mdenoise/Region2D.hh
+index b44e93f..ebc2821 100644
+--- a/y4mdenoise/Region2D.hh
++++ b/y4mdenoise/Region2D.hh
+@@ -97,35 +97,11 @@ public:
+ // Add the given horizontal extent to the region. Note that
+ // a_tnXEnd is technically one past the end of the extent.
+
+- template
+- void UnionDebug (Status_t &a_reStatus, INDEX a_tnY,
+- INDEX a_tnXStart, INDEX a_tnXEnd, REGION_TEMP &a_rTemp);
+- // Add the given horizontal extent to the region. Note that
+- // a_tnXEnd is technically one past the end of the extent.
+- // Exhaustively (i.e. slowly) verifies the results, using a
+- // much simpler algorithm.
+- // Requires the use of a temporary region, usually of the
+- // final subclass' type, in order to work. (Since that can't
+- // be known at this level, a template parameter is included for
+- // it.)
+-
+ template
+ void Union (Status_t &a_reStatus, const REGION &a_rOther);
+ // Make the current region represent the union between itself
+ // and the other given region.
+
+- template
+- void UnionDebug (Status_t &a_reStatus,
+- REGION_O &a_rOther, REGION_TEMP &a_rTemp);
+- // Make the current region represent the union between itself
+- // and the other given region.
+- // Exhaustively (i.e. slowly) verifies the results, using a
+- // much simpler algorithm.
+- // Requires the use of a temporary region, usually of the
+- // final subclass' type, in order to work. (Since that can't
+- // be known at this level, a template parameter is included for
+- // it.)
+-
+ //void Merge (Status_t &a_reStatus, INDEX a_tnY, INDEX a_tnXStart,
+ // INDEX a_tnXEnd);
+ // Merge this extent into the current region.
+@@ -166,37 +142,12 @@ public:
+ // Subtract the given horizontal extent from the region. Note
+ // that a_tnXEnd is technically one past the end of the extent.
+
+- template
+- void SubtractDebug (Status_t &a_reStatus, INDEX a_tnY,
+- INDEX a_tnXStart, INDEX a_tnXEnd, REGION_TEMP &a_rTemp);
+- // Subtract the given horizontal extent from the region. Note
+- // that a_tnXEnd is technically one past the end of the extent.
+- // Exhaustively (i.e. slowly) verifies the results, using a
+- // much simpler algorithm.
+- // Requires the use of a temporary region, usually of the
+- // final subclass' type, in order to work. (Since that can't
+- // be known at this level, a template parameter is included for
+- // it.)
+-
+ template
+ void Subtract (Status_t &a_reStatus, const REGION &a_rOther);
+ // Subtract the other region from the current region, i.e.
+ // remove from the current region any extents that exist in the
+ // other region.
+
+- template
+- void SubtractDebug (Status_t &a_reStatus, REGION_O &a_rOther,
+- REGION_TEMP &a_rTemp);
+- // Subtract the other region from the current region, i.e.
+- // remove from the current region any extents that exist in the
+- // other region.
+- // Exhaustively (i.e. slowly) verifies the results, using a
+- // much simpler algorithm.
+- // Requires the use of a temporary region, usually of the
+- // final subclass' type, in order to work. (Since that can't
+- // be known at this level, a template parameter is included for
+- // it.)
+-
+ //typedef ... ConstIterator;
+ //ConstIterator Begin (void) const { return m_setExtents.Begin(); }
+ //ConstIterator End (void) const { return m_setExtents.End(); }
+@@ -404,85 +355,6 @@ Region2D::~Region2D()
+
+
+
+-// Add the given horizontal extent to the region.
+-template
+-template
+-void
+-Region2D::UnionDebug (Status_t &a_reStatus, INDEX a_tnY,
+- INDEX a_tnXStart, INDEX a_tnXEnd, REGION_TEMP &a_rTemp)
+-{
+- typename REGION::ConstIterator itHere;
+- typename REGION_TEMP::ConstIterator itHereO;
+- INDEX tnX;
+- // Used to loop through points.
+-
+- // Make sure they didn't start us off with an error.
+- assert (a_reStatus == g_kNoError);
+-
+- // Calculate the union.
+- a_rTemp.Assign (a_reStatus, *this);
+- if (a_reStatus != g_kNoError)
+- return;
+- a_rTemp.Union (a_reStatus, a_tnY, a_tnXStart, a_tnXEnd);
+- if (a_reStatus != g_kNoError)
+- return;
+-
+- // Loop through every point in the result, make sure it's in
+- // one of the two input regions.
+- for (itHereO = a_rTemp.Begin(); itHereO != a_rTemp.End(); ++itHereO)
+- {
+- const Extent &rHere = *itHereO;
+- for (tnX = rHere.m_tnXStart; tnX < rHere.m_tnXEnd; ++tnX)
+- {
+- if (!((rHere.m_tnY == a_tnY
+- && (tnX >= a_tnXStart && tnX < a_tnXEnd))
+- || this->DoesContainPoint (rHere.m_tnY, tnX)))
+- goto error;
+- }
+- }
+-
+- // Loop through every point in the original region, make sure
+- // it's in the result.
+- for (itHere = this->Begin(); itHere != this->End(); ++itHere)
+- {
+- const Extent &rHere = *itHere;
+- for (tnX = rHere.m_tnXStart; tnX < rHere.m_tnXEnd; ++tnX)
+- {
+- if (!a_rTemp.DoesContainPoint (rHere.m_tnY, tnX))
+- goto error;
+- }
+- }
+-
+- // Loop through every point in the added extent, make sure it's in
+- // the result.
+- for (tnX = a_tnXStart; tnX < a_tnXEnd; ++tnX)
+- {
+- if (!a_rTemp.DoesContainPoint (a_tnY, tnX))
+- goto error;
+- }
+-
+- // The operation succeeded. Commit it.
+- Assign (a_reStatus, a_rTemp);
+- if (a_reStatus != g_kNoError)
+- return;
+-
+- // All done.
+- return;
+-
+-error:
+- // Handle deviations.
+- fprintf (stderr, "Region2D::Union() failed\n");
+- fprintf (stderr, "Input region:\n");
+- PrintRegion (*this);
+- fprintf (stderr, "Input extent: [%d,%d-%d]\n",
+- int (a_tnY), int (a_tnXStart), int (a_tnXEnd));
+- fprintf (stderr, "Result:\n");
+- PrintRegion (a_rTemp);
+- assert (false);
+-}
+-
+-
+-
+ // Make the current region represent the union between itself
+ // and the other given region.
+ template
+@@ -513,182 +385,6 @@ Region2D::Union (Status_t &a_reStatus,
+
+
+
+-// Make the current region represent the union between itself
+-// and the other given region.
+-template
+-template
+-void
+-Region2D::UnionDebug (Status_t &a_reStatus,
+- REGION_O &a_rOther, REGION_TEMP &a_rTemp)
+-{
+- typename REGION::ConstIterator itHere;
+- typename REGION_O::ConstIterator itHereO;
+- typename REGION_TEMP::ConstIterator itHereT;
+- INDEX tnX;
+- // Used to loop through points.
+-
+- // Make sure they didn't start us off with an error.
+- assert (a_reStatus == g_kNoError);
+-
+- // Calculate the union.
+- a_rTemp.Assign (a_reStatus, *this);
+- if (a_reStatus != g_kNoError)
+- return;
+- a_rTemp.Union (a_reStatus, a_rOther);
+- if (a_reStatus != g_kNoError)
+- return;
+-
+- // Loop through every point in the result, make sure it's in
+- // one of the two input regions.
+- for (itHereT = a_rTemp.Begin(); itHereT != a_rTemp.End(); ++itHereT)
+- {
+- const Extent &rHere = *itHereT;
+- for (tnX = rHere.m_tnXStart; tnX < rHere.m_tnXEnd; ++tnX)
+- {
+- if (!a_rOther.DoesContainPoint (rHere.m_tnY, tnX)
+- && !this->DoesContainPoint (rHere.m_tnY, tnX))
+- goto error;
+- }
+- }
+-
+- // Loop through every point in the first input region, make sure
+- // it's in the result.
+- for (itHere = this->Begin(); itHere != this->End(); ++itHere)
+- {
+- const Extent &rHere = *itHere;
+- for (tnX = rHere.m_tnXStart; tnX < rHere.m_tnXEnd; ++tnX)
+- {
+- if (!a_rTemp.DoesContainPoint (rHere.m_tnY, tnX))
+- goto error;
+- }
+- }
+-
+- // Loop through every point in the second input region, make sure
+- // it's in the result.
+- for (itHereO = a_rOther.Begin();
+- itHereO != a_rOther.End();
+- ++itHereO)
+- {
+- const Extent &rHere = *itHereO;
+- for (tnX = rHere.m_tnXStart; tnX < rHere.m_tnXEnd; ++tnX)
+- {
+- if (!a_rTemp.DoesContainPoint (rHere.m_tnY, tnX))
+- goto error;
+- }
+- }
+-
+- // The operation succeeded. Commit it.
+- Assign (a_reStatus, a_rTemp);
+- if (a_reStatus != g_kNoError)
+- return;
+-
+- // All done.
+- return;
+-
+-error:
+- // Handle deviations.
+- fprintf (stderr, "Region2D::Union() failed\n");
+- fprintf (stderr, "First input region:\n");
+- PrintRegion (*this);
+- fprintf (stderr, "Second input region:\n");
+- PrintRegion (a_rOther);
+- fprintf (stderr, "Result:\n");
+- PrintRegion (a_rTemp);
+- assert (false);
+-}
+-
+-
+-
+-// Subtract the other region from the current region, i.e.
+-// remove from the current region any areas that exist in the
+-// other region.
+-template
+-template
+-void
+-Region2D::SubtractDebug (Status_t &a_reStatus,
+- REGION_O &a_rOther, REGION_TEMP &a_rTemp)
+-{
+- typename REGION::ConstIterator itHere;
+- typename REGION_O::ConstIterator itHereO;
+- typename REGION_TEMP::ConstIterator itHereT;
+- INDEX tnX;
+- // Used to loop through points.
+-
+- // Make sure they didn't start us off with an error.
+- assert (a_reStatus == g_kNoError);
+-
+- // Calculate the difference.
+- a_rTemp.Assign (a_reStatus, *this);
+- if (a_reStatus != g_kNoError)
+- return;
+- a_rTemp.Subtract (a_reStatus, a_rOther);
+- if (a_reStatus != g_kNoError)
+- return;
+-
+- // Loop through every point in the result, make sure it's in
+- // the first input region but not the second.
+- for (itHereT = a_rTemp.Begin(); itHereT != a_rTemp.End(); ++itHereT)
+- {
+- const Extent &rHere = *itHereT;
+- for (tnX = rHere.m_tnXStart; tnX < rHere.m_tnXEnd; ++tnX)
+- {
+- if (!(this->DoesContainPoint (rHere.m_tnY, tnX)
+- && !a_rOther.DoesContainPoint (rHere.m_tnY, tnX)))
+- goto error;
+- }
+- }
+-
+- // Loop through every point in the first input region, and if it's
+- // not in the second input region, make sure it's in the result.
+- for (itHere = this->Begin(); itHere != this->End(); ++itHere)
+- {
+- const Extent &rHere = *itHere;
+- for (tnX = rHere.m_tnXStart; tnX < rHere.m_tnXEnd; ++tnX)
+- {
+- if (!a_rOther.DoesContainPoint (rHere.m_tnY, tnX))
+- {
+- if (!a_rTemp.DoesContainPoint (rHere.m_tnY, tnX))
+- goto error;
+- }
+- }
+- }
+-
+- // Loop through every point in the second input region, make sure
+- // it's not in the result.
+- for (itHereO = a_rOther.Begin();
+- itHereO != a_rOther.End();
+- ++itHereO)
+- {
+- const Extent &rHere = *itHere;
+- for (tnX = rHere.m_tnXStart; tnX < rHere.m_tnXEnd; ++tnX)
+- {
+- if (a_rTemp.DoesContainPoint (rHere.m_tnY, tnX))
+- goto error;
+- }
+- }
+-
+- // The operation succeeded. Commit it.
+- Assign (a_reStatus, a_rTemp);
+- if (a_reStatus != g_kNoError)
+- return;
+-
+- // All done.
+- return;
+-
+-error:
+- // Handle deviations.
+- fprintf (stderr, "Region2D::Subtract() failed\n");
+- fprintf (stderr, "First input region:\n");
+- PrintRegion (*this);
+- fprintf (stderr, "Second input region:\n");
+- PrintRegion (a_rOther);
+- fprintf (stderr, "Result:\n");
+- PrintRegion (a_rTemp);
+- assert (false);
+-}
+-
+-
+-
+ // Flood-fill the current region.
+ template
+ template
diff --git a/pkgs/by-name/mo/molden/package.nix b/pkgs/by-name/mo/molden/package.nix
index 7a15ef9363b5..e96165052ba5 100644
--- a/pkgs/by-name/mo/molden/package.nix
+++ b/pkgs/by-name/mo/molden/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
substituteInPlace ambfor/makefile --replace 'FFLAGS =' 'FFLAGS = -fallow-argument-mismatch'
- sed -in '/^# DO NOT DELETE THIS LINE/q;' surf/Makefile
+ sed -i '/^# DO NOT DELETE THIS LINE/q;' surf/Makefile
'';
preInstall = ''
diff --git a/pkgs/by-name/mu/multipath-tools/package.nix b/pkgs/by-name/mu/multipath-tools/package.nix
index 9fe8630e2275..d1c5edb7b1bb 100644
--- a/pkgs/by-name/mu/multipath-tools/package.nix
+++ b/pkgs/by-name/mu/multipath-tools/package.nix
@@ -61,6 +61,7 @@ stdenv.mkDerivation rec {
systemd
util-linuxMinimal # for libmount
];
+ strictDeps = true;
makeFlags = [
"LIB=lib"
@@ -77,7 +78,7 @@ stdenv.mkDerivation rec {
# skip test attempting to access /sys/dev/block
substituteInPlace tests/Makefile --replace-fail ' devt ' ' '
'';
- nativeCheckInputs = [ cmocka ];
+ checkInputs = [ cmocka ];
passthru.tests = { inherit (nixosTests) iscsi-multipath-root; };
diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix
index fb185d85f646..6ba5b838696b 100644
--- a/pkgs/by-name/ne/neovim-unwrapped/package.nix
+++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
- removeReferencesTo,
cmake,
gettext,
msgpack-c,
@@ -163,7 +162,6 @@ stdenv.mkDerivation (
cmake
gettext
pkg-config
- removeReferencesTo
];
# extra programs test via `make functionaltest`
@@ -189,22 +187,8 @@ stdenv.mkDerivation (
sed -i src/nvim/po/CMakeLists.txt \
-e "s|\$ ss;
++ std::basic_ostringstream ss;
+ json::to_bson(json_representation, ss);
+ json j3 = json::from_bson(ss.str());
+ CHECK(json_representation == j3);
+diff --git a/tests/src/unit-cbor.cpp b/tests/src/unit-cbor.cpp
+index be94d2f..2b396b7 100644
+--- a/tests/src/unit-cbor.cpp
++++ b/tests/src/unit-cbor.cpp
+@@ -1881,7 +1881,7 @@ TEST_CASE("single CBOR roundtrip")
+ {
+ SECTION("std::ostringstream")
+ {
+- std::basic_ostringstream ss;
++ std::basic_ostringstream ss;
+ json::to_cbor(j1, ss);
+ json j3 = json::from_cbor(ss.str());
+ CHECK(j1 == j3);
+diff --git a/tests/src/unit-deserialization.cpp b/tests/src/unit-deserialization.cpp
+index 3bc161f..e4918b0 100644
+--- a/tests/src/unit-deserialization.cpp
++++ b/tests/src/unit-deserialization.cpp
+@@ -1131,13 +1131,11 @@ TEST_CASE("deserialization")
+ }
+ }
+
++
+ TEST_CASE_TEMPLATE("deserialization of different character types (ASCII)", T,
+- char, unsigned char, signed char,
++ char,
+ wchar_t,
+- char16_t, char32_t,
+- std::uint8_t, std::int8_t,
+- std::int16_t, std::uint16_t,
+- std::int32_t, std::uint32_t)
++ char16_t, char32_t)
+ {
+ std::vector const v = {'t', 'r', 'u', 'e'};
+ CHECK(json::parse(v) == json(true));
+@@ -1163,7 +1161,7 @@ TEST_CASE_TEMPLATE("deserialization of different character types (UTF-8)", T,
+ }
+
+ TEST_CASE_TEMPLATE("deserialization of different character types (UTF-16)", T,
+- char16_t, std::uint16_t)
++ char16_t)
+ {
+ // a star emoji
+ std::vector const v = {static_cast('"'), static_cast(0x2b50), static_cast(0xfe0f), static_cast('"')};
+@@ -1176,7 +1174,7 @@ TEST_CASE_TEMPLATE("deserialization of different character types (UTF-16)", T,
+ }
+
+ TEST_CASE_TEMPLATE("deserialization of different character types (UTF-32)", T,
+- char32_t, std::uint32_t)
++ char32_t)
+ {
+ // a star emoji
+ std::vector const v = {static_cast('"'), static_cast(0x2b50), static_cast(0xfe0f), static_cast('"')};
+diff --git a/tests/src/unit-msgpack.cpp b/tests/src/unit-msgpack.cpp
+index 61162af..cfbb1fa 100644
+--- a/tests/src/unit-msgpack.cpp
++++ b/tests/src/unit-msgpack.cpp
+@@ -1604,7 +1604,7 @@ TEST_CASE("single MessagePack roundtrip")
+ {
+ SECTION("std::ostringstream")
+ {
+- std::basic_ostringstream ss;
++ std::basic_ostringstream ss;
+ json::to_msgpack(j1, ss);
+ json j3 = json::from_msgpack(ss.str());
+ CHECK(j1 == j3);
+diff --git a/tests/src/unit-regression2.cpp b/tests/src/unit-regression2.cpp
+index fab9aae..98947c5 100644
+--- a/tests/src/unit-regression2.cpp
++++ b/tests/src/unit-regression2.cpp
+@@ -674,6 +674,7 @@ TEST_CASE("regression tests 2")
+ CHECK(j.dump() == "{}");
+ }
+
++#if 0
+ #ifdef JSON_HAS_CPP_20
+ #if __has_include()
+ SECTION("issue #2546 - parsing containers of std::byte")
+@@ -684,6 +685,7 @@ TEST_CASE("regression tests 2")
+ CHECK(j.dump() == "\"Hello, world!\"");
+ }
+ #endif
++#endif
+ #endif
+
+ SECTION("issue #2574 - Deserialization to std::array, std::pair, and std::tuple with non-default constructable types fails")
diff --git a/pkgs/by-name/nl/nlohmann_json/package.nix b/pkgs/by-name/nl/nlohmann_json/package.nix
index d690cc45b2f9..8acc3d2d27ec 100644
--- a/pkgs/by-name/nl/nlohmann_json/package.nix
+++ b/pkgs/by-name/nl/nlohmann_json/package.nix
@@ -21,6 +21,12 @@ in stdenv.mkDerivation (finalAttrs: {
hash = "sha256-7F0Jon+1oWL7uqet5i1IgHX0fUw/+z0QwEcA3zs5xHg=";
};
+ patches = lib.optionals stdenv.cc.isClang [
+ # tests fail to compile on clang-19
+ # https://github.com/nlohmann/json/issues/4490
+ ./make-tests-build-clang-19.diff
+ ];
+
nativeBuildInputs = [ cmake ];
cmakeFlags = [
diff --git a/pkgs/by-name/no/notemap/package.nix b/pkgs/by-name/no/notemap/package.nix
index 0611665d6618..040f26752b51 100644
--- a/pkgs/by-name/no/notemap/package.nix
+++ b/pkgs/by-name/no/notemap/package.nix
@@ -3,7 +3,6 @@
, fetchzip
, pkg-config
, libressl
-, memstreamHook
}:
stdenv.mkDerivation rec {
@@ -21,8 +20,6 @@ stdenv.mkDerivation rec {
buildInputs = [
libressl
- ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
- memstreamHook
];
meta = {
diff --git a/pkgs/by-name/np/np2kai/package.nix b/pkgs/by-name/np/np2kai/package.nix
index 0fc56e284417..bea767d0ed07 100644
--- a/pkgs/by-name/np/np2kai/package.nix
+++ b/pkgs/by-name/np/np2kai/package.nix
@@ -124,7 +124,8 @@ stdenv.mkDerivation rec {
configurePhase = ''
export GIT_VERSION=${builtins.substring 0 7 src.rev}
- buildFlags="$buildFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES}"
+ '' + optionalString enableParallelBuilding ''
+ appendToVar buildFlags "-j$NIX_BUILD_CORES"
'' + optionalString enableX11 ''
cd x11
substituteInPlace Makefile.am \
diff --git a/pkgs/by-name/nu/nuweb/package.nix b/pkgs/by-name/nu/nuweb/package.nix
index bc7841843a8d..99fca7df950d 100644
--- a/pkgs/by-name/nu/nuweb/package.nix
+++ b/pkgs/by-name/nu/nuweb/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ texliveMedium ];
patchPhase = ''
- sed -ie 's|nuweb -r|./nuweb -r|' Makefile
+ sed -i -e 's|nuweb -r|./nuweb -r|' Makefile
'';
# Workaround build failure on -fno-common toolchains like upstream
diff --git a/pkgs/by-name/oc/octoprint/package.nix b/pkgs/by-name/oc/octoprint/package.nix
index a4b437ac6d1c..e1808f8824e4 100644
--- a/pkgs/by-name/oc/octoprint/package.nix
+++ b/pkgs/by-name/oc/octoprint/package.nix
@@ -34,6 +34,7 @@ let
flask = super.flask.overridePythonAttrs (oldAttrs: rec {
version = "2.2.5";
format = "setuptools";
+ pyproject = null;
src = fetchPypi {
pname = "Flask";
inherit version;
diff --git a/pkgs/by-name/op/openh264/package.nix b/pkgs/by-name/op/openh264/package.nix
index 12048b593dd0..a8a74377e4ff 100644
--- a/pkgs/by-name/op/openh264/package.nix
+++ b/pkgs/by-name/op/openh264/package.nix
@@ -1,6 +1,5 @@
{ lib
, fetchFromGitHub
-, fetchpatch2
, gtest
, meson
, nasm
@@ -12,27 +11,21 @@
stdenv.mkDerivation (finalAttrs: {
pname = "openh264";
- version = "2.4.1";
+ version = "2.5.0";
src = fetchFromGitHub {
owner = "cisco";
repo = "openh264";
rev = "v${finalAttrs.version}";
- hash = "sha256-ai7lcGcQQqpsLGSwHkSs7YAoEfGCIbxdClO6JpGA+MI=";
+ hash = "sha256-K8p94P4XO6bUWCJuT6jR5Kmz3lamNDyclGWgsV6Lf9I=";
};
- patches = [
- # build: fix build with meson on riscv64
- # https://github.com/cisco/openh264/pull/3773
- (fetchpatch2 {
- name = "openh264-riscv64.patch";
- url = "https://github.com/cisco/openh264/commit/cea886eda8fae7ba42c4819e6388ce8fc633ebf6.patch";
- hash = "sha256-ncXuGgogXA7JcCOjGk+kBprmOErFohrYjYzZYzAbbDQ=";
- })
- ];
-
outputs = [ "out" "dev" ];
+ postPatch = ''
+ substituteInPlace meson.build --replace-fail "'-Werror'," ""
+ '';
+
nativeBuildInputs = [
meson
nasm
diff --git a/pkgs/by-name/op/openjpeg/exclude-tests b/pkgs/by-name/op/openjpeg/exclude-tests
new file mode 100644
index 000000000000..3006eda409f4
--- /dev/null
+++ b/pkgs/by-name/op/openjpeg/exclude-tests
@@ -0,0 +1,55 @@
+Found-But-No-Test-issue1472-bigloop.j2k
+Found-But-No-Test-small_world_non_consecutive_tilepart_tlm.jp2
+NR-C1P0-p0_04.j2k-compare2base
+NR-C1P0-p0_05.j2k-compare2base
+NR-C1P0-p0_06.j2k-compare2base
+NR-C1P1-p1_02.j2k-compare2base
+NR-C1P1-p1_03.j2k-compare2base
+NR-C1P1-p1_04.j2k-compare2base
+NR-C1P1-p1_05.j2k-compare2base
+NR-DEC-Bretagne1_ht_lossy.j2k-311-decode-md5
+NR-DEC-CT_Phillips_JPEG2K_Decompr_Problem.j2k-13-decode-md5
+NR-DEC-Marrin.jp2-18-decode-md5
+NR-DEC-_00042.j2k-2-decode-md5
+NR-DEC-buxI.j2k-9-decode-md5
+NR-DEC-db11217111510058.jp2-306-decode-md5
+NR-DEC-file409752.jp2-40-decode-md5
+NR-DEC-issue134.jp2-67-decode-md5
+NR-DEC-issue135.j2k-68-decode-md5
+NR-DEC-issue142.j2k-66-decode-md5
+NR-DEC-issue188_beach_64bitsbox.jp2-41-decode-md5
+NR-DEC-issue205.jp2-253-decode-md5
+NR-DEC-issue205.jp2-43-decode-md5
+NR-DEC-issue206_image-000.jp2-42-decode-md5
+NR-DEC-issue208.jp2-69-decode-md5
+NR-DEC-issue211.jp2-70-decode-md5
+NR-DEC-issue226.j2k-74-decode
+NR-DEC-issue226.j2k-74-decode-md5
+NR-DEC-issue228.j2k-60-decode-md5
+NR-DEC-issue236-ESYCC-CDEF.jp2-254-decode-md5
+NR-DEC-issue414.jp2-110-decode-md5
+NR-DEC-issue559-eci-090-CIELab.jp2-255-decode-md5
+NR-DEC-issue559-eci-091-CIELab.jp2-256-decode-md5
+NR-DEC-kodak_2layers_lrcp.j2c-31-decode-md5
+NR-DEC-kodak_2layers_lrcp.j2c-32-decode-md5
+NR-DEC-p0_04.j2k-166-decode-md5
+NR-DEC-p0_04.j2k-167-decode-md5
+NR-DEC-p0_04.j2k-168-decode-md5
+NR-DEC-p0_04.j2k-172-decode-md5
+NR-DEC-p1_04.j2k-124-decode-md5
+NR-DEC-p1_04.j2k-125-decode-md5
+NR-DEC-p1_04.j2k-126-decode-md5
+NR-DEC-p1_04.j2k-127-decode-md5
+NR-DEC-p1_04.j2k-128-decode-md5
+NR-DEC-p1_04.j2k-129-decode-md5
+NR-DEC-p1_04.j2k-131-decode-md5
+NR-DEC-p1_04.j2k-134-decode-md5
+NR-DEC-p1_04.j2k-138-decode-md5
+NR-DEC-p1_04.j2k-140-decode-md5
+NR-DEC-tnsot_zero.jp2-307-decode-md5
+NR-JP2-file2.jp2-compare2base
+NR-JP2-file3.jp2-compare2base
+NR-RIC-subsampling_1.jp2-compare2base
+NR-RIC-subsampling_2.jp2-compare2base
+NR-RIC-zoo1.jp2-compare2base
+NR-RIC-zoo2.jp2-compare2base
diff --git a/pkgs/by-name/op/openjpeg/package.nix b/pkgs/by-name/op/openjpeg/package.nix
index 0bfa1067a7f7..15296d33b85d 100644
--- a/pkgs/by-name/op/openjpeg/package.nix
+++ b/pkgs/by-name/op/openjpeg/package.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
-, libpng, libtiff, zlib, lcms2, jpylyzer
+, libpng, libtiff, zlib, lcms2
, jpipLibSupport ? false # JPIP library & executables
, jpipServerSupport ? false, curl, fcgi # JPIP Server
, jdk
@@ -18,9 +18,15 @@
}:
let
- mkFlag = optSet: flag: "-D${flag}=${if optSet then "ON" else "OFF"}";
+ # may need to get updated with package
+ # https://github.com/uclouvain/openjpeg-data
+ test-data = fetchFromGitHub {
+ owner = "uclouvain";
+ repo = "openjpeg-data";
+ rev = "a428429db695fccfc6d698bd13b6937dffd9d005";
+ hash = "sha256-udUi7sPNQJ5uCIAM8SqMGee6vRj1QbF9pLjdpNTQE5k=";
+ };
in
-
stdenv.mkDerivation rec {
pname = "openjpeg";
version = "2.5.2";
@@ -35,16 +41,15 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
cmakeFlags = [
- "-DCMAKE_INSTALL_NAME_DIR=\${CMAKE_INSTALL_PREFIX}/lib"
- "-DBUILD_SHARED_LIBS=ON"
+ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
"-DBUILD_CODEC=ON"
"-DBUILD_THIRDPARTY=OFF"
- (mkFlag jpipLibSupport "BUILD_JPIP")
- (mkFlag jpipServerSupport "BUILD_JPIP_SERVER")
+ (lib.cmakeBool "BUILD_JPIP" jpipLibSupport)
+ (lib.cmakeBool "BUILD_JPIP_SERVER" jpipServerSupport)
"-DBUILD_VIEWER=OFF"
"-DBUILD_JAVA=OFF"
- (mkFlag doCheck "BUILD_TESTING")
- ];
+ (lib.cmakeBool "BUILD_TESTING" doCheck)
+ ] ++ lib.optional doCheck "-DOPJ_DATA_ROOT=${test-data}";
nativeBuildInputs = [ cmake pkg-config ];
@@ -52,12 +57,15 @@ stdenv.mkDerivation rec {
++ lib.optionals jpipServerSupport [ curl fcgi ]
++ lib.optional (jpipLibSupport) jdk;
- doCheck = (!stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isPower64); # tests fail on aarch64-linux and powerpc64
- nativeCheckInputs = [ jpylyzer ];
+ # tests did fail on powerpc64
+ doCheck = !stdenv.hostPlatform.isPower64
+ && stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
checkPhase = ''
- substituteInPlace ../tools/ctest_scripts/travis-ci.cmake \
- --replace "JPYLYZER_EXECUTABLE=" "JPYLYZER_EXECUTABLE=\"$(command -v jpylyzer)\" # "
- OPJ_SOURCE_DIR=.. ctest -S ../tools/ctest_scripts/travis-ci.cmake
+ runHook preCheck
+ ctest -j $NIX_BUILD_CORES \
+ -E '.*jpylyser' --exclude-from-file ${./exclude-tests}
+ runHook postCheck
'';
passthru = {
diff --git a/pkgs/by-name/op/openldap/package.nix b/pkgs/by-name/op/openldap/package.nix
index 453cb1dfebde..5a941240559a 100644
--- a/pkgs/by-name/op/openldap/package.nix
+++ b/pkgs/by-name/op/openldap/package.nix
@@ -17,11 +17,11 @@
stdenv.mkDerivation rec {
pname = "openldap";
- version = "2.6.8";
+ version = "2.6.9";
src = fetchurl {
url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${pname}-${version}.tgz";
- hash = "sha256-SJaTI+lOO+OwPGoTKULcun741UXyrTVAFwkBn2lsPE4=";
+ hash = "sha256-LLfcc+nINA3/DZk1f7qleKvzDMZhnwUhlyxVVoHmsv8=";
};
# TODO: separate "out" and "bin"
diff --git a/pkgs/by-name/op/openmolcas/package.nix b/pkgs/by-name/op/openmolcas/package.nix
index ed3f74e7656a..35d244cec9a0 100644
--- a/pkgs/by-name/op/openmolcas/package.nix
+++ b/pkgs/by-name/op/openmolcas/package.nix
@@ -14,7 +14,7 @@
libxc,
makeWrapper,
gsl,
- boost180,
+ boost,
autoPatchelfHook,
enableQcmaquis ? false,
# Note that the CASPT2 module is broken with MPI
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
armadillo
libxc
gsl.dev
- boost180
+ boost
]
++ lib.optionals enableMpi [
mpi
diff --git a/pkgs/by-name/os/ossia-score/package.nix b/pkgs/by-name/os/ossia-score/package.nix
index ee8e0a99a948..bce8a7b33fd4 100644
--- a/pkgs/by-name/os/ossia-score/package.nix
+++ b/pkgs/by-name/os/ossia-score/package.nix
@@ -8,7 +8,7 @@
, avahi
, avahi-compat
, bluez
-, boost185
+, boost
, fmt
, ffmpeg
, fftw
@@ -43,13 +43,13 @@
clangStdenv.mkDerivation (finalAttrs: {
pname = "ossia-score";
- version = "3.2.4";
+ version = "3.3.2";
src = fetchFromGitHub {
owner = "ossia";
repo = "score";
rev = "v${finalAttrs.version}";
- hash = "sha256-O9v7hhBHVi4OuuCebG3bvjp/MOYu1iPv+lji/wS4O7o=";
+ hash = "sha256-RMPsZIUZNWnnezxdZhW9oA0Cprb89NQhpwX9THHYN4M=";
fetchSubmodules = true;
};
@@ -57,7 +57,7 @@ clangStdenv.mkDerivation (finalAttrs: {
buildInputs = [
alsa-lib
- boost185
+ boost
avahi
avahi-compat
bluez
diff --git a/pkgs/by-name/p1/p11-kit/package.nix b/pkgs/by-name/p1/p11-kit/package.nix
index 316265e07bef..b520c7087ba7 100644
--- a/pkgs/by-name/p1/p11-kit/package.nix
+++ b/pkgs/by-name/p1/p11-kit/package.nix
@@ -60,11 +60,6 @@ stdenv.mkDerivation rec {
]))
];
- ${if stdenv.buildPlatform.isDarwin && stdenv.buildPlatform.isx86_64 then "mesonCheckFlags" else null} = [
- # Tests regularly exceed the default timeout on `x86_64-darwin`.
- "--timeout-multiplier=0"
- ];
-
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
postPatch = ''
diff --git a/pkgs/by-name/pa/pacparser/package.nix b/pkgs/by-name/pa/pacparser/package.nix
index dfef255c15c9..82d24f99c6f4 100644
--- a/pkgs/by-name/pa/pacparser/package.nix
+++ b/pkgs/by-name/pa/pacparser/package.nix
@@ -11,10 +11,12 @@ stdenv.mkDerivation rec {
sha256 = "sha256-X842+xPjM404aQJTc2JwqU4vq8kgyKhpnqVu70pNLks=";
};
- makeFlags = [ "NO_INTERNET=1" ];
+ makeFlags = [
+ "NO_INTERNET=1"
+ "PREFIX=${placeholder "out"}"
+ ];
preConfigure = ''
- export makeFlags="$makeFlags PREFIX=$out"
patchShebangs tests/runtests.sh
cd src
'';
diff --git a/pkgs/by-name/pa/patchPpdFilesHook/patch-ppd-hook.sh b/pkgs/by-name/pa/patchPpdFilesHook/patch-ppd-hook.sh
index 77322b245b27..822714636415 100644
--- a/pkgs/by-name/pa/patchPpdFilesHook/patch-ppd-hook.sh
+++ b/pkgs/by-name/pa/patchPpdFilesHook/patch-ppd-hook.sh
@@ -174,7 +174,7 @@ patchPpdFileCommands () {
# The end result might contain too many
# propagated dependencies for multi-output packages,
# but never a broken package.
- propagatedBuildInputs+=("$path")
+ appendToVar propagatedBuildInputs "$path"
done < sorted-dependencies
fi
diff --git a/pkgs/by-name/pg/pg-dump-anon/package.nix b/pkgs/by-name/pg/pg-dump-anon/package.nix
index a097eb8aa9c7..7eada77bfb17 100644
--- a/pkgs/by-name/pg/pg-dump-anon/package.nix
+++ b/pkgs/by-name/pg/pg-dump-anon/package.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitLab, buildGoModule, nixosTests, postgresql_17, makeWrapper }:
+{ lib, fetchFromGitLab, buildGoModule, nixosTests, postgresql, makeWrapper }:
buildGoModule rec {
pname = "pg-dump-anon";
@@ -19,7 +19,7 @@ buildGoModule rec {
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
wrapProgram $out/bin/pg_dump_anon \
- --prefix PATH : ${lib.makeBinPath [ postgresql_17 ]}
+ --prefix PATH : ${lib.makeBinPath [ postgresql ]}
'';
meta = with lib; {
diff --git a/pkgs/by-name/pn/pngtoico/package.nix b/pkgs/by-name/pn/pngtoico/package.nix
index a537e16d96ae..b7347ca09a3b 100644
--- a/pkgs/by-name/pn/pngtoico/package.nix
+++ b/pkgs/by-name/pn/pngtoico/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
patches = [
(fetchpatch {
- url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/pngtoico/files/pngtoico-1.0.1-libpng15.patch";
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/pngtoico/files/pngtoico-1.0.1-libpng15.patch?id=dec60bb6900d6ebdaaa6aa1dcb845b30b739f9b5";
hash = "sha256-MeRV4FL37Wq7aFRnjbxPokcBKmPM+h94cnFJmdvHAt0=";
})
];
diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix
index ddbbe8781a4e..8f77670f467f 100644
--- a/pkgs/by-name/pr/pretix/package.nix
+++ b/pkgs/by-name/pr/pretix/package.nix
@@ -13,16 +13,6 @@ let
python = python3.override {
self = python;
packageOverrides = self: super: {
- bleach = super.bleach.overridePythonAttrs (oldAttrs: rec {
- version = "5.0.1";
-
- src = fetchPypi {
- pname = "bleach";
- inherit version;
- hash = "sha256-DQMlXEfrm9Lyaqm7fyEHcy5+j+GVyi9kcJ/POwpKCFw=";
- };
- });
-
django = super.django_4;
django-oauth-toolkit = super.django-oauth-toolkit.overridePythonAttrs (oldAttrs: {
@@ -51,13 +41,13 @@ let
};
pname = "pretix";
- version = "2024.10.0";
+ version = "2024.11.0";
src = fetchFromGitHub {
owner = "pretix";
repo = "pretix";
rev = "refs/tags/v${version}";
- hash = "sha256-MCiCr00N7894DjckAw3vpxdiNtlgzqivlbSY4A/327E=";
+ hash = "sha256-vmk7oW9foXkZdt3XOLJDbPldX2TruJOgd8mmi5tGqNw=";
};
npmDeps = buildNpmPackage {
@@ -65,7 +55,7 @@ let
inherit version src;
sourceRoot = "${src.name}/src/pretix/static/npm_dir";
- npmDepsHash = "sha256-PPcA6TBsU/gGk4wII+w7VZOm65nS7qGjZ/UoQs31s9M=";
+ npmDepsHash = "sha256-4PrOrI2cykkuzob+DMeAu/GF5OMCho40G3BjCwVW/tE=";
dontBuild = true;
diff --git a/pkgs/by-name/pr/pretix/plugins/pages.nix b/pkgs/by-name/pr/pretix/plugins/pages.nix
index 97e409679385..020436d8f43c 100644
--- a/pkgs/by-name/pr/pretix/plugins/pages.nix
+++ b/pkgs/by-name/pr/pretix/plugins/pages.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "pretix-pages";
- version = "1.6.2";
+ version = "1.6.3";
pyproject = true;
src = fetchFromGitHub {
owner = "pretix";
repo = "pretix-pages";
rev = "v${version}";
- hash = "sha256-0pTFGCgtt/JGviTLsZFwgx93TD8ArLwZGfWoSYv5XuY=";
+ hash = "sha256-ZM38zHlFB5013PvoJwm7YC5/wHg2GZWmrhvreXuqNc8=";
};
build-system = [
diff --git a/pkgs/by-name/pr/pretix/plugins/zugferd.nix b/pkgs/by-name/pr/pretix/plugins/zugferd.nix
index e7aeb78b346f..bada0bbc9bfd 100644
--- a/pkgs/by-name/pr/pretix/plugins/zugferd.nix
+++ b/pkgs/by-name/pr/pretix/plugins/zugferd.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "pretix-zugferd";
- version = "2.2.1";
+ version = "2.2.2";
pyproject = true;
src = fetchFromGitHub {
owner = "pretix";
repo = "pretix-zugferd";
rev = "v${version}";
- hash = "sha256-AJbrx1n32YAZnJGYX67qqaEnOeegYfSUEekvQnmjt+0=";
+ hash = "sha256-urf5HrC3Y64hH+U738t9fchoeR2sawlJAQoLFtwebA4=";
};
postPatch = ''
diff --git a/pkgs/by-name/ps/ps2eps/package.nix b/pkgs/by-name/ps/ps2eps/package.nix
index c8f558889c60..88d295b03c66 100644
--- a/pkgs/by-name/ps/ps2eps/package.nix
+++ b/pkgs/by-name/ps/ps2eps/package.nix
@@ -1,7 +1,7 @@
{ lib
, fetchFromGitHub
, perlPackages
-, substituteAll
+, replaceVars
, ghostscript
, installShellFiles
}:
@@ -18,11 +18,11 @@ perlPackages.buildPerlPackage rec {
hash = "sha256-SPLwsGKLVhANoqSQ/GJ938cYjbjMbUOXkNn9so3aJTA=";
};
patches = [
- (substituteAll {
- src = ./hardcode-deps.patch;
+ (replaceVars ./hardcode-deps.patch {
gs = "${ghostscript}/bin/gs";
- # bbox cannot be substituted here because substituteAll doesn't know what
+ # bbox cannot be substituted here because replaceVars doesn't know what
# will be the $out path of the main derivation
+ bbox = null;
})
];
diff --git a/pkgs/by-name/pu/pugixml/package.nix b/pkgs/by-name/pu/pugixml/package.nix
index fc0eb1dfa291..dbfb68801592 100644
--- a/pkgs/by-name/pu/pugixml/package.nix
+++ b/pkgs/by-name/pu/pugixml/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
preConfigure = ''
# Enable long long support (required for filezilla)
- sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' src/pugiconfig.hpp
+ sed -i -e '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' src/pugiconfig.hpp
'';
meta = with lib; {
diff --git a/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix b/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix
index c83d08fc828f..5e62dd7a6386 100644
--- a/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix
+++ b/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
mv pulseaudio-* pulseaudio-src
chmod +w -Rv pulseaudio-src
cp ${pulseaudio.dev}/include/pulse/config.h pulseaudio-src
- configureFlags="$configureFlags PULSE_DIR=$(realpath ./pulseaudio-src)"
+ appendToVar configureFlags "PULSE_DIR=$(realpath ./pulseaudio-src)"
'';
installPhase = ''
diff --git a/pkgs/by-name/qu/quantlib/package.nix b/pkgs/by-name/qu/quantlib/package.nix
index aad65c6045db..0bd608ceb728 100644
--- a/pkgs/by-name/qu/quantlib/package.nix
+++ b/pkgs/by-name/qu/quantlib/package.nix
@@ -2,7 +2,7 @@
, stdenv
, fetchFromGitHub
, cmake
-, boost186 # (boost181) breaks on darwin
+, boost
}:
stdenv.mkDerivation (finalAttrs: {
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
};
nativeBuildInputs = [ cmake ];
- buildInputs = [ boost186 ];
+ buildInputs = [ boost ];
# Required by RQuantLib, may be beneficial for others too
cmakeFlags = [ "-DQL_HIGH_RESOLUTION_DATE=ON" ];
diff --git a/pkgs/by-name/ra/rapidjson/char_traits-clang-19-errors.diff b/pkgs/by-name/ra/rapidjson/char_traits-clang-19-errors.diff
new file mode 100644
index 000000000000..c057b3c1ec6a
--- /dev/null
+++ b/pkgs/by-name/ra/rapidjson/char_traits-clang-19-errors.diff
@@ -0,0 +1,22 @@
+diff --git a/test/unittest/writertest.cpp b/test/unittest/writertest.cpp
+index 4c24121..66c9087 100644
+--- a/test/unittest/writertest.cpp
++++ b/test/unittest/writertest.cpp
+@@ -386,6 +386,9 @@ TEST(Writer, InvalidEncoding) {
+ writer.EndArray();
+ }
+
++
++ // does not compile on clang-19
++#if 0
+ // Fail in encoding
+ {
+ StringBuffer buffer;
+@@ -401,6 +404,7 @@ TEST(Writer, InvalidEncoding) {
+ static const UTF32<>::Ch s[] = { 0x110000, 0 }; // Out of U+0000 to U+10FFFF
+ EXPECT_FALSE(writer.String(s));
+ }
++#endif
+ }
+
+ TEST(Writer, ValidateEncoding) {
diff --git a/pkgs/by-name/ra/rapidjson/package.nix b/pkgs/by-name/ra/rapidjson/package.nix
index 09707dc75b9a..887beaa63051 100644
--- a/pkgs/by-name/ra/rapidjson/package.nix
+++ b/pkgs/by-name/ra/rapidjson/package.nix
@@ -29,6 +29,10 @@ stdenv.mkDerivation (finalAttrs: {
./use-nixpkgs-gtest.patch
# https://github.com/Tencent/rapidjson/issues/2214
./suppress-valgrind-failures.patch
+
+ # disable tests which don't build on clang-19
+ # https://github.com/Tencent/rapidjson/issues/2318
+ ./char_traits-clang-19-errors.diff
];
postPatch = ''
diff --git a/pkgs/by-name/ra/rav1e/package.nix b/pkgs/by-name/ra/rav1e/package.nix
index e8834ac131e4..dccb2d01a6b9 100644
--- a/pkgs/by-name/ra/rav1e/package.nix
+++ b/pkgs/by-name/ra/rav1e/package.nix
@@ -6,13 +6,11 @@
fetchCrate,
pkg-config,
cargo-c,
- darwin,
- libgit2,
- libiconv,
nasm,
+ libgit2,
+ zlib,
nix-update-script,
testers,
- zlib,
rav1e,
}:
@@ -25,22 +23,22 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-Db7qb7HBAy6lniIiN07iEzURmbfNtuhmgJRv7OUagUM=";
};
- cargoHash = "sha256-VyQ6n2kIJ7OjK6Xlf0T0GNsBvgESRETzKZDZzAn8ZuY=";
+ # update built to be able to use the system libgit2
+ cargoPatches = [ ./update-built.diff ];
+ cargoHash = "sha256-Ud9Vw31y8nLo0aC3j7XY1+mN/pRvH9gJ0uIq73hKy3Y=";
- depsBuildBuild = [ pkg-config ];
+ depsBuildBuild = [
+ pkg-config
+ libgit2
+ zlib
+ ];
nativeBuildInputs = [
cargo-c
- libgit2
nasm
];
- buildInputs =
- [ zlib ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [
- libiconv
- darwin.apple_sdk.frameworks.Security
- ];
+ env.LIBGIT2_NO_VENDOR = 1;
# Darwin uses `llvm-strip`, which results in link errors when using `-x` to strip the asm library
# and linking it with cctools ld64.
diff --git a/pkgs/by-name/ra/rav1e/update-built.diff b/pkgs/by-name/ra/rav1e/update-built.diff
new file mode 100644
index 000000000000..3b2a027545d9
--- /dev/null
+++ b/pkgs/by-name/ra/rav1e/update-built.diff
@@ -0,0 +1,40 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 6825377..8512eba 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -242,9 +242,9 @@ dependencies = [
+
+ [[package]]
+ name = "built"
+-version = "0.7.1"
++version = "0.7.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "38d17f4d6e4dc36d1a02fbedc2753a096848e7c1b0772f7654eab8e2c927dd53"
++checksum = "c360505aed52b7ec96a3636c3f039d99103c37d1d9b4f7a8c743d3ea9ffcd03b"
+ dependencies = [
+ "git2",
+ ]
+@@ -633,9 +633,9 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+
+ [[package]]
+ name = "git2"
+-version = "0.18.1"
++version = "0.19.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
++checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724"
+ dependencies = [
+ "bitflags 2.4.1",
+ "libc",
+@@ -845,9 +845,9 @@ dependencies = [
+
+ [[package]]
+ name = "libgit2-sys"
+-version = "0.16.1+1.7.1"
++version = "0.17.0+1.8.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c"
++checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224"
+ dependencies = [
+ "cc",
+ "libc",
diff --git a/pkgs/by-name/ro/rocksndiamonds/package.nix b/pkgs/by-name/ro/rocksndiamonds/package.nix
index 4aa70ffa5334..633123165969 100644
--- a/pkgs/by-name/ro/rocksndiamonds/package.nix
+++ b/pkgs/by-name/ro/rocksndiamonds/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
preBuild = ''
dataDir="$out/share/rocksndiamonds"
- makeFlags+="BASE_PATH=$dataDir"
+ appendToVar makeFlags "BASE_PATH=$dataDir"
'';
installPhase = ''
diff --git a/pkgs/by-name/ro/rosie/package.nix b/pkgs/by-name/ro/rosie/package.nix
index 5cad6650d2ce..3d2f1006cfee 100644
--- a/pkgs/by-name/ro/rosie/package.nix
+++ b/pkgs/by-name/ro/rosie/package.nix
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
# Part of the same Makefile target which calls git to update submodules
ln -s src submodules/lua/include
# ldconfig is irrelevant, disable it inside `make installforce`.
- sed -iE 's/ldconfig/echo skippin ldconfig/' Makefile
- sed -iE '/ld.so.conf.d/d' Makefile
+ sed -i 's/ldconfig/echo skippin ldconfig/' Makefile
+ sed -i '/ld.so.conf.d/d' Makefile
'';
preInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/by-name/rt/rt/package.nix b/pkgs/by-name/rt/rt/package.nix
index 59933570d7b1..f73c6df494f9 100644
--- a/pkgs/by-name/rt/rt/package.nix
+++ b/pkgs/by-name/rt/rt/package.nix
@@ -123,12 +123,12 @@ stdenv.mkDerivation rec {
echo rt-${version} > .tag
'';
preConfigure = ''
- configureFlags="$configureFlags --with-web-user=$UID"
- configureFlags="$configureFlags --with-web-group=$(id -g)"
- configureFlags="$configureFlags --with-rt-group=$(id -g)"
- configureFlags="$configureFlags --with-bin-owner=$UID"
- configureFlags="$configureFlags --with-libs-owner=$UID"
- configureFlags="$configureFlags --with-libs-group=$(id -g)"
+ appendToVar configureFlags "--with-web-user=$UID"
+ appendToVar configureFlags "--with-web-group=$(id -g)"
+ appendToVar configureFlags "--with-rt-group=$(id -g)"
+ appendToVar configureFlags "--with-bin-owner=$UID"
+ appendToVar configureFlags "--with-libs-owner=$UID"
+ appendToVar configureFlags "--with-libs-group=$(id -g)"
'';
configureFlags = [
"--enable-graphviz"
diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix
index 2449165caeb0..6fd163a518cd 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -1,22 +1,22 @@
{
lib,
- rustPlatform,
- fetchFromGitHub,
- installShellFiles,
stdenv,
python3Packages,
- darwin,
+ fetchFromGitHub,
+ rustPlatform,
+ installShellFiles,
rust-jemalloc-sys,
- ruff-lsp,
- nix-update-script,
versionCheckHook,
- libiconv,
+
+ # passthru
+ ruff-lsp,
nixosTests,
+ nix-update-script,
}:
python3Packages.buildPythonPackage rec {
pname = "ruff";
- version = "0.8.0";
+ version = "0.8.1";
pyproject = true;
outputs = [
@@ -28,7 +28,7 @@ python3Packages.buildPythonPackage rec {
owner = "astral-sh";
repo = "ruff";
rev = "refs/tags/${version}";
- hash = "sha256-yenGZ7TuiHtY/3AIjMPlHVtQPP6PHMc1wdezfZdVtK0=";
+ hash = "sha256-N3TplR+vPu2r56VP/vnOfkxN3Lh2o92kE2hFZKLXO04=";
};
# Do not rely on path lookup at runtime to find the ruff binary
@@ -41,7 +41,7 @@ python3Packages.buildPythonPackage rec {
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
- hash = "sha256-O5+uVYWtSMEj7hBrc/FUuqRBN4hUlEbtDPF42kpL7PA=";
+ hash = "sha256-iddUzip2LmBMOB+MfpI4k3OitdPbwAZkc4szDPB6duM=";
};
nativeBuildInputs =
@@ -52,14 +52,9 @@ python3Packages.buildPythonPackage rec {
cargoCheckHook
]);
- buildInputs =
- [
- rust-jemalloc-sys
- ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [
- darwin.apple_sdk.frameworks.CoreServices
- libiconv
- ];
+ buildInputs = [
+ rust-jemalloc-sys
+ ];
postInstall =
''
@@ -74,17 +69,12 @@ python3Packages.buildPythonPackage rec {
--zsh <($bin/bin/ruff generate-shell-completion zsh)
'';
- passthru = {
- tests = {
- inherit ruff-lsp;
- nixos-test-driver-busybox = nixosTests.nixos-test-driver.busybox;
- };
- updateScript = nix-update-script { };
- };
-
# Run cargo tests
cargoCheckType = "debug";
- postInstallCheck = ''
+ # tests do not appear to respect linker options on doctests
+ # Upstream issue: https://github.com/rust-lang/cargo/issues/14189
+ # This causes errors like "error: linker `cc` not found" on static builds
+ postInstallCheck = lib.optionalString (!stdenv.hostPlatform.isStatic) ''
cargoCheckHook
'';
@@ -123,6 +113,17 @@ python3Packages.buildPythonPackage rec {
pythonImportsCheck = [ "ruff" ];
+ passthru = {
+ tests =
+ {
+ inherit ruff-lsp;
+ }
+ // lib.optionalAttrs stdenv.hostPlatform.isLinux {
+ nixos-test-driver-busybox = nixosTests.nixos-test-driver.busybox;
+ };
+ updateScript = nix-update-script { };
+ };
+
meta = {
description = "Extremely fast Python linter";
homepage = "https://github.com/astral-sh/ruff";
diff --git a/pkgs/by-name/s2/s2n-tls/package.nix b/pkgs/by-name/s2/s2n-tls/package.nix
index d2d8de6b4306..656a02a4147e 100644
--- a/pkgs/by-name/s2/s2n-tls/package.nix
+++ b/pkgs/by-name/s2/s2n-tls/package.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "s2n-tls";
- version = "1.5.5";
+ version = "1.5.7";
src = fetchFromGitHub {
owner = "aws";
repo = "s2n-tls";
rev = "v${version}";
- hash = "sha256-vIwhV8kFP7sN0tz8ZE3bDGD/v08pq2PCl1ea5w+ejHg=";
+ hash = "sha256-VexgPuuGlBWnlWildlyJd/bVZMS3PNhBnQllsYXYC8I=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/se/serf/package.nix b/pkgs/by-name/se/serf/package.nix
index 07138596d05d..1bbfe31f9c41 100644
--- a/pkgs/by-name/se/serf/package.nix
+++ b/pkgs/by-name/se/serf/package.nix
@@ -37,13 +37,13 @@ stdenv.mkDerivation rec {
prefixKey = "PREFIX=";
preConfigure = ''
- sconsFlags+=" APR=$(echo ${apr.dev}/bin/*-config)"
- sconsFlags+=" APU=$(echo ${aprutil.dev}/bin/*-config)"
- sconsFlags+=" CC=$CC"
- sconsFlags+=" OPENSSL=${openssl}"
- sconsFlags+=" ZLIB=${zlib}"
+ appendToVar sconsFlags "APR=$(echo ${apr.dev}/bin/*-config)"
+ appendToVar sconsFlags "APU=$(echo ${aprutil.dev}/bin/*-config)"
+ appendToVar sconsFlags "CC=$CC"
+ appendToVar sconsFlags "OPENSSL=${openssl}"
+ appendToVar sconsFlags "ZLIB=${zlib}"
'' + lib.optionalString (!stdenv.hostPlatform.isCygwin) ''
- sconsFlags+=" GSSAPI=${libkrb5.dev}"
+ appendToVar sconsFlags "GSSAPI=${libkrb5.dev}"
'';
enableParallelBuilding = true;
diff --git a/pkgs/by-name/sh/shadps4/package.nix b/pkgs/by-name/sh/shadps4/package.nix
index 5484724d886e..58477d157638 100644
--- a/pkgs/by-name/sh/shadps4/package.nix
+++ b/pkgs/by-name/sh/shadps4/package.nix
@@ -4,7 +4,7 @@
fetchFromGitHub,
fetchpatch,
alsa-lib,
- boost184,
+ boost,
cmake,
cryptopp,
glslang,
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
alsa-lib
- boost184
+ boost
cryptopp
glslang
ffmpeg
diff --git a/pkgs/by-name/sh/sherpa/package.nix b/pkgs/by-name/sh/sherpa/package.nix
index b1fbbab8781f..e9375cd219bd 100644
--- a/pkgs/by-name/sh/sherpa/package.nix
+++ b/pkgs/by-name/sh/sherpa/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
postPatch = lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''
- sed -ie '/sys\/sysctl.h/d' ATOOLS/Org/Run_Parameter.C
+ sed -i -e '/sys\/sysctl.h/d' ATOOLS/Org/Run_Parameter.C
'';
nativeBuildInputs = [ autoconf gfortran ];
diff --git a/pkgs/by-name/si/silc_client/package.nix b/pkgs/by-name/si/silc_client/package.nix
index 7a64e5cc1233..ae362b682674 100644
--- a/pkgs/by-name/si/silc_client/package.nix
+++ b/pkgs/by-name/si/silc_client/package.nix
@@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
- configureFlags = [ "--with-ncurses=${ncurses.dev}" ];
-
- preConfigure = lib.optionalString enablePlugin ''
- configureFlags="$configureFlags --with-silc-plugin=$out/lib/irssi"
- '';
+ configureFlags = [
+ "--with-ncurses=${ncurses.dev}"
+ ] ++ lib.optionals enablePlugin [
+ "--with-silc-plugin=${placeholder "out"}/lib/irssi"
+ ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ perl glib ncurses ];
diff --git a/pkgs/by-name/sl/slang/package.nix b/pkgs/by-name/sl/slang/package.nix
index 7d67d22eb3e0..26e93492bef9 100644
--- a/pkgs/by-name/sl/slang/package.nix
+++ b/pkgs/by-name/sl/slang/package.nix
@@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
# Fix some wrong hardcoded paths
preConfigure = ''
- sed -ie "s|/usr/lib/terminfo|${ncurses.out}/lib/terminfo|" configure
- sed -ie "s|/usr/lib/terminfo|${ncurses.out}/lib/terminfo|" src/sltermin.c
- sed -ie "s|/bin/ln|ln|" src/Makefile.in
- sed -ie "s|-ltermcap|-lncurses|" ./configure
+ sed -i -e "s|/usr/lib/terminfo|${ncurses.out}/lib/terminfo|" configure
+ sed -i -e "s|/usr/lib/terminfo|${ncurses.out}/lib/terminfo|" src/sltermin.c
+ sed -i -e "s|/bin/ln|ln|" src/Makefile.in
+ sed -i -e "s|-ltermcap|-lncurses|" ./configure
'';
configureFlags = [
diff --git a/pkgs/by-name/sp/spaceFM/package.nix b/pkgs/by-name/sp/spaceFM/package.nix
index f7c7eac9a3a3..c2d90f513e10 100644
--- a/pkgs/by-name/sp/spaceFM/package.nix
+++ b/pkgs/by-name/sp/spaceFM/package.nix
@@ -30,12 +30,9 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-bash-path=${pkgs.bash}/bin/bash"
+ "--sysconfdir=${placeholder "out"}/etc"
];
- preConfigure = ''
- configureFlags="$configureFlags --sysconfdir=$out/etc"
- '';
-
postInstall = ''
rm -f $out/etc/spacefm/spacefm.conf
ln -s /etc/spacefm/spacefm.conf $out/etc/spacefm/spacefm.conf
diff --git a/pkgs/by-name/sp/sparkleshare/package.nix b/pkgs/by-name/sp/sparkleshare/package.nix
index ef7da9d880bf..c5e9f08d4731 100644
--- a/pkgs/by-name/sp/sparkleshare/package.nix
+++ b/pkgs/by-name/sp/sparkleshare/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
patchPhase = ''
# SparkleShare's default desktop file falls back to flatpak.
- sed -ie "s_^Exec=.*_Exec=$out/bin/sparkleshare_" SparkleShare/Linux/SparkleShare.Autostart.desktop
+ sed -i -e "s_^Exec=.*_Exec=$out/bin/sparkleshare_" SparkleShare/Linux/SparkleShare.Autostart.desktop
# Nix will manage the icon cache.
echo '#!/bin/sh' >scripts/post-install.sh
diff --git a/pkgs/by-name/sp/spdlog/package.nix b/pkgs/by-name/sp/spdlog/package.nix
index 6aa91db83549..0c9777b1ca88 100644
--- a/pkgs/by-name/sp/spdlog/package.nix
+++ b/pkgs/by-name/sp/spdlog/package.nix
@@ -41,6 +41,11 @@ stdenv.mkDerivation rec {
postInstall = ''
mkdir -p $out/share/doc/spdlog
cp -rv ../example $out/share/doc/spdlog
+
+ substituteInPlace $dev/include/spdlog/tweakme.h \
+ --replace-fail \
+ '// #define SPDLOG_FMT_EXTERNAL' \
+ '#define SPDLOG_FMT_EXTERNAL'
'';
doCheck = true;
diff --git a/pkgs/by-name/su/superlu/package.nix b/pkgs/by-name/su/superlu/package.nix
index 4f52c2d6c507..9d9dfa5fe3d3 100644
--- a/pkgs/by-name/su/superlu/package.nix
+++ b/pkgs/by-name/su/superlu/package.nix
@@ -1,44 +1,59 @@
-{ lib, stdenv, fetchurl, cmake,
+{ lib, stdenv, fetchFromGitHub, fetchurl, cmake, ninja,
gfortran, blas, lapack}:
assert (!blas.isILP64) && (!lapack.isILP64);
-stdenv.mkDerivation rec {
- version = "5.2.1";
+stdenv.mkDerivation (finalAttrs: {
pname = "superlu";
+ version = "7.0.0";
- src = fetchurl {
- url = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_${version}.tar.gz";
- sha256 = "0qzlb7cd608q62kyppd0a8c65l03vrwqql6gsm465rky23b6dyr8";
+ src = fetchFromGitHub {
+ owner = "xiaoyeli";
+ repo = "superlu";
+ rev = "refs/tags/v${finalAttrs.version}";
+ # Remove non‐free files.
+ #
+ # See:
+ # *
+ # *
+ # *
+ postFetch = "rm $out/SRC/mc64ad.* $out/DOC/*.pdf";
+ hash = "sha256-iJiVyY+/vr6kll8FCunvZ8rKBj+w+Rnj4F696XW9xFc=";
};
- nativeBuildInputs = [ cmake gfortran ];
+ patches = [
+ (fetchurl {
+ url = "https://salsa.debian.org/science-team/superlu/-/raw/fae141179928d1cc5a8e381503e8b1264d297c3d/debian/patches/mc64ad-stub.patch";
+ hash = "sha256-QUaNUDaRghTqr6jk1TE6a7CdXABqu7xAkYZDhL/lZBQ=";
+ })
+ ];
+
+ nativeBuildInputs = [ cmake ninja gfortran ];
propagatedBuildInputs = [ blas ];
cmakeFlags = [
- "-DBUILD_SHARED_LIBS=true"
- "-DUSE_XSDK_DEFAULTS=true"
- ];
-
- env = lib.optionalAttrs stdenv.cc.isClang {
- NIX_CFLAGS_COMPILE = toString [
- "-Wno-error=implicit-function-declaration"
- "-Wno-error=implicit-int"
- ];
- };
-
- patches = [
- ./add-superlu-lib-as-dependency-for-the-unit-tests.patch
+ (lib.cmakeBool "BUILD_SHARED_LIBS" true)
+ (lib.cmakeBool "enable_fortran" true)
];
doCheck = true;
- checkTarget = "test";
meta = {
- homepage = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/";
- license = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/License.txt";
+ homepage = "https://portal.nersc.gov/project/sparse/superlu/";
+ license = [
+ lib.licenses.bsd3Lbnl
+
+ # Xerox code; actually `Boehm-GC` variant.
+ lib.licenses.mit
+
+ # University of Minnesota example files.
+ lib.licenses.gpl2Plus
+
+ # University of Florida code; permissive COLAMD licence.
+ lib.licenses.free
+ ];
description = "Library for the solution of large, sparse, nonsymmetric systems of linear equations";
platforms = lib.platforms.unix;
};
-}
+})
diff --git a/pkgs/by-name/sv/sv-lang/package.nix b/pkgs/by-name/sv/sv-lang/package.nix
index 2bc5059b8b80..87a4573cb6d8 100644
--- a/pkgs/by-name/sv/sv-lang/package.nix
+++ b/pkgs/by-name/sv/sv-lang/package.nix
@@ -1,7 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
-, boost182
+, boost
, catch2_3
, cmake
, ninja
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
buildInputs = [
unordered_dense
- boost182
+ boost
fmt_9
# though only used in tests, cmake will complain its absence when configuring
catch2_3
diff --git a/pkgs/by-name/sv/svt-av1/package.nix b/pkgs/by-name/sv/svt-av1/package.nix
index 1b515b792c79..967ed81a83a5 100644
--- a/pkgs/by-name/sv/svt-av1/package.nix
+++ b/pkgs/by-name/sv/svt-av1/package.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "svt-av1";
- version = "2.2.1";
+ version = "2.3.0";
src = fetchFromGitLab {
owner = "AOMediaCodec";
repo = "SVT-AV1";
rev = "v${finalAttrs.version}";
- hash = "sha256-/JWFO4eT8bNvhdqJ6S0mGRIP0+aUTbDrlzqzwRqJOog=";
+ hash = "sha256-JMOFWke/qO3cWHuhWJChzaH+sD5AVqYCTTz0Q0+r2AE=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/sw/swaylock-effects/package.nix b/pkgs/by-name/sw/swaylock-effects/package.nix
index 0f5ba4971181..4a5038650640 100644
--- a/pkgs/by-name/sw/swaylock-effects/package.nix
+++ b/pkgs/by-name/sw/swaylock-effects/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
};
postPatch = ''
- sed -iE "s/version: '1\.3',/version: '${version}',/" meson.build
+ sed -i "s/version: '1\.3',/version: '${version}',/" meson.build
'';
strictDeps = true;
diff --git a/pkgs/by-name/sw/swig/package.nix b/pkgs/by-name/sw/swig/package.nix
index 1ccaf4fb13fe..22338889b02c 100644
--- a/pkgs/by-name/sw/swig/package.nix
+++ b/pkgs/by-name/sw/swig/package.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "swig";
- version = "4.2.1";
+ version = "4.3.0";
src = fetchFromGitHub {
owner = "swig";
repo = "swig";
rev = "v${finalAttrs.version}";
- hash = "sha256-VlUsiRZLScmbC7hZDzKqUr9481YXVwo0eXT/jy6Fda8=";
+ hash = "sha256-hFHEE9wy8Lja9G396tI4fj4LhOkpPKJkDuy1L62AXr4=";
};
PCRE_CONFIG = "${pcre2.dev}/bin/pcre-config";
diff --git a/pkgs/by-name/tc/tcpkali/package.nix b/pkgs/by-name/tc/tcpkali/package.nix
index 805a70f88e74..d6a2952b0622 100644
--- a/pkgs/by-name/tc/tcpkali/package.nix
+++ b/pkgs/by-name/tc/tcpkali/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "09ky3cccaphcqc6nhfs00pps99lasmzc2pf5vk0gi8hlqbbhilxf";
};
postPatch = ''
- sed -ie '/sys\/sysctl\.h/d' src/tcpkali_syslimits.c
+ sed -i -e '/sys\/sysctl\.h/d' src/tcpkali_syslimits.c
'';
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ bison];
diff --git a/pkgs/by-name/te/telescope/package.nix b/pkgs/by-name/te/telescope/package.nix
index 801cae0b123c..7f1f23d07ad4 100644
--- a/pkgs/by-name/te/telescope/package.nix
+++ b/pkgs/by-name/te/telescope/package.nix
@@ -9,7 +9,6 @@
, ncurses
, autoreconfHook
, buildPackages
-, memstreamHook
}:
stdenv.mkDerivation rec {
@@ -39,7 +38,7 @@ stdenv.mkDerivation rec {
libgrapheme
libressl
ncurses
- ] ++ lib.optional stdenv.hostPlatform.isDarwin memstreamHook;
+ ];
configureFlags = [
"HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"
diff --git a/pkgs/by-name/th/thin-provisioning-tools/Cargo.lock b/pkgs/by-name/th/thin-provisioning-tools/Cargo.lock
index 8f9a97c8733e..a21223c91a81 100644
--- a/pkgs/by-name/th/thin-provisioning-tools/Cargo.lock
+++ b/pkgs/by-name/th/thin-provisioning-tools/Cargo.lock
@@ -10,24 +10,67 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
name = "aho-corasick"
-version = "1.1.2"
+version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
dependencies = [
"memchr",
]
[[package]]
-name = "anstyle"
-version = "1.0.6"
+name = "anstream"
+version = "0.6.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.52.0",
+]
[[package]]
name = "anyhow"
-version = "1.0.80"
+version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
[[package]]
name = "atty"
@@ -42,15 +85,35 @@ dependencies = [
[[package]]
name = "autocfg"
-version = "1.1.0"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
[[package]]
name = "base64"
-version = "0.21.7"
+version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "bindgen"
+version = "0.69.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
+dependencies = [
+ "bitflags 2.6.0",
+ "cexpr",
+ "clang-sys",
+ "itertools",
+ "lazy_static",
+ "lazycell",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn 2.0.72",
+]
[[package]]
name = "bitflags"
@@ -60,15 +123,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
-version = "2.4.2"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
[[package]]
name = "bytemuck"
-version = "1.14.3"
+version = "1.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f"
+checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83"
[[package]]
name = "byteorder"
@@ -82,6 +145,15 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
[[package]]
name = "cfg-if"
version = "1.0.0"
@@ -89,19 +161,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
-name = "clap"
-version = "4.5.1"
+name = "cfg_aliases"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
+[[package]]
+name = "clang-sys"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc"
dependencies = [
"clap_builder",
]
[[package]]
name = "clap_builder"
-version = "4.5.1"
+version = "4.5.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb"
+checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99"
dependencies = [
"anstyle",
"clap_lex",
@@ -110,9 +199,15 @@ dependencies = [
[[package]]
name = "clap_lex"
-version = "0.7.0"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
[[package]]
name = "console"
@@ -124,32 +219,59 @@ dependencies = [
"lazy_static",
"libc",
"unicode-width",
- "windows-sys",
+ "windows-sys 0.52.0",
]
[[package]]
name = "crc32c"
-version = "0.6.5"
+version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89254598aa9b9fa608de44b3ae54c810f0f06d755e24c50177f1f8f31ff50ce2"
+checksum = "3a47af21622d091a8f0fb295b88bc886ac74efcc613efc19f5d0b21de5c89e47"
dependencies = [
"rustc_version",
]
[[package]]
name = "crc32fast"
-version = "1.4.0"
+version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
dependencies = [
"cfg-if",
]
[[package]]
name = "data-encoding"
-version = "2.5.0"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
+checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+
+[[package]]
+name = "devicemapper"
+version = "0.34.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59209790c5d189070a52937581950947207e740fadc87f68af14f34d0eb333df"
+dependencies = [
+ "bitflags 2.6.0",
+ "devicemapper-sys",
+ "env_logger 0.11.5",
+ "log",
+ "nix",
+ "once_cell",
+ "rand",
+ "retry",
+ "semver",
+ "serde",
+]
+
+[[package]]
+name = "devicemapper-sys"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6681f5413e2094480381a97b8299f548c0579f07095ee20fe58e0a28cb34b5"
+dependencies = [
+ "bindgen",
+]
[[package]]
name = "downcast"
@@ -169,12 +291,28 @@ dependencies = [
"shared_child",
]
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
[[package]]
name = "encode_unicode"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+[[package]]
+name = "env_filter"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+dependencies = [
+ "log",
+ "regex",
+]
+
[[package]]
name = "env_logger"
version = "0.8.4"
@@ -186,13 +324,26 @@ dependencies = [
]
[[package]]
-name = "errno"
-version = "0.3.8"
+name = "env_logger"
+version = "0.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "humantime",
+ "log",
+]
+
+[[package]]
+name = "errno"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
dependencies = [
"libc",
- "windows-sys",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -203,9 +354,9 @@ checksum = "de853764b47027c2e862a995c34978ffa63c1501f2e15f987ba11bd4f9bba193"
[[package]]
name = "fastrand"
-version = "2.0.1"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
[[package]]
name = "fixedbitset"
@@ -215,9 +366,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
[[package]]
name = "flate2"
-version = "1.0.28"
+version = "1.0.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
+checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920"
dependencies = [
"crc32fast",
"miniz_oxide",
@@ -231,15 +382,21 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
[[package]]
name = "getrandom"
-version = "0.2.12"
+version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
dependencies = [
"cfg-if",
"libc",
"wasi",
]
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
[[package]]
name = "hermit-abi"
version = "0.1.19"
@@ -251,9 +408,15 @@ dependencies = [
[[package]]
name = "hermit-abi"
-version = "0.3.6"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]]
name = "indicatif"
@@ -270,9 +433,9 @@ dependencies = [
[[package]]
name = "instant"
-version = "0.1.12"
+version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
dependencies = [
"cfg-if",
]
@@ -287,34 +450,75 @@ dependencies = [
]
[[package]]
-name = "lazy_static"
-version = "1.4.0"
+name = "is_terminal_polyfill"
+version = "1.70.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "lazy_static"
+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.153"
+version = "0.2.155"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[package]]
+name = "libloading"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+dependencies = [
+ "cfg-if",
+ "windows-targets",
+]
+
+[[package]]
+name = "libudev-sys"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324"
+dependencies = [
+ "libc",
+ "pkg-config",
+]
[[package]]
name = "linux-raw-sys"
-version = "0.4.13"
+version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
[[package]]
name = "log"
-version = "0.4.20"
+version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
[[package]]
name = "memchr"
-version = "2.7.1"
+version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
[[package]]
name = "minimal-lexical"
@@ -324,23 +528,22 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "miniz_oxide"
-version = "0.7.2"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
dependencies = [
"adler",
]
[[package]]
name = "mockall"
-version = "0.12.1"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48"
+checksum = "d4c28b3fb6d753d28c20e826cd46ee611fda1cf3cde03a443a974043247c065a"
dependencies = [
"cfg-if",
"downcast",
"fragile",
- "lazy_static",
"mockall_derive",
"predicates",
"predicates-tree",
@@ -348,14 +551,26 @@ dependencies = [
[[package]]
name = "mockall_derive"
-version = "0.12.1"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2"
+checksum = "341014e7f530314e9a1fdbc7400b244efea7122662c96bfa248c31da5bfb2020"
dependencies = [
"cfg-if",
"proc-macro2",
"quote",
- "syn 2.0.50",
+ "syn 2.0.72",
+]
+
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
]
[[package]]
@@ -376,14 +591,14 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.50",
+ "syn 2.0.72",
]
[[package]]
name = "num-traits"
-version = "0.2.18"
+version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
dependencies = [
"autocfg",
]
@@ -394,7 +609,7 @@ version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
dependencies = [
- "hermit-abi 0.3.6",
+ "hermit-abi 0.3.9",
"libc",
]
@@ -418,31 +633,40 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
[[package]]
name = "os_pipe"
-version = "1.1.5"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9"
+checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982"
dependencies = [
"libc",
- "windows-sys",
+ "windows-sys 0.59.0",
]
[[package]]
-name = "portable-atomic"
-version = "1.6.0"
+name = "pkg-config"
+version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+
+[[package]]
+name = "portable-atomic"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
[[package]]
name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
[[package]]
name = "predicates"
-version = "3.1.0"
+version = "3.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8"
+checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97"
dependencies = [
"anstyle",
"predicates-core",
@@ -450,15 +674,15 @@ dependencies = [
[[package]]
name = "predicates-core"
-version = "1.0.6"
+version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174"
+checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931"
[[package]]
name = "predicates-tree"
-version = "1.0.9"
+version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf"
+checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13"
dependencies = [
"predicates-core",
"termtree",
@@ -466,18 +690,18 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quick-xml"
-version = "0.31.0"
+version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
+checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc"
dependencies = [
"memchr",
]
@@ -488,7 +712,7 @@ version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
dependencies = [
- "env_logger",
+ "env_logger 0.8.4",
"log",
"rand",
]
@@ -506,9 +730,9 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.35"
+version = "1.0.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
dependencies = [
"proc-macro2",
]
@@ -545,9 +769,9 @@ dependencies = [
[[package]]
name = "rangemap"
-version = "1.5.0"
+version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "795915a3930a5d6bafd9053d37602fea3e61be2e5d4d788983a8ba9654c1c6f2"
+checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684"
[[package]]
name = "redox_syscall"
@@ -566,9 +790,9 @@ checksum = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb"
[[package]]
name = "regex"
-version = "1.10.3"
+version = "1.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
dependencies = [
"aho-corasick",
"memchr",
@@ -578,9 +802,9 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.5"
+version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
dependencies = [
"aho-corasick",
"memchr",
@@ -589,9 +813,15 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+
+[[package]]
+name = "retry"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9166d72162de3575f950507683fac47e30f6f2c3836b71b7fbc61aa517c9c5f4"
[[package]]
name = "rio"
@@ -603,14 +833,20 @@ dependencies = [
[[package]]
name = "roaring"
-version = "0.10.3"
+version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1c77081a55300e016cb86f2864415b7518741879db925b8d488a0ee0d2da6bf"
+checksum = "8f4b84ba6e838ceb47b41de5194a60244fac43d9fe03b71dbe8c5a201081d6d1"
dependencies = [
"bytemuck",
"byteorder",
]
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
[[package]]
name = "rustc_version"
version = "0.4.0"
@@ -622,15 +858,15 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.38.31"
+version = "0.38.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
"errno",
"libc",
"linux-raw-sys",
- "windows-sys",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -641,25 +877,51 @@ checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
[[package]]
name = "semver"
-version = "1.0.22"
+version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
[[package]]
-name = "shared_child"
-version = "1.0.0"
+name = "serde"
+version = "1.0.204"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef"
+checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
dependencies = [
- "libc",
- "winapi",
+ "serde_derive",
]
[[package]]
-name = "strsim"
-version = "0.11.0"
+name = "serde_derive"
+version = "1.0.204"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
+checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.72",
+]
+
+[[package]]
+name = "shared_child"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09fa9338aed9a1df411814a5b2252f7cd206c55ae9bf2fa763f8de84603aa60c"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]]
name = "syn"
@@ -674,9 +936,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.50"
+version = "2.0.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
dependencies = [
"proc-macro2",
"quote",
@@ -685,14 +947,15 @@ dependencies = [
[[package]]
name = "tempfile"
-version = "3.10.0"
+version = "3.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67"
+checksum = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53"
dependencies = [
"cfg-if",
"fastrand",
+ "once_cell",
"rustix",
- "windows-sys",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -715,7 +978,7 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
[[package]]
name = "thinp"
-version = "1.0.12"
+version = "1.1.0"
dependencies = [
"anyhow",
"atty",
@@ -724,6 +987,7 @@ dependencies = [
"clap",
"crc32c",
"data-encoding",
+ "devicemapper",
"duct",
"exitcode",
"fixedbitset",
@@ -750,26 +1014,27 @@ dependencies = [
"thiserror",
"threadpool",
"tui",
+ "udev",
]
[[package]]
name = "thiserror"
-version = "1.0.57"
+version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.57"
+version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.50",
+ "syn 2.0.72",
]
[[package]]
@@ -794,6 +1059,17 @@ dependencies = [
"unicode-width",
]
+[[package]]
+name = "udev"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ebdbbd670373442a12fe9ef7aeb53aec4147a5a27a00bbc3ab639f08f48191a"
+dependencies = [
+ "libc",
+ "libudev-sys",
+ "pkg-config",
+]
+
[[package]]
name = "unicode-ident"
version = "1.0.12"
@@ -808,9 +1084,15 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
[[package]]
name = "unicode-width"
-version = "0.1.11"
+version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "wasi"
@@ -850,14 +1132,24 @@ dependencies = [
]
[[package]]
-name = "windows-targets"
-version = "0.52.3"
+name = "windows-sys"
+version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d380ba1dc7187569a8a9e91ed34b8ccfc33123bbacb8c0aed2d1ad7f3ef2dc5f"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
dependencies = [
"windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
+ "windows_i686_gnullvm",
"windows_i686_msvc",
"windows_x86_64_gnu",
"windows_x86_64_gnullvm",
@@ -866,42 +1158,69 @@ dependencies = [
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.52.3"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68e5dcfb9413f53afd9c8f86e56a7b4d86d9a2fa26090ea2dc9e40fba56c6ec6"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.52.3"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dab469ebbc45798319e69eebf92308e541ce46760b49b18c6b3fe5e8965b30f"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
[[package]]
name = "windows_i686_gnu"
-version = "0.52.3"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a4e9b6a7cac734a8b4138a4e1044eac3404d8326b6c0f939276560687a033fb"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[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_msvc"
-version = "0.52.3"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b0ec9c422ca95ff34a78755cfa6ad4a51371da2a5ace67500cf7ca5f232c58"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.52.3"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "704131571ba93e89d7cd43482277d6632589b18ecf4468f591fbae0a8b101614"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.52.3"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42079295511643151e98d61c38c0acc444e52dd42ab456f7ccfd5152e8ecf21c"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.52.3"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0770833d60a970638e989b3fa9fd2bb1aaadcf88963d1659fd7d9990196ed2d6"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.72",
+]
diff --git a/pkgs/by-name/th/thin-provisioning-tools/package.nix b/pkgs/by-name/th/thin-provisioning-tools/package.nix
index a386a46c40f1..08c04f005ccc 100644
--- a/pkgs/by-name/th/thin-provisioning-tools/package.nix
+++ b/pkgs/by-name/th/thin-provisioning-tools/package.nix
@@ -1,19 +1,31 @@
{ lib
, rustPlatform
+, pkg-config
+, udev
+, lvm2
, fetchFromGitHub
, nixosTests }:
rustPlatform.buildRustPackage rec {
pname = "thin-provisioning-tools";
- version = "1.0.12";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "jthornber";
repo = "thin-provisioning-tools";
rev = "v${version}";
- hash = "sha256-wliyTWo3iOonqf4UW50V5co0RQlc75VwLofF9FHV2LI=";
+ hash = "sha256-gpUiLUdg+EpVkJzDg43gI5oXhy611QwndwZZVVgg4Lg=";
};
+ nativeBuildInputs = [
+ pkg-config
+ rustPlatform.bindgenHook
+ ];
+ buildInputs = [
+ udev
+ lvm2
+ ];
+
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
diff --git a/pkgs/by-name/th/thrift/package.nix b/pkgs/by-name/th/thrift/package.nix
index 589f03c68858..cbb7e5967f40 100644
--- a/pkgs/by-name/th/thrift/package.nix
+++ b/pkgs/by-name/th/thrift/package.nix
@@ -34,14 +34,16 @@ stdenv.mkDerivation rec {
pkg-config
python3
python3.pkgs.setuptools
+ ] ++ lib.optionals (!static) [
+ python3.pkgs.twisted
];
buildInputs = [
boost
- ] ++ lib.optionals (!static) [
- (python3.withPackages (ps: [ps.twisted]))
];
+ strictDeps = true;
+
propagatedBuildInputs = [
libevent
openssl
diff --git a/pkgs/by-name/ti/tintin/package.nix b/pkgs/by-name/ti/tintin/package.nix
index 6f56512b1da2..3dc7884f1f67 100644
--- a/pkgs/by-name/ti/tintin/package.nix
+++ b/pkgs/by-name/ti/tintin/package.nix
@@ -1,5 +1,4 @@
{ stdenv, fetchFromGitHub, lib, zlib, pcre
-, memorymappingHook, memstreamHook
, gnutls
}:
@@ -14,8 +13,7 @@ stdenv.mkDerivation rec {
hash = "sha256-AfWw9CMBAzTTsrZXDEoOdpvUofIQfLCW7hRgSb7LB00=";
};
- buildInputs = [ zlib pcre gnutls ]
- ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook memstreamHook ];
+ buildInputs = [ zlib pcre gnutls ];
preConfigure = ''
cd src
diff --git a/pkgs/by-name/ti/tinysparql/package.nix b/pkgs/by-name/ti/tinysparql/package.nix
index 240dbf789f57..b9b284dc27a9 100644
--- a/pkgs/by-name/ti/tinysparql/package.nix
+++ b/pkgs/by-name/ti/tinysparql/package.nix
@@ -1,6 +1,5 @@
{ stdenv
, lib
-, fetchpatch2
, fetchurl
, gettext
, meson
@@ -35,13 +34,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "tinysparql";
- version = "3.8.0";
+ version = "3.8.1";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = with finalAttrs; "mirror://gnome/sources/tinysparql/${lib.versions.majorMinor version}/tinysparql-${version}.tar.xz";
- hash = "sha256-wPzad1IPUxVIsjlRN9zRk+6c3l4iLTydJz8DDRdipQQ=";
+ hash = "sha256-U+BK3R7LTQjKoTF/R3/fDnFI6qxUYoMfI3SIAJL/spU=";
};
strictDeps = true;
@@ -107,14 +106,6 @@ stdenv.mkDerivation (finalAttrs: {
"-Dsystemd_user_services=false"
];
- patches = [
- # https://gitlab.gnome.org/GNOME/tinysparql/-/merge_requests/730
- (fetchpatch2 {
- url = "https://gitlab.gnome.org/GNOME/tinysparql/commit/12ed969913cb579f638fa0aa0853aeb6c6c6f536.patch";
- hash = "sha256-jyx9hdWUUxfCSTGn7lZL4RUiQAF4pkf4gfCP8g9Ep3U=";
- })
- ];
-
doCheck = true;
postPatch = ''
diff --git a/pkgs/by-name/tk/tkman/package.nix b/pkgs/by-name/tk/tkman/package.nix
index c51c3564fef8..acc82bfcf024 100644
--- a/pkgs/by-name/tk/tkman/package.nix
+++ b/pkgs/by-name/tk/tkman/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
];
patches = [(fetchpatch {
- url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-text/tkman/files/tkman-CVE-2008-5137.diff";
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-text/tkman/files/tkman-CVE-2008-5137.diff?id=dec60bb6900d6ebdaaa6aa1dcb845b30b739f9b5";
hash = "sha256-l97SY2/YnMgzHYKnVYCVJKV7oGLN1hXNpeHFlLVzTMA=";
})];
diff --git a/pkgs/by-name/tp/tpm2-pkcs11/package.nix b/pkgs/by-name/tp/tpm2-pkcs11/package.nix
index 80d9a1c45200..06ae9c5f849c 100644
--- a/pkgs/by-name/tp/tpm2-pkcs11/package.nix
+++ b/pkgs/by-name/tp/tpm2-pkcs11/package.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, substituteAll
+{ stdenv, lib, fetchFromGitHub
, pkg-config, autoreconfHook, autoconf-archive, makeWrapper, patchelf
, tpm2-tss, tpm2-tools, opensc, openssl, sqlite, python3, glibc, libyaml
, abrmdSupport ? true, tpm2-abrmd ? null
diff --git a/pkgs/by-name/tr/trigger/package.nix b/pkgs/by-name/tr/trigger/package.nix
index 86b47f554193..7b661f642248 100644
--- a/pkgs/by-name/tr/trigger/package.nix
+++ b/pkgs/by-name/tr/trigger/package.nix
@@ -32,9 +32,12 @@ stdenv.mkDerivation rec {
sed s,lSDL2main,lSDL2, -i GNUmakefile
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL2.dev}/include/SDL2"
- export makeFlags="$makeFlags prefix=$out"
'';
+ makeFlags = [
+ "prefix=${placeholder "out"}"
+ ];
+
enableParallelBuilding = true;
postInstall = ''
diff --git a/pkgs/by-name/ts/tsduck/package.nix b/pkgs/by-name/ts/tsduck/package.nix
index 0da53e2e96ea..ec9c8323d15d 100644
--- a/pkgs/by-name/ts/tsduck/package.nix
+++ b/pkgs/by-name/ts/tsduck/package.nix
@@ -27,17 +27,17 @@ stdenv.mkDerivation rec {
# remove tests which call out to https://tsduck.io/download/test/...
postPatch = ''
- sed -i"" \
+ sed -i \
-e '/TSUNIT_TEST(testMasterPlaylist);/ d' \
-e '/TSUNIT_TEST(testMasterPlaylistWithAlternate);/ d' \
-e '/TSUNIT_TEST(testMediaPlaylist);/ d' \
src/utest/utestHLS.cpp
- sed -i"" \
+ sed -i \
-e '/TSUNIT_TEST(testBetterSystemRandomGenerator);/ d' \
src/utest/utestSystemRandomGenerator.cpp
- sed -i"" \
+ sed -i \
-e '/TSUNIT_ASSERT(request.downloadBinaryContent/ d' \
-e '/TSUNIT_ASSERT(!request.downloadBinaryContent/ d' \
-e '/TSUNIT_TEST(testGitHub);/ d' \
@@ -46,11 +46,11 @@ stdenv.mkDerivation rec {
-e '/TSUNIT_TEST(testReadMeFile);/ d' \
src/utest/utestWebRequest.cpp
- sed -i"" \
+ sed -i \
-e '/TSUNIT_TEST(testHomeDirectory);/ d' \
src/utest/utestSysUtils.cpp
- sed -i"" \
+ sed -i \
-e '/TSUNIT_TEST(testIPv4Address);/ d' \
-e '/TSUNIT_TEST(testIPv4AddressConstructors);/ d' \
-e '/TSUNIT_TEST(testIPv4SocketAddressConstructors);/ d' \
diff --git a/pkgs/by-name/ts/tsocks/package.nix b/pkgs/by-name/ts/tsocks/package.nix
index c12f9a44ac6d..33a66d637860 100644
--- a/pkgs/by-name/ts/tsocks/package.nix
+++ b/pkgs/by-name/ts/tsocks/package.nix
@@ -14,9 +14,12 @@ stdenv.mkDerivation rec {
preConfigure = ''
sed -i -e "s,\\\/usr,"$(echo $out|sed -e "s,\\/,\\\\\\\/,g")",g" tsocks
substituteInPlace tsocks --replace /usr $out
- export configureFlags="$configureFlags --libdir=$out/lib"
'';
+ configureFlags = [
+ "--libdir=${placeholder "out"}/lib"
+ ];
+
preBuild = ''
# We don't need the saveme binary, it is in fact never stored and we're
# never injecting stuff into ld.so.preload anyway
diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix
index c9d9a7a26cf6..6bb4dbe5f832 100644
--- a/pkgs/by-name/un/unbound/package.nix
+++ b/pkgs/by-name/un/unbound/package.nix
@@ -140,7 +140,8 @@ stdenv.mkDerivation (finalAttrs: {
# Build libunbound again, but only against nettle instead of openssl.
# This avoids gnutls.out -> unbound.lib -> lib.getLib openssl.
''
- configureFlags="$configureFlags --with-nettle=${nettle.dev} --with-libunbound-only"
+ appendToVar configureFlags "--with-nettle=${nettle.dev}"
+ appendToVar configureFlags "--with-libunbound-only"
configurePhase
buildPhase
if [ -n "$doCheck" ]; then
diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix
index 83c0789a15ea..3fa07e9e5164 100644
--- a/pkgs/by-name/ut/util-linux/package.nix
+++ b/pkgs/by-name/ut/util-linux/package.nix
@@ -14,7 +14,6 @@
, installShellFiles
, writeSupport ? stdenv.hostPlatform.isLinux
, shadowSupport ? stdenv.hostPlatform.isLinux
-, memstreamHook
, gitUpdater
}:
@@ -99,8 +98,7 @@ stdenv.mkDerivation rec {
++ lib.optionals pamSupport [ pam ]
++ lib.optionals capabilitiesSupport [ libcap_ng ]
++ lib.optionals ncursesSupport [ ncurses ]
- ++ lib.optionals systemdSupport [ systemd ]
- ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memstreamHook ];
+ ++ lib.optionals systemdSupport [ systemd ];
doCheck = false; # "For development purpose only. Don't execute on production system!"
diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock
deleted file mode 100644
index 651d4c41cc0b..000000000000
--- a/pkgs/by-name/uv/uv/Cargo.lock
+++ /dev/null
@@ -1,6076 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "anes"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
-
-[[package]]
-name = "anstream"
-version = "0.6.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "is_terminal_polyfill",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
-dependencies = [
- "anstyle",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13"
-
-[[package]]
-name = "arrayref"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
-
-[[package]]
-name = "arrayvec"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
-
-[[package]]
-name = "assert-json-diff"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12"
-dependencies = [
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "assert_cmd"
-version = "2.0.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1835b7f27878de8525dc71410b5a31cdcc5f230aed5ba5df968e09c201b23d"
-dependencies = [
- "anstyle",
- "bstr",
- "doc-comment",
- "libc",
- "predicates",
- "predicates-core",
- "predicates-tree",
- "wait-timeout",
-]
-
-[[package]]
-name = "assert_fs"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7efdb1fdb47602827a342857666feb372712cbc64b414172bd6b167a02927674"
-dependencies = [
- "anstyle",
- "doc-comment",
- "globwalk",
- "predicates",
- "predicates-core",
- "predicates-tree",
- "tempfile",
-]
-
-[[package]]
-name = "async-channel"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
-dependencies = [
- "concurrent-queue",
- "event-listener-strategy",
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-compression"
-version = "0.4.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cb8f1d480b0ea3783ab015936d2a55c87e219676f0c0b7dec61494043f21857"
-dependencies = [
- "bzip2",
- "flate2",
- "futures-core",
- "futures-io",
- "memchr",
- "pin-project-lite",
- "tokio",
- "xz2",
- "zstd",
- "zstd-safe",
-]
-
-[[package]]
-name = "async-trait"
-version = "0.1.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "async_http_range_reader"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4015e7130cf870da1c64a9c7ba474f4b3772a530edbeb05f8358bc9a02f8e505"
-dependencies = [
- "bisection",
- "futures",
- "http-content-range",
- "itertools 0.13.0",
- "memmap2 0.9.5",
- "reqwest",
- "reqwest-middleware",
- "thiserror",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "async_zip"
-version = "0.0.17"
-source = "git+https://github.com/charliermarsh/rs-async-zip?rev=011b24604fa7bc223daaad7712c0694bac8f0a87#011b24604fa7bc223daaad7712c0694bac8f0a87"
-dependencies = [
- "async-compression",
- "crc32fast",
- "futures-lite",
- "pin-project",
- "thiserror",
- "tokio",
- "tokio-util",
-]
-
-[[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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
-
-[[package]]
-name = "axoasset"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90f16d4ba2365a6f9b4394b369597b9bc00a1651db758edbe6d63a34879b9024"
-dependencies = [
- "camino",
- "image",
- "lazy_static",
- "miette",
- "mime",
- "reqwest",
- "serde",
- "serde_json",
- "thiserror",
- "url",
- "walkdir",
-]
-
-[[package]]
-name = "axoprocess"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4de46920588aef95658797996130bacd542436aee090084646521260a74bda7d"
-dependencies = [
- "miette",
- "thiserror",
- "tracing",
-]
-
-[[package]]
-name = "axotag"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d888fac0b73e64cbdf36a743fc5a25af5ae955c357535cb420b389bf1e1a6c54"
-dependencies = [
- "miette",
- "semver",
- "thiserror",
-]
-
-[[package]]
-name = "axoupdater"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fb8d8889305a413a040f281197bb2f8982a1d25c9696707cab350e3cc780ba5"
-dependencies = [
- "axoasset",
- "axoprocess",
- "axotag",
- "camino",
- "homedir",
- "miette",
- "self-replace",
- "serde",
- "tempfile",
- "thiserror",
- "tokio",
- "url",
-]
-
-[[package]]
-name = "backoff"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1"
-dependencies = [
- "futures-core",
- "getrandom",
- "instant",
- "pin-project-lite",
- "rand",
- "tokio",
-]
-
-[[package]]
-name = "backtrace"
-version = "0.3.74"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
-dependencies = [
- "addr2line",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
-[[package]]
-name = "base64"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
-
-[[package]]
-name = "bisection"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "021e079a1bab0ecce6cf4b4b74c0c37afa4a697136eb3b127875c84a8f04a8c3"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
-
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "boxcar"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fba19c552ee63cb6646b75e1166d1bdb8a6d34a6d19e319dec88c8adadff2db3"
-
-[[package]]
-name = "bstr"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
-dependencies = [
- "memchr",
- "regex-automata 0.4.8",
- "serde",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
-
-[[package]]
-name = "bytecheck"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50c8f430744b23b54ad15161fcbc22d82a29b73eacbe425fea23ec822600bc6f"
-dependencies = [
- "bytecheck_derive",
- "ptr_meta",
- "rancor",
- "simdutf8",
-]
-
-[[package]]
-name = "bytecheck_derive"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523363cbe1df49b68215efdf500b103ac3b0fb4836aed6d15689a076eadb8fff"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "bytemuck"
-version = "1.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d"
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "byteorder-lite"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
-
-[[package]]
-name = "bytes"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
-
-[[package]]
-name = "bzip2"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8"
-dependencies = [
- "bzip2-sys",
- "libc",
-]
-
-[[package]]
-name = "bzip2-sys"
-version = "0.1.11+1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "cachedir"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4703f3937077db8fa35bee3c8789343c1aec2585f0146f09d658d4ccc0e8d873"
-dependencies = [
- "tempfile",
-]
-
-[[package]]
-name = "camino"
-version = "1.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "cargo-util"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6dd67a24439ca5260a08128b6cbf4b0f4453497a2f60508163ab9d5b534b122"
-dependencies = [
- "anyhow",
- "core-foundation",
- "filetime",
- "hex",
- "ignore",
- "jobserver",
- "libc",
- "miow",
- "same-file",
- "sha2",
- "shell-escape",
- "tempfile",
- "tracing",
- "walkdir",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "cast"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
-
-[[package]]
-name = "cc"
-version = "1.1.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
-dependencies = [
- "jobserver",
- "libc",
- "shlex",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "cfg_aliases"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
-
-[[package]]
-name = "charset"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1f927b07c74ba84c7e5fe4db2baeb3e996ab2688992e39ac68ce3220a677c7e"
-dependencies = [
- "base64 0.22.1",
- "encoding_rs",
-]
-
-[[package]]
-name = "ciborium"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
-dependencies = [
- "ciborium-io",
- "ciborium-ll",
- "serde",
-]
-
-[[package]]
-name = "ciborium-io"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
-
-[[package]]
-name = "ciborium-ll"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
-dependencies = [
- "ciborium-io",
- "half",
-]
-
-[[package]]
-name = "clap"
-version = "4.5.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
-dependencies = [
- "clap_builder",
- "clap_derive",
-]
-
-[[package]]
-name = "clap_builder"
-version = "4.5.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
-dependencies = [
- "anstream",
- "anstyle",
- "clap_lex",
- "strsim",
- "terminal_size 0.4.0",
-]
-
-[[package]]
-name = "clap_complete"
-version = "4.5.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86bc73de94bc81e52f3bebec71bc4463e9748f7a59166663e32044669577b0e2"
-dependencies = [
- "clap",
-]
-
-[[package]]
-name = "clap_complete_command"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da8e198c052315686d36371e8a3c5778b7852fc75cc313e4e11eeb7a644a1b62"
-dependencies = [
- "clap",
- "clap_complete",
- "clap_complete_nushell",
-]
-
-[[package]]
-name = "clap_complete_nushell"
-version = "4.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "315902e790cc6e5ddd20cbd313c1d0d49db77f191e149f96397230fb82a17677"
-dependencies = [
- "clap",
- "clap_complete",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.5.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
-
-[[package]]
-name = "cmake"
-version = "0.1.51"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "codspeed"
-version = "2.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "450a0e9df9df1c154156f4344f99d8f6f6e69d0fc4de96ef6e2e68b2ec3bce97"
-dependencies = [
- "colored",
- "libc",
- "serde_json",
-]
-
-[[package]]
-name = "codspeed-criterion-compat"
-version = "2.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eb1a6cb9c20e177fde58cdef97c1c7c9264eb1424fe45c4fccedc2fb078a569"
-dependencies = [
- "codspeed",
- "colored",
- "criterion",
-]
-
-[[package]]
-name = "color_quant"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
-
-[[package]]
-name = "colorchoice"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
-
-[[package]]
-name = "colored"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8"
-dependencies = [
- "lazy_static",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "concurrent-queue"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "configparser"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e57e3272f0190c3f1584272d613719ba5fc7df7f4942fe542e63d949cf3a649b"
-
-[[package]]
-name = "console"
-version = "0.15.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
-dependencies = [
- "encode_unicode",
- "lazy_static",
- "libc",
- "unicode-width",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "core-foundation"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crc32fast"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "criterion"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
-dependencies = [
- "anes",
- "cast",
- "ciborium",
- "clap",
- "criterion-plot",
- "futures",
- "is-terminal",
- "itertools 0.10.5",
- "num-traits",
- "once_cell",
- "oorandom",
- "regex",
- "serde",
- "serde_derive",
- "serde_json",
- "tinytemplate",
- "tokio",
- "walkdir",
-]
-
-[[package]]
-name = "criterion-plot"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
-dependencies = [
- "cast",
- "itertools 0.10.5",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
-dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
-
-[[package]]
-name = "crunchy"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
-[[package]]
-name = "csv"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
-dependencies = [
- "csv-core",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "csv-core"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "ctrlc"
-version = "3.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3"
-dependencies = [
- "nix",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "dashmap"
-version = "6.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
- "hashbrown 0.14.5",
- "lock_api",
- "once_cell",
- "parking_lot_core 0.9.10",
-]
-
-[[package]]
-name = "data-encoding"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
-
-[[package]]
-name = "data-url"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5"
-
-[[package]]
-name = "deadpool"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb84100978c1c7b37f09ed3ce3e5f843af02c2a2c431bae5b19230dad2c1b490"
-dependencies = [
- "async-trait",
- "deadpool-runtime",
- "num_cpus",
- "tokio",
-]
-
-[[package]]
-name = "deadpool-runtime"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b"
-
-[[package]]
-name = "diff"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
-
-[[package]]
-name = "difflib"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
-
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "crypto-common",
-]
-
-[[package]]
-name = "directories"
-version = "5.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
-dependencies = [
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs"
-version = "5.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
-dependencies = [
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
-dependencies = [
- "libc",
- "option-ext",
- "redox_users",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "doc-comment"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
-
-[[package]]
-name = "dotenvy"
-version = "0.15.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
-
-[[package]]
-name = "dunce"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
-
-[[package]]
-name = "dyn-clone"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
-
-[[package]]
-name = "either"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
-
-[[package]]
-name = "encode_unicode"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "encoding_rs_io"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cc3c5651fb62ab8aa3103998dade57efdd028544bd300516baa31840c252a83"
-dependencies = [
- "encoding_rs",
-]
-
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "erased-serde"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d"
-dependencies = [
- "serde",
- "typeid",
-]
-
-[[package]]
-name = "errno"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "etcetera"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
-dependencies = [
- "cfg-if",
- "home",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "event-listener"
-version = "5.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener-strategy"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
-dependencies = [
- "event-listener",
- "pin-project-lite",
-]
-
-[[package]]
-name = "fastrand"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
-
-[[package]]
-name = "fdeflate"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07c6f4c64c1d33a3111c4466f7365ebdcc37c5bd1ea0d62aae2e3d722aacbedb"
-dependencies = [
- "simd-adler32",
-]
-
-[[package]]
-name = "filetime"
-version = "0.2.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
-dependencies = [
- "cfg-if",
- "libc",
- "libredox",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "fixedbitset"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
-
-[[package]]
-name = "flate2"
-version = "1.0.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
-dependencies = [
- "crc32fast",
- "libz-ng-sys",
- "miniz_oxide",
-]
-
-[[package]]
-name = "float-cmp"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "fontconfig-parser"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7"
-dependencies = [
- "roxmltree 0.20.0",
-]
-
-[[package]]
-name = "fontdb"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff20bef7942a72af07104346154a70a70b089c572e454b41bef6eb6cb10e9c06"
-dependencies = [
- "fontconfig-parser",
- "log",
- "memmap2 0.5.10",
- "ttf-parser",
-]
-
-[[package]]
-name = "form_urlencoded"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "fs-err"
-version = "2.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41"
-dependencies = [
- "autocfg",
- "tokio",
-]
-
-[[package]]
-name = "fs2"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "futures"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
-
-[[package]]
-name = "futures-lite"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f1fa2f9765705486b33fd2acf1577f8ec449c2ba1f318ae5447697b7c08d210"
-dependencies = [
- "fastrand",
- "futures-core",
- "futures-io",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "futures-macro"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
-
-[[package]]
-name = "futures-task"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
-
-[[package]]
-name = "futures-util"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
-dependencies = [
- "cfg-if",
- "js-sys",
- "libc",
- "wasi",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "gif"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045"
-dependencies = [
- "color_quant",
- "weezl",
-]
-
-[[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.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
-
-[[package]]
-name = "globset"
-version = "0.4.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19"
-dependencies = [
- "aho-corasick",
- "bstr",
- "log",
- "regex-automata 0.4.8",
- "regex-syntax 0.8.5",
-]
-
-[[package]]
-name = "globwalk"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757"
-dependencies = [
- "bitflags 2.6.0",
- "ignore",
- "walkdir",
-]
-
-[[package]]
-name = "goblin"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53ab3f32d1d77146981dea5d6b1e8fe31eedcb7013e5e00d6ccd1259a4b4d923"
-dependencies = [
- "log",
- "plain",
- "scroll",
-]
-
-[[package]]
-name = "h2"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
-dependencies = [
- "atomic-waker",
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "http",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "half"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
-dependencies = [
- "cfg-if",
- "crunchy",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-
-[[package]]
-name = "hashbrown"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
-
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
-[[package]]
-name = "hermit-abi"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
-[[package]]
-name = "home"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "homedir"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bdbbd5bc8c5749697ccaa352fa45aff8730cf21c68029c0eef1ffed7c3d6ba2"
-dependencies = [
- "cfg-if",
- "nix",
- "widestring",
- "windows 0.57.0",
-]
-
-[[package]]
-name = "html-escape"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476"
-dependencies = [
- "utf8-width",
-]
-
-[[package]]
-name = "http"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http-body"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
-dependencies = [
- "bytes",
- "http",
-]
-
-[[package]]
-name = "http-body-util"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
-dependencies = [
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "pin-project-lite",
-]
-
-[[package]]
-name = "http-content-range"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91314cc9d86f625097a3365cab4e4b6f190eac231650f8f41c1edd8080cea1d0"
-
-[[package]]
-name = "httparse"
-version = "1.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
-
-[[package]]
-name = "httpdate"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
-
-[[package]]
-name = "hyper"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "smallvec",
- "tokio",
- "want",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.27.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
-dependencies = [
- "futures-util",
- "http",
- "hyper",
- "hyper-util",
- "rustls",
- "rustls-native-certs",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls",
- "tower-service",
- "webpki-roots",
-]
-
-[[package]]
-name = "hyper-util"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "http",
- "http-body",
- "hyper",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "idna"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "ignore"
-version = "0.4.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b"
-dependencies = [
- "crossbeam-deque",
- "globset",
- "log",
- "memchr",
- "regex-automata 0.4.8",
- "same-file",
- "walkdir",
- "winapi-util",
-]
-
-[[package]]
-name = "image"
-version = "0.25.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc144d44a31d753b02ce64093d532f55ff8dc4ebf2ffb8a63c0dda691385acae"
-dependencies = [
- "bytemuck",
- "byteorder-lite",
- "num-traits",
-]
-
-[[package]]
-name = "imagesize"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b72ad49b554c1728b1e83254a1b1565aea4161e28dabbfa171fc15fe62299caf"
-
-[[package]]
-name = "indexmap"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
-dependencies = [
- "equivalent",
- "hashbrown 0.15.0",
- "serde",
-]
-
-[[package]]
-name = "indicatif"
-version = "0.17.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
-dependencies = [
- "console",
- "instant",
- "number_prefix",
- "portable-atomic",
- "unicode-width",
-]
-
-[[package]]
-name = "indoc"
-version = "2.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
-
-[[package]]
-name = "insta"
-version = "1.41.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e9ffc4d4892617c50a928c52b2961cb5174b6fc6ebf252b2fac9d21955c48b8"
-dependencies = [
- "console",
- "lazy_static",
- "linked-hash-map",
- "pest",
- "pest_derive",
- "regex",
- "serde",
- "similar",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "ipnet"
-version = "2.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
-
-[[package]]
-name = "is-terminal"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
-dependencies = [
- "hermit-abi 0.4.0",
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "is_ci"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45"
-
-[[package]]
-name = "is_terminal_polyfill"
-version = "1.70.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
-
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itertools"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
-
-[[package]]
-name = "jiff"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d9d414fc817d3e3d62b2598616733f76c4cc74fbac96069674739b881295c8"
-dependencies = [
- "jiff-tzdb-platform",
- "serde",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "jiff-tzdb"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91335e575850c5c4c673b9bd467b0e025f164ca59d0564f69d0c2ee0ffad4653"
-
-[[package]]
-name = "jiff-tzdb-platform"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9835f0060a626fe59f160437bc725491a6af23133ea906500027d1bd2f8f4329"
-dependencies = [
- "jiff-tzdb",
-]
-
-[[package]]
-name = "jobserver"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "jpeg-decoder"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
-
-[[package]]
-name = "js-sys"
-version = "0.3.72"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "junction"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72bbdfd737a243da3dfc1f99ee8d6e166480f17ab4ac84d7c34aacd73fc7bd16"
-dependencies = [
- "scopeguard",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "krata-tokio-tar"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8bd5fee9b96acb5fc36b401896d601e6fdcce52b0e651ce24a3b21fb524e79f"
-dependencies = [
- "filetime",
- "futures-core",
- "libc",
- "portable-atomic",
- "redox_syscall 0.3.5",
- "tokio",
- "tokio-stream",
- "xattr",
-]
-
-[[package]]
-name = "kurbo"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a53776d271cfb873b17c618af0298445c88afc52837f3e948fa3fafd131f449"
-dependencies = [
- "arrayvec",
-]
-
-[[package]]
-name = "kurbo"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b"
-dependencies = [
- "arrayvec",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-
-[[package]]
-name = "libc"
-version = "0.2.161"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
-
-[[package]]
-name = "libmimalloc-sys"
-version = "0.1.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "libredox"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
-dependencies = [
- "bitflags 2.6.0",
- "libc",
- "redox_syscall 0.5.7",
-]
-
-[[package]]
-name = "libz-ng-sys"
-version = "1.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4436751a01da56f1277f323c80d584ffad94a3d14aecd959dd0dff75aa73a438"
-dependencies = [
- "cmake",
- "libc",
-]
-
-[[package]]
-name = "linked-hash-map"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
-
-[[package]]
-name = "lock_api"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
-
-[[package]]
-name = "lzma-sys"
-version = "0.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "mailparse"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3da03d5980411a724e8aaf7b61a7b5e386ec55a7fb49ee3d0ff79efc7e5e7c7e"
-dependencies = [
- "charset",
- "data-encoding",
- "quoted_printable",
-]
-
-[[package]]
-name = "markdown"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef3aab6a1d529b112695f72beec5ee80e729cb45af58663ec902c8fac764ecdd"
-dependencies = [
- "lazy_static",
- "pipeline",
- "regex",
-]
-
-[[package]]
-name = "matchers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-dependencies = [
- "regex-automata 0.1.10",
-]
-
-[[package]]
-name = "md-5"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
-dependencies = [
- "cfg-if",
- "digest",
-]
-
-[[package]]
-name = "memchr"
-version = "2.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
-
-[[package]]
-name = "memmap2"
-version = "0.5.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "memmap2"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "miette"
-version = "7.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4edc8853320c2a0dab800fbda86253c8938f6ea88510dc92c5f1ed20e794afc1"
-dependencies = [
- "cfg-if",
- "miette-derive",
- "owo-colors",
- "supports-color",
- "supports-hyperlinks",
- "supports-unicode",
- "terminal_size 0.3.0",
- "textwrap",
- "thiserror",
- "unicode-width",
-]
-
-[[package]]
-name = "miette-derive"
-version = "7.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "mimalloc"
-version = "0.1.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633"
-dependencies = [
- "libmimalloc-sys",
-]
-
-[[package]]
-name = "mime"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-
-[[package]]
-name = "mime_guess"
-version = "2.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
-dependencies = [
- "mime",
- "unicase",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
-dependencies = [
- "adler2",
- "simd-adler32",
-]
-
-[[package]]
-name = "mio"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
-dependencies = [
- "hermit-abi 0.3.9",
- "libc",
- "wasi",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "miow"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "359f76430b20a79f9e20e115b3428614e654f04fab314482fc0fda0ebd3c6044"
-dependencies = [
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "munge"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64142d38c84badf60abf06ff9bd80ad2174306a5b11bd4706535090a30a419df"
-dependencies = [
- "munge_macro",
-]
-
-[[package]]
-name = "munge_macro"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bb5c1d8184f13f7d0ccbeeca0def2f9a181bce2624302793005f5ca8aa62e5e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "nanoid"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8"
-dependencies = [
- "rand",
-]
-
-[[package]]
-name = "nix"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
-dependencies = [
- "bitflags 2.6.0",
- "cfg-if",
- "cfg_aliases",
- "libc",
-]
-
-[[package]]
-name = "normalize-line-endings"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
-
-[[package]]
-name = "nu-ansi-term"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
-dependencies = [
- "overload",
- "winapi",
-]
-
-[[package]]
-name = "nu-ansi-term"
-version = "0.50.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi 0.3.9",
- "libc",
-]
-
-[[package]]
-name = "number_prefix"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
-
-[[package]]
-name = "object"
-version = "0.36.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
-
-[[package]]
-name = "oorandom"
-version = "11.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
-[[package]]
-name = "option-ext"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
-
-[[package]]
-name = "os_str_bytes"
-version = "6.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
-[[package]]
-name = "owo-colors"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb37767f6569cd834a413442455e0f066d0d522de8630436e2a1761d9726ba56"
-
-[[package]]
-name = "parking"
-version = "2.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
-
-[[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 0.8.6",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
-dependencies = [
- "lock_api",
- "parking_lot_core 0.9.10",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
-dependencies = [
- "cfg-if",
- "instant",
- "libc",
- "redox_syscall 0.2.16",
- "smallvec",
- "winapi",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall 0.5.7",
- "smallvec",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
-[[package]]
-name = "path-slash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42"
-
-[[package]]
-name = "pathdiff"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361"
-
-[[package]]
-name = "percent-encoding"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-
-[[package]]
-name = "pest"
-version = "2.7.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442"
-dependencies = [
- "memchr",
- "thiserror",
- "ucd-trie",
-]
-
-[[package]]
-name = "pest_derive"
-version = "2.7.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd"
-dependencies = [
- "pest",
- "pest_generator",
-]
-
-[[package]]
-name = "pest_generator"
-version = "2.7.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e"
-dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pest_meta"
-version = "2.7.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d"
-dependencies = [
- "once_cell",
- "pest",
- "sha2",
-]
-
-[[package]]
-name = "petgraph"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
-dependencies = [
- "fixedbitset",
- "indexmap",
-]
-
-[[package]]
-name = "pico-args"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
-
-[[package]]
-name = "pin-project"
-version = "1.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "pipeline"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d15b6607fa632996eb8a17c9041cb6071cb75ac057abd45dece578723ea8c7c0"
-
-[[package]]
-name = "pkg-config"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
-
-[[package]]
-name = "plain"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
-
-[[package]]
-name = "platform-info"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91077ffd05d058d70d79eefcd7d7f6aac34980860a7519960f7913b6563a8c3a"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "png"
-version = "0.17.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0"
-dependencies = [
- "bitflags 1.3.2",
- "crc32fast",
- "fdeflate",
- "flate2",
- "miniz_oxide",
-]
-
-[[package]]
-name = "poloto"
-version = "19.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "164dbd541c9832e92fa34452e9c2e98b515a548a3f8549fb2402fe1cd5e46b96"
-dependencies = [
- "tagu",
-]
-
-[[package]]
-name = "portable-atomic"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
-dependencies = [
- "zerocopy",
-]
-
-[[package]]
-name = "predicates"
-version = "3.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97"
-dependencies = [
- "anstyle",
- "difflib",
- "float-cmp",
- "normalize-line-endings",
- "predicates-core",
- "regex",
-]
-
-[[package]]
-name = "predicates-core"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931"
-
-[[package]]
-name = "predicates-tree"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13"
-dependencies = [
- "predicates-core",
- "termtree",
-]
-
-[[package]]
-name = "pretty_assertions"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
-dependencies = [
- "diff",
- "yansi",
-]
-
-[[package]]
-name = "priority-queue"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "714c75db297bc88a63783ffc6ab9f830698a6705aa0201416931759ef4c8183d"
-dependencies = [
- "autocfg",
- "equivalent",
- "indexmap",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "procfs"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc5b72d8145275d844d4b5f6d4e1eef00c8cd889edb6035c21675d1bb1f45c9f"
-dependencies = [
- "bitflags 2.6.0",
- "flate2",
- "hex",
- "procfs-core",
- "rustix",
-]
-
-[[package]]
-name = "procfs-core"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239df02d8349b06fc07398a3a1697b06418223b1c7725085e801e7c0fc6a12ec"
-dependencies = [
- "bitflags 2.6.0",
- "hex",
-]
-
-[[package]]
-name = "ptr_meta"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe9e76f66d3f9606f44e45598d155cb13ecf09f4a28199e48daf8c8fc937ea90"
-dependencies = [
- "ptr_meta_derive",
-]
-
-[[package]]
-name = "ptr_meta_derive"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca414edb151b4c8d125c12566ab0d74dc9cdba36fb80eb7b848c15f495fd32d1"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pubgrub"
-version = "0.2.1"
-source = "git+https://github.com/astral-sh/pubgrub?rev=95e1390399cdddee986b658be19587eb1fdb2d79#95e1390399cdddee986b658be19587eb1fdb2d79"
-dependencies = [
- "indexmap",
- "log",
- "priority-queue",
- "rustc-hash",
- "thiserror",
- "version-ranges",
-]
-
-[[package]]
-name = "quinn"
-version = "0.11.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684"
-dependencies = [
- "bytes",
- "pin-project-lite",
- "quinn-proto",
- "quinn-udp",
- "rustc-hash",
- "rustls",
- "socket2",
- "thiserror",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "quinn-proto"
-version = "0.11.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6"
-dependencies = [
- "bytes",
- "rand",
- "ring",
- "rustc-hash",
- "rustls",
- "slab",
- "thiserror",
- "tinyvec",
- "tracing",
-]
-
-[[package]]
-name = "quinn-udp"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e346e016eacfff12233c243718197ca12f148c84e1e84268a896699b41c71780"
-dependencies = [
- "cfg_aliases",
- "libc",
- "once_cell",
- "socket2",
- "tracing",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "quoted_printable"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "640c9bd8497b02465aeef5375144c26062e0dcd5939dfcbb0f5db76cb8c17c73"
-
-[[package]]
-name = "rancor"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caf5f7161924b9d1cea0e4cabc97c372cea92b5f927fc13c6bca67157a0ad947"
-dependencies = [
- "ptr_meta",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "rayon"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
-dependencies = [
- "crossbeam-deque",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "rctree"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f"
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
-dependencies = [
- "bitflags 2.6.0",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
-dependencies = [
- "getrandom",
- "libredox",
- "thiserror",
-]
-
-[[package]]
-name = "reflink-copy"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc31414597d1cd7fdd2422798b7652a6329dda0fe0219e6335a13d5bcaa9aeb6"
-dependencies = [
- "cfg-if",
- "rustix",
- "windows 0.58.0",
-]
-
-[[package]]
-name = "regex"
-version = "1.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata 0.4.8",
- "regex-syntax 0.8.5",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax 0.8.5",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
-
-[[package]]
-name = "rend"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a35e8a6bf28cd121053a66aa2e6a2e3eaffad4a60012179f0e864aa5ffeff215"
-dependencies = [
- "bytecheck",
-]
-
-[[package]]
-name = "reqwest"
-version = "0.12.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
-dependencies = [
- "async-compression",
- "base64 0.22.1",
- "bytes",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "http-body-util",
- "hyper",
- "hyper-rustls",
- "hyper-util",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "mime_guess",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "quinn",
- "rustls",
- "rustls-native-certs",
- "rustls-pemfile",
- "rustls-pki-types",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper",
- "tokio",
- "tokio-rustls",
- "tokio-socks",
- "tokio-util",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-streams",
- "web-sys",
- "webpki-roots",
- "windows-registry 0.2.0",
-]
-
-[[package]]
-name = "reqwest-middleware"
-version = "0.3.3"
-source = "git+https://github.com/TrueLayer/reqwest-middleware?rev=d95ec5a99fcc9a4339e1850d40378bbfe55ab121#d95ec5a99fcc9a4339e1850d40378bbfe55ab121"
-dependencies = [
- "anyhow",
- "async-trait",
- "http",
- "reqwest",
- "serde",
- "thiserror",
- "tower-service",
-]
-
-[[package]]
-name = "reqwest-retry"
-version = "0.7.1"
-source = "git+https://github.com/TrueLayer/reqwest-middleware?rev=d95ec5a99fcc9a4339e1850d40378bbfe55ab121#d95ec5a99fcc9a4339e1850d40378bbfe55ab121"
-dependencies = [
- "anyhow",
- "async-trait",
- "futures",
- "getrandom",
- "http",
- "hyper",
- "parking_lot 0.11.2",
- "reqwest",
- "reqwest-middleware",
- "retry-policies",
- "thiserror",
- "tokio",
- "tracing",
- "wasm-timer",
-]
-
-[[package]]
-name = "resvg"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76888219c0881e22b0ceab06fddcfe83163cd81642bd60c7842387f9c968a72e"
-dependencies = [
- "gif",
- "jpeg-decoder",
- "log",
- "pico-args",
- "png",
- "rgb",
- "svgfilters",
- "svgtypes 0.10.0",
- "tiny-skia",
- "usvg",
- "usvg-text-layout",
-]
-
-[[package]]
-name = "retry-policies"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5875471e6cab2871bc150ecb8c727db5113c9338cc3354dc5ee3425b6aa40a1c"
-dependencies = [
- "rand",
-]
-
-[[package]]
-name = "rgb"
-version = "0.8.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a"
-dependencies = [
- "bytemuck",
-]
-
-[[package]]
-name = "ring"
-version = "0.17.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
-dependencies = [
- "cc",
- "cfg-if",
- "getrandom",
- "libc",
- "spin",
- "untrusted",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "rkyv"
-version = "0.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "395027076c569819ea6035ee62e664f5e03d74e281744f55261dd1afd939212b"
-dependencies = [
- "bytecheck",
- "bytes",
- "hashbrown 0.14.5",
- "indexmap",
- "munge",
- "ptr_meta",
- "rancor",
- "rend",
- "rkyv_derive",
- "tinyvec",
- "uuid",
-]
-
-[[package]]
-name = "rkyv_derive"
-version = "0.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cb82b74b4810f07e460852c32f522e979787691b0b7b7439fe473e49d49b2f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "rmp"
-version = "0.8.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4"
-dependencies = [
- "byteorder",
- "num-traits",
- "paste",
-]
-
-[[package]]
-name = "rmp-serde"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db"
-dependencies = [
- "byteorder",
- "rmp",
- "serde",
-]
-
-[[package]]
-name = "rosvgtree"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdc23d1ace03d6b8153c7d16f0708cd80b61ee8e80304954803354e67e40d150"
-dependencies = [
- "log",
- "roxmltree 0.18.1",
- "simplecss",
- "siphasher",
- "svgtypes 0.9.0",
-]
-
-[[package]]
-name = "roxmltree"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302"
-dependencies = [
- "xmlparser",
-]
-
-[[package]]
-name = "roxmltree"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
-
-[[package]]
-name = "rust-netrc"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e98097f62769f92dbf95fb51f71c0a68ec18a4ee2e70e0d3e4f47ac005d63e9"
-dependencies = [
- "shellexpand",
- "thiserror",
-]
-
-[[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 = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
-
-[[package]]
-name = "rustix"
-version = "0.38.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a"
-dependencies = [
- "bitflags 2.6.0",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "rustls"
-version = "0.23.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e"
-dependencies = [
- "once_cell",
- "ring",
- "rustls-pki-types",
- "rustls-webpki",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rustls-native-certs"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a"
-dependencies = [
- "openssl-probe",
- "rustls-pemfile",
- "rustls-pki-types",
- "schannel",
- "security-framework",
-]
-
-[[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.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
-
-[[package]]
-name = "rustls-webpki"
-version = "0.102.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
-dependencies = [
- "ring",
- "rustls-pki-types",
- "untrusted",
-]
-
-[[package]]
-name = "rustybuzz"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "162bdf42e261bee271b3957691018634488084ef577dddeb6420a9684cab2a6a"
-dependencies = [
- "bitflags 1.3.2",
- "bytemuck",
- "smallvec",
- "ttf-parser",
- "unicode-bidi-mirroring",
- "unicode-ccc",
- "unicode-general-category",
- "unicode-script",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "schannel"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "schemars"
-version = "0.8.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92"
-dependencies = [
- "dyn-clone",
- "schemars_derive",
- "serde",
- "serde_json",
- "url",
-]
-
-[[package]]
-name = "schemars_derive"
-version = "0.8.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e"
-dependencies = [
- "proc-macro2",
- "quote",
- "serde_derive_internals",
- "syn",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "scroll"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ab8598aa408498679922eff7fa985c25d58a90771bd6be794434c5277eab1a6"
-dependencies = [
- "scroll_derive",
-]
-
-[[package]]
-name = "scroll_derive"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "seahash"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
-
-[[package]]
-name = "security-framework"
-version = "2.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
-dependencies = [
- "bitflags 2.6.0",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "self-replace"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03ec815b5eab420ab893f63393878d89c90fdd94c0bcc44c07abb8ad95552fb7"
-dependencies = [
- "fastrand",
- "tempfile",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
-
-[[package]]
-name = "serde"
-version = "1.0.214"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde-untagged"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2676ba99bd82f75cae5cbd2c8eda6fa0b8760f18978ea840e980dd5567b5c5b6"
-dependencies = [
- "erased-serde",
- "serde",
- "typeid",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.214"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_derive_internals"
-version = "0.29.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.132"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
-dependencies = [
- "itoa",
- "memchr",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_spanned"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
-dependencies = [
- "form_urlencoded",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sharded-slab"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "shell-escape"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f"
-
-[[package]]
-name = "shellexpand"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b"
-dependencies = [
- "bstr",
- "dirs",
- "os_str_bytes",
-]
-
-[[package]]
-name = "shlex"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "simd-adler32"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
-
-[[package]]
-name = "simdutf8"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
-
-[[package]]
-name = "similar"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e"
-
-[[package]]
-name = "simplecss"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d"
-dependencies = [
- "log",
-]
-
-[[package]]
-name = "siphasher"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
-
-[[package]]
-name = "slab"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
-
-[[package]]
-name = "smawk"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
-
-[[package]]
-name = "socket2"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "spdx"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47317bbaf63785b53861e1ae2d11b80d6b624211d42cb20efcd210ee6f8a14bc"
-dependencies = [
- "smallvec",
-]
-
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-
-[[package]]
-name = "strict-num"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
-dependencies = [
- "float-cmp",
-]
-
-[[package]]
-name = "strsim"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-
-[[package]]
-name = "subtle"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
-
-[[package]]
-name = "supports-color"
-version = "3.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8775305acf21c96926c900ad056abeef436701108518cf890020387236ac5a77"
-dependencies = [
- "is_ci",
-]
-
-[[package]]
-name = "supports-hyperlinks"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c0a1e5168041f5f3ff68ff7d95dcb9c8749df29f6e7e89ada40dd4c9de404ee"
-
-[[package]]
-name = "supports-unicode"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2"
-
-[[package]]
-name = "svg"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "700efb40f3f559c23c18b446e8ed62b08b56b2bb3197b36d57e0470b4102779e"
-
-[[package]]
-name = "svgfilters"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "639abcebc15fdc2df179f37d6f5463d660c1c79cd552c12343a4600827a04bce"
-dependencies = [
- "float-cmp",
- "rgb",
-]
-
-[[package]]
-name = "svgtypes"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9ee29c1407a5b18ccfe5f6ac82ac11bab3b14407e09c209a6c1a32098b19734"
-dependencies = [
- "kurbo 0.8.3",
- "siphasher",
-]
-
-[[package]]
-name = "svgtypes"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98ffacedcdcf1da6579c907279b4f3c5492fbce99fbbf227f5ed270a589c2765"
-dependencies = [
- "kurbo 0.9.5",
- "siphasher",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "sync_wrapper"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
-dependencies = [
- "futures-core",
-]
-
-[[package]]
-name = "sys-info"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b3a0d0aba8bf96a0e1ddfdc352fc53b3df7f39318c71854910c3c4b024ae52c"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "tagu"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eddb6b06d20fba9ed21fca3d696ee1b6e870bca0bcf9fa2971f6ae2436de576a"
-
-[[package]]
-name = "target-lexicon"
-version = "0.12.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
-
-[[package]]
-name = "temp-env"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96374855068f47402c3121c6eed88d29cb1de8f3ab27090e273e420bdabcf050"
-dependencies = [
- "parking_lot 0.12.3",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
-dependencies = [
- "cfg-if",
- "fastrand",
- "once_cell",
- "rustix",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "terminal_size"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
-dependencies = [
- "rustix",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "terminal_size"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef"
-dependencies = [
- "rustix",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "termtree"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
-
-[[package]]
-name = "test-case"
-version = "3.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8"
-dependencies = [
- "test-case-macros",
-]
-
-[[package]]
-name = "test-case-core"
-version = "3.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f"
-dependencies = [
- "cfg-if",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "test-case-macros"
-version = "3.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "test-case-core",
-]
-
-[[package]]
-name = "test-log"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dffced63c2b5c7be278154d76b479f9f9920ed34e7574201407f0b14e2bbb93"
-dependencies = [
- "test-log-macros",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "test-log-macros"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
-dependencies = [
- "smawk",
- "unicode-linebreak",
- "unicode-width",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.67"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b3c6efbfc763e64eb85c11c25320f0737cb7364c4b6336db90aa9ebe27a0bbd"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.67"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b607164372e89797d78b8e23a6d67d5d1038c1c65efd52e1389ef8b77caba2a6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
-
-[[package]]
-name = "tikv-jemalloc-sys"
-version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "tikv-jemallocator"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cec5ff18518d81584f477e9bfdf957f5bb0979b0bac3af4ca30b5b3ae2d2865"
-dependencies = [
- "libc",
- "tikv-jemalloc-sys",
-]
-
-[[package]]
-name = "tiny-skia"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67"
-dependencies = [
- "arrayref",
- "arrayvec",
- "bytemuck",
- "cfg-if",
- "png",
- "tiny-skia-path",
-]
-
-[[package]]
-name = "tiny-skia-path"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adbfb5d3f3dd57a0e11d12f4f13d4ebbbc1b5c15b7ab0a156d030b21da5f677c"
-dependencies = [
- "arrayref",
- "bytemuck",
- "strict-num",
-]
-
-[[package]]
-name = "tinytemplate"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
-dependencies = [
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
-[[package]]
-name = "tl"
-version = "0.7.8"
-source = "git+https://github.com/charliermarsh/tl.git?rev=6e25b2ee2513d75385101a8ff9f591ef51f314ec#6e25b2ee2513d75385101a8ff9f591ef51f314ec"
-
-[[package]]
-name = "tokio"
-version = "1.41.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb"
-dependencies = [
- "backtrace",
- "bytes",
- "libc",
- "mio",
- "parking_lot 0.12.3",
- "pin-project-lite",
- "signal-hook-registry",
- "socket2",
- "tokio-macros",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
-dependencies = [
- "rustls",
- "rustls-pki-types",
- "tokio",
-]
-
-[[package]]
-name = "tokio-socks"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f"
-dependencies = [
- "either",
- "futures-util",
- "thiserror",
- "tokio",
-]
-
-[[package]]
-name = "tokio-stream"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
-dependencies = [
- "futures-core",
- "pin-project-lite",
- "tokio",
- "tokio-util",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-io",
- "futures-sink",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "toml"
-version = "0.8.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow",
-]
-
-[[package]]
-name = "tower-service"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
-
-[[package]]
-name = "tracing"
-version = "0.1.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
-dependencies = [
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
-dependencies = [
- "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-durations-export"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "382e025ef8e0db646343dd2cf56af9d7fe6f5eabce5f388f8e5ec7234f555a0f"
-dependencies = [
- "anyhow",
- "fs-err",
- "itertools 0.13.0",
- "once_cell",
- "rustc-hash",
- "serde",
- "serde_json",
- "svg",
- "tracing",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
-dependencies = [
- "log",
- "once_cell",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-serde"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1"
-dependencies = [
- "serde",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
-dependencies = [
- "matchers",
- "nu-ansi-term 0.46.0",
- "once_cell",
- "regex",
- "serde",
- "serde_json",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "tracing",
- "tracing-core",
- "tracing-log",
- "tracing-serde",
-]
-
-[[package]]
-name = "tracing-test"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "557b891436fe0d5e0e363427fc7f217abf9ccd510d5136549847bdcbcd011d68"
-dependencies = [
- "tracing-core",
- "tracing-subscriber",
- "tracing-test-macro",
-]
-
-[[package]]
-name = "tracing-test-macro"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568"
-dependencies = [
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tracing-tree"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f459ca79f1b0d5f71c54ddfde6debfc59c8b6eeb46808ae492077f739dc7b49c"
-dependencies = [
- "nu-ansi-term 0.50.1",
- "tracing-core",
- "tracing-log",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
-
-[[package]]
-name = "ttf-parser"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633"
-
-[[package]]
-name = "typeid"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e"
-
-[[package]]
-name = "typenum"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
-
-[[package]]
-name = "unicase"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df"
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
-
-[[package]]
-name = "unicode-bidi-mirroring"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694"
-
-[[package]]
-name = "unicode-ccc"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1"
-
-[[package]]
-name = "unicode-general-category"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
-
-[[package]]
-name = "unicode-linebreak"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-script"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb421b350c9aff471779e262955939f565ec18b86c15364e6bdf0d662ca7c1f"
-
-[[package]]
-name = "unicode-vo"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
-
-[[package]]
-name = "unscanny"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47"
-
-[[package]]
-name = "untrusted"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
-
-[[package]]
-name = "url"
-version = "2.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
- "serde",
-]
-
-[[package]]
-name = "urlencoding"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
-
-[[package]]
-name = "usvg"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63b6bb4e62619d9f68aa2d8a823fea2bff302340a1f2d45c264d5b0be170832e"
-dependencies = [
- "base64 0.21.7",
- "data-url",
- "flate2",
- "imagesize",
- "kurbo 0.9.5",
- "log",
- "rctree",
- "rosvgtree",
- "strict-num",
-]
-
-[[package]]
-name = "usvg-text-layout"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "195386e01bc35f860db024de275a76e7a31afdf975d18beb6d0e44764118b4db"
-dependencies = [
- "fontdb",
- "kurbo 0.9.5",
- "log",
- "rustybuzz",
- "unicode-bidi",
- "unicode-script",
- "unicode-vo",
- "usvg",
-]
-
-[[package]]
-name = "utf8-width"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3"
-
-[[package]]
-name = "utf8parse"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
-
-[[package]]
-name = "uuid"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
-
-[[package]]
-name = "uv"
-version = "0.4.30"
-dependencies = [
- "anstream",
- "anyhow",
- "assert_cmd",
- "assert_fs",
- "axoupdater",
- "base64 0.22.1",
- "byteorder",
- "clap",
- "console",
- "ctrlc",
- "dotenvy",
- "etcetera",
- "filetime",
- "flate2",
- "fs-err",
- "futures",
- "http",
- "ignore",
- "indicatif",
- "indoc",
- "insta",
- "itertools 0.13.0",
- "jiff",
- "miette",
- "owo-colors",
- "petgraph",
- "predicates",
- "rayon",
- "regex",
- "reqwest",
- "rustc-hash",
- "serde",
- "serde_json",
- "similar",
- "tempfile",
- "textwrap",
- "thiserror",
- "tokio",
- "toml",
- "tracing",
- "tracing-durations-export",
- "tracing-subscriber",
- "tracing-tree",
- "unicode-width",
- "url",
- "uv-auth",
- "uv-build-backend",
- "uv-cache",
- "uv-cache-info",
- "uv-cache-key",
- "uv-cli",
- "uv-client",
- "uv-configuration",
- "uv-console",
- "uv-dispatch",
- "uv-distribution",
- "uv-distribution-filename",
- "uv-distribution-types",
- "uv-extract",
- "uv-fs",
- "uv-git",
- "uv-install-wheel",
- "uv-installer",
- "uv-normalize",
- "uv-pep440",
- "uv-pep508",
- "uv-performance-flate2-backend",
- "uv-performance-memory-allocator",
- "uv-platform-tags",
- "uv-publish",
- "uv-pypi-types",
- "uv-python",
- "uv-requirements",
- "uv-resolver",
- "uv-scripts",
- "uv-settings",
- "uv-shell",
- "uv-static",
- "uv-tool",
- "uv-trampoline-builder",
- "uv-types",
- "uv-version",
- "uv-virtualenv",
- "uv-warnings",
- "uv-workspace",
- "which",
- "zip",
-]
-
-[[package]]
-name = "uv-auth"
-version = "0.0.1"
-dependencies = [
- "anyhow",
- "async-trait",
- "base64 0.22.1",
- "futures",
- "http",
- "insta",
- "reqwest",
- "reqwest-middleware",
- "rust-netrc",
- "rustc-hash",
- "tempfile",
- "test-log",
- "tokio",
- "tracing",
- "url",
- "urlencoding",
- "uv-once-map",
- "uv-static",
- "wiremock",
-]
-
-[[package]]
-name = "uv-bench"
-version = "0.0.0"
-dependencies = [
- "anyhow",
- "codspeed-criterion-compat",
- "criterion",
- "jiff",
- "tokio",
- "uv-cache",
- "uv-client",
- "uv-configuration",
- "uv-dispatch",
- "uv-distribution",
- "uv-distribution-filename",
- "uv-distribution-types",
- "uv-git",
- "uv-install-wheel",
- "uv-pep440",
- "uv-pep508",
- "uv-platform-tags",
- "uv-pypi-types",
- "uv-python",
- "uv-resolver",
- "uv-types",
-]
-
-[[package]]
-name = "uv-build-backend"
-version = "0.1.0"
-dependencies = [
- "csv",
- "fs-err",
- "glob",
- "indoc",
- "insta",
- "itertools 0.13.0",
- "serde",
- "sha2",
- "spdx",
- "tempfile",
- "thiserror",
- "toml",
- "tracing",
- "uv-distribution-filename",
- "uv-fs",
- "uv-normalize",
- "uv-pep440",
- "uv-pep508",
- "uv-pypi-types",
- "uv-warnings",
- "version-ranges",
- "walkdir",
- "zip",
-]
-
-[[package]]
-name = "uv-build-frontend"
-version = "0.0.1"
-dependencies = [
- "anstream",
- "anyhow",
- "fs-err",
- "indoc",
- "insta",
- "itertools 0.13.0",
- "owo-colors",
- "regex",
- "rustc-hash",
- "serde",
- "serde_json",
- "tempfile",
- "thiserror",
- "tokio",
- "toml_edit",
- "tracing",
- "uv-configuration",
- "uv-distribution",
- "uv-distribution-types",
- "uv-fs",
- "uv-pep440",
- "uv-pep508",
- "uv-pypi-types",
- "uv-python",
- "uv-static",
- "uv-types",
- "uv-virtualenv",
-]
-
-[[package]]
-name = "uv-cache"
-version = "0.0.1"
-dependencies = [
- "clap",
- "fs-err",
- "nanoid",
- "rmp-serde",
- "rustc-hash",
- "serde",
- "tempfile",
- "tracing",
- "url",
- "uv-cache-info",
- "uv-cache-key",
- "uv-dirs",
- "uv-distribution-types",
- "uv-fs",
- "uv-normalize",
- "uv-pypi-types",
- "uv-static",
- "walkdir",
-]
-
-[[package]]
-name = "uv-cache-info"
-version = "0.0.1"
-dependencies = [
- "fs-err",
- "globwalk",
- "schemars",
- "serde",
- "thiserror",
- "toml",
- "tracing",
-]
-
-[[package]]
-name = "uv-cache-key"
-version = "0.0.1"
-dependencies = [
- "hex",
- "seahash",
- "url",
-]
-
-[[package]]
-name = "uv-cli"
-version = "0.0.1"
-dependencies = [
- "anstream",
- "anyhow",
- "clap",
- "clap_complete_command",
- "fs-err",
- "insta",
- "serde",
- "url",
- "uv-cache",
- "uv-configuration",
- "uv-distribution-types",
- "uv-install-wheel",
- "uv-normalize",
- "uv-pep508",
- "uv-pypi-types",
- "uv-python",
- "uv-resolver",
- "uv-settings",
- "uv-static",
- "uv-version",
- "uv-warnings",
-]
-
-[[package]]
-name = "uv-client"
-version = "0.0.1"
-dependencies = [
- "anyhow",
- "async-trait",
- "async_http_range_reader",
- "async_zip",
- "bytecheck",
- "fs-err",
- "futures",
- "html-escape",
- "http",
- "http-body-util",
- "hyper",
- "hyper-util",
- "insta",
- "itertools 0.13.0",
- "jiff",
- "reqwest",
- "reqwest-middleware",
- "reqwest-retry",
- "rkyv",
- "rmp-serde",
- "serde",
- "serde_json",
- "sys-info",
- "thiserror",
- "tl",
- "tokio",
- "tokio-util",
- "tracing",
- "url",
- "urlencoding",
- "uv-auth",
- "uv-cache",
- "uv-cache-key",
- "uv-configuration",
- "uv-distribution-filename",
- "uv-distribution-types",
- "uv-fs",
- "uv-metadata",
- "uv-normalize",
- "uv-pep440",
- "uv-pep508",
- "uv-platform-tags",
- "uv-pypi-types",
- "uv-static",
- "uv-version",
- "uv-warnings",
-]
-
-[[package]]
-name = "uv-configuration"
-version = "0.0.1"
-dependencies = [
- "anyhow",
- "clap",
- "either",
- "fs-err",
- "rustc-hash",
- "schemars",
- "serde",
- "serde-untagged",
- "serde_json",
- "thiserror",
- "tracing",
- "url",
- "uv-auth",
- "uv-cache",
- "uv-cache-info",
- "uv-cache-key",
- "uv-normalize",
- "uv-pep508",
- "uv-platform-tags",
- "uv-pypi-types",
- "uv-static",
- "which",
-]
-
-[[package]]
-name = "uv-console"
-version = "0.0.1"
-dependencies = [
- "console",
- "ctrlc",
-]
-
-[[package]]
-name = "uv-dev"
-version = "0.0.1"
-dependencies = [
- "anstream",
- "anyhow",
- "clap",
- "fs-err",
- "itertools 0.13.0",
- "markdown",
- "owo-colors",
- "poloto",
- "pretty_assertions",
- "resvg",
- "schemars",
- "serde",
- "serde_json",
- "tagu",
- "textwrap",
- "tokio",
- "tracing",
- "tracing-durations-export",
- "tracing-subscriber",
- "uv-cache",
- "uv-cli",
- "uv-client",
- "uv-distribution-filename",
- "uv-distribution-types",
- "uv-installer",
- "uv-macros",
- "uv-options-metadata",
- "uv-pep508",
- "uv-performance-memory-allocator",
- "uv-pypi-types",
- "uv-python",
- "uv-settings",
- "uv-static",
- "uv-workspace",
- "walkdir",
-]
-
-[[package]]
-name = "uv-dirs"
-version = "0.0.1"
-dependencies = [
- "directories",
- "dirs-sys",
- "etcetera",
- "uv-static",
-]
-
-[[package]]
-name = "uv-dispatch"
-version = "0.0.1"
-dependencies = [
- "anyhow",
- "futures",
- "itertools 0.13.0",
- "rustc-hash",
- "tracing",
- "uv-build-frontend",
- "uv-cache",
- "uv-client",
- "uv-configuration",
- "uv-distribution",
- "uv-distribution-types",
- "uv-git",
- "uv-install-wheel",
- "uv-installer",
- "uv-pypi-types",
- "uv-python",
- "uv-resolver",
- "uv-types",
-]
-
-[[package]]
-name = "uv-distribution"
-version = "0.0.1"
-dependencies = [
- "anyhow",
- "either",
- "fs-err",
- "futures",
- "indoc",
- "insta",
- "nanoid",
- "owo-colors",
- "reqwest",
- "reqwest-middleware",
- "rmp-serde",
- "rustc-hash",
- "serde",
- "tempfile",
- "thiserror",
- "tokio",
- "tokio-util",
- "tracing",
- "url",
- "uv-cache",
- "uv-cache-info",
- "uv-cache-key",
- "uv-client",
- "uv-configuration",
- "uv-distribution-filename",
- "uv-distribution-types",
- "uv-extract",
- "uv-fs",
- "uv-git",
- "uv-metadata",
- "uv-normalize",
- "uv-pep440",
- "uv-pep508",
- "uv-platform-tags",
- "uv-pypi-types",
- "uv-types",
- "uv-warnings",
- "uv-workspace",
- "walkdir",
- "zip",
-]
-
-[[package]]
-name = "uv-distribution-filename"
-version = "0.0.1"
-dependencies = [
- "insta",
- "rkyv",
- "serde",
- "thiserror",
- "url",
- "uv-normalize",
- "uv-pep440",
- "uv-platform-tags",
-]
-
-[[package]]
-name = "uv-distribution-types"
-version = "0.0.1"
-dependencies = [
- "anyhow",
- "bitflags 2.6.0",
- "fs-err",
- "itertools 0.13.0",
- "jiff",
- "rkyv",
- "rustc-hash",
- "schemars",
- "serde",
- "serde_json",
- "thiserror",
- "tracing",
- "url",
- "urlencoding",
- "uv-auth",
- "uv-cache-info",
- "uv-cache-key",
- "uv-distribution-filename",
- "uv-fs",
- "uv-git",
- "uv-normalize",
- "uv-pep440",
- "uv-pep508",
- "uv-platform-tags",
- "uv-pypi-types",
-]
-
-[[package]]
-name = "uv-extract"
-version = "0.0.1"
-dependencies = [
- "async-compression",
- "async_zip",
- "fs-err",
- "futures",
- "krata-tokio-tar",
- "md-5",
- "rayon",
- "reqwest",
- "rustc-hash",
- "sha2",
- "thiserror",
- "tokio",
- "tokio-util",
- "tracing",
- "uv-distribution-filename",
- "uv-pypi-types",
- "xz2",
- "zip",
-]
-
-[[package]]
-name = "uv-fs"
-version = "0.0.1"
-dependencies = [
- "backoff",
- "cachedir",
- "dunce",
- "either",
- "encoding_rs_io",
- "fs-err",
- "fs2",
- "junction",
- "path-slash",
- "rustix",
- "schemars",
- "serde",
- "tempfile",
- "tokio",
- "tracing",
- "urlencoding",
- "winsafe 0.0.22",
-]
-
-[[package]]
-name = "uv-git"
-version = "0.0.1"
-dependencies = [
- "anyhow",
- "cargo-util",
- "dashmap",
- "fs-err",
- "reqwest",
- "reqwest-middleware",
- "serde",
- "thiserror",
- "tokio",
- "tracing",
- "url",
- "uv-auth",
- "uv-cache-key",
- "uv-fs",
- "uv-static",
- "which",
-]
-
-[[package]]
-name = "uv-install-wheel"
-version = "0.0.1"
-dependencies = [
- "anyhow",
- "assert_fs",
- "clap",
- "configparser",
- "csv",
- "data-encoding",
- "fs-err",
- "indoc",
- "mailparse",
- "pathdiff",
- "platform-info",
- "reflink-copy",
- "regex",
- "rustc-hash",
- "schemars",
- "serde",
- "serde_json",
- "sha2",
- "tempfile",
- "thiserror",
- "tracing",
- "uv-cache-info",
- "uv-distribution-filename",
- "uv-fs",
- "uv-normalize",
- "uv-pep440",
- "uv-platform-tags",
- "uv-pypi-types",
- "uv-trampoline-builder",
- "uv-warnings",
- "walkdir",
- "zip",
-]
-
-[[package]]
-name = "uv-installer"
-version = "0.0.1"
-dependencies = [
- "anyhow",
- "async-channel",
- "fs-err",
- "futures",
- "rayon",
- "rustc-hash",
- "same-file",
- "tempfile",
- "thiserror",
- "tokio",
- "tracing",
- "url",
- "uv-cache",
- "uv-cache-info",
- "uv-cache-key",
- "uv-configuration",
- "uv-distribution",
- "uv-distribution-types",
- "uv-extract",
- "uv-fs",
- "uv-install-wheel",
- "uv-normalize",
- "uv-pep440",
- "uv-pep508",
- "uv-platform-tags",
- "uv-pypi-types",
- "uv-python",
- "uv-static",
- "uv-types",
- "uv-warnings",
- "walkdir",
-]
-
-[[package]]
-name = "uv-macros"
-version = "0.0.1"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "textwrap",
-]
-
-[[package]]
-name = "uv-metadata"
-version = "0.1.0"
-dependencies = [
- "async_zip",
- "fs-err",
- "futures",
- "thiserror",
- "tokio",
- "tokio-util",
- "uv-distribution-filename",
- "uv-normalize",
- "uv-pypi-types",
- "zip",
-]
-
-[[package]]
-name = "uv-normalize"
-version = "0.0.1"
-dependencies = [
- "rkyv",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "uv-once-map"
-version = "0.0.1"
-dependencies = [
- "dashmap",
- "futures",
- "tokio",
-]
-
-[[package]]
-name = "uv-options-metadata"
-version = "0.0.1"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "uv-pep440"
-version = "0.7.0"
-dependencies = [
- "indoc",
- "rkyv",
- "serde",
- "tracing",
- "unicode-width",
- "unscanny",
- "version-ranges",
-]
-
-[[package]]
-name = "uv-pep508"
-version = "0.6.0"
-dependencies = [
- "boxcar",
- "indexmap",
- "insta",
- "itertools 0.13.0",
- "regex",
- "rustc-hash",
- "schemars",
- "serde",
- "serde_json",
- "smallvec",
- "thiserror",
- "tracing",
- "tracing-test",
- "unicode-width",
- "url",
- "uv-fs",
- "uv-normalize",
- "uv-pep440",
- "version-ranges",
-]
-
-[[package]]
-name = "uv-performance-flate2-backend"
-version = "0.1.0"
-dependencies = [
- "flate2",
- "libz-ng-sys",
-]
-
-[[package]]
-name = "uv-performance-memory-allocator"
-version = "0.1.0"
-dependencies = [
- "mimalloc",
- "tikv-jemallocator",
-]
-
-[[package]]
-name = "uv-platform-tags"
-version = "0.0.1"
-dependencies = [
- "insta",
- "rustc-hash",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "uv-publish"
-version = "0.1.0"
-dependencies = [
- "async-compression",
- "base64 0.22.1",
- "fs-err",
- "futures",
- "glob",
- "insta",
- "itertools 0.13.0",
- "krata-tokio-tar",
- "reqwest",
- "reqwest-middleware",
- "reqwest-retry",
- "rustc-hash",
- "serde",
- "serde_json",
- "thiserror",
- "tokio",
- "tokio-util",
- "tracing",
- "url",
- "uv-cache",
- "uv-client",
- "uv-configuration",
- "uv-distribution-filename",
- "uv-distribution-types",
- "uv-extract",
- "uv-fs",
- "uv-metadata",
- "uv-pypi-types",
- "uv-static",
- "uv-warnings",
-]
-
-[[package]]
-name = "uv-pypi-types"
-version = "0.0.1"
-dependencies = [
- "anyhow",
- "indexmap",
- "itertools 0.13.0",
- "jiff",
- "mailparse",
- "regex",
- "rkyv",
- "serde",
- "serde-untagged",
- "thiserror",
- "toml",
- "toml_edit",
- "tracing",
- "url",
- "uv-distribution-filename",
- "uv-fs",
- "uv-git",
- "uv-normalize",
- "uv-pep440",
- "uv-pep508",
-]
-
-[[package]]
-name = "uv-python"
-version = "0.0.1"
-dependencies = [
- "anyhow",
- "assert_fs",
- "clap",
- "configparser",
- "fs-err",
- "futures",
- "goblin",
- "indoc",
- "itertools 0.13.0",
- "owo-colors",
- "procfs",
- "regex",
- "reqwest",
- "reqwest-middleware",
- "rmp-serde",
- "same-file",
- "schemars",
- "serde",
- "serde_json",
- "target-lexicon",
- "temp-env",
- "tempfile",
- "test-log",
- "thiserror",
- "tokio",
- "tokio-util",
- "tracing",
- "url",
- "uv-cache",
- "uv-cache-info",
- "uv-cache-key",
- "uv-client",
- "uv-dirs",
- "uv-distribution-filename",
- "uv-extract",
- "uv-fs",
- "uv-install-wheel",
- "uv-pep440",
- "uv-pep508",
- "uv-platform-tags",
- "uv-pypi-types",
- "uv-state",
- "uv-static",
- "uv-trampoline-builder",
- "uv-warnings",
- "which",
- "windows-registry 0.3.0",
- "windows-result 0.2.0",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "uv-requirements"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "configparser",
- "console",
- "fs-err",
- "futures",
- "rustc-hash",
- "serde",
- "thiserror",
- "toml",
- "tracing",
- "url",
- "uv-cache-key",
- "uv-client",
- "uv-configuration",
- "uv-console",
- "uv-distribution",
- "uv-distribution-filename",
- "uv-distribution-types",
- "uv-fs",
- "uv-git",
- "uv-normalize",
- "uv-pep508",
- "uv-pypi-types",
- "uv-requirements-txt",
- "uv-resolver",
- "uv-types",
- "uv-warnings",
- "uv-workspace",
-]
-
-[[package]]
-name = "uv-requirements-txt"
-version = "0.0.1"
-dependencies = [
- "anyhow",
- "assert_fs",
- "fs-err",
- "indoc",
- "insta",
- "itertools 0.13.0",
- "regex",
- "reqwest",
- "reqwest-middleware",
- "tempfile",
- "test-case",
- "thiserror",
- "tokio",
- "tracing",
- "unscanny",
- "url",
- "uv-client",
- "uv-configuration",
- "uv-distribution-types",
- "uv-fs",
- "uv-normalize",
- "uv-pep508",
- "uv-pypi-types",
- "uv-warnings",
-]
-
-[[package]]
-name = "uv-resolver"
-version = "0.0.1"
-dependencies = [
- "anyhow",
- "clap",
- "dashmap",
- "either",
- "futures",
- "indexmap",
- "insta",
- "itertools 0.13.0",
- "jiff",
- "owo-colors",
- "petgraph",
- "pubgrub",
- "rkyv",
- "rustc-hash",
- "same-file",
- "schemars",
- "serde",
- "textwrap",
- "thiserror",
- "tokio",
- "tokio-stream",
- "toml",
- "toml_edit",
- "tracing",
- "url",
- "uv-cache-key",
- "uv-client",
- "uv-configuration",
- "uv-distribution",
- "uv-distribution-filename",
- "uv-distribution-types",
- "uv-fs",
- "uv-git",
- "uv-metadata",
- "uv-normalize",
- "uv-once-map",
- "uv-pep440",
- "uv-pep508",
- "uv-platform-tags",
- "uv-pypi-types",
- "uv-python",
- "uv-requirements-txt",
- "uv-static",
- "uv-types",
- "uv-warnings",
- "uv-workspace",
-]
-
-[[package]]
-name = "uv-scripts"
-version = "0.0.1"
-dependencies = [
- "fs-err",
- "indoc",
- "memchr",
- "serde",
- "thiserror",
- "toml",
- "uv-distribution-types",
- "uv-pep440",
- "uv-pep508",
- "uv-pypi-types",
- "uv-settings",
- "uv-workspace",
-]
-
-[[package]]
-name = "uv-settings"
-version = "0.0.1"
-dependencies = [
- "assert_fs",
- "clap",
- "dirs-sys",
- "fs-err",
- "indoc",
- "schemars",
- "serde",
- "textwrap",
- "thiserror",
- "toml",
- "tracing",
- "url",
- "uv-cache-info",
- "uv-configuration",
- "uv-distribution-types",
- "uv-fs",
- "uv-install-wheel",
- "uv-macros",
- "uv-normalize",
- "uv-options-metadata",
- "uv-pep508",
- "uv-pypi-types",
- "uv-python",
- "uv-resolver",
- "uv-static",
- "uv-warnings",
-]
-
-[[package]]
-name = "uv-shell"
-version = "0.0.1"
-dependencies = [
- "anyhow",
- "home",
- "same-file",
- "tracing",
- "uv-fs",
- "uv-static",
- "winreg",
-]
-
-[[package]]
-name = "uv-state"
-version = "0.0.1"
-dependencies = [
- "fs-err",
- "tempfile",
- "uv-dirs",
-]
-
-[[package]]
-name = "uv-static"
-version = "0.0.1"
-dependencies = [
- "uv-macros",
-]
-
-[[package]]
-name = "uv-tool"
-version = "0.0.1"
-dependencies = [
- "fs-err",
- "pathdiff",
- "serde",
- "thiserror",
- "toml",
- "toml_edit",
- "tracing",
- "uv-cache",
- "uv-dirs",
- "uv-fs",
- "uv-install-wheel",
- "uv-installer",
- "uv-pep440",
- "uv-pep508",
- "uv-pypi-types",
- "uv-python",
- "uv-settings",
- "uv-state",
- "uv-static",
- "uv-virtualenv",
-]
-
-[[package]]
-name = "uv-trampoline-builder"
-version = "0.0.1"
-dependencies = [
- "anyhow",
- "assert_cmd",
- "assert_fs",
- "fs-err",
- "thiserror",
- "uv-fs",
- "which",
- "zip",
-]
-
-[[package]]
-name = "uv-types"
-version = "0.0.1"
-dependencies = [
- "anyhow",
- "rustc-hash",
- "thiserror",
- "url",
- "uv-cache",
- "uv-configuration",
- "uv-distribution-types",
- "uv-git",
- "uv-normalize",
- "uv-once-map",
- "uv-pep440",
- "uv-pep508",
- "uv-pypi-types",
- "uv-python",
-]
-
-[[package]]
-name = "uv-version"
-version = "0.4.30"
-
-[[package]]
-name = "uv-virtualenv"
-version = "0.0.4"
-dependencies = [
- "fs-err",
- "itertools 0.13.0",
- "pathdiff",
- "thiserror",
- "tracing",
- "uv-fs",
- "uv-platform-tags",
- "uv-pypi-types",
- "uv-python",
- "uv-version",
-]
-
-[[package]]
-name = "uv-warnings"
-version = "0.0.1"
-dependencies = [
- "anstream",
- "owo-colors",
- "rustc-hash",
-]
-
-[[package]]
-name = "uv-workspace"
-version = "0.0.1"
-dependencies = [
- "anyhow",
- "assert_fs",
- "fs-err",
- "glob",
- "insta",
- "itertools 0.13.0",
- "owo-colors",
- "regex",
- "rustc-hash",
- "same-file",
- "schemars",
- "serde",
- "tempfile",
- "thiserror",
- "tokio",
- "toml",
- "toml_edit",
- "tracing",
- "url",
- "uv-cache-key",
- "uv-distribution-types",
- "uv-fs",
- "uv-git",
- "uv-macros",
- "uv-normalize",
- "uv-options-metadata",
- "uv-pep440",
- "uv-pep508",
- "uv-pypi-types",
- "uv-static",
- "uv-warnings",
-]
-
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
-[[package]]
-name = "version-ranges"
-version = "0.1.0"
-source = "git+https://github.com/astral-sh/pubgrub?rev=95e1390399cdddee986b658be19587eb1fdb2d79#95e1390399cdddee986b658be19587eb1fdb2d79"
-dependencies = [
- "smallvec",
-]
-
-[[package]]
-name = "version_check"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-
-[[package]]
-name = "wait-timeout"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "walkdir"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
-dependencies = [
- "same-file",
- "winapi-util",
-]
-
-[[package]]
-name = "want"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
-dependencies = [
- "try-lock",
-]
-
-[[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.95"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
-dependencies = [
- "cfg-if",
- "once_cell",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.95"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.95"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.95"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.95"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
-
-[[package]]
-name = "wasm-streams"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
-dependencies = [
- "futures-util",
- "js-sys",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-timer"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f"
-dependencies = [
- "futures",
- "js-sys",
- "parking_lot 0.11.2",
- "pin-utils",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
-[[package]]
-name = "web-sys"
-version = "0.3.72"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.26.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958"
-dependencies = [
- "rustls-pki-types",
-]
-
-[[package]]
-name = "weezl"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
-
-[[package]]
-name = "which"
-version = "7.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9cad3279ade7346b96e38731a641d7343dd6a53d55083dd54eadfa5a1b38c6b"
-dependencies = [
- "either",
- "home",
- "regex",
- "rustix",
- "winsafe 0.0.19",
-]
-
-[[package]]
-name = "widestring"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
-
-[[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-util"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
-[[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"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
-dependencies = [
- "windows-core 0.57.0",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
-dependencies = [
- "windows-core 0.58.0",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
-dependencies = [
- "windows-implement 0.57.0",
- "windows-interface 0.57.0",
- "windows-result 0.1.2",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
-dependencies = [
- "windows-implement 0.58.0",
- "windows-interface 0.58.0",
- "windows-result 0.2.0",
- "windows-strings 0.1.0",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-implement"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "windows-implement"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "windows-interface"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "windows-interface"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "windows-registry"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
-dependencies = [
- "windows-result 0.2.0",
- "windows-strings 0.1.0",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-registry"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bafa604f2104cf5ae2cc2db1dee84b7e6a5d11b05f737b60def0ffdc398cbc0a"
-dependencies = [
- "windows-result 0.2.0",
- "windows-strings 0.2.0",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-result"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-result"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-strings"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
-dependencies = [
- "windows-result 0.2.0",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-strings"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978d65aedf914c664c510d9de43c8fd85ca745eaff1ed53edf409b479e441663"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[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.59.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
-]
-
-[[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",
- "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_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-[[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_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
-[[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_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-[[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_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-[[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_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
-[[package]]
-name = "winnow"
-version = "0.6.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "winreg"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "winsafe"
-version = "0.0.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
-
-[[package]]
-name = "winsafe"
-version = "0.0.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d6ad6cbd9c6e5144971e326303f0e453b61d82e4f72067fccf23106bccd8437"
-
-[[package]]
-name = "wiremock"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fff469918e7ca034884c7fd8f93fe27bacb7fcb599fd879df6c7b429a29b646"
-dependencies = [
- "assert-json-diff",
- "async-trait",
- "base64 0.22.1",
- "deadpool",
- "futures",
- "http",
- "http-body-util",
- "hyper",
- "hyper-util",
- "log",
- "once_cell",
- "regex",
- "serde",
- "serde_json",
- "tokio",
- "url",
-]
-
-[[package]]
-name = "xattr"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
-dependencies = [
- "libc",
- "linux-raw-sys",
- "rustix",
-]
-
-[[package]]
-name = "xmlparser"
-version = "0.13.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
-
-[[package]]
-name = "xz2"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2"
-dependencies = [
- "lzma-sys",
-]
-
-[[package]]
-name = "yansi"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
-
-[[package]]
-name = "zerocopy"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
-dependencies = [
- "byteorder",
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "zeroize"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
-
-[[package]]
-name = "zip"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
-dependencies = [
- "byteorder",
- "crc32fast",
- "crossbeam-utils",
- "flate2",
-]
-
-[[package]]
-name = "zstd"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9"
-dependencies = [
- "zstd-safe",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "7.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059"
-dependencies = [
- "zstd-sys",
-]
-
-[[package]]
-name = "zstd-sys"
-version = "2.0.13+zstd.1.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
-dependencies = [
- "cc",
- "pkg-config",
-]
diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 2652cbbc3e89..3abe878f2afd 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -1,43 +1,34 @@
{
lib,
+ stdenv,
cmake,
fetchFromGitHub,
installShellFiles,
pkg-config,
- python3Packages,
rustPlatform,
versionCheckHook,
+ python3Packages,
nix-update-script,
}:
-python3Packages.buildPythonApplication rec {
+rustPlatform.buildRustPackage rec {
pname = "uv";
- version = "0.4.30";
- pyproject = true;
+ version = "0.5.5";
src = fetchFromGitHub {
owner = "astral-sh";
repo = "uv";
rev = "refs/tags/${version}";
- hash = "sha256-xy/fgy3+YvSdfq5ngPVbAmRpYyJH27Cft5QxBwFQumU=";
+ hash = "sha256-E0U6K+lvtIM9htpMpFN36JHA772LgTHaTCVGiTTlvQk=";
};
- cargoDeps = rustPlatform.importCargoLock {
- lockFile = ./Cargo.lock;
- outputHashes = {
- "async_zip-0.0.17" = "sha256-3k9rc4yHWhqsCUJ17K55F8aQoCKdVamrWAn6IDWo3Ss=";
- "pubgrub-0.2.1" = "sha256-8TrOQ6fYJrYgFNuqiqnGztnHOqFIEDi2MFZEBA+oks4=";
- "reqwest-middleware-0.3.3" = "sha256-KjyXB65a7SAfwmxokH2PQFFcJc6io0xuIBQ/yZELJzM=";
- "tl-0.7.8" = "sha256-F06zVeSZA4adT6AzLzz1i9uxpI1b8P1h+05fFfjm3GQ=";
- };
- };
+ useFetchCargoVendor = true;
+ cargoHash = "sha256-WbA0/HojU/E2ccAvV2sv9EAXLqcb+99LFHxddcYFZFw=";
nativeBuildInputs = [
cmake
installShellFiles
pkg-config
- rustPlatform.cargoSetupHook
- rustPlatform.maturinBuildHook
];
dontUseCmakeConfigure = true;
@@ -47,7 +38,10 @@ python3Packages.buildPythonApplication rec {
"uv"
];
- postInstall = ''
+ # Tests require python3
+ doCheck = false;
+
+ postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
export HOME=$TMPDIR
installShellCompletion --cmd uv \
--bash <($out/bin/uv --generate-shell-completion bash) \
@@ -55,14 +49,14 @@ python3Packages.buildPythonApplication rec {
--zsh <($out/bin/uv --generate-shell-completion zsh)
'';
- pythonImportsCheck = [ "uv" ];
-
- nativeCheckInputs = [
+ nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
+ doInstallCheck = true;
passthru = {
+ tests.uv-python = python3Packages.uv;
updateScript = nix-update-script { };
};
diff --git a/pkgs/by-name/ve/vectorscan/package.nix b/pkgs/by-name/ve/vectorscan/package.nix
index 8525a66e4092..860ea03f7a2d 100644
--- a/pkgs/by-name/ve/vectorscan/package.nix
+++ b/pkgs/by-name/ve/vectorscan/package.nix
@@ -6,7 +6,7 @@
, ragel
, util-linux
, python3
-, boost184
+, boost
, sqlite
, pcre
, enableShared ? !stdenv.hostPlatform.isStatic
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
] ++ lib.optional stdenv.hostPlatform.isLinux util-linux;
buildInputs = [
- boost184
+ boost
sqlite
pcre
];
diff --git a/pkgs/by-name/vk/vk-bootstrap/package.nix b/pkgs/by-name/vk/vk-bootstrap/package.nix
index bc43da3567d8..f865c783b079 100644
--- a/pkgs/by-name/vk/vk-bootstrap/package.nix
+++ b/pkgs/by-name/vk/vk-bootstrap/package.nix
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
postPatch = ''
# Upstream uses cmake FetchContent to resolve glfw and catch2
# needed for examples and tests
- sed -iE 's=add_subdirectory(ext)==g' CMakeLists.txt
- sed -iE 's=Catch2==g' tests/CMakeLists.txt
+ sed -i 's=add_subdirectory(ext)==g' CMakeLists.txt
+ sed -i 's=Catch2==g' tests/CMakeLists.txt
'';
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/vl/vlc/package.nix b/pkgs/by-name/vl/vlc/package.nix
index 2c005cbfa434..f93efd316cb5 100644
--- a/pkgs/by-name/vl/vlc/package.nix
+++ b/pkgs/by-name/vl/vlc/package.nix
@@ -189,6 +189,7 @@ stdenv.mkDerivation (finalAttrs: {
systemd
taglib
xcbutilkeysyms
+ wayland-scanner # only required for configure script
zlib
]
++ optionals (!stdenv.hostPlatform.isAarch && !onlyLibVLC) [ live555 ]
@@ -207,6 +208,7 @@ stdenv.mkDerivation (finalAttrs: {
qtx11extras
])
++ optionals (waylandSupport && withQt5) [ libsForQt5.qtwayland ];
+ strictDeps = true;
env = {
# vlc depends on a c11-gcc wrapper script which we don't have so we need to
diff --git a/pkgs/by-name/w3/w3m/package.nix b/pkgs/by-name/w3/w3m/package.nix
index 8ea48ffbad99..e0a627cbef16 100644
--- a/pkgs/by-name/w3/w3m/package.nix
+++ b/pkgs/by-name/w3/w3m/package.nix
@@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
ln -s ${mktable}/bin/mktable mktable
# stop make from recompiling mktable
- sed -ie 's!mktable.*:.*!mktable:!' Makefile.in
+ sed -i -e 's!mktable.*:.*!mktable:!' Makefile.in
'';
# updateAutotoolsGnuConfigScriptsHook necessary to build on FreeBSD native pending inclusion of
diff --git a/pkgs/by-name/wi/wifish/package.nix b/pkgs/by-name/wi/wifish/package.nix
index 7f474bc98442..2d89880ce6a8 100644
--- a/pkgs/by-name/wi/wifish/package.nix
+++ b/pkgs/by-name/wi/wifish/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
postPatch = ''
- sed -ie 's|/var/lib/wifish|${placeholder "out"}/var/lib/wifish|' wifish
+ sed -i -e 's|/var/lib/wifish|${placeholder "out"}/var/lib/wifish|' wifish
'';
dontConfigure = true;
diff --git a/pkgs/by-name/x2/x2goserver/package.nix b/pkgs/by-name/x2/x2goserver/package.nix
index 44e16e378f55..6960d3c1c663 100644
--- a/pkgs/by-name/x2/x2goserver/package.nix
+++ b/pkgs/by-name/x2/x2goserver/package.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
done
# We're patching @INC of the setgid wrapper, because we can't mix
# the perl wrapper (for PERL5LIB) with security.wrappers (for setgid)
- sed -ie "s,.\+bin/perl,#!${perl}/bin/perl -I ${perlEnv}/lib/perl5/site_perl," \
+ sed -i -e "s,.\+bin/perl,#!${perl}/bin/perl -I ${perlEnv}/lib/perl5/site_perl," \
$out/lib/x2go/libx2go-server-db-sqlite3-wrapper.pl
'';
diff --git a/pkgs/by-name/xf/xfitter/package.nix b/pkgs/by-name/xf/xfitter/package.nix
index e509f3a005f7..86dcd3d809d4 100644
--- a/pkgs/by-name/xf/xfitter/package.nix
+++ b/pkgs/by-name/xf/xfitter/package.nix
@@ -18,7 +18,6 @@
, qcdnum
, root
, zlib
-, memorymappingHook, memstreamHook
}:
stdenv.mkDerivation rec {
@@ -40,7 +39,6 @@ stdenv.mkDerivation rec {
buildInputs =
[ apfel blas ceres-solver lhapdf lapack libyaml root qcdnum gsl yaml-cpp zlib ]
++ lib.optionals ("5" == lib.versions.major root.version) [ apfelgrid applgrid ]
- ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook memstreamHook ]
++ lib.optional (stdenv.hostPlatform.libc == "glibc") libtirpc
;
diff --git a/pkgs/by-name/xl/xlockmore/package.nix b/pkgs/by-name/xl/xlockmore/package.nix
index 37c864f87f41..4ef282631510 100644
--- a/pkgs/by-name/xl/xlockmore/package.nix
+++ b/pkgs/by-name/xl/xlockmore/package.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
# fine via PAM without super user privileges.
configureFlags =
[ "--disable-setuid"
+ "--enable-appdefaultdir=${placeholder "out"}/share/X11/app-defaults"
] ++ (lib.optional (pam != null) "--enable-pam");
postPatch =
@@ -27,7 +28,6 @@ stdenv.mkDerivation rec {
in ''
sed -i 's,\(for ac_dir in\),\1 ${inputs},' configure.ac
sed -i 's,/usr/,/no-such-dir/,g' configure.ac
- configureFlags+=" --enable-appdefaultdir=$out/share/X11/app-defaults"
'';
hardeningDisable = [ "format" ]; # no build output otherwise
diff --git a/pkgs/by-name/xo/xonsh/unwrapped.nix b/pkgs/by-name/xo/xonsh/unwrapped.nix
index ce0533d0200d..da56a040e169 100644
--- a/pkgs/by-name/xo/xonsh/unwrapped.nix
+++ b/pkgs/by-name/xo/xonsh/unwrapped.nix
@@ -94,11 +94,11 @@ let
env.LC_ALL = "en_US.UTF-8";
postPatch = ''
- sed -ie 's|/bin/ls|${lib.getExe' coreutils "ls"}|' tests/test_execer.py
- sed -ie 's|SHELL=xonsh|SHELL=$out/bin/xonsh|' tests/test_integrations.py
+ sed -i -e 's|/bin/ls|${lib.getExe' coreutils "ls"}|' tests/test_execer.py
+ sed -i -e 's|SHELL=xonsh|SHELL=$out/bin/xonsh|' tests/test_integrations.py
for script in tests/test_integrations.py scripts/xon.sh $(find -name "*.xsh"); do
- sed -ie 's|/usr/bin/env|${lib.getExe' coreutils "env"}|' $script
+ sed -i -e 's|/usr/bin/env|${lib.getExe' coreutils "env"}|' $script
done
patchShebangs .
'';
diff --git a/pkgs/by-name/xs/xsimd/package.nix b/pkgs/by-name/xs/xsimd/package.nix
index 622f11f400bc..ad806a6a7d46 100644
--- a/pkgs/by-name/xs/xsimd/package.nix
+++ b/pkgs/by-name/xs/xsimd/package.nix
@@ -26,6 +26,9 @@ stdenv.mkDerivation (finalAttrs: {
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
# https://github.com/xtensor-stack/xsimd/issues/1030
./disable-test_error_gamma.patch
+
+ # https://github.com/xtensor-stack/xsimd/issues/1063
+ ./relax-asin-precision.diff
];
# strictDeps raises the chance that xsimd will be able to be cross compiled
diff --git a/pkgs/by-name/xs/xsimd/relax-asin-precision.diff b/pkgs/by-name/xs/xsimd/relax-asin-precision.diff
new file mode 100644
index 000000000000..7623f6e81e4a
--- /dev/null
+++ b/pkgs/by-name/xs/xsimd/relax-asin-precision.diff
@@ -0,0 +1,14 @@
+diff --git a/test/test_xsimd_api.cpp b/test/test_xsimd_api.cpp
+index f416ae9..1f8253e 100644
+--- a/test/test_xsimd_api.cpp
++++ b/test/test_xsimd_api.cpp
+@@ -468,7 +468,8 @@ struct xsimd_api_float_types_functions
+ void test_asin()
+ {
+ value_type val(1);
+- CHECK_EQ(extract(xsimd::asin(T(val))), std::asin(val));
++ CHECK(extract(xsimd::asin(T(val)))
++ == doctest::Approx(std::asin(val)).epsilon(1e-7));
+ }
+ void test_asinh()
+ {
diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 8776f4a06033..ce9900205250 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -35,7 +35,7 @@
apple-sdk_15,
darwinMinVersionHook,
makeWrapper,
- nodejs_22,
+ nodejs,
withGLES ? false,
}:
@@ -197,7 +197,7 @@ rustPlatform.buildRustPackage rec {
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
patchelf --add-rpath ${gpu-lib}/lib $out/libexec/*
patchelf --add-rpath ${wayland}/lib $out/libexec/*
- wrapProgram $out/libexec/zed-editor --suffix PATH : ${lib.makeBinPath [ nodejs_22 ]}
+ wrapProgram $out/libexec/zed-editor --suffix PATH : ${lib.makeBinPath [ nodejs ]}
'';
preCheck = ''
diff --git a/pkgs/by-name/zi/zip/12-fix-build-with-gcc-14.patch b/pkgs/by-name/zi/zip/12-fix-build-with-gcc-14.patch
new file mode 100644
index 000000000000..58d070a3c2b9
--- /dev/null
+++ b/pkgs/by-name/zi/zip/12-fix-build-with-gcc-14.patch
@@ -0,0 +1,56 @@
+From: Santiago Vila
+Subject: Fix build with gcc-14
+Bug-Debian: https://bugs.debian.org/1075706
+X-Debian-version: 3.0-14
+
+--- a/unix/configure
++++ b/unix/configure
+@@ -514,14 +514,16 @@
+ echo Check for $func
+ echo "int main(){ $func(); return 0; }" > conftest.c
+ $CC $BFLAG -o conftest conftest.c >/dev/null 2>/dev/null
+- [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_`echo $func | tr '[a-z]' '[A-Z]'`"
++# glibc-based systems do not need this
++# [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_`echo $func | tr '[a-z]' '[A-Z]'`"
+ done
+
+
+ echo Check for memset
+ echo "int main(){ char k; memset(&k,0,0); return 0; }" > conftest.c
+ $CC -o conftest conftest.c >/dev/null 2>/dev/null
+-[ $? -ne 0 ] && CFLAGS="${CFLAGS} -DZMEM"
++# glibc-based systems do not need this
++# [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DZMEM"
+
+
+ echo Check for memmove
+@@ -551,7 +553,8 @@
+ }
+ _EOF_
+ $CC $CFLAGS -c conftest.c >/dev/null 2>/dev/null
+-[ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_ERRNO"
++# glibc-based systems do not need this
++# [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_ERRNO"
+
+
+ echo Check for directory libraries
+@@ -567,7 +570,8 @@
+ $CC -o conftest conftest.c -l$lib >/dev/null 2>/dev/null
+ [ $? -eq 0 ] && OPT=-l$lib && break
+ done
+- if [ ${OPT} ]; then
++ # glibc-based systems do not need this
++ if true; then
+ LFLAGS2="${LFLAGS2} ${OPT}"
+ else
+ CFLAGS="${CFLAGS} -DNO_DIR"
+@@ -629,7 +633,8 @@
+ }
+ _EOF_
+ $CC ${CFLAGS} -c conftest.c > /dev/null 2>/dev/null
+-[ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_VALLOC"
++# glibc-based systems do not need this
++# [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_VALLOC"
+
+
+ echo Check for /usr/local/bin and /usr/local/man
diff --git a/pkgs/by-name/zi/zip/buffer-overflow-on-utf8-rh-bug-2165653.patch b/pkgs/by-name/zi/zip/buffer-overflow-on-utf8-rh-bug-2165653.patch
deleted file mode 100644
index 2ee3fff0db54..000000000000
--- a/pkgs/by-name/zi/zip/buffer-overflow-on-utf8-rh-bug-2165653.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urp zip30/fileio.c zip30/fileio.c
---- zip30/fileio.c 2008-05-29 03:13:24.000000000 +0300
-+++ zip30/fileio.c 2023-05-02 12:19:50.488314853 +0300
-@@ -3502,7 +3502,7 @@ zwchar *local_to_wide_string(local_strin
- if ((wc_string = (wchar_t *)malloc((wsize + 1) * sizeof(wchar_t))) == NULL) {
- ZIPERR(ZE_MEM, "local_to_wide_string");
- }
-- wsize = mbstowcs(wc_string, local_string, strlen(local_string) + 1);
-+ wsize = mbstowcs(wc_string, local_string, wsize + 1);
- wc_string[wsize] = (wchar_t) 0;
-
- /* in case wchar_t is not zwchar */
diff --git a/pkgs/by-name/zi/zip/fix-memset-detection.patch b/pkgs/by-name/zi/zip/fix-memset-detection.patch
deleted file mode 100644
index 55bda33a2573..000000000000
--- a/pkgs/by-name/zi/zip/fix-memset-detection.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur a/unix/configure b/unix/configure
---- a/unix/configure 2008-06-19 21:32:20.000000000 -0600
-+++ b/unix/configure 2023-07-11 10:02:57.809867694 -0600
-@@ -519,7 +519,10 @@
-
-
- echo Check for memset
--echo "int main(){ char k; memset(&k,0,0); return 0; }" > conftest.c
-+cat > conftest.c << _EOF_
-+#include
-+int main(){ char k; memset(&k,0,0); return 0; }
-+_EOF_
- $CC -o conftest conftest.c >/dev/null 2>/dev/null
- [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DZMEM"
-
diff --git a/pkgs/by-name/zi/zip/package.nix b/pkgs/by-name/zi/zip/package.nix
index 2c225489a346..85b81e0f309b 100644
--- a/pkgs/by-name/zi/zip/package.nix
+++ b/pkgs/by-name/zi/zip/package.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, enableNLS ? false, libnatspec ? null, libiconv }:
+{ lib, stdenv, fetchurl, enableNLS ? false, libnatspec ? null, libiconv, fetchpatch }:
assert enableNLS -> libnatspec != null;
@@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
];
sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h";
};
- prePatch = ''
- substituteInPlace unix/Makefile --replace 'CC = cc' ""
- '';
- hardeningDisable = [ "format" ];
+ postPatch = ''
+ substituteInPlace unix/Makefile --replace 'CC = cc' ""
+ substituteInPlace unix/configure --replace-fail "O3" "O2"
+ '';
makefile = "unix/Makefile";
buildFlags = if stdenv.hostPlatform.isCygwin then [ "cygwin" ] else [ "generic" ];
@@ -27,17 +27,45 @@ stdenv.mkDerivation rec {
];
patches = [
- # Trying to use `memset` without declaring it is flagged as an error with clang 16, causing
- # the `configure` script to incorrectly define `ZMEM`. That causes the build to fail due to
- # incompatible redeclarations of `memset`, `memcpy`, and `memcmp` in `zip.h`.
- ./fix-memset-detection.patch
# Implicit declaration of `closedir` and `opendir` cause dirent detection to fail with clang 16.
./fix-implicit-declarations.patch
- # Buffer overflow on Unicode characters in path names
- # https://bugzilla.redhat.com/show_bug.cgi?id=2165653
- ./buffer-overflow-on-utf8-rh-bug-2165653.patch
# Fixes forward declaration errors with timezone.c
./fix-time.h-not-included.patch
+ # Without this patch, we get a runtime failures with GCC 14 when building OpenJDK 8:
+ #
+ # zip I/O error: No such file or directory
+ # zip error: Could not create output file (was replacing the original zip file)
+ # make[2]: *** [CreateJars.gmk:659: /build/source/build/linux-x86_64-normal-server-release/images/src.zip] Error 1
+ #
+ # Source: Debian
+ ./12-fix-build-with-gcc-14.patch
+ (fetchpatch {
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-arch/zip/files/zip-3.0-pic.patch?id=d37d095fc7a2a9e4a8e904a7bf0f597fe99df85a";
+ hash = "sha256-OXgC9KqiOpH/o/bSabt3LqtoT/xifqfkvpLLPfPz+1c=";
+ })
+ (fetchpatch {
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-arch/zip/files/zip-3.0-no-crypt.patch?id=d37d095fc7a2a9e4a8e904a7bf0f597fe99df85a";
+ hash = "sha256-9bwV+uKST828PcRVbICs8xwz9jcIPk26gxLBbiEeta4=";
+ })
+ (fetchpatch {
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-arch/zip/files/zip-3.0-format-security.patch?id=d37d095fc7a2a9e4a8e904a7bf0f597fe99df85a";
+ hash = "sha256-YmGKivZ0iFCFmPjVYuOv9D8Y0xG2QnWOpas8gMgoQ3M=";
+ })
+ (fetchpatch {
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-arch/zip/files/zip-3.0-exec-stack.patch?id=d37d095fc7a2a9e4a8e904a7bf0f597fe99df85a";
+ hash = "sha256-akJFY+zGijPWCwaAL/xxCN4wQpVFBHkLMo2HowrSn/M=";
+ })
+ (fetchpatch {
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-arch/zip/files/zip-3.0-build.patch?id=d37d095fc7a2a9e4a8e904a7bf0f597fe99df85a";
+ hash = "sha256-MiupD7W+sxiRTsB5viKAiI4QeqtZC6VttfJktdt1ucI=";
+ })
+ # Buffer overflow on Unicode characters in path names
+ # https://bugzilla.redhat.com/show_bug.cgi?id=2165653
+ # (included among other changes below)
+ (fetchpatch {
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-arch/zip/files/zip-3.0-zipnote-freeze.patch?id=d37d095fc7a2a9e4a8e904a7bf0f597fe99df85a";
+ hash = "sha256-EVr7YS3IytnCRjAYUlkg05GA/kaAY9NRFG7uDt0QLAY=";
+ })
] ++ lib.optionals (enableNLS && !stdenv.hostPlatform.isCygwin) [ ./natspec-gentoo.patch.bz2 ];
buildInputs = lib.optional enableNLS libnatspec
diff --git a/pkgs/by-name/zo/zod/package.nix b/pkgs/by-name/zo/zod/package.nix
index e0c2031dde25..7a992251c9a5 100644
--- a/pkgs/by-name/zo/zod/package.nix
+++ b/pkgs/by-name/zo/zod/package.nix
@@ -13,7 +13,7 @@
, makeWrapper
, coreutils
, scalingFactor ? 2 # this is to resize the fixed-size zod_launcher window
-, substituteAll
+, replaceVars
}:
let
name = "zod-engine";
@@ -70,9 +70,8 @@ let
# 2,3,4 look acceptable on my 4k monitor and 1 is unreadable.
# also the ./ in the run command is removed to have easier time starting the game
patches = [
- (substituteAll {
+ (replaceVars ./0002-add-scaling-factor-to-source.patch {
inherit scalingFactor;
- src=./0002-add-scaling-factor-to-source.patch;
})
];
postPatch = ''
diff --git a/pkgs/by-name/zv/zvbi/package.nix b/pkgs/by-name/zv/zvbi/package.nix
index 55982a1c81b9..97c4c54c7dab 100644
--- a/pkgs/by-name/zv/zvbi/package.nix
+++ b/pkgs/by-name/zv/zvbi/package.nix
@@ -4,6 +4,7 @@
gitUpdater,
lib,
libiconv,
+ libintl,
stdenv,
testers,
validatePkgConfig,
@@ -11,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "zvbi";
- version = "0.2.42";
+ version = "0.2.42-unstable-2024-11-29";
src = fetchFromGitHub {
owner = "zapping-vbi";
repo = "zvbi";
- rev = "refs/tags/v${finalAttrs.version}";
- hash = "sha256-IeSGscgz51IndX6Xbu8Kw8GcJ9MLXXFhV+4LvnVkrLE=";
+ rev = "f3aca6cb9eaf2b4f1fd28e94563db4773b98dfca";
+ hash = "sha256-SG+MXauK4bZ1IMxklVt5R2y864Zs3MjGtpfN4np7xiE=";
};
nativeBuildInputs = [
@@ -25,7 +26,10 @@ stdenv.mkDerivation (finalAttrs: {
validatePkgConfig
];
- buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
+ propagatedBuildInputs = [
+ libiconv
+ libintl
+ ];
outputs = [
"out"
@@ -41,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Vertical Blanking Interval (VBI) utilities";
homepage = "https://github.com/zapping-vbi/zvbi";
- changelog = "https://github.com/zapping-vbi/zvbi/blob/v${finalAttrs.version}/ChangeLog";
+ changelog = "https://github.com/zapping-vbi/zvbi/blob/${finalAttrs.src.rev}/ChangeLog";
pkgConfigModules = [ "zvbi-0.2" ];
license = with lib.licenses; [
bsd2
diff --git a/pkgs/by-name/zx/zxing-cpp/package.nix b/pkgs/by-name/zx/zxing-cpp/package.nix
index 30a304867d58..63beb2e61d11 100644
--- a/pkgs/by-name/zx/zxing-cpp/package.nix
+++ b/pkgs/by-name/zx/zxing-cpp/package.nix
@@ -18,6 +18,12 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-teFspdATn9M7Z1vSr/7PdJx/xAv+TVai8rIekxqpBZk=";
};
+ # c++ 20 needed for char8_t or clang-19 build fails
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace-fail "CMAKE_CXX_STANDARD 17" "CMAKE_CXX_STANDARD 20"
+ '';
+
nativeBuildInputs = [
cmake
pkg-config
diff --git a/pkgs/desktops/gnustep/make/default.nix b/pkgs/desktops/gnustep/make/default.nix
index 32dda5f64838..eed342d4847c 100644
--- a/pkgs/desktops/gnustep/make/default.nix
+++ b/pkgs/desktops/gnustep/make/default.nix
@@ -17,12 +17,9 @@ stdenv.mkDerivation (finalAttrs: {
configureFlags = [
"--with-layout=fhs-system"
"--disable-install-p"
+ "--with-config-file=${placeholder "out"}/etc/GNUstep/GNUstep.conf"
];
- preConfigure = ''
- configureFlags="$configureFlags --with-config-file=$out/etc/GNUstep/GNUstep.conf"
- '';
-
makeFlags = [
"GNUSTEP_INSTALLATION_DOMAIN=SYSTEM"
];
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index 20c7904f9c0a..61ad804d8190 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -61,7 +61,7 @@ let
postHooks+=("source @dev@/nix-support/setup-hook")
else
# Propagate $${out} output
- propagatedUserEnvPkgs+=" @${out}@"
+ appendToVar propagatedUserEnvPkgs "@${out}@"
if [ -z "$outputDev" ]; then
echo "error: \$outputDev is unset!" >&2
@@ -71,7 +71,7 @@ let
# Propagate $dev so that this setup hook is propagated
# But only if there is a separate $dev output
if [ "$outputDev" != out ]; then
- propagatedBuildInputs+=" @dev@"
+ appendToVar propagatedBuildInputs "@dev@"
fi
fi
'';
diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix
index 53b4cc9024d5..6d9563b9f662 100644
--- a/pkgs/development/compilers/chicken/5/chicken.nix
+++ b/pkgs/development/compilers/chicken/5/chicken.nix
@@ -27,9 +27,6 @@ stdenv.mkDerivation (finalAttrs: {
setupHook = lib.optional (bootstrap-chicken != null) ./setup-hook.sh;
- # -fno-strict-overflow is not a supported argument in clang
- hardeningDisable = lib.optionals stdenv.cc.isClang [ "strictoverflow" ];
-
makeFlags = [
"PLATFORM=${platform}"
"PREFIX=$(out)"
diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix
index 586abb37b296..7a830748b689 100644
--- a/pkgs/development/compilers/chicken/5/overrides.nix
+++ b/pkgs/development/compilers/chicken/5/overrides.nix
@@ -120,9 +120,7 @@ in
plot = addToBuildInputs pkgs.plotutils;
postgresql = addToBuildInputsWithPkgConfig pkgs.postgresql;
rocksdb = addToBuildInputs pkgs.rocksdb_8_3;
- scheme2c-compatibility = old:
- addToNativeBuildInputs (lib.optionals (stdenv.system == "x86_64-darwin") [ pkgs.memorymappingHook ])
- (addPkgConfig old);
+ scheme2c-compatibility = addPkgConfig;
sdl-base = old:
((addToPropagatedBuildInputsWithPkgConfig pkgs.SDL old) //
# needed for sdl-config to be in PATH
diff --git a/pkgs/development/compilers/dotnet/completions/dotnet.bash b/pkgs/development/compilers/dotnet/completions/dotnet.bash
index 56c599e4358d..3cc4f77f7d8e 100644
--- a/pkgs/development/compilers/dotnet/completions/dotnet.bash
+++ b/pkgs/development/compilers/dotnet/completions/dotnet.bash
@@ -2,12 +2,12 @@
function _dotnet_bash_complete()
{
- local cur="${COMP_WORDS[COMP_CWORD]}" IFS=$'\n' # On Windows you may need to use use IFS=$'\r\n'
- local candidates
+ local cur="${COMP_WORDS[COMP_CWORD]}" IFS=$'\n' # On Windows you may need to use use IFS=$'\r\n'
+ local candidates
- read -d '' -ra candidates < <(dotnet complete --position "${COMP_POINT}" "${COMP_LINE}" 2>/dev/null)
+ read -d '' -ra candidates < <(dotnet complete --position "${COMP_POINT}" "${COMP_LINE}" 2>/dev/null)
- read -d '' -ra COMPREPLY < <(compgen -W "${candidates[*]:-}" -- "$cur")
+ read -d '' -ra COMPREPLY < <(compgen -W "${candidates[*]:-}" -- "$cur")
}
complete -f -F _dotnet_bash_complete dotnet
diff --git a/pkgs/development/compilers/factor-lang/factor99.nix b/pkgs/development/compilers/factor-lang/factor99.nix
index a020d6a2ce31..bd8d9069941f 100644
--- a/pkgs/development/compilers/factor-lang/factor99.nix
+++ b/pkgs/development/compilers/factor-lang/factor99.nix
@@ -106,13 +106,13 @@ stdenv.mkDerivation {
buildInputs = runtimeLibs;
postPatch = ''
- sed -ie '4i GIT_LABEL = heads/master-${rev}' GNUmakefile
+ sed -i -e '4i GIT_LABEL = heads/master-${rev}' GNUmakefile
# There is no ld.so.cache in NixOS so we patch out calls to that completely.
# This should work as long as no application code relies on `find-library*`
# to return a match, which currently is the case and also a justified assumption.
- sed -ie "s#/sbin/ldconfig -p#cat $out/lib/factor/ld.so.cache#g" \
+ sed -i -e "s#/sbin/ldconfig -p#cat $out/lib/factor/ld.so.cache#g" \
basis/alien/libraries/finder/linux/linux.factor
# Some other hard-coded paths to fix:
@@ -123,7 +123,7 @@ stdenv.mkDerivation {
extra/terminfo/terminfo.factor
# De-memoize xdg-* functions, otherwise they break the image.
- sed -ie 's/^MEMO:/:/' basis/xdg/xdg.factor
+ sed -i -e 's/^MEMO:/:/' basis/xdg/xdg.factor
# update default paths in factor-listener.el for fuel mode
substituteInPlace misc/fuel/fuel-listener.el \
diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix
index 69872053952d..7a25cfb5a360 100644
--- a/pkgs/development/compilers/flutter/flutter.nix
+++ b/pkgs/development/compilers/flutter/flutter.nix
@@ -55,9 +55,9 @@ let
name = "flutter-${version}-unwrapped";
inherit src patches version;
- buildInputs = [ git ];
- nativeBuildInputs = [ makeWrapper jq ]
+ nativeBuildInputs = [ makeWrapper jq git ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ];
+ strictDeps = true;
preConfigure = ''
if [ "$(< bin/internal/engine.version)" != '${engineVersion}' ]; then
diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix
index 874a43a75f82..ccc4a2feff0b 100644
--- a/pkgs/development/compilers/gcc/common/builder.nix
+++ b/pkgs/development/compilers/gcc/common/builder.nix
@@ -185,7 +185,7 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // {
mkdir -p ../mingw
# --with-build-sysroot expects that:
cp -R $libcCross/include ../mingw
- configureFlags="$configureFlags --with-build-sysroot=`pwd`/.."
+ appendToVar configureFlags "--with-build-sysroot=`pwd`/.."
fi
# Perform the build in a different directory.
diff --git a/pkgs/development/compilers/gcc/common/pre-configure.nix b/pkgs/development/compilers/gcc/common/pre-configure.nix
index 9e1764eae916..6e22a59d5792 100644
--- a/pkgs/development/compilers/gcc/common/pre-configure.nix
+++ b/pkgs/development/compilers/gcc/common/pre-configure.nix
@@ -32,42 +32,6 @@ lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
export GFORTRAN_FOR_TARGET=${pkgsBuildTarget.gfortran}/bin/${stdenv.targetPlatform.config}-gfortran
''
-# NOTE 2020/3/18: This environment variable prevents configure scripts from
-# detecting the presence of aligned_alloc on Darwin. There are many facts that
-# collectively make this fix necessary:
-# - Nix uses a fixed set of standard library headers on all MacOS systems,
-# regardless of their actual version. (Nix uses version 10.12 headers.)
-# - Nix uses the native standard library binaries for the build system. That
-# means the standard library binaries may not exactly match the standard
-# library headers.
-# - The aligned_alloc procedure is present in MacOS 10.15 (Catalina), but not
-# in earlier versions. Therefore on Catalina systems, aligned_alloc is
-# linkable (i.e. present in the binary libraries) but not present in the
-# headers.
-# - Configure scripts detect a procedure's existence by checking whether it is
-# linkable. They do not check whether it is present in the headers.
-# - GCC throws an error during compilation because aligned_alloc is not
-# defined in the headers---even though the linker can see it.
-#
-# This fix would not be necessary if ANY of the above were false:
-# - If Nix used native headers for each different MacOS version, aligned_alloc
-# would be in the headers on Catalina.
-# - If Nix used the same library binaries for each MacOS version, aligned_alloc
-# would not be in the library binaries.
-# - If Catalina did not include aligned_alloc, this wouldn't be a problem.
-# - If the configure scripts looked for header presence as well as
-# linkability, they would see that aligned_alloc is missing.
-# - If GCC allowed implicit declaration of symbols, it would not fail during
-# compilation even if the configure scripts did not check header presence.
-#
-+ lib.optionalString (buildPlatform.isDarwin) ''
- export build_configargs=ac_cv_func_aligned_alloc=no
-'' + lib.optionalString (hostPlatform.isDarwin) ''
- export host_configargs=ac_cv_func_aligned_alloc=no
-'' + lib.optionalString (targetPlatform.isDarwin) ''
- export target_configargs=ac_cv_func_aligned_alloc=no
-''
-
# In order to properly install libgccjit on macOS Catalina, strip(1)
# upon installation must not remove external symbols, otherwise the
# install step errors with "symbols referenced by indirect symbol
diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix
index 5e35a660785c..91d27aba7e2b 100644
--- a/pkgs/development/compilers/gcc/default.nix
+++ b/pkgs/development/compilers/gcc/default.nix
@@ -180,7 +180,13 @@ pipe ((callFile ./common/builder.nix {}) ({
inherit version;
src = fetchurl {
- url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
+ url = "mirror://gcc/${
+ # TODO: Remove this before 25.05.
+ if version == "14-20241116" then
+ "snapshots/"
+ else
+ "releases/gcc-"
+ }${version}/gcc-${version}.tar.xz";
${if is10 || is11 || is13 then "hash" else "sha256"} =
gccVersions.srcHashForVersion version;
};
@@ -202,6 +208,29 @@ pipe ((callFile ./common/builder.nix {}) ({
patchShebangs $configureScript
done
''
+ # Copy the precompiled `gcc/gengtype-lex.cc` from the 14.2.0 tarball.
+ # Since the `gcc/gengtype-lex.l` file didn’t change between 14.2.0
+ # and 14-2024116, this is safe. If it changes and we update the
+ # snapshot, we might need to vendor the compiled output in Nixpkgs.
+ #
+ # TODO: Remove this before 25.05.
+ + optionalString (version == "14-20241116") ''
+ cksum -c <
+*
+
+and then taking the diff between the result and the upstream GCC
+commit, and excerpting only the files that have conflicts when
+naively applying the branch’s diff to the snapshot. (This is
+more files than the two that actually needed manual merge work –
+`gcc/config/aarch64/aarch64-tune.md` and `libgcc/config.host` –
+because `patch(1)` can’t do a three‐way merge using ancestor
+information.)
+
+diff --git a/gcc/config/aarch64/aarch64-tune.md b/gcc/config/aarch64/aarch64-tune.md
+index 35b27ddb88..8ce2a93168 100644
+--- a/gcc/config/aarch64/aarch64-tune.md
++++ b/gcc/config/aarch64/aarch64-tune.md
+@@ -1,5 +1,5 @@
+ ;; -*- buffer-read-only: t -*-
+ ;; Generated automatically by gentune.sh from aarch64-cores.def
+ (define_attr "tune"
+- "cortexa34,cortexa35,cortexa53,cortexa57,cortexa72,cortexa73,thunderx,thunderxt88p1,thunderxt88,octeontx,octeontxt81,octeontxt83,thunderxt81,thunderxt83,ampere1,ampere1a,ampere1b,emag,xgene1,falkor,qdf24xx,exynosm1,phecda,thunderx2t99p1,vulcan,thunderx2t99,cortexa55,cortexa75,cortexa76,cortexa76ae,cortexa77,cortexa78,cortexa78ae,cortexa78c,cortexa65,cortexa65ae,cortexx1,cortexx1c,neoversen1,ares,neoversee1,octeontx2,octeontx2t98,octeontx2t96,octeontx2t93,octeontx2f95,octeontx2f95n,octeontx2f95mm,a64fx,fujitsu_monaka,tsv110,thunderx3t110,neoversev1,zeus,neoverse512tvb,saphira,cortexa57cortexa53,cortexa72cortexa53,cortexa73cortexa35,cortexa73cortexa53,cortexa75cortexa55,cortexa76cortexa55,cortexr82,cortexa510,cortexa520,cortexa710,cortexa715,cortexa720,cortexa725,cortexx2,cortexx3,cortexx4,cortexx925,neoversen2,cobalt100,neoversen3,neoversev2,grace,neoversev3,neoversev3ae,demeter,generic,generic_armv8_a,generic_armv9_a"
++ "cortexa34,cortexa35,cortexa53,cortexa57,cortexa72,cortexa73,thunderx,thunderxt88p1,thunderxt88,octeontx,octeontxt81,octeontxt83,thunderxt81,thunderxt83,ampere1,ampere1a,ampere1b,emag,xgene1,falkor,qdf24xx,exynosm1,phecda,thunderx2t99p1,vulcan,thunderx2t99,cortexa55,cortexa75,cortexa76,cortexa76ae,cortexa77,cortexa78,cortexa78ae,cortexa78c,cortexa65,cortexa65ae,cortexx1,cortexx1c,neoversen1,ares,neoversee1,octeontx2,octeontx2t98,octeontx2t96,octeontx2t93,octeontx2f95,octeontx2f95n,octeontx2f95mm,a64fx,fujitsu_monaka,tsv110,thunderx3t110,neoversev1,zeus,neoverse512tvb,saphira,cortexa57cortexa53,cortexa72cortexa53,cortexa73cortexa35,cortexa73cortexa53,cortexa75cortexa55,cortexa76cortexa55,cortexr82,applea12,applem1,applem2,applem3,cortexa510,cortexa520,cortexa710,cortexa715,cortexa720,cortexa725,cortexx2,cortexx3,cortexx4,cortexx925,neoversen2,cobalt100,neoversen3,neoversev2,grace,neoversev3,neoversev3ae,demeter,generic,generic_armv8_a,generic_armv9_a"
+ (const (symbol_ref "((enum attr_tune) aarch64_tune)")))
+diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
+index 0d8886c026..5370511bec 100644
+--- a/gcc/config/darwin.h
++++ b/gcc/config/darwin.h
+@@ -42,6 +42,7 @@
+
+ #define DARWIN_X86 0
+ #define DARWIN_PPC 0
++#define DARWIN_ARM64 0
+
+ #define OBJECT_FORMAT_MACHO 1
+
+@@ -373,7 +374,8 @@
+ */
+
+ #define DARWIN_NOCOMPACT_UNWIND \
+-" %:version-compare(>= 10.6 mmacosx-version-min= -no_compact_unwind) "
++"%{!fuse-ld=lld: \
++ %:version-compare(>= 10.6 mmacosx-version-min= -no_compact_unwind)}"
+
+ /* In Darwin linker specs we can put -lcrt0.o and ld will search the library
+ path for crt0.o or -lcrtx.a and it will search for libcrtx.a. As for
+@@ -397,7 +399,8 @@
+ LINK_PLUGIN_SPEC \
+ "%{flto*:%&2
+ ;;
+ esac
+@@ -277,7 +280,7 @@
+ if test "x$enable_darwin_at_rpath" = "xyes"; then
+ tmake_file="$tmake_file t-darwin-rpath "
+ fi
+- extra_parts="crt3.o libd10-uwfef.a crttms.o crttme.o libemutls_w.a"
++ extra_parts="crt3.o crttms.o crttme.o libemutls_w.a "
+ ;;
+ *-*-dragonfly*)
+ tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip"
+@@ -421,6 +424,15 @@
+ tmake_file="${tmake_file} t-dfprules"
+ md_unwind_header=aarch64/aarch64-unwind.h
+ ;;
++aarch64*-*-darwin*)
++ extra_parts="$extra_parts crtfastmath.o libheapt_w.a"
++ tmake_file="${tmake_file} ${cpu_type}/t-aarch64"
++ tmake_file="${tmake_file} ${cpu_type}/t-lse"
++ tmake_file="${tmake_file} t-crtfm t-dfprules"
++ tmake_file="${tmake_file} ${cpu_type}/t-softfp t-softfp"
++ tmake_file="${tmake_file} ${cpu_type}/t-heap-trampoline"
++ md_unwind_header=aarch64/aarch64-unwind.h
++ ;;
+ aarch64*-*-freebsd*)
+ extra_parts="$extra_parts crtfastmath.o"
+ tmake_file="${tmake_file} ${cpu_type}/t-aarch64"
+@@ -728,14 +740,14 @@
+ tmake_file="$tmake_file i386/t-crtpc t-crtfm i386/t-msabi"
+ tm_file="$tm_file i386/darwin-lib.h"
+ extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o"
+- extra_parts="$extra_parts crtfastmath.o libheapt_w.a"
++ extra_parts="$extra_parts crtfastmath.o libd10-uwfef.a libheapt_w.a"
+ tmake_file="${tmake_file} i386/t-heap-trampoline"
+ ;;
+ x86_64-*-darwin*)
+ tmake_file="$tmake_file i386/t-crtpc t-crtfm i386/t-msabi"
+ tm_file="$tm_file i386/darwin-lib.h"
+ extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o"
+- extra_parts="$extra_parts crtfastmath.o libheapt_w.a"
++ extra_parts="$extra_parts crtfastmath.o libd10-uwfef.a libheapt_w.a"
+ tmake_file="${tmake_file} i386/t-heap-trampoline"
+ ;;
+ i[34567]86-*-elfiamcu)
+@@ -1218,12 +1230,14 @@
+ # We build the darwin10 EH shim for Rosetta (running on x86 machines).
+ tm_file="$tm_file i386/darwin-lib.h"
+ tmake_file="$tmake_file rs6000/t-ppc64-fp rs6000/t-ibm-ldouble"
++ extra_parts="$extra_parts libd10-uwfef.a "
+ extra_parts="$extra_parts crt2.o crt3_2.o libef_ppc.a dw_ppc.o"
+ ;;
+ powerpc64-*-darwin*)
+ # We build the darwin10 EH shim for Rosetta (running on x86 machines).
+ tm_file="$tm_file i386/darwin-lib.h"
+ tmake_file="$tmake_file rs6000/t-darwin64 rs6000/t-ibm-ldouble"
++ extra_parts="$extra_parts libd10-uwfef.a "
+ extra_parts="$extra_parts crt2.o crt3_2.o libef_ppc.a dw_ppc.o"
+ ;;
+ powerpc*-*-freebsd*)
diff --git a/pkgs/development/compilers/gcc/patches/14/libgcc-darwin-detection.patch b/pkgs/development/compilers/gcc/patches/14/libgcc-darwin-detection.patch
index 27d455aa58b6..c08706e8097f 100644
--- a/pkgs/development/compilers/gcc/patches/14/libgcc-darwin-detection.patch
+++ b/pkgs/development/compilers/gcc/patches/14/libgcc-darwin-detection.patch
@@ -1,12 +1,13 @@
-diff -u a/libgcc/config.host b/libgcc/config.host
---- a/libgcc/config.host 2023-11-05 11:01:55.778638446 -0500
-+++ b/libgcc/config.host 2023-11-05 11:07:29.405103979 -0500
-@@ -227,7 +227,7 @@
+diff --git a/libgcc/config.host b/libgcc/config.host
+index 7332903704..27a8b5bedb 100644
+--- a/libgcc/config.host
++++ b/libgcc/config.host
+@@ -236,7 +236,7 @@
+ esac
tmake_file="$tmake_file t-slibgcc-darwin"
- # newer toolsets produce warnings when building for unsupported versions.
case ${host} in
-- *-*-darwin1[89]* | *-*-darwin2* )
-+ *-*-darwin1[89]* | *-*-darwin2* | *-*-darwin)
- tmake_file="t-darwin-min-8 $tmake_file"
+- *-*-darwin2*)
++ *-*-darwin2* | *-*-darwin)
+ tmake_file="t-darwin-min-11 $tmake_file"
;;
- *-*-darwin9* | *-*-darwin1[0-7]*)
+ *-*-darwin1[89]*)
diff --git a/pkgs/development/compilers/gcc/patches/cfi_startproc-reorder-label-09-1.diff b/pkgs/development/compilers/gcc/patches/cfi_startproc-reorder-label-09-1.diff
new file mode 100644
index 000000000000..ee27f402956e
--- /dev/null
+++ b/pkgs/development/compilers/gcc/patches/cfi_startproc-reorder-label-09-1.diff
@@ -0,0 +1,16 @@
+this patch fixes build for clang-18+
+
+diff --git a/libgcc/config/aarch64/lse.S b/libgcc/config/aarch64/lse.S
+index d3235bc33..1a56eb61c 100644
+--- a/libgcc/config/aarch64/lse.S
++++ b/libgcc/config/aarch64/lse.S
+@@ -170,8 +170,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+ .globl \name
+ .hidden \name
+ .type \name, %function
+- .cfi_startproc
+ \name:
++ .cfi_startproc
+ BTI_C
+ .endm
+
diff --git a/pkgs/development/compilers/gcc/patches/cfi_startproc-reorder-label-14-1.diff b/pkgs/development/compilers/gcc/patches/cfi_startproc-reorder-label-14-1.diff
new file mode 100644
index 000000000000..ea6dfe9c9b47
--- /dev/null
+++ b/pkgs/development/compilers/gcc/patches/cfi_startproc-reorder-label-14-1.diff
@@ -0,0 +1,16 @@
+this patch fixes build for clang-18+
+
+diff --git a/libgcc/config/aarch64/lse.S b/libgcc/config/aarch64/lse.S
+index ecef47086..b478dd4d9 100644
+--- a/libgcc/config/aarch64/lse.S
++++ b/libgcc/config/aarch64/lse.S
+@@ -174,8 +174,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+ .globl \name
+ HIDDEN(\name)
+ SYMBOL_TYPE(\name, %function)
+- .cfi_startproc
+ \name:
++ .cfi_startproc
+ .endm
+
+ .macro ENDFN name
diff --git a/pkgs/development/compilers/gcc/patches/cfi_startproc-reorder-label-2.diff b/pkgs/development/compilers/gcc/patches/cfi_startproc-reorder-label-2.diff
new file mode 100644
index 000000000000..83aecff1a0df
--- /dev/null
+++ b/pkgs/development/compilers/gcc/patches/cfi_startproc-reorder-label-2.diff
@@ -0,0 +1,16 @@
+this patch fixes build for clang-18+
+
+diff --git a/libgcc/config/aarch64/lse.S b/libgcc/config/aarch64/lse.S
+index d3235bc33..1a56eb61c 100644
+--- a/libgcc/config/aarch64/lse.S
++++ b/libgcc/config/aarch64/lse.S
+@@ -197,8 +197,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+ .text
+ .balign 16
+ .private_extern _\name
+- .cfi_startproc
+ _\name:
++ .cfi_startproc
+ BTI_C
+ .endm
+
diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix
index c9989f4c1e0b..94dcfa176835 100644
--- a/pkgs/development/compilers/gcc/patches/default.nix
+++ b/pkgs/development/compilers/gcc/patches/default.nix
@@ -36,6 +36,15 @@ let
is11 = majorVersion == "11";
is10 = majorVersion == "10";
is9 = majorVersion == "9";
+
+ # We only apply these patches when building a native toolchain for
+ # aarch64-darwin, as it breaks building a foreign one:
+ # https://github.com/iains/gcc-12-branch/issues/18
+ canApplyIainsDarwinPatches = stdenv.hostPlatform.isDarwin
+ && stdenv.hostPlatform.isAarch64
+ && buildPlatform == hostPlatform
+ && hostPlatform == targetPlatform;
+
inherit (lib) optionals optional;
in
@@ -67,6 +76,8 @@ in
++ optional langFortran (if atLeast12 then ./gcc-12-gfortran-driving.patch else ./gfortran-driving.patch)
++ [ ./ppc-musl.patch ]
++ optional langD ./libphobos.patch
+++ optional (!atLeast14) ./cfi_startproc-reorder-label-09-1.diff
+++ optional (atLeast14 && !canApplyIainsDarwinPatches) ./cfi_startproc-reorder-label-14-1.diff
@@ -131,38 +142,46 @@ in
"12" = [ ./gnat-darwin-dylib-install-name.patch ];
}.${majorVersion} or [])
-# We only apply this patch when building a native toolchain for aarch64-darwin, as it breaks building
-# a foreign one: https://github.com/iains/gcc-12-branch/issues/18
-++ optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && buildPlatform == hostPlatform && hostPlatform == targetPlatform) ({
- "14" = [ (fetchpatch {
- # There are no upstream release tags in https://github.com/iains/gcc-14-branch.
- # 04696df09633baf97cdbbdd6e9929b9d472161d3 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-14.2.0
- name = "gcc-14-darwin-aarch64-support.patch";
- url = "https://github.com/iains/gcc-14-branch/compare/04696df09633baf97cdbbdd6e9929b9d472161d3..gcc-14.2-darwin-r0.diff";
- hash = "sha256-GEUz7KdGzd2WJ0gjX3Uddq2y9bWKdZpT3E9uZ09qLs4=";
- }) ];
+++ optionals canApplyIainsDarwinPatches ({
+ "14" = [
+ (fetchpatch {
+ name = "gcc-14-darwin-aarch64-support.patch";
+ url = "https://raw.githubusercontent.com/Homebrew/formula-patches/41fdb9d5ec21fc8165cd4bee89bd23d0c90572ee/gcc/gcc-14.2.0-r2.diff";
+ # The patch is based on 14.2.0, but we use a GCC snapshot. We
+ # exclude the files with conflicts and apply our own merged patch
+ # to avoid vendoring the entire huge patch in‐tree.
+ excludes = [
+ "gcc/config/aarch64/aarch64-tune.md"
+ "gcc/config/darwin.h"
+ "libgcc/config.host"
+ "libgcc/config/t-darwin-min-11"
+ ];
+ hash = "sha256-E4zEKm4tMhovOJKc1/FXZCLQvA+Jt5SC0O2C6SEvZjI=";
+ })
+ ./14/fixup-gcc-14-darwin-aarch64-support.patch
+ ];
"13" = [ (fetchpatch {
name = "gcc-13-darwin-aarch64-support.patch";
url = "https://raw.githubusercontent.com/Homebrew/formula-patches/bda0faddfbfb392e7b9c9101056b2c5ab2500508/gcc/gcc-13.3.0.diff";
sha256 = "sha256-RBTCBXIveGwuQGJLzMW/UexpUZdDgdXprp/G2NHkmQo=";
- }) ];
+ }) ./cfi_startproc-reorder-label-2.diff ];
"12" = [ (fetchurl {
name = "gcc-12-darwin-aarch64-support.patch";
url = "https://raw.githubusercontent.com/Homebrew/formula-patches/1ed9eaea059f1677d27382c62f21462b476b37fe/gcc/gcc-12.4.0.diff";
sha256 = "sha256-wOjpT79lps4TKG5/E761odhLGCphBIkCbOPiQg/D1Fw=";
- }) ];
+ }) ./cfi_startproc-reorder-label-2.diff ];
"11" = [ (fetchpatch {
# There are no upstream release tags in https://github.com/iains/gcc-11-branch.
# 5cc4c42a0d4de08715c2eef8715ad5b2e92a23b6 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-11.5.0
url = "https://github.com/iains/gcc-11-branch/compare/5cc4c42a0d4de08715c2eef8715ad5b2e92a23b6..gcc-11.5-darwin-r0.diff";
hash = "sha256-7lH+GkgkrE6nOp9PMdIoqlQNWK31s6oW+lDt1LIkadE=";
- }) ];
+ }) ./cfi_startproc-reorder-label-2.diff ];
"10" = [ (fetchpatch {
# There are no upstream release tags in https://github.com/iains/gcc-10-branch.
# d04fe55 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-10.5.0
url = "https://github.com/iains/gcc-10-branch/compare/d04fe5541c53cb16d1ca5c80da044b4c7633dbc6...gcc-10-5Dr0-pre-0.diff";
hash = "sha256-kVUHZKtYqkWIcqxHG7yAOR2B60w4KWLoxzaiFD/FWYk=";
- }) ];
+ }) ./cfi_startproc-reorder-label-2.diff ];
}.${majorVersion} or [])
# Work around newer AvailabilityInternal.h when building older versions of GCC.
diff --git a/pkgs/development/compilers/gcc/versions.nix b/pkgs/development/compilers/gcc/versions.nix
index 87ebf0681299..3842408011a9 100644
--- a/pkgs/development/compilers/gcc/versions.nix
+++ b/pkgs/development/compilers/gcc/versions.nix
@@ -1,6 +1,6 @@
let
majorMinorToVersionMap = {
- "14" = "14.2.0";
+ "14" = "14-20241116";
"13" = "13.3.0";
"12" = "12.4.0";
"11" = "11.5.0";
@@ -13,7 +13,7 @@ let
# TODO(amjoseph): convert older hashes to SRI form
srcHashForVersion = version: {
- "14.2.0" = "sha256-p7Obxpy/niWCbFpgqyZHcAH3wI2FzsBLwOKcq+1vPMk=";
+ "14-20241116" = "sha256-aXSkle8Mzj/Q15cHOu0D9Os2PWQwMIboUZULhnsRSUo=";
"13.3.0" = "sha256-CEXpYhyVQ6E/SE6UWEpJ/8ASmXDpkUYkI1/B0GGgwIM=";
"12.4.0" = "sha256-cE9lJgTMvMsUvavzR4yVEciXiLEss7v/3tNzQZFqkXU=";
"11.5.0" = "sha256-puIYaOrVRc+H8MAfhCduS1KB1nIJhZHByJYkHwk2NHg=";
diff --git a/pkgs/development/compilers/llvm/13/lldb/cpu_subtype_arm64e_replacement.patch b/pkgs/development/compilers/llvm/13/lldb/cpu_subtype_arm64e_replacement.patch
deleted file mode 100644
index 20d35c9f3ea9..000000000000
--- a/pkgs/development/compilers/llvm/13/lldb/cpu_subtype_arm64e_replacement.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/source/Host/macosx/objcxx/HostInfoMacOSX.mm b/source/Host/macosx/objcxx/HostInfoMacOSX.mm
---- a/source/Host/macosx/objcxx/HostInfoMacOSX.mm
-+++ b/source/Host/macosx/objcxx/HostInfoMacOSX.mm
-@@ -233,7 +233,7 @@ void HostInfoMacOSX::ComputeHostArchitectureSupport(ArchSpec &arch_32,
- len = sizeof(is_64_bit_capable);
- ::sysctlbyname("hw.cpu64bit_capable", &is_64_bit_capable, &len, NULL, 0);
-
-- if (cputype == CPU_TYPE_ARM64 && cpusubtype == CPU_SUBTYPE_ARM64E) {
-+ if (cputype == CPU_TYPE_ARM64 && cpusubtype == ((cpu_subtype_t) 2)) { // CPU_SUBTYPE_ARM64E is not available in the macOS 10.12 headers
- // The arm64e architecture is a preview. Pretend the host architecture
- // is arm64.
- cpusubtype = CPU_SUBTYPE_ARM64_ALL;
diff --git a/pkgs/development/compilers/llvm/18/libcxx/0001-darwin-10.12-mbstate_t-fix.patch b/pkgs/development/compilers/llvm/18/libcxx/0001-darwin-10.12-mbstate_t-fix.patch
deleted file mode 100644
index 29942f8ed03d..000000000000
--- a/pkgs/development/compilers/llvm/18/libcxx/0001-darwin-10.12-mbstate_t-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9c1cb26c1dd3f92d1c1177e548107d2cd3c5e616 Mon Sep 17 00:00:00 2001
-From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com>
-Date: Fri, 23 Feb 2024 22:58:58 +0000
-Subject: [PATCH] darwin 10.12 mbstate_t fix
-
-https://github.com/llvm/llvm-project/issues/64226
-
-removes space from
-https://github.com/macports/macports-ports/raw/acd8acb171f1658596ed1cf25da48d5b932e2d19/lang/llvm-17/files/0042-mbstate_t-not-defined.patch
-so it applies cleanly
----
- libcxx/include/__mbstate_t.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/libcxx/include/__mbstate_t.h b/libcxx/include/__mbstate_t.h
-index bfa6d61..5f51112 100644
---- a/libcxx/include/__mbstate_t.h
-+++ b/libcxx/include/__mbstate_t.h
-@@ -42,6 +42,9 @@
- #elif __has_include()
- # include // works on most Unixes
- #elif __has_include()
-+# if __has_include()
-+# include
-+# endif
- # include // works on Darwin
- #elif !defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS) && __has_include_next()
- # include_next // fall back to the C standard provider of mbstate_t
---
-2.43.0
-
diff --git a/pkgs/development/compilers/llvm/common/clang/add-nostdlibinc-flag.patch b/pkgs/development/compilers/llvm/common/clang/add-nostdlibinc-flag.patch
deleted file mode 100644
index 80c2eb362383..000000000000
--- a/pkgs/development/compilers/llvm/common/clang/add-nostdlibinc-flag.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
-index 3f29afd35971..223d2769cdfc 100644
---- a/lib/Driver/Driver.cpp
-+++ b/lib/Driver/Driver.cpp
-@@ -491,6 +491,13 @@ DerivedArgList *Driver::TranslateInputArgs(const InputArgList &Args) const {
- }
- #endif
-
-+ {
-+ Arg *A = DAL->MakeFlagArg(/*BaseArg=*/nullptr,
-+ Opts.getOption(options::OPT_nostdlibinc));
-+ A->claim();
-+ DAL->append(A);
-+ }
-+
- return DAL;
- }
-
diff --git a/pkgs/development/compilers/llvm/common/clang/clang-unsupported-option.patch b/pkgs/development/compilers/llvm/common/clang/clang-unsupported-option.patch
new file mode 100644
index 000000000000..b265e7922c0d
--- /dev/null
+++ b/pkgs/development/compilers/llvm/common/clang/clang-unsupported-option.patch
@@ -0,0 +1,75 @@
+From 7ef5ed98cc6666f64db2f155ded2077ce038e1e4 Mon Sep 17 00:00:00 2001
+From: Reno Dakota
+Date: Sat, 16 Nov 2024 05:57:40 +0000
+Subject: [PATCH] [Clang][Driver] report unsupported option error regardless of
+ argument order
+
+This change updates clang to report unsupported option errors regardless
+of the command line argument order.
+
+When clang with a source file and without `-c` it will both compile and
+link. When an unsupported option is also part of the command line clang
+should generated an error. However, if the source file name comes before
+an object file, eg: `-lc`, the error is ignored.
+
+```
+$ clang --target=x86_64 -lc hello.c -mhtm
+clang: error: unsupported option '-mhtm' for target 'x86_64'
+$ echo $?
+1
+```
+
+but if `-lc` comes after `hello.c` the error is dropped
+
+```
+$ clang --target=x86_64 hello.c -mhtm -lc
+$ echo $?
+0
+```
+
+after this change clang will report the error regardless of the command
+line argument order.
+---
+ clang/lib/Driver/Driver.cpp | 13 ++++++-------
+ clang/test/Driver/unsupported-option.c | 10 ++++++++++
+ 2 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
+index 93e85f7dffe35a..8e784a7b130ac3 100644
+--- a/lib/Driver/Driver.cpp
++++ b/lib/Driver/Driver.cpp
+@@ -4064,17 +4064,18 @@ void Driver::handleArguments(Compilation &C, DerivedArgList &Args,
+ YcArg = YuArg = nullptr;
+ }
+
+- unsigned LastPLSize = 0;
++ bool LinkOnly = phases::Link == FinalPhase && Inputs.size() > 0;
+ for (auto &I : Inputs) {
+ types::ID InputType = I.first;
+ const Arg *InputArg = I.second;
+
+ auto PL = types::getCompilationPhases(InputType);
+- LastPLSize = PL.size();
++
++ phases::ID InitialPhase = PL[0];
++ LinkOnly = LinkOnly && phases::Link == InitialPhase && PL.size() == 1;
+
+ // If the first step comes after the final phase we are doing as part of
+ // this compilation, warn the user about it.
+- phases::ID InitialPhase = PL[0];
+ if (InitialPhase > FinalPhase) {
+ if (InputArg->isClaimed())
+ continue;
+@@ -4129,10 +4130,8 @@ void Driver::handleArguments(Compilation &C, DerivedArgList &Args,
+ }
+ }
+
+- // If we are linking, claim any options which are obviously only used for
+- // compilation.
+- // FIXME: Understand why the last Phase List length is used here.
+- if (FinalPhase == phases::Link && LastPLSize == 1) {
++ // claim any options which are obviously only used for compilation.
++ if (LinkOnly) {
+ Args.ClaimAllArgs(options::OPT_CompileOnly_Group);
+ Args.ClaimAllArgs(options::OPT_cl_compile_Group);
+ }
diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix
index 44e13c48fd4b..db19f8b59ea2 100644
--- a/pkgs/development/compilers/llvm/common/clang/default.nix
+++ b/pkgs/development/compilers/llvm/common/clang/default.nix
@@ -5,7 +5,6 @@
, src ? null
, monorepoSrc ? null
, runCommand
-, substituteAll
, cmake
, ninja
, libxml2
diff --git a/pkgs/development/compilers/llvm/common/clang/ignore-nostd-link-13.diff b/pkgs/development/compilers/llvm/common/clang/ignore-nostd-link-13.diff
new file mode 100644
index 000000000000..9a7a18a4c5ad
--- /dev/null
+++ b/pkgs/development/compilers/llvm/common/clang/ignore-nostd-link-13.diff
@@ -0,0 +1,57 @@
+backported to clang-12 & clang-13 from https://github.com/llvm/llvm-project/commit/5b77e752dcd073846b89559d6c0e1a7699e58615
+diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td
+index a0cbcae..8797646 100644
+--- a/include/clang/Driver/Options.td
++++ b/include/clang/Driver/Options.td
+@@ -2931,7 +2931,7 @@ def headerpad__max__install__names : Joined<["-"], "headerpad_max_install_names"
+ def help : Flag<["-", "--"], "help">, Flags<[CC1Option,CC1AsOption, FC1Option,
+ FlangOption]>, HelpText<"Display available options">,
+ MarshallingInfoFlag>;
+-def ibuiltininc : Flag<["-"], "ibuiltininc">,
++def ibuiltininc : Flag<["-"], "ibuiltininc">, Group,
+ HelpText<"Enable builtin #include directories even when -nostdinc is used "
+ "before or after -ibuiltininc. "
+ "Using -nobuiltininc after the option disables it">;
+@@ -3641,10 +3641,11 @@ def no_cpp_precomp : Flag<["-"], "no-cpp-precomp">, Group
+ def no_integrated_cpp : Flag<["-", "--"], "no-integrated-cpp">, Flags<[NoXarchOption]>;
+ def no_pedantic : Flag<["-", "--"], "no-pedantic">, Group;
+ def no__dead__strip__inits__and__terms : Flag<["-"], "no_dead_strip_inits_and_terms">;
+-def nobuiltininc : Flag<["-"], "nobuiltininc">, Flags<[CC1Option, CoreOption]>,
++def nobuiltininc : Flag<["-"], "nobuiltininc">, Flags<[CC1Option, CoreOption]>, Group,
+ HelpText<"Disable builtin #include directories">,
+ MarshallingInfoNegativeFlag>;
+-def nogpuinc : Flag<["-"], "nogpuinc">, HelpText<"Do not add include paths for CUDA/HIP and"
++def nogpuinc : Flag<["-"], "nogpuinc">, Group,
++ HelpText<"Do not add include paths for CUDA/HIP and"
+ " do not include the default CUDA/HIP wrapper headers">;
+ def : Flag<["-"], "nocudainc">, Alias;
+ def nogpulib : Flag<["-"], "nogpulib">,
+@@ -3660,9 +3661,9 @@ def noprebind : Flag<["-"], "noprebind">;
+ def noprofilelib : Flag<["-"], "noprofilelib">;
+ def noseglinkedit : Flag<["-"], "noseglinkedit">;
+ def nostartfiles : Flag<["-"], "nostartfiles">, Group;
+-def nostdinc : Flag<["-"], "nostdinc">, Flags<[CoreOption]>;
+-def nostdlibinc : Flag<["-"], "nostdlibinc">;
+-def nostdincxx : Flag<["-"], "nostdinc++">, Flags<[CC1Option]>,
++def nostdinc : Flag<["-"], "nostdinc">, Flags<[CoreOption]>, Group;
++def nostdlibinc : Flag<["-"], "nostdlibinc">, Group;
++def nostdincxx : Flag<["-"], "nostdinc++">, Flags<[CC1Option]>, Group,
+ HelpText<"Disable standard #include directories for the C++ standard library">,
+ MarshallingInfoNegativeFlag>;
+ def nostdlib : Flag<["-"], "nostdlib">, Group;
+diff --git a/test/Driver/linker-opts.c b/test/Driver/linker-opts.c
+index e1673f7..b9beb91 100644
+--- a/test/Driver/linker-opts.c
++++ b/test/Driver/linker-opts.c
+@@ -16,9 +16,8 @@
+ //
+ // Make sure that we don't warn on unused compiler arguments.
+ // RUN: %clang -Xclang -I. -x c %s -c -o %t/tmp.o
+-// RUN: %clang -Xclang -I. %t/tmp.o -o %t/tmp -### 2>&1 | FileCheck %s --check-prefix=NO-UNUSED
+-// NO-UNUSED-NOT: warning:{{.*}}unused
+-//
++// RUN: %clang -### -I. -ibuiltininc -nobuiltininc -nostdinc -nostdinc++ -nostdlibinc -nogpuinc %t/tmp.o -o /dev/null 2>&1 | FileCheck /dev/null --implicit-check-not=warning:
++
+ // Make sure that we do warn in other cases.
+ // RUN: %clang %s -lfoo -c -o %t/tmp2.o -### 2>&1 | FileCheck %s --check-prefix=UNUSED
+ // UNUSED: warning:{{.*}}unused
diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
index f859a415b5db..457c68555d11 100644
--- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
@@ -7,12 +7,11 @@
, src ? null
, monorepoSrc ? null
, runCommand
-, apple-sdk
-, apple-sdk_10_13
, cmake
, ninja
, python3
, libllvm
+, jq
, libcxx
, linuxHeaders
, freebsd
@@ -47,14 +46,6 @@ let
baseName = "compiler-rt";
pname = baseName + lib.optionalString (haveLibc) "-libc";
- # Sanitizers require 10.13 or newer. Instead of disabling them for most x86_64-darwin users,
- # build them with a newer SDK and the default (10.12) deployment target.
- apple-sdk' =
- if lib.versionOlder (lib.getVersion apple-sdk) "10.13" then
- apple-sdk_10_13.override { enableBootstrap = true; }
- else
- apple-sdk.override { enableBootstrap = true; };
-
src' = if monorepoSrc != null then
runCommand "${baseName}-src-${version}" {} (''
mkdir -p "$out"
@@ -63,13 +54,9 @@ let
'' + ''
cp -r ${monorepoSrc}/${baseName} "$out"
'') else src;
-
- preConfigure = lib.optionalString (!haveLibc) ''
- cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")
- '';
in
-stdenv.mkDerivation ({
+stdenv.mkDerivation {
inherit pname version patches;
src = src';
@@ -77,13 +64,11 @@ stdenv.mkDerivation ({
nativeBuildInputs = [ cmake ]
++ (lib.optional (lib.versionAtLeast release_version "15") ninja)
- ++ [ python3 libllvm.dev ];
+ ++ [ python3 libllvm.dev ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [ jq ];
buildInputs =
lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders
- ++ lib.optional (stdenv.hostPlatform.isFreeBSD) freebsd.include
- # Adding the bootstrap SDK to `buildInputs` on static builds propagates it, breaking `xcrun`.
- # This can be removed once the minimum SDK >10.12 on x86_64-darwin.
- ++ lib.optionals (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isStatic) [ apple-sdk' ];
+ ++ lib.optional (stdenv.hostPlatform.isFreeBSD) freebsd.include;
env = {
NIX_CFLAGS_COMPILE = toString ([
@@ -148,8 +133,6 @@ stdenv.mkDerivation ({
# Darwin support, so force it to be enabled during the first stage of the compiler-rt bootstrap.
"-DCOMPILER_RT_HAS_G_FLAG=ON"
] ++ [
- "-DDARWIN_macosx_CACHED_SYSROOT=${apple-sdk'.sdkroot}"
- "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=${lib.versions.majorMinor (lib.getVersion apple-sdk)}"
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
"-DDARWIN_osx_BUILTIN_ARCHS=${stdenv.hostPlatform.darwinArch}"
"-DSANITIZER_MIN_OSX_VERSION=${stdenv.hostPlatform.darwinMinVersion}"
@@ -196,6 +179,15 @@ stdenv.mkDerivation ({
--replace-fail 'find_program(CODESIGN codesign)' ""
'';
+ preConfigure = lib.optionalString (lib.versionOlder release_version "16" && !haveLibc) ''
+ cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")
+ '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
+ cmakeFlagsArray+=(
+ "-DDARWIN_macosx_CACHED_SYSROOT=$SDKROOT"
+ "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=$(jq -r .Version "$SDKROOT/SDKSettings.json")"
+ )
+ '';
+
# Hack around weird upsream RPATH bug
postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin) ''
ln -s "$out/lib"/*/* "$out/lib"
@@ -238,4 +230,4 @@ stdenv.mkDerivation ({
# `enable_execute_stack.c` Also doesn't sound like something WASM would support.
|| (stdenv.hostPlatform.isWasm && haveLibc);
};
-} // (if lib.versionOlder release_version "16" then { inherit preConfigure; } else {}))
+}
diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index b53f76e96c11..102a43161e3d 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -7,7 +7,7 @@
preLibcCrossHeaders,
libxcrypt,
substitute,
- substituteAll,
+ replaceVars,
fetchFromGitHub,
fetchpatch,
fetchpatch2,
@@ -167,12 +167,6 @@ let
path = ../15;
}
];
- "libcxx/0001-darwin-10.12-mbstate_t-fix.patch" = [
- {
- after = "18";
- path = ../18;
- }
- ];
"libunwind/gnu-install-dirs.patch" = [
{
before = "17";
@@ -264,12 +258,6 @@ let
path = ../12;
}
];
- "lldb/cpu_subtype_arm64e_replacement.patch" = [
- {
- after = "13";
- path = ../13;
- }
- ];
"lldb/resource-dir.patch" = [
{
before = "16";
@@ -533,6 +521,12 @@ let
(metadata.getVersionFile "clang/purity.patch")
# https://reviews.llvm.org/D51899
(metadata.getVersionFile "clang/gnu-install-dirs.patch")
+
+ # https://github.com/llvm/llvm-project/pull/116476
+ # prevent clang ignoring warnings / errors for unsuppored
+ # options when building & linking a source file with trailing
+ # libraries. eg: `clang -munsupported hello.c -lc`
+ ./clang/clang-unsupported-option.patch
]
++ lib.optional (lib.versions.major metadata.release_version == "13")
# Revert of https://reviews.llvm.org/D100879
@@ -540,32 +534,29 @@ let
# mis-compilation in firefox.
# See: https://bugzilla.mozilla.org/show_bug.cgi?id=1741454
(metadata.getVersionFile "clang/revert-malloc-alignment-assumption.patch")
- # This patch prevents global system header directories from
- # leaking through on non‐NixOS Linux. However, on macOS, the
- # SDK path is used as the sysroot, and forcing `-nostdlibinc`
- # breaks `-isysroot` with an unwrapped compiler. As macOS has
- # no `/usr/include`, there’s essentially no risk to skipping
- # the patch there. It’s possible that Homebrew headers in
- # `/usr/local/include` might leak through to unwrapped
- # compilers being used without an SDK set or something, but
- # it hopefully shouldn’t matter.
- #
- # TODO: Figure out a better solution to this whole problem so
- # that we won’t have to choose between breaking unwrapped
- # compilers breaking libclang when we can do Linux‐to‐Darwin
- # cross‐compilation again.
- ++ lib.optional (
- !args.stdenv.hostPlatform.isDarwin || !args.stdenv.targetPlatform.isDarwin
- ) ./clang/add-nostdlibinc-flag.patch
+ ++ lib.optional (lib.versionOlder metadata.release_version "17") (
+ if lib.versionAtLeast metadata.release_version "14" then
+ fetchpatch {
+ name = "ignore-nostd-link.patch";
+ url = "https://github.com/llvm/llvm-project/commit/5b77e752dcd073846b89559d6c0e1a7699e58615.patch";
+ relative = "clang";
+ hash = "sha256-qzSAmoGY+7POkDhcGgQRPaNQ3+7PIcIc9cZuiE/eLkc=";
+ }
+ else
+ ./clang/ignore-nostd-link-13.diff
+ )
++ [
- (substituteAll {
- src =
+ (replaceVars
+ (
if (lib.versionOlder metadata.release_version "16") then
./clang/clang-11-15-LLVMgold-path.patch
else
- ./clang/clang-at-least-16-LLVMgold-path.patch;
- libllvmLibdir = "${tools.libllvm.lib}/lib";
- })
+ ./clang/clang-at-least-16-LLVMgold-path.patch
+ )
+ {
+ libllvmLibdir = "${tools.libllvm.lib}/lib";
+ }
+ )
]
# Backport version logic from Clang 16. This is needed by the following patch.
++ lib.optional (lib.versions.major metadata.release_version == "15") (fetchpatch {
@@ -673,9 +664,9 @@ let
patches =
let
resourceDirPatch = callPackage (
- { substituteAll, libclang }:
- (substituteAll {
- src = metadata.getVersionFile "lldb/resource-dir.patch";
+ { replaceVars, libclang }:
+ (replaceVars (metadata.getVersionFile "lldb/resource-dir.patch") {
+
clangLibDir = "${lib.getLib libclang}/lib";
}).overrideAttrs
(_: _: { name = "resource-dir.patch"; })
@@ -714,23 +705,7 @@ let
++ lib.optional (lib.versionOlder metadata.release_version "14") (
metadata.getVersionFile "lldb/gnu-install-dirs.patch"
)
- ++ lib.optional (lib.versionAtLeast metadata.release_version "14") ./lldb/gnu-install-dirs.patch
- # This is a stopgap solution if/until the macOS SDK used for x86_64 is
- # updated.
- #
- # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h`
- # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use
- # of this preprocessor symbol in `lldb` with its expansion.
- #
- # See here for some context:
- # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132
- #
- # Patch is applied for >= 14 as the versions below are broken anyways.
- ++ lib.optional (
- lib.versionAtLeast metadata.release_version "14"
- && stdenv.targetPlatform.isDarwin
- && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0"
- ) (metadata.getVersionFile "lldb/cpu_subtype_arm64e_replacement.patch");
+ ++ lib.optional (lib.versionAtLeast metadata.release_version "14") ./lldb/gnu-install-dirs.patch;
}
// lib.optionalAttrs (lib.versions.major metadata.release_version == "16") {
src = callPackage (
@@ -1019,6 +994,15 @@ let
lib.versionAtLeast metadata.release_version "14" && lib.versionOlder metadata.release_version "18"
)
) (metadata.getVersionFile "compiler-rt/gnu-install-dirs.patch")
+ ++
+ lib.optional
+ (lib.versionAtLeast metadata.release_version "13" && lib.versionOlder metadata.release_version "18")
+ (fetchpatch {
+ name = "cfi_startproc-after-label.patch";
+ url = "https://github.com/llvm/llvm-project/commit/7939ce39dac0078fef7183d6198598b99c652c88.patch";
+ stripLen = 1;
+ hash = "sha256-tGqXsYvUllFrPa/r/dsKVlwx5IrcJGccuR1WAtUg7/o=";
+ })
++ [
# ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the
# extra `/`.
@@ -1122,62 +1106,37 @@ let
libcxx = callPackage ./libcxx (
{
- patches =
- lib.optionals (lib.versionOlder metadata.release_version "16") (
- lib.optional (lib.versions.major metadata.release_version == "15")
- # See:
- # - https://reviews.llvm.org/D133566
- # - https://github.com/NixOS/nixpkgs/issues/214524#issuecomment-1429146432
- # !!! Drop in LLVM 16+
- (
- fetchpatch {
- url = "https://github.com/llvm/llvm-project/commit/57c7bb3ec89565c68f858d316504668f9d214d59.patch";
- hash = "sha256-B07vHmSjy5BhhkGSj3e1E0XmMv5/9+mvC/k70Z29VwY=";
- }
- )
- ++ [
- (substitute {
- src = ./libcxxabi/wasm.patch;
- substitutions = [
- "--replace-fail"
- "/cmake/"
- "/llvm/cmake/"
- ];
- })
- ]
- ++ lib.optional stdenv.hostPlatform.isMusl (substitute {
- src = ./libcxx/libcxx-0001-musl-hacks.patch;
+ patches = lib.optionals (lib.versionOlder metadata.release_version "16") (
+ lib.optional (lib.versions.major metadata.release_version == "15")
+ # See:
+ # - https://reviews.llvm.org/D133566
+ # - https://github.com/NixOS/nixpkgs/issues/214524#issuecomment-1429146432
+ # !!! Drop in LLVM 16+
+ (
+ fetchpatch {
+ url = "https://github.com/llvm/llvm-project/commit/57c7bb3ec89565c68f858d316504668f9d214d59.patch";
+ hash = "sha256-B07vHmSjy5BhhkGSj3e1E0XmMv5/9+mvC/k70Z29VwY=";
+ }
+ )
+ ++ [
+ (substitute {
+ src = ./libcxxabi/wasm.patch;
substitutions = [
"--replace-fail"
- "/include/"
- "/libcxx/include/"
+ "/cmake/"
+ "/llvm/cmake/"
];
})
- )
- ++
- lib.optional
- (
- lib.versions.major metadata.release_version == "17"
- && stdenv.hostPlatform.isDarwin
- && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13"
- )
- # https://github.com/llvm/llvm-project/issues/64226
- (
- fetchpatch {
- name = "0042-mbstate_t-not-defined.patch";
- url = "https://github.com/macports/macports-ports/raw/acd8acb171f1658596ed1cf25da48d5b932e2d19/lang/llvm-17/files/0042-mbstate_t-not-defined.patch";
- hash = "sha256-jo+DYA6zuSv9OH3A0bYwY5TlkWprup4OKQ7rfK1WHBI=";
- }
- )
- ++
- lib.optional
- (
- lib.versionAtLeast metadata.release_version "18"
- && stdenv.hostPlatform.isDarwin
- && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13"
- )
- # https://github.com/llvm/llvm-project/issues/64226
- (metadata.getVersionFile "libcxx/0001-darwin-10.12-mbstate_t-fix.patch");
+ ]
+ ++ lib.optional stdenv.hostPlatform.isMusl (substitute {
+ src = ./libcxx/libcxx-0001-musl-hacks.patch;
+ substitutions = [
+ "--replace-fail"
+ "/include/"
+ "/libcxx/include/"
+ ];
+ })
+ );
stdenv =
if stdenv.hostPlatform.isDarwin then
overrideCC darwin.bootstrapStdenv buildLlvmTools.clangWithLibcAndBasicRt
diff --git a/pkgs/development/compilers/llvm/common/lldb.nix b/pkgs/development/compilers/llvm/common/lldb.nix
index 1e2233790738..3fc17e9143ad 100644
--- a/pkgs/development/compilers/llvm/common/lldb.nix
+++ b/pkgs/development/compilers/llvm/common/lldb.nix
@@ -24,8 +24,6 @@
, patches ? [ ]
, enableManpages ? false
, devExtraCmakeFlags ? [ ]
-, apple-sdk_11
-, darwinMinVersionHook
, ...
}:
@@ -93,14 +91,6 @@ stdenv.mkDerivation (rec {
(lib.getLib libclang)
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.bootstrap_cmds
- ]
- ++ lib.optionals
- (
- stdenv.targetPlatform.isDarwin
- && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0"
- ) [
- apple-sdk_11
- (darwinMinVersionHook "10.15")
];
hardeningDisable = [ "format" ];
diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix
index be106b3db295..ce35c039fc8c 100644
--- a/pkgs/development/compilers/llvm/common/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/common/llvm/default.nix
@@ -13,9 +13,6 @@
, python3
, python3Packages
, libffi
- # TODO: Can this memory corruption bug still occur?
- #
-, enableGoldPlugin ? libbfd.hasPluginAPI
, ld64
, libbfd
, libpfm
@@ -373,8 +370,13 @@ stdenv.mkDerivation (finalAttrs: {
"-DSPHINX_OUTPUT_MAN=ON"
"-DSPHINX_OUTPUT_HTML=OFF"
"-DSPHINX_WARNINGS_AS_ERRORS=OFF"
- ] ++ optionals (enableGoldPlugin) [
- "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
+ ] ++ optionals (libbfd != null) [
+ # LLVM depends on binutils only through libbfd/include/plugin-api.h, which
+ # is meant to be a stable interface. Depend on that file directly rather
+ # than through a build of BFD to break the dependency of clang on the target
+ # triple. The result of this is that a single clang build can be used for
+ # multiple targets.
+ "-DLLVM_BINUTILS_INCDIR=${libbfd.plugin-api-header}/include"
] ++ optionals stdenv.hostPlatform.isDarwin [
"-DLLVM_ENABLE_LIBCXX=ON"
"-DCAN_TARGET_i386=false"
diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix
index ee3b6b5991a1..43ce3e68612d 100644
--- a/pkgs/development/compilers/openjdk/generic.nix
+++ b/pkgs/development/compilers/openjdk/generic.nix
@@ -7,6 +7,7 @@
fetchurl,
fetchpatch,
+ buildPackages,
pkg-config,
autoconf,
lndir,
@@ -77,11 +78,11 @@
temurin-bin-23,
jdk-bootstrap ?
{
- "8" = temurin-bin-8;
- "11" = temurin-bin-11;
- "17" = temurin-bin-17;
- "21" = temurin-bin-21;
- "23" = temurin-bin-23;
+ "8" = temurin-bin-8.__spliced.buildBuild or temurin-bin-8;
+ "11" = temurin-bin-11.__spliced.buildBuild or temurin-bin-11;
+ "17" = temurin-bin-17.__spliced.buildBuild or temurin-bin-17;
+ "21" = temurin-bin-21.__spliced.buildBuild or temurin-bin-21;
+ "23" = temurin-bin-23.__spliced.buildBuild or temurin-bin-23;
}
.${featureVersion},
}:
@@ -228,6 +229,10 @@ stdenv.mkDerivation (finalAttrs: {
)
];
+ strictDeps = true;
+
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
+
nativeBuildInputs =
[
pkg-config
@@ -237,9 +242,15 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optionals (!atLeast11) [
lndir
+ # Certificates generated using perl in `installPhase`
+ perl
]
++ [
unzip
+ zip
+ which
+ # Probably for BUILD_CC but not sure, not in closure.
+ zlib
]
++ lib.optionals atLeast21 [
ensureNewerSourcesForZipFilesHook
@@ -249,11 +260,8 @@ stdenv.mkDerivation (finalAttrs: {
[
# TODO: Many of these should likely be in `nativeBuildInputs`.
cpio
+ # `-lmagic` in NIX_LDFLAGS
file
- which
- zip
- perl
- zlib
cups
freetype
]
@@ -292,7 +300,6 @@ stdenv.mkDerivation (finalAttrs: {
libXcursor
libXrandr
fontconfig
- jdk-bootstrap'
]
++ lib.optionals (!headless && enableGtk) [
(if atLeast11 then gtk3 else gtk2)
@@ -317,6 +324,14 @@ stdenv.mkDerivation (finalAttrs: {
configureFlags =
[
"--with-boot-jdk=${jdk-bootstrap'.home}"
+ # https://github.com/openjdk/jdk/blob/471f112bca715d04304cbe35c6ed63df8c7b7fee/make/autoconf/util_paths.m4#L315
+ # Ignoring value of READELF from the environment. Use command line variables instead.
+ "READELF=${stdenv.cc.targetPrefix}readelf"
+ "AR=${stdenv.cc.targetPrefix}ar"
+ "STRIP=${stdenv.cc.targetPrefix}strip"
+ "NM=${stdenv.cc.targetPrefix}nm"
+ "OBJDUMP=${stdenv.cc.targetPrefix}objdump"
+ "OBJCOPY=${stdenv.cc.targetPrefix}objcopy"
]
++ (
if atLeast23 then
@@ -428,6 +443,11 @@ stdenv.mkDerivation (finalAttrs: {
"-std=gnu++98"
"-Wno-error"
]
+ ++ [
+ # error by default in GCC 14
+ "-Wno-error=int-conversion"
+ "-Wno-error=incompatible-pointer-types"
+ ]
);
NIX_LDFLAGS = lib.concatStringsSep " " (
diff --git a/pkgs/development/compilers/rust/1_82.nix b/pkgs/development/compilers/rust/1_83.nix
similarity index 60%
rename from pkgs/development/compilers/rust/1_82.nix
rename to pkgs/development/compilers/rust/1_83.nix
index 9d1281352ee1..8232079a2adc 100644
--- a/pkgs/development/compilers/rust/1_82.nix
+++ b/pkgs/development/compilers/rust/1_83.nix
@@ -24,16 +24,15 @@
pkgsTargetTarget,
makeRustPlatform,
wrapRustcWith,
- llvmPackages_18,
- llvm_18,
+ llvmPackages_19,
+ llvm_19,
wrapCCWith,
overrideCC,
- fetchpatch,
}@args:
let
llvmSharedFor =
pkgSet:
- pkgSet.llvmPackages_18.libllvm.override (
+ pkgSet.llvmPackages_19.libllvm.override (
{
enableSharedLibraries = true;
}
@@ -41,15 +40,15 @@ let
# Force LLVM to compile using clang + LLVM libs when targeting pkgsLLVM
stdenv = pkgSet.stdenv.override {
allowedRequisites = null;
- cc = pkgSet.pkgsBuildHost.llvmPackages_18.clangUseLLVM;
+ cc = pkgSet.pkgsBuildHost.llvmPackages_19.clangUseLLVM;
};
}
);
in
import ./default.nix
{
- rustcVersion = "1.82.0";
- rustcSha256 = "fFP0UJ7aGE4XTvprp9XutYZYVobOjt78eBorEafPUSo=";
+ rustcVersion = "1.83.0";
+ rustcSha256 = "ci13O9Tqstgo1901tZ8LAX3fmpfuK0bBt/f6xciEHG4=";
llvmSharedForBuild = llvmSharedFor pkgsBuildBuild;
llvmSharedForHost = llvmSharedFor pkgsBuildHost;
@@ -68,14 +67,14 @@ import ./default.nix
bootBintools ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintools,
}:
let
- llvmPackages = llvmPackages_18;
+ llvmPackages = llvmPackages_19;
setStdenv =
pkg:
pkg.override {
stdenv = stdenv.override {
allowedRequisites = null;
- cc = pkgsBuildHost.llvmPackages_18.clangUseLLVM;
+ cc = pkgsBuildHost.llvmPackages_19.clangUseLLVM;
};
};
in
@@ -88,7 +87,7 @@ import ./default.nix
libcxx = llvmPackages.libcxx.override {
stdenv = stdenv.override {
allowedRequisites = null;
- cc = pkgsBuildHost.llvmPackages_18.clangNoLibcxx;
+ cc = pkgsBuildHost.llvmPackages_19.clangNoLibcxx;
hostPlatform = stdenv.hostPlatform // {
useLLVM = !stdenv.hostPlatform.isDarwin;
};
@@ -102,48 +101,39 @@ import ./default.nix
}
) { }
else
- llvmPackages_18;
+ llvmPackages_19;
# Note: the version MUST be the same version that we are building. Upstream
# ensures that each released compiler can compile itself:
# https://github.com/NixOS/nixpkgs/pull/351028#issuecomment-2438244363
- bootstrapVersion = "1.82.0";
+ bootstrapVersion = "1.83.0";
# fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
bootstrapHashes = {
- i686-unknown-linux-gnu = "77b261fb3d9efa7fe39e87c024987495e03b647b6cb23a66b8e69aeb12a8be61";
- x86_64-unknown-linux-gnu = "0265c08ae997c4de965048a244605fb1f24a600bbe35047b811c638b8fcf676b";
- x86_64-unknown-linux-musl = "9dd781c64f71c1d3f854b0937eb751f19e8ebac1110e68e08b94223ad9b022ba";
- arm-unknown-linux-gnueabihf = "d6a2857d0ab8880c3bc691607b10b68fb2750eae35144e035a9a5eeef820b740";
- armv7-unknown-linux-gnueabihf = "eff9939c4b98c6ad91a759fa1a2ebdd81b4d05e47ac523218bf9d7093226589b";
- aarch64-unknown-linux-gnu = "d7db04fce65b5f73282941f3f1df5893be9810af17eb7c65b2e614461fe31a48";
- aarch64-unknown-linux-musl = "f061eabf0324805637c1e89e7d936365f705be1359699efbda59b637dbe9715f";
- x86_64-apple-darwin = "b1a289cabc523f259f65116a41374ac159d72fbbf6c373bd5e545c8e835ceb6a";
- aarch64-apple-darwin = "49b6d36b308addcfd21ae56c94957688338ba7b8985bff57fc626c8e1b32f62c";
- powerpc64le-unknown-linux-gnu = "44f3a1e70be33f91927ae8d89a11843a79b8b6124d62a9ddd9030a5275ebc923";
- riscv64gc-unknown-linux-gnu = "a72e8aa3fff374061ff90ada317a8d170c2a15eb079ddc828c97189179d3eebd";
- s390x-unknown-linux-gnu = "63760886a9b2de6cb38f75a236db358939d904e205e1e2bc9d96cec69e00ae83";
- x86_64-unknown-freebsd = "f7b51943dbed0af3387e3269c1767fee916fb22b8e7897b3594bf5e422403137";
+ i686-unknown-linux-gnu = "cb4763e8e04a302486e06195917921f917b485d1138823b9ebae1e23abf55a99";
+ x86_64-unknown-linux-gnu = "bd9d53d09d4b60826288336de19fb9c5c7592081e4e4520d6de2f65ee8d79087";
+ x86_64-unknown-linux-musl = "d1d379e8bb545466f53f8a5821dfbc7129e8cab046c44c0a9ea089eeff1616e1";
+ arm-unknown-linux-gnueabihf = "1ac6ebcb610226c7d81d52ef5158571567d5385a62a41ba73775e52c25666220";
+ armv7-unknown-linux-gnueabihf = "747c685a4858f2814a7e493e5d2552ff4234ad41e724560c75738340947cf425";
+ aarch64-unknown-linux-gnu = "ec70c500e2744f0db55bd495ef90534a31fd9c0d5f5a2d752182a59e439ddee3";
+ aarch64-unknown-linux-musl = "b7aabedc3d6109e2b46e02e2925aafd8d0aa2d319390a257c170b6750ba683ce";
+ x86_64-apple-darwin = "d878d4508e0bf2d699e4c8b9b8b9ccd30787859f60149c0934371c53a0fdf013";
+ aarch64-apple-darwin = "a605f4e3732eb472dac524861ca8c7456a923e4b4c883b0c8ebfba7550238f41";
+ powerpc64le-unknown-linux-gnu = "0bf705a288994d47975e10bd2a709d00e4caf6cc53b02a8847ad607cbc77e24a";
+ riscv64gc-unknown-linux-gnu = "f4cb563530ad12daba059373a354cf0dcb53a88e5a5d24928778d2736a0e8c65";
+ s390x-unknown-linux-gnu = "502010d6f40b1385c4b99cf74ff0436102efd155ec1e49bca4c02e8c68a4b142";
+ x86_64-unknown-freebsd = "3b55ed8afe27032128622b14e4f4b59d66b3cc7ff64e6df7a06d5e224b3de2a1";
};
- selectRustPackage = pkgs: pkgs.rust_1_82;
-
- rustcPatches = [
- (fetchpatch {
- name = "fix-fastCross.patch";
- url = "https://github.com/rust-lang/rust/commit/c15469a7fec811d1a4f69ff26e18c6f383df41d2.patch";
- hash = "sha256-lFc48AMoGf4LCP65IsXS5rEB9eYacTP8ADftQkj8zkg=";
- })
- ];
+ selectRustPackage = pkgs: pkgs.rust_1_83;
}
(
builtins.removeAttrs args [
- "llvmPackages_18"
- "llvm_18"
+ "llvmPackages_19"
+ "llvm_19"
"wrapCCWith"
"overrideCC"
- "fetchpatch"
"pkgsHostTarget"
]
)
diff --git a/pkgs/development/compilers/rust/cargo-auditable.nix b/pkgs/development/compilers/rust/cargo-auditable.nix
index 0fa6098934c1..77185f267b5b 100644
--- a/pkgs/development/compilers/rust/cargo-auditable.nix
+++ b/pkgs/development/compilers/rust/cargo-auditable.nix
@@ -1,26 +1,23 @@
-{ lib, buildPackages, fetchFromGitHub, fetchpatch, makeRustPlatform, installShellFiles, stdenv }:
+{ lib, buildPackages, fetchFromGitHub, makeRustPlatform, installShellFiles, stdenv }:
let
args = rec {
pname = "cargo-auditable";
- version = "0.6.2";
+ version = "0.6.5";
src = fetchFromGitHub {
owner = "rust-secure-code";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ERIzx9Fveanq7/aWcB2sviTxIahvSu0sTwgpGf/aYE8=";
+ sha256 = "sha256-zjv2/qZM0vRyz45DeKRtPHaamv2iLtjpSedVTEXeDr8=";
};
- patches = [
- (fetchpatch {
- name = "rust-1.77-tests.patch";
- url = "https://github.com/rust-secure-code/cargo-auditable/commit/5317a27244fc428335c4e7a1d066ae0f65f0d496.patch";
- hash = "sha256-UblGseiSC/2eE4rcnTgYzxAMrutHFSdxKTHqKj1mX5o=";
- })
- ];
+ cargoHash = "sha256-uNoqWT3gVslGEPcyrfFeOquvSlLzZbPO4yM1YJeD8N4=";
- cargoHash = "sha256-4o3ctun/8VcBRuj+j0Yaawdkyn6Z6LPp+FTyhPxQWU8=";
+ checkFlags = [
+ # requires wasm32-unknown-unknown target
+ "--skip=test_wasm"
+ ];
meta = with lib; {
description = "Tool to make production Rust binaries auditable";
diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix
index 42c71513151a..569ec815e36a 100644
--- a/pkgs/development/compilers/rust/rustfmt.nix
+++ b/pkgs/development/compilers/rust/rustfmt.nix
@@ -1,6 +1,14 @@
-{ lib, stdenv, rustPlatform, rustc, Security, asNightly ? false }:
+{ lib
+, stdenv
+, cargo
+, makeWrapper
+, rustPlatform
+, rustc
+, Security
+, asNightly ? false
+}:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
pname = "rustfmt" + lib.optionalString asNightly "-nightly";
inherit (rustc) version src;
@@ -11,6 +19,10 @@ rustPlatform.buildRustPackage rec {
# changes hash of vendor directory otherwise
dontUpdateAutotoolsGnuConfigScripts = true;
+ nativeBuildInputs = [
+ makeWrapper
+ ];
+
buildInputs = [
rustc.llvm
] ++ lib.optional stdenv.hostPlatform.isDarwin Security;
@@ -34,6 +46,11 @@ rustPlatform.buildRustPackage rec {
CFG_RELEASE = rustc.version;
CFG_RELEASE_CHANNEL = if asNightly then "nightly" else "stable";
+ postInstall = ''
+ wrapProgram $out/bin/cargo-fmt \
+ --suffix PATH : ${lib.makeBinPath [ cargo ]}
+ '';
+
meta = with lib; {
description = "Tool for formatting Rust code according to style guidelines";
homepage = "https://github.com/rust-lang-nursery/rustfmt";
diff --git a/pkgs/development/compilers/scala-runners/default.nix b/pkgs/development/compilers/scala-runners/default.nix
index bc0756e0c11c..278d1a046ba8 100644
--- a/pkgs/development/compilers/scala-runners/default.nix
+++ b/pkgs/development/compilers/scala-runners/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
dontBuild = true;
installPhase = ''
mkdir -p $out/bin $out/lib
- sed -ie "s| cs | ${coursier}/bin/cs |" scala-runner
+ sed -i -e "s| cs | ${coursier}/bin/cs |" scala-runner
cp scala-runner $out/lib
ln -s $out/lib/scala-runner $out/bin/scala
ln -s $out/lib/scala-runner $out/bin/scalac
diff --git a/pkgs/development/cuda-modules/setup-hooks/setup-cuda-hook.sh b/pkgs/development/cuda-modules/setup-hooks/setup-cuda-hook.sh
index 7799d72873a0..7586f9f4b414 100644
--- a/pkgs/development/cuda-modules/setup-hooks/setup-cuda-hook.sh
+++ b/pkgs/development/cuda-modules/setup-hooks/setup-cuda-hook.sh
@@ -112,7 +112,7 @@ propagateCudaLibraries() {
local propagatedBuildInputs=( "${!cudaHostPathsSeen[@]}" )
for output in $(getAllOutputNames) ; do
if [[ ! "$output" = "$cudaPropagateToOutput" ]] ; then
- propagatedBuildInputs+=( "${!output}" )
+ appendToVar propagatedBuildInputs "${!output}"
fi
break
done
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e1d497a992e9..822d4846d9e2 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2599,9 +2599,36 @@ self: super: {
testTarget = "tests";
}) super.conduit-aeson;
- # Upper bounds are too strict:
- # https://github.com/velveteer/hermes/pull/22
- hermes-json = doJailbreak super.hermes-json;
+ hermes-json = overrideCabal (drv: {
+ # Upper bounds are too strict:
+ # https://github.com/velveteer/hermes/pull/22
+ jailbreak = true;
+
+ # vendored simdjson breaks with clang-19. apply patches that work with
+ # a more recent simdjson so we can un-vendor it
+ patches = drv.patches or [] ++ [
+ (fetchpatch {
+ url = "https://github.com/velveteer/hermes/commit/6fd9904d93a5c001aadb27c114345a6958904d71.patch";
+ hash = "sha256-Pv09XP0/VjUiAFp237Adj06PIZU21mQRh7guTlKksvA=";
+ excludes = [
+ ".github/*"
+ "hermes-bench/*"
+ ];
+ })
+ (fetchpatch {
+ url = "https://github.com/velveteer/hermes/commit/ca8dddbf52f9d7788460a056fefeb241bcd09190.patch";
+ hash = "sha256-tDDGS0QZ3YWe7+SP09wnxx6lIWL986ce5Zhqr7F2sBk=";
+ excludes = [
+ "README.md"
+ ".github/*"
+ "hermes-bench/*"
+ ];
+ })
+ ];
+ postPatch = drv.postPatch or "" + ''
+ ln -fs ${pkgs.simdjson.src} simdjson
+ '';
+ }) super.hermes-json;
# Disabling doctests.
regex-tdfa = overrideCabal {
diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix
index e5e1bd62c3df..2658a1c190af 100644
--- a/pkgs/development/haskell-modules/configuration-darwin.nix
+++ b/pkgs/development/haskell-modules/configuration-darwin.nix
@@ -308,13 +308,6 @@ self: super: ({
__darwinAllowLocalNetworking = true;
});
- # network requires `IP_RECVTOS`, which was added in 10.15.
- network =
- if lib.versionOlder (lib.getVersion pkgs.apple-sdk) "10.15" then
- addBuildDepend pkgs.apple-sdk_10_15 super.network
- else
- super.network;
-
foldl = overrideCabal (drv: {
postPatch = ''
# This comment has been inserted, so the derivation hash changes, forcing
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index f9e811106f20..2a92ef16dc6f 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -255,7 +255,7 @@ self: super: builtins.intersectAttrs super {
jni = overrideCabal (drv: {
preConfigure = ''
local libdir=( "${pkgs.jdk}/lib/openjdk/jre/lib/"*"/server" )
- configureFlags+=" --extra-lib-dir=''${libdir[0]}"
+ appendToVar configureFlags "--extra-lib-dir=''${libdir[0]}"
'';
}) super.jni;
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 14afa3dfe6b4..34b3313674d6 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -24,7 +24,7 @@ let
inherit (buildPackages)
fetchurl removeReferencesTo
- pkg-config coreutils gnugrep glibcLocales
+ pkg-config coreutils glibcLocales
emscripten;
in
@@ -478,13 +478,13 @@ stdenv.mkDerivation ({
for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do
${buildPkgDb ghc "$packageConfDir"}
if [ -d "$p/include" ]; then
- configureFlags+=" --extra-include-dirs=$p/include"
+ appendToVar configureFlags "--extra-include-dirs=$p/include"
fi
if [ -d "$p/lib" ]; then
- configureFlags+=" --extra-lib-dirs=$p/lib"
+ appendToVar configureFlags "--extra-lib-dirs=$p/lib"
fi
if [[ -d "$p/Library/Frameworks" ]]; then
- configureFlags+=" --extra-framework-dirs=$p/Library/Frameworks"
+ appendToVar configureFlags "--extra-framework-dirs=$p/Library/Frameworks"
fi
'' + ''
done
@@ -569,7 +569,7 @@ stdenv.mkDerivation ({
echo configureFlags: $configureFlags
${setupCommand} configure $configureFlags 2>&1 | ${coreutils}/bin/tee "$NIX_BUILD_TOP/cabal-configure.log"
${lib.optionalString (!allowInconsistentDependencies) ''
- if ${gnugrep}/bin/egrep -q -z 'Warning:.*depends on multiple versions' "$NIX_BUILD_TOP/cabal-configure.log"; then
+ if grep -E -q -z 'Warning:.*depends on multiple versions' "$NIX_BUILD_TOP/cabal-configure.log"; then
echo >&2 "*** abort because of serious configure-time warning from Cabal"
exit 1
fi
diff --git a/pkgs/development/interpreters/emilua/default.nix b/pkgs/development/interpreters/emilua/default.nix
index 22affc8b9add..366782276241 100644
--- a/pkgs/development/interpreters/emilua/default.nix
+++ b/pkgs/development/interpreters/emilua/default.nix
@@ -9,7 +9,7 @@
gperf,
gawk,
pkg-config,
- boost182,
+ boost,
fmt,
luajit_openresty,
ncurses,
@@ -47,8 +47,6 @@ let
EOF
'';
};
-
- boost = boost182;
in
stdenv.mkDerivation (self: {
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 20c7c0c145ef..61bf21b99e2d 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -25,7 +25,6 @@
# platform-specific dependencies
, bash
-, apple-sdk_11
, darwin
, windows
@@ -178,9 +177,6 @@ let
bluez
] ++ optionals enableFramework [
darwin.apple_sdk.frameworks.Cocoa
- ] ++ optionals stdenv.hostPlatform.isDarwin [
- # Work around for ld64 crashes on x86_64-darwin. Remove once 11.0 becomes the default.
- apple-sdk_11
] ++ optionals stdenv.hostPlatform.isMinGW [
windows.dlfcn
windows.mingw_w64_pthreads
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index abed1fe0a685..9d7dbd43c4f8 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -20,10 +20,10 @@
sourceVersion = {
major = "3";
minor = "12";
- patch = "7";
+ patch = "8";
suffix = "";
};
- hash = "sha256-JIh7kuKv1KKsYCQZrUtZY3L2esmwdxkPRZq6OQ+vVVA=";
+ hash = "sha256-yQkVe7JewRTlhpEkzCqcSk1MHpV8pP9VPx7caSEBFU4=";
};
};
diff --git a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh
index fd61fd14043d..b542398a92b0 100644
--- a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh
@@ -4,29 +4,6 @@ echo "Sourcing pytest-check-hook"
declare -ar disabledTests
declare -a disabledTestPaths
-function _concatSep {
- local result
- local sep="$1"
- local -n arr=$2
- for index in ${!arr[*]}; do
- if [ $index -eq 0 ]; then
- result="${arr[index]}"
- else
- result+=" $sep ${arr[index]}"
- fi
- done
- echo "$result"
-}
-
-function _pytestComputeDisabledTestsString() {
- declare -a tests
- local tests=($1)
- local prefix="not "
- prefixed=("${tests[@]/#/$prefix}")
- result=$(_concatSep "and" prefixed)
- echo "$result"
-}
-
function pytestCheckPhase() {
echo "Executing pytestCheckPhase"
runHook preCheck
@@ -34,7 +11,7 @@ function pytestCheckPhase() {
# Compose arguments
args=" -m pytest"
if [ -n "$disabledTests" ]; then
- disabledTestsString=$(_pytestComputeDisabledTestsString "${disabledTests[@]}")
+ disabledTestsString="not $(concatStringsSep " and not " disabledTests)"
args+=" -k \""$disabledTestsString"\""
fi
diff --git a/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook-tests.nix b/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook-tests.nix
index 2a77ef015015..4a691685a37a 100644
--- a/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook-tests.nix
+++ b/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook-tests.nix
@@ -83,7 +83,7 @@ in {
generatePythonPackage {
pname = "cyclic-dependencies";
preFixup = ''
- propagatedBuildInputs+=("$out")
+ appendToVar propagatedBuildInputs "$out"
'';
};
diff --git a/pkgs/development/interpreters/python/hooks/python-runtime-deps-check-hook.py b/pkgs/development/interpreters/python/hooks/python-runtime-deps-check-hook.py
index 36ce389de50f..77a6f33d49dd 100644
--- a/pkgs/development/interpreters/python/hooks/python-runtime-deps-check-hook.py
+++ b/pkgs/development/interpreters/python/hooks/python-runtime-deps-check-hook.py
@@ -55,7 +55,7 @@ def get_metadata(wheel: str) -> Metadata:
"""
text = get_manifest_text_from_wheel(wheel)
raw, _ = parse_email(text)
- metadata = Metadata.from_raw(raw)
+ metadata = Metadata.from_raw(raw, validate=False)
return metadata
@@ -78,6 +78,9 @@ def test_requirement(requirement: Requirement) -> bool:
error(f"{package_name} not installed")
return False
+ # Allow prereleases, to give to give us some wiggle-room
+ requirement.specifier.prereleases = True
+
if requirement.specifier and package.version not in requirement.specifier:
error(
f"{package_name}{requirement.specifier} not satisfied by version {package.version}"
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 11778cce06af..2d170db3c5bb 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -313,8 +313,8 @@ in {
};
ruby_3_3 = generic {
- version = rubyVersion "3" "3" "5" "";
- hash = "sha256-N4GjUEIiwvJstLnrnBoS2/SUTTZs4kqf+M+Z7LznUZY=";
+ version = rubyVersion "3" "3" "6" "";
+ hash = "sha256-jcSP/68nD4bxAZBT8o5R5NpMzjKjZ2CgYDqa7mfX/Y0=";
cargoHash = "sha256-GeelTMRFIyvz1QS2L+Q3KAnyQy7jc0ejhx3TdEFVEbk=";
};
diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix
index 8c152d32ef6c..c5ac805f6be5 100644
--- a/pkgs/development/libraries/aspell/default.nix
+++ b/pkgs/development/libraries/aspell/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchzip, perl, ncurses
+{ lib, stdenv, fetchpatch, fetchurl, fetchzip, perl, ncurses
# for tests
, aspell, glibc, runCommand
@@ -27,7 +27,14 @@ stdenv.mkDerivation rec {
hash = "sha256-1toSs01C1Ff6YE5DWtSEp0su/80SD/QKzWuz+yiH0hs=";
};
- patches = lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch;
+ patches = [
+ # fix gcc-15 / clang-19 build. can remove on next update
+ (fetchpatch {
+ name = "fix-gcc-15-build.patch";
+ url = "https://github.com/GNUAspell/aspell/commit/ee6cbb12ff36a1e6618d7388a78dd4e0a2b44041.patch";
+ hash = "sha256-rW1FcfARdtT4wX+zGd2x/1K8zRp9JZhdR/zRd8RwPZA=";
+ })
+ ] ++ lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch;
postPatch = ''
patch interfaces/cc/aspell.h < ${./clang.patch}
diff --git a/pkgs/development/libraries/aws-c-cal/default.nix b/pkgs/development/libraries/aws-c-cal/default.nix
index caf0ce60cdb2..f8df96571764 100644
--- a/pkgs/development/libraries/aws-c-cal/default.nix
+++ b/pkgs/development/libraries/aws-c-cal/default.nix
@@ -2,13 +2,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "aws-c-cal";
- version = "0.6.15";
+ # nixpkgs-update: no auto update
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-cal";
rev = "v${finalAttrs.version}";
- hash = "sha256-RrUJz3IqwbBJ8NuJTIWqK33FlJHolcaid55PT2EhO24=";
+ hash = "sha256-dYFUYdMQMT8CZFMrCrhQ8JPEhA4CVf+f7VLFt3JNmn8=";
};
patches = [
diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix
index 2b3019d48cfa..b8825e88dbb9 100644
--- a/pkgs/development/libraries/aws-c-io/default.nix
+++ b/pkgs/development/libraries/aws-c-io/default.nix
@@ -2,13 +2,14 @@
stdenv.mkDerivation rec {
pname = "aws-c-io";
- version = "0.14.18";
+ # nixpkgs-update: no auto update
+ version = "0.15.3";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
- hash = "sha256-dKZOgbufmPfksSOvOmzSTR/WjoSzmX8edMiuKAOyoyY=";
+ hash = "sha256-/pG/+MHAu/TYTtY/RQrr1U1ev2FZ1p/O8kIRUDDOcvQ=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 6e549526a14c..15e0e1127c9c 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -27,13 +27,14 @@ in
stdenv.mkDerivation rec {
pname = "aws-sdk-cpp";
- version = "1.11.336";
+ # nixpkgs-update: no auto update
+ version = "1.11.448";
src = fetchFromGitHub {
owner = "aws";
repo = "aws-sdk-cpp";
rev = version;
- hash = "sha256-hetXtXM8HG6V3rAuyf+w+DtlxEcpsyaroZsw0nIJoAw=";
+ hash = "sha256-K0UFs7vOeZeQIs3G5L4FfEWXDGTXT9ssr/vQwa1l2lw=";
};
postPatch = ''
diff --git a/pkgs/development/libraries/boost/1.84.nix b/pkgs/development/libraries/boost/1.84.nix
deleted file mode 100644
index bfcfdfbfd7cf..000000000000
--- a/pkgs/development/libraries/boost/1.84.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ callPackage, fetchurl, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
- version = "1.84.0";
-
- src = fetchurl {
- urls = [
- "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
- "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
- ];
- # SHA256 from http://www.boost.org/users/history/version_1_84_0.html
- sha256 = "cc4b893acf645c9d4b698e9a0f08ca8846aa5d6c68275c14c3e7949c24109454";
- };
-})
diff --git a/pkgs/development/libraries/boost/1.85.nix b/pkgs/development/libraries/boost/1.85.nix
deleted file mode 100644
index a95789800e1b..000000000000
--- a/pkgs/development/libraries/boost/1.85.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ callPackage, fetchurl, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
- version = "1.85.0";
-
- src = fetchurl {
- urls = [
- "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
- "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
- ];
- # SHA256 from http://www.boost.org/users/history/version_1_85_0.html
- sha256 = "7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617";
- };
-})
diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix
index 8e1b3593162d..e5b12646ab76 100644
--- a/pkgs/development/libraries/boost/default.nix
+++ b/pkgs/development/libraries/boost/default.nix
@@ -23,7 +23,5 @@ in {
boost181 = makeBoost ./1.81.nix;
boost182 = makeBoost ./1.82.nix;
boost183 = makeBoost ./1.83.nix;
- boost184 = makeBoost ./1.84.nix;
- boost185 = makeBoost ./1.85.nix;
boost186 = makeBoost ./1.86.nix;
}
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 94ee8c236423..c59fc3b2a80e 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -64,6 +64,16 @@ let
"link=${link}"
"-sEXPAT_INCLUDE=${expat.dev}/include"
"-sEXPAT_LIBPATH=${expat.out}/lib"
+ (
+ # The stacktrace from exception feature causes memory leaks when built
+ # with libc++. For all other standard library implementations, i.e.
+ # libstdc++, we must aknowledge this or stacktrace refuses to compile.
+ # Issue upstream: https://github.com/boostorg/stacktrace/issues/163
+ if (stdenv.cc.libcxx != null) then
+ "boost.stacktrace.from_exception=off"
+ else
+ "define=BOOST_STACKTRACE_LIBCXX_RUNTIME_MAY_CAUSE_MEMORY_LEAK"
+ )
# TODO: make this unconditional
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform ||
@@ -151,7 +161,17 @@ stdenv.mkDerivation {
extraPrefix = "libs/python/";
})
]
- ++ lib.optional (lib.versionAtLeast version "1.81" && stdenv.cc.isClang) ./fix-clang-target.patch;
+ ++ lib.optional (lib.versionAtLeast version "1.81" && stdenv.cc.isClang) ./fix-clang-target.patch
+ ++ lib.optional (lib.versionAtLeast version "1.86") [
+ # 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=";
+ })
+ ];
meta = with lib; {
homepage = "http://boost.org/";
@@ -163,6 +183,10 @@ stdenv.mkDerivation {
# a very cryptic error message.
badPlatforms = [ lib.systems.inspect.patterns.isMips64n32 ];
maintainers = with maintainers; [ hjones2199 ];
+ broken =
+ enableNumpy
+ && lib.versionOlder version "1.86"
+ && lib.versionAtLeast python.pkgs.numpy.version "2";
};
passthru = {
diff --git a/pkgs/development/libraries/catch2/3.nix b/pkgs/development/libraries/catch2/3.nix
index b005dc3f8116..fe83ce36bf0b 100644
--- a/pkgs/development/libraries/catch2/3.nix
+++ b/pkgs/development/libraries/catch2/3.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DCATCH_DEVELOPMENT_BUILD=ON"
"-DCATCH_BUILD_TESTING=${if doCheck then "ON" else "OFF"}"
+ "-DCATCH_ENABLE_WERROR=OFF"
] ++ lib.optionals (stdenv.hostPlatform.isDarwin && doCheck) [
# test has a faulty path normalization technique that won't work in
# our darwin build environment https://github.com/catchorg/Catch2/issues/1691
diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix
index d2f6036437fb..5ccae55f63fc 100644
--- a/pkgs/development/libraries/enchant/2.x.nix
+++ b/pkgs/development/libraries/enchant/2.x.nix
@@ -8,12 +8,14 @@
, hunspell
, hspell
, nuspell
+, libvoikko
, unittest-cpp
, withHspell ? true
, withAspell ? true
, withHunspell ? true
, withNuspell ? true
+, withVoikko ? true
, withAppleSpell ? stdenv.hostPlatform.isDarwin
, Cocoa
@@ -45,6 +47,8 @@ stdenv.mkDerivation rec {
hunspell
] ++ lib.optionals withNuspell [
nuspell
+ ] ++ lib.optionals withVoikko [
+ libvoikko
] ++ lib.optionals withAppleSpell [
Cocoa
];
@@ -70,6 +74,7 @@ stdenv.mkDerivation rec {
(lib.withFeature withHspell "hspell")
(lib.withFeature withHunspell "hunspell")
(lib.withFeature withNuspell "nuspell")
+ (lib.withFeature withVoikko "voikko")
(lib.withFeature withAppleSpell "applespell")
];
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 33cebfb2a9a3..a7f4dd70e659 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -40,7 +40,7 @@
, withAribcaption ? withFullDeps && lib.versionAtLeast version "6.1" # ARIB STD-B24 Caption Decoder/Renderer
, withAss ? withHeadlessDeps && stdenv.hostPlatform == stdenv.buildPlatform # (Advanced) SubStation Alpha subtitle rendering
, withAvisynth ? withFullDeps # AviSynth script files reading
-, withBluray ? withFullDeps # BluRay reading
+, withBluray ? withHeadlessDeps # BluRay reading
, withBs2b ? withFullDeps # bs2b DSP library
, withBzlib ? withHeadlessDeps
, withCaca ? withFullDeps # Textual display (ASCII art)
@@ -49,7 +49,7 @@
, withChromaprint ? withFullDeps # Audio fingerprinting
, withCodec2 ? withFullDeps # codec2 en/decoding
, withCuda ? withFullDeps && withNvcodec
-, withCudaLLVM ? withFullDeps
+, withCudaLLVM ? withHeadlessDeps
, withCudaNVCC ? withFullDeps && withUnfree && config.cudaSupport
, withCuvid ? withHeadlessDeps && withNvcodec
, withDav1d ? withHeadlessDeps # AV1 decoder (focused on speed and correctness)
@@ -63,7 +63,7 @@
, withFontconfig ? withHeadlessDeps # Needed for drawtext filter
, withFreetype ? withHeadlessDeps # Needed for drawtext filter
, withFrei0r ? withFullDeps && withGPL # frei0r video filtering
-, withFribidi ? withFullDeps # Needed for drawtext filter
+, withFribidi ? withHeadlessDeps # Needed for drawtext filter
, withGme ? withFullDeps # Game Music Emulator
, withGnutls ? withHeadlessDeps
, withGsm ? withFullDeps # GSM de/encoder
@@ -87,13 +87,13 @@
, withNvdec ? withHeadlessDeps && withNvcodec
, withNvenc ? withHeadlessDeps && withNvcodec
, withOpenal ? withFullDeps # OpenAL 1.1 capture support
-, withOpencl ? withFullDeps
+, withOpencl ? withHeadlessDeps
, withOpencoreAmrnb ? withFullDeps && withVersion3 # AMR-NB de/encoder
, withOpencoreAmrwb ? withFullDeps && withVersion3 # AMR-WB decoder
, withOpengl ? withFullDeps && !stdenv.hostPlatform.isDarwin # OpenGL rendering
, withOpenh264 ? withFullDeps # H.264/AVC encoder
, withOpenjpeg ? withHeadlessDeps # JPEG 2000 de/encoder
-, withOpenmpt ? withFullDeps # Tracked music files decoder
+, withOpenmpt ? withHeadlessDeps # Tracked music files decoder
, withOpus ? withHeadlessDeps # Opus de/encoder
, withPlacebo ? withFullDeps && !stdenv.hostPlatform.isDarwin # libplacebo video processing library
, withPulse ? withSmallDeps && stdenv.hostPlatform.isLinux # Pulseaudio input support
@@ -127,7 +127,7 @@
, withVorbis ? withHeadlessDeps # Vorbis de/encoding, native encoder exists
, withVpl ? false # Hardware acceleration via intel libvpl
, withVpx ? withHeadlessDeps && stdenv.buildPlatform == stdenv.hostPlatform # VP8 & VP9 de/encoding
-, withVulkan ? withSmallDeps && !stdenv.hostPlatform.isDarwin
+, withVulkan ? withHeadlessDeps && !stdenv.hostPlatform.isDarwin
, withVvenc ? withFullDeps && lib.versionAtLeast version "7.1" # H.266/VVC encoding
, withWebp ? withHeadlessDeps # WebP encoder
, withX264 ? withHeadlessDeps && withGPL # H.264/AVC encoder
@@ -140,12 +140,12 @@
, withXevd ? withFullDeps && lib.versionAtLeast version "7.1" && !xevd.meta.broken # MPEG-5 EVC decoding
, withXeve ? withFullDeps && lib.versionAtLeast version "7.1" && !xeve.meta.broken # MPEG-5 EVC encoding
, withXlib ? withFullDeps # Xlib support
-, withXml2 ? withFullDeps # libxml2 support, for IMF and DASH demuxers
+, withXml2 ? withHeadlessDeps # libxml2 support, for IMF and DASH demuxers
, withXvid ? withHeadlessDeps && withGPL # Xvid encoder, native encoder exists
, withZimg ? withHeadlessDeps
, withZlib ? withHeadlessDeps
, withZmq ? withFullDeps # Message passing
-, withZvbi ? withFullDeps # Teletext support
+, withZvbi ? withHeadlessDeps # Teletext support
/*
* Licensing options (yes some are listed twice, filters and such are not listed)
diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix
index e2dcaadf5206..e4d6aaf99037 100644
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/pkgs/development/libraries/fmt/default.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
+ fetchpatch,
cmake,
enableShared ? !stdenv.hostPlatform.isStatic,
@@ -39,7 +40,7 @@ let
nativeBuildInputs = [ cmake ];
- cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}" ];
+ cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared) ];
doCheck = true;
@@ -68,14 +69,16 @@ let
};
in
{
- fmt_8 = generic {
- version = "8.1.1";
- hash = "sha256-leb2800CwdZMJRWF5b1Y9ocK0jXpOX/nwo95icDf308=";
- };
-
fmt_9 = generic {
version = "9.1.0";
hash = "sha256-rP6ymyRc7LnKxUXwPpzhHOQvpJkpnRFOt2ctvUNlYI0=";
+ patches = [
+ # Fixes the build with Clang ≥ 18.
+ (fetchpatch {
+ url = "https://github.com/fmtlib/fmt/commit/c4283ec471bd3efdb114bc1ab30c7c7c5e5e0ee0.patch";
+ hash = "sha256-YyB5GY/ZqJQIhhGy0ICMPzfP/OUuyLnciiyv8Nscsec=";
+ })
+ ];
};
fmt_10 = generic {
@@ -86,5 +89,12 @@ in
fmt_11 = generic {
version = "11.0.2";
hash = "sha256-IKNt4xUoVi750zBti5iJJcCk3zivTt7nU12RIf8pM+0=";
+ patches = [
+ (fetchpatch {
+ name = "get-rid-of-std-copy-fix-clang.patch";
+ url = "https://github.com/fmtlib/fmt/commit/6e462b89aa22fd5f737ed162d0150e145ccb1914.patch";
+ hash = "sha256-tRU1y1VCxtQ5J2yvFmwUx+YNcQs8izzLImD37KBiCFk=";
+ })
+ ];
};
}
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 0518a40c2930..86bbd26ed459 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "gettext";
- version = "0.21.1";
+ version = "0.22.5";
src = fetchurl {
url = "mirror://gnu/gettext/${pname}-${version}.tar.gz";
- sha256 = "sha256-6MNlDh2M7odcTzVWQjgsHfgwWL1aEe6FVcDPJ21kbUU=";
+ hash = "sha256-7BcFselpuDqfBzFE7IBhUduIEn9eQP5alMtsj6SJlqA=";
};
patches = [
./absolute-paths.diff
@@ -23,8 +23,6 @@ stdenv.mkDerivation rec {
outputs = [ "out" "man" "doc" "info" ];
- hardeningDisable = [ "format" ];
-
LDFLAGS = lib.optionalString stdenv.hostPlatform.isSunOS "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec";
configureFlags = [
@@ -38,10 +36,25 @@ stdenv.mkDerivation rec {
];
postPatch = ''
- substituteAllInPlace gettext-runtime/src/gettext.sh.in
- substituteInPlace gettext-tools/projects/KDE/trigger --replace "/bin/pwd" pwd
- substituteInPlace gettext-tools/projects/GNOME/trigger --replace "/bin/pwd" pwd
- substituteInPlace gettext-tools/src/project-id --replace "/bin/pwd" pwd
+ # Older versions of gettext come with a copy of `extern-inline.m4` that is not compatible with clang 18.
+ # When a project uses gettext + autoreconfPhase, autoreconfPhase will invoke `autopoint -f`, which will
+ # replace whatever (probably compatible) version of `extern-inline.m4` with one that probalby won’t work
+ # because `autopoint` will copy the autoconf macros from the project’s required version of gettext.
+ # Fixing this requires replacing all the older copies of the problematic file with a new one.
+ #
+ # This is ugly, but it avoids requiring workarounds in every package using gettext and autoreconfPhase.
+ declare -a oldFiles=($(tar tf gettext-tools/misc/archive.dir.tar | grep '^gettext-0\.[19].*/extern-inline.m4'))
+ oldFilesDir=$(mktemp -d)
+ for oldFile in "''${oldFiles[@]}"; do
+ mkdir -p "$oldFilesDir/$(dirname "$oldFile")"
+ cp gettext-tools/gnulib-m4/extern-inline.m4 "$oldFilesDir/$oldFile"
+ done
+ tar uf gettext-tools/misc/archive.dir.tar -C "$oldFilesDir" "''${oldFiles[@]}"
+
+ substituteAllInPlace gettext-runtime/src/gettext.sh.in
+ substituteInPlace gettext-tools/projects/KDE/trigger --replace "/bin/pwd" pwd
+ substituteInPlace gettext-tools/projects/GNOME/trigger --replace "/bin/pwd" pwd
+ substituteInPlace gettext-tools/src/project-id --replace "/bin/pwd" pwd
'' + lib.optionalString stdenv.hostPlatform.isCygwin ''
sed -i -e "s/\(cldr_plurals_LDADD = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in
sed -i -e "s/\(libgettextsrc_la_LDFLAGS = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 09dde042848b..42ca8f70ff2e 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -224,6 +224,11 @@ stdenv.mkDerivation ({
inherit sha256;
};
+ makeFlags = lib.optionals (stdenv.cc.libc != null) [
+ "BUILD_LDFLAGS=-Wl,-rpath,${stdenv.cc.libc}/lib"
+ "OBJDUMP=${stdenv.cc.bintools.bintools}/bin/objdump"
+ ];
+
# Remove absolute paths from `configure' & co.; build out-of-tree.
preConfigure = ''
export PWD_P=$(type -tP pwd)
@@ -237,12 +242,6 @@ stdenv.mkDerivation ({
cd ../build
configureScript="`pwd`/../$sourceRoot/configure"
-
- ${lib.optionalString (stdenv.cc.libc != null)
- ''makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.cc.libc}/lib OBJDUMP=${stdenv.cc.bintools.bintools}/bin/objdump"''
- }
-
-
'' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
sed -i s/-lgcc_eh//g "../$sourceRoot/Makeconfig"
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 45df332bc0ca..58dccbfa2375 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -10,12 +10,9 @@
pth,
libassuan,
which,
- ncurses,
texinfo,
buildPackages,
qtbase ? null,
- pythonSupport ? false,
- swig ? null,
# only for passthru.tests
libsForQt5,
qt6Packages,
@@ -24,7 +21,7 @@
stdenv.mkDerivation rec {
pname = "gpgme";
- version = "1.23.2";
+ version = "1.24.0";
pyproject = true;
outputs = [
@@ -37,12 +34,10 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnupg/gpgme/gpgme-${version}.tar.bz2";
- hash = "sha256-lJnosfM8zLaBVSehvBYEnTWmGYpsX64BhfK9VhvOUiQ=";
+ hash = "sha256-YeOmrYkyP+z6/xdrwXKPuMMxLy+qg0JNnVB3uiD199o=";
};
patches = [
- # Support Python 3.10-3.12, remove distutils, https://dev.gnupg.org/D545
- ./python-310-312-remove-distutils.patch
# 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)
@@ -50,31 +45,12 @@ stdenv.mkDerivation rec {
./LFS64.patch
];
- postPatch = ''
- # autoconf's beta detection requires a git repo to work
- # and otherwise appends -unknown to the version number used in the python package which pip stumbles upon
- substituteInPlace autogen.sh \
- --replace-fail 'tmp="-unknown"' 'tmp=""'
- '';
-
- nativeBuildInputs =
- [
- autoreconfHook
- gnupg
- pkg-config
- texinfo
- ]
- ++ lib.optionals pythonSupport [
- python3.pythonOnBuildForHost
- python3.pkgs.pip
- python3.pkgs.setuptools
- python3.pkgs.wheel
- ncurses
- swig
- which
- ];
-
- buildInputs = lib.optionals pythonSupport [ python3 ];
+ nativeBuildInputs = [
+ autoreconfHook
+ gnupg
+ pkg-config
+ texinfo
+ ];
propagatedBuildInputs = [
glib
@@ -95,7 +71,6 @@ stdenv.mkDerivation rec {
"--with-libgpg-error-prefix=${libgpg-error.dev}"
"--with-libassuan-prefix=${libassuan.dev}"
]
- ++ lib.optional pythonSupport "--enable-languages=python"
# Tests will try to communicate with gpg-agent instance via a UNIX socket
# which has a path length limit. Nix on darwin is using a build directory
# that already has quite a long path and the resulting socket path doesn't
diff --git a/pkgs/development/libraries/gpgme/python-310-312-remove-distutils.patch b/pkgs/development/libraries/gpgme/python-310-312-remove-distutils.patch
deleted file mode 100644
index 774188aee89c..000000000000
--- a/pkgs/development/libraries/gpgme/python-310-312-remove-distutils.patch
+++ /dev/null
@@ -1,647 +0,0 @@
-diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
---- a/lang/python/Makefile.am
-+++ b/lang/python/Makefile.am
-@@ -34,8 +34,8 @@
- .PHONY: prepare
- prepare: copystamp
-
--# For VPATH builds we need to copy some files because Python's
--# distutils are not VPATH-aware.
-+# For VPATH builds we need to copy some files because Python
-+# is not VPATH-aware.
- copystamp:
- ln -sf "$(top_srcdir)/src/data.h" .
- ln -sf "$(top_builddir)/conf/config.h" .
-@@ -48,7 +48,7 @@
- CFLAGS="$(CFLAGS)" \
- srcdir="$(srcdir)" \
- top_builddir="$(top_builddir)" \
-- $$PYTHON setup.py build --verbose --build-base="$$(basename "$${PYTHON}")-gpg" ; \
-+ $$PYTHON -m pip --verbose install --no-index --no-build-isolation --root="$$(basename "$${PYTHON}")-gpg" ${srcdir} ; \
- done
-
- python$(PYTHON_VERSION)-gpg/dist/gpg-$(VERSION).tar.gz.asc: copystamp
-@@ -57,8 +57,7 @@
- CFLAGS="$(CFLAGS)" \
- srcdir="$(srcdir)" \
- top_builddir="$(top_builddir)" \
-- $(PYTHON) setup.py sdist --verbose --dist-dir=python$(PYTHON_VERSION)-gpg-dist \
-- --manifest=python$(PYTHON_VERSION)-gpg-dist/MANIFEST
-+ $(PYTHON) -m build --sdist --outdir=python$(PYTHON_VERSION)-gpg-dist
- gpgbin=gpgconf --list-components | grep OpenPGP | sed -e 's/gpg:OpenPGP://g'
- $(gpgbin) --detach-sign --armor python$(PYTHON_VERSION)-gpg-dist/gpg-$(VERSION).tar.gz
-
-@@ -92,17 +91,16 @@
- CFLAGS="$(CFLAGS)" \
- srcdir="$(srcdir)" \
- top_builddir="$(top_builddir)" \
-- $$PYTHON setup.py \
-- build \
-- --build-base="$$(basename "$${PYTHON}")-gpg" \
-+ $$PYTHON -m pip --verbose \
- install \
-+ --no-index --no-build-isolation \
- --prefix "$(DESTDIR)$(prefix)" \
-- --verbose ; \
-+ ${srcdir} ; \
- done
-
- uninstall-local:
- set -x; GV=$$(echo $(VERSION) | tr - _); for PYTHON in $(PYTHONS); do \
- PLATLIB="$(prefix)/$$("$${PYTHON}" -c 'import sysconfig, os; print(os.path.relpath(sysconfig.get_path("platlib", scheme="posix_prefix"), sysconfig.get_config_var("prefix")))')" ; \
- rm -rf -- "$(DESTDIR)$${PLATLIB}/gpg" \
-- "$(DESTDIR)$${PLATLIB}"/gpg-$$GV-py*.egg-info ; \
-+ "$(DESTDIR)$${PLATLIB}"/gpg-$$GV.dist-info ; \
- done
-diff --git a/lang/python/doc/src/gpgme-python-howto.org b/lang/python/doc/src/gpgme-python-howto.org
---- a/lang/python/doc/src/gpgme-python-howto.org
-+++ b/lang/python/doc/src/gpgme-python-howto.org
-@@ -2945,7 +2945,7 @@
- =setup.py= file which contains this:
-
- #+BEGIN_SRC python -i
--from distutils.core import setup
-+from setuptools import setup
- from Cython.Build import cythonize
-
- setup(
-diff --git a/lang/python/examples/howto/advanced/cython/setup.py b/lang/python/examples/howto/advanced/cython/setup.py
---- a/lang/python/examples/howto/advanced/cython/setup.py
-+++ b/lang/python/examples/howto/advanced/cython/setup.py
-@@ -1,4 +1,4 @@
--from distutils.core import setup
-+from setuptools import setup
- from Cython.Build import cythonize
-
- setup(
-diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
---- a/lang/python/setup.py.in
-+++ b/lang/python/setup.py.in
-@@ -18,8 +18,8 @@
- # License along with this library; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
--from distutils.core import setup, Extension
--from distutils.command.build import build
-+from setuptools import setup, Extension
-+from setuptools.command.build import build
-
- import glob
- import os
-@@ -225,9 +225,8 @@
- build.run(self)
-
-
--py3 = [] if sys.version_info.major < 3 else ['-py3']
- swig_sources = []
--swig_opts = ['-threads'] + py3 + extra_swig_opts
-+swig_opts = ['-threads'] + extra_swig_opts
- swige = Extension(
- 'gpg._gpgme',
- sources=swig_sources,
-diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4
---- a/m4/ax_python_devel.m4
-+++ b/m4/ax_python_devel.m4
-@@ -1,10 +1,10 @@
- # ===========================================================================
--# https://www.gnu.org/software/autoconf-archive/ax_python_devel.html
-+# https://www.gnu.org/software/autoconf-archive/ax_python_devel.html
- # ===========================================================================
- #
- # SYNOPSIS
- #
--# AX_PYTHON_DEVEL([version])
-+# AX_PYTHON_DEVEL([version[,optional]])
- #
- # DESCRIPTION
- #
-@@ -12,8 +12,8 @@
- # in your configure.ac.
- #
- # This macro checks for Python and tries to get the include path to
--# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS)
--# output variables. It also exports $(PYTHON_EXTRA_LIBS) and
-+# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LIBS) output
-+# variables. It also exports $(PYTHON_EXTRA_LIBS) and
- # $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code.
- #
- # You can search for some particular version of Python by passing a
-@@ -23,6 +23,11 @@
- # version number. Don't use "PYTHON_VERSION" for this: that environment
- # variable is declared as precious and thus reserved for the end-user.
- #
-+# By default this will fail if it does not detect a development version of
-+# python. If you want it to continue, set optional to true, like
-+# AX_PYTHON_DEVEL([], [true]). The ax_python_devel_found variable will be
-+# "no" if it fails.
-+#
- # This macro should work for all versions of Python >= 2.1.0. As an end
- # user, you can disable the check for the python version by setting the
- # PYTHON_NOVERSIONCHECK environment variable to something else than the
-@@ -67,10 +72,18 @@
- # modified version of the Autoconf Macro, you may extend this special
- # exception to the GPL to apply to your modified version as well.
-
--#serial 17
-+#serial 36
-
- AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL])
- AC_DEFUN([AX_PYTHON_DEVEL],[
-+ # Get whether it's optional
-+ if test -z "$2"; then
-+ ax_python_devel_optional=false
-+ else
-+ ax_python_devel_optional=$2
-+ fi
-+ ax_python_devel_found=yes
-+
- #
- # Allow the use of a (user set) custom python version
- #
-@@ -81,81 +94,147 @@
-
- AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
- if test -z "$PYTHON"; then
-- AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path])
-+ AC_MSG_WARN([Cannot find python$PYTHON_VERSION in your system path])
-+ if ! $ax_python_devel_optional; then
-+ AC_MSG_ERROR([Giving up, python development not available])
-+ fi
-+ ax_python_devel_found=no
- PYTHON_VERSION=""
- fi
-
-- #
-- # Check for a version of Python >= 2.1.0
-- #
-- AC_MSG_CHECKING([for a version of Python >= '2.1.0'])
-- ac_supports_python_ver=`$PYTHON -c "import sys; \
-+ if test $ax_python_devel_found = yes; then
-+ #
-+ # Check for a version of Python >= 2.1.0
-+ #
-+ AC_MSG_CHECKING([for a version of Python >= '2.1.0'])
-+ ac_supports_python_ver=`$PYTHON -c "import sys; \
- ver = sys.version.split ()[[0]]; \
- print (ver >= '2.1.0')"`
-- if test "$ac_supports_python_ver" != "True"; then
-+ if test "$ac_supports_python_ver" != "True"; then
- if test -z "$PYTHON_NOVERSIONCHECK"; then
- AC_MSG_RESULT([no])
-- AC_MSG_FAILURE([
-+ AC_MSG_WARN([
- This version of the AC@&t@_PYTHON_DEVEL macro
- doesn't work properly with versions of Python before
- 2.1.0. You may need to re-run configure, setting the
--variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG,
-+variables PYTHON_CPPFLAGS, PYTHON_LIBS, PYTHON_SITE_PKG,
- PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
- Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
- to something else than an empty string.
- ])
-+ if ! $ax_python_devel_optional; then
-+ AC_MSG_FAILURE([Giving up])
-+ fi
-+ ax_python_devel_found=no
-+ PYTHON_VERSION=""
- else
- AC_MSG_RESULT([skip at user request])
- fi
-- else
-+ else
- AC_MSG_RESULT([yes])
-+ fi
- fi
-
-- #
-- # if the macro parameter ``version'' is set, honour it
-- #
-- if test -n "$1"; then
-+ if test $ax_python_devel_found = yes; then
-+ #
-+ # If the macro parameter ``version'' is set, honour it.
-+ # A Python shim class, VPy, is used to implement correct version comparisons via
-+ # string expressions, since e.g. a naive textual ">= 2.7.3" won't work for
-+ # Python 2.7.10 (the ".1" being evaluated as less than ".3").
-+ #
-+ if test -n "$1"; then
- AC_MSG_CHECKING([for a version of Python $1])
-- ac_supports_python_ver=`$PYTHON -c "import sys; \
-- ver = sys.version.split ()[[0]]; \
-+ cat << EOF > ax_python_devel_vpy.py
-+class VPy:
-+ def vtup(self, s):
-+ return tuple(map(int, s.strip().replace("rc", ".").split(".")))
-+ def __init__(self):
-+ import sys
-+ self.vpy = tuple(sys.version_info)[[:3]]
-+ def __eq__(self, s):
-+ return self.vpy == self.vtup(s)
-+ def __ne__(self, s):
-+ return self.vpy != self.vtup(s)
-+ def __lt__(self, s):
-+ return self.vpy < self.vtup(s)
-+ def __gt__(self, s):
-+ return self.vpy > self.vtup(s)
-+ def __le__(self, s):
-+ return self.vpy <= self.vtup(s)
-+ def __ge__(self, s):
-+ return self.vpy >= self.vtup(s)
-+EOF
-+ ac_supports_python_ver=`$PYTHON -c "import ax_python_devel_vpy; \
-+ ver = ax_python_devel_vpy.VPy(); \
- print (ver $1)"`
-+ rm -rf ax_python_devel_vpy*.py* __pycache__/ax_python_devel_vpy*.py*
- if test "$ac_supports_python_ver" = "True"; then
-- AC_MSG_RESULT([yes])
-+ AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
-- AC_MSG_ERROR([this package requires Python $1.
-+ AC_MSG_WARN([this package requires Python $1.
- If you have it installed, but it isn't the default Python
- interpreter in your system path, please pass the PYTHON_VERSION
- variable to configure. See ``configure --help'' for reference.
- ])
-+ if ! $ax_python_devel_optional; then
-+ AC_MSG_ERROR([Giving up])
-+ fi
-+ ax_python_devel_found=no
- PYTHON_VERSION=""
- fi
-+ fi
- fi
-
-- #
-- # Check if you have distutils, else fail
-- #
-- AC_MSG_CHECKING([for the distutils Python package])
-- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
-- if test -z "$ac_distutils_result"; then
-+ if test $ax_python_devel_found = yes; then
-+ #
-+ # Check if you have distutils, else fail
-+ #
-+ AC_MSG_CHECKING([for the sysconfig Python package])
-+ ac_sysconfig_result=`$PYTHON -c "import sysconfig" 2>&1`
-+ if test $? -eq 0; then
- AC_MSG_RESULT([yes])
-- else
-+ IMPORT_SYSCONFIG="import sysconfig"
-+ else
- AC_MSG_RESULT([no])
-- AC_MSG_ERROR([cannot import Python module "distutils".
-+
-+ AC_MSG_CHECKING([for the distutils Python package])
-+ ac_sysconfig_result=`$PYTHON -c "from distutils import sysconfig" 2>&1`
-+ if test $? -eq 0; then
-+ AC_MSG_RESULT([yes])
-+ IMPORT_SYSCONFIG="from distutils import sysconfig"
-+ else
-+ AC_MSG_WARN([cannot import Python module "distutils".
- Please check your Python installation. The error was:
--$ac_distutils_result])
-- PYTHON_VERSION=""
-+$ac_sysconfig_result])
-+ if ! $ax_python_devel_optional; then
-+ AC_MSG_ERROR([Giving up])
-+ fi
-+ ax_python_devel_found=no
-+ PYTHON_VERSION=""
-+ fi
-+ fi
- fi
-
-- #
-- # Check for Python include path
-- #
-- AC_MSG_CHECKING([for Python include path])
-- if test -z "$PYTHON_CPPFLAGS"; then
-- python_path=`$PYTHON -c "import distutils.sysconfig; \
-- print (distutils.sysconfig.get_python_inc ());"`
-- plat_python_path=`$PYTHON -c "import distutils.sysconfig; \
-- print (distutils.sysconfig.get_python_inc (plat_specific=1));"`
-+ if test $ax_python_devel_found = yes; then
-+ #
-+ # Check for Python include path
-+ #
-+ AC_MSG_CHECKING([for Python include path])
-+ if test -z "$PYTHON_CPPFLAGS"; then
-+ if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then
-+ # sysconfig module has different functions
-+ python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-+ print (sysconfig.get_path ('include'));"`
-+ plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-+ print (sysconfig.get_path ('platinclude'));"`
-+ else
-+ # old distutils way
-+ python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-+ print (sysconfig.get_python_inc ());"`
-+ plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-+ print (sysconfig.get_python_inc (plat_specific=1));"`
-+ fi
- if test -n "${python_path}"; then
- if test "${plat_python_path}" != "${python_path}"; then
- python_path="-I$python_path -I$plat_python_path"
-@@ -164,22 +243,22 @@
- fi
- fi
- PYTHON_CPPFLAGS=$python_path
-- fi
-- AC_MSG_RESULT([$PYTHON_CPPFLAGS])
-- AC_SUBST([PYTHON_CPPFLAGS])
-+ fi
-+ AC_MSG_RESULT([$PYTHON_CPPFLAGS])
-+ AC_SUBST([PYTHON_CPPFLAGS])
-
-- #
-- # Check for Python library path
-- #
-- AC_MSG_CHECKING([for Python library path])
-- if test -z "$PYTHON_LDFLAGS"; then
-+ #
-+ # Check for Python library path
-+ #
-+ AC_MSG_CHECKING([for Python library path])
-+ if test -z "$PYTHON_LIBS"; then
- # (makes two attempts to ensure we've got a version number
- # from the interpreter)
- ac_python_version=`cat<]],
- [[Py_Initialize();]])
- ],[pythonexists=yes],[pythonexists=no])
-- AC_LANG_POP([C])
-- # turn back to default flags
-- CPPFLAGS="$ac_save_CPPFLAGS"
-- LIBS="$ac_save_LIBS"
-+ AC_LANG_POP([C])
-+ # turn back to default flags
-+ CPPFLAGS="$ac_save_CPPFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ LDFLAGS="$ac_save_LDFLAGS"
-
-- AC_MSG_RESULT([$pythonexists])
-+ AC_MSG_RESULT([$pythonexists])
-
-- if test ! "x$pythonexists" = "xyes"; then
-- AC_MSG_WARN([
-+ if test ! "x$pythonexists" = "xyes"; then
-+ AC_MSG_WARN([
- Could not link test program to Python. Maybe the main Python library has been
- installed in some non-standard library path. If so, pass it to configure,
-- via the LDFLAGS environment variable.
-- Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib"
-+ via the LIBS environment variable.
-+ Example: ./configure LIBS="-L/usr/non-standard-path/python/lib"
- ============================================================================
-+ ERROR!
- You probably have to install the development version of the Python package
- for your distribution. The exact name of this package varies among them.
- ============================================================================
-- ])
-- PYTHON_VERSION=""
-+ ])
-+ if ! $ax_python_devel_optional; then
-+ AC_MSG_ERROR([Giving up])
-+ fi
-+ ax_python_devel_found=no
-+ PYTHON_VERSION=""
-+ fi
- fi
-
- #
- # all done!
- #
--])
-+])
-\ No newline at end of file
-diff --git a/m4/python.m4 b/m4/python.m4
---- a/m4/python.m4
-+++ b/m4/python.m4
-@@ -41,7 +41,7 @@
- m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
- [python2 python2.7 dnl
- python dnl
-- python3 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4
-+ python3 python3.12 python3.11 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4
- ])
-
- AC_ARG_VAR([PYTHON], [the Python interpreter])
-
diff --git a/pkgs/development/libraries/grantlee/5/setup-hook.sh b/pkgs/development/libraries/grantlee/5/setup-hook.sh
index b51cb4a31909..1f57c38eb89a 100644
--- a/pkgs/development/libraries/grantlee/5/setup-hook.sh
+++ b/pkgs/development/libraries/grantlee/5/setup-hook.sh
@@ -6,8 +6,8 @@ providesGrantleeRuntime() {
_grantleeEnvHook() {
if providesGrantleeRuntime "$1"; then
- propagatedBuildInputs+=" $1"
- propagatedUserEnvPkgs+=" $1"
+ appendToVar propagatedBuildInputs "$1"
+ appendToVar propagatedUserEnvPkgs "$1"
fi
}
addEnvHooks "$hostOffset" _grantleeEnvHook
diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix
index 187d1a048697..8c32204d9704 100644
--- a/pkgs/development/libraries/gstreamer/rs/default.nix
+++ b/pkgs/development/libraries/gstreamer/rs/default.nix
@@ -240,8 +240,7 @@ stdenv.mkDerivation (finalAttrs: {
export CSOUND_LIB_DIR=${lib.getLib csound}/lib
'';
- # give meson longer before timing out for tests
- mesonCheckFlags = [ "--verbose" "--timeout-multiplier" "12" ];
+ mesonCheckFlags = [ "--verbose" ];
doInstallCheck = (lib.elem "webp" selectedPlugins) && !stdenv.hostPlatform.isStatic &&
stdenv.hostPlatform.isElf;
diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix
index 8a79a06560fc..5ceaa2864086 100644
--- a/pkgs/development/libraries/gtk/4.x.nix
+++ b/pkgs/development/libraries/gtk/4.x.nix
@@ -53,8 +53,6 @@
, libexecinfo
, broadwaySupport ? true
, testers
-, apple-sdk
-, apple-sdk_10_15
, darwinMinVersionHook
}:
@@ -162,11 +160,6 @@ stdenv.mkDerivation (finalAttrs: {
# Required for GSettings schemas at runtime.
# Will be picked up by wrapGAppsHook4.
gsettings-desktop-schemas
- ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
- (darwinMinVersionHook "10.15")
- ] ++ lib.optionals (stdenv.hostPlatform.isDarwin
- && lib.versionOlder apple-sdk.version "10.15") [
- apple-sdk_10_15
];
mesonFlags = [
diff --git a/pkgs/development/libraries/gupnp/1.6.nix b/pkgs/development/libraries/gupnp/1.6.nix
index 46714e2e25bd..eb8abeb28953 100644
--- a/pkgs/development/libraries/gupnp/1.6.nix
+++ b/pkgs/development/libraries/gupnp/1.6.nix
@@ -51,11 +51,6 @@ stdenv.mkDerivation rec {
doCheck = true;
- mesonCheckFlags = [
- # The service-proxy test takes 28s on ofborg, which is too close to the time limit.
- "--timeout-multiplier" "2"
- ];
-
postFixup = ''
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
moveToOutput "share/doc" "$devdoc"
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 1ff6d193268e..124c507f5a63 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -33,11 +33,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "harfbuzz${lib.optionalString withIcu "-icu"}";
- version = "10.0.1";
+ version = "10.1.0";
src = fetchurl {
url = "https://github.com/harfbuzz/harfbuzz/releases/download/${finalAttrs.version}/harfbuzz-${finalAttrs.version}.tar.xz";
- hash = "sha256-sssTvTUZBMuQOPkH3A3uCuBxJwYSQv41VrJ5XE6XSPw=";
+ hash = "sha256-bONSDy0ImjPO8PxIMhM0uOC3IUH2p2Nxmqrs0neey4I=";
};
postPatch = ''
diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix
index 6711622a2eb8..3eb7678cc0a5 100644
--- a/pkgs/development/libraries/irrlicht/default.nix
+++ b/pkgs/development/libraries/irrlicht/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
src = common.src;
postPatch = ''
- sed -ie '/sys\/sysctl.h/d' source/Irrlicht/COSOperator.cpp
+ sed -i -e '/sys\/sysctl.h/d' source/Irrlicht/COSOperator.cpp
'' + lib.optionalString stdenv.hostPlatform.isAarch64 ''
substituteInPlace source/Irrlicht/Makefile \
--replace "-DIRRLICHT_EXPORTS=1" "-DIRRLICHT_EXPORTS=1 -DPNG_ARM_NEON_OPT=0"
diff --git a/pkgs/development/libraries/itk/generic.nix b/pkgs/development/libraries/itk/generic.nix
index d4ece7d311ec..6fc32c0e4e20 100644
--- a/pkgs/development/libraries/itk/generic.nix
+++ b/pkgs/development/libraries/itk/generic.nix
@@ -58,19 +58,6 @@ let
rev = "bb896868fc6480835495d0da4356d5db009592a6";
hash = "sha256-MfaIA0xxA/pzUBSwnAevr17iR23Bo5iQO2cSyknS3o4=";
};
-
- # remove after next swig update:
- swigUnstable = swig.overrideAttrs ({
- version = "4.2.1-unstable-2024-08-19";
-
- src = fetchFromGitHub {
- owner = "swig";
- repo = "swig";
- rev = "5ac5d90f970759fbe705fae551d0743a7c63c67e";
- hash = "sha256-32EFLHpP4l04nqrc8dt4Qsr8deTBqLt8lUlhnNnaIGU=";
- };
-
- });
in
stdenv.mkDerivation {
@@ -137,7 +124,7 @@ stdenv.mkDerivation {
]
++ lib.optionals enablePython [
castxml
- swigUnstable
+ swig
which
];
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index cc87ec2afa57..e751d8b40b03 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -52,7 +52,7 @@ let
# Propagate $dev so that this setup hook is propagated
# But only if there is a separate $dev output
if [ "''${outputDev:?}" != out ]; then
- propagatedBuildInputs="''${propagatedBuildInputs-} @dev@"
+ appendToVar propagatedBuildInputs "@dev@"
fi
fi
'';
diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
index e576dbb4ec73..abf330fd9662 100644
--- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
+++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
@@ -111,7 +111,7 @@ ecmHostPathHook() {
if [ -d "$1/dbus-1" ]
then
- propagatedUserEnvPkgs+=" $1"
+ appendToVar propagatedUserEnvPkgs "$1"
fi
}
addEnvHooks "$targetOffset" ecmHostPathHook
diff --git a/pkgs/development/libraries/kompute/default.nix b/pkgs/development/libraries/kompute/default.nix
index ced30a87dbfa..04b21d9ce026 100644
--- a/pkgs/development/libraries/kompute/default.nix
+++ b/pkgs/development/libraries/kompute/default.nix
@@ -6,41 +6,37 @@
, vulkan-headers
, vulkan-loader
, fmt
+, spdlog
, glslang
, ninja
}:
stdenv.mkDerivation rec {
pname = "kompute";
- version = "0.8.1";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "KomputeProject";
repo = "kompute";
rev = "v${version}";
- sha256 = "sha256-OkVGYh8QrD7JNqWFBLrDTYlk6IYHdvt4i7UtC4sQTzo=";
+ hash = "sha256-cf9Ef85R+VKao286+WHLgBWUqgwvuRocgeCzVJOGbdc=";
};
- patches = [
- (fetchpatch {
- url = "https://github.com/KomputeProject/kompute/commit/9a791b161dd58ca927fe090f65fa2b0e5e85e7ca.diff";
- sha256 = "OtFTN8sgPlyiMmVzUnqzCkVMKj6DWxbCXtYwkRdEprY=";
- })
- (fetchpatch {
- name = "enum-class-fix-for-fmt-8-x.patch";
- url = "https://github.com/KomputeProject/kompute/commit/f731f2e55c7aaaa804111106c3e469f9a642d4eb.patch";
- sha256 = "sha256-scTCYqkgKQnH27xzuY4FVbiwRuwBvChmLPPU7ZUrrL0=";
- })
- ];
-
cmakeFlags = [
+ "-DKOMPUTE_OPT_USE_SPDLOG=ON"
+ # Doesn’t work without the vendored `spdlog`, and is redundant.
+ "-DKOMPUTE_OPT_LOG_LEVEL_DISABLED=ON"
+ "-DKOMPUTE_OPT_USE_BUILT_IN_SPDLOG=OFF"
+ "-DKOMPUTE_OPT_USE_BUILT_IN_FMT=OFF"
+ "-DKOMPUTE_OPT_USE_BUILT_IN_GOOGLE_TEST=OFF"
+ "-DKOMPUTE_OPT_USE_BUILT_IN_PYBIND11=OFF"
+ "-DKOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER=OFF"
+ "-DKOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK=ON"
"-DKOMPUTE_OPT_INSTALL=1"
- "-DRELEASE=1"
- "-DKOMPUTE_ENABLE_SPDLOG=1"
];
nativeBuildInputs = [ cmake ninja ];
- buildInputs = [ fmt ];
+ buildInputs = [ fmt spdlog ];
propagatedBuildInputs = [ glslang vulkan-headers vulkan-loader ];
meta = with lib; {
diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix
index 3cf0e799cb7e..3ece3c925f76 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -1,4 +1,5 @@
{ fetchurl, stdenv, lib
+, updateAutotoolsGnuConfigScriptsHook
, enableStatic ? stdenv.hostPlatform.isStatic
, enableShared ? !stdenv.hostPlatform.isStatic
, enableDarwinABICompat ? false
@@ -6,7 +7,7 @@
# assert !stdenv.hostPlatform.isLinux || stdenv.hostPlatform != stdenv.buildPlatform; # TODO: improve on cross
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
pname = "libiconv";
version = "1.17";
@@ -17,6 +18,13 @@ stdenv.mkDerivation (rec {
enableParallelBuilding = true;
+ # necessary to build on FreeBSD native pending inclusion of
+ # https://git.savannah.gnu.org/cgit/config.git/commit/?id=e4786449e1c26716e3f9ea182caf472e4dbc96e0
+ nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
+
+ # https://github.com/NixOS/nixpkgs/pull/192630#discussion_r978985593
+ hardeningDisable = lib.optional (stdenv.hostPlatform.libc == "bionic") "fortify";
+
setupHooks = [
../../../build-support/setup-hooks/role.bash
./setup-hook.sh
@@ -87,7 +95,4 @@ stdenv.mkDerivation (rec {
# This library is not needed on GNU platforms.
hydraPlatforms = with lib.platforms; cygwin ++ darwin ++ freebsd;
};
-} // lib.optionalAttrs (stdenv.hostPlatform.libc == "bionic") {
- # https://github.com/NixOS/nixpkgs/pull/192630#discussion_r978985593
- hardeningDisable = [ "fortify" ];
-})
+}
diff --git a/pkgs/development/libraries/libmicrohttpd/generic.nix b/pkgs/development/libraries/libmicrohttpd/generic.nix
index 45736cea1e95..adb9cc005a26 100644
--- a/pkgs/development/libraries/libmicrohttpd/generic.nix
+++ b/pkgs/development/libraries/libmicrohttpd/generic.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: {
preCheck = ''
# Since `localhost' can't be resolved in a chroot, work around it.
- sed -ie 's/localhost/127.0.0.1/g' src/test*/*.[ch]
+ sed -i -e 's/localhost/127.0.0.1/g' src/test*/*.[ch]
'';
# Disabled because the tests can time-out.
diff --git a/pkgs/development/libraries/libpulsar/default.nix b/pkgs/development/libraries/libpulsar/default.nix
index f083ef041457..9e227f92ded0 100644
--- a/pkgs/development/libraries/libpulsar/default.nix
+++ b/pkgs/development/libraries/libpulsar/default.nix
@@ -1,7 +1,7 @@
{ lib
, asioSupport ? true
, asio
-, boost180
+, boost
, log4cxxSupport ? false
, log4cxx
, snappySupport ? false
@@ -41,7 +41,7 @@ let
++ lib.optional zstdSupport zstd
++ lib.optional log4cxxSupport log4cxx
++ lib.optional asioSupport asio
- ++ lib.optional (!asioSupport) boost180;
+ ++ lib.optional (!asioSupport) boost;
in
stdenv.mkDerivation (finalAttrs: rec {
diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix
index 2aff5ca60377..79d4fee1ef01 100644
--- a/pkgs/development/libraries/libsoup/3.x.nix
+++ b/pkgs/development/libraries/libsoup/3.x.nix
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "libsoup";
- version = "3.6.0";
+ version = "3.6.1";
outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-YpWfeR6OhEL4wTztrIxJGdePkSDVu1MBvmel5TMYtKM=";
+ sha256 = "sha256-zrHxqivdc7LNgVnTmYyWxV7wl+8V5LTzYCkgn6GK+Dg=";
};
depsBuildBuild = [
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index a88cd9355326..2e9d52bc54c1 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchurl
+, fetchpatch
, glib
, libxml2
, meson
@@ -29,6 +30,34 @@ stdenv.mkDerivation rec {
sha256 = "sha256-5Ld8Qc/EyMWgNfzcMgx7xs+3XvfFoDQVPfFBP6HZLxM=";
};
+ patches = [
+ (fetchpatch {
+ name = "CVE-2024-52530.patch";
+ url = "https://gitlab.gnome.org/GNOME/libsoup/-/commit/04df03bc092ac20607f3e150936624d4f536e68b.patch";
+ hash = "sha256-WRLiW2B/xxr3hW0nmeRNrXtZL44S0nTptPRdTqBV8Iw=";
+ })
+ (fetchpatch {
+ name = "CVE-2024-52531_1.patch";
+ url = "https://git.launchpad.net/ubuntu/+source/libsoup2.4/patch/?id=4ce2f2dc8ba0c458edce0f039a087fb3ac57787e";
+ hash = "sha256-wg1qz8xHcnTiinBTF0ECMkrsD8W6M4IbiKGgbJ1gp9o=";
+ })
+ (fetchpatch {
+ name = "CVE-2024-52531_2.patch";
+ url = "https://git.launchpad.net/ubuntu/+source/libsoup2.4/patch/?id=5866d63aed3500700c5f1d2868ff689bb2ba8b82";
+ hash = "sha256-e/VXtKX+agCw+ESGbgQ83NaVNbB3jLTxL7+VgNGbZ7U=";
+ })
+ (fetchpatch {
+ name = "CVE-2024-52532_1.patch";
+ url = "https://git.launchpad.net/ubuntu/+source/libsoup2.4/patch/?id=98e096a0d2142e3c63de2cca7d4023f9c52ed2c6";
+ hash = "sha256-h7k+HpcKlsVYlAONxTOiupMhsMkf2v246ouxLejurcY=";
+ })
+ (fetchpatch {
+ name = "CVE-2024-52532_2.patch";
+ url = "https://git.launchpad.net/ubuntu/+source/libsoup2.4/patch/?id=030e72420e8271299c324273f393d92f6d4bb53e";
+ hash = "sha256-0BEJpEKgjmKACf53lHMglxhmevKsSXR4ejEoTtr4wII=";
+ })
+ ];
+
depsBuildBuild = [
pkg-config
];
diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index 2b8020d43093..fdf4ee4233fd 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -23,14 +23,14 @@
}:
stdenv.mkDerivation (finalAttrs: {
- version = "1.48.0";
+ version = "1.49.2";
pname = "libuv";
src = fetchFromGitHub {
owner = "libuv";
repo = "libuv";
rev = "v${finalAttrs.version}";
- hash = "sha256-U68BmIQNpmIy3prS7LkYl+wvDJQNikoeFiKh50yQFoA=";
+ hash = "sha256-hNXW3cQVW8VGMQrHFkezRI2OqYF7Qf1riD8sHy66qxg=";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/mbedtls/3.nix b/pkgs/development/libraries/mbedtls/3.nix
index 9655393615b9..0722638c274b 100644
--- a/pkgs/development/libraries/mbedtls/3.nix
+++ b/pkgs/development/libraries/mbedtls/3.nix
@@ -1,6 +1,17 @@
-{ callPackage }:
+{ callPackage, fetchurl }:
callPackage ./generic.nix {
version = "3.6.2";
hash = "sha256-tSWhF8i0Tx9QSFmyDEHdd2xveZvpyd+HXR+8xYj2Syo=";
+ patches = [
+ # Fixes the build with GCC 14.
+ #
+ # See:
+ # *
+ # *
+ (fetchurl {
+ url = "https://raw.githubusercontent.com/openwrt/openwrt/52b6c9247997e51a97f13bb9e94749bc34e2d52e/package/libs/mbedtls/patches/100-fix-gcc14-build.patch";
+ hash = "sha256-20bxGoUHkrOEungN3SamYKNgj95pM8IjbisNRh68Wlw=";
+ })
+ ];
}
diff --git a/pkgs/development/libraries/mbedtls/generic.nix b/pkgs/development/libraries/mbedtls/generic.nix
index 14545a2710fc..e87a133eb2a1 100644
--- a/pkgs/development/libraries/mbedtls/generic.nix
+++ b/pkgs/development/libraries/mbedtls/generic.nix
@@ -47,10 +47,6 @@ stdenv.mkDerivation rec {
"-DGEN_FILES=off"
];
- env = lib.optionalAttrs (stdenv.cc.isGNU && (lib.versionAtLeast (lib.getVersion stdenv.cc.cc) "14")) {
- NIX_CFLAGS_COMPILE = "-Wno-error=calloc-transposed-args";
- };
-
doCheck = true;
# Parallel checking causes test failures
diff --git a/pkgs/development/libraries/memstream/default.nix b/pkgs/development/libraries/memstream/default.nix
deleted file mode 100644
index 7877718e6d35..000000000000
--- a/pkgs/development/libraries/memstream/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ lib, stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
- pname = "memstream";
- version = "0.1";
-
- src = fetchurl {
- url = "https://piumarta.com/software/memstream/memstream-${version}.tar.gz";
- sha256 = "0kvdb897g7nyviaz72arbqijk2g2wa61cmi3l5yh48rzr49r3a3a";
- };
-
- postPatch = ''
- substituteInPlace Makefile \
- --replace-fail 'cc' '$(CC)'
- '';
-
- dontConfigure = true;
-
- postBuild = ''
- $AR rcs libmemstream.a memstream.o
- '';
-
- doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
- checkPhase = ''
- runHook preCheck
-
- ./test | grep "This is a test of memstream"
-
- runHook postCheck
- '';
-
- installPhase = ''
- runHook preInstall
-
- install -D libmemstream.a "$out"/lib/libmemstream.a
- install -D memstream.h "$out"/include/memstream.h
-
- runHook postInstall
- '';
-
- meta = with lib; {
- homepage = "https://www.piumarta.com/software/memstream/";
- description = "memstream.c is an implementation of the POSIX function open_memstream() for BSD and BSD-like operating systems";
- license = licenses.mit;
- maintainers = with maintainers; [ veprbl ];
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/development/libraries/memstream/setup-hook.sh b/pkgs/development/libraries/memstream/setup-hook.sh
deleted file mode 100644
index 09aabe748841..000000000000
--- a/pkgs/development/libraries/memstream/setup-hook.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-useMemstream () {
- export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE-}${NIX_CFLAGS_COMPILE:+ }-include memstream.h";
- export NIX_LDFLAGS="${NIX_LDFLAGS-}${NIX_LDFLAGS:+ }-lmemstream";
-}
-
-postHooks+=(useMemstream)
diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix
index 6c349d679871..80f9c133a63d 100644
--- a/pkgs/development/libraries/mesa/common.nix
+++ b/pkgs/development/libraries/mesa/common.nix
@@ -5,14 +5,14 @@
# nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
rec {
pname = "mesa";
- version = "24.2.6";
+ version = "24.2.8";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "mesa";
repo = "mesa";
rev = "mesa-${version}";
- hash = "sha256-yoX2DvinzqrG+rekiqO/iG6F6Zn63WC+ZaathimxO1g=";
+ hash = "sha256-70X0Ba7t8l9Vs/w/3dd4UpTR7woIvd7NRwO/ph2rKu8=";
};
meta = {
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index fb5f6b1d817c..c3e5f1392757 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -201,6 +201,11 @@ in stdenv.mkDerivation {
(lib.mesonBool "osmesa" true) # used by wine
(lib.mesonBool "teflon" true) # TensorFlow frontend
+ # Enable all freedreno kernel mode drivers. (For example, virtio can be
+ # used with a virtio-gpu device supporting drm native context.) This option
+ # is ignored when freedreno is not being built.
+ (lib.mesonOption "freedreno-kmds" "msm,kgsl,virtio,wsl")
+
# Enable Intel RT stuff when available
(lib.mesonBool "install-intel-clc" true)
(lib.mesonEnable "intel-rt" stdenv.hostPlatform.isx86_64)
diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix
index 9e54ddda866f..eda3955217fe 100644
--- a/pkgs/development/libraries/nss/generic.nix
+++ b/pkgs/development/libraries/nss/generic.nix
@@ -4,6 +4,7 @@
, fetchFromGitHub
, nspr
, perl
+, installShellFiles
, zlib
, sqlite
, ninja
@@ -35,7 +36,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ];
- nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ]
+ nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) installShellFiles ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools fixDarwinDylibNames ];
buildInputs = [ zlib sqlite ];
@@ -61,7 +62,7 @@ stdenv.mkDerivation rec {
substituteInPlace coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'"
'';
- outputs = [ "out" "dev" "tools" ];
+ outputs = [ "out" "dev" "tools" "man" ];
buildPhase =
let
@@ -140,6 +141,8 @@ stdenv.mkDerivation rec {
-e "s,@MOD_PATCH_VERSION@,$NSS_PATCH_VERSION," \
pkg/pkg-config/nss-config.in > $out/bin/nss-config
chmod 0755 $out/bin/nss-config
+
+ installManPage doc/nroff/*
'';
postInstall = lib.optionalString useP11kit ''
diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix
index 58cd0245d052..9068c5f67d53 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/pkgs/development/libraries/phonon/default.nix
@@ -62,9 +62,9 @@ stdenv.mkDerivation rec {
dontWrapQtApps = true;
preConfigure = ''
- cmakeFlags+=" -DPHONON_QT_MKSPECS_INSTALL_DIR=''${!outputDev}/mkspecs"
- cmakeFlags+=" -DPHONON_QT_IMPORTS_INSTALL_DIR=''${!outputBin}/$qtQmlPrefix"
- cmakeFlags+=" -DPHONON_QT_PLUGIN_INSTALL_DIR=''${!outputBin}/$qtPluginPrefix/designer"
+ appendToVar cmakeFlags "-DPHONON_QT_MKSPECS_INSTALL_DIR=''${!outputDev}/mkspecs"
+ appendToVar cmakeFlags "-DPHONON_QT_IMPORTS_INSTALL_DIR=''${!outputBin}/$qtQmlPrefix"
+ appendToVar cmakeFlags "-DPHONON_QT_PLUGIN_INSTALL_DIR=''${!outputBin}/$qtPluginPrefix/designer"
'';
postPatch = ''
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index f8735c294a07..8ddb73bb956c 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -59,7 +59,7 @@
stdenv.mkDerivation(finalAttrs: {
pname = "pipewire";
- version = "1.2.6";
+ version = "1.2.7";
outputs = [
"out"
@@ -75,7 +75,7 @@ stdenv.mkDerivation(finalAttrs: {
owner = "pipewire";
repo = "pipewire";
rev = finalAttrs.version;
- sha256 = "sha256-AmrbA1YQBeETLC9u9rQ2f85rG9TASvcbCZ/Xlz7ICdY=";
+ sha256 = "sha256-TV+2nz44a742bUfGnWt7zJAnO15eED5kAwyAgE5CQZ0=";
};
patches = [
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 368c5a06a463..160206196d64 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -1,39 +1,47 @@
-{ lib
-, stdenv
-, fetchurl
-, fetchFromGitLab
-, fetchpatch
-, cairo
-, cmake
-, boost
-, curl
-, fontconfig
-, freetype
-, lcms
-, libiconv
-, libintl
-, libjpeg
-, ninja
-, openjpeg
-, pkg-config
-, python3
-, zlib
-, withData ? true, poppler_data
-, qt5Support ? false, qt6Support ? false, qtbase ? null
-, introspectionSupport ? false, gobject-introspection ? null
-, gpgmeSupport ? false, gpgme ? null
-, utils ? false, nss ? null
-, minimal ? false
-, suffix ? "glib"
+{
+ lib,
+ stdenv,
+ fetchurl,
+ fetchFromGitLab,
+ fetchpatch,
+ cairo,
+ cmake,
+ boost,
+ curl,
+ fontconfig,
+ freetype,
+ glib,
+ lcms,
+ libiconv,
+ libintl,
+ libjpeg,
+ ninja,
+ openjpeg,
+ pkg-config,
+ python3,
+ zlib,
+ withData ? true,
+ poppler_data,
+ qt5Support ? false,
+ qt6Support ? false,
+ qtbase ? null,
+ introspectionSupport ? false,
+ gobject-introspection ? null,
+ gpgmeSupport ? false,
+ gpgme ? null,
+ utils ? false,
+ nss ? null,
+ minimal ? false,
+ suffix ? "glib",
-# for passthru.tests
-, cups-filters
-, gdal
-, gegl
-, inkscape
-, pdfslicer
-, scribus
-, vips
+ # for passthru.tests
+ cups-filters,
+ gdal,
+ gegl,
+ inkscape,
+ pdfslicer,
+ scribus,
+ vips,
}:
let
@@ -55,7 +63,10 @@ stdenv.mkDerivation (finalAttrs: rec {
pname = "poppler-${suffix}";
version = "24.02.0"; # beware: updates often break cups-filters build, check scribus too!
- outputs = [ "out" "dev" ];
+ outputs = [
+ "out"
+ "dev"
+ ];
src = fetchurl {
url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz";
@@ -69,6 +80,14 @@ stdenv.mkDerivation (finalAttrs: rec {
url = "https://gitlab.freedesktop.org/poppler/poppler/-/commit/0554731052d1a97745cb179ab0d45620589dd9c4.patch";
hash = "sha256-I78wJ4l1DSh+x/e00ZL8uvrGdBH+ufp+EDm0A1XWyCU=";
})
+
+ (fetchpatch {
+ # fixes build on clang-19
+ # https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/1526
+ name = "char16_t-not-short.patch";
+ url = "https://gitlab.freedesktop.org/poppler/poppler/-/commit/b4ac7d9af7cb5edfcfcbda035ed8b8c218ba8564.patch";
+ hash = "sha256-2aEq3VDITJabvB/+bcdULBXbqVbDdL0xJr2TWLiWqX8=";
+ })
];
nativeBuildInputs = [
@@ -76,51 +95,62 @@ stdenv.mkDerivation (finalAttrs: rec {
ninja
pkg-config
python3
+ ] ++ lib.optionals (!minimal) [
+ glib # for glib-mkenums
];
- buildInputs = [
- boost
- libiconv
- libintl
- ] ++ lib.optionals withData [
- poppler_data
- ];
+ buildInputs =
+ [
+ boost
+ libiconv
+ libintl
+ ]
+ ++ lib.optionals withData [
+ poppler_data
+ ];
# TODO: reduce propagation to necessary libs
- propagatedBuildInputs = [
- zlib
- freetype
- fontconfig
- libjpeg
- openjpeg
- ] ++ lib.optionals (!minimal) [
- cairo
- lcms
- curl
- nss
- ] ++ lib.optionals (qt5Support || qt6Support) [
- qtbase
- ] ++ lib.optionals introspectionSupport [
- gobject-introspection
- ] ++ lib.optionals gpgmeSupport [
- gpgme
- ];
+ propagatedBuildInputs =
+ [
+ zlib
+ freetype
+ fontconfig
+ libjpeg
+ openjpeg
+ ]
+ ++ lib.optionals (!minimal) [
+ cairo
+ lcms
+ curl
+ nss
+ ]
+ ++ lib.optionals (qt5Support || qt6Support) [
+ qtbase
+ ]
+ ++ lib.optionals introspectionSupport [
+ gobject-introspection
+ ]
+ ++ lib.optionals gpgmeSupport [
+ gpgme
+ ];
- cmakeFlags = [
- (mkFlag true "UNSTABLE_API_ABI_HEADERS") # previously "XPDF_HEADERS"
- (mkFlag (!minimal) "GLIB")
- (mkFlag (!minimal) "CPP")
- (mkFlag (!minimal) "LIBCURL")
- (mkFlag (!minimal) "LCMS")
- (mkFlag (!minimal) "LIBTIFF")
- (mkFlag (!minimal) "NSS3")
- (mkFlag utils "UTILS")
- (mkFlag qt5Support "QT5")
- (mkFlag qt6Support "QT6")
- (mkFlag gpgmeSupport "GPGME")
- ] ++ lib.optionals finalAttrs.finalPackage.doCheck [
- "-DTESTDATADIR=${testData}"
- ];
+ cmakeFlags =
+ [
+ (mkFlag true "UNSTABLE_API_ABI_HEADERS") # previously "XPDF_HEADERS"
+ (mkFlag (!minimal) "GLIB")
+ (mkFlag (!minimal) "CPP")
+ (mkFlag (!minimal) "LIBCURL")
+ (mkFlag (!minimal) "LCMS")
+ (mkFlag (!minimal) "LIBTIFF")
+ (mkFlag (!minimal) "NSS3")
+ (mkFlag utils "UTILS")
+ (mkFlag qt5Support "QT5")
+ (mkFlag qt6Support "QT6")
+ (mkFlag gpgmeSupport "GPGME")
+ ]
+ ++ lib.optionals finalAttrs.finalPackage.doCheck [
+ "-DTESTDATADIR=${testData}"
+ ];
disallowedReferences = lib.optional finalAttrs.finalPackage.doCheck testData;
dontWrapQtApps = true;
@@ -151,19 +181,19 @@ stdenv.mkDerivation (finalAttrs: rec {
cups-filters
inkscape
scribus
- ;
+ ;
inherit
gegl
pdfslicer
vips
- ;
+ ;
gdal = gdal.override { usePoppler = true; };
python-poppler-qt5 = python3.pkgs.poppler-qt5;
};
};
- meta = with lib; {
+ meta = {
homepage = "https://poppler.freedesktop.org/";
changelog = "https://gitlab.freedesktop.org/poppler/poppler/-/blob/poppler-${version}/NEWS";
description = "PDF rendering library";
@@ -171,8 +201,8 @@ stdenv.mkDerivation (finalAttrs: rec {
Poppler is a PDF rendering library based on the xpdf-3.0 code base. In
addition it provides a number of tools that can be installed separately.
'';
- license = licenses.gpl2Plus;
- platforms = platforms.all;
- maintainers = with maintainers; [ ttuegel ] ++ teams.freedesktop.members;
+ license = with lib.licenses; [ gpl2Plus ];
+ platforms = lib.platforms.all;
+ maintainers = with lib.maintainers; [ ttuegel ] ++ lib.teams.freedesktop.members;
};
})
diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index b94be6d893d2..7c84a97c4d7c 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -176,6 +176,15 @@ let
# See: https://bugreports.qt.io/browse/QTBUG-124375
# Backport of: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=a766045f65f934df3b5f1aa63bc86fbb3e003a09
./qtwebengine-ninja-1.12.patch
+ # 5.15.17: Fixes 'converts to incompatible function type [-Werror,-Wcast-function-type-strict]'
+ # in chromium harfbuzz dependency. This may be removed again if harfbuzz is updated
+ # to include the upstream fixes: https://github.com/harfbuzz/harfbuzz/commit/d88269c827895b38f99f7cf741fa60210d4d5169
+ # See https://trac.macports.org/ticket/70850
+ (fetchpatch {
+ url = "https://github.com/macports/macports-ports/raw/dd7bc40d8de48c762bf9757ce0a0672840c5d8c2/aqua/qt5/files/patch-qtwebengine_hb-ft.cc_error.diff";
+ sha256 = "sha256-8/CYjGM5n2eJ6sG+ODTa8fPaxZSDVyKuInpc3IlZuyc=";
+ extraPrefix = "";
+ })
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
./qtwebengine-darwin-no-platform-check.patch
./qtwebengine-mac-dont-set-dsymutil-path.patch
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json
index 7949a05a61b8..b3284a654a8a 100644
--- a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json
+++ b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json
@@ -1,202 +1,202 @@
{
"qt3d": {
"url": "https://invent.kde.org/qt/qt/qt3d.git",
- "rev": "84b2eae328fdff5d633af0a9563272c93f6ec074",
- "sha256": "0h5jmm02xyfzq9pkba3xl3kw6710azj1plshm4v9brgjq524vkpj"
+ "rev": "1eecf07a4d5dadd1b5aaf785fc2a5ed03565599d",
+ "sha256": "0xhdw3hjas8z9qmd9l4zcfsnndyfhsmnry4nwzrbnk1kd2n5ik0s"
},
"qtactiveqt": {
"url": "https://invent.kde.org/qt/qt/qtactiveqt.git",
- "rev": "8f8e9fcc03f506cf27b0bb090c5120eaa15c6e19",
- "sha256": "10ihi1m6ysqd5mig4bmiv2hq9qs06j9xrc6sx0iy1w0ihnhclzyx"
+ "rev": "57ffe4b2b86854c60d85c263fde9a56a891b578e",
+ "sha256": "11q0nfwxlpj3n078mvhpihybyf90dfz8c24vks0x6vn0gs06rjda"
},
"qtandroidextras": {
"url": "https://invent.kde.org/qt/qt/qtandroidextras.git",
- "rev": "305cce86cb62c0d2cac1209dd50f15caf2f21c2a",
- "sha256": "1rdlxzr7ld6i0j3xwxwxhf467z46zaycynqhim4mfhi76fi309vz"
+ "rev": "abe5958ccfb1741daf37bb135aa6b90ef6c35b21",
+ "sha256": "0694mgaal3v4c8kd8spp5rw47dc1iydcydli2gsnx4rnypyf3pl2"
},
"qtbase": {
"url": "https://invent.kde.org/qt/qt/qtbase.git",
- "rev": "ab13e81917207959785ad0185a3a9974e552a7f5",
- "sha256": "0p6xymjvhwiqvyh7pn1zkglfjnmhb3c0xfb62xnsd0rbp0xaw7ws"
+ "rev": "2529f7f0c2333d437089c775c9c30f624d1fd5bc",
+ "sha256": "0sfhawlad2s24dwraha6snbdiaj8v774fxb8mq0l9ww3yjfh3kyz"
},
"qtcharts": {
"url": "https://invent.kde.org/qt/qt/qtcharts.git",
- "rev": "0c97aae7dc242ac0710e09397672ad878761157a",
- "sha256": "1zivl0gzbbfxa2hq4vwi2yc6k9hl9aln4aw96hd9jb7pw2n03crx"
+ "rev": "4e4fc559c61d1fc2542add48d2b3c490214e9936",
+ "sha256": "1fnrpj5w5ccix1p3v3kj4kdv17a7nh7hvxf8jr7c32yys3bq8igc"
},
"qtconnectivity": {
"url": "https://invent.kde.org/qt/qt/qtconnectivity.git",
- "rev": "f2a9c5d1235d88cc26f2cfa348a037b65e31a5ae",
- "sha256": "0r9c7f9g4l4dik1kvs239ahm8hx20kfj2lcd946fn71cz0fqri9z"
+ "rev": "c8a0f0b1f6dd4c63dbc015f63dc6856895e46ba3",
+ "sha256": "16c22q5ka6b3ghipl6jv51vw890zkfxrr1klldl4rwkad2m7liby"
},
"qtdatavis3d": {
"url": "https://invent.kde.org/qt/qt/qtdatavis3d.git",
- "rev": "e5c03e4431eed6c4654c20fb2d2a20485cff522d",
- "sha256": "0s6b3sclyyq6hmmn535ksdkckfw02yqbqzrd502p7fb2cakynhjc"
+ "rev": "db75c351cd0c2b93016ca489ffb9db806e6fd6e9",
+ "sha256": "14j577hs69b32b88nmy3bf3hw55rk7h3xyrlkr8l5d4rcp28xz75"
},
"qtdeclarative": {
"url": "https://invent.kde.org/qt/qt/qtdeclarative.git",
- "rev": "310c124dac82d711ab15309a9cb0b9d95db9ea8f",
- "sha256": "082hp6brizrfr90vla315kjri4ym9vkd1qnjlyx8f9p3sgdmplyn"
+ "rev": "e2b38659cb79104f157e1d0099c01e545d04d0db",
+ "sha256": "1zk8fkn9hiip458dgnj1zd7yiqy1pvshvd0wijh9hwin2zjlbiii"
},
"qtdoc": {
"url": "https://invent.kde.org/qt/qt/qtdoc.git",
- "rev": "7c8712064b1aefcf880bbc82138e96bd4909b36e",
- "sha256": "06n8mn0y0sjq2znd0k2m5slaf2rcj4p8pxwayp7pyfig3mj9qf34"
+ "rev": "47e2864f01bbaff05e97cb885ece55ccf083d8fd",
+ "sha256": "03yz37njpm1zyqjya6m3skikhynq1mlv37vf76f26ri6gq4r7sx7"
},
"qtgamepad": {
"url": "https://invent.kde.org/qt/qt/qtgamepad.git",
- "rev": "e9109dadba5c8f2419af67139106b4c30f90332e",
- "sha256": "1xk42wbpl83rywjscw0kriw4vap2xv41p17pcr8pagrhijnhhjpg"
+ "rev": "4a0bc8068728e18d0cb49cfb1c34c2931b2f05e5",
+ "sha256": "1w1n9iy5lhrakshgy7xixcw8hrwshx02b9b0x331rl56qq0yv5hi"
},
"qtgraphicaleffects": {
"url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git",
- "rev": "4d3d395d14d4a956ac5b30afa859321c1e1934e4",
- "sha256": "1xwq8n2h5079xm1zbyg7nk4ln53pmbjp0s35a6clhcx40mrw9b80"
+ "rev": "d6ef4931b295881becd2ff37b301a0115f14618e",
+ "sha256": "1x4g8hp82b0xwpsw0sv08w64mg77750wdjs7rlqr47a94ngjwpys"
},
"qtimageformats": {
"url": "https://invent.kde.org/qt/qt/qtimageformats.git",
- "rev": "9f658c2093e81d1dc3333e594cc1aa4b0990e221",
- "sha256": "13h43hc9yzskqi30yx1wi9ia4nbrgxlwk0zh4dprcwc7p8sgwz76"
+ "rev": "7b25a0435edc2602f8999bd216c4bec711ffe09e",
+ "sha256": "1s59sqg6grhmh85bnlnmhc0l90yqm50sfbwvamnrly57b6ca107j"
},
"qtlocation": {
"url": "https://invent.kde.org/qt/qt/qtlocation.git",
- "rev": "e0a477d04f35495ba6eeda8578d1311dba623270",
- "sha256": "104x4drmfxx2d599hzsigiy6m69y0b7n811wgm3wyhqmiay85jvl"
+ "rev": "6e89db9fcf76fa35c9275123c814e260610d355e",
+ "sha256": "0l909llb9p4dvckf9d7d9anz9q3h8k78blkqf0kpmja29wmzib7n"
},
"qtlottie": {
"url": "https://invent.kde.org/qt/qt/qtlottie.git",
- "rev": "bdbd77ef5529b894699fe8d01642e75230e59f24",
- "sha256": "13b4hfnvl9as1bwn2zaw3nlxkd8yg0phssnahc5hw07xm8z11vsm"
+ "rev": "f5984b138b8d1da6940d48fc1fe0e4cac068ff1c",
+ "sha256": "1d0ic5v4n5h5dymqy75fpialw9gpy0vf9arh69hayxcjcnc1ya8f"
},
"qtmacextras": {
"url": "https://invent.kde.org/qt/qt/qtmacextras.git",
- "rev": "3ffd97b730fb635e0ada0b5b6f4894a128286cb1",
- "sha256": "1fgpm2aa8wc65bq426xckkrwgb2h1c9hl9d454rgl5sl3xg4r61w"
+ "rev": "acf76f52fa9cc919303c41f763f158c94bcd5189",
+ "sha256": "1546f3nna5xlpgl9zg0r0nf36d62gbnlyj097pz46yv0g4sq4ywg"
},
"qtmultimedia": {
"url": "https://invent.kde.org/qt/qt/qtmultimedia.git",
- "rev": "85fe63b98703ced6c5568c52af77b50e6ddf1edc",
- "sha256": "129pdvhrahi2r30lfhqjvyird2pb9z58xc807wab779cqi5l2v5g"
+ "rev": "b7c7ff4ab8c0f43a03de51a76867aae691411410",
+ "sha256": "0l48ijl98cm7h28wxhncdlnj6x6zxwn37hbh45dakvh2nqihm7zh"
},
"qtnetworkauth": {
"url": "https://invent.kde.org/qt/qt/qtnetworkauth.git",
- "rev": "17d6ed940cea4ead62f4055184d4fc69bf06b789",
- "sha256": "0w5225fj5rhzz2jq8qpbaajg011j9xpxb3w83sn9zgnr39jgknl2"
+ "rev": "0ca0165f1fd036ab2d8ebee6e253cf4e05124cc9",
+ "sha256": "0ydmxw92l9gv5bbcyr4fg6cjl2yh2k72mj5p4jz5vwngvra7xxpz"
},
"qtpurchasing": {
"url": "https://invent.kde.org/qt/qt/qtpurchasing.git",
- "rev": "6922c0e403e94ac9c2336706bc3df1e2da217a1f",
- "sha256": "0jg6z309dj0lm4gdbvqiyprkrqiwr9cg9qhrni2q4dimg7ywci31"
+ "rev": "e15e0b0fd495bd708f740df754fa45917fcb3fb9",
+ "sha256": "1l9pn2d04xvlv9pa1c9gy1mgl7d295nagdjbx7yljw7kivbbz9qv"
},
"qtquick3d": {
"url": "https://invent.kde.org/qt/qt/qtquick3d.git",
- "rev": "880d7aa04f3cc331c9bc7ba4ca71d7091480ea6d",
- "sha256": "1gwsba3zkal7cjninridxvvilrh2iqc2qsrn9izha7m51li1kc7a"
+ "rev": "4db879b73a7b7546acab87bec50f9265dd1da8bd",
+ "sha256": "0xp63hjfdscys4dazc45xcw3scbxlvn39kmaxv8xglmkx7lhdsa8"
},
"qtquickcontrols": {
"url": "https://invent.kde.org/qt/qt/qtquickcontrols.git",
- "rev": "fe98f874f89abe9b96edadb812cfa9b1488679f0",
- "sha256": "1j843wfhm9xn0sd86faxg0aabdsxyjjvfrq9nfx00r7a0sb1giga"
+ "rev": "c0edbd157555ae4d87082f7e786787dabb1f9873",
+ "sha256": "034fjgjmw5qbjblihjvc2k8hzyf8ya50w6zvcbhh6mda9xmrmcrh"
},
"qtquickcontrols2": {
"url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git",
- "rev": "d0537c14e71d0959f96592b20103033b128f9c0b",
- "sha256": "123njm1ph04l7842c1q01737xfk4hfwpcdlk7pipyfvyjgpyq7bb"
+ "rev": "8f244d09b22ed68b3aefaa8e521c8d68d18cada7",
+ "sha256": "163yfpbr6cvx094p1bckcrc3yg95aysfngy68dvd89iqpdq8vcvw"
},
"qtquicktimeline": {
"url": "https://invent.kde.org/qt/qt/qtquicktimeline.git",
- "rev": "a0a95b50f2477823f9400b07e76e516555f16dc0",
- "sha256": "0kcxjgcqs7l5yvxl53a7sr7sk959r3wcwyg6w5krbk0sf9sdf48b"
+ "rev": "a5bbd4ad3997e812a18ee89973317fd04d169b0a",
+ "sha256": "14yfgzfc1s22m76nmhg9znxlqi0y57d8wnyiha2py45fpwjxkiay"
},
"qtremoteobjects": {
"url": "https://invent.kde.org/qt/qt/qtremoteobjects.git",
- "rev": "289bbabdff28b4362351f3d91abf75130c9cf666",
- "sha256": "11x172lkajaqq2d7hyd30wny5mi6hw4p78nqhj0j2gh3kpw6x06c"
+ "rev": "aa61cc683979ea1413222e64a03aae9971392e3d",
+ "sha256": "0b98j2fvgbf8cvdz58p7brr8s9cv39mjc2r4ydhmjvlacbxgk6yc"
},
"qtscxml": {
"url": "https://invent.kde.org/qt/qt/qtscxml.git",
- "rev": "02e1e963ec9492bb1620b3ac3fc6ffc2ff280778",
- "sha256": "01m13rz3df05n2c44a16l532faj3516903p1zhp0b3hlgy2jw6k9"
+ "rev": "64398dfca74a6d4c37d51b56ecfcd1d7ccb6e533",
+ "sha256": "0fb5ff3ac9ps8dqzrmlp8bbv29fhybhnl1r2nj0c0lhssznk4fgf"
},
"qtsensors": {
"url": "https://invent.kde.org/qt/qt/qtsensors.git",
- "rev": "b97c60bee7505eb3901579abc4751f35ba7b303e",
- "sha256": "0i60av9ykbsgxizw9i31mnfr87fm4kygwdmcxk4829pmscvcv91s"
+ "rev": "55398471a3b46db2727b462776c137bced1dfdd6",
+ "sha256": "00shjmijlxkwhawijnssfrsgqwqv38nc9x5icdn7zzghqlvckr70"
},
"qtserialbus": {
"url": "https://invent.kde.org/qt/qt/qtserialbus.git",
- "rev": "77dae896b13e36969fefdfa25d711e455d58597b",
- "sha256": "08yr35mzzyqianhi66bd3iaw48yynrfv6izqsp23s5bggh5arh9r"
+ "rev": "9dfba421ded501fd0016728b381df3b7166280ec",
+ "sha256": "036gcxg5icvi8bxpm9ynajd4xvbfsmj3n9vmqj1xx4rfpjrn14rf"
},
"qtserialport": {
"url": "https://invent.kde.org/qt/qt/qtserialport.git",
- "rev": "aa2ffdbd7295db9e5814070d1432a0b77c59cfce",
- "sha256": "08lqzygmb40b060g47zqfxs87s1s0946xy18c7jsqy0i6cl6wl1k"
+ "rev": "875adfdf3ca8f1059fdd3c5fd20baaa00694a2e7",
+ "sha256": "1917l4gfgwcq8pzd5gwkwc32b114rp475lc839py5q3b0jaqrrfr"
},
"qtspeech": {
"url": "https://invent.kde.org/qt/qt/qtspeech.git",
- "rev": "71574a57103f0da64ce5e4c0ac6d70141496d5e8",
- "sha256": "1kjpx8v80r9hp2ispgz2gxrhs8l09zpq09ylwc69gxqr6y7xrjj8"
+ "rev": "fe7fc4f6295f644a93157707f940072b2676902d",
+ "sha256": "0yvb1ih90rhih50s43gq184ladaw3g3jpf0rwqfpibb20pzfm4ky"
},
"qtsvg": {
"url": "https://invent.kde.org/qt/qt/qtsvg.git",
- "rev": "26fdcaff0d3d6bf6f5c847e833006577a6e8ba7d",
- "sha256": "0n4m6a6v66fdx4cyiyzaqqgyryf4n350xzxmibr7rrbzz7z8afrz"
+ "rev": "9c3d40626ddfccc87886966a59e5cd6b1b5ce739",
+ "sha256": "1kqnrfjf93n16ns3gcf0fpxkyd20swiv5sqb7gpanxds15yyx77s"
},
"qttools": {
"url": "https://invent.kde.org/qt/qt/qttools.git",
- "rev": "0378d3e541f40bc9c5433eac70d3949ddff9cfc4",
- "sha256": "0jzncvjp07gwykfxp9nrp2nbcrfpjlpy6r2cgb8wqq1pkjy0nkg4"
+ "rev": "15deb8f202b838b4dd1b2ff84e852171e8587881",
+ "sha256": "1hw3qjgkmjl3dspphgmi8nw8mphb4rfbnlrbd4wmi93jndf16p8s"
},
"qttranslations": {
"url": "https://invent.kde.org/qt/qt/qttranslations.git",
- "rev": "07ae7ea7c94225e73c8eddc9f3f89edc863e83e0",
- "sha256": "177g0iavfk5kim8wibfa5d4h23cf0kfhx7hmaz20afwf5cwxb47z"
+ "rev": "56f5bf5a27db344e62d74bd5d2d54060e4b81fa2",
+ "sha256": "095n1j8wnsfgx3q7lsl5dfhvk2z73sj9hq7dmc7mmjsfz45m5mm1"
},
"qtvirtualkeyboard": {
"url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git",
- "rev": "e62c1219caef25182ba85383834be04eefce12bf",
- "sha256": "09rhxkycz4w5k800sd88mzg8dd0gjbry4ylcj1pbhvnm6xrzw6fz"
+ "rev": "365f79ee89c6a57f205fe6c89817c51ff52ea059",
+ "sha256": "0r7lw1nhv3qhwfxmz7diyvwsszklh4z9lf52ibr7v13nyj3qp72j"
},
"qtwayland": {
"url": "https://invent.kde.org/qt/qt/qtwayland.git",
- "rev": "6b1ba1cd0e1389d13e59b94e65da8f20a89ba03f",
- "sha256": "127s7b76f7k1iha3crdv0z5gvm65g3lk97jzp7wl1afmv2vnfq7v"
+ "rev": "9340737a208b5dd4eda98eb74808951ddaef66c5",
+ "sha256": "1mai5xxnwhafn39rqbb10cc2ikj7nvqna007f5phlxvxwz7j7sdl"
},
"qtwebchannel": {
"url": "https://invent.kde.org/qt/qt/qtwebchannel.git",
- "rev": "ad85920e02049bf7ba06366046498e8366a98e8e",
- "sha256": "1z28ass00f7jm2wq5kb3rkx6q861092gvpb58ivnqn753jd95ban"
+ "rev": "b375bde968f7b9c273adfb8a89f9a6fb888f9af6",
+ "sha256": "0xi8vb8p6hdw46labni6s9j53bnmk4xayb3gq5my1n4cjaqcj0i1"
},
"qtwebglplugin": {
"url": "https://invent.kde.org/qt/qt/qtwebglplugin.git",
- "rev": "0d29f1cd46331caf1b5169eb037d573680454348",
- "sha256": "1ar4fs9c5av8zy19k05ygkzwcsv131c561z349wzxbj9j5qyzb6d"
+ "rev": "64efc679e520505be352f2b3ad662184ef265503",
+ "sha256": "1rba903s48y2f9hsqvdc2brlahqi4v50w5h799n9zkrm5p7lr21m"
},
"qtwebsockets": {
"url": "https://invent.kde.org/qt/qt/qtwebsockets.git",
- "rev": "0231c7c3a17c0320601e7766e7e701db5b9eb0dc",
- "sha256": "020lynaz4aw84y2dkc72nckhlpmv41nwfdssr1s8a27r4dk58p5a"
+ "rev": "a0c1c335b691ad5ecaddbec17a14dcb2a129a177",
+ "sha256": "08nvb7m6ckkbmc33cr4v4p07kbqilg9vdpjb4vgiyrikic5sfxcb"
},
"qtwebview": {
"url": "https://invent.kde.org/qt/qt/qtwebview.git",
- "rev": "70030514bdaf993517556209503075db15bd1c61",
- "sha256": "1cj0fqk41nb63as1br6zkwgpxxznc29hp5xlv2hnlcwc2mbfh2c4"
+ "rev": "e3de9fef1557d4a5bac4c9fe42b399df34502c9f",
+ "sha256": "1gg52n8hm06z2wrrq67n299ssf4h717f7xap4ng39yxzpzjyszm9"
},
"qtwinextras": {
"url": "https://invent.kde.org/qt/qt/qtwinextras.git",
- "rev": "e1773a917239c5b548ebd9e2ab34a687ffb949e4",
- "sha256": "1rvv9cpgfy62j1l15lz7p65g00jmy9k0gcmn5i0xlx9dgs35yw6b"
+ "rev": "56cbbfad338183d764868dd8c5a271d542280751",
+ "sha256": "1lcwl1a31kyg25ilyr5x1j39hyfkmvwjg4zbkc09lpjv1mrl730s"
},
"qtx11extras": {
"url": "https://invent.kde.org/qt/qt/qtx11extras.git",
- "rev": "ff2cc0065a3504e6043b47b1b4601fcdce62eefb",
- "sha256": "16m05j8iznjlsvp41pzm0yqfji42ryw5r6ypzy5avij0by0wdkir"
+ "rev": "0c61151bf14e5b4c74187608b6b47b9d0d6ca745",
+ "sha256": "09lkfs47b2c8ks5a1paa4gqxw0j8df1ih5z0173zvxhf4zqp53bh"
},
"qtxmlpatterns": {
"url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git",
- "rev": "330c47bab8333d6dc7d4ab838afb81f29b6a32d0",
- "sha256": "10slr93nfc53pzv94xw2h7wzcvzbgbr72yj06jvjr9q6jfv3qgkk"
+ "rev": "43996a4e543fa22b345c03ba3a1a41b1aba4b454",
+ "sha256": "0yphf7j76q47f1llvpmf1lfy51nyhis1nmn0sj9afmq4wxjvhl3q"
}
}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix
index 8de92625f8a5..715e0570fb85 100644
--- a/pkgs/development/libraries/qt-5/5.15/srcs.nix
+++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix
@@ -1,7 +1,7 @@
{ lib, fetchgit, fetchFromGitHub }:
let
- version = "5.15.15";
+ version = "5.15.16";
mk = name: args:
{
@@ -64,24 +64,24 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
};
qtscript = rec {
- version = "5.15.17";
+ version = "5.15.18";
src = fetchFromGitHub {
owner = "qt";
repo = "qtscript";
rev = "v${version}-lts";
- hash = "sha256-wXEKdu2gdlkVsWr3nb/tCBwyo9H8GPHWTUele1cP0ks=";
+ hash = "sha256-tq9dH76ArLO4avFCl8h0vCWDOPyJuV+z4geikCZM7J8=";
};
};
qtwebengine = rec {
- version = "5.15.17";
+ version = "5.15.18";
src = fetchFromGitHub {
owner = "qt";
repo = "qtwebengine";
rev = "v${version}-lts";
- hash = "sha256-1be8Y96yHYBCxQsRC/PD2X0TVWpA2/r1hvi8sBKOais=";
+ hash = "sha256-l5sE+9I5H6XLJXUoPfrq2ImTtL8TZhtun5O97AhdLO4=";
fetchSubmodules = true;
};
};
diff --git a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh
index 1b189d24d9ee..1a9b94032868 100644
--- a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh
@@ -72,7 +72,7 @@ qtEnvHostTargetHook() {
qtEnvHostTargetSeen[$1]=1
if providesQtRuntime "$1" && [ "z${!outputBin}" != "z${!outputDev}" ]
then
- propagatedBuildInputs+=" $1"
+ appendToVar propagatedBuildInputs "$1"
fi
}
envHostTargetHooks+=(qtEnvHostTargetHook)
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 49912da2b167..1ca065e94ce9 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -4,10 +4,10 @@
, coreutils, bison, flex, gdb, gperf, lndir, perl, pkg-config, python3
, which
# darwin support
-, apple-sdk_13, darwinMinVersionHook, xcbuild
+, apple-sdk_13, xcbuild
, dbus, fontconfig, freetype, glib, harfbuzz, icu, libdrm, libX11, libXcomposite
-, libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng , libxcb
+, libXcursor, libXext, libXi, libXrender, libjpeg, libpng , libxcb
, libxkbcommon, libxml2, libxslt, openssl, pcre2, sqlite, udev, xcbutil
, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm , zlib, at-spi2-core
@@ -15,6 +15,7 @@
, cups ? null, postgresql ? null
, withGtk3 ? false, dconf, gtk3
, withQttranslation ? true, qttranslations ? null
+, withLibinput ? false, libinput
# options
, libGLSupported ? !stdenv.hostPlatform.isDarwin
@@ -38,13 +39,12 @@ let
then "linux-generic-g++"
else throw "Please add a qtPlatformCross entry for ${plat.config}";
- # Per https://doc.qt.io/qt-5/macos.html#supported-versions: deployment target = 10.13, build SDK = 13.x or 14.x.
+ # Per https://doc.qt.io/qt-5/macos.html#supported-versions: build SDK = 13.x or 14.x.
# Despite advertising support for the macOS 14 SDK, the build system sets the maximum to 13 and complains
# about 14, so we just use that.
deploymentTarget = "10.13";
darwinVersionInputs = [
apple-sdk_13
- (darwinMinVersionHook deploymentTarget)
];
in
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: ({
libxml2 libxslt openssl sqlite zlib
# Text rendering
- harfbuzz icu
+ freetype harfbuzz icu
# Image formats
libjpeg libpng
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: ({
dbus glib udev
# Text rendering
- fontconfig freetype
+ fontconfig
libdrm
@@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: ({
buildInputs = [ python3 at-spi2-core ]
++ lib.optionals (!stdenv.hostPlatform.isDarwin)
(
- [ libinput ]
+ lib.optional withLibinput libinput
++ lib.optional withGtk3 gtk3
)
++ lib.optional stdenv.hostPlatform.isDarwin darwinVersionInputs
@@ -90,6 +90,7 @@ stdenv.mkDerivation (finalAttrs: ({
++ lib.optional (postgresql != null) postgresql;
nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which ]
+ ++ lib.optionals (mysqlSupport) [ libmysqlclient ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
} // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
@@ -101,6 +102,8 @@ stdenv.mkDerivation (finalAttrs: ({
propagatedNativeBuildInputs = [ lndir ];
+ strictDeps = true;
+
# libQt5Core links calls CoreFoundation APIs that call into the system ICU. Binaries linked
# against it will crash during build unless they can access `/usr/share/icu/icudtXXl.dat`.
propagatedSandboxProfile = lib.optionalString stdenv.hostPlatform.isDarwin ''
@@ -165,7 +168,7 @@ stdenv.mkDerivation (finalAttrs: ({
--replace-fail 'CONFIG += ' 'CONFIG += no_default_rpath ' \
--replace-fail \
'QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13' \
- 'QMAKE_MACOSX_DEPLOYMENT_TARGET = ${deploymentTarget}'
+ "QMAKE_MACOSX_DEPLOYMENT_TARGET = $MACOSX_DEPLOYMENT_TARGET"
'' else lib.optionalString libGLSupported ''
sed -i mkspecs/common/linux.conf \
-e "/^QMAKE_INCDIR_OPENGL/ s|$|${lib.getDev libGL}/include|" \
@@ -234,10 +237,6 @@ stdenv.mkDerivation (finalAttrs: ({
''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
] ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"''
++ lib.optional stdenv.hostPlatform.isLinux "-DUSE_X11"
- ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [
- # ignore "is only available on macOS 10.12.2 or newer" in obj-c code
- "-Wno-error=unguarded-availability"
- ]
++ lib.optionals withGtk3 [
''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"''
''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"''
@@ -327,6 +326,7 @@ stdenv.mkDerivation (finalAttrs: ({
"-system-sqlite"
''-${if mysqlSupport then "plugin" else "no"}-sql-mysql''
''-${if postgresql != null then "plugin" else "no"}-sql-psql''
+ "-system-libpng"
"-make libs"
"-make tools"
@@ -336,8 +336,6 @@ stdenv.mkDerivation (finalAttrs: ({
++ (
if stdenv.hostPlatform.isDarwin then [
"-no-fontconfig"
- "-qt-freetype"
- "-qt-libpng"
"-no-framework"
"-no-rpath"
] else [
@@ -352,14 +350,11 @@ stdenv.mkDerivation (finalAttrs: ({
"-L" "${libXrender.out}/lib"
"-I" "${libXrender.out}/include"
- "-libinput"
-
''-${lib.optionalString (cups == null) "no-"}cups''
"-dbus-linked"
"-glib"
- ] ++ [
- "-system-libpng"
] ++ lib.optional withGtk3 "-gtk"
+ ++ lib.optional withLibinput "-libinput"
++ [
"-inotify"
] ++ lib.optionals (cups != null) [
diff --git a/pkgs/development/libraries/qt-5/modules/qtlocation.nix b/pkgs/development/libraries/qt-5/modules/qtlocation.nix
index 35627af0c685..617a735baaa3 100644
--- a/pkgs/development/libraries/qt-5/modules/qtlocation.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtlocation.nix
@@ -4,6 +4,11 @@ qtModule {
pname = "qtlocation";
propagatedBuildInputs = [ qtbase qtmultimedia ];
outputs = [ "bin" "out" "dev" ];
+ # Clang 18 treats a non-const, narrowing conversion in an initializer list as an error,
+ # which results in a failure building a 3rd party dependency of qtlocation. Just suppress it.
+ env = lib.optionalAttrs (stdenv.cc.isClang && (lib.versionAtLeast (lib.getVersion stdenv.cc) "18")) {
+ NIX_CFLAGS_COMPILE = "-Wno-c++11-narrowing-const-reference";
+ };
qmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [
# boost uses std::auto_ptr which has been disabled in clang with libcxx
# This flag re-enables this feature
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index 38ad37fc0364..b5768a3da351 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -173,6 +173,10 @@ qtModule ({
"-march=westmere"
] ++ lib.optionals stdenv.cc.isClang [
"-Wno-elaborated-enum-base"
+ # 5.15.17: need to silence these two warnings
+ # https://trac.macports.org/ticket/70850
+ "-Wno-enum-constexpr-conversion"
+ "-Wno-unused-but-set-variable"
]);
} // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
NIX_CFLAGS_LINK = "-Wl,--no-warn-search-mismatch";
diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix
index 96a498c5f195..a664247dfbcd 100644
--- a/pkgs/development/libraries/qt-6/default.nix
+++ b/pkgs/development/libraries/qt-6/default.nix
@@ -56,34 +56,10 @@ let
inherit darwinVersionInputs;
};
- qtbase = callPackage ./modules/qtbase.nix {
+ qtbase = callPackage ./modules/qtbase {
withGtk3 = !stdenv.hostPlatform.isMinGW;
inherit darwinVersionInputs;
inherit (srcs.qtbase) src version;
- patches = [
- ./patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch
- ./patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch
- ./patches/0004-qtbase-qt-cmake-always-use-cmake-from-path.patch
- ./patches/0005-qtbase-find-tools-in-PATH.patch
- ./patches/0006-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch
- ./patches/0007-qtbase-allow-translations-outside-prefix.patch
- ./patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch
- ./patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-.patch
- ./patches/0010-qtbase-derive-plugin-load-path-from-PATH.patch
- # Backport patch for https://bugs.kde.org/show_bug.cgi?id=493116
- # FIXME: remove for 6.8.1
- (fetchpatch2 {
- url = "https://github.com/qt/qtbase/commit/2ea3abed0125d81ca4f3bacb9650db7314657332.patch";
- hash = "sha256-mdTdwhJtebuLUQRo+y1XUrrzgqG9G7GvPQwvrXLycJI=";
- })
-
- # Backport patch to fix plugin loading through symlinks
- # FIXME: remove for 6.8.1
- (fetchpatch2 {
- url = "https://github.com/qt/qtbase/commit/e25150ca29437ab315e3686aa801b8636e201e2a.patch";
- hash = "sha256-8WOjjffI48Vlx7gQIiOzfUtPloLys5lf06RQi1lsTys=";
- })
- ];
};
env = callPackage ./qt-env.nix { };
full = callPackage
@@ -135,7 +111,7 @@ let
qtcharts = callPackage ./modules/qtcharts.nix { };
qtconnectivity = callPackage ./modules/qtconnectivity.nix { };
qtdatavis3d = callPackage ./modules/qtdatavis3d.nix { };
- qtdeclarative = callPackage ./modules/qtdeclarative.nix { };
+ qtdeclarative = callPackage ./modules/qtdeclarative { };
qtdoc = callPackage ./modules/qtdoc.nix { };
qtgraphs = callPackage ./modules/qtgraphs.nix { };
qtgrpc = callPackage ./modules/qtgrpc.nix { };
@@ -144,7 +120,7 @@ let
qtlanguageserver = callPackage ./modules/qtlanguageserver.nix { };
qtlocation = callPackage ./modules/qtlocation.nix { };
qtlottie = callPackage ./modules/qtlottie.nix { };
- qtmultimedia = callPackage ./modules/qtmultimedia.nix {
+ qtmultimedia = callPackage ./modules/qtmultimedia {
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi;
};
qtmqtt = callPackage ./modules/qtmqtt.nix { };
@@ -162,12 +138,12 @@ let
qtremoteobjects = callPackage ./modules/qtremoteobjects.nix { };
qtsvg = callPackage ./modules/qtsvg.nix { };
qtscxml = callPackage ./modules/qtscxml.nix { };
- qttools = callPackage ./modules/qttools.nix { };
+ qttools = callPackage ./modules/qttools { };
qttranslations = callPackage ./modules/qttranslations.nix { };
qtvirtualkeyboard = callPackage ./modules/qtvirtualkeyboard.nix { };
qtwayland = callPackage ./modules/qtwayland.nix { };
qtwebchannel = callPackage ./modules/qtwebchannel.nix { };
- qtwebengine = callPackage ./modules/qtwebengine.nix {
+ qtwebengine = callPackage ./modules/qtwebengine {
inherit (darwin) autoSignDarwinBinariesHook bootstrap_cmds;
};
qtwebsockets = callPackage ./modules/qtwebsockets.nix { };
diff --git a/pkgs/development/libraries/qt-6/fetch.sh b/pkgs/development/libraries/qt-6/fetch.sh
index 8ae22eecfa05..183e6e5b2028 100644
--- a/pkgs/development/libraries/qt-6/fetch.sh
+++ b/pkgs/development/libraries/qt-6/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.qt.io/official_releases/qt/6.8/6.8.0/submodules/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/ -A '*.tar.xz' )
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 48beac0b04fa..44e48db7dad8 100644
--- a/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh
+++ b/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh
@@ -35,16 +35,18 @@ else # Only set up Qt once.
}
envBuildHostHooks+=(qmakePathHook)
- export QTTOOLSPATH=
-
- declare -Ag qttoolsPathSeen=()
+ declare -g qttoolsPathSeen=
qtToolsHook() {
- # Skip this path if we have seen it before.
- # MUST use 'if' because 'qttoolsPathSeen[$]' may be unset.
- if [ -n "${qttoolsPathSeen[$1]-}" ]; then return; fi
- qttoolsPathSeen[$1]=1
- if [ -d "$1/libexec" ]; then
- QTTOOLSPATH="${QTTOOLSPATH}${QTTOOLSPATH:+:}$1/libexec"
+ if [ -f "$1/libexec/qhelpgenerator" ]; then
+ if [[ -n "${qtToolsPathSeen:-}" && "${qttoolsPathSeen:-}" != "$1" ]]; then
+ echo >&2 "Error: detected mismatched Qt dependencies:"
+ echo >&2 " $1"
+ echo >&2 " $qttoolsPathSeen"
+ exit 1
+ fi
+
+ qttoolsPathSeen=$1
+ appendToVar cmakeFlags "-DQT_OPTIONAL_TOOLS_PATH=$1"
fi
}
addEnvHooks "$hostOffset" qtToolsHook
diff --git a/pkgs/development/libraries/qt-6/patches/0007-qtbase-allow-translations-outside-prefix.patch b/pkgs/development/libraries/qt-6/modules/qtbase/allow-translations-outside-prefix.patch
similarity index 83%
rename from pkgs/development/libraries/qt-6/patches/0007-qtbase-allow-translations-outside-prefix.patch
rename to pkgs/development/libraries/qt-6/modules/qtbase/allow-translations-outside-prefix.patch
index c7c097cce359..35e78451f186 100644
--- a/pkgs/development/libraries/qt-6/patches/0007-qtbase-allow-translations-outside-prefix.patch
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/allow-translations-outside-prefix.patch
@@ -1,5 +1,3 @@
-diff --git a/cmake/QtBuildPathsHelpers.cmake b/cmake/QtBuildPathsHelpers.cmake
-index bf28d1e9ee..08e64a2092 100644
--- a/cmake/QtBuildPathsHelpers.cmake
+++ b/cmake/QtBuildPathsHelpers.cmake
@@ -140,7 +140,7 @@ function(qt_configure_process_path name default docstring)
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
similarity index 82%
rename from pkgs/development/libraries/qt-6/modules/qtbase.nix
rename to pkgs/development/libraries/qt-6/modules/qtbase/default.nix
index 9df79ccc89be..6b6fa45e6dea 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
@@ -1,7 +1,6 @@
{ stdenv
, lib
, src
-, patches ? [ ]
, version
, bison
, flex
@@ -44,7 +43,6 @@
, libXext
, libXi
, libXrender
-, libinput
, libjpeg
, libpng
, libxcb
@@ -76,8 +74,9 @@
, libmysqlclient
, postgresql
, withGtk3 ? false
-, dconf
, gtk3
+, withLibinput ? false
+, libinput
# options
, libGLSupported ? stdenv.hostPlatform.isLinux
, libGL
@@ -163,10 +162,9 @@ stdenv.mkDerivation rec {
buildInputs = lib.optionals (lib.meta.availableOn stdenv.hostPlatform at-spi2-core) [
at-spi2-core
- ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libinput) [
- libinput
] ++ lib.optionals stdenv.hostPlatform.isDarwin darwinVersionInputs
++ lib.optional withGtk3 gtk3
+ ++ lib.optional withLibinput libinput
++ lib.optional (libmysqlclient != null && !stdenv.hostPlatform.isMinGW) libmysqlclient
++ lib.optional (postgresql != null && lib.meta.availableOn stdenv.hostPlatform postgresql) postgresql;
@@ -182,7 +180,32 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- inherit patches;
+ patches = [
+ # look for Qt plugins in directories on PATH
+ ./derive-plugin-load-path-from-PATH.patch
+
+ # allow translations to be found outside of install prefix, as is the case in our split builds
+ ./allow-translations-outside-prefix.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
+ ./qmake-fix-includedir.patch
+
+ # don't generate SBOM files by default, they don't work with our split installs anyway
+ ./no-sbom.patch
+
+ # use cmake from PATH in qt-cmake wrapper, to avoid qtbase runtime-depending on cmake
+ ./use-cmake-from-path.patch
+
+ # macdeployqt fixes
+ # get qmlimportscanner location from environment variable
+ ./find-qmlimportscanner.patch
+ # pass QML2_IMPORT_PATH from environment to qmlimportscanner
+ ./qmlimportscanner-import-path.patch
+ # don't pass qtbase's QML directory to qmlimportscanner if it's empty
+ ./skip-missing-qml-directory.patch
+ ];
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
# TODO: Verify that this catches all the occurrences?
@@ -205,8 +228,8 @@ stdenv.mkDerivation rec {
--replace-fail 'CONFIG += ' 'CONFIG += no_default_rpath '
'';
- fix_qt_builtin_paths = ../hooks/fix-qt-builtin-paths.sh;
- fix_qt_module_paths = ../hooks/fix-qt-module-paths.sh;
+ fix_qt_builtin_paths = ../../hooks/fix-qt-builtin-paths.sh;
+ fix_qt_module_paths = ../../hooks/fix-qt-module-paths.sh;
preHook = ''
. "$fix_qt_builtin_paths"
. "$fix_qt_module_paths"
@@ -253,7 +276,7 @@ stdenv.mkDerivation rec {
dontWrapQtApps = true;
- setupHook = ../hooks/qtbase-setup-hook.sh;
+ setupHook = ../../hooks/qtbase-setup-hook.sh;
meta = with lib; {
homepage = "https://www.qt.io/";
diff --git a/pkgs/development/libraries/qt-6/patches/0010-qtbase-derive-plugin-load-path-from-PATH.patch b/pkgs/development/libraries/qt-6/modules/qtbase/derive-plugin-load-path-from-PATH.patch
similarity index 66%
rename from pkgs/development/libraries/qt-6/patches/0010-qtbase-derive-plugin-load-path-from-PATH.patch
rename to pkgs/development/libraries/qt-6/modules/qtbase/derive-plugin-load-path-from-PATH.patch
index b950b7d4ac79..447d01257783 100644
--- a/pkgs/development/libraries/qt-6/patches/0010-qtbase-derive-plugin-load-path-from-PATH.patch
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/derive-plugin-load-path-from-PATH.patch
@@ -1,14 +1,3 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Milan=20P=C3=A4ssler?=
-Date: Sun, 10 May 2020 12:47:28 +0200
-Subject: [PATCH] qtbase: derive plugin load path from PATH
-
----
- src/corelib/kernel/qcoreapplication.cpp | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
-index 1ce2642cf2d..48fd91a0d7f 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -3038,6 +3038,15 @@ QStringList QCoreApplication::libraryPathsLocked()
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/find-qmlimportscanner.patch b/pkgs/development/libraries/qt-6/modules/qtbase/find-qmlimportscanner.patch
new file mode 100644
index 000000000000..bde2c940d682
--- /dev/null
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/find-qmlimportscanner.patch
@@ -0,0 +1,13 @@
+--- a/src/tools/macdeployqt/shared/shared.cpp
++++ b/src/tools/macdeployqt/shared/shared.cpp
+@@ -1280,6 +1280,10 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf
+ if (!QFile::exists(qmlImportScannerPath))
+ qmlImportScannerPath = QCoreApplication::applicationDirPath() + "/qmlimportscanner";
+
++ // Fallback: Pass qml import scanner via environment variable
++ if (!QFile::exists(qmlImportScannerPath))
++ qmlImportScannerPath = ::qgetenv("NIX_QMLIMPORTSCANNER");
++
+ // Verify that we found a qmlimportscanner binary
+ if (!QFile::exists(qmlImportScannerPath)) {
+ LogError() << "qmlimportscanner not found at" << qmlImportScannerPath;
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/no-sbom.patch b/pkgs/development/libraries/qt-6/modules/qtbase/no-sbom.patch
new file mode 100644
index 000000000000..f0822bac3ced
--- /dev/null
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/no-sbom.patch
@@ -0,0 +1,11 @@
+--- a/cmake/QtBuildOptionsHelpers.cmake
++++ b/cmake/QtBuildOptionsHelpers.cmake
+@@ -345,7 +345,7 @@ macro(qt_internal_setup_sbom)
+ qt_internal_compute_sbom_default(_qt_generate_sbom_default)
+
+ option(QT_GENERATE_SBOM "Generate SBOM documents in SPDX v2.3 tag:value format."
+- "${_qt_generate_sbom_default}")
++ OFF)
+
+ option(QT_SBOM_GENERATE_JSON
+ "Generate SBOM documents in SPDX v2.3 JSON format if dependencies are available" ON)
diff --git a/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch b/pkgs/development/libraries/qt-6/modules/qtbase/qmake-always-use-libname.patch
similarity index 87%
rename from pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch
rename to pkgs/development/libraries/qt-6/modules/qtbase/qmake-always-use-libname.patch
index 94ae308c1cfc..d1d91c39f4d7 100644
--- a/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/qmake-always-use-libname.patch
@@ -1,5 +1,3 @@
-diff --git a/cmake/QtFinishPrlFile.cmake b/cmake/QtFinishPrlFile.cmake
-index 0cef22617c..232d92bc62 100644
--- a/cmake/QtFinishPrlFile.cmake
+++ b/cmake/QtFinishPrlFile.cmake
@@ -69,9 +69,10 @@ foreach(line ${lines})
@@ -16,8 +14,6 @@ index 0cef22617c..232d92bc62 100644
endif()
endif()
else()
-diff --git a/cmake/QtGenerateLibHelpers.cmake b/cmake/QtGenerateLibHelpers.cmake
-index 96675267d2..c9d4a69497 100644
--- a/cmake/QtGenerateLibHelpers.cmake
+++ b/cmake/QtGenerateLibHelpers.cmake
@@ -82,9 +82,6 @@ function(qt_transform_absolute_library_paths_to_link_flags out_var library_path_
diff --git a/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch b/pkgs/development/libraries/qt-6/modules/qtbase/qmake-fix-includedir.patch
similarity index 57%
rename from pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch
rename to pkgs/development/libraries/qt-6/modules/qtbase/qmake-fix-includedir.patch
index f2f9425841a8..3cb9a9ce85e6 100644
--- a/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/qmake-fix-includedir.patch
@@ -1,14 +1,3 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nick Cao
-Date: Fri, 14 Apr 2023 09:34:46 +0800
-Subject: [PATCH] qtbase: qmake: fix includedir in generated pkg-config
-
----
- qmake/generators/makefile.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 482ef2e2697..49217e62cda 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -3412,8 +3412,7 @@ MakefileGenerator::writePkgConfigFile()
diff --git a/pkgs/development/libraries/qt-6/patches/0006-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch b/pkgs/development/libraries/qt-6/modules/qtbase/qmlimportscanner-import-path.patch
similarity index 64%
rename from pkgs/development/libraries/qt-6/patches/0006-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch
rename to pkgs/development/libraries/qt-6/modules/qtbase/qmlimportscanner-import-path.patch
index de4c12ef0448..e99dd5a90363 100644
--- a/pkgs/development/libraries/qt-6/patches/0006-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/qmlimportscanner-import-path.patch
@@ -1,14 +1,3 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nick Cao
-Date: Tue, 10 Oct 2023 10:12:56 -0400
-Subject: [PATCH] qtbase: pass to qmlimportscanner the QML2_IMPORT_PATH
-
----
- src/tools/macdeployqt/shared/shared.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp
-index b7ee93f6fc1..57b68627eba 100644
--- a/src/tools/macdeployqt/shared/shared.cpp
+++ b/src/tools/macdeployqt/shared/shared.cpp
@@ -1300,6 +1300,13 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf
diff --git a/pkgs/development/libraries/qt-6/patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-.patch b/pkgs/development/libraries/qt-6/modules/qtbase/skip-missing-qml-directory.patch
similarity index 53%
rename from pkgs/development/libraries/qt-6/patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-.patch
rename to pkgs/development/libraries/qt-6/modules/qtbase/skip-missing-qml-directory.patch
index 890c68a97f77..bb6257ca31d7 100644
--- a/pkgs/development/libraries/qt-6/patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-.patch
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/skip-missing-qml-directory.patch
@@ -1,18 +1,3 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nick Cao
-Date: Tue, 10 Oct 2023 10:17:00 -0400
-Subject: [PATCH] qtbase: check in the QML folder of this library does actually
- exist
-
-In a modularized installation, this folder will be the location where
-`qtbase` itself is installed, but `qtbase` does not have any QML
-code, and `qmlimportscanner` will complain that it does not exist.
----
- src/tools/macdeployqt/shared/shared.cpp | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp
-index 2b972a76c49..96c61b3824a 100644
--- a/src/tools/macdeployqt/shared/shared.cpp
+++ b/src/tools/macdeployqt/shared/shared.cpp
@@ -1300,9 +1300,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf
diff --git a/pkgs/development/libraries/qt-6/patches/0004-qtbase-qt-cmake-always-use-cmake-from-path.patch b/pkgs/development/libraries/qt-6/modules/qtbase/use-cmake-from-path.patch
similarity index 65%
rename from pkgs/development/libraries/qt-6/patches/0004-qtbase-qt-cmake-always-use-cmake-from-path.patch
rename to pkgs/development/libraries/qt-6/modules/qtbase/use-cmake-from-path.patch
index 56d19e0bb817..f439bf5d50e6 100644
--- a/pkgs/development/libraries/qt-6/patches/0004-qtbase-qt-cmake-always-use-cmake-from-path.patch
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/use-cmake-from-path.patch
@@ -1,17 +1,3 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nick Cao
-Date: Wed, 12 Apr 2023 10:13:50 +0800
-Subject: [PATCH] qtbase: qt-cmake: always use cmake from path
-
-The generated qt-cmake scripts embeds the absolute path of cmake used
-during the build of qtbase, bloating the runtime closure of qtbase.
----
- bin/qt-cmake-create.in | 7 +------
- bin/qt-cmake.in | 7 +------
- 2 files changed, 2 insertions(+), 12 deletions(-)
-
-diff --git a/bin/qt-cmake-create.in b/bin/qt-cmake-create.in
-index 7865d0fe91b..884dc4aba93 100755
--- a/bin/qt-cmake-create.in
+++ b/bin/qt-cmake-create.in
@@ -7,12 +7,7 @@ HELP_MESSAGE="Usage
diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix
deleted file mode 100644
index 42f5bfd76b88..000000000000
--- a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ qtModule
-, qtbase
-, qtlanguageserver
-, qtshadertools
-, openssl
-, stdenv
-, lib
-, pkgsBuildBuild
-, fetchpatch2
-}:
-
-qtModule {
- pname = "qtdeclarative";
-
- propagatedBuildInputs = [ qtbase qtlanguageserver qtshadertools openssl ];
- strictDeps = true;
-
- patches = [
- # prevent headaches from stale qmlcache data
- ../patches/0001-qtdeclarative-disable-qml-disk-cache.patch
- # add version specific QML import path
- ../patches/0002-qtdeclarative-also-use-versioned-qml-paths.patch
-
- # Backport patches for https://bugs.kde.org/show_bug.cgi?id=493116
- # FIXME: remove for 6.8.1
- (fetchpatch2 {
- url = "https://github.com/qt/qtdeclarative/commit/3330731d0cb221477ab3d856db032126403ae6a0.patch";
- hash = "sha256-XXXGJ7nVDpEG/6nr16L89J87tvutyc+YnQPQx9cRU+w=";
- })
- (fetchpatch2 {
- url = "https://github.com/qt/qtdeclarative/commit/2aefbca84d2f3dca2c2697f13710b6907c0c7e59.patch";
- hash = "sha256-a/BX0gpW6juJbjDRo8OleMahOC6WWqreURmYZNiGm5c=";
- })
- # Backport patch to fix Kirigami applications crashing
- # FIXME: remove for 6.8.1
- (fetchpatch2 {
- url = "https://github.com/qt/qtdeclarative/commit/0ae3697cf40bcd3ae1de20621abad17cf6c5f52d.patch";
- hash = "sha256-YuTHqHCWOsqUOATfaAZRxPSwMsFNylxoqnqCeW5kPjs=";
- })
- ];
-
- cmakeFlags = [
- "-DQt6ShaderToolsTools_DIR=${pkgsBuildBuild.qt6.qtshadertools}/lib/cmake/Qt6ShaderTools"
- # for some reason doesn't get found automatically on Darwin
- "-DPython_EXECUTABLE=${lib.getExe pkgsBuildBuild.python3}"
- ]
- # Conditional is required to prevent infinite recursion during a cross build
- ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
- "-DQt6QmlTools_DIR=${pkgsBuildBuild.qt6.qtdeclarative}/lib/cmake/Qt6QmlTools"
- ];
-}
diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
new file mode 100644
index 000000000000..196f3d782fcd
--- /dev/null
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
@@ -0,0 +1,33 @@
+{ qtModule
+, qtbase
+, qtlanguageserver
+, qtshadertools
+, openssl
+, stdenv
+, lib
+, pkgsBuildBuild
+}:
+
+qtModule {
+ pname = "qtdeclarative";
+
+ propagatedBuildInputs = [ qtbase qtlanguageserver qtshadertools openssl ];
+ strictDeps = true;
+
+ patches = [
+ # prevent headaches from stale qmlcache data
+ ./disable-disk-cache.patch
+ # add version specific QML import path
+ ./use-versioned-import-path.patch
+ ];
+
+ cmakeFlags = [
+ "-DQt6ShaderToolsTools_DIR=${pkgsBuildBuild.qt6.qtshadertools}/lib/cmake/Qt6ShaderTools"
+ # for some reason doesn't get found automatically on Darwin
+ "-DPython_EXECUTABLE=${lib.getExe pkgsBuildBuild.python3}"
+ ]
+ # Conditional is required to prevent infinite recursion during a cross build
+ ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+ "-DQt6QmlTools_DIR=${pkgsBuildBuild.qt6.qtdeclarative}/lib/cmake/Qt6QmlTools"
+ ];
+}
diff --git a/pkgs/development/libraries/qt-6/patches/0001-qtdeclarative-disable-qml-disk-cache.patch b/pkgs/development/libraries/qt-6/modules/qtdeclarative/disable-disk-cache.patch
similarity index 50%
rename from pkgs/development/libraries/qt-6/patches/0001-qtdeclarative-disable-qml-disk-cache.patch
rename to pkgs/development/libraries/qt-6/modules/qtdeclarative/disable-disk-cache.patch
index 9afcc8240ab3..2c10263bdc84 100644
--- a/pkgs/development/libraries/qt-6/patches/0001-qtdeclarative-disable-qml-disk-cache.patch
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/disable-disk-cache.patch
@@ -1,17 +1,6 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nick Cao
-Date: Tue, 10 Oct 2023 11:12:27 -0400
-Subject: [PATCH] qtdeclarative: disable qml disk cache
-
----
- src/qml/jsruntime/qv4engine.cpp | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
-index 506b920142..3cadb4fe06 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
-@@ -2202,11 +2202,7 @@ ExecutionEngine::DiskCacheOptions ExecutionEngine::diskCacheOptions() const
+@@ -2208,13 +2208,7 @@ ExecutionEngine::DiskCacheOptions ExecutionEngine::diskCacheOptions() const
{
if (forceDiskCache())
return DiskCache::Enabled;
@@ -19,7 +8,9 @@ index 506b920142..3cadb4fe06 100644
- return DiskCache::Disabled;
- static const DiskCacheOptions options = qmlGetConfigOption<
- DiskCacheOptions, transFormDiskCache>("QML_DISK_CACHE");
-- return options;
+- return hasPreview.loadAcquire()
+- ? (options & ~DiskCacheOptions(DiskCache::Aot)) // Disable AOT if preview enabled
+- : options;
+ return DiskCache::Disabled;
}
diff --git a/pkgs/development/libraries/qt-6/patches/0002-qtdeclarative-also-use-versioned-qml-paths.patch b/pkgs/development/libraries/qt-6/modules/qtdeclarative/use-versioned-import-path.patch
similarity index 52%
rename from pkgs/development/libraries/qt-6/patches/0002-qtdeclarative-also-use-versioned-qml-paths.patch
rename to pkgs/development/libraries/qt-6/modules/qtdeclarative/use-versioned-import-path.patch
index d857d7ac1bba..7efd9c9cdb70 100644
--- a/pkgs/development/libraries/qt-6/patches/0002-qtdeclarative-also-use-versioned-qml-paths.patch
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/use-versioned-import-path.patch
@@ -1,14 +1,3 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nick Cao
-Date: Wed, 7 Feb 2024 11:49:04 -0500
-Subject: [PATCH] qtdeclarative: also use versioned qml paths
-
----
- src/qml/qml/qqmlimport.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp
-index f9cc8da240..f8cb033be0 100644
--- a/src/qml/qml/qqmlimport.cpp
+++ b/src/qml/qml/qqmlimport.cpp
@@ -1520,6 +1520,7 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e)
diff --git a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix
index 80eef148701a..36fe1962983d 100644
--- a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix
@@ -5,13 +5,13 @@
qtModule rec {
pname = "qtmqtt";
- version = "6.8.0";
+ version = "6.8.1";
src = fetchFromGitHub {
owner = "qt";
repo = "qtmqtt";
rev = "v${version}";
- hash = "sha256-WvqBEq7Zv1CONMMuDHdj8/nJHoY4y7ysrqliTZHi7x8=";
+ hash = "sha256-PmIs+06DjPTbVTNfnl4N/F6sL7qa/X58AvbyCxltAMw=";
};
propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix
similarity index 88%
rename from pkgs/development/libraries/qt-6/modules/qtmultimedia.nix
rename to pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix
index ae02112475f0..49cd63224819 100644
--- a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix
@@ -36,10 +36,10 @@ qtModule {
++ lib.optionals stdenv.hostPlatform.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ];
patches = [
- ../patches/fix-qtgui-include-incorrect-case.patch
+ ./fix-qtgui-include-incorrect-case.patch
] ++ lib.optionals stdenv.hostPlatform.isMinGW [
- ../patches/qtmultimedia-windows-no-uppercase-libs.patch
- ../patches/qtmultimedia-windows-resolve-function-name.patch
+ ./windows-no-uppercase-libs.patch
+ ./windows-resolve-function-name.patch
];
cmakeFlags = [
diff --git a/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch b/pkgs/development/libraries/qt-6/modules/qtmultimedia/fix-qtgui-include-incorrect-case.patch
similarity index 70%
rename from pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch
rename to pkgs/development/libraries/qt-6/modules/qtmultimedia/fix-qtgui-include-incorrect-case.patch
index 5540ed8d77da..c67fde93498b 100644
--- a/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch
+++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia/fix-qtgui-include-incorrect-case.patch
@@ -1,5 +1,3 @@
-diff --git a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp
-index c90dabb53..12557976d 100644
--- a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp
+++ b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp
@@ -7,7 +7,7 @@
diff --git a/pkgs/development/libraries/qt-6/patches/qtmultimedia-windows-no-uppercase-libs.patch b/pkgs/development/libraries/qt-6/modules/qtmultimedia/windows-no-uppercase-libs.patch
similarity index 63%
rename from pkgs/development/libraries/qt-6/patches/qtmultimedia-windows-no-uppercase-libs.patch
rename to pkgs/development/libraries/qt-6/modules/qtmultimedia/windows-no-uppercase-libs.patch
index 05f009bacdad..06cead730f77 100644
--- a/pkgs/development/libraries/qt-6/patches/qtmultimedia-windows-no-uppercase-libs.patch
+++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia/windows-no-uppercase-libs.patch
@@ -1,5 +1,3 @@
-diff --git a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp
-index c0fbb53..3c82085 100644
--- a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp
+++ b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp
@@ -14,7 +14,7 @@
diff --git a/pkgs/development/libraries/qt-6/patches/qtmultimedia-windows-resolve-function-name.patch b/pkgs/development/libraries/qt-6/modules/qtmultimedia/windows-resolve-function-name.patch
similarity index 85%
rename from pkgs/development/libraries/qt-6/patches/qtmultimedia-windows-resolve-function-name.patch
rename to pkgs/development/libraries/qt-6/modules/qtmultimedia/windows-resolve-function-name.patch
index 681e36e0c513..56482b30652d 100644
--- a/pkgs/development/libraries/qt-6/patches/qtmultimedia-windows-resolve-function-name.patch
+++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia/windows-resolve-function-name.patch
@@ -1,5 +1,3 @@
-diff --git a/src/plugins/multimedia/ffmpeg/qwincapturablewindows.cpp b/src/plugins/multimedia/ffmpeg/qwincapturablewindows.cpp
-index aac77ae..71ffed6 100644
--- a/src/plugins/multimedia/ffmpeg/qwincapturablewindows.cpp
+++ b/src/plugins/multimedia/ffmpeg/qwincapturablewindows.cpp
@@ -42,11 +42,7 @@ static QString windowTitle(HWND hwnd) {
diff --git a/pkgs/development/libraries/qt-6/modules/qtquick3d.nix b/pkgs/development/libraries/qt-6/modules/qtquick3d.nix
index 1c84856c0c12..fc40a408f4cc 100644
--- a/pkgs/development/libraries/qt-6/modules/qtquick3d.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtquick3d.nix
@@ -2,10 +2,19 @@
, qtbase
, qtdeclarative
, openssl
+, fetchpatch
}:
qtModule {
pname = "qtquick3d";
propagatedBuildInputs = [ qtbase qtdeclarative ];
buildInputs = [ openssl ];
+ patches = [
+ # should be able to remove on next update
+ (fetchpatch {
+ name = "fix-clang-19-build.patch";
+ url = "https://github.com/qt/qtquick3d/commit/636a5558470ba0e0a4db1ca23dc72d96dfabeccf.patch";
+ hash = "sha256-xBzOoVWDWvpxbSHKWeeWY1ZVldsjoUeJqFcfpvjEWAg=";
+ })
+ ];
}
diff --git a/pkgs/development/libraries/qt-6/modules/qttools.nix b/pkgs/development/libraries/qt-6/modules/qttools/default.nix
similarity index 95%
rename from pkgs/development/libraries/qt-6/modules/qttools.nix
rename to pkgs/development/libraries/qt-6/modules/qttools/default.nix
index f13500d65464..ba7c421211fd 100644
--- a/pkgs/development/libraries/qt-6/modules/qttools.nix
+++ b/pkgs/development/libraries/qt-6/modules/qttools/default.nix
@@ -18,7 +18,7 @@ qtModule {
propagatedBuildInputs = [ qtbase qtdeclarative ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ cups ];
patches = [
- ../patches/qttools-paths.patch
+ ./paths.patch
];
env.NIX_CFLAGS_COMPILE = toString [
"-DNIX_OUTPUT_OUT=\"${placeholder "out"}\""
diff --git a/pkgs/development/libraries/qt-6/patches/qttools-paths.patch b/pkgs/development/libraries/qt-6/modules/qttools/paths.patch
similarity index 88%
rename from pkgs/development/libraries/qt-6/patches/qttools-paths.patch
rename to pkgs/development/libraries/qt-6/modules/qttools/paths.patch
index 6e7b8488fa54..ec306ecc480a 100644
--- a/pkgs/development/libraries/qt-6/patches/qttools-paths.patch
+++ b/pkgs/development/libraries/qt-6/modules/qttools/paths.patch
@@ -1,5 +1,3 @@
-diff --git a/src/linguist/shared/runqttool.cpp b/src/linguist/shared/runqttool.cpp
-index d355b9dc..94fef33f 100644
--- a/src/linguist/shared/runqttool.cpp
+++ b/src/linguist/shared/runqttool.cpp
@@ -20,9 +20,21 @@ class FMT {
diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix
index d3d55685f5fb..925a94ba6742 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix
@@ -6,6 +6,7 @@
, wayland-scanner
, pkg-config
, libdrm
+, fetchpatch2
}:
qtModule {
@@ -13,11 +14,20 @@ qtModule {
# wayland-scanner needs to be propagated as both build
# (for the wayland-scanner binary) and host (for the
# actual wayland.xml protocol definition)
- propagatedBuildInputs = [ qtbase qtdeclarative wayland-scanner ];
+ propagatedBuildInputs = [ qtbase qtdeclarative wayland wayland-scanner ];
propagatedNativeBuildInputs = [ wayland wayland-scanner ];
- buildInputs = [ wayland libdrm ];
+ buildInputs = [ libdrm ];
nativeBuildInputs = [ pkg-config ];
+ patches = [
+ # backport fix for crashes when hotplugging a graphics tablet, as recommended by upstream
+ # FIXME: remove in 6.8.2
+ (fetchpatch2 {
+ url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/24002ac6cbd01dbde4944b63c1f7c87ed2bd72b5.patch";
+ hash = "sha256-Lz4Gv6FLhFGv7dVpqqcss6/w5jsGA8SKaNeWMHT0A/A=";
+ })
+ ];
+
# Replace vendored wayland.xml with our matching version
# FIXME: remove when upstream updates past 1.23
postPatch = ''
diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
similarity index 97%
rename from pkgs/development/libraries/qt-6/modules/qtwebengine.nix
rename to pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
index c97dd0377981..8fe5a0b32ec6 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
@@ -101,12 +101,12 @@ qtModule {
# Don't assume /usr/share/X11, and also respect the XKB_CONFIG_ROOT
# environment variable, since NixOS relies on it working.
# See https://github.com/NixOS/nixpkgs/issues/226484 for more context.
- ../patches/qtwebengine-xkb-includes.patch
+ ./xkb-includes.patch
- ../patches/qtwebengine-link-pulseaudio.patch
+ ./link-pulseaudio.patch
# Override locales install path so they go to QtWebEngine's $out
- ../patches/qtwebengine-locales-path.patch
+ ./locales-path.patch
];
postPatch = ''
diff --git a/pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch b/pkgs/development/libraries/qt-6/modules/qtwebengine/link-pulseaudio.patch
similarity index 80%
rename from pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch
rename to pkgs/development/libraries/qt-6/modules/qtwebengine/link-pulseaudio.patch
index a48bb2c37eee..7ee990f45ce7 100644
--- a/pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/link-pulseaudio.patch
@@ -1,5 +1,3 @@
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index de5222645..bddb2322a 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -366,6 +366,7 @@ foreach(arch ${archs})
diff --git a/pkgs/development/libraries/qt-6/patches/qtwebengine-locales-path.patch b/pkgs/development/libraries/qt-6/modules/qtwebengine/locales-path.patch
similarity index 73%
rename from pkgs/development/libraries/qt-6/patches/qtwebengine-locales-path.patch
rename to pkgs/development/libraries/qt-6/modules/qtwebengine/locales-path.patch
index fecdb93cd547..e2bf74980878 100644
--- a/pkgs/development/libraries/qt-6/patches/qtwebengine-locales-path.patch
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/locales-path.patch
@@ -1,15 +1,3 @@
-From 6f0068359f32d1e7ebaa32650c3b608c008a1127 Mon Sep 17 00:00:00 2001
-From: Nick Cao
-Date: Tue, 10 Oct 2023 11:46:28 -0400
-Subject: [PATCH 2/2] qtwebengine: fix path to locales
-
----
- src/core/api/CMakeLists.txt | 3 ++-
- src/core/web_engine_library_info.cpp | 3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/api/CMakeLists.txt b/src/core/api/CMakeLists.txt
-index a3cb53e17..fcb6d70c5 100644
--- a/src/core/api/CMakeLists.txt
+++ b/src/core/api/CMakeLists.txt
@@ -190,7 +190,8 @@ if(QT_FEATURE_framework)
diff --git a/pkgs/development/libraries/qt-6/patches/qtwebengine-xkb-includes.patch b/pkgs/development/libraries/qt-6/modules/qtwebengine/xkb-includes.patch
similarity index 100%
rename from pkgs/development/libraries/qt-6/patches/qtwebengine-xkb-includes.patch
rename to pkgs/development/libraries/qt-6/modules/qtwebengine/xkb-includes.patch
diff --git a/pkgs/development/libraries/qt-6/patches/0005-qtbase-find-tools-in-PATH.patch b/pkgs/development/libraries/qt-6/patches/0005-qtbase-find-tools-in-PATH.patch
deleted file mode 100644
index df1b67654b61..000000000000
--- a/pkgs/development/libraries/qt-6/patches/0005-qtbase-find-tools-in-PATH.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: rewine
-Date: Wed, 29 Mar 2023 11:51:33 +0800
-Subject: [PATCH] qtbase: find tools in PATH
-
-1. find qt's tools in `QTTOOLSPATH` env
- qt assumes that all components use the same install prefix
- we can't get the real prefix for qttools when build qtbase
- we will add /libexec to `QTTOOLSPATH` in qtToolsHook
- find_path will also search in 'PATH' by default
- see `CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH`
-
-2. disable tool_dependencies_enabled
- We can guarantee the build order of qt components in nixpkgs
- tools in qttools always build before qtdoc
- qdoc_bin is not a build target now, since we find it in `QTTOOLSPATH`
----
- cmake/QtDocsHelpers.cmake | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake
-index 8b631e88ca5..922639a9985 100644
---- a/cmake/QtDocsHelpers.cmake
-+++ b/cmake/QtDocsHelpers.cmake
-@@ -72,9 +72,14 @@ function(qt_internal_add_docs)
- set(doc_tools_libexec "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_LIBEXECDIR}")
- endif()
-
-- set(qdoc_bin "${doc_tools_bin}/qdoc${CMAKE_EXECUTABLE_SUFFIX}")
-- set(qtattributionsscanner_bin "${doc_tools_libexec}/qtattributionsscanner${CMAKE_EXECUTABLE_SUFFIX}")
-- set(qhelpgenerator_bin "${doc_tools_libexec}/qhelpgenerator${CMAKE_EXECUTABLE_SUFFIX}")
-+ set(tool_dependencies_enabled FALSE)
-+
-+ find_path(qdoc_path name qdoc PATHS ENV QTTOOLSPATH)
-+ find_path(qtattributionsscanner_path name qtattributionsscanner PATHS ENV QTTOOLSPATH)
-+ find_path(qhelpgenerator_path name qhelpgenerator PATHS ENV QTTOOLSPATH)
-+ set(qdoc_bin "${qdoc_path}/qdoc${CMAKE_EXECUTABLE_SUFFIX}")
-+ set(qtattributionsscanner_bin "${qtattributionsscanner_path}/qtattributionsscanner${CMAKE_EXECUTABLE_SUFFIX}")
-+ set(qhelpgenerator_bin "${qhelpgenerator_path}/qhelpgenerator${CMAKE_EXECUTABLE_SUFFIX}")
-
- get_target_property(target_type ${target} TYPE)
- if (NOT target_type STREQUAL "INTERFACE_LIBRARY")
diff --git a/pkgs/development/libraries/qt-6/patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch b/pkgs/development/libraries/qt-6/patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch
deleted file mode 100644
index 597dd7e6550d..000000000000
--- a/pkgs/development/libraries/qt-6/patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Juan=20Pedro=20Bol=C3=ADvar=20Puente?=
-Date: Wed, 9 Aug 2023 16:16:21 +0200
-Subject: [PATCH] qtbase: find qmlimportscanner in macdeployqt via environment
-
-The qmlimportscanner tool is provided by qtdeclarative. Because of the
-modularized installation in Nix, it can not be found via the usual
-mechanisms. Also, hard-coding it like we do for Qt5 would also not
-work, as it would require making qtbase depend on qtdeclarative.
-
-Here we add an option to provide its location via the environment.
-While this means macdeployqt does not work out of the box, it provides
-a workaround for users.
----
- src/tools/macdeployqt/shared/shared.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp
-index 57b68627eba..2b972a76c49 100644
---- a/src/tools/macdeployqt/shared/shared.cpp
-+++ b/src/tools/macdeployqt/shared/shared.cpp
-@@ -1280,6 +1280,10 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf
- if (!QFile::exists(qmlImportScannerPath))
- qmlImportScannerPath = QCoreApplication::applicationDirPath() + "/qmlimportscanner";
-
-+ // Fallback: Pass qml import scanner via environment variable
-+ if (!QFile::exists(qmlImportScannerPath))
-+ qmlImportScannerPath = ::qgetenv("NIX_QMLIMPORTSCANNER");
-+
- // Verify that we found a qmlimportscanner binary
- if (!QFile::exists(qmlImportScannerPath)) {
- LogError() << "qmlimportscanner not found at" << qmlImportScannerPath;
diff --git a/pkgs/development/libraries/qt-6/srcs.nix b/pkgs/development/libraries/qt-6/srcs.nix
index 1bf3d1a649c8..cc37e20647de 100644
--- a/pkgs/development/libraries/qt-6/srcs.nix
+++ b/pkgs/development/libraries/qt-6/srcs.nix
@@ -4,315 +4,315 @@
{
qt3d = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qt3d-everywhere-src-6.8.0.tar.xz";
- sha256 = "0zbv1j0i9bla73b4v15skjballff2l0lxgrdfhdkaz232ng9249s";
- name = "qt3d-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qt3d-everywhere-src-6.8.1.tar.xz";
+ sha256 = "0dj2gh6lrcy096g0f9cyawg16c7n46lqqn3bgicr5bbv3f3hdc08";
+ name = "qt3d-everywhere-src-6.8.1.tar.xz";
};
};
qt5compat = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qt5compat-everywhere-src-6.8.0.tar.xz";
- sha256 = "0c2yhgsn63a5m0pxchmkkqfb7izllpr46srf2pndcsqbszyhb6rw";
- name = "qt5compat-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qt5compat-everywhere-src-6.8.1.tar.xz";
+ sha256 = "1z34289x0j40f3jylwz62aqqq21aqkvpz2wwibx330ydnj4c1j05";
+ name = "qt5compat-everywhere-src-6.8.1.tar.xz";
};
};
qtactiveqt = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtactiveqt-everywhere-src-6.8.0.tar.xz";
- sha256 = "0nycsn0yim01cvinfaljwmx8rllll6xw62cywqhbz61fqlsdy693";
- name = "qtactiveqt-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtactiveqt-everywhere-src-6.8.1.tar.xz";
+ sha256 = "1mwc5incb7hy33d0jskxl3yliw6jvgky8qxq9cgmplx5p7m48scj";
+ name = "qtactiveqt-everywhere-src-6.8.1.tar.xz";
};
};
qtbase = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtbase-everywhere-src-6.8.0.tar.xz";
- sha256 = "0x9wp9fd37ycpw73s03p01zi19l93xjp57vcvrrgh9xa20blib8v";
- name = "qtbase-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtbase-everywhere-src-6.8.1.tar.xz";
+ sha256 = "1bywb2nxdqdwnc68qvpaz0sq58lgw0mfl6041sy7kmrvxxi4bca0";
+ name = "qtbase-everywhere-src-6.8.1.tar.xz";
};
};
qtcharts = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtcharts-everywhere-src-6.8.0.tar.xz";
- sha256 = "0bqkbd31lxyqiw4nbwrach7hixg3q93v26di9hxb0s8s1nndl8qr";
- name = "qtcharts-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtcharts-everywhere-src-6.8.1.tar.xz";
+ sha256 = "0abxy1b42rzvg1yksbmzvdpapxdp8n37jclkv44gb3i4dvqs7pif";
+ name = "qtcharts-everywhere-src-6.8.1.tar.xz";
};
};
qtconnectivity = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtconnectivity-everywhere-src-6.8.0.tar.xz";
- sha256 = "120pq8yvm4v72800cj0mm8069fiyan036arnc74zq1vmq1ngpgmv";
- name = "qtconnectivity-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtconnectivity-everywhere-src-6.8.1.tar.xz";
+ sha256 = "0724lq45jjw223n681rnrsjxh97jn5gi8ki7i03p3412mpkldzfc";
+ name = "qtconnectivity-everywhere-src-6.8.1.tar.xz";
};
};
qtdatavis3d = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtdatavis3d-everywhere-src-6.8.0.tar.xz";
- sha256 = "1zscaf1f4dfc5v8w8bivac5hnbq4j6j70vf78b5dcy5h2dfrdwim";
- name = "qtdatavis3d-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtdatavis3d-everywhere-src-6.8.1.tar.xz";
+ sha256 = "03jba3d5arysrw1drz4a5kj2kjrb6lrwfrrhvgg3mamqdph8zrns";
+ name = "qtdatavis3d-everywhere-src-6.8.1.tar.xz";
};
};
qtdeclarative = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtdeclarative-everywhere-src-6.8.0.tar.xz";
- sha256 = "1hj4asdzkm78v0mfwyvh847j010mb43i3xx11nma66g989ms6h9v";
- name = "qtdeclarative-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtdeclarative-everywhere-src-6.8.1.tar.xz";
+ sha256 = "1z1rq2j4cwhz5wgibdb8a6xw339vs6d231b4vyqyvp3a3df5vlcm";
+ name = "qtdeclarative-everywhere-src-6.8.1.tar.xz";
};
};
qtdoc = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtdoc-everywhere-src-6.8.0.tar.xz";
- sha256 = "0mqjki77cbm14jxxh750p6h7kixkma1nsimdl97b4lslcrs3mj1x";
- name = "qtdoc-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtdoc-everywhere-src-6.8.1.tar.xz";
+ sha256 = "1ckvrpn32v20vd0m06s46vxcrhn8plq738bzahz9329rvdild9vh";
+ name = "qtdoc-everywhere-src-6.8.1.tar.xz";
};
};
qtgraphs = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtgraphs-everywhere-src-6.8.0.tar.xz";
- sha256 = "0hnb1nb8bdhjkrr3b64dk9wgkdgnrb8bxdafvizy2gsr0rd4m9ab";
- name = "qtgraphs-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtgraphs-everywhere-src-6.8.1.tar.xz";
+ sha256 = "102asm1c2pmn3xb784l74qgafkl2yp5gh3ml59jkas4kd7gf6ihy";
+ name = "qtgraphs-everywhere-src-6.8.1.tar.xz";
};
};
qtgrpc = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtgrpc-everywhere-src-6.8.0.tar.xz";
- sha256 = "0zgli0y52n5ahiahkmr1439c5vmjjv69f1x6vw4jbhc3xkp4lnvx";
- name = "qtgrpc-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtgrpc-everywhere-src-6.8.1.tar.xz";
+ sha256 = "102y1gs7r9097cvym8zds03cj8ffs8hc8mza5bsfa4mhjrq5qqdi";
+ name = "qtgrpc-everywhere-src-6.8.1.tar.xz";
};
};
qthttpserver = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qthttpserver-everywhere-src-6.8.0.tar.xz";
- sha256 = "0zvrmqdch8mgpz3xbql3qy6zivyg8f0h10h86di90p1ssb40ihw1";
- name = "qthttpserver-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qthttpserver-everywhere-src-6.8.1.tar.xz";
+ sha256 = "09qbkg1lx0rdq6bjvlw5n61q8hawg1b4cd0y9p3v2nf3vl7vk32x";
+ name = "qthttpserver-everywhere-src-6.8.1.tar.xz";
};
};
qtimageformats = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtimageformats-everywhere-src-6.8.0.tar.xz";
- sha256 = "1m55966458jf5n7hciahzw8fdix3d2cf1w96qzmziqcigdazhnsr";
- name = "qtimageformats-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtimageformats-everywhere-src-6.8.1.tar.xz";
+ sha256 = "0dyj7n8dh8fawaxgxd537ifn4ppb6qwyndiy53vmz3x9ka8c530k";
+ name = "qtimageformats-everywhere-src-6.8.1.tar.xz";
};
};
qtlanguageserver = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtlanguageserver-everywhere-src-6.8.0.tar.xz";
- sha256 = "1vsw0q0pb7dbxhpg1df0bandfy7k62l68pi063fxpld4ihn1bxzv";
- name = "qtlanguageserver-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtlanguageserver-everywhere-src-6.8.1.tar.xz";
+ sha256 = "0zkdiqy26fji2mqh827m7xap5gv0xrn5nqihibim6aj3q4v98pl6";
+ name = "qtlanguageserver-everywhere-src-6.8.1.tar.xz";
};
};
qtlocation = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtlocation-everywhere-src-6.8.0.tar.xz";
- sha256 = "181ijzpx4xav5j282w2ppa9g5wdc4z13q0r7269flrb9ngs8gi50";
- name = "qtlocation-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtlocation-everywhere-src-6.8.1.tar.xz";
+ sha256 = "1vsr9fpdsslz78fh6vb3qrqjgqip5s9amls99qfkm1xvp1gdnw4h";
+ name = "qtlocation-everywhere-src-6.8.1.tar.xz";
};
};
qtlottie = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtlottie-everywhere-src-6.8.0.tar.xz";
- sha256 = "15kw2cgxqh8mhip0838yalbpfnp4pd000sdalgxvc53bd8wycsfb";
- name = "qtlottie-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtlottie-everywhere-src-6.8.1.tar.xz";
+ sha256 = "0jhpf3hmhzr0ns4qd0zsdblxadmparmcj6n24js95pxzzk2l8hw2";
+ name = "qtlottie-everywhere-src-6.8.1.tar.xz";
};
};
qtmultimedia = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtmultimedia-everywhere-src-6.8.0.tar.xz";
- sha256 = "1kfgfcnihn0rqnjdif4n0hd8j2p9xkbfy3a2m3gsfypscajnlxi8";
- name = "qtmultimedia-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtmultimedia-everywhere-src-6.8.1.tar.xz";
+ sha256 = "0lzrfg8vscjc3n79rlb0jm8pkb4r8xsa8m9clvqbgyls9w9qgykm";
+ name = "qtmultimedia-everywhere-src-6.8.1.tar.xz";
};
};
qtnetworkauth = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtnetworkauth-everywhere-src-6.8.0.tar.xz";
- sha256 = "0j6ch2p6c2b6akg0hq7iy96v118rypz77573bf4mvcy68ijmcpdr";
- name = "qtnetworkauth-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtnetworkauth-everywhere-src-6.8.1.tar.xz";
+ sha256 = "0920qx3zw0567la4wl1fx3z4qrs3pmlvsf14hbgvnpwwjax691hi";
+ name = "qtnetworkauth-everywhere-src-6.8.1.tar.xz";
};
};
qtpositioning = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtpositioning-everywhere-src-6.8.0.tar.xz";
- sha256 = "0fgbgsg1hnwnm7bbp0j41nlpmz9g65nwj48v2c8mjiq15cz4d0gc";
- name = "qtpositioning-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtpositioning-everywhere-src-6.8.1.tar.xz";
+ sha256 = "13gpglkgacmpjikga5wsbvghnhvp7vzzizsvg2qvxm4i4liyf473";
+ name = "qtpositioning-everywhere-src-6.8.1.tar.xz";
};
};
qtquick3d = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtquick3d-everywhere-src-6.8.0.tar.xz";
- sha256 = "0gr2y030phghpniw7flr90f4kckiksq39y53dwddncysw970959y";
- name = "qtquick3d-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtquick3d-everywhere-src-6.8.1.tar.xz";
+ sha256 = "1rqcy8ds8kidccp193paklims7l1676kfskync5d9z4mdig38g9z";
+ name = "qtquick3d-everywhere-src-6.8.1.tar.xz";
};
};
qtquick3dphysics = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtquick3dphysics-everywhere-src-6.8.0.tar.xz";
- sha256 = "07wmy546hwavbpy368pyk0qgj79sqykqkcsnmv802qp7kwi5rcqk";
- name = "qtquick3dphysics-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtquick3dphysics-everywhere-src-6.8.1.tar.xz";
+ sha256 = "0vhabyblidy7wf80jl27bq25rpq5f9pys8dj9bxj40rgazdqwbk5";
+ name = "qtquick3dphysics-everywhere-src-6.8.1.tar.xz";
};
};
qtquickeffectmaker = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtquickeffectmaker-everywhere-src-6.8.0.tar.xz";
- sha256 = "1x3lijsfd8pv74sgyjc7cj9s0c2q9bf49r44aa2d0zdjs3rxg8ca";
- name = "qtquickeffectmaker-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtquickeffectmaker-everywhere-src-6.8.1.tar.xz";
+ sha256 = "1xjizd15q2pgvaikw5vjkf2chvkdrfy3c66cfar91gba6l9xykrd";
+ name = "qtquickeffectmaker-everywhere-src-6.8.1.tar.xz";
};
};
qtquicktimeline = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtquicktimeline-everywhere-src-6.8.0.tar.xz";
- sha256 = "020zv4fnx37k8nm0c462bk8r9ma7l6ivr8j7i82h6688v0ds81hi";
- name = "qtquicktimeline-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtquicktimeline-everywhere-src-6.8.1.tar.xz";
+ sha256 = "18qjzvnhx24lhfp9fv53wq3jd4w1dqrzlg7v044cwyzx4y71kg7x";
+ name = "qtquicktimeline-everywhere-src-6.8.1.tar.xz";
};
};
qtremoteobjects = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtremoteobjects-everywhere-src-6.8.0.tar.xz";
- sha256 = "123mkiak4xj05yg6sg86z1hixp8vycj0yks1fj1yk5lpdl65gpzi";
- name = "qtremoteobjects-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtremoteobjects-everywhere-src-6.8.1.tar.xz";
+ sha256 = "1y2riwh227s1krp4l96s8fy4lagmrqmc2ynxrz8p2jv10l7qgwky";
+ name = "qtremoteobjects-everywhere-src-6.8.1.tar.xz";
};
};
qtscxml = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtscxml-everywhere-src-6.8.0.tar.xz";
- sha256 = "0fxl6yc03z43x49nskm2r1wa7vq9zg6dv1hl74nipc21yi7amadv";
- name = "qtscxml-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtscxml-everywhere-src-6.8.1.tar.xz";
+ sha256 = "1mjgc49gr7fsgqm1m8h5xij7m7frs6ji5026j3dyvmmcrx26yh1g";
+ name = "qtscxml-everywhere-src-6.8.1.tar.xz";
};
};
qtsensors = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtsensors-everywhere-src-6.8.0.tar.xz";
- sha256 = "0yg6vn1yk4k962bff33pk9pjzyw3rskqcqfnadfvgyh5zb2l8dbj";
- name = "qtsensors-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtsensors-everywhere-src-6.8.1.tar.xz";
+ sha256 = "0l4p3lh5g8w2dymy7k661b4qz7kmpvv0xrw0gdj0rm2h91hrpx21";
+ name = "qtsensors-everywhere-src-6.8.1.tar.xz";
};
};
qtserialbus = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtserialbus-everywhere-src-6.8.0.tar.xz";
- sha256 = "1ynsy0xkjdp5d3rii0ch540n8cs07dzwd66cxw59gh9j92839676";
- name = "qtserialbus-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtserialbus-everywhere-src-6.8.1.tar.xz";
+ sha256 = "1nhmxm44achdagfqvzd39yjriqr1kpm9x7wfh6by4fjwxj98sy20";
+ name = "qtserialbus-everywhere-src-6.8.1.tar.xz";
};
};
qtserialport = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtserialport-everywhere-src-6.8.0.tar.xz";
- sha256 = "1hz7fynpa6z0x206g920xfk45hi74fahpcyha1f09cddrwpdfrvp";
- name = "qtserialport-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtserialport-everywhere-src-6.8.1.tar.xz";
+ sha256 = "15c3jdncjvc172sqk7nbm4z8wc6pfbnv18gfwc1v0zbdq2jp53h9";
+ name = "qtserialport-everywhere-src-6.8.1.tar.xz";
};
};
qtshadertools = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtshadertools-everywhere-src-6.8.0.tar.xz";
- sha256 = "1jy4siv6ny9wgs5bcn19z05my9q8za0wi5lyngrlndw26k4jssa4";
- name = "qtshadertools-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtshadertools-everywhere-src-6.8.1.tar.xz";
+ sha256 = "0ij8khb8k9qzmvkn1g2ks90m175syw897a2bqx1q0fj76bb0rdsm";
+ name = "qtshadertools-everywhere-src-6.8.1.tar.xz";
};
};
qtspeech = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtspeech-everywhere-src-6.8.0.tar.xz";
- sha256 = "0rb52qbwjkxlncz28rcjapi059b8px3i5haq71gm7f1pph90l8vm";
- name = "qtspeech-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtspeech-everywhere-src-6.8.1.tar.xz";
+ sha256 = "1pxcw468f003qx645xv377rm55jkbqrddl49xg6b1c2pq4vgxidh";
+ name = "qtspeech-everywhere-src-6.8.1.tar.xz";
};
};
qtsvg = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtsvg-everywhere-src-6.8.0.tar.xz";
- sha256 = "16b1ckqpfhzn9xaqbwz5gy4b0xavbpjxj4064ivq23sjbqymjyng";
- name = "qtsvg-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtsvg-everywhere-src-6.8.1.tar.xz";
+ sha256 = "1l0darn7apr142kzn4k9hm91f2dv4r27rms8gjm2ssz3jqsyf39x";
+ name = "qtsvg-everywhere-src-6.8.1.tar.xz";
};
};
qttools = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qttools-everywhere-src-6.8.0.tar.xz";
- sha256 = "1xw1k7rnm2yylbj08p9a0w2ydfcfwa50qca3dv6cc0w54vc1aca0";
- name = "qttools-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qttools-everywhere-src-6.8.1.tar.xz";
+ sha256 = "0ba37hl5pp3zpf3n9vqsq4zrm75n2i8wdaam04d6if08pq4x8hwx";
+ name = "qttools-everywhere-src-6.8.1.tar.xz";
};
};
qttranslations = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qttranslations-everywhere-src-6.8.0.tar.xz";
- sha256 = "1dkw8f3hcnmnnv0ia62i5189dcgjkpx7pkcal180rka3q9kjpgw4";
- name = "qttranslations-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qttranslations-everywhere-src-6.8.1.tar.xz";
+ sha256 = "0jjs0c1j62rlp4sv3b6lhr3xvsjw91vi1rbxh0xj8llix69n0nk3";
+ name = "qttranslations-everywhere-src-6.8.1.tar.xz";
};
};
qtvirtualkeyboard = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtvirtualkeyboard-everywhere-src-6.8.0.tar.xz";
- sha256 = "1q0cdmxm4j9w6lhm1k1ayjykknl6kmzr415qc14znr87ykbh4rcg";
- name = "qtvirtualkeyboard-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtvirtualkeyboard-everywhere-src-6.8.1.tar.xz";
+ sha256 = "0r52i57lfzy6yvjg9zhdppn1x8vhia61andnhlp77v4k82ya68hh";
+ name = "qtvirtualkeyboard-everywhere-src-6.8.1.tar.xz";
};
};
qtwayland = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtwayland-everywhere-src-6.8.0.tar.xz";
- sha256 = "02h6lak0cp87b76474ifsm78vsx0gwfc2smnzg3g3srq2rcmhmqp";
- name = "qtwayland-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtwayland-everywhere-src-6.8.1.tar.xz";
+ sha256 = "00x2xhlp3iyxvxkk9rl9wxa6lw7x727rq8sbpzw15p9d9vggn9i2";
+ name = "qtwayland-everywhere-src-6.8.1.tar.xz";
};
};
qtwebchannel = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtwebchannel-everywhere-src-6.8.0.tar.xz";
- sha256 = "1h30mzmhkbcjaj4wivway0ldrdidqyg2b79313v2m3capwjhs9fn";
- name = "qtwebchannel-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtwebchannel-everywhere-src-6.8.1.tar.xz";
+ sha256 = "0fknlmlaajrf7cmkk4wnswmr51zam0zh4id19n99wc18j5zry4vb";
+ name = "qtwebchannel-everywhere-src-6.8.1.tar.xz";
};
};
qtwebengine = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtwebengine-everywhere-src-6.8.0.tar.xz";
- sha256 = "0lklgz5i3ryl6d1ghy11rvmg9isbzvrvx007nwb4qqm89294b114";
- name = "qtwebengine-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtwebengine-everywhere-src-6.8.1.tar.xz";
+ sha256 = "1g4imqhd3rnkq5sjjiapczlj5pl3p4yvcj8fhg751kzdr0xf1a0v";
+ name = "qtwebengine-everywhere-src-6.8.1.tar.xz";
};
};
qtwebsockets = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtwebsockets-everywhere-src-6.8.0.tar.xz";
- sha256 = "0vxgbqxahay0gz5cv3fl075qw3flm3hgz1srhs4jl75p8rff0jy1";
- name = "qtwebsockets-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtwebsockets-everywhere-src-6.8.1.tar.xz";
+ sha256 = "0gqy6kgixyvpwayldjwd072i3k48pz4sca84n31d3v8bfvldmkz4";
+ name = "qtwebsockets-everywhere-src-6.8.1.tar.xz";
};
};
qtwebview = {
- version = "6.8.0";
+ version = "6.8.1";
src = fetchurl {
- url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtwebview-everywhere-src-6.8.0.tar.xz";
- sha256 = "1wvrq7lf688hqvq102kyvx7kqnixxp6w25cb6rvb2xiqb50rvf3w";
- name = "qtwebview-everywhere-src-6.8.0.tar.xz";
+ url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtwebview-everywhere-src-6.8.1.tar.xz";
+ sha256 = "08lyas1zvc2yj8h7d75yf9n6jmjm0qvvlwaqjprhdyl4kjgc0szm";
+ name = "qtwebview-everywhere-src-6.8.1.tar.xz";
};
};
}
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index df28ee6cb39b..4502b3d9f813 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -2,7 +2,7 @@
, updateAutotoolsGnuConfigScriptsHook
# for tests
-, python3Packages, sqldiff, sqlite-analyzer, tinysparql
+, python3Packages, sqldiff, sqlite-analyzer, sqlite-rsync, tinysparql
# uses readline & ncurses for a better interactive experience if set to true
, interactive ? false
@@ -16,17 +16,17 @@ in
stdenv.mkDerivation rec {
pname = "sqlite${lib.optionalString interactive "-interactive"}";
- version = "3.46.1";
+ version = "3.47.0";
# nixpkgs-update: no auto update
# NB! Make sure to update ./tools.nix src (in the same directory).
src = fetchurl {
url = "https://sqlite.org/2024/sqlite-autoconf-${archiveVersion version}.tar.gz";
- hash = "sha256-Z9P+bSaObq3crjcn/OWPzI6cU4ab3Qegxh443fKWUHE=";
+ hash = "sha256-g+shpvamSfUG34vTqrhaCPdVbO7V29jep0PqAD/DqVc=";
};
docsrc = fetchurl {
url = "https://sqlite.org/2024/sqlite-doc-${archiveVersion version}.zip";
- hash = "sha256-6WkTH5PKefvGTVdyShA1c1iBVVpSYA2+acaeq3LJ/NE=";
+ hash = "sha256-3yXJb6+4Cck7jhwlxs/XSPRJ99SmV+jBJNOO/v5Ws04=";
};
outputs = [ "bin" "dev" "man" "doc" "out" ];
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
passthru = {
tests = {
inherit (python3Packages) sqlalchemy;
- inherit sqldiff sqlite-analyzer tinysparql;
+ inherit sqldiff sqlite-analyzer sqlite-rsync tinysparql;
};
updateScript = gitUpdater {
diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix
index 863a1f668c32..8381ec78a210 100644
--- a/pkgs/development/libraries/sqlite/tools.nix
+++ b/pkgs/development/libraries/sqlite/tools.nix
@@ -4,12 +4,12 @@ let
archiveVersion = import ./archive-version.nix lib;
mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec {
inherit pname;
- version = "3.46.1";
+ version = "3.47.0";
# nixpkgs-update: no auto update
src = assert version == sqlite.version; fetchurl {
url = "https://sqlite.org/2024/sqlite-src-${archiveVersion version}.zip";
- hash = "sha256-3vP8KS657MRE9sGVDlx52EYu1eez1gX9YVLRReHVq7Q=";
+ hash = "sha256-9Zw0m+20cCA1hqa20QrbNfKv76SfkeVaZyo2oJqP7fc=";
};
nativeBuildInputs = [ unzip ];
@@ -43,4 +43,11 @@ in
homepage = "https://www.sqlite.org/sqlanalyze.html";
mainProgram = "sqlite3_analyzer";
};
+ sqlite-rsync = mkTool {
+ pname = "sqlite-rsync";
+ makeTarget = "sqlite3_rsync";
+ description = "Database remote-copy tool for SQLite";
+ homepage = "https://www.sqlite.org/rsync.html";
+ mainProgram = "sqlite3_rsync";
+ };
}
diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix
index c1f3aeb7a34a..e33d8f717955 100644
--- a/pkgs/development/libraries/tpm2-tss/default.nix
+++ b/pkgs/development/libraries/tpm2-tss/default.nix
@@ -2,7 +2,7 @@
, autoreconfHook, autoconf-archive, pkg-config, doxygen, perl
, openssl, json_c, curl, libgcrypt
, cmocka, uthash, swtpm, iproute2, procps, which
-, libuuid
+, libuuid, libtpms
}:
let
# Avoid a circular dependency on Linux systems (systemd depends on tpm2-tss,
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- openssl json_c curl libgcrypt uthash libuuid
+ openssl json_c curl libgcrypt uthash libuuid libtpms
]
# cmocka is checked in the configure script
# when unit and/or integration testing is enabled
@@ -68,12 +68,26 @@ stdenv.mkDerivation rec {
postPatch = ''
patchShebangs script
substituteInPlace src/tss2-tcti/tctildr-dl.c \
- --replace '@PREFIX@' $out/lib/
+ --replace-fail '@PREFIX@' $out/lib/
substituteInPlace ./test/unit/tctildr-dl.c \
- --replace '@PREFIX@' $out/lib/
+ --replace-fail '@PREFIX@' $out/lib/
substituteInPlace ./bootstrap \
- --replace 'git describe --tags --always --dirty' 'echo "${version}"'
- '';
+ --replace-fail 'git describe --tags --always --dirty' 'echo "${version}"'
+ for src in src/tss2-tcti/tcti-libtpms.c test/unit/tcti-libtpms.c; do
+ substituteInPlace "$src" \
+ --replace-fail '"libtpms.so"' '"${libtpms.out}/lib/libtpms.so"' \
+ --replace-fail '"libtpms.so.0"' '"${libtpms.out}/lib/libtpms.so.0"'
+ done
+ ''
+ # tcti tests rely on mocking function calls, which appears not to be supported
+ # on clang
+ + lib.optionalString stdenv.cc.isClang ''
+ sed -i '/TESTS_UNIT / {
+ /test\/unit\/tcti-swtpm/d;
+ /test\/unit\/tcti-mssim/d;
+ /test\/unit\/tcti-device/d
+ }' Makefile-test.am
+ '';
configureFlags = lib.optionals doInstallCheck [
"--enable-unit"
diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix
index 91c210814a89..ee4cae7e0d65 100644
--- a/pkgs/development/libraries/vtk/generic.nix
+++ b/pkgs/development/libraries/vtk/generic.nix
@@ -80,8 +80,13 @@ in stdenv.mkDerivation {
"-DVTK_PYTHON_VERSION:STRING=${pythonMajor}"
];
- env = lib.optionalAttrs stdenv.cc.isClang {
- NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types";
+ env = {
+ # Lots of warnings in vendored code…
+ NIX_CFLAGS_COMPILE =
+ if stdenv.cc.isClang then
+ "-Wno-error=incompatible-function-pointer-types"
+ else
+ "-Wno-error=incompatible-pointer-types";
};
postInstall = optionalString enablePython ''
diff --git a/pkgs/development/libraries/wasilibc/default.nix b/pkgs/development/libraries/wasilibc/default.nix
index c0714a78556a..82df25395f82 100644
--- a/pkgs/development/libraries/wasilibc/default.nix
+++ b/pkgs/development/libraries/wasilibc/default.nix
@@ -8,7 +8,7 @@
let
pname = "wasilibc";
- version = "21";
+ version = "22-unstable-2024-10-16";
in
stdenv.mkDerivation {
inherit pname version;
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
src = buildPackages.fetchFromGitHub {
owner = "WebAssembly";
repo = "wasi-libc";
- rev = "refs/tags/wasi-sdk-${version}";
- hash = "sha256-1LsMpO29y79twVrUsuM/JvC7hK8O6Yey4Ard/S3Mvvc=";
+ rev = "98897e29fcfc81e2b12e487e4154ac99188330c4";
+ hash = "sha256-NFKhMJj/quvN3mR7lmxzA9w46KhX92iG0rQA9qDeS8I=";
fetchSubmodules = true;
};
diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix
index 76976be200b5..24a57957a131 100644
--- a/pkgs/development/libraries/wayland/protocols.nix
+++ b/pkgs/development/libraries/wayland/protocols.nix
@@ -24,8 +24,9 @@ stdenv.mkDerivation (finalAttrs: {
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson ninja wayland-scanner ];
- nativeCheckInputs = [ python3 ];
+ nativeCheckInputs = [ python3 wayland ];
checkInputs = [ wayland ];
+ strictDeps = true;
mesonFlags = [ "-Dtests=${lib.boolToString finalAttrs.doCheck}" ];
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 153ba7901460..d64885ef2af9 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -101,14 +101,6 @@ clangStdenv.mkDerivation (finalAttrs: {
})
];
- preConfigure = lib.optionalString (clangStdenv.hostPlatform != clangStdenv.buildPlatform) ''
- # Ignore gettext in cmake_prefix_path so that find_program doesn't
- # pick up the wrong gettext. TODO: Find a better solution for
- # this, maybe make cmake not look up executables in
- # CMAKE_PREFIX_PATH.
- cmakeFlags+=" -DCMAKE_IGNORE_PATH=${lib.getBin gettext}/bin"
- '';
-
nativeBuildInputs = [
bison
cmake
diff --git a/pkgs/development/libraries/wxsqliteplus/default.nix b/pkgs/development/libraries/wxsqliteplus/default.nix
index 2d980c69cbe6..efb22df03738 100644
--- a/pkgs/development/libraries/wxsqliteplus/default.nix
+++ b/pkgs/development/libraries/wxsqliteplus/default.nix
@@ -24,9 +24,9 @@ stdenv.mkDerivation rec {
];
preBuild = ''
- sed -ie 's|all: $(LIBPREFIX)wxsqlite$(LIBEXT)|all: |g' Makefile
- sed -ie 's|wxsqliteplus$(EXEEXT): $(WXSQLITEPLUS_OBJECTS) $(LIBPREFIX)wxsqlite$(LIBEXT)|wxsqliteplus$(EXEEXT): $(WXSQLITEPLUS_OBJECTS) |g' Makefile
- sed -ie 's|-lwxsqlite |-lwxcode_${if stdenv.hostPlatform.isDarwin then "osx_cocoau_wxsqlite3-3.2.0" else "gtk3u_wxsqlite3-3.2"} |g' Makefile
+ sed -i -e 's|all: $(LIBPREFIX)wxsqlite$(LIBEXT)|all: |g' Makefile
+ sed -i -e 's|wxsqliteplus$(EXEEXT): $(WXSQLITEPLUS_OBJECTS) $(LIBPREFIX)wxsqlite$(LIBEXT)|wxsqliteplus$(EXEEXT): $(WXSQLITEPLUS_OBJECTS) |g' Makefile
+ sed -i -e 's|-lwxsqlite |-lwxcode_${if stdenv.hostPlatform.isDarwin then "osx_cocoau_wxsqlite3-3.2.0" else "gtk3u_wxsqlite3-3.2"} |g' Makefile
'';
installPhase = ''
diff --git a/pkgs/development/python-modules/a2wsgi/default.nix b/pkgs/development/python-modules/a2wsgi/default.nix
index e9a90937760d..08460911bbec 100644
--- a/pkgs/development/python-modules/a2wsgi/default.nix
+++ b/pkgs/development/python-modules/a2wsgi/default.nix
@@ -2,13 +2,12 @@
lib,
buildPythonPackage,
fetchPypi,
- asgiref,
+ baize,
httpx,
pdm-backend,
pytest-asyncio,
pytestCheckHook,
starlette,
- baize,
}:
buildPythonPackage rec {
@@ -21,20 +20,21 @@ buildPythonPackage rec {
hash = "sha256-zkYv9+HarAvFcYPG+ADwmnHCp6mN3VzeyhSePqvzM44=";
};
- nativeBuildInputs = [ pdm-backend ];
-
- nativeCheckInputs = [
- asgiref
- httpx
- pytest-asyncio
- pytestCheckHook
- ];
+ build-system = [ pdm-backend ];
dependencies = [
starlette
baize
];
+ nativeCheckInputs = [
+ baize
+ httpx
+ pytest-asyncio
+ pytestCheckHook
+ starlette
+ ];
+
meta = {
description = "Convert WSGI app to ASGI app or ASGI app to WSGI app";
homepage = "https://github.com/abersheeran/a2wsgi";
diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix
index c7de615170bb..4e15614ea378 100644
--- a/pkgs/development/python-modules/aiogram/default.nix
+++ b/pkgs/development/python-modules/aiogram/default.nix
@@ -42,6 +42,8 @@ buildPythonPackage rec {
build-system = [ hatchling ];
+ pythonRelaxDeps = [ "aiohttp" ];
+
dependencies = [
aiofiles
aiohttp
diff --git a/pkgs/development/python-modules/aiohappyeyeballs/default.nix b/pkgs/development/python-modules/aiohappyeyeballs/default.nix
index 51b923c86df6..c8e1d431eeef 100644
--- a/pkgs/development/python-modules/aiohappyeyeballs/default.nix
+++ b/pkgs/development/python-modules/aiohappyeyeballs/default.nix
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "aiohappyeyeballs";
- version = "2.4.2";
+ version = "2.4.4";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "bdraco";
repo = "aiohappyeyeballs";
rev = "refs/tags/v${version}";
- hash = "sha256-ZHxAup3Qf+ejW5Lz9ucuiWAQAwSG0Rf5giPSwk9A0ww=";
+ hash = "sha256-zf1EkS+cdCkttce2jCjRf1693AlBYkmAuLX5IysWeUs=";
};
outputs = [
diff --git a/pkgs/development/python-modules/aiohttp-zlib-ng/default.nix b/pkgs/development/python-modules/aiohttp-zlib-ng/default.nix
deleted file mode 100644
index 73ab81fa78a8..000000000000
--- a/pkgs/development/python-modules/aiohttp-zlib-ng/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
- lib,
- aiohttp,
- buildPythonPackage,
- fetchFromGitHub,
- poetry-core,
- pytestCheckHook,
- pythonOlder,
- zlib-ng,
-}:
-
-buildPythonPackage rec {
- pname = "aiohttp-zlib-ng";
- version = "0.3.2";
- pyproject = true;
-
- disabled = pythonOlder "3.8";
-
- src = fetchFromGitHub {
- owner = "bdraco";
- repo = "aiohttp-zlib-ng";
- rev = "refs/tags/v${version}";
- hash = "sha256-SiDDtadbBnw67lnqadAVSkHILB/8Sur0MfjgCbndX4o=";
- };
-
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace-fail " --cov=aiohttp_zlib_ng --cov-report=term-missing:skip-covered" ""
- '';
-
- nativeBuildInputs = [ poetry-core ];
-
- propagatedBuildInputs = [
- aiohttp
- zlib-ng
- ];
-
- nativeCheckInputs = [ pytestCheckHook ];
-
- pythonImportsCheck = [ "aiohttp_zlib_ng" ];
-
- meta = with lib; {
- description = "Enable zlib_ng on aiohttp";
- homepage = "https://github.com/bdraco/aiohttp-zlib-ng";
- changelog = "https://github.com/bdraco/aiohttp-zlib-ng/blob/${version}/CHANGELOG.md";
- license = licenses.asl20;
- maintainers = with maintainers; [ fab ];
- };
-}
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 86cb1b427734..3d681d212dfc 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -2,11 +2,10 @@
lib,
stdenv,
buildPythonPackage,
- pythonOlder,
fetchFromGitHub,
substituteAll,
- python,
isPy310,
+ isPyPy,
# build-system
cython,
@@ -17,21 +16,27 @@
# dependencies
aiohappyeyeballs,
- attrs,
- multidict,
- async-timeout,
- yarl,
- frozenlist,
aiosignal,
+ async-timeout,
+ attrs,
+ frozenlist,
+ multidict,
+ propcache,
+ yarl,
+
+ # optional dependencies
aiodns,
brotli,
+ brotlicffi,
# tests
freezegun,
gunicorn,
proxy-py,
+ pytest-codspeed,
pytest-cov-stub,
pytest-mock,
+ pytest-xdist,
pytestCheckHook,
python-on-whales,
re-assert,
@@ -40,16 +45,14 @@
buildPythonPackage rec {
pname = "aiohttp";
- version = "3.10.10";
+ version = "3.11.9";
pyproject = true;
- disabled = pythonOlder "3.8";
-
src = fetchFromGitHub {
owner = "aio-libs";
repo = "aiohttp";
rev = "refs/tags/v${version}";
- hash = "sha256-c2mnt2ZQ7d7WO7Z8eDaUo9y+v0V0JwXUa1WJI9bwGTM=";
+ hash = "sha256-3pZPiDnAlsKX5kXH9OQzhmkBZ0vD2qiy2lpKdvV2vW8=";
};
patches = [
@@ -77,28 +80,28 @@ buildPythonPackage rec {
dependencies = [
aiohappyeyeballs
- attrs
- multidict
- async-timeout
- yarl
- frozenlist
aiosignal
+ async-timeout
+ attrs
+ frozenlist
+ multidict
+ propcache
+ yarl
+ ] ++ optional-dependencies.speedups;
+
+ optional-dependencies.speedups = [
aiodns
- brotli
+ (if isPyPy then brotlicffi else brotli)
];
- postInstall = ''
- # remove source code file with reference to dev dependencies
- rm $out/${python.sitePackages}/aiohttp/_cparser.pxd{,.orig}
- '';
-
- # NOTE: pytest-xdist cannot be added because it is flaky. See https://github.com/NixOS/nixpkgs/issues/230597 for more info.
nativeCheckInputs = [
freezegun
gunicorn
proxy-py
+ pytest-codspeed
pytest-cov-stub
pytest-mock
+ pytest-xdist
pytestCheckHook
python-on-whales
re-assert
diff --git a/pkgs/development/python-modules/aiohttp/unvendor-llhttp.patch b/pkgs/development/python-modules/aiohttp/unvendor-llhttp.patch
index 49b3e9154ded..5fad9427371d 100644
--- a/pkgs/development/python-modules/aiohttp/unvendor-llhttp.patch
+++ b/pkgs/development/python-modules/aiohttp/unvendor-llhttp.patch
@@ -1,22 +1,22 @@
diff --git a/Makefile b/Makefile
-index 5769d2a1..f505dd81 100644
+index b0a3ef32..f36132c6 100644
--- a/Makefile
+++ b/Makefile
-@@ -71,7 +71,7 @@ vendor/llhttp/node_modules: vendor/llhttp/package.json
+@@ -79,7 +79,7 @@ vendor/llhttp/node_modules: vendor/llhttp/package.json
generate-llhttp: .llhttp-gen
.PHONY: cythonize
--cythonize: .install-cython $(PYXS:.pyx=.c)
-+cythonize: $(PYXS:.pyx=.c)
+-cythonize: .install-cython $(PYXS:.pyx=.c) aiohttp/_websocket/reader_c.c
++cythonize: $(PYXS:.pyx=.c) aiohttp/_websocket/reader_c.c
- .install-deps: .install-cython $(PYXS:.pyx=.c) $(call to-hash,$(CYS) $(REQS))
- @python -m pip install -r requirements/dev.txt -c requirements/constraints.txt
+ .install-deps: .install-cython $(PYXS:.pyx=.c) aiohttp/_websocket/reader_c.c $(call to-hash,$(CYS) $(REQS))
+ @python -m pip install -r requirements/dev.in -c requirements/dev.txt
diff --git a/aiohttp/_cparser.pxd b/aiohttp/_cparser.pxd
-index 165dd61d..bc6bf86d 100644
+index c2cd5a92..9184ac60 100644
--- a/aiohttp/_cparser.pxd
+++ b/aiohttp/_cparser.pxd
-@@ -10,7 +10,7 @@ from libc.stdint cimport (
- )
+@@ -1,7 +1,7 @@
+ from libc.stdint cimport int32_t, uint8_t, uint16_t, uint64_t
-cdef extern from "../vendor/llhttp/build/llhttp.h":
@@ -25,7 +25,7 @@ index 165dd61d..bc6bf86d 100644
struct llhttp__internal_s:
int32_t _index
diff --git a/setup.py b/setup.py
-index 4d59a022..d87d5b69 100644
+index 2f024e87..feebc638 100644
--- a/setup.py
+++ b/setup.py
@@ -17,13 +17,6 @@ if sys.implementation.name != "cpython":
@@ -56,5 +56,5 @@ index 4d59a022..d87d5b69 100644
+ library_dirs=["@llhttpLib@/lib"],
+ libraries=["llhttp"],
),
- Extension("aiohttp._helpers", ["aiohttp/_helpers.c"]),
Extension("aiohttp._http_writer", ["aiohttp/_http_writer.c"]),
+ Extension("aiohttp._websocket.reader_c", ["aiohttp/_websocket/reader_c.c"]),
diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix
index 5b102d463171..880f7505c28b 100644
--- a/pkgs/development/python-modules/aioresponses/default.nix
+++ b/pkgs/development/python-modules/aioresponses/default.nix
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchPypi,
+ fetchpatch2,
pythonOlder,
# build-system
@@ -18,14 +19,14 @@
buildPythonPackage rec {
pname = "aioresponses";
- version = "0.7.6";
+ version = "0.7.7";
pyproject = true;
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- hash = "sha256-95XZ29otYXdIQOfjL1Nm9FdS0a3Bt0yTYq/QFylsfuE=";
+ hash = "sha256-ZikvHVyUo8uYTzM22AZEYEKtsXNH0wifLTli3W5bpVo=";
};
nativeBuildInputs = [
@@ -43,9 +44,10 @@ buildPythonPackage rec {
];
disabledTests = [
- # Skip a test which makes requests to httpbin.org
+ # Skip tests which make requests to httpbin.org
"test_address_as_instance_of_url_combined_with_pass_through"
"test_pass_through_with_origin_params"
+ "test_pass_through_unmatched_requests"
];
meta = {
diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix
index dbdcbce06753..b4670c9cac70 100644
--- a/pkgs/development/python-modules/ase/default.nix
+++ b/pkgs/development/python-modules/ase/default.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchPypi,
+ fetchpatch2,
buildPythonPackage,
isPy27,
pythonAtLeast,
@@ -30,6 +31,16 @@ buildPythonPackage rec {
hash = "sha256-kaKqMdib2QsO/f5KfoQmTzKCiyq/yfOOZeBBrXb+yK4=";
};
+ patches = [
+ # https://gitlab.com/ase/ase/-/merge_requests/3400
+ (fetchpatch2 {
+ name = "numpy_2-compatibility.patch";
+ url = "https://gitlab.com/ase/ase/-/commit/5434193ad9dd2cb20a76b3d503fa2b50d7a8ed34.patch";
+ excludes = [ "pyproject.toml" ];
+ hash = "sha256-3hsyzYnFCrlZDT/jqJKKvj2UXjnjLU0U6PJqgOpA7CU=";
+ })
+ ];
+
build-system = [ setuptools ];
dependencies = [
diff --git a/pkgs/development/python-modules/asn1/default.nix b/pkgs/development/python-modules/asn1/default.nix
index b3591e0610e9..d76bb41da69f 100644
--- a/pkgs/development/python-modules/asn1/default.nix
+++ b/pkgs/development/python-modules/asn1/default.nix
@@ -3,7 +3,6 @@
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
- future,
pytestCheckHook,
setuptools,
}:
@@ -24,15 +23,10 @@ buildPythonPackage rec {
build-system = [ setuptools ];
- dependencies = [ future ];
+ pythonRemoveDeps = [ "enum-compat" ];
nativeCheckInputs = [ pytestCheckHook ];
- postPatch = ''
- substituteInPlace setup.py \
- --replace "enum-compat" ""
- '';
-
pytestFlagsArray = [ "tests/test_asn1.py" ];
pythonImportsCheck = [ "asn1" ];
diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix
index 5bf0ab7dfe04..a39b8a395b70 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.4"; # Check whether the version is compatible with pylint
+ version = "3.3.5"; # Check whether the version is compatible with pylint
pyproject = true;
disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "PyCQA";
repo = "astroid";
rev = "refs/tags/v${version}";
- hash = "sha256-/VpGniyKzFToDNSnnbYvpUFJjx0Rx9N7x56BJnR0lpk=";
+ hash = "sha256-IFcBb0BP0FRYCztV3FscBPTDeKrGbr23nxeibSuNRno=";
};
nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/astropy-healpix/default.nix b/pkgs/development/python-modules/astropy-healpix/default.nix
index e65d0d222285..fce3ab8e11e9 100644
--- a/pkgs/development/python-modules/astropy-healpix/default.nix
+++ b/pkgs/development/python-modules/astropy-healpix/default.nix
@@ -24,10 +24,6 @@ buildPythonPackage rec {
hash = "sha256-3l0qfsl7FnBFBmlx8loVDR5AYfBxWb4jZJY02zbnl0Y=";
};
- postPatch = ''
- substituteInPlace pyproject.toml --replace "numpy>=2.0.0rc1" "numpy"
- '';
-
nativeBuildInputs = [
astropy-extension-helpers
numpy
diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
index 8315d4454280..956d39cfdc3a 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -36,11 +36,6 @@ buildPythonPackage rec {
hash = "sha256-NhVY4rCTqZvr5p8f1H+shqGSYHpMFu05ugqACyq2DDQ=";
};
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace-fail "numpy>=2.0.0" "numpy"
- '';
-
build-system = [
astropy-extension-helpers
cython
diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/pkgs/development/python-modules/asyncpg/default.nix
index b855d952ed2d..bc993bda0d59 100644
--- a/pkgs/development/python-modules/asyncpg/default.nix
+++ b/pkgs/development/python-modules/asyncpg/default.nix
@@ -8,18 +8,19 @@
pythonOlder,
pytest-xdist,
pytestCheckHook,
+ distro,
}:
buildPythonPackage rec {
pname = "asyncpg";
- version = "0.29.0";
+ version = "0.30.0";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
- hash = "sha256-0cSeH0T/+v2aVeGpsQFZCFnYgdY56ikiUW9dnFEtNU4=";
+ hash = "sha256-xVHpkoq2cHYC9EgRgX+CujxEbgGL/h06vsyLpfPqyFE=";
};
# sandboxing issues on aarch64-darwin, see https://github.com/NixOS/nixpkgs/issues/198495
@@ -34,6 +35,7 @@ buildPythonPackage rec {
postgresql
pytest-xdist
pytestCheckHook
+ distro
];
preCheck = ''
diff --git a/pkgs/development/python-modules/audioop-lts/default.nix b/pkgs/development/python-modules/audioop-lts/default.nix
new file mode 100644
index 000000000000..b25454bf0671
--- /dev/null
+++ b/pkgs/development/python-modules/audioop-lts/default.nix
@@ -0,0 +1,43 @@
+{
+ lib,
+ buildPythonPackage,
+ pythonOlder,
+ fetchFromGitHub,
+ setuptools,
+ pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+ pname = "audioop-lts";
+ version = "0.2.1";
+ pyproject = true;
+
+ disabled = pythonOlder "3.13";
+
+ src = fetchFromGitHub {
+ owner = "AbstractUmbra";
+ repo = "audioop";
+ rev = "refs/tags/${version}";
+ hash = "sha256-tx5/dcyEfHlYRohfYW/t0UkLiZ9LJHmI8g3sC3+DGAE=";
+ };
+
+ build-system = [ setuptools ];
+
+ nativeCheckInputs = [ pytestCheckHook ];
+
+ preCheck = ''
+ rm -rf audioop
+ '';
+
+ pythonImportsCheck = [
+ "audioop"
+ ];
+
+ meta = {
+ changelog = "https://github.com/AbstractUmbra/audioop/releases/tag/${version}";
+ description = "An LTS port of Python's `audioop` module";
+ homepage = "https://github.com/AbstractUmbra/audioop";
+ license = lib.licenses.psfl;
+ maintainers = with lib.maintainers; [ hexa ];
+ };
+}
diff --git a/pkgs/development/python-modules/av/update-test-samples.bash b/pkgs/development/python-modules/av/update-test-samples.bash
index 5b0b1966d43b..0ec4bdc2479f 100755
--- a/pkgs/development/python-modules/av/update-test-samples.bash
+++ b/pkgs/development/python-modules/av/update-test-samples.bash
@@ -4,8 +4,8 @@ set -o errexit
set -o nounset
if test "$#" != 1; then
- printf >&2 'usage: update-test-samples.bash /path/to/PyAV/source\n'
- exit 2
+ printf >&2 'usage: update-test-samples.bash /path/to/PyAV/source\n'
+ exit 2
fi
pyav_source=$1
@@ -13,31 +13,31 @@ pyav_source=$1
exec > "$(dirname "$(readlink -f "$0")")/test-samples.toml"
fetch() {
- path=$1
- url=$2
- prefetch_json=$(nix store prefetch-file --json "${url}")
- sri_hash=$(jq -r .hash <<< "${prefetch_json}")
- printf '"%s" = { url = "%s", hash = "%s" }\n' "${path}" "${url}" "${sri_hash}"
+ path=$1
+ url=$2
+ prefetch_json=$(nix store prefetch-file --json "${url}")
+ sri_hash=$(jq -r .hash <<< "${prefetch_json}")
+ printf '"%s" = { url = "%s", hash = "%s" }\n' "${path}" "${url}" "${sri_hash}"
}
fetch_all() {
- function=$1
- base_path=$2
- base_url=$3
+ function=$1
+ base_path=$2
+ base_url=$3
- samples=$(
- rg \
- --only-matching \
- --no-filename \
- "\\b${function}\\([\"']([^\"']+)[\"']\\)" \
- --replace '$1' \
- "${pyav_source}"
- )
- unique_samples=$(sort -u <<< "${samples}")
+ samples=$(
+ rg \
+ --only-matching \
+ --no-filename \
+ "\\b${function}\\([\"']([^\"']+)[\"']\\)" \
+ --replace '$1' \
+ "${pyav_source}"
+ )
+ unique_samples=$(sort -u <<< "${samples}")
- while IFS= read -r sample; do
+ while IFS= read -r sample; do
fetch "${base_path}/${sample}" "${base_url}/${sample}"
- done <<< "${unique_samples}"
+ done <<< "${unique_samples}"
}
fetch_all fate_suite fate-suite "http://fate.ffmpeg.org/fate-suite"
diff --git a/pkgs/development/python-modules/baize/default.nix b/pkgs/development/python-modules/baize/default.nix
index d0fec79bc5a6..b3ac8bc5e564 100644
--- a/pkgs/development/python-modules/baize/default.nix
+++ b/pkgs/development/python-modules/baize/default.nix
@@ -1,18 +1,13 @@
{
buildPythonPackage,
+ fetchFromGitHub,
+ httpx,
lib,
- fetchPypi,
- pytestCheckHook,
pdm-pep517,
- pytest-httpx,
+ pytest-asyncio,
+ pytestCheckHook,
setuptools,
starlette,
- anyio,
- pytest-asyncio,
- pytest-tornasync,
- pytest-trio,
- pytest-twisted,
- twisted,
}:
buildPythonPackage rec {
@@ -20,9 +15,11 @@ buildPythonPackage rec {
version = "0.22.2";
pyproject = true;
- src = fetchPypi {
- inherit pname version;
- hash = "sha256-J+l8NsSTpCh7Uws+Zp45LXkLEBBurqOsOr8Iik/9smY=";
+ src = fetchFromGitHub {
+ owner = "abersheeran";
+ repo = "baize";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-vsYt1q8QEDmEXjd8dlzHr85Fz3YAjPowS+oBWYGbG1o=";
};
build-system = [
@@ -30,31 +27,29 @@ buildPythonPackage rec {
setuptools
];
- dependencies = [
+ pythonImportsCheck = [ "baize" ];
+
+ nativeCheckInputs = [
+ httpx
+ pytest-asyncio
+ pytestCheckHook
starlette
];
- nativeCheckInputs = [
- pytestCheckHook
- pytest-httpx
- anyio
- pytest-asyncio
- pytest-tornasync
- pytest-trio
- pytest-twisted
- twisted
- ];
-
disabledTests = [
- # https://github.com/abersheeran/baize/issues/67
+ # test relies on last modified date, which is set to 1970-01-01 in the sandbox
"test_files"
+ # starlette.testclient.WebSocketDenialResponse
"test_request_response"
];
meta = {
description = "Powerful and exquisite WSGI/ASGI framework/toolkit";
- maintainers = with lib.maintainers; [ bot-wxt1221 ];
- homepage = "https://baize.aber.sh/";
+ homepage = "https://github.com/abersheeran/baize";
license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [
+ dotlambda
+ bot-wxt1221
+ ];
};
}
diff --git a/pkgs/development/python-modules/baselines/default.nix b/pkgs/development/python-modules/baselines/default.nix
index fab9db7660d9..0221c57f1971 100644
--- a/pkgs/development/python-modules/baselines/default.nix
+++ b/pkgs/development/python-modules/baselines/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage {
# Needed for the atari wrapper, but the gym-atari package is not supported
# in nixos anyways. Since opencv-python is not currently packaged, we
# disable it.
- sed -ie '/opencv-python/d' setup.py
+ sed -i -e '/opencv-python/d' setup.py
'';
# fails to create a daemon, probably because of sandboxing
diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix
index 5adbde446d95..290aa1913b81 100644
--- a/pkgs/development/python-modules/bleach/default.nix
+++ b/pkgs/development/python-modules/bleach/default.nix
@@ -3,25 +3,21 @@
buildPythonPackage,
fetchPypi,
pytestCheckHook,
- six,
html5lib,
setuptools,
tinycss2,
packaging,
- pythonOlder,
webencodings,
}:
buildPythonPackage rec {
pname = "bleach";
- version = "6.1.0";
+ version = "6.2.0";
pyproject = true;
- disabled = pythonOlder "3.8";
-
src = fetchPypi {
inherit pname version;
- hash = "sha256-CjHxg3ljxB1Gu/EzG4d44TCOoHkdsDzE5zV7l89CqP4=";
+ hash = "sha256-Ej6JQRi4pZn9gNPsGm1Mx85OWIKxMXp+G6abVulfmR8=";
};
nativeBuildInputs = [ setuptools ];
@@ -30,7 +26,6 @@ buildPythonPackage rec {
html5lib
packaging
setuptools
- six
webencodings
];
diff --git a/pkgs/development/python-modules/blinker/default.nix b/pkgs/development/python-modules/blinker/default.nix
index c32e23e56a92..d338057e70a6 100644
--- a/pkgs/development/python-modules/blinker/default.nix
+++ b/pkgs/development/python-modules/blinker/default.nix
@@ -13,15 +13,15 @@
buildPythonPackage rec {
pname = "blinker";
- version = "1.8.2";
- format = "pyproject";
+ version = "1.9.0";
+ pyproject = true;
src = fetchPypi {
inherit pname version;
- hash = "sha256-j3ewnTv3x5XpaelIbznCxenDnU7gdCS+K8WU7OlkLYM=";
+ hash = "sha256-tM4iZaer7ORefMiW6Y2+vmzq1WvPgFo9IxNtFF9URb8=";
};
- nativeBuildInputs = [ flit-core ];
+ build-system = [ flit-core ];
pythonImportsCheck = [ "blinker" ];
diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix
index 26cb315a62e0..00d40e461c09 100644
--- a/pkgs/development/python-modules/blis/default.nix
+++ b/pkgs/development/python-modules/blis/default.nix
@@ -9,7 +9,7 @@
pytestCheckHook,
pythonOlder,
blis,
- numpy_2,
+ numpy_1,
gitUpdater,
}:
@@ -28,12 +28,6 @@ buildPythonPackage rec {
};
postPatch = ''
- # The commit pinning numpy to version 2 doesn't have any functional changes:
- # https://github.com/explosion/cython-blis/pull/108
- # BLIS should thus work with numpy and numpy_2.
- substituteInPlace pyproject.toml setup.py \
- --replace-fail "numpy>=2.0.0,<3.0.0" numpy
-
# See https://github.com/numpy/numpy/issues/21079
# has no functional difference as the name is only used in log output
substituteInPlace blis/benchmark.py \
@@ -62,8 +56,8 @@ buildPythonPackage rec {
passthru = {
tests = {
- numpy_2 = blis.overridePythonAttrs (old: {
- numpy = numpy_2;
+ numpy_1 = blis.overridePythonAttrs (old: {
+ numpy = numpy_1;
});
};
updateScript = gitUpdater {
diff --git a/pkgs/development/python-modules/blosc2/default.nix b/pkgs/development/python-modules/blosc2/default.nix
index f72a50eb26d3..51163f0689be 100644
--- a/pkgs/development/python-modules/blosc2/default.nix
+++ b/pkgs/development/python-modules/blosc2/default.nix
@@ -43,8 +43,6 @@ buildPythonPackage rec {
};
postPatch = ''
- substituteInPlace pyproject.toml \
- --replace-fail "numpy>=2.0.0" "numpy"
substituteInPlace requirements-runtime.txt \
--replace "pytest" ""
'';
diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix
index 79059c7d53f5..104adf729968 100644
--- a/pkgs/development/python-modules/cartopy/default.nix
+++ b/pkgs/development/python-modules/cartopy/default.nix
@@ -34,11 +34,6 @@ buildPythonPackage rec {
hash = "sha256-AckQ1WNMaafv3sRuChfUc9Iyh2fwAdTcC1xLSOWFyL0=";
};
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace-fail "numpy>=2.0.0rc1" "numpy"
- '';
-
build-system = [ setuptools-scm ];
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix
index b3bd55484b0f..8772932278e8 100644
--- a/pkgs/development/python-modules/cattrs/default.nix
+++ b/pkgs/development/python-modules/cattrs/default.nix
@@ -16,6 +16,7 @@
orjson,
pytest-xdist,
pytestCheckHook,
+ pythonAtLeast,
pythonOlder,
pyyaml,
tomlkit,
@@ -26,13 +27,11 @@
buildPythonPackage rec {
pname = "cattrs";
version = "24.1.2";
- format = "pyproject";
-
- disabled = pythonOlder "3.7";
+ pyproject = true;
src = fetchFromGitHub {
owner = "python-attrs";
- repo = pname;
+ repo = "cattrs";
rev = "refs/tags/v${version}";
hash = "sha256-LSP8a/JduK0h9GytfbN7/CjFlnGGChaa3VbbCHQ3AFE=";
};
@@ -55,12 +54,12 @@ buildPythonPackage rec {
})
];
- nativeBuildInputs = [
+ build-system = [
hatchling
hatch-vcs
];
- propagatedBuildInputs =
+ dependencies =
[ attrs ]
++ lib.optionals (pythonOlder "3.11") [
exceptiongroup
@@ -85,10 +84,10 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace pyproject.toml \
- --replace "-l --benchmark-sort=fullname --benchmark-warmup=true --benchmark-warmup-iterations=5 --benchmark-group-by=fullname" ""
+ --replace-fail "-l --benchmark-sort=fullname --benchmark-warmup=true --benchmark-warmup-iterations=5 --benchmark-group-by=fullname" ""
substituteInPlace tests/test_preconf.py \
- --replace "from orjson import dumps as orjson_dumps" "" \
- --replace "from orjson import loads as orjson_loads" ""
+ --replace-fail "from orjson import dumps as orjson_dumps" "" \
+ --replace-fail "from orjson import loads as orjson_loads" ""
'';
preCheck = ''
@@ -97,29 +96,29 @@ buildPythonPackage rec {
disabledTestPaths = [
# Don't run benchmarking tests
- "bench/test_attrs_collections.py"
- "bench/test_attrs_nested.py"
- "bench/test_attrs_primitives.py"
- "bench/test_primitives.py"
+ "bench"
];
- disabledTests = [
- # orjson is not available as it requires Rust nightly features to compile its requirements
- "test_orjson"
- # tomlkit is pinned to an older version and newer versions raise InvalidControlChar exception
- "test_tomlkit"
- # msgspec causes a segmentation fault for some reason
- "test_simple_classes"
- "test_msgspec_json_converter"
- ];
+ disabledTests =
+ [
+ # orjson is not available as it requires Rust nightly features to compile its requirements
+ "test_orjson"
+ # msgspec causes a segmentation fault for some reason
+ "test_simple_classes"
+ "test_msgspec_json_converter"
+ ]
+ ++ lib.optionals (pythonAtLeast "3.13") [
+ # https://github.com/python-attrs/cattrs/pull/543
+ "test_unstructure_deeply_nested_generics_list"
+ ];
pythonImportsCheck = [ "cattr" ];
- meta = with lib; {
+ meta = {
description = "Python custom class converters for attrs";
homepage = "https://github.com/python-attrs/cattrs";
changelog = "https://github.com/python-attrs/cattrs/blob/${src.rev}/HISTORY.md";
- license = with licenses; [ mit ];
- maintainers = with maintainers; [ fab ];
+ license = with lib.licenses; [ mit ];
+ maintainers = with lib.maintainers; [ fab ];
};
}
diff --git a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix
index 9833bed552d4..2a115f7590c8 100644
--- a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix
+++ b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
pytestFlagsArray = [
- "-o cache_dir=$(mktemp -d)"
+ "-p no:cacheprovider"
# Monitor https://github.com/certbot/certbot/issues/9606 for a solution
"-W"
diff --git a/pkgs/development/python-modules/certbot-dns-google/default.nix b/pkgs/development/python-modules/certbot-dns-google/default.nix
index 8e3f51299081..1061502b7bac 100644
--- a/pkgs/development/python-modules/certbot-dns-google/default.nix
+++ b/pkgs/development/python-modules/certbot-dns-google/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
pytestFlagsArray = [
- "-o cache_dir=$(mktemp -d)"
+ "-p no:cacheprovider"
# https://github.com/certbot/certbot/issues/9988
"-Wignore::DeprecationWarning"
];
diff --git a/pkgs/development/python-modules/certbot-dns-ovh/default.nix b/pkgs/development/python-modules/certbot-dns-ovh/default.nix
index 6e976eccb8ce..5c71ebee3d78 100644
--- a/pkgs/development/python-modules/certbot-dns-ovh/default.nix
+++ b/pkgs/development/python-modules/certbot-dns-ovh/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
pytestFlagsArray = [
- "-o cache_dir=$(mktemp -d)"
+ "-p no:cacheprovider"
# Monitor https://github.com/certbot/certbot/issues/9606 for a solution
"-W"
diff --git a/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix b/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix
index c0910bdf40f8..c870636194d2 100644
--- a/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix
+++ b/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
pytestFlagsArray = [
- "-o cache_dir=$(mktemp -d)"
+ "-p no:cacheprovider"
# Monitor https://github.com/certbot/certbot/issues/9606 for a solution
"-W"
diff --git a/pkgs/development/python-modules/certbot-dns-route53/default.nix b/pkgs/development/python-modules/certbot-dns-route53/default.nix
index 01156dd0b799..a8e3f476350c 100644
--- a/pkgs/development/python-modules/certbot-dns-route53/default.nix
+++ b/pkgs/development/python-modules/certbot-dns-route53/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
pytestFlagsArray = [
- "-o cache_dir=$(mktemp -d)"
+ "-p no:cacheprovider"
# Monitor https://github.com/certbot/certbot/issues/9606 for a solution
"-W"
diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix
index f04d2b2a793b..bf8fc8333b40 100644
--- a/pkgs/development/python-modules/certbot/default.nix
+++ b/pkgs/development/python-modules/certbot/default.nix
@@ -72,7 +72,7 @@ buildPythonPackage rec {
];
pytestFlagsArray = [
- "-o cache_dir=$(mktemp -d)"
+ "-p no:cacheprovider"
"-W"
"ignore::DeprecationWarning"
];
diff --git a/pkgs/development/python-modules/cffi/clang-pointer-substraction-warning.diff b/pkgs/development/python-modules/cffi/clang-pointer-substraction-warning.diff
deleted file mode 100644
index 75b2677e380e..000000000000
--- a/pkgs/development/python-modules/cffi/clang-pointer-substraction-warning.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -r c649a735cf82 testing/support.py
---- a/testing/support.py Thu Feb 23 05:42:01 2023 +0100
-+++ b/testing/support.py Sat May 20 21:46:56 2023 -0400
-@@ -112,6 +112,7 @@
- '-Wno-unreachable-code']
- # special things for clang
- extra_compile_args.append('-Qunused-arguments')
-+ extra_compile_args.append('-Wno-null-pointer-subtraction')
- else:
- # assume a standard gcc
- extra_compile_args = ['-Werror', '-Wall', '-Wextra', '-Wconversion',
diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix
index cd0e1c143a7f..6597dd4749d0 100644
--- a/pkgs/development/python-modules/cffi/default.nix
+++ b/pkgs/development/python-modules/cffi/default.nix
@@ -11,9 +11,6 @@
pycparser,
}:
-let
- ccVersion = lib.getVersion stdenv.cc;
-in
if isPyPy then
null
else
@@ -27,35 +24,19 @@ else
hash = "sha256-HDnGAWwyvEjdVFYZUOvWg24WcPKuRhKPZ89J54nFKCQ=";
};
- patches =
- [
- #
- # Trusts the libffi library inside of nixpkgs on Apple devices.
- #
- # Based on some analysis I did:
- #
- # https://groups.google.com/g/python-cffi/c/xU0Usa8dvhk
- #
- # I believe that libffi already contains the code from Apple's fork that is
- # deemed safe to trust in cffi.
- #
- ./darwin-use-libffi-closures.diff
- ]
- ++ lib.optionals (stdenv.cc.isClang && (ccVersion == "boot" || lib.versionAtLeast ccVersion "13")) [
- # -Wnull-pointer-subtraction is enabled with -Wextra. Suppress it to allow the following tests
- # to run and pass when cffi is built with newer versions of clang (including the bootstrap tools clang on Darwin):
- # - testing/cffi1/test_verify1.py::test_enum_usage
- # - testing/cffi1/test_verify1.py::test_named_pointer_as_argument
- ./clang-pointer-substraction-warning.diff
- ];
-
- postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
- # Remove setup.py impurities
- substituteInPlace setup.py \
- --replace "'-iwithsysroot/usr/include/ffi'" "" \
- --replace "'/usr/include/ffi'," "" \
- --replace '/usr/include/libffi' '${lib.getDev libffi}/include'
- '';
+ patches = [
+ #
+ # Trusts the libffi library inside of nixpkgs on Apple devices.
+ #
+ # Based on some analysis I did:
+ #
+ # https://groups.google.com/g/python-cffi/c/xU0Usa8dvhk
+ #
+ # I believe that libffi already contains the code from Apple's fork that is
+ # deemed safe to trust in cffi.
+ #
+ ./darwin-use-libffi-closures.diff
+ ];
nativeBuildInputs = [ pkg-config ];
@@ -72,6 +53,11 @@ else
nativeCheckInputs = [ pytestCheckHook ];
+ disabledTests = lib.optionals stdenv.hostPlatform.isFreeBSD [
+ # https://github.com/python-cffi/cffi/pull/144
+ "test_dlopen_handle"
+ ];
+
meta = with lib; {
changelog = "https://github.com/python-cffi/cffi/releases/tag/v${version}";
description = "Foreign Function Interface for Python calling C code";
diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix
index c2e85c1f238d..e6ac6d5b5220 100644
--- a/pkgs/development/python-modules/cirq-core/default.nix
+++ b/pkgs/development/python-modules/cirq-core/default.nix
@@ -31,7 +31,7 @@
buildPythonPackage rec {
pname = "cirq-core";
- version = "1.4.1";
+ version = "1.4.1-unstable-2024-09-21";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -39,8 +39,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "quantumlib";
repo = "cirq";
- rev = "refs/tags/v${version}";
- hash = "sha256-1GcRDVgYF+1igZQFlQbiWZmU1WNIJh4CcOftQe6OP6I=";
+ rev = "3fefe2984a1203c0bf647c1ea84f4882b05f8477";
+ hash = "sha256-/WDKVxNJ8pewTLAFTyAZ/nnYcJSLubEJcn7qoJslZ3U=";
};
sourceRoot = "${src.name}/${pname}";
diff --git a/pkgs/development/python-modules/coloredlogs/default.nix b/pkgs/development/python-modules/coloredlogs/default.nix
index 182c5c370624..c3852dc4ad07 100644
--- a/pkgs/development/python-modules/coloredlogs/default.nix
+++ b/pkgs/development/python-modules/coloredlogs/default.nix
@@ -3,6 +3,8 @@
stdenv,
buildPythonPackage,
fetchFromGitHub,
+ fetchpatch2,
+ setuptools,
humanfriendly,
verboselogs,
capturer,
@@ -14,7 +16,7 @@
buildPythonPackage rec {
pname = "coloredlogs";
version = "15.0.1";
- format = "setuptools";
+ pyproject = true;
src = fetchFromGitHub {
owner = "xolox";
@@ -23,7 +25,18 @@ buildPythonPackage rec {
hash = "sha256-TodI2Wh8M0qMM2K5jzqlLmUKILa5+5qq4ByLttmAA7E=";
};
- propagatedBuildInputs = [ humanfriendly ];
+ patches = [
+ # https://github.com/xolox/python-coloredlogs/pull/120
+ (fetchpatch2 {
+ name = "python313-compat.patch";
+ url = "https://github.com/xolox/python-coloredlogs/commit/9d4f4020897fcf48d381de8e099dc29b53fc9531.patch?full_index=1";
+ hash = "sha256-Z7MYzyoQBMLBS7c0r5zITuHpl5yn4Vg7Xf/CiG7jTSs=";
+ })
+ ];
+
+ build-system = [ setuptools ];
+
+ dependencies = [ humanfriendly ];
nativeCheckInputs = [
pytestCheckHook
diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix
index 8dfb12cf5f84..f352096610cf 100644
--- a/pkgs/development/python-modules/colorlog/default.nix
+++ b/pkgs/development/python-modules/colorlog/default.nix
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchPypi,
+ fetchpatch2,
setuptools,
pytestCheckHook,
}:
@@ -16,6 +17,15 @@ buildPythonPackage rec {
hash = "sha256-Pj4HmkH+taG2T5eLXqT0YECpTxHw6Lu4Jh49u+ymTUQ=";
};
+ patches = [
+ (fetchpatch2 {
+ name = "python313-compat.patch";
+ url = "https://github.com/borntyping/python-colorlog/commit/607485def2d60b60c40c0d682574324b47fc30ba.patch";
+ hash = "sha256-oO0efAOq7XIwt40Nq5pn2eXen1+p5FiUMDihn8fYAFg=";
+ includes = [ "colorlog/wrappers.py" ];
+ })
+ ];
+
nativeBuildInputs = [ setuptools ];
pythonImportsCheck = [ "colorlog" ];
diff --git a/pkgs/development/python-modules/commonmark/default.nix b/pkgs/development/python-modules/commonmark/default.nix
index 2d7b83782730..6ac907f78ab5 100644
--- a/pkgs/development/python-modules/commonmark/default.nix
+++ b/pkgs/development/python-modules/commonmark/default.nix
@@ -1,36 +1,46 @@
{
lib,
buildPythonPackage,
- fetchPypi,
- isPy3k,
- glibcLocales,
- future,
+ fetchFromGitHub,
+ setuptools,
+ hypothesis,
+ python,
}:
buildPythonPackage rec {
pname = "commonmark";
version = "0.9.1";
- format = "setuptools";
+ pyproject = true;
- src = fetchPypi {
- inherit pname version;
- sha256 = "452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60";
+ src = fetchFromGitHub {
+ owner = "readthedocs";
+ repo = "commonmark.py";
+ rev = "refs/tags/${version}";
+ hash = "sha256-Ui/G/VLdjWcm7YmVjZ5Q8h0DEEFqdDByre29g3zHUq4=";
};
- preCheck = ''
- export LC_ALL="en_US.UTF-8"
+ build-system = [ setuptools ];
+
+ nativeCheckInputs = [ hypothesis ];
+
+ checkPhase = ''
+ runHook preCheck
+
+ ${python.interpreter} commonmark/tests/run_spec_tests.py
+ ${python.interpreter} commonmark/tests/unit_tests.py
+
+ export PATH=$out/bin:$PATH
+ cmark commonmark/tests/test.md
+ cmark commonmark/tests/test.md -a
+ cmark commonmark/tests/test.md -aj
+
+ runHook postCheck
'';
- # UnicodeEncodeError on Python 2
- doCheck = isPy3k;
-
- nativeCheckInputs = [ glibcLocales ];
- propagatedBuildInputs = [ future ];
-
meta = with lib; {
- description = "Python parser for the CommonMark Markdown spec";
+ description = "Python CommonMark parser ";
mainProgram = "cmark";
- homepage = "https://github.com/rolandshoemaker/CommonMark-py";
+ homepage = "https://github.com/readthedocs/commonmark.py";
license = licenses.bsd3;
};
}
diff --git a/pkgs/development/python-modules/compreffor/default.nix b/pkgs/development/python-modules/compreffor/default.nix
index 76cd8caa1a9a..5cf9169bb1a3 100644
--- a/pkgs/development/python-modules/compreffor/default.nix
+++ b/pkgs/development/python-modules/compreffor/default.nix
@@ -2,49 +2,48 @@
lib,
buildPythonPackage,
cython,
- fetchpatch,
fetchPypi,
setuptools-scm,
fonttools,
pytestCheckHook,
- wheel,
}:
buildPythonPackage rec {
pname = "compreffor";
- version = "0.5.5";
- format = "pyproject";
+ version = "0.5.6";
+ pyproject = true;
src = fetchPypi {
inherit pname version;
- hash = "sha256-9NMmIJC8Q4hRC/H2S7OrgoWSQ9SRIPHxHvZpPrPCvHo=";
+ hash = "sha256-icE9GDf5SD/gmqZrGe30SQ7ghColye3VIytSXaI/EA4=";
};
- patches = [
- # https://github.com/googlefonts/compreffor/pull/153
- (fetchpatch {
- name = "remove-setuptools-git-ls-files.patch";
- url = "https://github.com/googlefonts/compreffor/commit/10f563564390568febb3ed1d0f293371cbd86953.patch";
- hash = "sha256-wNQMJFJXTFILGzAgzUXzz/rnK67/RU+exYP6MhEQAkA=";
- })
- ];
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace-fail '"setuptools_git_ls_files",' ""
+ substituteInPlace setup.py \
+ --replace-fail ', "setuptools_git_ls_files"' ""
+ '';
- nativeBuildInputs = [
+ build-system = [
cython
setuptools-scm
- wheel
];
- propagatedBuildInputs = [ fonttools ];
+ dependencies = [ fonttools ];
nativeCheckInputs = [ pytestCheckHook ];
- # Tests cannot seem to open the cpython module.
- doCheck = false;
+ preCheck = ''
+ # import from $out
+ mv src/python/compreffor/test .
+ rm -r src tools
+ '';
pythonImportsCheck = [ "compreffor" ];
meta = with lib; {
+ changelog = "https://github.com/googlefonts/compreffor/releases/tag/${version}";
description = "CFF table subroutinizer for FontTools";
mainProgram = "compreffor";
homepage = "https://github.com/googlefonts/compreffor";
diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix
index b56c8acb2258..595bd8ef14d0 100644
--- a/pkgs/development/python-modules/connexion/default.nix
+++ b/pkgs/development/python-modules/connexion/default.nix
@@ -98,6 +98,8 @@ buildPythonPackage rec {
"test_get_bad_default_response"
"test_schema_response"
"test_writeonly"
+ # test expects "{'name': 'foo', 'type': 'string'}" rather than "{'type': 'string', 'name': 'foo'}"
+ "test_invalid_type"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# ImportError: Error while finding loader for '/private/tmp/nix-build-python3.12-connexion-3.1.0.drv-0/source' (: No module named '/private/tmp/nix-build-python3')
diff --git a/pkgs/development/python-modules/coreapi/default.nix b/pkgs/development/python-modules/coreapi/default.nix
index d620f6fb4e22..f70b8a73a65e 100644
--- a/pkgs/development/python-modules/coreapi/default.nix
+++ b/pkgs/development/python-modules/coreapi/default.nix
@@ -2,6 +2,7 @@
lib,
fetchFromGitHub,
buildPythonPackage,
+ pythonAtLeast,
django,
coreschema,
itypes,
@@ -15,6 +16,9 @@ buildPythonPackage rec {
version = "2.3.3";
format = "setuptools";
+ # cgi module was removed in 3.13, upstream repo archived since 2019
+ disabled = pythonAtLeast "3.13";
+
src = fetchFromGitHub {
repo = "python-client";
owner = "core-api";
diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index 63f6bf2850e7..791d90f8c9ad 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -8,7 +8,7 @@
certifi,
cffi,
cryptography-vectors ? (callPackage ./vectors.nix { }),
- fetchPypi,
+ fetchFromGitHub,
isPyPy,
libiconv,
libxcrypt,
@@ -24,21 +24,22 @@
buildPythonPackage rec {
pname = "cryptography";
- version = "43.0.1"; # Also update the hash in vectors.nix
+ version = "44.0.0"; # Also update the hash in vectors.nix
pyproject = true;
disabled = pythonOlder "3.7";
- src = fetchPypi {
- inherit pname version;
- hash = "sha256-ID6Sp1cW2M+0kdxHx54X0NkgfM/8vLNfWY++RjrjRE0=";
+ src = fetchFromGitHub {
+ owner = "pyca";
+ repo = "cryptography";
+ rev = "refs/tags/${version}";
+ hash = "sha256-A+qYW8GksYk+FQG8ZJHNYrjcouE1CsVH0Lko2ahoYUI=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
- sourceRoot = "${pname}-${version}/${cargoRoot}";
name = "${pname}-${version}";
- hash = "sha256-wiAHM0ucR1X7GunZX8V0Jk2Hsi+dVdGgDKqcYjSdD7Q=";
+ hash = "sha256-LJIY2O8ul36JQmhiW8VhLCQ0BaX+j+HGr3e8RUkZpc8=";
};
postPatch = ''
@@ -46,8 +47,6 @@ buildPythonPackage rec {
--replace-fail "--benchmark-disable" ""
'';
- cargoRoot = "src/rust";
-
build-system = [
rustPlatform.cargoSetupHook
rustPlatform.maturinBuildHook
diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix
index 4f296b036265..0e404d57a665 100644
--- a/pkgs/development/python-modules/cryptography/vectors.nix
+++ b/pkgs/development/python-modules/cryptography/vectors.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "cryptography_vectors";
inherit version;
- hash = "sha256-aKD8GP4nswnpM6KTpU8zVreKFMFSB+lsn/hWga8FCd4=";
+ hash = "sha256-EGIodmxFuaX/0aiz4lTwVgyCHaedXNf9EToX43U1gKs=";
};
nativeBuildInputs = [ flit-core ];
diff --git a/pkgs/development/python-modules/css-inline/Cargo.lock b/pkgs/development/python-modules/css-inline/Cargo.lock
index cbd1794e6994..12e4e4e8ae40 100644
--- a/pkgs/development/python-modules/css-inline/Cargo.lock
+++ b/pkgs/development/python-modules/css-inline/Cargo.lock
@@ -4,36 +4,24 @@ version = 3
[[package]]
name = "addr2line"
-version = "0.21.0"
+version = "0.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
dependencies = [
"gimli",
]
[[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "ahash"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
-dependencies = [
- "cfg-if",
- "once_cell",
- "version_check",
- "zerocopy",
-]
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
[[package]]
name = "allocator-api2"
-version = "0.2.18"
+version = "0.2.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
+checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9"
[[package]]
name = "android-tzdata"
@@ -52,23 +40,23 @@ dependencies = [
[[package]]
name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "backtrace"
-version = "0.3.71"
+version = "0.3.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
dependencies = [
"addr2line",
- "cc",
"cfg-if",
"libc",
"miniz_oxide",
"object",
"rustc-demangle",
+ "windows-targets",
]
[[package]]
@@ -79,15 +67,15 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
[[package]]
name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
[[package]]
name = "built"
-version = "0.7.2"
+version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41bfbdb21256b87a8b5e80fab81a8eed158178e812fd7ba451907518b2742f16"
+checksum = "c360505aed52b7ec96a3636c3f039d99103c37d1d9b4f7a8c743d3ea9ffcd03b"
dependencies = [
"cargo-lock",
"chrono",
@@ -107,15 +95,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
-version = "1.6.0"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
[[package]]
name = "cargo-lock"
-version = "9.0.0"
+version = "10.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e11c675378efb449ed3ce8de78d75d0d80542fc98487c26aba28eb3b82feac72"
+checksum = "6469776d007022d505bbcc2be726f5f096174ae76d710ebc609eb3029a45b551"
dependencies = [
"semver",
"serde",
@@ -125,9 +113,12 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.0.96"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd"
+checksum = "1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8"
+dependencies = [
+ "shlex",
+]
[[package]]
name = "cfg-if"
@@ -135,6 +126,12 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
[[package]]
name = "chrono"
version = "0.4.38"
@@ -144,14 +141,14 @@ dependencies = [
"android-tzdata",
"iana-time-zone",
"num-traits",
- "windows-targets 0.52.5",
+ "windows-targets",
]
[[package]]
name = "core-foundation-sys"
-version = "0.8.6"
+version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
[[package]]
name = "crossbeam-deque"
@@ -174,13 +171,13 @@ dependencies = [
[[package]]
name = "crossbeam-utils"
-version = "0.8.19"
+version = "0.8.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
[[package]]
name = "css-inline"
-version = "0.14.1"
+version = "0.14.2"
dependencies = [
"cssparser",
"html5ever",
@@ -195,7 +192,7 @@ dependencies = [
[[package]]
name = "css-inline-python"
-version = "0.14.1"
+version = "0.14.2"
dependencies = [
"built",
"css-inline",
@@ -225,18 +222,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
dependencies = [
"quote",
- "syn 2.0.60",
+ "syn",
]
[[package]]
name = "derive_more"
-version = "0.99.17"
+version = "0.99.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
]
[[package]]
@@ -247,18 +255,18 @@ checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653"
[[package]]
name = "dtoa-short"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74"
+checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87"
dependencies = [
"dtoa",
]
[[package]]
name = "either"
-version = "1.11.0"
+version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
[[package]]
name = "equivalent"
@@ -272,6 +280,12 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+[[package]]
+name = "foldhash"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
+
[[package]]
name = "form_urlencoded"
version = "1.2.1"
@@ -293,9 +307,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
dependencies = [
"futures-core",
"futures-sink",
@@ -303,33 +317,33 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
[[package]]
name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
[[package]]
name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
[[package]]
name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
[[package]]
name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
dependencies = [
"futures-core",
"futures-io",
@@ -352,36 +366,39 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.14"
+version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
dependencies = [
"cfg-if",
+ "js-sys",
"libc",
"wasi",
+ "wasm-bindgen",
]
[[package]]
name = "gimli"
-version = "0.28.1"
+version = "0.31.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
[[package]]
name = "hashbrown"
-version = "0.14.5"
+version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
dependencies = [
- "ahash",
"allocator-api2",
+ "equivalent",
+ "foldhash",
]
[[package]]
name = "heck"
-version = "0.4.1"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
[[package]]
name = "hermit-abi"
@@ -400,7 +417,7 @@ dependencies = [
"markup5ever",
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn",
]
[[package]]
@@ -416,9 +433,9 @@ dependencies = [
[[package]]
name = "http-body"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
dependencies = [
"bytes",
"http",
@@ -426,12 +443,12 @@ dependencies = [
[[package]]
name = "http-body-util"
-version = "0.1.1"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
dependencies = [
"bytes",
- "futures-core",
+ "futures-util",
"http",
"http-body",
"pin-project-lite",
@@ -439,15 +456,15 @@ dependencies = [
[[package]]
name = "httparse"
-version = "1.8.0"
+version = "1.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
[[package]]
name = "hyper"
-version = "1.3.1"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d"
+checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a"
dependencies = [
"bytes",
"futures-channel",
@@ -464,9 +481,9 @@ dependencies = [
[[package]]
name = "hyper-rustls"
-version = "0.26.0"
+version = "0.27.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c"
+checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
dependencies = [
"futures-util",
"http",
@@ -477,13 +494,14 @@ dependencies = [
"tokio",
"tokio-rustls",
"tower-service",
+ "webpki-roots",
]
[[package]]
name = "hyper-util"
-version = "0.1.3"
+version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
dependencies = [
"bytes",
"futures-channel",
@@ -494,16 +512,15 @@ dependencies = [
"pin-project-lite",
"socket2",
"tokio",
- "tower",
"tower-service",
"tracing",
]
[[package]]
name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
dependencies = [
"android_system_properties",
"core-foundation-sys",
@@ -523,20 +540,149 @@ dependencies = [
]
[[package]]
-name = "idna"
-version = "0.5.0"
+name = "icu_collections"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
]
[[package]]
name = "indexmap"
-version = "2.2.6"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
dependencies = [
"equivalent",
"hashbrown",
@@ -550,9 +696,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
[[package]]
name = "ipnet"
-version = "2.9.0"
+version = "2.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
[[package]]
name = "itoa"
@@ -562,18 +708,24 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
[[package]]
name = "js-sys"
-version = "0.3.69"
+version = "0.3.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
dependencies = [
"wasm-bindgen",
]
[[package]]
name = "libc"
-version = "0.2.154"
+version = "0.2.162"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
+checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
+
+[[package]]
+name = "litemap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
[[package]]
name = "lock_api"
@@ -587,15 +739,15 @@ dependencies = [
[[package]]
name = "log"
-version = "0.4.21"
+version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
[[package]]
name = "lru"
-version = "0.12.3"
+version = "0.12.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc"
+checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
dependencies = [
"hashbrown",
]
@@ -622,9 +774,9 @@ dependencies = [
[[package]]
name = "memchr"
-version = "2.7.2"
+version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
[[package]]
name = "memoffset"
@@ -643,22 +795,23 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]]
name = "miniz_oxide"
-version = "0.7.2"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
dependencies = [
- "adler",
+ "adler2",
]
[[package]]
name = "mio"
-version = "0.8.11"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
dependencies = [
+ "hermit-abi",
"libc",
"wasi",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -676,36 +829,26 @@ dependencies = [
"autocfg",
]
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
[[package]]
name = "object"
-version = "0.32.2"
+version = "0.36.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
dependencies = [
"memchr",
]
[[package]]
name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
[[package]]
name = "parking_lot"
-version = "0.12.2"
+version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
dependencies = [
"lock_api",
"parking_lot_core",
@@ -721,7 +864,7 @@ dependencies = [
"libc",
"redox_syscall",
"smallvec",
- "windows-targets 0.52.5",
+ "windows-targets",
]
[[package]]
@@ -799,7 +942,7 @@ dependencies = [
"phf_shared 0.11.2",
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn",
]
[[package]]
@@ -820,31 +963,11 @@ dependencies = [
"siphasher",
]
-[[package]]
-name = "pin-project"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.60",
-]
-
[[package]]
name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
[[package]]
name = "pin-utils"
@@ -854,15 +977,18 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "portable-atomic"
-version = "1.6.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
[[package]]
name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
[[package]]
name = "precomputed-hash"
@@ -872,24 +998,24 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
[[package]]
name = "proc-macro2"
-version = "1.0.81"
+version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
dependencies = [
"unicode-ident",
]
[[package]]
name = "pyo3"
-version = "0.21.2"
+version = "0.22.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8"
+checksum = "f402062616ab18202ae8319da13fa4279883a2b8a9d9f83f20dbade813ce1884"
dependencies = [
"cfg-if",
"indoc",
"libc",
"memoffset",
- "parking_lot",
+ "once_cell",
"portable-atomic",
"pyo3-build-config",
"pyo3-ffi",
@@ -899,9 +1025,9 @@ dependencies = [
[[package]]
name = "pyo3-build-config"
-version = "0.21.2"
+version = "0.22.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50"
+checksum = "b14b5775b5ff446dd1056212d778012cbe8a0fbffd368029fd9e25b514479c38"
dependencies = [
"once_cell",
"target-lexicon",
@@ -915,9 +1041,9 @@ checksum = "35ee655adc94166665a1d714b439e27857dd199b947076891d6a17d32d396cde"
[[package]]
name = "pyo3-ffi"
-version = "0.21.2"
+version = "0.22.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403"
+checksum = "9ab5bcf04a2cdcbb50c7d6105de943f543f9ed92af55818fd17b660390fc8636"
dependencies = [
"libc",
"pyo3-build-config",
@@ -925,34 +1051,86 @@ dependencies = [
[[package]]
name = "pyo3-macros"
-version = "0.21.2"
+version = "0.22.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c"
+checksum = "0fd24d897903a9e6d80b968368a34e1525aeb719d568dba8b3d4bfa5dc67d453"
dependencies = [
"proc-macro2",
"pyo3-macros-backend",
"quote",
- "syn 2.0.60",
+ "syn",
]
[[package]]
name = "pyo3-macros-backend"
-version = "0.21.2"
+version = "0.22.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c"
+checksum = "36c011a03ba1e50152b4b394b479826cad97e7a21eb52df179cd91ac411cbfbe"
dependencies = [
"heck",
"proc-macro2",
"pyo3-build-config",
"quote",
- "syn 2.0.60",
+ "syn",
+]
+
+[[package]]
+name = "quinn"
+version = "0.11.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
+dependencies = [
+ "bytes",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash",
+ "rustls",
+ "socket2",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "quinn-proto"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
+dependencies = [
+ "bytes",
+ "getrandom",
+ "rand",
+ "ring",
+ "rustc-hash",
+ "rustls",
+ "rustls-pki-types",
+ "slab",
+ "thiserror",
+ "tinyvec",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-udp"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d5a626c6807713b15cac82a6acaccd6043c9a5408c24baae07611fec3f243da"
+dependencies = [
+ "cfg_aliases",
+ "libc",
+ "once_cell",
+ "socket2",
+ "tracing",
+ "windows-sys 0.59.0",
]
[[package]]
name = "quote"
-version = "1.0.36"
+version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
dependencies = [
"proc-macro2",
]
@@ -1009,18 +1187,18 @@ dependencies = [
[[package]]
name = "redox_syscall"
-version = "0.5.1"
+version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
dependencies = [
"bitflags",
]
[[package]]
name = "reqwest"
-version = "0.12.4"
+version = "0.12.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
+checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
dependencies = [
"base64",
"bytes",
@@ -1040,6 +1218,7 @@ dependencies = [
"once_cell",
"percent-encoding",
"pin-project-lite",
+ "quinn",
"rustls",
"rustls-pemfile",
"rustls-pki-types",
@@ -1055,7 +1234,7 @@ dependencies = [
"wasm-bindgen-futures",
"web-sys",
"webpki-roots",
- "winreg",
+ "windows-registry",
]
[[package]]
@@ -1075,23 +1254,23 @@ dependencies = [
[[package]]
name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
[[package]]
name = "rustc-hash"
-version = "1.1.0"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
[[package]]
name = "rustls"
-version = "0.22.4"
+version = "0.23.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
+checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e"
dependencies = [
- "log",
+ "once_cell",
"ring",
"rustls-pki-types",
"rustls-webpki",
@@ -1101,25 +1280,27 @@ dependencies = [
[[package]]
name = "rustls-pemfile"
-version = "2.1.2"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
dependencies = [
- "base64",
"rustls-pki-types",
]
[[package]]
name = "rustls-pki-types"
-version = "1.5.0"
+version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54"
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
+dependencies = [
+ "web-time",
+]
[[package]]
name = "rustls-webpki"
-version = "0.102.3"
+version = "0.102.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
dependencies = [
"ring",
"rustls-pki-types",
@@ -1128,9 +1309,9 @@ dependencies = [
[[package]]
name = "ryu"
-version = "1.0.17"
+version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
[[package]]
name = "scopeguard"
@@ -1159,49 +1340,50 @@ dependencies = [
[[package]]
name = "semver"
-version = "1.0.22"
+version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
dependencies = [
"serde",
]
[[package]]
name = "serde"
-version = "1.0.200"
+version = "1.0.215"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f"
+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.200"
+version = "1.0.215"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb"
+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn",
]
[[package]]
name = "serde_json"
-version = "1.0.116"
+version = "1.0.132"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
dependencies = [
"itoa",
+ "memchr",
"ryu",
"serde",
]
[[package]]
name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
dependencies = [
"serde",
]
@@ -1227,6 +1409,12 @@ dependencies = [
"stable_deref_trait",
]
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
[[package]]
name = "siphasher"
version = "0.3.11"
@@ -1298,26 +1486,15 @@ dependencies = [
[[package]]
name = "subtle"
-version = "2.5.0"
+version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]]
name = "syn"
-version = "1.0.109"
+version = "2.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
dependencies = [
"proc-macro2",
"quote",
@@ -1326,15 +1503,29 @@ dependencies = [
[[package]]
name = "sync_wrapper"
-version = "0.1.2"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
[[package]]
name = "target-lexicon"
-version = "0.12.14"
+version = "0.12.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
[[package]]
name = "tendril"
@@ -1348,10 +1539,40 @@ dependencies = [
]
[[package]]
-name = "tinyvec"
-version = "1.6.0"
+name = "thiserror"
+version = "2.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
dependencies = [
"tinyvec_macros",
]
@@ -1364,25 +1585,24 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.37.0"
+version = "1.41.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33"
dependencies = [
"backtrace",
"bytes",
"libc",
"mio",
- "num_cpus",
"pin-project-lite",
"socket2",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
]
[[package]]
name = "tokio-rustls"
-version = "0.25.0"
+version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
+checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
dependencies = [
"rustls",
"rustls-pki-types",
@@ -1391,9 +1611,9 @@ dependencies = [
[[package]]
name = "toml"
-version = "0.7.8"
+version = "0.8.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
dependencies = [
"serde",
"serde_spanned",
@@ -1403,18 +1623,18 @@ dependencies = [
[[package]]
name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
dependencies = [
"serde",
]
[[package]]
name = "toml_edit"
-version = "0.19.15"
+version = "0.22.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
dependencies = [
"indexmap",
"serde",
@@ -1423,33 +1643,11 @@ dependencies = [
"winnow",
]
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
- "tokio",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
-
[[package]]
name = "tower-service"
-version = "0.3.2"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
[[package]]
name = "tracing"
@@ -1457,7 +1655,6 @@ version = "0.1.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
dependencies = [
- "log",
"pin-project-lite",
"tracing-core",
]
@@ -1477,26 +1674,11 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
-[[package]]
-name = "unicode-bidi"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
-
[[package]]
name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
[[package]]
name = "unindent"
@@ -1512,9 +1694,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
[[package]]
name = "url"
-version = "2.5.0"
+version = "2.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada"
dependencies = [
"form_urlencoded",
"idna",
@@ -1528,10 +1710,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
[[package]]
-name = "version_check"
-version = "0.9.4"
+name = "utf16_iter"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
[[package]]
name = "want"
@@ -1550,34 +1738,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
dependencies = [
"cfg-if",
+ "once_cell",
"wasm-bindgen-macro",
]
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.42"
+version = "0.4.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
+checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
dependencies = [
"cfg-if",
"js-sys",
@@ -1587,9 +1776,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -1597,28 +1786,38 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
[[package]]
name = "web-sys"
-version = "0.3.69"
+version = "0.3.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -1626,9 +1825,9 @@ dependencies = [
[[package]]
name = "webpki-roots"
-version = "0.26.1"
+version = "0.26.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009"
+checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958"
dependencies = [
"rustls-pki-types",
]
@@ -1639,16 +1838,37 @@ version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets",
]
[[package]]
-name = "windows-sys"
-version = "0.48.0"
+name = "windows-registry"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
dependencies = [
- "windows-targets 0.48.5",
+ "windows-result",
+ "windows-strings",
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result",
+ "windows-targets",
]
[[package]]
@@ -1657,171 +1877,193 @@ version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
]
[[package]]
name = "windows-targets"
-version = "0.48.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
-dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
"windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
]
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.48.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.48.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
[[package]]
name = "windows_i686_gnu"
-version = "0.48.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
[[package]]
name = "windows_i686_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
[[package]]
name = "windows_i686_msvc"
-version = "0.48.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.48.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.48.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.48.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "winnow"
-version = "0.5.40"
+version = "0.6.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
dependencies = [
"memchr",
]
[[package]]
-name = "winreg"
-version = "0.52.0"
+name = "write16"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
+[[package]]
+name = "yoke"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
]
[[package]]
name = "zerocopy"
-version = "0.7.33"
+version = "0.7.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "087eca3c1eaf8c47b94d02790dd086cd594b912d2043d4de4bfdd466b3befb7c"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
dependencies = [
+ "byteorder",
"zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
-version = "0.7.33"
+version = "0.7.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f4b6c273f496d8fd4eaf18853e6b448760225dc030ff2c485a786859aea6393"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
]
[[package]]
name = "zeroize"
-version = "1.7.0"
+version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/pkgs/development/python-modules/css-inline/default.nix b/pkgs/development/python-modules/css-inline/default.nix
index a108599eb6ba..0f6ed18338a6 100644
--- a/pkgs/development/python-modules/css-inline/default.nix
+++ b/pkgs/development/python-modules/css-inline/default.nix
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "css-inline";
- version = "0.14.1";
+ version = "0.14.2";
pyproject = true;
src = fetchFromGitHub {
owner = "Stranger6667";
repo = "css-inline";
rev = "python-v${version}";
- hash = "sha256-+hX05y+ii2/wAbcc3SPK3ns4slUKFGqHURb3Z08yhVw=";
+ hash = "sha256-2C+UbndhGQxIsPVaJOMu/WdLHcA2H1uuJrNMhafybmU=";
};
postPatch = ''
@@ -43,7 +43,7 @@ buildPythonPackage rec {
ln -s ${./Cargo.lock} Cargo.lock
'';
name = "${pname}-${version}";
- hash = "sha256-ogzj8JxiFX2VWEeEnKACycd2Bud9VUpLuF4h35eUls0=";
+ hash = "sha256-FvkVwd681EhEHRJ8ip97moEkRE3VcuIPbi+F1SjXz8E=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix
index 434af5cb974a..dbdc54f01b5d 100644
--- a/pkgs/development/python-modules/curio/default.nix
+++ b/pkgs/development/python-modules/curio/default.nix
@@ -1,33 +1,27 @@
{
lib,
buildPythonPackage,
- fetchPypi,
- fetchpatch,
- isPy3k,
+ fetchFromGitHub,
+ setuptools,
pytestCheckHook,
sphinx,
stdenv,
+ unstableGitUpdater,
}:
buildPythonPackage rec {
pname = "curio";
- version = "1.6";
- format = "setuptools";
- disabled = !isPy3k;
+ version = "1.6-unstable-2024-04-11";
+ pyproject = true;
- src = fetchPypi {
- inherit pname version;
- hash = "sha256-VipYbbICFrp9K+gmPeuesHnlYEj5uJBtEdX0WqgcUkc=";
+ src = fetchFromGitHub {
+ owner = "dabeaz";
+ repo = "curio";
+ rev = "148454621f9bd8dd843f591e87715415431f6979";
+ hash = "sha256-WLu7XF5wiVzBRQH1KRdAbhluTvGE7VvnRQUS0c3SUDk=";
};
- patches = [
- (fetchpatch {
- # Add support for Python 3.12
- # https://github.com/dabeaz/curio/pull/363
- url = "https://github.com/dabeaz/curio/commit/a5590bb04de3f1f201fd1fd0ce9cfe5825db80ac.patch";
- hash = "sha256-dwatxLOPAWLQSyNqJvkx6Cbl327tX9OpZXM5aaDX58I=";
- })
- ];
+ build-system = [ setuptools ];
nativeCheckInputs = [
pytestCheckHook
@@ -53,6 +47,9 @@ buildPythonPackage rec {
pythonImportsCheck = [ "curio" ];
+ # curio does not package new releaseas any more
+ passthru.updateScript = unstableGitUpdater { };
+
meta = with lib; {
description = "Library for performing concurrent I/O with coroutines in Python";
homepage = "https://github.com/dabeaz/curio";
diff --git a/pkgs/development/python-modules/cython/0.nix b/pkgs/development/python-modules/cython/0.nix
index a484892c0040..3f360fbb704e 100644
--- a/pkgs/development/python-modules/cython/0.nix
+++ b/pkgs/development/python-modules/cython/0.nix
@@ -2,11 +2,12 @@
lib,
stdenv,
buildPythonPackage,
- fetchPypi,
+ fetchFromGitHub,
fetchpatch,
setuptools,
python,
pkg-config,
+ pythonAtLeast,
gdb,
numpy,
ncurses,
@@ -32,13 +33,17 @@ let
in
buildPythonPackage rec {
pname = "cython";
- version = "0.29.36";
+ version = "0.29.37.1";
pyproject = true;
- src = fetchPypi {
- pname = "Cython";
- inherit version;
- hash = "sha256-QcDP0tdU44PJ7rle/8mqSrhH0Ml0cHfd18Dctow7wB8=";
+ # error: too few arguments to function '_PyLong_AsByteArray'
+ disabled = pythonAtLeast "3.13";
+
+ src = fetchFromGitHub {
+ owner = "cython";
+ repo = "cython";
+ rev = "refs/tags/${version}";
+ hash = "sha256-XsEy2NrG7hq+VXRCRbD4BRaBieU6mVoE0GT52L3mMhs=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/datalad/default.nix b/pkgs/development/python-modules/datalad/default.nix
index c61c0566c163..815fa83a1684 100644
--- a/pkgs/development/python-modules/datalad/default.nix
+++ b/pkgs/development/python-modules/datalad/default.nix
@@ -234,6 +234,12 @@ buildPythonPackage rec {
httpretty
];
+ pytestFlagsArray = [
+ # Deprecated in 3.13. Use exc_type_str instead.
+ "-W"
+ "ignore::DeprecationWarning"
+ ];
+
pythonImportsCheck = [ "datalad" ];
meta = {
diff --git a/pkgs/development/python-modules/dbus-python/default.nix b/pkgs/development/python-modules/dbus-python/default.nix
index b6664daa2576..756cd75ed6ad 100644
--- a/pkgs/development/python-modules/dbus-python/default.nix
+++ b/pkgs/development/python-modules/dbus-python/default.nix
@@ -90,7 +90,7 @@ lib.fix (
checkPhase = ''
runHook preCheck
- meson test -C _meson-build --no-rebuild --print-errorlogs
+ meson test -C _meson-build --no-rebuild --print-errorlogs --timeout-multiplier 0
runHook postCheck
'';
diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix
index e32aab6be8a2..b8c57b379c00 100644
--- a/pkgs/development/python-modules/deprecated/default.nix
+++ b/pkgs/development/python-modules/deprecated/default.nix
@@ -2,6 +2,8 @@
lib,
fetchFromGitHub,
buildPythonPackage,
+ pythonAtLeast,
+ setuptools,
wrapt,
pytestCheckHook,
sphinxHook,
@@ -10,7 +12,8 @@
buildPythonPackage rec {
pname = "deprecated";
version = "1.2.14";
- format = "setuptools";
+ pyproject = true;
+
outputs = [
"out"
"doc"
@@ -23,12 +26,20 @@ buildPythonPackage rec {
hash = "sha256-H5Gp2F/ChMeEH4fSYXIB34syDIzDymfN949ksJnS0k4=";
};
+ build-system = [ setuptools ];
+
nativeBuildInputs = [ sphinxHook ];
propagatedBuildInputs = [ wrapt ];
nativeCheckInputs = [ pytestCheckHook ];
+ disabledTests = lib.optionals (pythonAtLeast "3.13") [
+ # assertion text mismatch
+ "test_classic_deprecated_class_method__warns"
+ "test_sphinx_deprecated_class_method__warns"
+ ];
+
pythonImportsCheck = [ "deprecated" ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix
index 3e79caf80134..88f287327066 100644
--- a/pkgs/development/python-modules/django/4.nix
+++ b/pkgs/development/python-modules/django/4.nix
@@ -44,7 +44,7 @@
buildPythonPackage rec {
pname = "django";
- version = "4.2.16";
+ version = "4.2.17";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -53,7 +53,7 @@ buildPythonPackage rec {
owner = "django";
repo = "django";
rev = "refs/tags/${version}";
- hash = "sha256-VW/qfqOadivtU8Xg70FLqENtOV7GqJM4bR2Ik6Yag+o=";
+ hash = "sha256-G3PAG/fe4yG55699XS8rcWigF92J0Fke1qnUxRqOUnc=";
};
patches =
@@ -85,6 +85,13 @@ buildPythonPackage rec {
# https://hydra.nixos.org/build/254630990
substituteInPlace tests/view_tests/tests/test_debug.py \
--replace-fail "test_files" "dont_test_files"
+ ''
+ + lib.optionalString (pythonAtLeast "3.13") ''
+ # Fixed CommandTypes.test_help_default_options_with_custom_arguments test on Python 3.13+.
+ # https://github.com/django/django/commit/3426a5c33c36266af42128ee9eca4921e68ea876
+ substituteInPlace tests/admin_scripts/tests.py --replace-fail \
+ "test_help_default_options_with_custom_arguments" \
+ "dont_test_help_default_options_with_custom_arguments"
'';
nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix
index 108ec71a2978..43a5c0779801 100644
--- a/pkgs/development/python-modules/djangorestframework/default.nix
+++ b/pkgs/development/python-modules/djangorestframework/default.nix
@@ -46,15 +46,19 @@ buildPythonPackage rec {
] ++ (lib.optional (lib.versionOlder django.version "5.0.0") pytz);
optional-dependencies = {
- complete = [
- coreapi
- coreschema
- django-guardian
- inflection
- psycopg2
- pygments
- pyyaml
- ];
+ complete =
+ [
+ coreschema
+ django-guardian
+ inflection
+ psycopg2
+ pygments
+ pyyaml
+ ]
+ ++ lib.optionals (pythonOlder "3.13") [
+ # broken on 3.13
+ coreapi
+ ];
};
nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/einops/default.nix b/pkgs/development/python-modules/einops/default.nix
index 4a6dfc6ab777..0b1fd24a3ac3 100644
--- a/pkgs/development/python-modules/einops/default.nix
+++ b/pkgs/development/python-modules/einops/default.nix
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+ fetchpatch2,
hatchling,
jupyter,
nbconvert,
@@ -26,6 +27,15 @@ buildPythonPackage rec {
hash = "sha256-6x9AttvSvgYrHaS5ESKOwyEnXxD2BitYTGtqqSKur+0=";
};
+ patches = [
+ # https://github.com/arogozhnikov/einops/pull/325
+ (fetchpatch2 {
+ name = "numpy_2-compatibility.patch";
+ url = "https://github.com/arogozhnikov/einops/commit/11680b457ce2216d9827330d0b794565946847d7.patch";
+ hash = "sha256-OKWp319ClYarNrek7TdRHt+NKTOEfBdJaV0U/6vLeMc=";
+ })
+ ];
+
nativeBuildInputs = [ hatchling ];
nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/elastic-transport/default.nix b/pkgs/development/python-modules/elastic-transport/default.nix
index 2e333376bb93..97ef9334cf7c 100644
--- a/pkgs/development/python-modules/elastic-transport/default.nix
+++ b/pkgs/development/python-modules/elastic-transport/default.nix
@@ -61,6 +61,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "elastic_transport" ];
+ pytestFlagsArray = [
+ "-W"
+ "ignore::DeprecationWarning"
+ ];
+
disabledTests = [
# Tests require network access
"fingerprint"
diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix
index fedbca7e913b..eae5b60184cb 100644
--- a/pkgs/development/python-modules/eliot/default.nix
+++ b/pkgs/development/python-modules/eliot/default.nix
@@ -3,6 +3,7 @@
stdenv,
buildPythonPackage,
fetchFromGitHub,
+ fetchpatch2,
pythonOlder,
pythonAtLeast,
@@ -37,6 +38,14 @@ buildPythonPackage rec {
hash = "sha256-KqAXOMrRawzjpt5do2KdqpMMgpBtxeZ+X+th0WwBl+U=";
};
+ patches = [
+ (fetchpatch2 {
+ name = "numpy2-compat.patch";
+ url = "https://github.com/itamarst/eliot/commit/39eccdad44f91971ecf1211fb01366b4d9801817.patch";
+ hash = "sha256-al6olmvFZ8pDblljWmWqs5QrtcuHKcea255XgG+1+1o=";
+ })
+ ];
+
build-system = [ setuptools ];
dependencies = [
diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix
index 88bb8a599aba..e3f3bb02ade2 100644
--- a/pkgs/development/python-modules/eventlet/default.nix
+++ b/pkgs/development/python-modules/eventlet/default.nix
@@ -32,6 +32,11 @@ buildPythonPackage rec {
hash = "sha256-R/nRHsz4z4phG51YYDwkGqvnXssGoiJxIPexuhAf0BI=";
};
+ patches = [
+ # https://github.com/eventlet/eventlet/pull/988
+ ./python-3.13-compat.patch
+ ];
+
nativeBuildInputs = [
hatch-vcs
hatchling
@@ -63,6 +68,8 @@ buildPythonPackage rec {
# Tests requires network access
"test_getaddrinfo"
"test_hosts_no_network"
+ # flaky test, depends on builder performance
+ "test_server_connection_timeout_exception"
];
pythonImportsCheck = [ "eventlet" ];
diff --git a/pkgs/development/python-modules/eventlet/python-3.13-compat.patch b/pkgs/development/python-modules/eventlet/python-3.13-compat.patch
new file mode 100644
index 000000000000..e0b5b1895fc9
--- /dev/null
+++ b/pkgs/development/python-modules/eventlet/python-3.13-compat.patch
@@ -0,0 +1,181 @@
+From 0cef8bb6bbf5baf5953e2739233572060ae70b34 Mon Sep 17 00:00:00 2001
+From: Stefano Rivera
+Date: Wed, 6 Nov 2024 21:30:29 -0800
+Subject: [PATCH] Python 3.13 support
+
+Emulate Python 3.13's start_joinable_thread API using greenthreads.
+
+We cut some corners, of course:
+* We aren't maintaining a table of green thread idents to threads, so we
+ can't wait for all threads on shutdown.
+* Our _make_thread_handle() can only make a handle for the current
+ thread (as we don't have a way to look up green threads by ident).
+* .join() on a non-GreenThread (e.g. the main thread) just returns
+ immediately.
+
+Fixes: #964
+---
+ eventlet/green/thread.py | 66 ++++++++++++++++++++++++++++++++++---
+ eventlet/green/threading.py | 7 ++--
+ 2 files changed, 65 insertions(+), 8 deletions(-)
+
+diff --git a/eventlet/green/thread.py b/eventlet/green/thread.py
+index 053a1c3c6..e9c4f3830 100644
+--- a/eventlet/green/thread.py
++++ b/eventlet/green/thread.py
+@@ -2,13 +2,16 @@
+ import _thread as __thread
+ from eventlet.support import greenlets as greenlet
+ from eventlet import greenthread
++from eventlet.timeout import with_timeout
+ from eventlet.lock import Lock
+ import sys
+
+
+-__patched__ = ['get_ident', 'start_new_thread', 'start_new', 'allocate_lock',
+- 'allocate', 'exit', 'interrupt_main', 'stack_size', '_local',
+- 'LockType', 'Lock', '_count']
++__patched__ = ['Lock', 'LockType', '_ThreadHandle', '_count',
++ '_get_main_thread_ident', '_local', '_make_thread_handle',
++ 'allocate', 'allocate_lock', 'exit', 'get_ident',
++ 'interrupt_main', 'stack_size', 'start_joinable_thread',
++ 'start_new', 'start_new_thread']
+
+ error = __thread.error
+ LockType = Lock
+@@ -47,7 +50,36 @@ def __thread_body(func, args, kwargs):
+ __threadcount -= 1
+
+
+-def start_new_thread(function, args=(), kwargs=None):
++class _ThreadHandle:
++ def __init__(self, greenthread=None):
++ self._greenthread = greenthread
++ self._done = False
++
++ def _set_done(self):
++ self._done = True
++
++ def is_done(self):
++ return self._done
++
++ @property
++ def ident(self):
++ return get_ident(self._greenthread)
++
++ def join(self, timeout=None):
++ if not hasattr(self._greenthread, "wait"):
++ return
++ if timeout is not None:
++ return with_timeout(timeout, self._greenthread.wait)
++ return self._greenthread.wait()
++
++
++def _make_thread_handle(ident):
++ greenthread = greenlet.getcurrent()
++ assert ident == get_ident(greenthread)
++ return _ThreadHandle(greenthread=greenthread)
++
++
++def __spawn_green(function, args=(), kwargs=None, joinable=False):
+ if (sys.version_info >= (3, 4)
+ and getattr(function, '__module__', '') == 'threading'
+ and hasattr(function, '__self__')):
+@@ -72,13 +104,34 @@ def wrap_bootstrap_inner():
+ thread._bootstrap_inner = wrap_bootstrap_inner
+
+ kwargs = kwargs or {}
+- g = greenthread.spawn_n(__thread_body, function, args, kwargs)
++ spawn_func = greenthread.spawn if joinable else greenthread.spawn_n
++ return spawn_func(__thread_body, function, args, kwargs)
++
++
++def start_joinable_thread(function, handle=None, daemon=True):
++ g = __spawn_green(function, joinable=True)
++ if handle is None:
++ handle = _ThreadHandle(greenthread=g)
++ else:
++ handle._greenthread = g
++ return handle
++
++
++def start_new_thread(function, args=(), kwargs=None):
++ g = __spawn_green(function, args=args, kwargs=kwargs)
+ return get_ident(g)
+
+
+ start_new = start_new_thread
+
+
++def _get_main_thread_ident():
++ greenthread = greenlet.getcurrent()
++ while greenthread.parent is not None:
++ greenthread = greenthread.parent
++ return get_ident(greenthread)
++
++
+ def allocate_lock(*a):
+ return LockType(1)
+
+@@ -118,3 +171,6 @@ def stack_size(size=None):
+
+ if hasattr(__thread, 'daemon_threads_allowed'):
+ daemon_threads_allowed = __thread.daemon_threads_allowed
++
++if hasattr(__thread, '_shutdown'):
++ _shutdown = __thread._shutdown
+diff --git a/eventlet/green/threading.py b/eventlet/green/threading.py
+index 7ea20cdad..83b4c767f 100644
+--- a/eventlet/green/threading.py
++++ b/eventlet/green/threading.py
+@@ -4,9 +4,10 @@
+ from eventlet.green import time
+ from eventlet.support import greenlets as greenlet
+
+-__patched__ = ['_start_new_thread', '_allocate_lock',
+- '_sleep', 'local', 'stack_size', 'Lock', 'currentThread',
+- 'current_thread', '_after_fork', '_shutdown']
++__patched__ = ['Lock', '_after_fork', '_allocate_lock', '_make_thread_handle',
++ '_shutdown', '_sleep', '_start_joinable_thread',
++ '_start_new_thread', '_ThreadHandle', 'currentThread',
++ 'current_thread', 'local', 'stack_size']
+
+ __patched__ += ['get_ident', '_set_sentinel']
+
+From 969cd8de59c0b0de48e17a969027f1d041b394ef Mon Sep 17 00:00:00 2001
+From: Stefano Rivera
+Date: Thu, 7 Nov 2024 14:38:01 -0800
+Subject: [PATCH] _tstate_lock was removed in Python 3.13
+
+In python/cpython#114271, _tstate_lock was replaced with an event on
+PyThreadState.
+---
+ eventlet/green/thread.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/eventlet/green/thread.py b/eventlet/green/thread.py
+index e9c4f3830..ef723ff46 100644
+--- a/eventlet/green/thread.py
++++ b/eventlet/green/thread.py
+@@ -80,10 +80,10 @@ def _make_thread_handle(ident):
+
+
+ def __spawn_green(function, args=(), kwargs=None, joinable=False):
+- if (sys.version_info >= (3, 4)
++ if ((3, 4) <= sys.version_info < (3, 13)
+ and getattr(function, '__module__', '') == 'threading'
+ and hasattr(function, '__self__')):
+- # Since Python 3.4, threading.Thread uses an internal lock
++ # In Python 3.4-3.12, threading.Thread uses an internal lock
+ # automatically released when the python thread state is deleted.
+ # With monkey patching, eventlet uses green threads without python
+ # thread state, so the lock is not automatically released.
+@@ -98,7 +98,7 @@ def wrap_bootstrap_inner():
+ bootstrap_inner()
+ finally:
+ # The lock can be cleared (ex: by a fork())
+- if thread._tstate_lock is not None:
++ if getattr(thread, "_tstate_lock", None) is not None:
+ thread._tstate_lock.release()
+
+ thread._bootstrap_inner = wrap_bootstrap_inner
diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix
index eb4cc8a9c1f4..9b6b4e054e6d 100644
--- a/pkgs/development/python-modules/fakeredis/default.nix
+++ b/pkgs/development/python-modules/fakeredis/default.nix
@@ -37,13 +37,6 @@ buildPythonPackage rec {
sortedcontainers
];
- nativeCheckInputs = [
- hypothesis
- pytest-asyncio
- pytest-mock
- pytestCheckHook
- ];
-
optional-dependencies = {
lua = [ lupa ];
json = [ jsonpath-ng ];
@@ -52,6 +45,13 @@ buildPythonPackage rec {
probabilistic = [ pyprobables ];
};
+ nativeCheckInputs = [
+ hypothesis
+ pytest-asyncio
+ pytest-mock
+ pytestCheckHook
+ ];
+
pythonImportsCheck = [ "fakeredis" ];
pytestFlagsArray = [ "-m 'not slow'" ];
@@ -65,11 +65,6 @@ buildPythonPackage rec {
kill $REDIS_PID
'';
- disabledTests = [
- # AssertionError
- "test_command"
- ];
-
meta = with lib; {
description = "Fake implementation of Redis API";
homepage = "https://github.com/dsoftwareinc/fakeredis-py";
diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix
index cb2ff6942eb2..27492073c580 100644
--- a/pkgs/development/python-modules/falcon/default.nix
+++ b/pkgs/development/python-modules/falcon/default.nix
@@ -30,18 +30,19 @@
buildPythonPackage rec {
pname = "falcon";
- version = "3.1.3";
- format = "pyproject";
+ version = "4.0.2";
+ pyproject = true;
+
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "falconry";
- repo = pname;
+ repo = "falcon";
rev = "refs/tags/${version}";
- hash = "sha256-7719gOM8WQVjODwOSo7HpH3HMFFeCGQQYBKktBAevig=";
+ hash = "sha256-umNuHyZrdDGyrhQEG9+f08D4Wwrz6bVJ6ysw8pfbHv4=";
};
- nativeBuildInputs = [ setuptools ] ++ lib.optionals (!isPyPy) [ cython ];
+ build-system = [ setuptools ] ++ lib.optionals (!isPyPy) [ cython ];
__darwinAllowLocalNetworking = true;
@@ -90,7 +91,8 @@ buildPythonPackage rec {
];
meta = with lib; {
- description = "Unladen web framework for building APIs and app backends";
+ changelog = "https://falcon.readthedocs.io/en/stable/changes/${version}.html";
+ description = "Ultra-reliable, fast ASGI+WSGI framework for building data plane APIs at scale";
homepage = "https://falconframework.org/";
license = licenses.asl20;
maintainers = with maintainers; [ desiderius ];
diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix
index e9ed6eb2e2ea..52c4d75e6c96 100644
--- a/pkgs/development/python-modules/fastapi/default.nix
+++ b/pkgs/development/python-modules/fastapi/default.nix
@@ -8,12 +8,12 @@
pdm-backend,
# dependencies
- fastapi-cli,
starlette,
pydantic,
typing-extensions,
# tests
+ anyio,
dirty-equals,
flask,
inline-snapshot,
@@ -25,10 +25,11 @@
trio,
# optional-dependencies
+ fastapi-cli,
httpx,
jinja2,
- python-multipart,
itsdangerous,
+ python-multipart,
pyyaml,
ujson,
orjson,
@@ -40,7 +41,7 @@
buildPythonPackage rec {
pname = "fastapi";
- version = "0.115.3";
+ version = "0.115.6";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -49,7 +50,7 @@ buildPythonPackage rec {
owner = "tiangolo";
repo = "fastapi";
rev = "refs/tags/${version}";
- hash = "sha256-JIaPgZVbz887liVwd3YtubJm+L4tFCM9Jcn9/smjiKo=";
+ hash = "sha256-yNYjFD77q5x5DtcYdywmScuuVdyWhBoxbLYJhu1Fmno=";
};
build-system = [ pdm-backend ];
@@ -60,41 +61,57 @@ buildPythonPackage rec {
];
dependencies = [
- fastapi-cli
starlette
pydantic
typing-extensions
];
- optional-dependencies.all =
- [
+ optional-dependencies = {
+ all =
+ [
+ fastapi-cli
+ httpx
+ jinja2
+ python-multipart
+ itsdangerous
+ pyyaml
+ ujson
+ orjson
+ email-validator
+ uvicorn
+ ]
+ ++ lib.optionals (lib.versionAtLeast pydantic.version "2") [
+ pydantic-settings
+ pydantic-extra-types
+ ]
+ ++ fastapi-cli.optional-dependencies.standard
+ ++ uvicorn.optional-dependencies.standard;
+ standard = [
+ fastapi-cli
httpx
jinja2
python-multipart
- itsdangerous
- pyyaml
- ujson
- orjson
email-validator
uvicorn
- ]
- ++ lib.optionals (lib.versionAtLeast pydantic.version "2") [
- pydantic-settings
- pydantic-extra-types
- ]
- ++ uvicorn.optional-dependencies.standard;
+ ] ++ fastapi-cli.optional-dependencies.standard ++ uvicorn.optional-dependencies.standard;
+ };
- nativeCheckInputs = [
- dirty-equals
- flask
- inline-snapshot
- passlib
- pyjwt
- pytestCheckHook
- pytest-asyncio
- trio
- sqlalchemy
- ] ++ optional-dependencies.all;
+ nativeCheckInputs =
+ [
+ anyio
+ dirty-equals
+ flask
+ inline-snapshot
+ passlib
+ pyjwt
+ pytestCheckHook
+ pytest-asyncio
+ trio
+ sqlalchemy
+ ]
+ ++ anyio.optional-dependencies.trio
+ ++ passlib.optional-dependencies.bcrypt
+ ++ optional-dependencies.all;
pytestFlagsArray = [
# ignoring deprecation warnings to avoid test failure from
diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix
index 5beafcea7a1c..79185e3a3c2f 100644
--- a/pkgs/development/python-modules/fastparquet/default.nix
+++ b/pkgs/development/python-modules/fastparquet/default.nix
@@ -7,7 +7,6 @@
fsspec,
git,
numpy,
- oldest-supported-numpy,
packaging,
pandas,
pytestCheckHook,
@@ -33,11 +32,6 @@ buildPythonPackage rec {
hash = "sha256-YiaVkpPzH8ZmTiEtCom9xLbKzByIt7Ilig/WlmGrYH4=";
};
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace-fail "numpy>=2.0.0rc1" "oldest-supported-numpy"
- '';
-
build-system = [
setuptools
setuptools-scm
@@ -47,7 +41,7 @@ buildPythonPackage rec {
nativeBuildInputs = [
cython
git
- oldest-supported-numpy
+ numpy
];
dependencies = [
diff --git a/pkgs/development/python-modules/filterpy/default.nix b/pkgs/development/python-modules/filterpy/default.nix
index 039c2e863ac7..9522b0c4c27e 100644
--- a/pkgs/development/python-modules/filterpy/default.nix
+++ b/pkgs/development/python-modules/filterpy/default.nix
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+ setuptools,
numpy,
scipy,
matplotlib,
@@ -11,8 +12,8 @@
buildPythonPackage {
pname = "filterpy";
- version = "unstable-2022-08-23";
- format = "setuptools";
+ version = "1.4.5-unstable-2022-08-23";
+ pyproject = true;
disabled = !isPy3k;
@@ -23,14 +24,21 @@ buildPythonPackage {
hash = "sha256-KuuVu0tqrmQuNKYmDmdy+TU6BnnhDxh4G8n9BGzjGag=";
};
- nativeCheckInputs = [ pytestCheckHook ];
+ build-system = [ setuptools ];
- propagatedBuildInputs = [
+ dependencies = [
numpy
scipy
matplotlib
];
+ nativeCheckInputs = [ pytestCheckHook ];
+
+ disabledTests = [
+ # ValueError: Unable to avoid copy while creating an array as requested."
+ "test_multivariate_gaussian"
+ ];
+
meta = with lib; {
homepage = "https://github.com/rlabbe/filterpy";
description = "Kalman filtering and optimal estimation library";
diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix
index 4a9de0f4dd6d..8fe842c2b6a0 100644
--- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix
@@ -36,11 +36,13 @@ buildPythonPackage rec {
pytestCheckHook
];
+ doCheck = pythonOlder "3.13"; # https://github.com/pallets-eco/flask-sqlalchemy/issues/1379
+
disabledTests = [
# flaky
"test_session_scoping_changing"
- # https://github.com/pallets-eco/flask-sqlalchemy/issues/1084
- "test_persist_selectable"
+ # https://github.com/pallets-eco/flask-sqlalchemy/issues/1378
+ "test_explicit_table"
];
pytestFlagsArray = lib.optionals (pythonAtLeast "3.12") [
diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix
index 850dba14f28e..ac0653a56c9b 100644
--- a/pkgs/development/python-modules/flask/default.nix
+++ b/pkgs/development/python-modules/flask/default.nix
@@ -32,17 +32,17 @@
buildPythonPackage rec {
pname = "flask";
- version = "3.0.3";
- format = "pyproject";
+ version = "3.1.0";
+ pyproject = true;
src = fetchPypi {
inherit pname version;
- hash = "sha256-zrJ7CvOCPqJzeSik2Z0SWgYXW4USxEXL2anOIA73aEI=";
+ hash = "sha256-X4c8UYTIl8jZ0bBd8ePQGxSRDOaWB6EXvTJ3CYpYNqw=";
};
- nativeBuildInputs = [ flit-core ];
+ build-system = [ flit-core ];
- propagatedBuildInputs = [
+ dependencies = [
click
blinker
itsdangerous
@@ -55,10 +55,7 @@ buildPythonPackage rec {
dotenv = [ python-dotenv ];
};
- nativeCheckInputs =
- [ pytestCheckHook ]
- ++ lib.optionals (pythonOlder "3.11") [ greenlet ]
- ++ lib.flatten (builtins.attrValues optional-dependencies);
+ nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies);
passthru.tests = {
inherit
diff --git a/pkgs/development/python-modules/flexparser/default.nix b/pkgs/development/python-modules/flexparser/default.nix
index 60ab74a5546e..4cb3cfbf6c58 100644
--- a/pkgs/development/python-modules/flexparser/default.nix
+++ b/pkgs/development/python-modules/flexparser/default.nix
@@ -6,7 +6,6 @@
# build-system
setuptools,
setuptools-scm,
- wheel,
# dependencies
typing-extensions,
@@ -19,23 +18,22 @@
buildPythonPackage rec {
pname = "flexparser";
- version = "0.3.1";
+ version = "0.4";
pyproject = true;
src = fetchFromGitHub {
owner = "hgrecco";
repo = "flexparser";
rev = version;
- hash = "sha256-9ImG8uh1SZ+pAbqzWBkTVn+3EBAGzzdP8vqqP59IgIw=";
+ hash = "sha256-0Ocp4GsrnzkpSqnP+AK5OxJ3KyUf5Uc6CegDXpRYRqo=";
};
- nativeBuildInputs = [
+ build-system = [
setuptools
setuptools-scm
- wheel
];
- propagatedBuildInputs = [ typing-extensions ];
+ dependencies = [ typing-extensions ];
nativeCheckInputs = [
pytestCheckHook
diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix
index 825e4435535a..da47860de927 100644
--- a/pkgs/development/python-modules/flit/default.nix
+++ b/pkgs/development/python-modules/flit/default.nix
@@ -2,13 +2,20 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+
+ # build-system
+ flit-core,
+
+ # dependencies
docutils,
+ pip,
requests,
+ tomli-w,
+
+ # tests
pytestCheckHook,
testpath,
responses,
- flit-core,
- tomli-w,
}:
# Flit is actually an application to build universal wheels.
@@ -18,27 +25,23 @@
buildPythonPackage rec {
pname = "flit";
- version = "3.9.0";
+ version = "3.10.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "takluyver";
repo = "flit";
rev = version;
- hash = "sha256-yl2+PcKr7xRW4oIBWl+gzh/nKhSNu5GH9fWKRGgaNHU=";
+ hash = "sha256-4JMoK1UxYcHoSvKDF7Yn4iqMXokyCPCswQknK0a070k=";
};
- patches = [
- # https://github.com/pypa/flit/commit/6ab62c91d0db451b5e9ab000f0dba5471550b442.patch
- ./python314-compat.patch
- ];
+ build-system = [ flit-core ];
- nativeBuildInputs = [ flit-core ];
-
- propagatedBuildInputs = [
+ dependencies = [
docutils
- requests
flit-core
+ pip
+ requests
tomli-w
];
diff --git a/pkgs/development/python-modules/flit/python314-compat.patch b/pkgs/development/python-modules/flit/python314-compat.patch
deleted file mode 100644
index 439592e3a63b..000000000000
--- a/pkgs/development/python-modules/flit/python314-compat.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 6ab62c91d0db451b5e9ab000f0dba5471550b442 Mon Sep 17 00:00:00 2001
-From: Thomas A Caswell
-Date: Tue, 28 May 2024 10:25:13 -0400
-Subject: [PATCH] MNT: fix compatibility with Python 3.14
-
-The ast.Str class was deprecated in 3.8 and will be removed in 3.14
----
- flit_core/flit_core/common.py | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/flit_core/flit_core/common.py b/flit_core/flit_core/common.py
-index 6625224b..8bcda3fb 100644
---- a/flit_core/flit_core/common.py
-+++ b/flit_core/flit_core/common.py
-@@ -148,6 +148,10 @@ def get_docstring_and_version_via_ast(target):
- with target_path.open('rb') as f:
- node = ast.parse(f.read())
- for child in node.body:
-+ if sys.version_info >= (3, 8):
-+ target_type = ast.Constant
-+ else:
-+ target_type = ast.Str
- # Only use the version from the given module if it's a simple
- # string assignment to __version__
- is_version_str = (
-@@ -157,10 +161,13 @@ def get_docstring_and_version_via_ast(target):
- and target.id == "__version__"
- for target in child.targets
- )
-- and isinstance(child.value, ast.Str)
-+ and isinstance(child.value, target_type)
- )
- if is_version_str:
-- version = child.value.s
-+ if sys.version_info >= (3, 8):
-+ version = child.value.value
-+ else:
-+ version = child.value.s
- break
- return ast.get_docstring(node), version
-
diff --git a/pkgs/development/python-modules/freud/default.nix b/pkgs/development/python-modules/freud/default.nix
index 9fa555e28170..da4d966c8129 100644
--- a/pkgs/development/python-modules/freud/default.nix
+++ b/pkgs/development/python-modules/freud/default.nix
@@ -51,13 +51,6 @@ buildPythonPackage rec {
touch extern/{voro++,fsph,Eigen}/.git
'';
- # Scipy still depends on numpy 1, and so we'd get 'package duplicates in
- # closure' error if we'd use numpy_2
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace-fail 'numpy>=2.0.0rc1' 'numpy' \
- '';
-
nativeBuildInputs = [
cmake
cython
diff --git a/pkgs/development/python-modules/future/default.nix b/pkgs/development/python-modules/future/default.nix
index 47ed954e1b1a..730274bc19d3 100644
--- a/pkgs/development/python-modules/future/default.nix
+++ b/pkgs/development/python-modules/future/default.nix
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchPypi,
+ pythonAtLeast,
# build-system
setuptools,
@@ -12,6 +13,9 @@ buildPythonPackage rec {
version = "1.0.0";
pyproject = true;
+ # https://github.com/PythonCharmers/python-future/issues/640
+ disabled = pythonAtLeast "3.13";
+
src = fetchPypi {
inherit pname version;
hash = "sha256-vSloMJMHhh7a4UWKT4pPNZjAO+Q7l1IQdq6/XZTAewU=";
diff --git a/pkgs/development/python-modules/geojson/default.nix b/pkgs/development/python-modules/geojson/default.nix
index a8c1ea999077..eb070e8234a9 100644
--- a/pkgs/development/python-modules/geojson/default.nix
+++ b/pkgs/development/python-modules/geojson/default.nix
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+ fetchpatch2,
setuptools,
unittestCheckHook,
}:
@@ -18,7 +19,15 @@ buildPythonPackage rec {
hash = "sha256-OL+7ntgzpA63ALQ8whhKRePsKxcp81PLuU1bHJvxN9U=";
};
- nativeBuildInputs = [ setuptools ];
+ 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/gpgme/default.nix b/pkgs/development/python-modules/gpgme/default.nix
new file mode 100644
index 000000000000..18604bf1d535
--- /dev/null
+++ b/pkgs/development/python-modules/gpgme/default.nix
@@ -0,0 +1,51 @@
+{
+ buildPythonPackage,
+ gpgme,
+ lib,
+ setuptools,
+ swig,
+}:
+
+buildPythonPackage {
+ pname = "gpgme";
+ inherit (gpgme) version src;
+ pyproject = true;
+
+ patches = gpgme.patches or [ ] ++ [
+ ./python313-support.patch
+ ];
+
+ postPatch = ''
+ substituteInPlace lang/python/setup.py.in \
+ --replace-fail "gpgme_h = '''" "gpgme_h = '${lib.getDev gpgme}/include/gpgme.h'"
+ '';
+
+ configureFlags = gpgme.configureFlags ++ [
+ "--enable-languages=python"
+ ];
+
+ postConfigure = "
+ cd lang/python
+ ";
+
+ preBuild = ''
+ make copystamp
+ '';
+
+ build-system = [ setuptools ];
+
+ nativeBuildInputs = [
+ swig
+ ];
+
+ buildInputs = [
+ gpgme
+ ];
+
+ pythonImportsCheck = [ "gpg" ];
+
+ meta = gpgme.meta // {
+ description = "Python bindings to the GPGME API of the GnuPG cryptography library";
+ homepage = "https://dev.gnupg.org/source/gpgme/browse/master/lang/python/";
+ };
+}
diff --git a/pkgs/development/python-modules/gpgme/python313-support.patch b/pkgs/development/python-modules/gpgme/python313-support.patch
new file mode 100644
index 000000000000..d314ad329d19
--- /dev/null
+++ b/pkgs/development/python-modules/gpgme/python313-support.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 7eef3523..b8e7d274 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -614,7 +614,7 @@ if test "$found_py" = "1"; then
+ if test "$found_py" = "1" -o "$found_py3" = "1"; then
+ # Reset everything, so that we can look for another Python.
+ m4_foreach([mym4pythonver],
+- [[2.7],[3.6],[3.8],[3.9],[3.10],[3.11],[3.12],[all]],
++ [[2.7],[3.6],[3.8],[3.9],[3.10],[3.11],[3.12],[3.13],[all]],
+ [unset PYTHON
+ unset PYTHON_VERSION
+ unset PYTHON_CPPFLAGS
diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix
index a9fe91656bec..05b8098aa639 100644
--- a/pkgs/development/python-modules/gradio/default.nix
+++ b/pkgs/development/python-modules/gradio/default.nix
@@ -77,7 +77,7 @@ buildPythonPackage rec {
# fix packaging.ParserSyntaxError, which can't handle comments
postPatch = ''
- sed -ie "s/ #.*$//g" requirements*.txt
+ sed -i -e "s/ #.*$//g" requirements*.txt
# they bundle deps?
rm -rf venv/
diff --git a/pkgs/development/python-modules/graph-tool/default.nix b/pkgs/development/python-modules/graph-tool/default.nix
index ff0ab4f62787..eefa3ea7a5e0 100644
--- a/pkgs/development/python-modules/graph-tool/default.nix
+++ b/pkgs/development/python-modules/graph-tool/default.nix
@@ -5,7 +5,7 @@
stdenv,
autoreconfHook,
- boost185,
+ boost,
cairomm,
cgal,
expat,
@@ -26,8 +26,7 @@
}:
let
- # graph-tool doesn't build against boost181 on Darwin
- boost = boost185.override {
+ boost' = boost.override {
enablePython = true;
inherit python;
};
@@ -58,7 +57,7 @@ buildPythonPackage rec {
configureFlags = [
"--with-python-module-path=$(out)/${python.sitePackages}"
- "--with-boost-libdir=${boost}/lib"
+ "--with-boost-libdir=${boost'}/lib"
"--with-cgal=${cgal}"
];
@@ -71,7 +70,7 @@ buildPythonPackage rec {
# https://graph-tool.skewed.de/installation.html#manual-compilation
dependencies = [
- boost
+ boost'
cairomm
cgal
expat
diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix
index 57043658c744..1b8fa37aa5e7 100644
--- a/pkgs/development/python-modules/graphql-core/default.nix
+++ b/pkgs/development/python-modules/graphql-core/default.nix
@@ -2,7 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
- py,
+ poetry-core,
pytest-benchmark,
pytest-asyncio,
pytestCheckHook,
@@ -11,20 +11,28 @@
buildPythonPackage rec {
pname = "graphql-core";
- version = "3.2.4";
- format = "setuptools";
+ version = "3.2.5";
+ pyproject = true;
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "graphql-python";
- repo = pname;
+ repo = "graphql-core";
rev = "refs/tags/v${version}";
- hash = "sha256-LWmUrkYZuyzQ89Z3dXrce1xk3NODXrHWvWG9zAYTUi0=";
+ hash = "sha256-xZOiQOFWnImDXuvHP9V6BDjIZwlwHSxN/os+UYV4A0M=";
};
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace-fail ', "setuptools>=59,<70"' ""
+ '';
+
+ build-system = [
+ poetry-core
+ ];
+
nativeCheckInputs = [
- py
pytest-asyncio
pytest-benchmark
pytestCheckHook
@@ -33,6 +41,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "graphql" ];
meta = with lib; {
+ changelog = "https://github.com/graphql-python/graphql-core/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
description = "Port of graphql-js to Python";
homepage = "https://github.com/graphql-python/graphql-core";
license = licenses.mit;
diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix
index 28c9a5aa3d25..2ff6279b0120 100644
--- a/pkgs/development/python-modules/gsd/default.nix
+++ b/pkgs/development/python-modules/gsd/default.nix
@@ -4,7 +4,6 @@
cython,
fetchFromGitHub,
numpy,
- numpy_2,
pytestCheckHook,
pythonOlder,
setuptools,
@@ -26,7 +25,7 @@ buildPythonPackage rec {
build-system = [
cython
- numpy_2
+ numpy
setuptools
];
diff --git a/pkgs/development/python-modules/gstools/default.nix b/pkgs/development/python-modules/gstools/default.nix
index e11048953986..136c79b2d67e 100644
--- a/pkgs/development/python-modules/gstools/default.nix
+++ b/pkgs/development/python-modules/gstools/default.nix
@@ -44,13 +44,6 @@ buildPythonPackage rec {
scipy
];
- # scipy derivation dont support numpy_2 and is patched to use version 1
- # Using numpy_2 in the derivation will cause a clojure duplicate error
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace-fail 'numpy>=2.0.0rc1,' 'numpy' \
- '';
-
pythonImportsCheck = [ "gstools" ];
nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix
index 069cd5374b4c..19daf7262e18 100644
--- a/pkgs/development/python-modules/hatchling/default.nix
+++ b/pkgs/development/python-modules/hatchling/default.nix
@@ -21,13 +21,13 @@
buildPythonPackage rec {
pname = "hatchling";
- version = "1.25.0";
+ version = "1.26.1";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
- hash = "sha256-cGRjGlEmELUiUKTT/xvYFVHW0UMcTre3LnNN9sdPQmI=";
+ hash = "sha256-jZVlkubF1d8fWRvh6XqUHHuexv0Dn0yGJMKVV7rANOk=";
};
# listed in backend/pyproject.toml
diff --git a/pkgs/development/python-modules/httptools/default.nix b/pkgs/development/python-modules/httptools/default.nix
index c6d2c176a5f6..65537e346929 100644
--- a/pkgs/development/python-modules/httptools/default.nix
+++ b/pkgs/development/python-modules/httptools/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "httptools";
- version = "0.6.1";
+ version = "0.6.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-xuJsMEVWALldlLG4NghROOgvF3NRRU7oQcFI+TqbrVo=";
+ hash = "sha256-TpPu5K3WSTtZpcUU2pjJObJE/OSg2Iec0/RmVi9LfVw=";
};
# Tests are not included in pypi tarball
diff --git a/pkgs/development/python-modules/hug/default.nix b/pkgs/development/python-modules/hug/default.nix
deleted file mode 100644
index 2bd9cc3a20db..000000000000
--- a/pkgs/development/python-modules/hug/default.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{
- lib,
- buildPythonPackage,
- fetchFromGitHub,
- isPy27,
- falcon,
- requests,
- pytestCheckHook,
- marshmallow,
- mock,
- numpy,
-}:
-
-buildPythonPackage rec {
- pname = "hug";
- version = "2.6.0";
- format = "setuptools";
- disabled = isPy27;
-
- src = fetchFromGitHub {
- owner = "hugapi";
- repo = pname;
- rev = version;
- sha256 = "05rsv16g7ph100p8kl4l2jba0y4wcpp3xblc02mfp67zp1279vaq";
- };
-
- propagatedBuildInputs = [
- falcon
- requests
- ];
-
- nativeCheckInputs = [
- mock
- marshmallow
- pytestCheckHook
- numpy
- ];
-
- postPatch = ''
- substituteInPlace setup.py --replace '"pytest-runner"' ""
- '';
-
- preCheck = ''
- # some tests need the `hug` CLI on the PATH
- export PATH=$out/bin:$PATH
- '';
-
- disabledTests = [
- # some tests attempt network access
- "test_datagram_request"
- "test_request"
- # these tests use an unstable test dependency (https://github.com/hugapi/hug/issues/859)
- "test_marshmallow_custom_context"
- "test_marshmallow_schema"
- "test_transform"
- "test_validate_route_args_negative_case"
- ];
-
- meta = with lib; {
- description = "Python framework that makes developing APIs as simple as possible, but no simpler";
- homepage = "https://github.com/hugapi/hug";
- license = licenses.mit;
- # Missing support for later falcon releases
- broken = true;
- };
-}
diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix
index b9f05dda461c..529f03a806ea 100644
--- a/pkgs/development/python-modules/importlib-resources/default.nix
+++ b/pkgs/development/python-modules/importlib-resources/default.nix
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchPypi,
+ fetchpatch2,
pythonOlder,
# build-system
@@ -33,6 +34,15 @@ buildPythonPackage rec {
hash = "sha256-mAhiodFsnhR6WWA2d/oqpf2CuH8iO2y4cGlbz86DAGU=";
};
+ patches = [
+ (fetchpatch2 {
+ # https://github.com/python/importlib_resources/issues/318
+ name = "python-3.13-compat.patch";
+ url = "https://github.com/python/importlib_resources/commit/8684c7a028b65381ec6c6724e2f9c9bea7df0aee.patch";
+ hash = "sha256-mb2V4rQPKyi5jMQ+yCf9fY3vHxB54BhvLzy2NNc0zNc=";
+ })
+ ];
+
build-system = [
setuptools
setuptools-scm
diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix
index 2435c7e46786..f19708321bfb 100644
--- a/pkgs/development/python-modules/inkex/default.nix
+++ b/pkgs/development/python-modules/inkex/default.nix
@@ -40,6 +40,8 @@ buildPythonPackage {
nativeBuildInputs = [ poetry-core ];
+ pythonRelaxDeps = [ "numpy" ];
+
propagatedBuildInputs = [
cssselect
lxml
diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix
index 84123590fe1b..9d140f2bebfa 100644
--- a/pkgs/development/python-modules/ipdb/default.nix
+++ b/pkgs/development/python-modules/ipdb/default.nix
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchPypi,
+ pythonAtLeast,
pythonOlder,
decorator,
ipython,
@@ -9,7 +10,8 @@
exceptiongroup,
tomli,
setuptools,
- unittestCheckHook,
+ pytestCheckHook,
+ pytest-timeout,
}:
buildPythonPackage rec {
@@ -36,12 +38,22 @@ buildPythonPackage rec {
tomli
];
- nativeCheckInputs = [ unittestCheckHook ];
+ nativeCheckInputs = [ pytestCheckHook ];
preCheck = ''
export HOME=$(mktemp -d)
'';
+ disabledTestPaths =
+ [
+ # OSError: pytest: reading from stdin while output is captured! Consider using `-s`.
+ "manual_test.py"
+ ]
+ ++ lib.optionals (pythonAtLeast "3.13") [
+ # tests get stuck
+ "tests/test_opts.py"
+ ];
+
meta = with lib; {
homepage = "https://github.com/gotcha/ipdb";
description = "IPython-enabled pdb";
diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix
index b88dc9311e91..8e31fe41c780 100644
--- a/pkgs/development/python-modules/jedi/default.nix
+++ b/pkgs/development/python-modules/jedi/default.nix
@@ -4,7 +4,6 @@
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
- fetchpatch2,
# build-system
setuptools,
@@ -19,7 +18,7 @@
buildPythonPackage rec {
pname = "jedi";
- version = "0.19.1";
+ version = "0.19.2";
pyproject = true;
disabled = pythonOlder "3.6";
@@ -28,21 +27,13 @@ buildPythonPackage rec {
owner = "davidhalter";
repo = "jedi";
rev = "v${version}";
- hash = "sha256-MD7lIKwAwULZp7yLE6jiao2PU6h6RIl0SQ/6b4Lq+9I=";
+ hash = "sha256-2nDQJS6LIaq91PG3Av85OMFfs1ZwId00K/kvog3PGXE=";
fetchSubmodules = true;
};
- patches = [
- (fetchpatch2 {
- # pytest8 compat
- url = "https://github.com/davidhalter/jedi/commit/39c8317922f8f0312c12127cad10aea38d0ed7b5.patch";
- hash = "sha256-wXHWcfoRJUl+ADrNMML0+DYTcRTyLs55Qrs7sDqT8BA=";
- })
- ];
+ build-system = [ setuptools ];
- nativeBuildInputs = [ setuptools ];
-
- propagatedBuildInputs = [ parso ];
+ dependencies = [ parso ];
nativeCheckInputs = [
attrs
@@ -58,10 +49,6 @@ buildPythonPackage rec {
# sensitive to platform, causes false negatives on darwin
"test_import"
]
- ++ lib.optionals (stdenv.hostPlatform.isAarch64 && pythonOlder "3.9") [
- # AssertionError: assert 'foo' in ['setup']
- "test_init_extension_module"
- ]
++ lib.optionals (stdenv.targetPlatform.useLLVM or false) [
# InvalidPythonEnvironment: The python binary is potentially unsafe.
"test_create_environment_executable"
diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index f07acb53dc69..437bd302e3e2 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -110,8 +110,6 @@ buildPythonPackage rec {
# script.
postPatch =
''
- substituteInPlace pyproject.toml \
- --replace-fail '"numpy>=2.0.0rc1,<2.3",' ""
patchShebangs tools
''
+ lib.optionalString (stdenv.hostPlatform.isLinux && interactive) ''
diff --git a/pkgs/development/python-modules/ml-dtypes/default.nix b/pkgs/development/python-modules/ml-dtypes/default.nix
index b23ca450327c..1b8b581267c3 100644
--- a/pkgs/development/python-modules/ml-dtypes/default.nix
+++ b/pkgs/development/python-modules/ml-dtypes/default.nix
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+ fetchpatch2,
# build-system
setuptools,
@@ -30,9 +31,16 @@ buildPythonPackage rec {
fetchSubmodules = true;
};
+ patches = [
+ (fetchpatch2 {
+ name = "numpy2-compat.patch";
+ url = "https://github.com/jax-ml/ml_dtypes/commit/204df1147fd568f65890d958b6cdfa4dc55a226c.patch";
+ hash = "sha256-IPHE6bQTbM0Ky5X6FDwwD/1eXL+kcA/D8pDGihAiJrQ=";
+ })
+ ];
+
postPatch = ''
substituteInPlace pyproject.toml \
- --replace-fail "numpy~=2.0" "numpy" \
--replace-fail "setuptools~=73.0.1" "setuptools"
'';
diff --git a/pkgs/development/python-modules/moderngl-window/default.nix b/pkgs/development/python-modules/moderngl-window/default.nix
index e9eed7317097..ef838c9196e7 100644
--- a/pkgs/development/python-modules/moderngl-window/default.nix
+++ b/pkgs/development/python-modules/moderngl-window/default.nix
@@ -40,13 +40,15 @@ buildPythonPackage rec {
hash = "sha256-WXHQVJJCE+7FQJjRgjnmpoGGnF20OQ6/X6Fnrzsp2fA=";
};
- pythonRelaxDeps = [ "pillow" ];
+ pythonRelaxDeps = [
+ "numpy" # https://github.com/moderngl/moderngl-window/issues/193
+ ];
build-system = [
setuptools
];
- dependencies = [
+ propagatedBuildInputs = [
moderngl
numpy
pillow
diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix
index e4cee7571da9..60eddaf3ba6a 100644
--- a/pkgs/development/python-modules/moto/default.nix
+++ b/pkgs/development/python-modules/moto/default.nix
@@ -37,14 +37,14 @@
buildPythonPackage rec {
pname = "moto";
- version = "5.0.18";
+ version = "5.0.20";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
- hash = "sha256-inrS9ToubMnbL/ZcDg1LXX54vAC4Jcnh/2zDlDceduk=";
+ hash = "sha256-JLExnMZvgfQIF6V6yAYCpfGGJmm91iHw2Wq5iaZXglU=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix
index 1af1b9814a16..30f821da7385 100644
--- a/pkgs/development/python-modules/msgspec/default.nix
+++ b/pkgs/development/python-modules/msgspec/default.nix
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+ fetchpatch2,
pythonOlder,
setuptools,
}:
@@ -20,7 +21,19 @@ buildPythonPackage rec {
hash = "sha256-xqtV60saQNINPMpOnZRSDnicedPSPBUQwPSE5zJGrTo=";
};
- nativeBuildInputs = [ setuptools ];
+ patches = [
+ (fetchpatch2 {
+ name = "python-3.13-compat.patch";
+ url = "https://github.com/jcrist/msgspec/commit/7ade46952adea22f3b2bb9c2b8b3139e4f2831b7.patch";
+ includes = [
+ "msgspec/_core.c"
+ "msgspec/_utils.py"
+ ];
+ hash = "sha256-yYotfJXUOaFiqvy0u+LqAx2YYnibNDXA24cE1ibPSOc=";
+ })
+ ];
+
+ build-system = [ setuptools ];
# Requires libasan to be accessible
doCheck = false;
diff --git a/pkgs/development/python-modules/multipart/default.nix b/pkgs/development/python-modules/multipart/default.nix
index 46ccd9bfa8f3..ff4aa63698db 100644
--- a/pkgs/development/python-modules/multipart/default.nix
+++ b/pkgs/development/python-modules/multipart/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "multipart";
- version = "1.1.0";
+ version = "1.2.1";
pyproject = true;
src = fetchFromGitHub {
owner = "defnull";
repo = "multipart";
rev = "refs/tags/v${version}";
- hash = "sha256-RaHAV1LapYf0zRW7cxxbe7ysAJ5xB6EvF1bsCbCWS0U=";
+ hash = "sha256-mQMv5atWrWpwyY9YYjaRYNDm5AfW54drPSKL7qiae+I=";
};
build-system = [ flit-core ];
@@ -25,7 +25,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "multipart" ];
meta = {
- changelog = "https://github.com/defnull/multipart/blob/${src.rev}/README.rst#changelog";
+ changelog = "https://github.com/defnull/multipart/blob/${src.rev}/CHANGELOG.rst";
description = "Parser for multipart/form-data";
homepage = "https://github.com/defnull/multipart";
license = lib.licenses.mit;
diff --git a/pkgs/development/python-modules/mxnet/default.nix b/pkgs/development/python-modules/mxnet/default.nix
index 3b9f692d7205..75f9ff539146 100644
--- a/pkgs/development/python-modules/mxnet/default.nix
+++ b/pkgs/development/python-modules/mxnet/default.nix
@@ -29,6 +29,7 @@ buildPythonPackage {
pythonRelaxDeps = [
"graphviz"
+ "numpy"
];
LD_LIBRARY_PATH = lib.makeLibraryPath [ pkgs.mxnet ];
diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix
index e43f0e1bd1a2..022f29733f83 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -3,7 +3,6 @@
stdenv,
buildPythonPackage,
fetchFromGitHub,
- fetchpatch2,
gitUpdater,
pythonAtLeast,
pythonOlder,
@@ -33,28 +32,18 @@
buildPythonPackage rec {
pname = "mypy";
- version = "1.11.2";
+ version = "1.13.0";
pyproject = true;
- # mypy doesn't support python313 yet
- # https://github.com/python/mypy/issues/17264
- disabled = pythonOlder "3.8" || pythonAtLeast "3.13";
+ disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "python";
repo = "mypy";
rev = "refs/tags/v${version}";
- hash = "sha256-5gfqIBtI/G5HARYdXHjYNYNRxeNgrk9dnpSgvMSu9bw=";
+ hash = "sha256-P2Ozmj7/7QBmjlveHLsNdYgUAerg0qOoa8pO0iQc5os=";
};
- patches = [
- (fetchpatch2 {
- name = "python3.12.7-compat.patch";
- url = "https://github.com/python/mypy/commit/1a2c8e2a4df21532e4952191cad74ae50083f4ad.patch";
- hash = "sha256-GBQPTkdoLeErjbRUjZBFEwvCcN/WzC3OYVvou6M+f80=";
- })
- ];
-
passthru.updateScript = gitUpdater {
rev-prefix = "v";
};
@@ -140,12 +129,12 @@ buildPythonPackage rec {
inherit (nixosTests) nixos-test-driver;
};
- meta = with lib; {
+ meta = {
description = "Optional static typing for Python";
homepage = "https://www.mypy-lang.org";
changelog = "https://github.com/python/mypy/blob/${src.rev}/CHANGELOG.md";
- license = licenses.mit;
+ license = lib.licenses.mit;
mainProgram = "mypy";
- maintainers = with maintainers; [ lnl7 ];
+ maintainers = with lib.maintainers; [ lnl7 ];
};
}
diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix
index 870b0dba1088..d13414c12567 100644
--- a/pkgs/development/python-modules/nbconvert/default.nix
+++ b/pkgs/development/python-modules/nbconvert/default.nix
@@ -86,6 +86,11 @@ buildPythonPackage rec {
pytestCheckHook
];
+ pytestFlagsArray = [
+ "-W"
+ "ignore::DeprecationWarning"
+ ];
+
disabledTests = [
# Attempts network access (Failed to establish a new connection: [Errno -3] Temporary failure in name resolution)
"test_export"
diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix
index e6eb3344e8d9..7c31e3e4acc7 100644
--- a/pkgs/development/python-modules/nbformat/default.nix
+++ b/pkgs/development/python-modules/nbformat/default.nix
@@ -1,6 +1,7 @@
{
lib,
buildPythonPackage,
+ pythonAtLeast,
pythonOlder,
fetchPypi,
hatchling,
@@ -45,6 +46,14 @@ buildPythonPackage rec {
testpath
];
+ disabledTestPaths = lib.optionals (pythonAtLeast "3.13") [
+ # ResourceWarning: unclosed database in
+ "tests/test_validator.py"
+ "tests/v4/test_convert.py"
+ "tests/v4/test_json.py"
+ "tests/v4/test_validate.py"
+ ];
+
# Some of the tests use localhost networking.
__darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/nbmake/default.nix b/pkgs/development/python-modules/nbmake/default.nix
index 4c6d46e6d470..d070f39853cb 100644
--- a/pkgs/development/python-modules/nbmake/default.nix
+++ b/pkgs/development/python-modules/nbmake/default.nix
@@ -56,6 +56,10 @@ buildPythonPackage rec {
typing-extensions
];
+ preCheck = ''
+ export HOME=$(mktemp -d)
+ '';
+
__darwinAllowLocalNetworking = true;
meta = {
diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix
index 056949ef2f97..7f49fed39528 100644
--- a/pkgs/development/python-modules/netcdf4/default.nix
+++ b/pkgs/development/python-modules/netcdf4/default.nix
@@ -32,10 +32,6 @@ buildPythonPackage rec {
hash = "sha256-N9VX42ZUiJ1wIBkr+1b51fk4lMsymX64N65YbFOP17Y=";
};
- postPatch = ''
- sed -i "/numpy>=/d" pyproject.toml
- '';
-
build-system = [
cython
oldest-supported-numpy
diff --git a/pkgs/development/python-modules/nitime/default.nix b/pkgs/development/python-modules/nitime/default.nix
index 35b8eb4c46fc..d6295005e693 100644
--- a/pkgs/development/python-modules/nitime/default.nix
+++ b/pkgs/development/python-modules/nitime/default.nix
@@ -27,13 +27,6 @@ buildPythonPackage rec {
hash = "sha256-4Ie8fuk9CKdn/64TsCfN2No2dU16ICpBRWYerqqF0/0=";
};
- # Upstream wants to build against the newest version of numpy possible, but
- # we only want to build against our default numpy.
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace-fail "numpy>=2.0.0rc1,<3" "numpy"
- '';
-
nativeBuildInputs = [
cython
setuptools
diff --git a/pkgs/development/python-modules/norfair/default.nix b/pkgs/development/python-modules/norfair/default.nix
index 24376e28863f..7624e396b9de 100644
--- a/pkgs/development/python-modules/norfair/default.nix
+++ b/pkgs/development/python-modules/norfair/default.nix
@@ -25,13 +25,14 @@ buildPythonPackage rec {
hash = "sha256-aKB5TYSLW7FOXIy9u2hK7px6eEmIQdKPrhChKaU1uYs=";
};
- nativeBuildInputs = [
- poetry-core
+ build-system = [ poetry-core ];
+
+ pythonRelaxDeps = [
+ "numpy"
+ "rich"
];
- pythonRelaxDeps = [ "rich" ];
-
- propagatedBuildInputs = [
+ dependencies = [
filterpy
importlib-metadata
numpy
diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index 18bd264c5d76..b9a3e734a580 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage,
setuptools,
numpy,
- numpy_2,
+ numpy_1,
llvmlite,
libcxx,
importlib-metadata,
@@ -161,8 +161,8 @@ buildPythonPackage rec {
doFullCheck = true;
testsWithoutSandbox = false;
};
- numpy_2 = numba.override {
- numpy = numpy_2;
+ numpy_1 = numba.override {
+ numpy = numpy_1;
};
};
diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix
index 403d5ea16051..e7d2a690f140 100644
--- a/pkgs/development/python-modules/numcodecs/default.nix
+++ b/pkgs/development/python-modules/numcodecs/default.nix
@@ -58,7 +58,8 @@ buildPythonPackage rec {
];
# https://github.com/NixOS/nixpkgs/issues/255262
- pytestFlagsArray = [ "$out/${python.sitePackages}/numcodecs" ];
+ preCheck = "pushd $out";
+ postCheck = "popd";
meta = {
homepage = "https://github.com/zarr-developers/numcodecs";
diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix
index 3681e0d9c73a..bda5304a69c0 100644
--- a/pkgs/development/python-modules/numexpr/default.nix
+++ b/pkgs/development/python-modules/numexpr/default.nix
@@ -32,15 +32,6 @@ buildPythonPackage rec {
dos2unix numexpr/tests/test_numexpr.py
'';
- # patch for compatibility with numpy < 2.0
- # see more details, https://numpy.org/devdocs/numpy_2_0_migration_guide.html#c-api-changes
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace-fail "numpy>=2.0.0" "numpy"
- sed -i "1i#define PyDataType_SET_ELSIZE(descr, elsize)" numexpr/interpreter.cpp
- sed -i "1i#define PyDataType_ELSIZE(descr) ((descr)->elsize)" numexpr/interpreter.cpp
- '';
-
nativeBuildInputs = [ dos2unix ];
build-system = [
diff --git a/pkgs/development/python-modules/numpy/1.nix b/pkgs/development/python-modules/numpy/1.nix
index 795f24e5eefa..fad35559c9ed 100644
--- a/pkgs/development/python-modules/numpy/1.nix
+++ b/pkgs/development/python-modules/numpy/1.nix
@@ -126,7 +126,7 @@ buildPythonPackage rec {
# HACK: copy mesonEmulatorHook's flags to the variable used by meson-python
postConfigure = ''
- mesonFlags="$mesonFlags ''${mesonFlagsArray[@]}"
+ concatTo mesonFlags mesonFlagsArray
'';
preBuild = ''
diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix
index 5acc21db4538..db4d1fcc63ee 100644
--- a/pkgs/development/python-modules/numpy/2.nix
+++ b/pkgs/development/python-modules/numpy/2.nix
@@ -59,7 +59,7 @@ let
in
buildPythonPackage rec {
pname = "numpy";
- version = "2.1.2";
+ version = "2.1.3";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -67,7 +67,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
extension = "tar.gz";
- hash = "sha256-E1MqCIIX+mJMmbhD7rVGQN4js0FLFKpm0COAXrcxBmw=";
+ hash = "sha256-qgjgTgiq+XTURY3vU53s4NKBRthmo52lY5WW9JIf12E=";
};
patches = lib.optionals python.hasDistutilsCxxPatch [
@@ -103,7 +103,7 @@ buildPythonPackage rec {
# HACK: copy mesonEmulatorHook's flags to the variable used by meson-python
postConfigure = ''
- mesonFlags="$mesonFlags ''${mesonFlagsArray[@]}"
+ concatTo mesonFlags mesonFlagsArray
'';
buildInputs = [
diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix
index fbbc8a6a1ad9..ea504ea4f621 100644
--- a/pkgs/development/python-modules/oauthlib/default.nix
+++ b/pkgs/development/python-modules/oauthlib/default.nix
@@ -7,6 +7,7 @@
mock,
pyjwt,
pytestCheckHook,
+ pythonAtLeast,
pythonOlder,
setuptools,
@@ -47,10 +48,14 @@ buildPythonPackage rec {
pytestCheckHook
] ++ lib.flatten (lib.attrValues optional-dependencies);
- disabledTests = [
- # https://github.com/oauthlib/oauthlib/issues/877
- "test_rsa_bad_keys"
- ];
+ disabledTests =
+ [
+ # https://github.com/oauthlib/oauthlib/issues/877
+ "test_rsa_bad_keys"
+ ]
+ ++ lib.optionals (pythonAtLeast "3.13") [
+ "test_filter_params"
+ ];
pythonImportsCheck = [ "oauthlib" ];
diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix
index bdd104518852..de84c59b59b8 100644
--- a/pkgs/development/python-modules/objgraph/default.nix
+++ b/pkgs/development/python-modules/objgraph/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "objgraph";
- version = "3.6.1";
+ version = "3.6.2";
pyproject = true;
disabled = pythonOlder "3.7" || isPyPy;
src = fetchPypi {
inherit pname version;
- hash = "sha256-/pbHQUe7yq6GZbOW5TiL3MMZfe67pOY4HwUgLuW0U6c=";
+ hash = "sha256-ALny9A90IuPH9FphxNr9r4HwP/BknW6uyGbwEDDlGtg=";
};
patches = [
diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix
index 98ce76ed1480..5476d86dab19 100644
--- a/pkgs/development/python-modules/orjson/default.nix
+++ b/pkgs/development/python-modules/orjson/default.nix
@@ -31,7 +31,7 @@
buildPythonPackage rec {
pname = "orjson";
- version = "3.10.7";
+ version = "3.10.11";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -40,13 +40,13 @@ buildPythonPackage rec {
owner = "ijl";
repo = "orjson";
rev = "refs/tags/${version}";
- hash = "sha256-+ofDblSbaG8CjRXFfF0QFpq2yGmLF/2yILqk2m8PSl8=";
+ hash = "sha256-RJcTyLf2pLb1kHd7+5K9dGMWja4KFdKIwdRAp6Ud+Ps=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
- hash = "sha256-MACmdptHmnifBTfB5s+CY6npAOFIrh0zvrIImYghGsw=";
+ hash = "sha256-HlvsV3Bsxa4Ud1+RrEnDWKX82DRyfgBS7GvK9827/wE=";
};
maturinBuildFlags = [ "--interpreter ${python.executable}" ];
diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix
index 4ddebe8901df..e93e3680351b 100644
--- a/pkgs/development/python-modules/packaging/default.nix
+++ b/pkgs/development/python-modules/packaging/default.nix
@@ -15,14 +15,14 @@
let
packaging = buildPythonPackage rec {
pname = "packaging";
- version = "24.1";
+ version = "24.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-Am7XLI7T/M5b+JUFciWGmJJ/0dvaEKXpgc3wrDf08AI=";
+ hash = "sha256-wiim3F6TLTRrxXOTeRCdSeiFPdgiNXHHxbVSYO3AuX8=";
};
nativeBuildInputs = [ flit-core ];
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index 9c707351f209..1e2d51af3627 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -80,7 +80,6 @@ let
substituteInPlace pyproject.toml \
--replace-fail "meson-python==0.13.1" "meson-python>=0.13.1" \
--replace-fail "meson==1.2.1" "meson>=1.2.1" \
- --replace-fail "numpy>=2.0" "numpy"
'';
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix
index 8af2b491701d..62663c9cd9da 100644
--- a/pkgs/development/python-modules/parameterized/default.nix
+++ b/pkgs/development/python-modules/parameterized/default.nix
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchPypi,
+ fetchpatch2,
mock,
pytestCheckHook,
pythonOlder,
@@ -20,6 +21,14 @@ buildPythonPackage rec {
hash = "sha256-f8kFJyzvpPNkwaNCnLvpwPmLeTmI77W/kKrIDwjbCbE=";
};
+ patches = [
+ (fetchpatch2 {
+ name = "parameterized-docstring-3.13-compat.patch";
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-python/parameterized/files/parameterized-0.9.0-py313-test.patch?id=dec60bb6900d6ebdaaa6aa1dcb845b30b739f9b5";
+ hash = "sha256-tWcN0eRC0oRHrOaa/cctXLhi1WapDKvxO36e6gU6UIk=";
+ })
+ ];
+
postPatch = ''
# broken with pytest 7 and python 3.12
# https://github.com/wolever/parameterized/issues/167
diff --git a/pkgs/development/python-modules/patsy/default.nix b/pkgs/development/python-modules/patsy/default.nix
index d5acbee88521..5db6c74916f1 100644
--- a/pkgs/development/python-modules/patsy/default.nix
+++ b/pkgs/development/python-modules/patsy/default.nix
@@ -1,9 +1,8 @@
{
lib,
- fetchPypi,
+ fetchFromGitHub,
buildPythonPackage,
setuptools,
- six,
numpy,
scipy, # optional, allows spline-related features (see patsy's docs)
pytestCheckHook,
@@ -11,18 +10,19 @@
buildPythonPackage rec {
pname = "patsy";
- version = "0.5.6";
+ version = "1.0.1";
pyproject = true;
- src = fetchPypi {
- inherit pname version;
- hash = "sha256-lcbUenIiU1+Ev/f2PXMD8uKXdHpZjbic9cZ/DAx9LNs=";
+ src = fetchFromGitHub {
+ owner = "pydata";
+ repo = "patsy";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-gtkvFxNzMFiBBiuKhelSSsTilA/fLJSC5QHqDLiRrWE=";
};
- nativeBuildInputs = [ setuptools ];
+ build-system = [ setuptools ];
- propagatedBuildInputs = [
- six
+ dependencies = [
numpy
scipy
];
@@ -32,6 +32,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "patsy" ];
meta = {
+ changelog = "https://github.com/pydata/patsy/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
description = "Python package for describing statistical models";
homepage = "https://github.com/pydata/patsy";
license = lib.licenses.bsd2;
diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix
index cd49841eecad..0a22016c926f 100644
--- a/pkgs/development/python-modules/pendulum/default.nix
+++ b/pkgs/development/python-modules/pendulum/default.nix
@@ -3,6 +3,7 @@
stdenv,
buildPythonPackage,
fetchFromGitHub,
+ fetchpatch,
pythonOlder,
isPyPy,
@@ -53,6 +54,15 @@ buildPythonPackage rec {
'';
};
+ patches = [
+ # fix build on 32bit
+ # https://github.com/sdispater/pendulum/pull/842
+ (fetchpatch {
+ url = "https://github.com/sdispater/pendulum/commit/6f2fcb8b025146ae768a5889be4a437fbd3156d6.patch";
+ hash = "sha256-47591JvpADxGQT2q7EYWHfStaiWyP7dt8DPTq0tiRvk=";
+ })
+ ];
+
nativeBuildInputs = [
poetry-core
rustPlatform.maturinBuildHook
diff --git a/pkgs/development/python-modules/photutils/default.nix b/pkgs/development/python-modules/photutils/default.nix
index f81ba4f5ec4d..bfe057b3796f 100644
--- a/pkgs/development/python-modules/photutils/default.nix
+++ b/pkgs/development/python-modules/photutils/default.nix
@@ -35,11 +35,6 @@ buildPythonPackage rec {
hash = "sha256-gXtC6O8rXBBa8VMuqxshnJieAahv3bCY2C1BXNmJxb4=";
};
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace-fail "'numpy>=2.0.0'," ""
- '';
-
build-system = [
setuptools
setuptools-scm
diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix
index da280313c9e9..6c1cea184fd7 100644
--- a/pkgs/development/python-modules/pikepdf/default.nix
+++ b/pkgs/development/python-modules/pikepdf/default.nix
@@ -25,10 +25,10 @@
buildPythonPackage rec {
pname = "pikepdf";
- version = "9.2.1";
+ version = "9.4.2";
pyproject = true;
- disabled = pythonOlder "3.8";
+ disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "pikepdf";
@@ -40,7 +40,7 @@ buildPythonPackage rec {
postFetch = ''
rm "$out/.git_archival.txt"
'';
- hash = "sha256-k50Wg/JvHgOULocUsYRjYH+q1M+5DTFLBZzHC6io+To=";
+ hash = "sha256-J/ipkKqZifkWtgv7z/MJPwRK+yB7MP/19PDdjV1NMpY=";
};
patches = [
diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix
index 1339b39505a9..e480d1657875 100644
--- a/pkgs/development/python-modules/pint/default.nix
+++ b/pkgs/development/python-modules/pint/default.nix
@@ -9,9 +9,9 @@
setuptools-scm,
# dependencies
- appdirs,
flexcache,
flexparser,
+ platformdirs,
typing-extensions,
# tests
@@ -25,7 +25,7 @@
buildPythonPackage rec {
pname = "pint";
- version = "0.24.3";
+ version = "0.24.4";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -34,7 +34,7 @@ buildPythonPackage rec {
owner = "hgrecco";
repo = "pint";
rev = "refs/tags/${version}";
- hash = "sha256-PJEgwshTBIqmKMEro+IT+7v4dab3qD7I45OuTOJloR0=";
+ hash = "sha256-Pr+BRLj6BjEDwKJ24qxmfiJswpgQJDumAx3rT6tQHSY=";
};
build-system = [
@@ -43,9 +43,9 @@ buildPythonPackage rec {
];
dependencies = [
- appdirs
flexcache
flexparser
+ platformdirs
typing-extensions
# Both uncertainties and numpy are not necessarily needed for every
diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix
index 069ffd31a4ab..f21b2b38c844 100644
--- a/pkgs/development/python-modules/pkginfo/default.nix
+++ b/pkgs/development/python-modules/pkginfo/default.nix
@@ -2,21 +2,29 @@
lib,
buildPythonPackage,
fetchPypi,
+ setuptools,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "pkginfo";
- version = "1.11.1";
- format = "setuptools";
+ version = "1.11.2";
+ pyproject = true;
src = fetchPypi {
inherit pname version;
- hash = "sha256-Lg3KHPTI45ZE7tMkCOqZZu4V4NMkxiuomaOTs8a0Z6o=";
+ hash = "sha256-xryRa4KY0VnjHywhbjXuW4bafaGIdPh5eY0KGYNTfIY=";
};
+ build-system = [ setuptools ];
+
nativeCheckInputs = [ pytestCheckHook ];
+ disabledTests = [
+ # wheel metadata version mismatch 2.1 vs 2.3
+ "test_installed_ctor_w_dist_info"
+ ];
+
pythonImportsCheck = [ "pkginfo" ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index ab177fa01b32..9823c41c4fec 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -38,9 +38,18 @@ buildPythonPackage rec {
sourceRoot = "${src.name}/packages/python/plotly";
+ # tracking numpy 2 issue: https://github.com/plotly/plotly.py/pull/4622
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "\"jupyterlab~=3.0;python_version>='3.6'\"," ""
+
+ substituteInPlace plotly/tests/test_optional/test_utils/test_utils.py \
+ --replace-fail "np.NaN" "np.nan" \
+ --replace-fail "np.NAN" "np.nan" \
+ --replace-fail "np.Inf" "np.inf"
+
+ substituteInPlace plotly/tests/test_optional/test_px/test_imshow.py \
+ --replace-fail "- 255 * img.max()" "- np.int64(255) * img.max()"
'';
env.SKIP_NPM = true;
@@ -91,6 +100,9 @@ buildPythonPackage rec {
# AssertionError: assert "plotly" not in sys.modules
"test_dependencies_not_imported"
"test_lazy_imports"
+ # numpy2 related error, RecursionError
+ # https://github.com/plotly/plotly.py/pull/4622#issuecomment-2452886352
+ "test_masked_constants_example"
];
disabledTestPaths =
[
diff --git a/pkgs/development/python-modules/pot/default.nix b/pkgs/development/python-modules/pot/default.nix
index 9d361a3ff11c..196b93dc224a 100644
--- a/pkgs/development/python-modules/pot/default.nix
+++ b/pkgs/development/python-modules/pot/default.nix
@@ -87,9 +87,6 @@ buildPythonPackage rec {
--replace " --durations=20" "" \
--replace " --junit-xml=junit-results.xml" ""
- substituteInPlace pyproject.toml \
- --replace-fail "numpy>=2.0.0" "numpy"
-
# we don't need setup.py to find the macos sdk for us
sed -i '/sdk_path/d' setup.py
'';
diff --git a/pkgs/development/python-modules/propcache/default.nix b/pkgs/development/python-modules/propcache/default.nix
index 7dc515ef6fee..143b27953077 100644
--- a/pkgs/development/python-modules/propcache/default.nix
+++ b/pkgs/development/python-modules/propcache/default.nix
@@ -4,6 +4,7 @@
cython,
expandvars,
fetchFromGitHub,
+ pytest-codspeed,
pytest-cov-stub,
pytest-xdist,
pytestCheckHook,
@@ -13,7 +14,7 @@
buildPythonPackage rec {
pname = "propcache";
- version = "0.2.0";
+ version = "0.2.1";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -22,7 +23,7 @@ buildPythonPackage rec {
owner = "aio-libs";
repo = "propcache";
rev = "refs/tags/v${version}";
- hash = "sha256-S0u5/HJYtZCWB9X+Nlnz+oSFb3o98mGWWwsNLodzS9g=";
+ hash = "sha256-j2PjSaOx0IKijoMjhtYVNrpqEwRjVFsON5OU/Fv5idc=";
};
build-system = [
@@ -32,6 +33,7 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
+ pytest-codspeed
pytest-cov-stub
pytest-xdist
pytestCheckHook
diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix
index 8e0cc3cc7a51..07674f06e050 100644
--- a/pkgs/development/python-modules/protobuf/default.nix
+++ b/pkgs/development/python-modules/protobuf/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "protobuf";
- version = "5.28.3";
+ version = "5.29.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
- hash = "sha256-ZLrbxJGApeQB83P5znqx0Ytj991KnNxDySufC0gc73s=";
+ hash = "sha256-RFoMAkg4ae2FE6WF2AAg0BLG3GAHX5b6BWOnJJh7EAE=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix
index ee3f390b79af..ee79e250e1d7 100644
--- a/pkgs/development/python-modules/psutil/default.nix
+++ b/pkgs/development/python-modules/psutil/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage rec {
# - the other disabled tests are likely due to sanboxing (missing specific errors)
pytestFlagsArray = [
# Note: $out must be referenced as test import paths are relative
- "$out/${python.sitePackages}/psutil/tests/test_system.py"
+ "${placeholder "out"}/${python.sitePackages}/psutil/tests/test_system.py"
];
disabledTests = [
diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix
index 7cba53cb3ec0..33cc96524f56 100644
--- a/pkgs/development/python-modules/psycopg/default.nix
+++ b/pkgs/development/python-modules/psycopg/default.nix
@@ -210,8 +210,7 @@ buildPythonPackage rec {
];
pytestFlagsArray = [
- "-o"
- "cache_dir=$TMPDIR"
+ "-o cache_dir=.cache"
"-m"
"'not refcount and not timing and not flakey'"
# pytest.PytestRemovedIn9Warning: Marks applied to fixtures have no effect
diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix
index aaab94547a02..5b8501a29cdb 100644
--- a/pkgs/development/python-modules/psycopg2/default.nix
+++ b/pkgs/development/python-modules/psycopg2/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "psycopg2";
- version = "2.9.9";
+ version = "2.9.10";
format = "setuptools";
# Extension modules don't work well with PyPy. Use psycopg2cffi instead.
@@ -29,7 +29,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- hash = "sha256-0UVL3pP7HiJBZoEWlNYA50ZDDABvuwMeoG7MLqQb8VY=";
+ hash = "sha256-EuwLQLAnP5UpYjPodQRBM5KY5qVy9wOdpbJg48i2DhE=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/pure-eval/default.nix b/pkgs/development/python-modules/pure-eval/default.nix
index a94abf72712a..e9c48fe6c51d 100644
--- a/pkgs/development/python-modules/pure-eval/default.nix
+++ b/pkgs/development/python-modules/pure-eval/default.nix
@@ -9,22 +9,22 @@
}:
buildPythonPackage rec {
- pname = "pure_eval";
- version = "0.2.2";
+ pname = "pure-eval";
+ version = "0.2.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "alexmojaki";
- repo = pname;
+ repo = "pure_eval";
rev = "v${version}";
- hash = "sha256-9N+UcgAv30s4ctgsBrOHiix4BoXhKPgxH/GOz/NIFdU=";
+ hash = "sha256-gdP8/MkzTyjkZaWUG5PoaOtBqzbCXYNYBX2XBLWLh18=";
};
- buildInputs = [ setuptools-scm ];
+ build-system = [ setuptools-scm ];
- propagatedBuildInputs = [ toml ];
+ dependencies = [ toml ];
nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix
index ba171e372c8b..46a1151edd04 100644
--- a/pkgs/development/python-modules/pyarrow/default.nix
+++ b/pkgs/development/python-modules/pyarrow/default.nix
@@ -9,7 +9,7 @@
cffi,
cloudpickle,
cmake,
- cython_0,
+ cython,
fsspec,
hypothesis,
numpy,
@@ -37,7 +37,7 @@ buildPythonPackage rec {
nativeBuildInputs = [
cmake
- cython_0
+ cython
pkg-config
setuptools
setuptools-scm
diff --git a/pkgs/development/python-modules/pydantic-core/default.nix b/pkgs/development/python-modules/pydantic-core/default.nix
index 716d9584b0d6..9e71bbec8a87 100644
--- a/pkgs/development/python-modules/pydantic-core/default.nix
+++ b/pkgs/development/python-modules/pydantic-core/default.nix
@@ -18,14 +18,14 @@
let
pydantic-core = buildPythonPackage rec {
pname = "pydantic-core";
- version = "2.23.4";
+ version = "2.27.1";
pyproject = true;
src = fetchFromGitHub {
owner = "pydantic";
repo = "pydantic-core";
rev = "refs/tags/v${version}";
- hash = "sha256-WSSwiqmdQN4zB7fqaniHyh4SHmrGeDHdCGpiSJZT7Mg=";
+ hash = "sha256-ikdQAT1y0g+V2gPU0Ohn+UktJrEObnixCW56/J1UsSk=";
};
patches = [ ./01-remove-benchmark-flags.patch ];
@@ -33,7 +33,7 @@ let
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
- hash = "sha256-dX3wDnKQLmC+FabC0van3czkQLRcrBbtp9b90PgepZs=";
+ hash = "sha256-kY+XSiwfh1ao0vvqz1M23CONeh/T8uN8YpHf/GOphTk=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix
index 9e008f9565e1..bb5ba289d5f5 100644
--- a/pkgs/development/python-modules/pydantic/default.nix
+++ b/pkgs/development/python-modules/pydantic/default.nix
@@ -29,7 +29,7 @@
buildPythonPackage rec {
pname = "pydantic";
- version = "2.9.2";
+ version = "2.10.3";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -38,7 +38,7 @@ buildPythonPackage rec {
owner = "pydantic";
repo = "pydantic";
rev = "refs/tags/v${version}";
- hash = "sha256-Eb/9k9bNizRyGhjbW/LAE/2R0Ino4DIRDy5ZrQuzJ7o=";
+ hash = "sha256-/QxWgViqVmPnX/sO+qkvGl+WQX3OPXpS44CdP2HHOis=";
};
buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ];
diff --git a/pkgs/development/python-modules/pydevd/default.nix b/pkgs/development/python-modules/pydevd/default.nix
index 207e5e5c9edf..20264af54865 100644
--- a/pkgs/development/python-modules/pydevd/default.nix
+++ b/pkgs/development/python-modules/pydevd/default.nix
@@ -62,6 +62,8 @@ buildPythonPackage rec {
"test_tracing_other_threads"
# subprocess.CalledProcessError
"test_find_main_thread_id"
+ # numpy 2 compat
+ "test_evaluate_numpy"
]
++ lib.optionals (pythonAtLeast "3.12") [
"test_case_handled_and_unhandled_exception_generator"
diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix
index 3cad1aafe06c..594ee6bd5c83 100644
--- a/pkgs/development/python-modules/pydot/default.nix
+++ b/pkgs/development/python-modules/pydot/default.nix
@@ -2,30 +2,37 @@
lib,
buildPythonPackage,
fetchPypi,
+ setuptools,
substituteAll,
graphviz,
pytestCheckHook,
chardet,
+ parameterized,
pythonOlder,
pyparsing,
}:
buildPythonPackage rec {
pname = "pydot";
- version = "2.0.0";
- format = "setuptools";
+ version = "3.0.2";
+ pyproject = true;
- disabled = pythonOlder "3.5";
+ disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
- hash = "sha256-YCRq8hUSP6Bi8hzXkb5n3aI6bygN8J9okZ5jeh5PMjU=";
+ hash = "sha256-kYDaVAtRs6oJ+/gRQLPt++IxXXeOhYmn0KSmnEEzK64=";
};
- propagatedBuildInputs = [ pyparsing ];
+ build-system = [
+ setuptools
+ ];
+
+ dependencies = [ pyparsing ];
nativeCheckInputs = [
chardet
+ parameterized
pytestCheckHook
];
@@ -36,29 +43,15 @@ buildPythonPackage rec {
})
];
- postPatch = ''
- # test_graphviz_regression_tests also fails upstream: https://github.com/pydot/pydot/pull/198
- substituteInPlace test/pydot_unittest.py \
- --replace "test_graphviz_regression_tests" "no_test_graphviz_regression_tests" \
- # Patch path for pytestCheckHook
- substituteInPlace test/pydot_unittest.py \
- --replace "shapefile_dir = os.path.join(test_dir, 'from-past-to-future')" "shapefile_dir = 'test/from-past-to-future'" \
- --replace "path = os.path.join(test_dir, TESTS_DIR_1)" "path = os.path.join('test/', TESTS_DIR_1)"
- '';
-
- pytestFlagsArray = [ "test/pydot_unittest.py" ];
-
- disabledTests = [
- # broken, fixed after 2.0.0
- "test_graph_with_shapefiles"
- ];
+ pytestFlagsArray = [ "test/test_pydot.py" ];
pythonImportsCheck = [ "pydot" ];
- meta = with lib; {
+ meta = {
description = "Allows to create both directed and non directed graphs from Python";
homepage = "https://github.com/erocarrera/pydot";
- license = licenses.mit;
+ changelog = "https://github.com/pydot/pydot/blob/v${version}/ChangeLog";
+ license = lib.licenses.mit;
maintainers = [ ];
};
}
diff --git a/pkgs/development/python-modules/pyerfa/default.nix b/pkgs/development/python-modules/pyerfa/default.nix
index 68e5f7d97496..e5bd3e20e5be 100644
--- a/pkgs/development/python-modules/pyerfa/default.nix
+++ b/pkgs/development/python-modules/pyerfa/default.nix
@@ -22,11 +22,6 @@ buildPythonPackage rec {
hash = "sha256-rLimcTIy6jXAS8bkCsTkYd/MgX05XvKjyAUcGjMkndM=";
};
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace-fail "numpy>=2.0.0rc1" "numpy"
- '';
-
build-system = [
jinja2
packaging
diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix
index aaf9e961cb23..4550ca77e02b 100644
--- a/pkgs/development/python-modules/pyflakes/default.nix
+++ b/pkgs/development/python-modules/pyflakes/default.nix
@@ -1,6 +1,7 @@
{
lib,
buildPythonPackage,
+ pythonAtLeast,
pythonOlder,
fetchFromGitHub,
setuptools,
@@ -26,6 +27,11 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
+ disabledTests = lib.optionals (pythonAtLeast "3.13") [
+ # https://github.com/PyCQA/pyflakes/issues/812
+ "test_errors_syntax"
+ ];
+
pythonImportsCheck = [ "pyflakes" ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix
index daffbcb6d70c..7488891a717e 100644
--- a/pkgs/development/python-modules/pyjwt/default.nix
+++ b/pkgs/development/python-modules/pyjwt/default.nix
@@ -5,7 +5,6 @@
setuptools,
cryptography,
pytestCheckHook,
- pythonOlder,
sphinxHook,
sphinx-rtd-theme,
zope-interface,
@@ -14,16 +13,14 @@
buildPythonPackage rec {
pname = "pyjwt";
- version = "2.9.0";
+ version = "2.10.1";
pyproject = true;
- disabled = pythonOlder "3.8";
-
src = fetchFromGitHub {
owner = "jpadilla";
repo = "pyjwt";
rev = "refs/tags/${version}";
- hash = "sha256-z1sqaSeign0ZDFcg94cli0fIVBxcK14VUlgP+mSaxRA=";
+ hash = "sha256-BPVythRLpglYtpLEoaC7+Q4l9izYXH2M9JEbxdyQZqU=";
};
outputs = [
diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix
index f169201b2cc5..db1452a61451 100644
--- a/pkgs/development/python-modules/pykdtree/default.nix
+++ b/pkgs/development/python-modules/pykdtree/default.nix
@@ -25,11 +25,6 @@ buildPythonPackage rec {
hash = "sha256-Osz4UulGZT45nD1Nu+EZ28bT9yz9LVqVyr8L8Mf5JP4=";
};
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace-warn "numpy>=2.0.0rc1,<3" "numpy"
- '';
-
nativeBuildInputs = [
cython
numpy
diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix
index 2b133f061bf3..6074b06b0bdc 100644
--- a/pkgs/development/python-modules/pymatgen/default.nix
+++ b/pkgs/development/python-modules/pymatgen/default.nix
@@ -43,11 +43,6 @@ buildPythonPackage rec {
hash = "sha256-o76bGItldcLfgZ5KDw2uL0GJvyljQJEwISR0topVR44=";
};
- prePatch = ''
- # Upstream switched to building against numpy2 but should still be compatible with numpy1
- substituteInPlace pyproject.toml --replace-fail "numpy>=2.1.0" "numpy>=1.26.0"
- '';
-
build-system = [ setuptools ];
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix
index a8589e0af77c..80bcf8c6117b 100644
--- a/pkgs/development/python-modules/pymupdf/default.nix
+++ b/pkgs/development/python-modules/pymupdf/default.nix
@@ -19,7 +19,6 @@
jbig2dec,
libjpeg_turbo,
gumbo,
- memstreamHook,
# dependencies
mupdf,
@@ -75,7 +74,7 @@ buildPythonPackage rec {
jbig2dec
libjpeg_turbo
gumbo
- ] ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memstreamHook ];
+ ];
propagatedBuildInputs = [ mupdf-cxx ];
diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix
index 5e224805d14d..f5e1da3ce897 100644
--- a/pkgs/development/python-modules/pyodbc/default.nix
+++ b/pkgs/development/python-modules/pyodbc/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "pyodbc";
- version = "5.1.0";
+ version = "5.2.0";
format = "setuptools";
disabled = pythonOlder "3.7" || isPyPy; # use pypypdbc instead
src = fetchPypi {
inherit pname version;
- hash = "sha256-OX/u5EVhplgL4IztvphkNoWVY/S7N49IIkZVyOmH6mA=";
+ hash = "sha256-3ovjmAnI3e7uJqS4dqZGNSnNSHpg0Tk+sqk+m81EqPU=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix
index 4d9ecb6152c2..ecb51cbebdda 100644
--- a/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/pkgs/development/python-modules/pyopenssl/default.nix
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "pyopenssl";
- version = "24.2.1";
+ version = "24.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "pyca";
repo = "pyopenssl";
rev = "refs/tags/${version}";
- hash = "sha256-/TQnDWdycN4hQ7ZGvBhMJEZVafmL+0wy9eJ8hC6rfio=";
+ hash = "sha256-otK7Y7Kb/l3QOErhAcuDHB/CKG9l1vH2BTnOieAWNc0=";
};
outputs = [
diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix
index d30f96b67d66..c930fefd524f 100644
--- a/pkgs/development/python-modules/pyramid/default.nix
+++ b/pkgs/development/python-modules/pyramid/default.nix
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchPypi,
+ fetchpatch2,
webtest,
zope-component,
hupper,
@@ -31,6 +32,14 @@ buildPythonPackage rec {
hash = "sha256-NyE4pzjkIWU1zHbczm7d1aGqypUTDyNU+4NCZMBvGN4=";
};
+ patches = [
+ (fetchpatch2 {
+ name = "python-3.13-compat.patch";
+ url = "https://github.com/Pylons/pyramid/commit/1079613eb07e2a67454378e1fc28815dfd64bb82.patch";
+ hash = "sha256-/jxbA2q0kAeXDvIwhNkO8h4KbKtdquWXAH7/0lV8MXc=";
+ })
+ ];
+
build-system = [ setuptools ];
dependencies = [
diff --git a/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch b/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch
index 9b8374a0f051..792c8bcd28e2 100644
--- a/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch
+++ b/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch
@@ -39,7 +39,7 @@ index 2413329..f460bf6 100644
try:
- dll = DLL("SDL2", ["SDL2", "SDL2-2.0", "SDL2-2.0.0"], os.getenv("PYSDL2_DLL_PATH"))
-+ dll = DLL("SDL2", "@sdl2@")
++ dll = DLL("SDL2", "@SDL2@")
except RuntimeError as exc:
raise ImportError(exc)
@@ -53,7 +53,7 @@ index 015eeaf..d6ce52f 100644
try:
- dll = DLL("SDL2_gfx", ["SDL2_gfx", "SDL2_gfx-1.0"],
- os.getenv("PYSDL2_DLL_PATH"))
-+ dll = DLL("SDL2_gfx", "@sdl2_gfx@")
++ dll = DLL("SDL2_gfx", "@SDL2_gfx@")
except RuntimeError as exc:
raise ImportError(exc)
@@ -68,7 +68,7 @@ index a702136..dcdea51 100644
- dll = DLL(
- "SDL2_image", ["SDL2_image", "SDL2_image-2.0"], os.getenv("PYSDL2_DLL_PATH")
- )
-+ dll = DLL("SDL2_image", "@sdl2_image@")
++ dll = DLL("SDL2_image", "@SDL2_image@")
except RuntimeError as exc:
raise ImportError(exc)
@@ -82,7 +82,7 @@ index 5f2163c..23d95b0 100644
try:
- dll = DLL("SDL2_mixer", ["SDL2_mixer", "SDL2_mixer-2.0"],
- os.getenv("PYSDL2_DLL_PATH"))
-+ dll = DLL("SDL2_mixer", "@sdl2_mixer@")
++ dll = DLL("SDL2_mixer", "@SDL2_mixer@")
except RuntimeError as exc:
raise ImportError(exc)
@@ -96,7 +96,7 @@ index 7c5f7db..61814cd 100644
try:
- dll = DLL("SDL2_ttf", ["SDL2_ttf", "SDL2_ttf-2.0"],
- os.getenv("PYSDL2_DLL_PATH"))
-+ dll = DLL("SDL2_ttf", "@sdl2_ttf@")
++ dll = DLL("SDL2_ttf", "@SDL2_ttf@")
except RuntimeError as exc:
raise ImportError(exc)
diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix
index 7854f2465432..2bc97d102b7f 100644
--- a/pkgs/development/python-modules/pysdl2/default.nix
+++ b/pkgs/development/python-modules/pysdl2/default.nix
@@ -1,7 +1,7 @@
{
stdenv,
lib,
- substituteAll,
+ replaceVars,
fetchPypi,
buildPythonPackage,
SDL2,
@@ -38,21 +38,18 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [ SDL2 ];
patches = [
- (substituteAll (
- {
- src = ./PySDL2-dll.patch;
- }
- //
- builtins.mapAttrs
- (_: pkg: "${pkg}/lib/lib${pkg.pname}${stdenv.hostPlatform.extensions.sharedLibrary}")
- {
- # substituteAll keys must start lowercase
- sdl2 = SDL2;
- sdl2_ttf = SDL2_ttf;
- sdl2_image = SDL2_image;
- sdl2_gfx = SDL2_gfx;
- sdl2_mixer = SDL2_mixer;
- }
+ (replaceVars ./PySDL2-dll.patch (
+ builtins.mapAttrs
+ (_: pkg: "${pkg}/lib/lib${pkg.pname}${stdenv.hostPlatform.extensions.sharedLibrary}")
+ {
+ inherit
+ SDL2
+ SDL2_ttf
+ SDL2_image
+ SDL2_gfx
+ SDL2_mixer
+ ;
+ }
))
];
diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix
index 585092787483..e66926d4c5cd 100644
--- a/pkgs/development/python-modules/pytest-benchmark/default.nix
+++ b/pkgs/development/python-modules/pytest-benchmark/default.nix
@@ -3,98 +3,84 @@
aspectlib,
buildPythonPackage,
elasticsearch,
- elastic-transport,
fetchFromGitHub,
- fetchpatch,
freezegun,
git,
mercurial,
+ nbmake,
py-cpuinfo,
pygal,
pytest,
pytestCheckHook,
pytest-xdist,
+ pythonAtLeast,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "pytest-benchmark";
- version = "4.0.0";
+ version = "5.1.0";
pyproject = true;
- disabled = pythonOlder "3.7";
-
src = fetchFromGitHub {
owner = "ionelmc";
- repo = pname;
- rev = "v${version}";
- hash = "sha256-f9Ty4+5PycraxoLUSa9JFusV5Cot6bBWKfOGHZIRR3o=";
+ repo = "pytest-benchmark";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-4fD9UfZ6jtY7Gx/PVzd1JNWeQNz+DJ2kQmCku2TgxzI=";
};
- patches = [
- # replace distutils.spawn.find_executable with shutil.which
- (fetchpatch {
- url = "https://github.com/ionelmc/pytest-benchmark/commit/728752d2976ef53fde7e40beb3e55f09cf4d4736.patch";
- hash = "sha256-WIQADCLey5Y79UJUj9J5E02HQ0O86xBh/3IeGLpVrWI=";
- })
- # fix tests with python3.11+; https://github.com/ionelmc/pytest-benchmark/pull/232
- (fetchpatch {
- url = "https://github.com/ionelmc/pytest-benchmark/commit/b2f624afd68a3090f20187a46284904dd4baa4f6.patch";
- hash = "sha256-cylxPj/d0YzvOGw+ncVSCnQHwq2cukrgXhBHePPwjO0=";
- })
- (fetchpatch {
- url = "https://github.com/ionelmc/pytest-benchmark/commit/2b987f5be1873617f02f24cb6d76196f9aed21bd.patch";
- hash = "sha256-92kWEd935Co6uc/1y5OGKsc5/or81bORSdaiQFjDyTw=";
- })
- ];
-
- nativeBuildInputs = [ setuptools ];
+ build-system = [ setuptools ];
buildInputs = [ pytest ];
- propagatedBuildInputs = [ py-cpuinfo ];
+ dependencies = [ py-cpuinfo ];
optional-dependencies = {
aspect = [ aspectlib ];
- histogram = [ pygal ];
+ histogram = [
+ pygal
+ # FIXME package pygaljs
+ setuptools
+ ];
elasticsearch = [ elasticsearch ];
};
pythonImportsCheck = [ "pytest_benchmark" ];
nativeCheckInputs = [
- elastic-transport
freezegun
git
mercurial
+ nbmake
pytestCheckHook
pytest-xdist
] ++ lib.flatten (lib.attrValues optional-dependencies);
- pytestFlagsArray = [
- "-W"
- "ignore::DeprecationWarning"
- ];
-
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"
- ];
+ 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"
+ ];
- meta = with lib; {
+ meta = {
changelog = "https://github.com/ionelmc/pytest-benchmark/blob/${src.rev}/CHANGELOG.rst";
description = "Pytest fixture for benchmarking code";
homepage = "https://github.com/ionelmc/pytest-benchmark";
- license = licenses.bsd2;
- maintainers = with maintainers; [ dotlambda ];
+ license = lib.licenses.bsd2;
+ maintainers = with lib.maintainers; [ dotlambda ];
};
}
diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix
index 64aae4d60ad2..911d834c26bb 100644
--- a/pkgs/development/python-modules/pytest-doctestplus/default.nix
+++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchPypi,
+ fetchpatch2,
gitMinimal,
numpy,
packaging,
@@ -24,6 +25,14 @@ buildPythonPackage rec {
hash = "sha256-JHKoosjOo00vZfZJlUP663SO7LWcWXhS/ZiDm0cwdnk=";
};
+ patches = [
+ (fetchpatch2 {
+ name = "python313-compat.patch";
+ url = "https://github.com/scientific-python/pytest-doctestplus/commit/aee0be27a8e8753ac68adc035f098ccc7a9e3678.patch";
+ hash = "sha256-UOG664zm7rJIjm/OXNu6N6jlINNB6UDZOCSUZxy3HrQ=";
+ })
+ ];
+
postPatch = ''
substituteInPlace pytest_doctestplus/plugin.py \
--replace-fail '"git"' '"${lib.getExe gitMinimal}"'
diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index 555c84031144..972d0bdf23c7 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -45,10 +45,10 @@ buildPythonPackage rec {
setproctitle = [ setproctitle ];
};
- pytestFlagsArray = [
- # pytest can already use xdist at this point
- "--numprocesses=$NIX_BUILD_CORES"
- ];
+ # pytest can already use xdist at this point
+ preCheck = ''
+ appendToVar pytestFlagsArray "--numprocesses=$NIX_BUILD_CORES"
+ '';
# access file system
disabledTests = [
diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix
index d39f44084d50..96f48d0ebd01 100644
--- a/pkgs/development/python-modules/python-dbusmock/default.nix
+++ b/pkgs/development/python-modules/python-dbusmock/default.nix
@@ -52,6 +52,11 @@ buildPythonPackage rec {
url = "https://github.com/martinpitt/python-dbusmock/commit/4b99cff50e8c741f20aef4527b27ccdb2a4053d2.patch";
hash = "sha256-Xcovv44JeuTvPAtXWJvWE+MxlyloClSJGKZz+C3P5bE=";
})
+ (fetchpatch {
+ name = "tests-bluez-5.79.patch";
+ url = "https://github.com/martinpitt/python-dbusmock/commit/d5e449bff924ea2b2837843237fbb5d9751c4f89.patch";
+ hash = "sha256-CafQ/RhFynjI9eY4Xeu5yS+a29ZiJJnSYUmd74/2Dpg=";
+ })
];
build-system = [
diff --git a/pkgs/development/python-modules/python-json-logger/default.nix b/pkgs/development/python-modules/python-json-logger/default.nix
index c56428e33c4a..ba9de7ec3d1e 100644
--- a/pkgs/development/python-modules/python-json-logger/default.nix
+++ b/pkgs/development/python-modules/python-json-logger/default.nix
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchPypi,
+ setuptools,
pytestCheckHook,
pythonAtLeast,
}:
@@ -9,21 +10,28 @@
buildPythonPackage rec {
pname = "python-json-logger";
version = "2.0.7";
- format = "setuptools";
+ pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-I+fsAtNCN8WqHimgcBk6Tqh1g7tOf4/QbT3oJkxLLhw=";
};
+ build-system = [ setuptools ];
+
nativeCheckInputs = [ pytestCheckHook ];
- disabledTests = lib.optionals (pythonAtLeast "3.12") [
- # https://github.com/madzak/python-json-logger/issues/185
- "test_custom_object_serialization"
- "test_percentage_format"
- "test_rename_reserved_attrs"
- ];
+ disabledTests =
+ lib.optionals (pythonAtLeast "3.12") [
+ # https://github.com/madzak/python-json-logger/issues/185
+ "test_custom_object_serialization"
+ "test_percentage_format"
+ "test_rename_reserved_attrs"
+ ]
+ ++ lib.optionals (pythonAtLeast "3.13") [
+ # https://github.com/madzak/python-json-logger/issues/198
+ "test_json_default_encoder_with_timestamp"
+ ];
meta = with lib; {
description = "Json Formatter for the standard python logger";
diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix
index 54fa536f792e..3e64e48a5926 100644
--- a/pkgs/development/python-modules/python-lsp-server/default.nix
+++ b/pkgs/development/python-modules/python-lsp-server/default.nix
@@ -34,6 +34,7 @@
matplotlib,
numpy,
pandas,
+ pytest-cov-stub,
pytestCheckHook,
websockets,
@@ -55,12 +56,6 @@ buildPythonPackage rec {
hash = "sha256-oFqa7DtFpJmDZrw+GJqrFH3QqnMAu9159q3IWT9vRko=";
};
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace-fail "--cov-report html --cov-report term --junitxml=pytest.xml" "" \
- --replace-fail "--cov pylsp --cov test" ""
- '';
-
pythonRelaxDeps = [
"autopep8"
"flake8"
@@ -115,6 +110,7 @@ buildPythonPackage rec {
matplotlib
numpy
pandas
+ pytest-cov-stub
pytestCheckHook
] ++ optional-dependencies.all;
@@ -127,6 +123,8 @@ buildPythonPackage rec {
"test_autoimport_code_actions_and_completions_for_notebook_document"
# avoid dependencies on many Qt things just to run one singular test
"test_pyqt_completion"
+ # https://github.com/python-lsp/python-lsp-server/issues/602
+ "test_jedi_completion_with_fuzzy_enabled"
];
preCheck = ''
diff --git a/pkgs/development/python-modules/python-multipart/default.nix b/pkgs/development/python-modules/python-multipart/default.nix
index 12b1e19f2c5b..2fef7a320657 100644
--- a/pkgs/development/python-modules/python-multipart/default.nix
+++ b/pkgs/development/python-modules/python-multipart/default.nix
@@ -1,12 +1,11 @@
{
lib,
buildPythonPackage,
- fetchPypi,
+ fetchFromGitHub,
hatchling,
pytestCheckHook,
mock,
pyyaml,
- six,
# for passthru.tests
asgi-csrf,
@@ -18,20 +17,19 @@
buildPythonPackage rec {
pname = "python-multipart";
- version = "0.0.12";
+ version = "0.0.17";
pyproject = true;
- src = fetchPypi {
- pname = "python_multipart";
- inherit version;
- hash = "sha256-BF4fmNcZwc4IXtf34e+djMyMAroCtVZtX3UhQQztWMs=";
+ src = fetchFromGitHub {
+ owner = "Kludex";
+ repo = "python-multipart";
+ rev = "refs/tags/${version}";
+ hash = "sha256-WtP2lPrBMRYjkae+/cMz+lN0Yf0uk2LL7RYjdOwQcXU=";
};
- nativeBuildInputs = [ hatchling ];
+ build-system = [ hatchling ];
- propagatedBuildInputs = [ six ];
-
- pythonImportsCheck = [ "multipart" ];
+ pythonImportsCheck = [ "python_multipart" ];
nativeCheckInputs = [
pytestCheckHook
@@ -50,8 +48,9 @@ buildPythonPackage rec {
};
meta = with lib; {
+ changelog = "https://github.com/Kludex/python-multipart/blob/${src.rev}/CHANGELOG.md";
description = "Streaming multipart parser for Python";
- homepage = "https://github.com/andrew-d/python-multipart";
+ homepage = "https://github.com/Kludex/python-multipart";
license = licenses.asl20;
maintainers = with maintainers; [ ris ];
};
diff --git a/pkgs/development/python-modules/pyvirtualdisplay/default.nix b/pkgs/development/python-modules/pyvirtualdisplay/default.nix
index 9905ee45e367..ac2a3bf68f69 100644
--- a/pkgs/development/python-modules/pyvirtualdisplay/default.nix
+++ b/pkgs/development/python-modules/pyvirtualdisplay/default.nix
@@ -14,6 +14,7 @@
entrypoint2,
pillow,
psutil,
+ pytest-timeout,
pytest-xdist,
pytestCheckHook,
vncdo,
@@ -47,7 +48,7 @@ buildPythonPackage rec {
entrypoint2
pillow
psutil
- pytest-xdist
+ pytest-timeout
pytestCheckHook
(vncdo.overridePythonAttrs { doCheck = false; })
xorg.xorgserver
@@ -55,6 +56,8 @@ buildPythonPackage rec {
xorg.xvfb
];
+ pytestFlagsArray = [ "-v" ];
+
meta = with lib; {
description = "Python wrapper for Xvfb, Xephyr and Xvnc";
homepage = "https://github.com/ponty/pyvirtualdisplay";
diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/pkgs/development/python-modules/pywavelets/default.nix
index e3350c4e624d..ba81da659d5a 100644
--- a/pkgs/development/python-modules/pywavelets/default.nix
+++ b/pkgs/development/python-modules/pywavelets/default.nix
@@ -23,11 +23,6 @@ buildPythonPackage rec {
hash = "sha256-oWAF8YDvb0SdlRzSjG2BNEekBkvR3U6KQ+e2FoIs+tw=";
};
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace-fail "numpy>=2.0.0" "numpy"
- '';
-
build-system = [
meson-python
cython
diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix
index 991274fd267a..c1c1b8f8e303 100644
--- a/pkgs/development/python-modules/quantities/default.nix
+++ b/pkgs/development/python-modules/quantities/default.nix
@@ -2,7 +2,6 @@
lib,
buildPythonPackage,
fetchFromGitHub,
- fetchpatch2,
numpy,
pytestCheckHook,
pythonOlder,
@@ -12,7 +11,7 @@
buildPythonPackage rec {
pname = "quantities";
- version = "0.15.0";
+ version = "0.16.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -21,17 +20,9 @@ buildPythonPackage rec {
owner = "python-quantities";
repo = "python-quantities";
rev = "refs/tags/v${version}";
- hash = "sha256-N20xfzGtM0VnfkJtzMytNLySTkgVz2xf1nEJxlwBSCI=";
+ hash = "sha256-gXxUmuhFAqHVj8jqWt8Ed2M6UvnPxku6hr/yJoa3nXE=";
};
- patches = [
- (fetchpatch2 {
- name = "prevent-arbitrary-code-eval.patch";
- url = "https://github.com/python-quantities/python-quantities/pull/236.patch";
- hash = "sha256-H1tOfXqNMIKY01m6o2PsfZG0CvnWNxW2qIWA5ce1lRk=";
- })
- ];
-
build-system = [
setuptools
setuptools-scm
@@ -41,11 +32,6 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
- disabledTests = [
- # test fails with numpy 1.24
- "test_mul"
- ];
-
pythonImportsCheck = [ "quantities" ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/quart/default.nix b/pkgs/development/python-modules/quart/default.nix
index 17c7a65ec387..1d589c177400 100644
--- a/pkgs/development/python-modules/quart/default.nix
+++ b/pkgs/development/python-modules/quart/default.nix
@@ -27,28 +27,24 @@
mock,
py,
pytest-asyncio,
- pytest7CheckHook,
+ pytest-cov-stub,
+ pytestCheckHook,
}:
buildPythonPackage rec {
pname = "quart";
- version = "0.19.8";
+ version = "0.19.9";
pyproject = true;
src = fetchFromGitHub {
owner = "pallets";
repo = "quart";
rev = "refs/tags/${version}";
- hash = "sha256-A23+25bDzK2GlGNTCul6HbsjNujrnhpzTxdnV3Ig028=";
+ hash = "sha256-jekbrHpB+7d3IagVUtDYA1VFlWtnE7kPqIm19NB2scA=";
};
build-system = [ poetry-core ];
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace "--no-cov-on-fail " ""
- '';
-
dependencies =
[
aiofiles
@@ -75,7 +71,8 @@ buildPythonPackage rec {
mock
py
pytest-asyncio
- pytest7CheckHook
+ pytest-cov-stub
+ pytestCheckHook
];
meta = with lib; {
diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix
index 8c3f93fe617b..93f23b1433b0 100644
--- a/pkgs/development/python-modules/rasterio/default.nix
+++ b/pkgs/development/python-modules/rasterio/default.nix
@@ -45,12 +45,6 @@ buildPythonPackage rec {
hash = "sha256-YGSd0IG6TWnHmDiVEE3F2KNQ4dXJhkPqAJsIrWyuHos=";
};
- postPatch = ''
- # relax numpy dependency
- substituteInPlace pyproject.toml \
- --replace-fail "numpy>=2" "numpy"
- '';
-
nativeBuildInputs = [
cython
gdal
diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix
index ec98f19c271f..fd66dd16cb90 100644
--- a/pkgs/development/python-modules/rdkit/default.nix
+++ b/pkgs/development/python-modules/rdkit/default.nix
@@ -17,7 +17,6 @@
numpy,
pandas,
pillow,
- memorymappingHook,
}:
let
external = {
@@ -96,7 +95,7 @@ buildPythonPackage rec {
eigen
inchi
maeparser
- ] ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook ];
+ ];
dependencies = [
numpy
diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix
index 8ad583fcf7b1..bada45ae9097 100644
--- a/pkgs/development/python-modules/redis/default.nix
+++ b/pkgs/development/python-modules/redis/default.nix
@@ -22,14 +22,14 @@
buildPythonPackage rec {
pname = "redis";
- version = "5.1.1";
+ version = "5.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-9smXUh/tuuUzhzB8XQv3hNmswo2fHQWKvqxWbsTb7XI=";
+ hash = "sha256-CxCHZlp3Gx/y4AOqW901TxWnDJ4l1afb+cciwWUop7A=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix
index 48fec33e8cd1..c4fca7a1fa8a 100644
--- a/pkgs/development/python-modules/reproject/default.nix
+++ b/pkgs/development/python-modules/reproject/default.nix
@@ -32,8 +32,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace pyproject.toml \
- --replace "cython==" "cython>=" \
- --replace "numpy>=2.0.0rc1" "numpy"
+ --replace "cython==" "cython>="
'';
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix
index 34913e526d78..7ba12b6311d9 100644
--- a/pkgs/development/python-modules/rich/default.nix
+++ b/pkgs/development/python-modules/rich/default.nix
@@ -18,7 +18,6 @@
# tests
attrs,
pytestCheckHook,
- setuptools,
which,
# for passthru.tests
@@ -30,24 +29,24 @@
buildPythonPackage rec {
pname = "rich";
- version = "13.8.1";
- format = "pyproject";
+ version = "13.9.4";
+ pyproject = true;
- disabled = pythonOlder "3.7";
+ disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "Textualize";
- repo = pname;
+ repo = "rich";
rev = "refs/tags/v${version}";
- hash = "sha256-k+a64GDGzRDprvJz7s9Sm4z8jDV5TZ+CZLMgXKXXonM=";
+ hash = "sha256-Zaop9zR+Sz9lMQjQP1ddJSid5jEmf0tQYuTeLuWNGA8=";
};
- nativeBuildInputs = [ poetry-core ];
+ build-system = [ poetry-core ];
- propagatedBuildInputs = [
+ dependencies = [
markdown-it-py
pygments
- ] ++ lib.optionals (pythonOlder "3.9") [ typing-extensions ];
+ ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];
optional-dependencies = {
jupyter = [ ipywidgets ];
@@ -56,24 +55,9 @@ buildPythonPackage rec {
nativeCheckInputs = [
attrs
pytestCheckHook
- setuptools
which
];
- disabledTests = [
- # pygments 2.16 compat
- # https://github.com/Textualize/rich/issues/3088
- "test_card_render"
- "test_markdown_render"
- "test_markdown_render"
- "test_python_render"
- "test_python_render_simple"
- "test_python_render_simple_passing_lexer_instance"
- "test_python_render_indent_guides"
- "test_option_no_wrap"
- "test_syntax_highlight_ranges"
- ];
-
pythonImportsCheck = [ "rich" ];
passthru.tests = {
diff --git a/pkgs/development/python-modules/rpds-py/default.nix b/pkgs/development/python-modules/rpds-py/default.nix
index 3b6747759867..de6c7a29141f 100644
--- a/pkgs/development/python-modules/rpds-py/default.nix
+++ b/pkgs/development/python-modules/rpds-py/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "rpds-py";
- version = "0.18.1";
+ version = "0.20.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -21,13 +21,13 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "rpds_py";
inherit version;
- hash = "sha256-3Ei0edVAdwyBH70eubortmlRhj5Ejv7C4sECYlMo6S8=";
+ hash = "sha256-1yohCCT6z9r4dozy18oloELDAyCzAg3i+gRkCSDU4SE=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
- hash = "sha256-caNEmU3K5COYa/UImE4BZYaFTc3Csi3WmnBSbFN3Yn8=";
+ hash = "sha256-5vbR2EbrAPJ8pb78tj/+r9nOWgQDT5aO/LUQI4kAGjU=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/scalene/default.nix b/pkgs/development/python-modules/scalene/default.nix
index dd855cadacbe..881194a62c07 100644
--- a/pkgs/development/python-modules/scalene/default.nix
+++ b/pkgs/development/python-modules/scalene/default.nix
@@ -59,8 +59,8 @@ buildPythonPackage rec {
mkdir vendor/printf
cp ${printf-src}/printf.c vendor/printf/printf.cpp
cp -r ${printf-src}/* vendor/printf
- sed -i"" 's/^#define printf printf_/\/\/&/' vendor/printf/printf.h
- sed -i"" 's/^#define vsnprintf vsnprintf_/\/\/&/' vendor/printf/printf.h
+ sed -i 's/^#define printf printf_/\/\/&/' vendor/printf/printf.h
+ sed -i 's/^#define vsnprintf vsnprintf_/\/\/&/' vendor/printf/printf.h
'';
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix
index 77eb9ea5195a..5ab37196fcd6 100644
--- a/pkgs/development/python-modules/scapy/default.nix
+++ b/pkgs/development/python-modules/scapy/default.nix
@@ -32,7 +32,7 @@
buildPythonPackage rec {
pname = "scapy";
- version = "2.6.0";
+ version = "2.6.1";
format = "setuptools";
disabled = isPyPy;
@@ -41,7 +41,7 @@ buildPythonPackage rec {
owner = "secdev";
repo = "scapy";
rev = "refs/tags/v${version}";
- hash = "sha256-k/wfY5nq/txdiqj5gyHT9FSjnFzazDBawE3+aNe9zrQ=";
+ hash = "sha256-m2L30aEpPp9cfW652yd+0wFkNlMij6FF1RzWZbwJ79A=";
};
patches = [ ./find-library.patch ];
diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix
index 93738259f2f8..0a65e71c39e0 100644
--- a/pkgs/development/python-modules/scikit-image/default.nix
+++ b/pkgs/development/python-modules/scikit-image/default.nix
@@ -49,9 +49,6 @@ let
postPatch = ''
patchShebangs skimage/_build_utils/{version,cythoner}.py
-
- substituteInPlace pyproject.toml \
- --replace "numpy>=2.0.0rc1" "numpy"
'';
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix
index 2502006fbae4..2dfaa2dd3ad3 100644
--- a/pkgs/development/python-modules/scikit-learn/default.nix
+++ b/pkgs/development/python-modules/scikit-learn/default.nix
@@ -36,9 +36,6 @@ buildPythonPackage rec {
};
postPatch = ''
- substituteInPlace pyproject.toml \
- --replace-fail "numpy>=2" "numpy"
-
substituteInPlace meson.build --replace-fail \
"run_command('sklearn/_build_utils/version.py', check: true).stdout().strip()," \
"'${version}',"
diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index e5b2db20a1c0..31a9010c3b29 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -92,13 +92,8 @@ buildPythonPackage {
})
];
- # Upstream says in a comment in their pyproject.toml that building against
- # both numpy 2 and numpy 1 should work, but they seem to worry about numpy
- # incompatibilities that we here with Nixpkgs' Python ecosystem, shouldn't
- # experience.
postPatch = ''
substituteInPlace pyproject.toml \
- --replace-fail 'numpy>=2.0.0rc1,' 'numpy' \
--replace-fail "pybind11>=2.12.0,<2.13.0" "pybind11>=2.12.0" \
'';
diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix
index 74987d59dcc4..bfb17ca01015 100644
--- a/pkgs/development/python-modules/seaborn/default.nix
+++ b/pkgs/development/python-modules/seaborn/default.nix
@@ -3,6 +3,7 @@
stdenv,
buildPythonPackage,
fetchFromGitHub,
+ fetchpatch2,
flit-core,
matplotlib,
pytest-xdist,
@@ -28,6 +29,15 @@ buildPythonPackage rec {
hash = "sha256-aGIVcdG/XN999nYBHh3lJqGa3QVt0j8kmzaxdkULznY=";
};
+ patches = [
+ # https://github.com/mwaskom/seaborn/pull/3685
+ (fetchpatch2 {
+ name = "numpy_2-compatibility.patch";
+ url = "https://github.com/mwaskom/seaborn/commit/58f170fe799ef496adae19925d7d4f0f14f8da95.patch";
+ hash = "sha256-/a3G+kNIRv8Oa4a0jPGnL2Wvx/9umMoiq1BXcXpehAg=";
+ })
+ ];
+
nativeBuildInputs = [ flit-core ];
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index c39ae6917bcd..961220f9260f 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "setuptools";
- version = "75.1.1";
+ version = "75.3.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "pypa";
repo = "setuptools";
rev = "refs/tags/v${version}";
- hash = "sha256-b8O/DrDWAbD6ht9M762fFN6kPtV8hAbn1gAN9SS7H5g=";
+ hash = "sha256-kmuKHHzTXZrJyfkFm1EIvH1tv/MF9/p/HQoqHXcJew0=";
};
patches = [
diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix
index 0959a8e3e0c9..914b6deccb6c 100644
--- a/pkgs/development/python-modules/shapely/default.nix
+++ b/pkgs/development/python-modules/shapely/default.nix
@@ -3,6 +3,7 @@
stdenv,
buildPythonPackage,
fetchPypi,
+ fetchpatch,
pytestCheckHook,
pythonOlder,
@@ -26,6 +27,14 @@ buildPythonPackage rec {
hash = "sha256-mX9hWbFIQFnsI5ysqlNGf9i1Vk2r4YbNhKwpRGY7C/Y=";
};
+ patches = [
+ # fixes build error with GCC 14
+ (fetchpatch {
+ url = "https://github.com/shapely/shapely/commit/05455886750680728dc751dc5888cd02086d908e.patch";
+ hash = "sha256-YnmiWFfjHHFZCxrmabBINM4phqfLQ+6xEc30EoV5d98=";
+ })
+ ];
+
nativeBuildInputs = [
cython_0
geos # for geos-config
diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index df9004d483ff..9f6dd8f79a59 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -46,12 +46,6 @@ buildPythonPackage rec {
hash = "sha256-Szfr0lraQFmw3J4Ik+cN3l34NIUymgaO8EWA5wiSpl0=";
};
- postPatch = ''
- # spaCy is compatible with NumPy v1 and v2
- substituteInPlace pyproject.toml setup.cfg \
- --replace-fail "numpy>=2.0.0,<2.1.0" numpy
- '';
-
build-system = [
cymem
cython_0
diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix
index a5bd5406b0cc..51f67fb4a0ad 100644
--- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix
+++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix
@@ -11,7 +11,7 @@
let
pname = "sphinx-autodoc-typehints";
- version = "2.4.4";
+ version = "2.5.0";
in
buildPythonPackage {
@@ -23,7 +23,7 @@ buildPythonPackage {
src = fetchPypi {
pname = "sphinx_autodoc_typehints";
inherit version;
- hash = "sha256-50NRLaWLZ6BleaFGJ5imkHZkq3dGB1ikMjSt6sNQr78=";
+ hash = "sha256-JZ4QJrIY1WPXJ0P0F/zCWQapYUiX/jf5G9jX1Y90jDs=";
};
pythonRelaxDeps = [ "sphinx" ];
diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix
index ec8f69958be3..e0cd899e3877 100644
--- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix
@@ -22,6 +22,7 @@
pyodbc,
pytestCheckHook,
python-dateutil,
+ pythonAtLeast,
pythonOlder,
pytz,
setuptools,
@@ -81,10 +82,15 @@ buildPythonPackage rec {
psycopg2cffi
];
- disabledTests = [
- "test_create_database_twice"
- "test_create_and_drop"
- ];
+ disabledTests =
+ [
+ "test_create_database_twice"
+ "test_create_and_drop"
+ ]
+ ++ lib.optionals (pythonAtLeast "3.13") [
+ # https://github.com/kvesteri/sqlalchemy-utils/issues/764
+ "test_render_mock_ddl"
+ ];
pytestFlagsArray = [
"-W"
diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 06ce40e7e336..0aec8225933f 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -41,7 +41,7 @@
buildPythonPackage rec {
pname = "sqlalchemy";
- version = "2.0.34";
+ version = "2.0.36";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -50,7 +50,7 @@ buildPythonPackage rec {
owner = "sqlalchemy";
repo = "sqlalchemy";
rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}";
- hash = "sha256-5nnMh8pEG6rXiy0nk9SKjIOY+htXNx9eHTEtNOkLrd8=";
+ hash = "sha256-i1yyAVBXz0efAdpFvUPvdzS+4IRU94akmePoprb8Is0=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix
index c1b0fa8be4bd..ce0f83687b43 100644
--- a/pkgs/development/python-modules/starlette/default.nix
+++ b/pkgs/development/python-modules/starlette/default.nix
@@ -28,7 +28,7 @@
buildPythonPackage rec {
pname = "starlette";
- version = "0.40.0";
+ version = "0.41.2";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
owner = "encode";
repo = "starlette";
rev = "refs/tags/${version}";
- hash = "sha256-CBkDDsIw9LAIeAzN5E9gdEvznFugoa/RilPmnwcJBy4=";
+ hash = "sha256-ZNB4OxzJHlsOie3URbUnZywJbqOZIvzxS/aq7YImdQ0=";
};
build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix
index f08c9613fc34..07cb6fe42278 100644
--- a/pkgs/development/python-modules/statsmodels/default.nix
+++ b/pkgs/development/python-modules/statsmodels/default.nix
@@ -26,11 +26,6 @@ buildPythonPackage rec {
hash = "sha256-7PNQJkP6k6q+XwvfI477WWCVF8TWCoEWMtMfzc6GwtI=";
};
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace-fail "numpy>=2.0.0,<3" "numpy"
- '';
-
build-system = [
cython
numpy
diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix
index e95952f94010..409435d4a533 100644
--- a/pkgs/development/python-modules/testfixtures/default.nix
+++ b/pkgs/development/python-modules/testfixtures/default.nix
@@ -1,6 +1,7 @@
{
lib,
buildPythonPackage,
+ fetchpatch2,
fetchPypi,
mock,
pytestCheckHook,
@@ -28,6 +29,14 @@ buildPythonPackage rec {
hash = "sha256-1MC4SvLyZ2EPkIAJtQ1vmDpOWK3iLGe6tnh7WkAtWcA=";
};
+ patches = [
+ (fetchpatch2 {
+ name = "python313-compat.patch";
+ url = "https://github.com/simplistix/testfixtures/commit/a23532c7bc685589cce6a5037821a74da48959e7.patch?full_index=1";
+ hash = "sha256-k0j/WgA+6LNTYJ233GJjeRU403bJJRxbpOu+BUsMeyQ=";
+ })
+ ];
+
build-system = [ setuptools ];
nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/tiktoken/Cargo.lock b/pkgs/development/python-modules/tiktoken/Cargo.lock
index c0ae6a287067..ad321b632cd9 100644
--- a/pkgs/development/python-modules/tiktoken/Cargo.lock
+++ b/pkgs/development/python-modules/tiktoken/Cargo.lock
@@ -13,9 +13,9 @@ dependencies = [
[[package]]
name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "bit-set"
@@ -32,17 +32,11 @@ version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
-[[package]]
-name = "bitflags"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
-
[[package]]
name = "bstr"
-version = "1.9.1"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"
+checksum = "1a68f1f47cdf0ec8ee4b941b2eee2a80cb796db73118c0dd09ac63fbe405be22"
dependencies = [
"memchr",
"regex-automata",
@@ -57,19 +51,20 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "fancy-regex"
-version = "0.11.0"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2"
+checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2"
dependencies = [
"bit-set",
- "regex",
+ "regex-automata",
+ "regex-syntax",
]
[[package]]
name = "heck"
-version = "0.4.1"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
[[package]]
name = "indoc"
@@ -79,19 +74,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
[[package]]
name = "libc"
-version = "0.2.155"
+version = "0.2.162"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
-
-[[package]]
-name = "lock_api"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
+checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
[[package]]
name = "memchr"
@@ -110,59 +95,36 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-
-[[package]]
-name = "parking_lot"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-targets",
-]
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
[[package]]
name = "portable-atomic"
-version = "1.6.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
[[package]]
name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
dependencies = [
"unicode-ident",
]
[[package]]
name = "pyo3"
-version = "0.20.3"
+version = "0.22.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233"
+checksum = "f402062616ab18202ae8319da13fa4279883a2b8a9d9f83f20dbade813ce1884"
dependencies = [
"cfg-if",
"indoc",
"libc",
"memoffset",
- "parking_lot",
+ "once_cell",
"portable-atomic",
"pyo3-build-config",
"pyo3-ffi",
@@ -172,9 +134,9 @@ dependencies = [
[[package]]
name = "pyo3-build-config"
-version = "0.20.3"
+version = "0.22.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7"
+checksum = "b14b5775b5ff446dd1056212d778012cbe8a0fbffd368029fd9e25b514479c38"
dependencies = [
"once_cell",
"target-lexicon",
@@ -182,9 +144,9 @@ dependencies = [
[[package]]
name = "pyo3-ffi"
-version = "0.20.3"
+version = "0.22.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa"
+checksum = "9ab5bcf04a2cdcbb50c7d6105de943f543f9ed92af55818fd17b660390fc8636"
dependencies = [
"libc",
"pyo3-build-config",
@@ -192,9 +154,9 @@ dependencies = [
[[package]]
name = "pyo3-macros"
-version = "0.20.3"
+version = "0.22.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158"
+checksum = "0fd24d897903a9e6d80b968368a34e1525aeb719d568dba8b3d4bfa5dc67d453"
dependencies = [
"proc-macro2",
"pyo3-macros-backend",
@@ -204,9 +166,9 @@ dependencies = [
[[package]]
name = "pyo3-macros-backend"
-version = "0.20.3"
+version = "0.22.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185"
+checksum = "36c011a03ba1e50152b4b394b479826cad97e7a21eb52df179cd91ac411cbfbe"
dependencies = [
"heck",
"proc-macro2",
@@ -217,27 +179,18 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.36"
+version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
dependencies = [
"proc-macro2",
]
-[[package]]
-name = "redox_syscall"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
-dependencies = [
- "bitflags",
-]
-
[[package]]
name = "regex"
-version = "1.10.5"
+version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
dependencies = [
"aho-corasick",
"memchr",
@@ -247,9 +200,9 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.7"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
dependencies = [
"aho-corasick",
"memchr",
@@ -258,9 +211,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]]
name = "rustc-hash"
@@ -268,43 +221,31 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
[[package]]
name = "serde"
-version = "1.0.204"
+version = "1.0.215"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.204"
+version = "1.0.215"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
-[[package]]
-name = "smallvec"
-version = "1.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
-
[[package]]
name = "syn"
-version = "2.0.71"
+version = "2.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
dependencies = [
"proc-macro2",
"quote",
@@ -313,13 +254,13 @@ dependencies = [
[[package]]
name = "target-lexicon"
-version = "0.12.15"
+version = "0.12.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
[[package]]
name = "tiktoken"
-version = "0.7.0"
+version = "0.8.0"
dependencies = [
"bstr",
"fancy-regex",
@@ -330,76 +271,12 @@ dependencies = [
[[package]]
name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
[[package]]
name = "unindent"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
-
-[[package]]
-name = "windows-targets"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_gnullvm",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
-]
-
-[[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_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[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_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-
-[[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_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
diff --git a/pkgs/development/python-modules/tiktoken/default.nix b/pkgs/development/python-modules/tiktoken/default.nix
index 9ce945ebf7c3..7999fe4a66ed 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.7.0";
+ version = "0.8.0";
src = fetchPypi {
inherit pname version;
- hash = "sha256-EHcmbpScJOApH2w1BDPG8JcTZezisXOiO8O5+d7+9rY=";
+ hash = "sha256-nMuydA8kVCU0NpxWNc/ZsrPCSQdUp4rIgx2Z+J+U7rI=";
};
postPatch = ''
cp ${./Cargo.lock} Cargo.lock
@@ -44,7 +44,7 @@ buildPythonPackage {
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src postPatch;
name = "${pname}-${version}";
- hash = "sha256-i0AQUu9ERDWBw0kjTTTyn4VHMig/k2/7wX2884MCGx8=";
+ hash = "sha256-XzUEqiUdi70bgQwARGHsgti36cFOh7QDiEkccjxlwls=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix
index 730bbfc4f4d7..5702722a4c9c 100644
--- a/pkgs/development/python-modules/tinycss2/default.nix
+++ b/pkgs/development/python-modules/tinycss2/default.nix
@@ -3,40 +3,36 @@
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
- webencodings,
- pytestCheckHook,
flit-core,
+ webencodings,
+ pytest-cov-stub,
+ pytestCheckHook,
}:
buildPythonPackage rec {
pname = "tinycss2";
- version = "1.3.0";
- format = "pyproject";
+ version = "1.4.0";
+ pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "kozea";
repo = "tinycss2";
-
- # Tag v1.3.0 is missing the actual version number bump.
- rev = "bda62b101530588718d931d61bcc343a628b9af9";
+ rev = "refs/tags/${version}";
# for tests
fetchSubmodules = true;
hash = "sha256-Exjxdm0VnnjHUKjquXsC/zDmwA7bELHdX1f55IGBjYk=";
};
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace "'pytest-cov', 'pytest-flake8', 'pytest-isort', 'coverage[toml]'" "" \
- --replace "--isort --flake8 --cov --no-cov-on-fail" ""
- '';
+ build-system = [ flit-core ];
- nativeBuildInputs = [ flit-core ];
+ dependencies = [ webencodings ];
- propagatedBuildInputs = [ webencodings ];
-
- nativeCheckInputs = [ pytestCheckHook ];
+ nativeCheckInputs = [
+ pytest-cov-stub
+ pytestCheckHook
+ ];
meta = with lib; {
description = "Low-level CSS parser for Python";
diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix
index 4d4e0a71c74d..6312d9a4f958 100644
--- a/pkgs/development/python-modules/toolz/default.nix
+++ b/pkgs/development/python-modules/toolz/default.nix
@@ -2,19 +2,22 @@
lib,
buildPythonPackage,
fetchPypi,
+ setuptools,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "toolz";
- version = "0.12.1";
- format = "setuptools";
+ version = "1.0.0";
+ pyproject = true;
src = fetchPypi {
inherit pname version;
- hash = "sha256-7Mo0JmSJPxd6E9rA5rQcvYrCWjWOXyFTFtQ+IQAiT00=";
+ hash = "sha256-LIbj2aBHmKxVZ5O87YOIFilqLwhQF2ZOSZXLQKEEegI=";
};
+ build-system = [ setuptools ];
+
nativeCheckInputs = [ pytestCheckHook ];
disabledTests = [
@@ -24,6 +27,7 @@ buildPythonPackage rec {
meta = with lib; {
homepage = "https://github.com/pytoolz/toolz";
+ changelog = "https://github.com/pytoolz/toolz/releases/tag/${version}";
description = "List processing tools and functional utilities";
license = licenses.bsd3;
};
diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix
index 2a5c06f5ab38..47122a67d7ef 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.4.1";
+ version = "6.4.2";
pyproject = true;
src = fetchFromGitHub {
owner = "tornadoweb";
repo = "tornado";
- rev = "v${version}";
- hash = "sha256-vWiTLKL5gzrf3J6T3u8I1HHg5Ww0sf5ybSbZX6G3UXM=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-qgJh8pnC1ALF8KxhAYkZFAc0DE6jHVB8R/ERJFL4OFc=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/tree-sitter/default.nix b/pkgs/development/python-modules/tree-sitter/default.nix
index 92a9c1f00a71..4ee037d37f84 100644
--- a/pkgs/development/python-modules/tree-sitter/default.nix
+++ b/pkgs/development/python-modules/tree-sitter/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "tree-sitter";
- version = "0.23.0";
+ version = "0.23.2";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "tree-sitter";
repo = "py-tree-sitter";
rev = "refs/tags/v${version}";
- hash = "sha256-OMCiHX1ZK9MknUcscEMg1Oie0qFpPQ9lMn8m/D0QF7g=";
+ hash = "sha256-RWnt1g7WN5CDbgWY5YSTuPFZomoxtRgDaSLkG9y2B6w=";
fetchSubmodules = true;
};
diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix
index a29bcd842401..f9cc2f20e19c 100644
--- a/pkgs/development/python-modules/trio/default.nix
+++ b/pkgs/development/python-modules/trio/default.nix
@@ -18,7 +18,6 @@
# tests
astor,
- coreutils,
jedi,
pyopenssl,
pytestCheckHook,
@@ -36,7 +35,7 @@ let
in
buildPythonPackage rec {
pname = "trio";
- version = "0.26.2";
+ version = "0.27.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -45,7 +44,7 @@ buildPythonPackage rec {
owner = "python-trio";
repo = "trio";
rev = "refs/tags/v${version}";
- hash = "sha256-Vlm6lEMKKfwmhbeefPjxm3vz1zFRUEGOCHXLcZKQcIo=";
+ hash = "sha256-VJVGMhoLISCtNh56E7ssKXBPh4/WvUbFyKUbnWvqd0s=";
};
build-system = [ setuptools ];
@@ -77,6 +76,11 @@ buildPythonPackage rec {
PYTHONPATH=$PWD/src:$PYTHONPATH
'';
+ pytestFlagsArray = [
+ "-W"
+ "ignore::DeprecationWarning"
+ ];
+
# It appears that the build sandbox doesn't include /etc/services, and these tests try to use it.
disabledTests = [
"getnameinfo"
diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix
index 297a666dc5b3..dc7ff7816681 100644
--- a/pkgs/development/python-modules/trustme/default.nix
+++ b/pkgs/development/python-modules/trustme/default.nix
@@ -3,6 +3,7 @@
buildPythonPackage,
cryptography,
fetchPypi,
+ hatchling,
idna,
pyopenssl,
pytestCheckHook,
@@ -12,17 +13,19 @@
buildPythonPackage rec {
pname = "trustme";
- version = "1.1.0";
- format = "setuptools";
+ version = "1.2.0";
+ pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
- hash = "sha256-U3Wtf7QnB0vslWWS4NTuKkz02miTThukvPQhcSa8ReY=";
+ hash = "sha256-7SJk+0bDVFnm3p5FTtS6tzvkS2oqJq1Bf5toVK67ZEo=";
};
- propagatedBuildInputs = [
+ build-system = [ hatchling ];
+
+ dependencies = [
cryptography
idna
];
diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index 6a6b752ab8a2..c8efec9a5e1a 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -2,9 +2,9 @@
lib,
stdenv,
buildPythonPackage,
+ pythonAtLeast,
pythonOlder,
fetchPypi,
- fetchpatch,
python,
# build-system
@@ -27,7 +27,6 @@
h2,
idna,
priority,
- pyasn1,
pyopenssl,
pyserial,
service-identity,
@@ -41,6 +40,7 @@
# for passthru.tests
cassandra-driver,
+ httpx,
klein,
magic-wormhole,
scrapy,
@@ -55,7 +55,7 @@
buildPythonPackage rec {
pname = "twisted";
- version = "24.7.0";
+ version = "24.10.0";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -63,25 +63,9 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
extension = "tar.gz";
- hash = "sha256-WmAUfwRBh6En7H2pbRcNSbzOUMb9NvWU5g9Fh+/005Q=";
+ hash = "sha256-ApUSmWcllf6g9w+i1fe149VoNhV+2miFmmrWSS02dW4=";
};
- patches = [
- (fetchpatch {
- # Conditionally skip tests that require METHOD_CRYPT
- # https://github.com/twisted/twisted/pull/11827
- url = "https://github.com/mweinelt/twisted/commit/e69e652de671aac0abf5c7e6c662fc5172758c5a.patch";
- hash = "sha256-LmvKUTViZoY/TPBmSlx4S9FbJNZfB5cxzn/YcciDmoI=";
- })
-
- (fetchpatch {
- name = "python-3.12.6.patch";
- url = "https://github.com/twisted/twisted/commit/3422f7988e3d42e6e5184acd65f103fd28750648.patch";
- excludes = [ ".github/workflows/test.yaml" ];
- hash = "sha256-/UmrHdWaApytkEDZiISjPGzpWv/Yxe/xjvr9GOjMPmQ=";
- })
- ];
-
__darwinAllowLocalNetworking = true;
nativeBuildInputs = [
@@ -101,66 +85,98 @@ buildPythonPackage rec {
];
postPatch =
- ''
- echo 'ListingTests.test_localeIndependent.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py
- echo 'ListingTests.test_newFile.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py
- echo 'ListingTests.test_newSingleDigitDayOfMonth.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py
- echo 'ListingTests.test_oldFile.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py
- echo 'ListingTests.test_oldSingleDigitDayOfMonth.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py
-
- echo 'WrapClientTLSParserTests.test_tls.skip = "pyopenssl update"' >> src/twisted/internet/test/test_endpoints.py
- echo 'UNIXTestsBuilder_AsyncioSelectorReactorTests.test_sendFileDescriptorTriggersPauseProducing.skip = "sendFileDescriptor producer was not paused"'>> src/twisted/internet/test/test_unix.py
- echo 'UNIXTestsBuilder_SelectReactorTests.test_sendFileDescriptorTriggersPauseProducing.skip = "sendFileDescriptor producer was not paused"'>> src/twisted/internet/test/test_unix.py
-
- echo 'FileObserverTests.test_getTimezoneOffsetEastOfUTC.skip = "mktime argument out of range"'>> src/twisted/test/test_log.py
- echo 'FileObserverTests.test_getTimezoneOffsetWestOfUTC.skip = "mktime argument out of range"'>> src/twisted/test/test_log.py
- echo 'FileObserverTests.test_getTimezoneOffsetWithoutDaylightSavingTime.skip = "tuple differs, values not"'>> src/twisted/test/test_log.py
-
- echo 'FileDescriptorTests.test_expectedFDs.skip = "Expected duplicate file descriptor to be greater than original"' >> src/twisted/internet/test/test_posixprocess.py
-
- echo 'MulticastTests.test_joinLeave.skip = "No such device"'>> src/twisted/test/test_udp.py
- echo 'MulticastTests.test_loopback.skip = "No such device"'>> src/twisted/test/test_udp.py
- echo 'MulticastTests.test_multicast.skip = "Reactor was unclean"'>> src/twisted/test/test_udp.py
- echo 'MulticastTests.test_multiListen.skip = "No such device"'>> src/twisted/test/test_udp.py
-
- # fails since migrating to libxcrypt
- echo 'HelperTests.test_refuteCryptedPassword.skip = "OSError: Invalid argument"' >> src/twisted/conch/test/test_checkers.py
-
- # expectation mismatch with `python -m twisted --help` and `python -m twisted.trial --help` usage output
- echo 'MainTests.test_twisted.skip = "Expectation Mismatch"' >> src/twisted/test/test_main.py
- echo 'MainTests.test_trial.skip = "Expectation Mismatch"' >> src/twisted/test/test_main.py
-
- # tests for missing https support in usage
- echo 'ServiceTests.test_HTTPSFailureOnMissingSSL.skip = "Expectation Mismatch"' >> src/twisted/web/test/test_tap.py
-
- # fail on Python 3.12
- echo 'WorkerReporterTests.test_addSkipPyunit.skip = "'WorkerReporter' object has no attribute '_testStarted'"' >> src/twisted/trial/_dist/test/test_workerreporter.py
- echo 'LocalWorkerAMPTests.test_runSkip.skip = "twisted.protocols.amp.UnknownRemoteError: Code: Unknown Error"' >> src/twisted/trial/_dist/test/test_worker.py
-
- # https://github.com/twisted/twisted/issues/12194
- echo 'FlattenerErrorTests.test_asynchronousFlattenError.skip = "builtins.KeyError: 'root'"' >> src/twisted/web/test/test_flatten.py
- echo 'FlattenerErrorTests.test_cancel.skip = "builtins.KeyError: 'root'"' >> src/twisted/web/test/test_flatten.py
-
- # not packaged
- substituteInPlace src/twisted/test/test_failure.py \
- --replace "from cython_test_exception_raiser import raiser # type: ignore[import]" "raiser = None"
- ''
+ let
+ skippedTests =
+ {
+ "src/twisted/conch/test/test_cftp.py" = [
+ # timezone issues
+ "ListingTests.test_localeIndependent"
+ "ListingTests.test_newSingleDigitDayOfMonth"
+ "ListingTests.test_oldFile"
+ "ListingTests.test_oldSingleDigitDayOfMonth"
+ "ListingTests.test_newFile"
+ ];
+ "src/twisted/test/test_log.py" = [
+ # wrong timezone offset calculation
+ "FileObserverTests.test_getTimezoneOffsetEastOfUTC"
+ "FileObserverTests.test_getTimezoneOffsetWestOfUTC"
+ "FileObserverTests.test_getTimezoneOffsetWithoutDaylightSavingTime"
+ ];
+ "src/twisted/test/test_udp.py" = [
+ # "No such device" (No multicast support in the build sandbox)
+ "MulticastTests.test_joinLeave"
+ "MulticastTests.test_loopback"
+ "MulticastTests.test_multicast"
+ "MulticastTests.test_multiListen"
+ ];
+ }
+ // lib.optionalAttrs (pythonAtLeast "3.12") {
+ "src/twisted/trial/_dist/test/test_workerreporter.py" = [
+ "WorkerReporterTests.test_addSkipPyunit"
+ ];
+ "src/twisted/trial/_dist/test/test_worker.py" = [
+ "LocalWorkerAMPTests.test_runSkip"
+ ];
+ }
+ // lib.optionalAttrs (pythonOlder "3.13") {
+ # missing ciphers in the crypt module due to libxcrypt
+ "src/twisted/web/test/test_tap.py" = [
+ "ServiceTests.test_HTTPSFailureOnMissingSSL"
+ "ServiceTests.test_HTTPSFailureOnMissingSSL"
+ ];
+ "src/twisted/conch/test/test_checkers.py" = [
+ "HelperTests.test_refuteCryptedPassword"
+ "HelperTests.test_verifyCryptedPassword"
+ "HelperTests.test_verifyCryptedPasswordMD5"
+ "UNIXPasswordDatabaseTests.test_defaultCheckers"
+ "UNIXPasswordDatabaseTests.test_passInCheckers"
+ ];
+ "src/twisted/cred/test/test_strcred.py" = [
+ "UnixCheckerTests.test_isChecker"
+ "UnixCheckerTests.test_unixCheckerFailsPassword"
+ "UnixCheckerTests.test_unixCheckerFailsPasswordBytes"
+ "UnixCheckerTests.test_unixCheckerFailsUsername"
+ "UnixCheckerTests.test_unixCheckerFailsUsernameBytes"
+ "UnixCheckerTests.test_unixCheckerSucceeds"
+ "UnixCheckerTests.test_unixCheckerSucceedsBytes"
+ "CryptTests.test_verifyCryptedPassword"
+ "CryptTests.test_verifyCryptedPasswordOSError"
+ ];
+ # dependant on UnixCheckerTests.test_isChecker
+ "src/twisted/cred/test/test_cred.py" = [
+ "HashedPasswordOnDiskDatabaseTests.testBadCredentials"
+ "HashedPasswordOnDiskDatabaseTests.testGoodCredentials"
+ "HashedPasswordOnDiskDatabaseTests.testGoodCredentials_login"
+ "HashedPasswordOnDiskDatabaseTests.testHashedCredentials"
+ ];
+ }
+ // lib.optionalAttrs (pythonAtLeast "3.13") {
+ "src/twisted/web/test/test_flatten.py" = [
+ "FlattenerErrorTests.test_asynchronousFlattenError"
+ "FlattenerErrorTests.test_cancel"
+ ];
+ }
+ // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+ "src/twisted/internet/test/test_process.py" = [
+ # invalid syntaax
+ "ProcessTestsBuilder_AsyncioSelectorReactorTests.test_openFileDescriptors"
+ "ProcessTestsBuilder_SelectReactorTests.test_openFileDescriptors"
+ # exit code 120
+ "ProcessTestsBuilder_AsyncioSelectorReactorTests.test_processEnded"
+ "ProcessTestsBuilder_SelectReactorTests.test_processEnded"
+ ];
+ };
+ in
+ lib.concatStringsSep "\n" (
+ lib.mapAttrsToList (
+ file: tests: lib.concatMapStringsSep "\n" (test: ''echo '${test}.skip = ""' >> "${file}"'') tests
+ ) skippedTests
+ )
+ lib.optionalString stdenv.hostPlatform.isLinux ''
- echo 'PTYProcessTestsBuilder_EPollReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py
- echo 'PTYProcessTestsBuilder_PollReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py
- echo 'UNIXTestsBuilder_EPollReactorTests.test_sendFileDescriptorTriggersPauseProducing.skip = "sendFileDescriptor producer was not paused"'>> src/twisted/internet/test/test_unix.py
- echo 'UNIXTestsBuilder_PollReactorTests.test_sendFileDescriptorTriggersPauseProducing.skip = "sendFileDescriptor producer was not paused"'>> src/twisted/internet/test/test_unix.py
-
# Patch t.p._inotify to point to libc. Without this,
# twisted.python.runtime.platform.supportsINotify() == False
- substituteInPlace src/twisted/python/_inotify.py --replace \
+ substituteInPlace src/twisted/python/_inotify.py --replace-fail \
"ctypes.util.find_library(\"c\")" "'${stdenv.cc.libc}/lib/libc.so.6'"
- ''
- + lib.optionalString stdenv.hostPlatform.isDarwin ''
- echo 'ProcessTestsBuilder_AsyncioSelectorReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py
- echo 'ProcessTestsBuilder_SelectReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py
- echo 'ProcessTestsBuilder_AsyncioSelectorReactorTests.test_processEnded.skip = "exit code 120"' >> src/twisted/internet/test/test_process.py
- echo 'ProcessTestsBuilder_SelectReactorTests.test_processEnded.skip = "exit code 120"' >> src/twisted/internet/test/test_process.py
'';
# Generate Twisted's plug-in cache. Twisted users must do it as well. See
@@ -172,12 +188,10 @@ buildPythonPackage rec {
nativeCheckInputs =
[
- cython-test-exception-raiser
git
glibcLocales
- hypothesis
- pyhamcrest
]
+ ++ optional-dependencies.test
++ optional-dependencies.conch
++ optional-dependencies.http2
++ optional-dependencies.serial
@@ -186,11 +200,16 @@ buildPythonPackage rec {
!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)
) optional-dependencies.tls;
- checkPhase = ''
+ preCheck = ''
export SOURCE_DATE_EPOCH=315532800
export PATH=$out/bin:$PATH
+ '';
+
+ checkPhase = ''
+ runHook preCheck
# race conditions when running in paralell
${python.interpreter} -m twisted.trial -j1 twisted
+ runHook postCheck
'';
optional-dependencies = {
@@ -198,13 +217,18 @@ buildPythonPackage rec {
appdirs
bcrypt
cryptography
- pyasn1
];
http2 = [
h2
priority
];
serial = [ pyserial ];
+ test = [
+ cython-test-exception-raiser
+ pyhamcrest
+ hypothesis
+ httpx
+ ] ++ httpx.optional-dependencies.http2;
tls = [
idna
pyopenssl
diff --git a/pkgs/development/python-modules/unify/default.nix b/pkgs/development/python-modules/unify/default.nix
index 9f6f7d929c6e..061129e80725 100644
--- a/pkgs/development/python-modules/unify/default.nix
+++ b/pkgs/development/python-modules/unify/default.nix
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+ pythonAtLeast,
pythonOlder,
setuptools,
pytestCheckHook,
@@ -13,7 +14,8 @@ buildPythonPackage rec {
version = "0.5";
pyproject = true;
- disabled = pythonOlder "3.9";
+ # lib2to3 usage and unmaintained since 2019
+ disabled = pythonOlder "3.9" || pythonAtLeast "3.13";
src = fetchFromGitHub {
owner = "myint";
diff --git a/pkgs/development/python-modules/uv/default.nix b/pkgs/development/python-modules/uv/default.nix
new file mode 100644
index 000000000000..529b3b782bc9
--- /dev/null
+++ b/pkgs/development/python-modules/uv/default.nix
@@ -0,0 +1,32 @@
+{
+ buildPythonPackage,
+ installShellFiles,
+ pkg-config,
+ rustPlatform,
+ pkgs,
+}:
+
+buildPythonPackage {
+ inherit (pkgs.uv)
+ pname
+ version
+ src
+ cargoDeps
+ dontUseCmakeConfigure
+ meta
+ cargoBuildFlags
+ postInstall
+ versionCheckProgramArg
+ ;
+
+ nativeBuildInputs = [
+ pkgs.cmake
+ installShellFiles
+ pkg-config
+ rustPlatform.cargoSetupHook
+ rustPlatform.maturinBuildHook
+ ];
+
+ pyproject = true;
+ pythonImportsCheck = [ "uv" ];
+}
diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix
index ab72df02971f..aded817044b3 100644
--- a/pkgs/development/python-modules/uvicorn/default.nix
+++ b/pkgs/development/python-modules/uvicorn/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "uvicorn";
- version = "0.32.0";
+ version = "0.32.1";
disabled = pythonOlder "3.8";
pyproject = true;
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "encode";
repo = "uvicorn";
rev = "refs/tags/${version}";
- hash = "sha256-LTioJNDq1zsy/FO6lBgRW8Ow5qyxUD8NjNCj4nIrVDM=";
+ hash = "sha256-Kx5OwIMqstiFCkqE2wunKSkttd9C8gM+a2KWJuhBN1c=";
};
outputs = [
diff --git a/pkgs/development/python-modules/uvicorn/tests.nix b/pkgs/development/python-modules/uvicorn/tests.nix
index b5d7cee2f7c5..62fc83d21fb1 100644
--- a/pkgs/development/python-modules/uvicorn/tests.nix
+++ b/pkgs/development/python-modules/uvicorn/tests.nix
@@ -7,6 +7,7 @@
pytestCheckHook,
pytest-mock,
trustme,
+ typing-extensions,
watchgod,
wsproto,
}:
@@ -27,6 +28,7 @@ buildPythonPackage {
pytestCheckHook
pytest-mock
trustme
+ typing-extensions
# strictly optional dependencies
a2wsgi
diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix
index 8ef7730047d5..881be880d9d9 100644
--- a/pkgs/development/python-modules/uvloop/default.nix
+++ b/pkgs/development/python-modules/uvloop/default.nix
@@ -32,6 +32,13 @@ buildPythonPackage rec {
hash = "sha256-O/ErD9poRHgGp62Ee/pZFhMXcnXTW2ckse5XP6o3BOM=";
};
+ postPatch = ''
+ rm -rf vendor
+
+ substituteInPlace setup.py \
+ --replace-fail "use_system_libuv = False" "use_system_libuv = True"
+ '';
+
build-system = [
cython
setuptools
diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix
index 2794a7a1699b..a5f6812a9455 100644
--- a/pkgs/development/python-modules/venusian/default.nix
+++ b/pkgs/development/python-modules/venusian/default.nix
@@ -1,6 +1,7 @@
{
lib,
buildPythonPackage,
+ fetchpatch2,
fetchPypi,
isPy27,
pytestCheckHook,
@@ -20,6 +21,15 @@ buildPythonPackage rec {
hash = "sha256-63LNym8xOaFdyA+cldPBD4pUoLqIHu744uxbQtPuOpU=";
};
+ patches = [
+ # https://github.com/Pylons/venusian/pull/92
+ (fetchpatch2 {
+ name = "python313-compat.patch";
+ url = "https://github.com/Pylons/venusian/pull/92/commits/000b36d6968502683615da618afc3677ec8f05fc.patch?full_index=1";
+ hash = "sha256-lH4x3Fc7odV+j/sHw48BDjaZAXo+WN20omnpKPNiF7w=";
+ })
+ ];
+
nativeBuildInputs = [ setuptools ];
nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix
index dd74e0212bc5..eb3b16c0a3ea 100644
--- a/pkgs/development/python-modules/vispy/default.nix
+++ b/pkgs/development/python-modules/vispy/default.nix
@@ -31,13 +31,6 @@ buildPythonPackage rec {
hash = "sha256-77u4R6kIuvfnFpq5vylhOKOTZPNn5ssKjsA61xaZ0x0=";
};
- postPatch = ''
- # https://numpy.org/devdocs/dev/depending_on_numpy.html#numpy-2-0-specific-advice
- # upstream enforce builds with numpy 2+, which is backward compat with 1.xx
- substituteInPlace pyproject.toml \
- --replace-fail "numpy>=2.0.0rc2" "numpy"
- '';
-
patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [
(substituteAll {
src = ./library-paths.patch;
diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix
index f9c205f3c725..f12797a153c0 100644
--- a/pkgs/development/python-modules/watchdog/default.nix
+++ b/pkgs/development/python-modules/watchdog/default.nix
@@ -10,32 +10,32 @@
pytestCheckHook,
pythonOlder,
pyyaml,
+ setuptools,
apple-sdk_11,
}:
buildPythonPackage rec {
pname = "watchdog";
- version = "4.0.2";
- format = "setuptools";
-
- disabled = pythonOlder "3.7";
+ version = "5.0.3";
+ pyproject = true;
src = fetchPypi {
inherit pname version;
- hash = "sha256-tN+7bEkiG+RTViPqRHSk1u4KnO9KgLIMKNtNhYtk4nA=";
+ hash = "sha256-EI9Cp/A0UEKoVNTQrQg0t0HUITMNX1dbgcsnuINQAXY=";
};
+ build-system = [ setuptools ];
+
buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
optional-dependencies.watchmedo = [ pyyaml ];
nativeCheckInputs = [
- eventlet
flaky
pytest-cov-stub
pytest-timeout
pytestCheckHook
- ] ++ optional-dependencies.watchmedo;
+ ] ++ optional-dependencies.watchmedo ++ lib.optionals (pythonOlder "3.13") [ eventlet ];
postPatch = ''
substituteInPlace setup.cfg \
diff --git a/pkgs/development/python-modules/watchfiles/Cargo.lock b/pkgs/development/python-modules/watchfiles/Cargo.lock
new file mode 100644
index 000000000000..f4ab61997cf7
--- /dev/null
+++ b/pkgs/development/python-modules/watchfiles/Cargo.lock
@@ -0,0 +1,532 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+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"
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "cc"
+version = "1.0.96"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+
+[[package]]
+name = "filetime"
+version = "0.2.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "libredox",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "fsevent-sys"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "indoc"
+version = "2.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
+
+[[package]]
+name = "inotify"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc"
+dependencies = [
+ "bitflags 1.3.2",
+ "inotify-sys",
+ "libc",
+]
+
+[[package]]
+name = "inotify-sys"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "kqueue"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
+dependencies = [
+ "kqueue-sys",
+ "libc",
+]
+
+[[package]]
+name = "kqueue-sys"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
+dependencies = [
+ "bitflags 1.3.2",
+ "libc",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.154"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
+ "redox_syscall",
+]
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+dependencies = [
+ "libc",
+ "log",
+ "wasi",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "notify"
+version = "6.1.1"
+source = "git+https://github.com/samuelcolvin/notify.git?branch=keep-io-error#0f87ab12707d231fa44180454d59478d3992eb59"
+dependencies = [
+ "bitflags 2.6.0",
+ "filetime",
+ "fsevent-sys",
+ "inotify",
+ "kqueue",
+ "libc",
+ "log",
+ "mio",
+ "notify-types",
+ "walkdir",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "notify-types"
+version = "1.0.0"
+source = "git+https://github.com/samuelcolvin/notify.git?branch=keep-io-error#0f87ab12707d231fa44180454d59478d3992eb59"
+dependencies = [
+ "instant",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "portable-atomic"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "pyo3"
+version = "0.22.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433"
+dependencies = [
+ "cfg-if",
+ "indoc",
+ "libc",
+ "memoffset",
+ "once_cell",
+ "portable-atomic",
+ "pyo3-build-config",
+ "pyo3-ffi",
+ "pyo3-macros",
+ "unindent",
+]
+
+[[package]]
+name = "pyo3-build-config"
+version = "0.22.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8"
+dependencies = [
+ "once_cell",
+ "python3-dll-a",
+ "target-lexicon",
+]
+
+[[package]]
+name = "pyo3-ffi"
+version = "0.22.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6"
+dependencies = [
+ "libc",
+ "pyo3-build-config",
+]
+
+[[package]]
+name = "pyo3-macros"
+version = "0.22.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206"
+dependencies = [
+ "proc-macro2",
+ "pyo3-macros-backend",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "pyo3-macros-backend"
+version = "0.22.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "pyo3-build-config",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "python3-dll-a"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd0b78171a90d808b319acfad166c4790d9e9759bbc14ac8273fe133673dd41b"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "target-lexicon"
+version = "0.12.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unindent"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "watchfiles_rust_notify"
+version = "0.0.0"
+dependencies = [
+ "crossbeam-channel",
+ "notify",
+ "pyo3",
+]
+
+[[package]]
+name = "winapi-util"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[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.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[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",
+ "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_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[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_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[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_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[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_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[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_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
diff --git a/pkgs/development/python-modules/watchfiles/default.nix b/pkgs/development/python-modules/watchfiles/default.nix
index 3b09081249b0..705be5e6c047 100644
--- a/pkgs/development/python-modules/watchfiles/default.nix
+++ b/pkgs/development/python-modules/watchfiles/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "watchfiles";
- version = "0.22.0";
+ version = "0.24.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -27,13 +27,12 @@ buildPythonPackage rec {
owner = "samuelcolvin";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-TtRSRgtMOqsnhdvsic3lg33xlA+r/DcYHlzewSOu/44=";
+ hash = "sha256-uc4CfczpNkS4NMevtRxhUOj9zTt59cxoC0BXnuHFzys=";
};
- cargoDeps = rustPlatform.fetchCargoTarball {
- inherit src;
- name = "${pname}-${version}";
- hash = "sha256-n9yN/VRNQWCxh+BoliIMkKqJC51inpB9DQ9WtqR4oA0=";
+ cargoDeps = rustPlatform.importCargoLock {
+ lockFile = ./Cargo.lock;
+ outputHashes."notify-6.1.1" = "sha256-lT3R5ZQpjx52NVMEKTTQI90EWT16YnbqphqvZmNpw/I=";
};
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix
index feafb29bcbd3..aef1412124fd 100644
--- a/pkgs/development/python-modules/werkzeug/default.nix
+++ b/pkgs/development/python-modules/werkzeug/default.nix
@@ -15,11 +15,10 @@
watchdog,
# tests
+ cffi,
cryptography,
ephemeral-port-reserve,
- greenlet,
pytest-timeout,
- pytest-xprocess,
pytestCheckHook,
# reverse dependencies
@@ -29,14 +28,14 @@
buildPythonPackage rec {
pname = "werkzeug";
- version = "3.0.6";
+ version = "3.1.3";
pyproject = true;
- disabled = pythonOlder "3.8";
+ disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
- hash = "sha256-qN1Z1N4oynBHGjTLp5vtX37y4Danazqwg1R0JG60H40=";
+ hash = "sha256-YHI86UXBkyhnl5DjKCzHWKpKYEDkuzMPU9MPpUbUR0Y=";
};
build-system = [ flit-core ];
@@ -44,26 +43,26 @@ buildPythonPackage rec {
dependencies = [ markupsafe ];
optional-dependencies = {
- watchdog = lib.optionals (!stdenv.hostPlatform.isDarwin) [
- # watchdog requires macos-sdk 10.13
- watchdog
- ];
+ watchdog = [ watchdog ];
};
- nativeCheckInputs =
- [
- cryptography
- ephemeral-port-reserve
- pytest-timeout
- pytest-xprocess
- pytestCheckHook
- ]
- ++ lib.optionals (pythonOlder "3.11") [ greenlet ]
- ++ lib.flatten (builtins.attrValues optional-dependencies);
+ nativeCheckInputs = [
+ cffi
+ cryptography
+ ephemeral-port-reserve
+ pytest-timeout
+ pytestCheckHook
+ ] ++ lib.flatten (lib.attrValues optional-dependencies);
pythonImportsCheck = [ "werkzeug" ];
- disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_get_machine_id" ];
+ disabledTests = [
+ # ConnectionRefusedError: [Errno 111] Connection refused
+ "test_http_proxy"
+ # ResourceWarning: subprocess 309 is still running
+ "test_basic"
+ "test_long_build"
+ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_get_machine_id" ];
disabledTestPaths = [
# ConnectionRefusedError: [Errno 111] Connection refused
diff --git a/pkgs/development/python-modules/wrapt/default.nix b/pkgs/development/python-modules/wrapt/default.nix
index b4c636923b96..59af6a58b8ab 100644
--- a/pkgs/development/python-modules/wrapt/default.nix
+++ b/pkgs/development/python-modules/wrapt/default.nix
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+ setuptools,
pytestCheckHook,
sphinxHook,
sphinx-rtd-theme,
@@ -9,27 +10,30 @@
buildPythonPackage rec {
pname = "wrapt";
- version = "1.16.0";
- outputs = [
- "out"
- "doc"
- ];
- format = "setuptools";
+ version = "1.17.0dev4";
+ pyproject = true;
src = fetchFromGitHub {
owner = "GrahamDumpleton";
- repo = pname;
+ repo = "wrapt";
rev = "refs/tags/${version}";
- hash = "sha256-lVpSriXSvRwAKX4iPOIBvJwhqhKjdrUdGaEG4QoTQyo=";
+ hash = "sha256-q2DYCzTWxGpuIa5v6cyDCTekXfDlFML4eo8J60YdCsc=";
};
- nativeCheckInputs = [ pytestCheckHook ];
+ build-system = [ setuptools ];
nativeBuildInputs = [
sphinxHook
sphinx-rtd-theme
];
+ outputs = [
+ "out"
+ "doc"
+ ];
+
+ nativeCheckInputs = [ pytestCheckHook ];
+
pythonImportsCheck = [ "wrapt" ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/xmlsec/default.nix b/pkgs/development/python-modules/xmlsec/default.nix
index 229fa8171371..3d6d6bc50acd 100644
--- a/pkgs/development/python-modules/xmlsec/default.nix
+++ b/pkgs/development/python-modules/xmlsec/default.nix
@@ -1,6 +1,7 @@
{
lib,
fetchPypi,
+ fetchpatch,
buildPythonPackage,
pytestCheckHook,
libxslt,
@@ -24,6 +25,14 @@ buildPythonPackage rec {
hash = "sha256-k0+ATy+JW824bx6u4ja2YQE1YO5p7BCNKc3W5fKSotk=";
};
+ patches = [
+ # fixes build error with GCC 14
+ (fetchpatch {
+ url = "https://github.com/xmlsec/python-xmlsec/commit/67cd4ac73e4fceac4b4eb6a320067cad33f79213.patch";
+ hash = "sha256-zU34a2x3S48Hwvo/oDe5mfkZ3jBwdajIrKwKhTRSsko=";
+ })
+ ];
+
nativeBuildInputs = [
pkg-config
pkgconfig
diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix
index 356e3f792639..2bbc77852c8e 100644
--- a/pkgs/development/python-modules/yarl/default.nix
+++ b/pkgs/development/python-modules/yarl/default.nix
@@ -2,12 +2,14 @@
lib,
buildPythonPackage,
fetchFromGitHub,
- pythonOlder,
cython,
expandvars,
setuptools,
idna,
multidict,
+ propcache,
+ hypothesis,
+ pytest-codspeed,
pytest-cov-stub,
pytest-xdist,
pytestCheckHook,
@@ -15,17 +17,14 @@
buildPythonPackage rec {
pname = "yarl";
- version = "1.13.1";
-
- disabled = pythonOlder "3.8";
-
+ version = "1.18.3";
pyproject = true;
src = fetchFromGitHub {
owner = "aio-libs";
repo = "yarl";
rev = "refs/tags/v${version}";
- hash = "sha256-I6/c5Q6/SRw8PIW4rPLKhVRVPRIC+n+Cz+UrKn5Pv/0=";
+ hash = "sha256-j2z6YAFbQe26YUQGLBwLr9ztUoxMDJJGS9qYeVqSob0=";
};
build-system = [
@@ -37,6 +36,7 @@ buildPythonPackage rec {
dependencies = [
idna
multidict
+ propcache
];
preCheck = ''
@@ -45,6 +45,8 @@ buildPythonPackage rec {
'';
nativeCheckInputs = [
+ hypothesis
+ pytest-codspeed
pytest-cov-stub
pytest-xdist
pytestCheckHook
diff --git a/pkgs/development/python-modules/yeelight/default.nix b/pkgs/development/python-modules/yeelight/default.nix
index cf9e8da676ec..ba9faf0217b2 100644
--- a/pkgs/development/python-modules/yeelight/default.nix
+++ b/pkgs/development/python-modules/yeelight/default.nix
@@ -3,8 +3,8 @@
async-timeout,
buildPythonPackage,
fetchFromGitLab,
+ fetchpatch2,
flit-core,
- future,
ifaddr,
pytestCheckHook,
pythonOlder,
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "yeelight";
version = "0.7.14";
- format = "pyproject";
+ pyproject = true;
disabled = pythonOlder "3.7";
@@ -24,12 +24,17 @@ buildPythonPackage rec {
hash = "sha256-BnMvRs95rsmoBa/5bp0zShgU1BBHtZzyADjbH0y1d/o=";
};
- nativeBuildInputs = [ flit-core ];
+ patches = [
+ (fetchpatch2 {
+ name = "remove-future-dependency.patch";
+ url = "https://gitlab.com/stavros/python-yeelight/-/commit/654f4f34e0246e65d8db02a107e2ab706de4806d.patch";
+ hash = "sha256-olKpYCzIq/E7zup40Kwzwgk5iOtCubLHo9uQDOhaByQ=";
+ })
+ ];
- propagatedBuildInputs = [
- future
- ifaddr
- ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
+ build-system = [ flit-core ];
+
+ dependencies = [ ifaddr ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix
index 1cb657483936..14da25f5d263 100644
--- a/pkgs/development/ruby-modules/bundled-common/default.nix
+++ b/pkgs/development/ruby-modules/bundled-common/default.nix
@@ -11,6 +11,7 @@
{
name ? null
, pname ? null
+, version ? null
, mainGemName ? null
, gemdir ? null
, gemfile ? null
@@ -65,14 +66,16 @@ let
gems = lib.flip lib.mapAttrs configuredGemset (name: attrs: buildGem name attrs);
+ version' = if version != null then
+ version
+ else if pname != null then
+ gems.${pname}.suffix
+ else null;
+
name' = if name != null then
name
else
- let
- gem = gems.${pname};
- suffix = gem.suffix;
- in
- "${pname}-${suffix}";
+ "${pname}-${version'}";
pname' = if pname != null then
pname
@@ -117,9 +120,10 @@ let
basicEnvArgs = {
- inherit nativeBuildInputs buildInputs ignoreCollisions;
+ inherit nativeBuildInputs buildInputs ignoreCollisions pname;
name = name';
+ version = version';
paths = envPaths;
pathsToLink = [ "/lib" ];
diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix
index 01e90ba53f1f..7fdfa6f15019 100644
--- a/pkgs/development/ruby-modules/bundler-app/default.nix
+++ b/pkgs/development/ruby-modules/bundler-app/default.nix
@@ -39,8 +39,9 @@ let
inherit ruby;
}) args;
- cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" "passthru" "gemset" "gemdir" ] // {
+ cmdArgs = removeAttrs args [ "postBuild" "gemConfig" "passthru" "gemset" "gemdir" ] // {
inherit preferLocalBuild allowSubstitutes; # pass the defaults
+ inherit (basicEnv) version;
nativeBuildInputs = nativeBuildInputs ++ lib.optionals (scripts != []) [ makeWrapper ];
diff --git a/pkgs/development/tools/analysis/rr/zen_workaround.nix b/pkgs/development/tools/analysis/rr/zen_workaround.nix
index 4410224e8454..f69fdcf3b638 100644
--- a/pkgs/development/tools/analysis/rr/zen_workaround.nix
+++ b/pkgs/development/tools/analysis/rr/zen_workaround.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
"-C${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
postConfigure = ''
- makeFlags="$makeFlags M=$(pwd)"
+ appendToVar makeFlags "M=$(pwd)"
'';
buildFlags = [ "modules" ];
diff --git a/pkgs/development/tools/analysis/sparse/default.nix b/pkgs/development/tools/analysis/sparse/default.nix
index 497d571cf14c..38adbe4d8377 100644
--- a/pkgs/development/tools/analysis/sparse/default.nix
+++ b/pkgs/development/tools/analysis/sparse/default.nix
@@ -14,9 +14,12 @@ in stdenv.mkDerivation rec {
preConfigure = ''
sed -i 's|"/usr/include"|"${stdenv.cc.libc.dev}/include"|' pre-process.c
sed -i 's|qx(\$ccom -print-file-name=)|"${GCC_BASE}"|' cgcc
- makeFlags+=" PREFIX=$out"
'';
+ makeFlags = [
+ "PREFIX=${placeholder "out"}"
+ ];
+
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk3 libxml2 llvm perl sqlite ];
doCheck = true;
diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index fe44e8b1922f..f2e6f7f67409 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -27,20 +27,11 @@ stdenv.mkDerivation rec {
sha256 = "Za+7K93pgnuEUQ+jDItEzWlN0izhbynX2crSOXBBY/I=";
})
# Fix build on armv7l.
- # https://bugs.kde.org/show_bug.cgi?id=454346
- # Applied on 3.22.0. Does not apply on 3.23.0.
- #(fetchpatch {
- # url = "https://bugsfiles.kde.org/attachment.cgi?id=149172";
- # sha256 = "sha256-4MASLsEK8wcshboR4YOc6mIt7AvAgDPvqIZyHqlvTEs=";
- #})
- #(fetchpatch {
- # url = "https://bugsfiles.kde.org/attachment.cgi?id=149173";
- # sha256 = "sha256-jX9hD4utWRebbXMJYZ5mu9jecvdrNP05E5J+PnKRTyQ=";
- #})
- #(fetchpatch {
- # url = "https://bugsfiles.kde.org/attachment.cgi?id=149174";
- # sha256 = "sha256-f1YIFIhWhXYVw3/UNEWewDak2mvbAd3aGzK4B+wTlys=";
- #})
+ # see also https://bugs.kde.org/show_bug.cgi?id=454346
+ (fetchpatch {
+ url = "https://git.yoctoproject.org/poky/plain/meta/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch?id=b7a9250590a16f1bdc8c7b563da428df814d4292";
+ sha256 = "sha256-sBZzn98Sf/ETFv8ubivgA6Y6fBNcyR8beB3ICDAyAH0=";
+ })
];
outputs = [ "out" "dev" "man" "doc" ];
diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index 455f18ba0a3d..e3a0f9609c0e 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -15,23 +15,33 @@
stdenv.mkDerivation rec {
pname = "doxygen";
- version = "1.10.0";
+ version = "1.12.0";
src = fetchFromGitHub {
owner = "doxygen";
repo = "doxygen";
rev = "Release_${lib.replaceStrings [ "." ] [ "_" ] version}";
- sha256 = "sha256-FPI5ICdn9Tne/g9SP6jAQS813AAyoDNooDR/Hyvq6R4=";
+ hash = "sha256-4zSaM49TjOaZvrUChM4dNJLondCsQPSArOXZnTHS4yI=";
};
patches = [
+ # fix clang-19 build. can drop on next update
+ # https://github.com/doxygen/doxygen/pull/11064
(fetchpatch {
- name = "sys-spdlog-fix.patch";
- url = "https://github.com/doxygen/doxygen/commit/0df6da616f01057d28b11c8bee28443c102dd424.patch";
- hash = "sha256-7efkCQFYGslwqhIuPsLYTEiA1rq+mO0DuyQBMt0O+m0=";
+ name = "fix-clang-19-build.patch";
+ url = "https://github.com/doxygen/doxygen/commit/cff64a87dea7596fd506a85521d4df4616dc845f.patch";
+ hash = "sha256-TtkVfV9Ep8/+VGbTjP4NOP8K3p1+A78M+voAIQ+lzOk=";
})
];
+ # https://github.com/doxygen/doxygen/issues/10928#issuecomment-2179320509
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace-fail 'JAVACC_CHAR_TYPE=\"unsigned char\"' \
+ 'JAVACC_CHAR_TYPE=\"char8_t\"' \
+ --replace-fail "CMAKE_CXX_STANDARD 17" "CMAKE_CXX_STANDARD 20"
+ '';
+
nativeBuildInputs = [
cmake
python3
@@ -49,9 +59,6 @@ stdenv.mkDerivation rec {
"-Duse_sys_sqlite3=ON"
] ++ lib.optional (qt5 != null) "-Dbuild_wizard=YES";
- env.NIX_CFLAGS_COMPILE =
- lib.optionalString stdenv.hostPlatform.isDarwin "-mmacosx-version-min=10.9";
-
# put examples in an output so people/tools can test against them
outputs = [ "out" "examples" ];
postInstall = ''
diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix
index bd4843edbcca..3be25cfbe9d0 100644
--- a/pkgs/development/tools/electron/common.nix
+++ b/pkgs/development/tools/electron/common.nix
@@ -8,7 +8,6 @@
, fixup-yarn-lock
, npmHooks
, yarn
-, substituteAll
, libnotify
, unzip
, pkgs
diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix
index 5a2956984eae..59ff96a3f42f 100644
--- a/pkgs/development/tools/language-servers/nixd/default.nix
+++ b/pkgs/development/tools/language-servers/nixd/default.nix
@@ -3,7 +3,7 @@
stdenv,
fetchFromGitHub,
cmake,
- boost182,
+ boost,
gtest,
llvmPackages,
meson,
@@ -72,7 +72,7 @@ in
buildInputs = [
gtest
- boost182
+ boost
nlohmann_json
];
@@ -103,7 +103,7 @@ in
buildInputs = [
nix
gtest
- boost182
+ boost
];
env.CXXFLAGS = "-include ${nix.dev}/include/nix/config.h";
@@ -132,7 +132,7 @@ in
nixt
llvmPackages.llvm
gtest
- boost182
+ boost
];
nativeBuildInputs = common.nativeBuildInputs ++ [ cmake ];
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 4d90fa66ea7d..d9c814dd41b5 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -12,6 +12,7 @@ in
, lib
, noSysDirs
, perl
+, runCommand
, zlib
, CoreServices
@@ -238,11 +239,18 @@ stdenv.mkDerivation (finalAttrs: {
inherit targetPrefix;
hasGold = enableGold;
isGNU = true;
- # Having --enable-plugins is not enough, system has to support
- # dlopen() or equivalent. See config/plugins.m4 and configure.ac
- # (around PLUGINS) for cases that support or not support plugins.
- # No platform specific filters yet here.
- hasPluginAPI = enableGold;
+
+ # The plugin API is not a function of any targets. Expose it separately,
+ # currently only used by LLVM for enabling BFD to do LTO with LLVM bitcode.
+ # (Tar will exit with an error if there are no matches).
+ plugin-api-header = runCommand "libbfd-plugin-api-header" {} ''
+ mkdir -p $out
+ tar --directory=$out \
+ --extract \
+ --file=${finalAttrs.src} \
+ --strip-components=1 \
+ --wildcards '*'/include/plugin-api.h
+ '';
};
meta = with lib; {
diff --git a/pkgs/development/tools/misc/binutils/libbfd.nix b/pkgs/development/tools/misc/binutils/libbfd.nix
index c6ab2a6431d0..f8dc8b5473a7 100644
--- a/pkgs/development/tools/misc/binutils/libbfd.nix
+++ b/pkgs/development/tools/misc/binutils/libbfd.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
];
passthru = {
- inherit (binutils-unwrapped-all-targets) dev hasPluginAPI;
+ inherit (binutils-unwrapped-all-targets) src dev plugin-api-header;
};
meta = with lib; {
diff --git a/pkgs/development/tools/misc/binutils/libopcodes.nix b/pkgs/development/tools/misc/binutils/libopcodes.nix
index c8d3b78b29eb..423ab850737d 100644
--- a/pkgs/development/tools/misc/binutils/libopcodes.nix
+++ b/pkgs/development/tools/misc/binutils/libopcodes.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
];
passthru = {
- inherit (binutils-unwrapped-all-targets) dev hasPluginAPI;
+ inherit (binutils-unwrapped-all-targets) dev;
};
meta = with lib; {
diff --git a/pkgs/development/tools/misc/coreboot-toolchain/update.sh b/pkgs/development/tools/misc/coreboot-toolchain/update.sh
index fc758e4ab021..ca59f795c0b7 100755
--- a/pkgs/development/tools/misc/coreboot-toolchain/update.sh
+++ b/pkgs/development/tools/misc/coreboot-toolchain/update.sh
@@ -33,6 +33,6 @@ done
echo ']' >>"$tmp"
-sed -ie 's/https\:\/\/ftpmirror\.gnu\.org/mirror\:\/\/gnu/g' "$tmp"
+sed -i -e 's/https\:\/\/ftpmirror\.gnu\.org/mirror\:\/\/gnu/g' "$tmp"
mv "$tmp" "${pkg_dir}/sources.nix"
diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix
index b15924b34f3c..db85fdef01c4 100644
--- a/pkgs/development/tools/misc/luarocks/default.nix
+++ b/pkgs/development/tools/misc/luarocks/default.nix
@@ -50,12 +50,12 @@ stdenv.mkDerivation (finalAttrs: {
lua -e "" || {
luajit -e "" && {
export LUA_SUFFIX=jit
- configureFlags="$configureFlags --lua-suffix=$LUA_SUFFIX"
+ appendToVar configureFlags "--lua-suffix=$LUA_SUFFIX"
}
}
lua_inc="$(echo "${lua}/include"/*/)"
if test -n "$lua_inc"; then
- configureFlags="$configureFlags --with-lua-include=$lua_inc"
+ appendToVar configureFlags "--with-lua-include=$lua_inc"
fi
'';
diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix
index 4a5f571332d6..dbb7abf14f7d 100644
--- a/pkgs/development/tools/ocaml/merlin/4.x.nix
+++ b/pkgs/development/tools/ocaml/merlin/4.x.nix
@@ -1,5 +1,5 @@
{ lib
-, substituteAll
+, replaceVars
, fetchurl
, ocaml
, dune_3
@@ -57,9 +57,9 @@ buildDunePackage {
old-patch = lib.versionOlder version "4.17";
in
[
- (substituteAll {
- src = if old-patch then ./fix-paths.patch else ./fix-paths2.patch;
- dot_merlin_reader = "${dot-merlin-reader}/bin/dot-merlin-reader";
+ (replaceVars (if old-patch then ./fix-paths.patch else ./fix-paths2.patch) {
+
+ dot-merlin-reader = "${dot-merlin-reader}/bin/dot-merlin-reader";
dune = "${dune_3}/bin/dune";
})
];
diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix
index f85dd2331392..aa876a4d29dd 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -27,8 +27,8 @@ let
# 2) nix-build -A tree-sitter.updater.update-all-grammars
# 3) Set GITHUB_TOKEN env variable to avoid api rate limit (Use a Personal Access Token from https://github.com/settings/tokens It does not need any permissions)
# 4) run the ./result script that is output by that (it updates ./grammars)
- version = "0.24.3";
- hash = "sha256-2Pg4D1Pf1Ex6ykXouAJvD1NVfg5CH4rCQcSTAJmYwd4=";
+ version = "0.24.4";
+ hash = "sha256-DIlPEz8oTzLm5BZHPjIQCHDHUXdUhL+LRrkld11HzXw=";
src = fetchFromGitHub {
owner = "tree-sitter";
@@ -111,7 +111,7 @@ rustPlatform.buildRustPackage {
pname = "tree-sitter";
inherit src version;
- cargoHash = "sha256-0ZoXf0eV3kmHaRoHcWrVEgoWnYNBsY9GiFfy84H+0mc=";
+ cargoHash = "sha256-32CcOb5op+7QOgLSw+8rvMW3GjJ0jaQsryX5DiW+bIk=";
buildInputs =
lib.optionals stdenv.hostPlatform.isDarwin [ Security CoreServices ];
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json
index 1c7fb3888868..c412e01f1735 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-bash",
- "rev": "d1a1a3fe7189fdab5bd29a54d1df4a5873db5cb1",
- "date": "2024-02-10T05:53:07-05:00",
- "path": "/nix/store/wc1dawmsb13fbbag3jxaz30iklakkn7i-tree-sitter-bash",
- "sha256": "00cjhv0zwlfp4i823y8r7wl2h2h63ygz2kmbcm16lvzspwiq8a2y",
- "hash": "sha256-XiiEI7/6b2pCZatO8Z8fBgooKD8Z+SFQJNdR/sGGkgE=",
+ "rev": "487734f87fd87118028a65a4599352fa99c9cde8",
+ "date": "2024-11-11T01:52:16-05:00",
+ "path": "/nix/store/llqfabr73wh33skh2qzhwjh93zc5cy09-tree-sitter-bash",
+ "sha256": "1smlcfkxxknhya1b1h72zj3ccg35szbg9mii2xwh7iq9acnlzpgc",
+ "hash": "sha256-7N1PLVMJxwN5FzHW9NbXZTzGhvziwLCC8tDO3qdjtOo=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
index 0329b6e5e4f3..435292c24e30 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-c-sharp",
- "rev": "7a47daeaf0d410dd1a91c97b274bb7276dd96605",
- "date": "2022-09-15T09:14:12+01:00",
- "path": "/nix/store/sscjjlp833rqqvfpgh84wsnq59jmy90c-tree-sitter-c-sharp",
- "sha256": "0lijbi5q49g50ji00p2lb45rvd76h07sif3xjl9b31yyxwillr6l",
- "hash": "sha256-1GRKI+/eh7ESlX24qA+A5rSdC1lUXACiBOUlgktcMlI=",
+ "rev": "362a8a41b265056592a0c3771664a21d23a71392",
+ "date": "2024-11-11T00:21:27-05:00",
+ "path": "/nix/store/5b0dbka0dnwzna233bd2gc0rydahvk0q-tree-sitter-c-sharp",
+ "sha256": "0w6xdb8m38brhin0bmqsdqggdl95xqs3lbwq7azm5gg94agz9qf1",
+ "hash": "sha256-weH0nyLpvVK/OpgvOjTuJdH2Hm4a1wVshHmhUdFq3XA=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json
index e3a6f4b9e12a..00d30c080ed4 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/uyha/tree-sitter-cmake",
- "rev": "f2569dd1fce0f252097a25bcbcb9ed8898840310",
- "date": "2024-10-07T08:54:29Z",
- "path": "/nix/store/8wbih7ylzajm44r4wxpr376r8r1jhbpy-tree-sitter-cmake",
- "sha256": "1vy9qrvnmbyah8zb2lg2vwmwilh8byzlyxkwdd2ww5yg651izs1d",
- "hash": "sha256-LegfQzHPF85Fa3x2T79fCNLIK9/iUbE+gsqvanfGye8=",
+ "rev": "e409ae33f00e04cde30f2bcffb979caf1a33562a",
+ "date": "2024-10-14T03:37:52+03:00",
+ "path": "/nix/store/hgwv6jwacl1md38yccvvvhigyk6h21s2-tree-sitter-cmake",
+ "sha256": "1v2kkxf9w0y9mwwgimgyvn1s9cmmp6jg71ckr001w1w8szyqqf7q",
+ "hash": "sha256-+DiM/deIBx4AyJOF86S5tbKkg93+1fg4r8kDnlyfU+w=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
index ff2f413a9953..7230d1854286 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-cpp",
- "rev": "30d2fa385735378388a55917e2910965fce19748",
- "date": "2024-09-22T21:23:40-04:00",
- "path": "/nix/store/4lkh62dqx3mgs2k7hncp8892y00xakih-tree-sitter-cpp",
- "sha256": "0sm8wbnc6allavcc1jrsdd6q59vp53j76kccrv9j4c74dfc1bc9v",
- "hash": "sha256-O7EVmGvkMCLTzoxNc+Qod6eCTWs6y8DYVpQqw+ziqGo=",
+ "rev": "f41e1a044c8a84ea9fa8577fdd2eab92ec96de02",
+ "date": "2024-11-11T01:56:44-05:00",
+ "path": "/nix/store/9735qnyqvf3wcgiyr5wmbx8w0ggsksh5-tree-sitter-cpp",
+ "sha256": "0sbvvfa718qrjmfr53p8x3q2c19i4vhw0n20106c8mrvpsxm7zml",
+ "hash": "sha256-tP5Tu747V8QMCEBYwOEmMQUm8OjojpJdlRmjcJTbe2k=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json
index a7c098c78b98..3d58abd6884a 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-css",
- "rev": "a68fcd1e6b03118d1e92ffa45e7ab7a39d52d3f7",
- "date": "2024-09-02T04:29:00-04:00",
- "path": "/nix/store/46v1b4mfmsgd7sk48n6l613vjcxpl3gg-tree-sitter-css",
- "sha256": "1apypprrqn23ghay11w35vz31crpjdby6imjhnxq9cqj9rvhxgx3",
- "hash": "sha256-o78Od04Ss4S7hbJG41eTN7Mw/i6Dh+AVfENYnPO9/qo=",
+ "rev": "66b4aad81acb269e7e98b2ed4b0c7f7252b23c5e",
+ "date": "2024-11-11T00:20:16-05:00",
+ "path": "/nix/store/s5672w3y7gfk99xb7q1s5vmqfj3frk7n-tree-sitter-css",
+ "sha256": "0p9n2sgjyrnvd4yr7z1kb63hq80w8aaxsiwx27f87nc78l950h0d",
+ "hash": "sha256-DUBQEkWH2YPcEZ1H3ZVCHCAMh1kz/JM9adtmL58WNl0=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json
index 57b620e57e05..15521af83a8b 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/usernobody14/tree-sitter-dart",
- "rev": "9ac03bb2154316624fb4c41fe0f372a5f1597b43",
- "date": "2024-09-01T14:20:26-06:00",
- "path": "/nix/store/g3q5dd40gjm0iwf19afz3vz5amvr7dsg-tree-sitter-dart",
- "sha256": "0nn7in0qr23vjkyk7ynyaw3rlbisx8vsvwf2yqclshdm72qabd7i",
- "hash": "sha256-8bSlsDi1QU0Z9sLxrTfqOi6aB1fe+jP9lHuIjIGNx1o=",
+ "rev": "a7496b9d562be91e6588eecd5d7045832f575cd0",
+ "date": "2024-11-03T15:26:25-08:00",
+ "path": "/nix/store/wh7md297c0617dnjm3rpssbmn39xzksh-tree-sitter-dart",
+ "sha256": "1l6i04g8cskb2y21p9qsaixzwbqsg0kj18xw6jwhxgigkbaa0iqw",
+ "hash": "sha256-HEeg1Jovvg65NLyjICd4Gi/+e1QapxuEF2tqhh4B0dA=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json
index 2a025287f953..f762eee5eb34 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/glehmann/tree-sitter-earthfile",
- "rev": "1d637f2002bb8b22d4c08d26ad2bfbc22916f3ce",
- "date": "2024-09-07T22:41:52+02:00",
- "path": "/nix/store/y2sjzjb5naajjzpshv4y1g38cala5sfw-tree-sitter-earthfile",
- "sha256": "1kzl8639pm3pxvkh2flmy5azzi7r48a1mirh2iqkvjc55fv30frb",
- "hash": "sha256-KzswtiuFyT1xFDDHGhQi+cT/VfGVOgHn7nfUm4ZB9M8=",
+ "rev": "059fb087247bef8789e938629388c3e7af32c986",
+ "date": "2024-11-09T21:50:50+01:00",
+ "path": "/nix/store/907d7p3lzbc22yvx1lw8qjinyviw87ja-tree-sitter-earthfile",
+ "sha256": "1yx4vxhyqwskfidbxbz3m7x9l18jnavrnp5f2xxwaaq75cbccyav",
+ "hash": "sha256-W3nGFisHK8V7F65cm7eyEgWa+qnjr75adFNz7GHfpPs=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
index dcfb7983536d..426ad295313c 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-embedded-template",
- "rev": "62b0a6e45900a7dff7c37da95fec20a09968ba52",
- "date": "2024-09-02T02:11:42-04:00",
- "path": "/nix/store/skq9pzdng2gblx99v9mxw3y90qxzs3q6-tree-sitter-embedded-template",
- "sha256": "0sn821pbg3gay9v51i6r3xdwi985chzgn6php2svydy82ab2hiqp",
- "hash": "sha256-F0colhLIN7+1uPAa+z5kBaXIWx/ZxFB28uqNt24QyGo=",
+ "rev": "332262529bc51abf5746317b2255ccc2fff778f8",
+ "date": "2024-11-11T01:51:07-05:00",
+ "path": "/nix/store/qfrdm02qnlllw3ric8pyv5gs0ahwnlbl-tree-sitter-embedded-template",
+ "sha256": "1vq9dywd9vcy59f6i5mk5n7vwk67g8j5x77czg7avpznskgfhqhb",
+ "hash": "sha256-C2Lo3tT2363O++ycXiR6x0y+jy2zlmhcKp7t1LhvCe8=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json
index 6b62fc988b0f..6bb6b7a53160 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/stadelmanma/tree-sitter-fortran",
- "rev": "4a593dda9cbc050a6686187249f8350ceea292ce",
- "date": "2024-09-26T12:07:02-04:00",
- "path": "/nix/store/yvw262lh24nbz37mvwlxmxgqij0y74yp-tree-sitter-fortran",
- "sha256": "1ss12vmg9ibwgz7wk2fmmghy1xw3rv29bn8fd7lr361j6p587h8y",
- "hash": "sha256-HsGDyjUymJHpaQ7ZlcTOg/fg4avVicnPf3zF9OoWQes=",
+ "rev": "e9fbb3acbfc62b051616e53b17ab97b9823e8617",
+ "date": "2024-10-28T20:57:25-04:00",
+ "path": "/nix/store/4rjmcmphqkc8pv3k9vxx794wrzbqsrcz-tree-sitter-fortran",
+ "sha256": "1a2ahzm1ld1wvhr45ql98rykh6fvxdvjxpxxp9fv74xninf6rfqv",
+ "hash": "sha256-G7tsnI22k7Ndur3fLnfr2xk4fUaJ4kIy3Dw0GuqHSqg=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json
index 0d0dbc08924e..3ebbfca362e8 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/gleam-lang/tree-sitter-gleam",
- "rev": "57c9951b290c8084d7c60b0aee7a2b30986ea031",
- "date": "2024-09-26T08:29:11-05:00",
- "path": "/nix/store/zgyi05wljzz1c264mx4lf62629lfkq4z-tree-sitter-gleam",
- "sha256": "1jcamn09jgna2jyhfali3x74dp9bsp8h4ylkq24hhlyfkfsszqw9",
- "hash": "sha256-ieOvtZvOUwiJwJN6AtHVK91GTh+RKge9FMo+mYCtisk=",
+ "rev": "2702fe84b986e4403a071bcb112d48e3dcde0ca4",
+ "date": "2024-10-30T19:13:15Z",
+ "path": "/nix/store/7gfpns8qclascf3d32ablmqw9nx81iq5-tree-sitter-gleam",
+ "sha256": "0cqsazqvl1hwpsayl39cz7j9jibbcql56rivwiwbvafrx4qgv3hd",
+ "hash": "sha256-DY79MOnZqb145DtmUyhma0WZ5PksDeqVvhwGuvFXGjM=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
index bbda8ba6b40d..b6fbb0de84bd 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-go",
- "rev": "bbaa67a180cfe0c943e50c55130918be8efb20bd",
- "date": "2023-07-26T05:48:29-04:00",
- "path": "/nix/store/v9xq4ym9925y1qdgd4frcnbklphvw8mp-tree-sitter-go",
- "sha256": "0wlhwcdlaj74japyn8wjza0fbwckqwbqv8iyyqdk0a5jf047rdqv",
- "hash": "sha256-G7d8CHCyKDAb9j6ijRfHk/HlgPqSI+uvkuRIRRvjkHI=",
+ "rev": "5f564e3d6c85c1caa311227448a9839532013840",
+ "date": "2024-11-11T00:58:30-05:00",
+ "path": "/nix/store/1bc05y21im7ybmg1bkxbjilqg90miqfy-tree-sitter-go",
+ "sha256": "1pcryir0g1mkr8sla90l6c4ra2xb89sa7qyibr5j8fqlhyrz2hyg",
+ "hash": "sha256-z0Pxs4cUOyRLXtHjo3RCqwuVCTMUJEU1yrOGB3L0md0=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
index 597e6e0c027d..3bcd64dcbe5a 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-haskell",
- "rev": "558b997049fddcb07fc513528189c57d6129a260",
- "date": "2024-09-02T05:58:07-04:00",
- "path": "/nix/store/gqvq3azd0g60ghzhbqj5ghqb8q8gsvai-tree-sitter-haskell",
- "sha256": "1jjknp2l8afggzxrp032998hw66r831069q4vy3i1hn9s4fw5y86",
- "hash": "sha256-BvnCHdHJwhCH3wQnA8JA2RgOUUpigJv7f88pRMW1U8o=",
+ "rev": "c30d812bc90827f1a54106a25bc9a6307f5cdcec",
+ "date": "2024-11-10T13:07:41-05:00",
+ "path": "/nix/store/a98r40cngmpvr1hrmxh6v404jhqlk6kf-tree-sitter-haskell",
+ "sha256": "0gpdv2w82w6qikp19ma2v916jg5ksh9i26q0lnd3bgbqnllif23f",
+ "hash": "sha256-bggXKbV4vTWapQAbERPUszxpQtpC1RTujNhwgbjY7T4=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json
index dc80021f2a21..08a9a4166c1a 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-html",
- "rev": "74cab04e10b71811a32dfdde10fd0162d55c54cc",
- "date": "2024-02-19T01:18:16-05:00",
- "path": "/nix/store/yz3yab424kskfrcvjz4y191rwpy78nd2-tree-sitter-html",
- "sha256": "16ldv6p1zhbwqvy7g7m40rbswfjpc58cpmm9kxkd82wz5qv5i3sp",
- "hash": "sha256-V49YNi6fC9Rmn6nWy1BhVzquVwaknnf8xnzBH67ZjZo=",
+ "rev": "5a5ca8551a179998360b4a4ca2c0f366a35acc03",
+ "date": "2024-11-11T00:55:18-05:00",
+ "path": "/nix/store/9wnjgv4nvkmq8n645ql8hmisz5h54nnq-tree-sitter-html",
+ "sha256": "0slhrmwcw2xax4ylyaykx4libkzlaz2lis8x8jmn6b3hbdxlrpix",
+ "hash": "sha256-Pd5Me1twLGOrRB3pSMVX9M8VKenTK0896aoLznjNkGo=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json
index 723155cf451a..32f2c01ba493 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-java",
- "rev": "2b57cd9541f9fd3a89207d054ce8fbe72657c444",
- "date": "2023-10-05T14:06:23+02:00",
- "path": "/nix/store/6nark1nnsz96zl56i39dxrrlx2675k4i-tree-sitter-java",
- "sha256": "1jhgmgiig5vxz8x961qdp9d3xwawgi5lwsfs1i7d53ffli1qm3v6",
- "hash": "sha256-Zo+KQ6TOjdJODNppTkt8XPE+WroNB5M6+n2XF+OrD8o=",
+ "rev": "a1bbe92a6370bb4c15386735fbda12f2b812a923",
+ "date": "2024-11-11T01:04:02-05:00",
+ "path": "/nix/store/y7sylnz0igvnq70g3dzcv0l1qy93jhjy-tree-sitter-java",
+ "sha256": "009nhnn4dv1p8yvhamhr8xh6q0mqj844725l9k81rkzzxqlv4q82",
+ "hash": "sha256-AmGyKe7/zxzQTLSIQwiSuAJsYEcZVgW3RzfsRqyFNgE=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
index 7c9b7ffbb69a..fd8859be185c 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-javascript",
- "rev": "b6f0624c1447bc209830b195999b78a56b10a579",
- "date": "2024-09-02T05:16:11-04:00",
- "path": "/nix/store/q6l4f361yzqcnsl29qhm1dcir75fk0hq-tree-sitter-javascript",
- "sha256": "03lyqswy7h9iw2mhjlsa7an3g76hqi074c06pvdjb57h637zisf5",
- "hash": "sha256-xen4zzDwlCXbvgYwckDE0Jw3rDpKUwmr4DHB47nGng4=",
+ "rev": "3a837b6f3658ca3618f2022f8707e29739c91364",
+ "date": "2024-11-10T00:38:27-05:00",
+ "path": "/nix/store/hpvzw8l06lbvxsh0szkj44gshiqrjb02-tree-sitter-javascript",
+ "sha256": "03v1gpr5lnifrk4lns690fviid8p02wn7hfdwp3ynp7lh1cid63a",
+ "hash": "sha256-apgWWYD0XOvH5c3BY7kAF7UYtwPJaEvJzC5aWvJ9YQ8=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json
index d886cfd7e92c..a00bbfddb9d5 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-jsdoc",
- "rev": "bc09606fc786ead131a301e4b7524888f2d5c517",
- "date": "2024-09-02T04:15:15-04:00",
- "path": "/nix/store/l1jmw9y271rl00y9lhjwscdmidl3mn31-tree-sitter-jsdoc",
- "sha256": "080dzr7547vsapxdd7vs4id3m9mfnzqfzjzkssgyb1vpcdmrhl5m",
- "hash": "sha256-tVCYa2N3h+Wf1vPL7/C3rqY6WiR6n9b6VXofUk7+DSA=",
+ "rev": "b253abf68a73217b7a52c0ec254f4b6a7bb86665",
+ "date": "2024-11-11T01:54:33-05:00",
+ "path": "/nix/store/w2hks666pc8yb031ydclz0qn7k0qsfa1-tree-sitter-jsdoc",
+ "sha256": "0vpvy5hnnr9l4ggii6fp6svv35l659b3n13028dzq0b363dxng03",
+ "hash": "sha256-Azzb2zBjAfwbEmAEO1YqhpaxtzbXmRjfIzRla2Hx+24=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
index 9ace481a7922..dda51e46775b 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-json",
- "rev": "8bfdb43f47ad805bb1ce093203cfcbaa8ed2c571",
- "date": "2024-09-02T05:26:12-04:00",
- "path": "/nix/store/qcm8dvbv4d4i989b7c8rc11fnbfh9nr6-tree-sitter-json",
- "sha256": "0z9nq267cx0c6dpkq3hm24jcxv37l3lhpwabxpmmpmx2f758yjyc",
- "hash": "sha256-zEuPynGi11vr7UvxC+mgZ+zOJBEVDjxvMwx0dozANn0=",
+ "rev": "ee35a6ebefcef0c5c416c0d1ccec7370cfca5a24",
+ "date": "2024-11-11T01:00:59-05:00",
+ "path": "/nix/store/1a2z29149h46rlb9s9wkr1ln52qh7hm1-tree-sitter-json",
+ "sha256": "0p0fiqi5imxm13s1fs6bhqw6v11n79ri1af3d072zm7jqkcl5mhc",
+ "hash": "sha256-DNZC2cTy1C8OaMOpEHM6NoRtOIbLaBf0CLXXWCKODlw=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
index 0c49037052cb..7d3ebefad07e 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-julia",
- "rev": "3520b57e418f734f582215181ecd926a6178c90f",
- "date": "2024-09-05T13:11:36-05:00",
- "path": "/nix/store/4zljgvbaih9ds4kcb52qk5r1si4dpy8m-tree-sitter-julia",
- "sha256": "0lp3js2dmmfv9bsgsjrxj4j1yaj47hmzrkhv07s9yc8cwq749yr0",
- "hash": "sha256-IPtEDuYMMZ/0ARvO/Cs8RCofJJE9S/30StvV2oSW41I=",
+ "rev": "a8e1262997d5a45520a06cbe1b86c0737d507054",
+ "date": "2024-11-11T00:25:28-05:00",
+ "path": "/nix/store/qrhmhag6j88rv7qg7nk1ya1rk5skyppj-tree-sitter-julia",
+ "sha256": "0xi04a48ly438gar25bkkvvr8by4dd013cnafbjdysqjfs04q2wg",
+ "hash": "sha256-jwtMgHYSa9/kcsqyEUBrxC+U955zFZHVQ4N4iogiIHY=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json
index 86172703b343..ee7bb27bb365 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/IndianBoy42/tree-sitter-just",
- "rev": "390cec48bf04b5bb4e87e8ebc35a06ca3f7051cf",
- "date": "2024-10-12T11:54:49-05:00",
- "path": "/nix/store/wbplh7k0xa63pzld09nk6vdljlpc96fg-tree-sitter-just",
- "sha256": "0r5xjx0v0fsghmin689ib39y682kk87374n2r8vq5xqdkv7m8gix",
- "hash": "sha256-PT5Uz54N94I3ysKSMw6aUyDj01gxIWNjhU87sEGXvWQ=",
+ "rev": "1014d2fd6396856c312054d6c30df4d78b62966c",
+ "date": "2024-10-27T18:37:31-05:00",
+ "path": "/nix/store/niwnwg8nb4084y8vy50s818cxbl6gzwa-tree-sitter-just",
+ "sha256": "02df3cbcbf300n3hy98l8rwbz9ivdyd5s6yghmcrqf2973kzkypj",
+ "hash": "sha256-8vr55zhJOJxZhc8bXZpvO6a/eEYUJQ+HBWC4xRYbrgk=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json
index 02d5ca9f0cde..d48735c541cf 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/cbarrete/tree-sitter-ledger",
- "rev": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a",
- "date": "2023-05-07T23:13:39-04:00",
- "path": "/nix/store/hdf6hzhb4h9p28hx26iqqz0cwf471aq8-tree-sitter-ledger",
- "sha256": "12mfn42nhn0i8gf39aqbqfkccqc1mbn5z1vw5gh98pc9392jccq4",
- "hash": "sha256-BDMmRRqJXZTgK3yHX+yqgWHGpsMLqzTcQxFYaAWxroo=",
+ "rev": "a2eff7fee59ee6adfc4a3646e2f41ba3b340a97d",
+ "date": "2024-10-13T19:47:52-04:00",
+ "path": "/nix/store/5szmgha7pgir3w8n558482fr60nxnhvv-tree-sitter-ledger",
+ "sha256": "0r9r05g14i29sb3mrx7gvi9finbim5vyb17pqpk9vds3d5ikwczd",
+ "hash": "sha256-7TM+Y2lDt53mxfeE5XepcdnoUtzv9FzH0klEEl4BOWU=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
index df4b224a6314..aac43a34076e 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/cstrahan/tree-sitter-nix",
- "rev": "456b14a2fa6315abc7e02fcffaf4a1f35d4955d3",
- "date": "2024-10-12T02:22:35Z",
- "path": "/nix/store/as4bh1khg5ymrdvzb9sb3d3d3nh4z2v7-tree-sitter-nix",
- "sha256": "05jq1ssazilajk5s0i3zfy1jhx0qvpwjwf7cjp8z87n5qpirx3vr",
- "hash": "sha256-eY+e48XFHvTRlew4LvndGHQog3d/RKDLlIrGr7QOWBY=",
+ "rev": "0240bbfce72d155823c3b7edec622dedd580bf02",
+ "date": "2024-11-12T12:58:37Z",
+ "path": "/nix/store/4cnv6lk60fxy7hlx18xzmd0y9gvfc2qq-tree-sitter-nix",
+ "sha256": "0814a5vbk71b4hnl5zr5pc5qgls2rifl1xh5cakl3sj4nxh7js37",
+ "hash": "sha256-Z2h5YLdE6kGnYgX2QF3MQtOHC7sl/0ItJCucuXZRJCA=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
index 5b4701aa3986..13af8c7b5d11 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/nushell/tree-sitter-nu",
- "rev": "e3b4c967937cad628dca09bd098cd780d8288750",
- "date": "2024-09-26T09:06:33-05:00",
- "path": "/nix/store/b0dxxkkj4zqclhm2l6s8n8sqndzzsw49-tree-sitter-nu",
- "sha256": "1652pyb888lbi4g7g6jh9bkqasm2zjch8d4ir2m90f6pl12c2nqf",
- "hash": "sha256-DlvBRKDXOJCqyJE0BJn8omqF50pQmnceiYsihJa/opg=",
+ "rev": "7e0f16f608a9e804fae61430ade734f9f849fb80",
+ "date": "2024-11-09T07:02:51-06:00",
+ "path": "/nix/store/2ddk19m7asfq34bwgy6ivad1dx1m4bnc-tree-sitter-nu",
+ "sha256": "0zlqf7mxcgy6552bhiiiy11qrgw5xhnbhjx0awj416psrs8vaw85",
+ "hash": "sha256-BXG1kc76mkAkV6BLuCzshb+MQ/AxRrhEKcY/1utxmH4=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json
index c983defb998c..aa124ec03c2f 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-ocaml",
- "rev": "5f7a97e9757d8afe6c0b0b5dd8734cf59f35456e",
- "date": "2024-09-27T01:35:53+02:00",
- "path": "/nix/store/aaq21ki5ds4l85ymww8yb04g6jwrmclm-tree-sitter-ocaml",
- "sha256": "144b8wdlxyzwmbi7x8flxvs8v8b2p92xy70fvrsp417dj8k8s5cc",
- "hash": "sha256-jBWNJpLtBHJ13g4c30W6YqGN9O7UoX7iqvz7ThtHi5A=",
+ "rev": "26bc61c206e7820f9f804b206f7765ffc55cd039",
+ "date": "2024-11-10T23:21:59-05:00",
+ "path": "/nix/store/dlkj7hw4sy5zywabkr67hgajpnsaw48c-tree-sitter-ocaml",
+ "sha256": "1rcvy51swpz6wpdk45z3m8xkrc03xl0hypwgbrnivsi9zizf14zj",
+ "hash": "sha256-8pPgfvwp6h1tXo9fDwHtA7A8O6rjFzLb5eZfrkPxm+U=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
index 149336a19090..975daf866b42 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-php",
- "rev": "a342f7c0ad1db48afc6d2420cdd87b55b51a0644",
- "date": "2024-10-01T08:28:55-05:00",
- "path": "/nix/store/nhhbb50wrzyqmqar66gynmc44qgrk2ws-tree-sitter-php",
- "sha256": "0gblhb2cvl740pjccjqxkvdd9shq7f1grzz7qqv7knjvmzhdw858",
- "hash": "sha256-qCDe4K9b2nk2xuf//II7GOrU2p4dS8bkBeTQzcSCdD0=",
+ "rev": "89e256dab1a990366e7931911fe144a14ffa539e",
+ "date": "2024-11-10T19:37:58-05:00",
+ "path": "/nix/store/v7j420hslh44ljw09m8jq22vw0gg2avz-tree-sitter-php",
+ "sha256": "1s12lrxv3arpx22vja2ig4za7wnfk5p8l4wsbpm8rkymm9z5v28z",
+ "hash": "sha256-H4ldfqrVz4zqXZoTim6ZzvKjPnlRKLmF6DersXumIug=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
index 299aa72dadf5..ee7922207b95 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-python",
- "rev": "8c65e256f971812276ff2a69a2f515c218ed7f82",
- "date": "2024-09-02T20:40:41-04:00",
- "path": "/nix/store/8mw7g7r8j8n8d8wssjz43nsmkhnlqd0b-tree-sitter-python",
- "sha256": "0d51zk7znaxvwcacp5gzm2rwprk8m10wnxhk5g4q7sygbcvl2rzj",
- "hash": "sha256-8mdBN1vP64PJKxN2y0GoaObLs6j/lcsU47sr+8/8oTQ=",
+ "rev": "6d14e44ea217bc5bb1c1804180e9818d7d1b8d91",
+ "date": "2024-11-11T01:55:16-05:00",
+ "path": "/nix/store/3w1qnipkm727n9bm679k6vngl6fnrsy7-tree-sitter-python",
+ "sha256": "0dzy60m16qb0i9xrwi3vnii3gy1k50prbbgq3362gcm4dj5hcdpy",
+ "hash": "sha256-/jYGi2yksifMGPitlS8oM/g3YrR7RJ57imBhEyow/jc=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json
index 81b8070b53d0..8daf67a2c621 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-ql-dbscheme",
- "rev": "1980b4b6998a1138d326f863e6168f0f2c0c544d",
- "date": "2024-09-02T15:26:46-04:00",
- "path": "/nix/store/s3klligl52ag14ai8n1fcwhn7k4m1wdk-tree-sitter-ql-dbscheme",
- "sha256": "1k3qz85507xysx2msr1ns44ya3x3xxb9kxfzvpp088w6nrc6cipm",
- "hash": "sha256-9UZmWLaGIwTu3d/1mVbvow/lCdE2ZF1F174fUAr6eMw=",
+ "rev": "15baf01feb5f20bb3d668d27abc0a36e944b183f",
+ "date": "2024-11-10T23:41:29-05:00",
+ "path": "/nix/store/9bmzx5bc247dir7skgb8jh3hqh3wvw53-tree-sitter-ql-dbscheme",
+ "sha256": "0wgaa0zsb9n4vf6na5znkb4vwrnw1ha9xqzi8w72bk7kipwfcwcm",
+ "hash": "sha256-lXHm+I3zzCUOR/HjnhQM3Ga+yZr2F2WN28SmpT9Q6nE=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
index 901d037b9feb..f6d02a241070 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-ql",
- "rev": "c73c31c89cb0019ef56fe8bc1723e7c36e0be607",
- "date": "2024-09-02T14:59:29-04:00",
- "path": "/nix/store/diaw28vzzry46dc5b0fra2xw263lmbhs-tree-sitter-ql",
- "sha256": "1lnasix7vb9q7lixy5qayslzw9yk53gll8130d03h0a9vl44dw8b",
- "hash": "sha256-C/FGCN1JAThAAyMgSt8o0yf+qfYKF98jPTitfXrUytI=",
+ "rev": "1fd627a4e8bff8c24c11987474bd33112bead857",
+ "date": "2024-11-10T23:34:04-05:00",
+ "path": "/nix/store/q8zbiszrsnrvpl9q2m88kzr2hm5a621l-tree-sitter-ql",
+ "sha256": "18kvspj7kqmm0bv1prnzx68xvkhcawj5xa12da9makv69y7xp7wq",
+ "hash": "sha256-mJ/bj09mT1WTaiKoXiRXDM7dkenf5hv2ArXieeTVe6I=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json
index db619e455693..62357a454806 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-regex",
- "rev": "f70251e1f1d72bd6dc1f897f956f9112f8668441",
- "date": "2024-09-02T03:31:05-04:00",
- "path": "/nix/store/9shrpsgb7rnk24nwc3xr1xv33wxi0ydk-tree-sitter-regex",
- "sha256": "08i97gwvf6777h6dkvsd08s2n4pmpz2xghxpn1npn16jcpaknhhv",
- "hash": "sha256-G0I71WXSBHttsLfD18W/9RIrNAJN79kMPOcYt/k7KSI=",
+ "rev": "4470c59041416e8a2a9fa343595ca28ed91f38b8",
+ "date": "2024-11-11T00:48:15-05:00",
+ "path": "/nix/store/2iwwqdj0zjxxqqc6aw2hwqi55aczbf5x-tree-sitter-regex",
+ "sha256": "098pkjicnw3a8bypb7f2xqwhqjlfvicibcmgx5nsb0icdyvagm8q",
+ "hash": "sha256-GNWntm8sgqVt6a+yFVncjkoMOe7CnXX9Qmpwy6KcFyU=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
index f9ea1c01fafa..9ec40c9df6b4 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-ruby",
- "rev": "7a010836b74351855148818d5cb8170dc4df8e6a",
- "date": "2024-02-10T23:07:01-05:00",
- "path": "/nix/store/3k3zb8n4cy49hgzaai20ka8r3fam8djc-tree-sitter-ruby",
- "sha256": "03d96cv6iqmyak2jw4wffyynmh9hqk8d4i4sgn5d5w24wfv6r3lb",
- "hash": "sha256-i45stuNE8NKKfZpE0tDEMMFqvXeOEy7FVL7iaDYzqQ0=",
+ "rev": "71bd32fb7607035768799732addba884a37a6210",
+ "date": "2024-11-10T23:48:17-05:00",
+ "path": "/nix/store/d3r6c4r9691zy7dxx9v009p7xwnl3wln-tree-sitter-ruby",
+ "sha256": "0c1vs63ydcb3q2wnif18l5irbj6chkcvd3p6dg0vyhklk5acrvca",
+ "hash": "sha256-iu3MVJl0Qr/Ba+aOttmEzMiVY6EouGi5wGOx5ofROzA=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
index a682053ee93e..eece08fd3788 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-rust",
- "rev": "6b7d1fc73ded57f73b1619bcf4371618212208b1",
- "date": "2024-09-02T05:17:41-04:00",
- "path": "/nix/store/7qazknjwzfdl0jyc7jyqskjagw00i5wy-tree-sitter-rust",
- "sha256": "08m0i6ar5gkz1pvz8lh2dfwjff4szzl0q0lzbqp0p5il0arxvbbh",
- "hash": "sha256-cK3dswI0lgsuXp8CDOj/mjgnuWsCUvT3DX++kpWJoCI=",
+ "rev": "48eef06e8d806413d9a617f4a3f4d3168c4e5918",
+ "date": "2024-11-10T00:44:07-05:00",
+ "path": "/nix/store/8w8d3p1zn5dxlmkn3z03jk7f3bp8g0yh-tree-sitter-rust",
+ "sha256": "09piqnxiyhms8503m6jxqr0mwimd75mvh3j2g51jv5796kjy3alz",
+ "hash": "sha256-n6rh5TTplC1DeUIOuGs5rUZeQcZdmjpAQbpCH7vF8SY=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json
index c72db6775674..19c28b7eff35 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-scala",
- "rev": "62e7506f5ec87e2daf218e3bbd317401768d9963",
- "date": "2024-09-12T09:36:24-04:00",
- "path": "/nix/store/kcrap980k751mp2mk59z19jcc196pk08-tree-sitter-scala",
- "sha256": "0ybj359b21cqy1nqr1psjy244y7d672iik9a3pqxrg67cppwwn26",
- "hash": "sha256-RljO72XHvNzxHSrNGMUx7XhChJf6hoxt8JgFsVIZcnk=",
+ "rev": "28c3be045afe1e293b5ba1a74e759601e74050c3",
+ "date": "2024-11-11T00:29:53-05:00",
+ "path": "/nix/store/zypc1jvywxz21dbik2awcmhxrpl94k60-tree-sitter-scala",
+ "sha256": "0iyy6273ki4fgbmxn2xaksiw2nq9czhh7azdm9fn29qf7sda55y4",
+ "hash": "sha256-xJeimj4OJ2Fdqu2rA+FnCVvBo56qC9vreo7EOY4w3kc=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json
index 32997568a47c..0a61c5a22ebc 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/vrischmann/tree-sitter-templ",
- "rev": "4519e3ec9ca92754ca25659bb1fd410d5e0f8d88",
- "date": "2024-10-13T13:44:06+02:00",
- "path": "/nix/store/2qw76ygi99kpygl7v49syy6v7n81fii2-tree-sitter-templ",
- "sha256": "10zgbql8z1rnn7wm5gm8z9mfpp0rzm0pnidjj8d8crn4l2b55kl9",
- "hash": "sha256-ic5SlqDEZoYakrJFe0H9GdzravqovlL5sTaHjyhe74M=",
+ "rev": "73a558744fff7c4560f4801e14a467811f608556",
+ "date": "2024-11-11T15:28:15+01:00",
+ "path": "/nix/store/anf5z6bmmwrqqwjirylamcc94h2vki8l-tree-sitter-templ",
+ "sha256": "0rb08502gf91z1pw2q3gvzv890i8v7q1bdva2raf8kn8v05bgnsr",
+ "hash": "sha256-Wdu3CtjITuRUFmq3FfDZKIKE9t9vYMFv+CG5J0BBYGU=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json
index 444e95e3bdab..fda7ed856d18 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tlaplus-community/tree-sitter-tlaplus",
- "rev": "b9e3978f363b3f8884c886a01d15e41bd14d30bd",
- "date": "2024-09-28T09:39:52-04:00",
- "path": "/nix/store/cl7xp08fmz23bzn67lzj9ygwzp5fwgz6-tree-sitter-tlaplus",
- "sha256": "02igqk23gfh5ffdbcdngri769dcr1yd5pcla8vvgwlrgnh1j4bf4",
- "hash": "sha256-xC0iA7QvU/72RoqyW5oPmbVkTszPNraacwW6N8TELwo=",
+ "rev": "8a8413f1d08e7ee40b347206d26eac4324db9fd9",
+ "date": "2024-10-20T11:46:21-04:00",
+ "path": "/nix/store/j8fx0g50q12kbxa85rkg9pv2m6zmgmxy-tree-sitter-tlaplus",
+ "sha256": "11073rjg9n9hnr88193mmb8ff5xlcv6isgqc0g2fbfbl0y820zlk",
+ "hash": "sha256-k34gkAd0ueXEAww/Hc1mtBfn0Kp1pIBQtjDZ9GQeB4Q=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
index bd97462e4bd7..524720491330 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-typescript",
- "rev": "eb6b845dee9ee22987262699a152312604313662",
- "date": "2024-01-31T10:42:05-05:00",
- "path": "/nix/store/f8pj12fbzxfipidrj1srz3ld8qw5x4h7-tree-sitter-typescript",
- "sha256": "1109v1w6icm018hkc41ysn5iflc9gq2q02v23dy4bnfas7kzizyc",
- "hash": "sha256-zP/459HK2UV8G2ILgAV+iVEXi9U+EDYhCqCyaHjYCYQ=",
+ "rev": "f975a621f4e7f532fe322e13c4f79495e0a7b2e7",
+ "date": "2024-11-10T21:32:53-05:00",
+ "path": "/nix/store/1gsbn9dw7bbpq5mrgmw71kif0wjmf71s-tree-sitter-typescript",
+ "sha256": "0rlhhqp9dv6y0iljb4bf90d89f07zkfnsrxjb6rvw985ibwpjkh9",
+ "hash": "sha256-CU55+YoFJb6zWbJnbd38B7iEGkhukSVpBN7sli6GkGY=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-uiua.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-uiua.json
index 7db26325a7fd..5ce9ec929f5e 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-uiua.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-uiua.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/shnarazk/tree-sitter-uiua",
- "rev": "942e8365d10b9b62be9f2a8b0503459d3d8f3af3",
- "date": "2024-02-29T15:18:16+09:00",
- "path": "/nix/store/ahzzkr0wlxkxwnmp7sysjhfcgdfy4lkh-tree-sitter-uiua",
- "sha256": "1pwhdsvdi6p70r9iij3mqnpdl0m2vz242l2qxlanplfcasf58sf9",
- "hash": "sha256-yWlUnFbM0WsV7VhQQcTfogLarsV1yBhTBuea2LZukN8=",
+ "rev": "f3fb8b8fe367b00e2ad858a419da3dedc8cbeeeb",
+ "date": "2024-10-26T11:23:32+09:00",
+ "path": "/nix/store/ifvi5012plsbl9lxv416yp4jfjrw854f-tree-sitter-uiua",
+ "sha256": "02fiaqap937d072qq1prvljhp7fdh7mxisxjh99vb20kik9r3yvg",
+ "hash": "sha256-b/uR04wTiLVTgrLr2OuBzZ0LJd35BozFAe2MdBVW0Qk=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json
index e0c25f231042..8fc8bbf4d539 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json
@@ -1,10 +1,10 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-verilog",
- "rev": "075ebfc84543675f12e79a955f79d717772dcef3",
- "date": "2024-04-27T13:13:12-04:00",
- "path": "/nix/store/6wsakwazlb9y44n2pmr6xfx0dn6hr99x-tree-sitter-verilog",
- "sha256": "0j5iycqm5dmvzy7dssm8km1djhr7hnfgk26zyzcxanhrwwq3wi4k",
- "hash": "sha256-k0Q+MOcZWtXZ99+I+ZyFJ0PZQp2oat2O/7u2UjHzsUg=",
+ "rev": "521b535e41a5acd2c6539a922d4649bbe8275110",
+ "date": "2024-11-10T18:32:24-05:00",
+ "path": "/nix/store/b4ybpz7bv7bsx6kkpgvizhp6rfywn96x-tree-sitter-verilog",
+ "sha256": "1mk8waij5lbj1wbayvqs0cxk003dssdic13h14gd5fi1ckfvflja",
+ "hash": "sha256-SlK33WQhutIeCXAEFpvWbQAwOwMab68WD3LRIqPiaNY=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix
index 3c45e4b74089..386c178776bd 100644
--- a/pkgs/development/tools/parsing/tree-sitter/update.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/update.nix
@@ -89,6 +89,9 @@ let
"go-tree-sitter"
# kotlin bindings to the Tree-sitter parsing library
"kotlin-tree-sitter"
+ # not ready to be used
+ "zig-tree-sitter"
+
# Non-grammar repositories
".github"
diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix
index c6595db224ef..898b499e9268 100644
--- a/pkgs/development/tools/profiling/systemtap/default.nix
+++ b/pkgs/development/tools/profiling/systemtap/default.nix
@@ -8,8 +8,8 @@ let
## fetchgit info
url = "git://sourceware.org/git/systemtap.git";
rev = "release-${version}";
- sha256 = "sha256-2L7+k/tgI6trkstDTY4xxfFzmNDlxbCHDRKAFaERQeM=";
- version = "5.0a";
+ hash = "sha256-SUPNarZW8vdK9hQaI2kU+rfKWIPiXB4BvJvRNC1T9tU=";
+ version = "5.2";
inherit (kernel) stdenv;
@@ -17,11 +17,10 @@ let
stapBuild = stdenv.mkDerivation {
pname = "systemtap";
inherit version;
- src = fetchgit { inherit url rev sha256; };
+ src = fetchgit { inherit url rev hash; };
nativeBuildInputs = [ pkg-config cpio python3 python3.pkgs.setuptools ];
buildInputs = [ elfutils gettext python3 ];
enableParallelBuilding = true;
- env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=deprecated-declarations" ]; # Needed with GCC 12
};
## symlink farm for --sysroot flag
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index ab63e1e14a7a..2c4f996aa2a6 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, openssl, python, zlib, libuv, http-parser, icu, bash
+{ lib, stdenv, fetchurl, openssl, python, zlib, libuv, sqlite, http-parser, icu, bash
, ninja, pkgconf, unixtools, runCommand, buildPackages
, testers
# for `.pkgs` attribute
@@ -97,8 +97,15 @@ let
# TODO: also handle MIPS flags (mips_arch, mips_fpu, mips_float_abi).
useSharedHttpParser = !stdenv.hostPlatform.isDarwin && lib.versionOlder "${majorVersion}.${minorVersion}" "11.4";
+ useSharedSQLite = lib.versionAtLeast version "22.5";
- sharedLibDeps = { inherit openssl zlib libuv; } // (lib.optionalAttrs useSharedHttpParser { inherit http-parser; });
+ sharedLibDeps = {
+ inherit openssl zlib libuv;
+ } // (lib.optionalAttrs useSharedHttpParser {
+ inherit http-parser;
+ }) // (lib.optionalAttrs useSharedSQLite {
+ inherit sqlite;
+ });
copyLibHeaders =
map
@@ -151,7 +158,8 @@ let
# wrappers over the corresponding JS scripts. There are some packages though
# that use bash wrappers, e.g. polaris-web.
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ApplicationServices ]
- ++ [ zlib libuv openssl http-parser icu bash ];
+ ++ [ zlib libuv openssl http-parser icu bash ]
+ ++ lib.optionals useSharedSQLite [ sqlite ];
nativeBuildInputs =
[
@@ -291,6 +299,7 @@ let
"FLAKY_TESTS=skip"
# Skip some tests that are not passing in this context
"CI_SKIP_TESTS=${lib.concatStringsSep "," ([
+ # Tests don't work in sandbox.
"test-child-process-exec-env"
"test-child-process-uid-gid"
"test-fs-write-stream-eagain"
diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix
index 6099d100675a..e8783fc314cd 100644
--- a/pkgs/development/web/nodejs/v18.nix
+++ b/pkgs/development/web/nodejs/v18.nix
@@ -1,19 +1,8 @@
-{ callPackage, lib, overrideCC, pkgs, buildPackages, openssl, python311, fetchpatch2, enableNpm ? true }:
+{ callPackage, lib, openssl, python311, fetchpatch2, enableNpm ? true }:
let
- # Clang 16+ cannot build Node v18 due to -Wenum-constexpr-conversion errors.
- # Use an older version of clang with the current libc++ for compatibility (e.g., with icu).
- ensureCompatibleCC = packages:
- if packages.stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion packages.stdenv.cc.cc) "16"
- then overrideCC packages.llvmPackages_15.stdenv (packages.llvmPackages_15.stdenv.cc.override {
- inherit (packages.llvmPackages) libcxx;
- })
- else packages.stdenv;
-
buildNodejs = callPackage ./nodejs.nix {
inherit openssl;
- stdenv = ensureCompatibleCC pkgs;
- buildPackages = buildPackages // { stdenv = ensureCompatibleCC buildPackages; };
python = python311;
};
@@ -47,5 +36,27 @@ buildNodejs {
url = "https://github.com/nodejs/node/commit/d0a6b605fba6cd69a82e6f12ff0363eef8fe1ee9.patch";
hash = "sha256-TfYal/PikRZHL6zpAlC3SmkYXCe+/8Gs83dLX/X/P/k=";
})
+ # Remove unused `fdopen` in vendored zlib, which causes compilation failures with clang 18 on Darwin.
+ (fetchpatch2 {
+ url = "https://github.com/madler/zlib/commit/4bd9a71f3539b5ce47f0c67ab5e01f3196dc8ef9.patch?full_index=1";
+ extraPrefix = "deps/v8/third_party/zlib/";
+ stripLen = 1;
+ hash = "sha256-WVxsoEcJu0WBTyelNrVQFTZxJhnekQb1GrueeRBRdnY=";
+ })
+ # Backport V8 fixes for LLVM 19.
+ (fetchpatch2 {
+ url = "https://chromium.googlesource.com/v8/v8/+/182d9c05e78b1ddb1cb8242cd3628a7855a0336f%5E%21/?format=TEXT";
+ decode = "base64 -d";
+ extraPrefix = "deps/v8/";
+ stripLen = 1;
+ hash = "sha256-bDTwFbATPn5W4VifWz/SqaiigXYDWHq785C64VezuUE=";
+ })
+ (fetchpatch2 {
+ url = "https://chromium.googlesource.com/v8/v8/+/1a3ecc2483b2dba6ab9f7e9f8f4b60dbfef504b7%5E%21/?format=TEXT";
+ decode = "base64 -d";
+ extraPrefix = "deps/v8/";
+ stripLen = 1;
+ hash = "sha256-6y3aEqxNC4iTQEv1oewodJrhOHxjp5xZMq1P1QL94Rg=";
+ })
] ++ gypPatches;
}
diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
index 7a8865afae94..1f402f30b1f6 100644
--- a/pkgs/development/web/nodejs/v20.nix
+++ b/pkgs/development/web/nodejs/v20.nix
@@ -21,5 +21,43 @@ buildNodejs {
./bypass-darwin-xcrun-node16.patch
./node-npm-build-npm-package-logic.patch
./use-correct-env-in-tests.patch
+
+ # Remove unused `fdopen` in vendored zlib, which causes compilation failures with clang 18 on Darwin.
+ (fetchpatch2 {
+ url = "https://github.com/madler/zlib/commit/4bd9a71f3539b5ce47f0c67ab5e01f3196dc8ef9.patch?full_index=1";
+ extraPrefix = "deps/v8/third_party/zlib/";
+ stripLen = 1;
+ hash = "sha256-WVxsoEcJu0WBTyelNrVQFTZxJhnekQb1GrueeRBRdnY=";
+ })
+ # Fix for https://github.com/NixOS/nixpkgs/issues/355919
+ # FIXME: remove after a minor point release
+ (fetchpatch2 {
+ url = "https://github.com/nodejs/node/commit/a094a8166cd772f89e92b5deef168e5e599fa815.patch?full_index=1";
+ hash = "sha256-5FZfozYWRa1ZI/f+e+xpdn974Jg2DbiHbua13XUQP5E=";
+ })
+ (fetchpatch2 {
+ url = "https://github.com/nodejs/node/commit/f270462c09ddfd770291a7c8a2cd204b2c63d730.patch?full_index=1";
+ hash = "sha256-Err0i5g7WtXcnhykKgrS3ocX7/3oV9UrT0SNeRtMZNU=";
+ })
+ # Backport V8 fixes for LLVM 19.
+ (fetchpatch2 {
+ url = "https://chromium.googlesource.com/v8/v8/+/182d9c05e78b1ddb1cb8242cd3628a7855a0336f%5E%21/?format=TEXT";
+ decode = "base64 -d";
+ extraPrefix = "deps/v8/";
+ stripLen = 1;
+ hash = "sha256-bDTwFbATPn5W4VifWz/SqaiigXYDWHq785C64VezuUE=";
+ })
+ (fetchpatch2 {
+ url = "https://chromium.googlesource.com/v8/v8/+/1a3ecc2483b2dba6ab9f7e9f8f4b60dbfef504b7%5E%21/?format=TEXT";
+ decode = "base64 -d";
+ extraPrefix = "deps/v8/";
+ stripLen = 1;
+ hash = "sha256-6y3aEqxNC4iTQEv1oewodJrhOHxjp5xZMq1P1QL94Rg=";
+ })
+ # fixes test failure, remove when included in release
+ (fetchpatch2 {
+ url = "https://github.com/nodejs/node/commit/b6fe731c55eb4cb9d14042a23e5002ed39b7c8b7.patch?full_index=1";
+ hash = "sha256-KoKsQBFKUji0GeEPTR8ixBflCiHBhPqd2cPVPuKyua8=";
+ })
] ++ gypPatches;
}
diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix
index 6a71b0056bf7..2da784c93f18 100644
--- a/pkgs/development/web/nodejs/v22.nix
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -8,8 +8,8 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "22.10.0";
- sha256 = "3180710d3130ad9df01466abf010e408d41b374be54301d1480d10eca73558e0";
+ version = "22.11.0";
+ sha256 = "bbf0297761d53aefda9d7855c57c7d2c272b83a7b5bad4fea9cb29006d8e1d35";
patches = [
./configure-emulator.patch
./configure-armv6-vfpv2.patch
@@ -18,5 +18,26 @@ buildNodejs {
./node-npm-build-npm-package-logic.patch
./use-correct-env-in-tests.patch
./bin-sh-node-run-v22.patch
+
+ # Fix for https://github.com/NixOS/nixpkgs/issues/355919
+ # FIXME: remove after a minor point release
+ (fetchpatch2 {
+ url = "https://github.com/nodejs/node/commit/a094a8166cd772f89e92b5deef168e5e599fa815.patch?full_index=1";
+ hash = "sha256-5FZfozYWRa1ZI/f+e+xpdn974Jg2DbiHbua13XUQP5E=";
+ })
+ (fetchpatch2 {
+ url = "https://github.com/nodejs/node/commit/f270462c09ddfd770291a7c8a2cd204b2c63d730.patch?full_index=1";
+ hash = "sha256-Err0i5g7WtXcnhykKgrS3ocX7/3oV9UrT0SNeRtMZNU=";
+ })
+ # Patch to use the shared version of SQLite instead of the one vendored upstream:
+ (fetchpatch2 {
+ url = "https://github.com/nodejs/node/commit/32f7d5ad1cf79e7e731e1bb7ac967f4f2a3194cf.patch?full_index=1";
+ hash = "sha256-dyUr3caGfetrXgfAl+CLE1LKKetDZCpPwMg4EM98rqI=";
+ })
+ # fixes test failure, remove when included in release
+ (fetchpatch2 {
+ url = "https://github.com/nodejs/node/commit/b6fe731c55eb4cb9d14042a23e5002ed39b7c8b7.patch?full_index=1";
+ hash = "sha256-KoKsQBFKUji0GeEPTR8ixBflCiHBhPqd2cPVPuKyua8=";
+ })
];
}
diff --git a/pkgs/development/web/nodejs/v23.nix b/pkgs/development/web/nodejs/v23.nix
index 7e5a915ed357..43cbaa2b8e71 100644
--- a/pkgs/development/web/nodejs/v23.nix
+++ b/pkgs/development/web/nodejs/v23.nix
@@ -25,34 +25,6 @@ buildNodejs {
./use-correct-env-in-tests.patch
./bin-sh-node-run-v22.patch
- # Those reverts are due to a mismatch with the libuv version used upstream
- (fetchpatch2 {
- url = "https://github.com/nodejs/node/commit/84fe809535b0954bbfed8658d3ede8a2f0e030db.patch?full_index=1";
- hash = "sha256-C1xG2K9Ejofqkl/vKWLBz3vE0mIPBjCdfA5GX2wlS0I=";
- revert = true;
- })
- (fetchpatch2 {
- url = "https://github.com/nodejs/node/commit/dcbc5fbe65b068a90c3d0970155d3a68774caa38.patch?full_index=1";
- hash = "sha256-Q7YrooolMjsGflTQEj5ra6hRVGhMP6APaydf1MGH54Q=";
- revert = true;
- excludes = [ "doc/*" ];
- })
- (fetchpatch2 {
- url = "https://github.com/nodejs/node/commit/ec867ac7ce4e4913a8415eda48a7af9fc226097d.patch?full_index=1";
- hash = "sha256-zfnHxC7ZMZAiu0/6PsX7RFasTevHMETv+azhTZnKI64=";
- revert = true;
- excludes = [ "doc/*" ];
- })
- (fetchpatch2 {
- url = "https://github.com/nodejs/node/commit/f97865fab436fba24b46dad14435ec4b482243a2.patch?full_index=1";
- hash = "sha256-o5aPQqUXubtJKMX28jn8LdjZHw37/BqENkYt6RAR3kY=";
- revert = true;
- })
- (fetchpatch2 {
- url = "https://github.com/nodejs/node/commit/54d55f2337ebe04451da770935ad453accb147f9.patch?full_index=1";
- hash = "sha256-gmIyiSyNzC3pClL1SM2YicckWM+/2tsbV1xv2S3d5G0=";
- revert = true;
- })
# Fix for https://github.com/NixOS/nixpkgs/issues/355919
# FIXME: remove after a minor point release
(fetchpatch2 {
@@ -63,5 +35,10 @@ buildNodejs {
url = "https://github.com/nodejs/node/commit/f270462c09ddfd770291a7c8a2cd204b2c63d730.patch?full_index=1";
hash = "sha256-Err0i5g7WtXcnhykKgrS3ocX7/3oV9UrT0SNeRtMZNU=";
})
+ # fixes test failure, remove when included in release
+ (fetchpatch2 {
+ url = "https://github.com/nodejs/node/commit/b6fe731c55eb4cb9d14042a23e5002ed39b7c8b7.patch?full_index=1";
+ hash = "sha256-KoKsQBFKUji0GeEPTR8ixBflCiHBhPqd2cPVPuKyua8=";
+ })
];
}
diff --git a/pkgs/games/doom-ports/zandronum/alpha/default.nix b/pkgs/games/doom-ports/zandronum/alpha/default.nix
index 665bef3bd4a1..7e45e62af62f 100644
--- a/pkgs/games/doom-ports/zandronum/alpha/default.nix
+++ b/pkgs/games/doom-ports/zandronum/alpha/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
preConfigure = ''
ln -s ${sqlite}/* sqlite/
- sed -ie 's| restrict| _restrict|g' dumb/include/dumb.h \
+ sed -i -e 's| restrict| _restrict|g' dumb/include/dumb.h \
dumb/src/it/*.c
'' + lib.optionalString (!serverOnly) ''
sed -i \
diff --git a/pkgs/games/doom-ports/zandronum/default.nix b/pkgs/games/doom-ports/zandronum/default.nix
index 17c9b473870a..abd4a2a0f06d 100644
--- a/pkgs/games/doom-ports/zandronum/default.nix
+++ b/pkgs/games/doom-ports/zandronum/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
preConfigure = ''
ln -s ${sqlite}/* sqlite/
- sed -ie 's| restrict| _restrict|g' dumb/include/dumb.h \
+ sed -i -e 's| restrict| _restrict|g' dumb/include/dumb.h \
dumb/src/it/*.c
'' + lib.optionalString (!serverOnly) ''
sed -i \
diff --git a/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh b/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh
index c635816777f5..85ba59faf8df 100644
--- a/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh
+++ b/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh
@@ -107,7 +107,7 @@ ecmHostPathHook() {
if [ -d "$1/share/dbus-1" ]
then
- propagatedUserEnvPkgs+=" $1"
+ appendToVar propagatedUserEnvPkgs "$1"
fi
}
addEnvHooks "$hostOffset" ecmHostPathHook
diff --git a/pkgs/kde/gear/kdegraphics-thumbnailers/default.nix b/pkgs/kde/gear/kdegraphics-thumbnailers/default.nix
index bfb3ba1fc850..79ae5c8b30a9 100644
--- a/pkgs/kde/gear/kdegraphics-thumbnailers/default.nix
+++ b/pkgs/kde/gear/kdegraphics-thumbnailers/default.nix
@@ -1,6 +1,6 @@
{
mkKdeDerivation,
- substituteAll,
+ replaceVars,
ghostscript,
}:
mkKdeDerivation {
@@ -9,9 +9,8 @@ mkKdeDerivation {
patches = [
# Hardcode patches to Ghostscript so PDF thumbnails work OOTB.
# Intentionally not doing the same for dvips because TeX is big.
- (substituteAll {
+ (replaceVars ./gs-paths.patch {
gs = "${ghostscript}/bin/gs";
- src = ./gs-paths.patch;
})
];
}
diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix
index 1642e91bb109..6b24313af1db 100644
--- a/pkgs/misc/drivers/utsushi/default.nix
+++ b/pkgs/misc/drivers/utsushi/default.nix
@@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
sha256 = "sha256-W8R1l7ZPcsfiIy1QBJvh0M8du0w1cnTg3PyAz65v4rE=";
})
(fetchpatch {
- url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/iscan/files/iscan-3.65.0-sane-backends-1.1.patch";
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/iscan/files/iscan-3.65.0-sane-backends-1.1.patch?id=dec60bb6900d6ebdaaa6aa1dcb845b30b739f9b5";
sha256 = "sha256-AmMZ+/lrUMR7IU+S8MEn0Ji5pqOiD6izFJBsJ0tCCCw=";
})
];
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/bin.nix b/pkgs/os-specific/bsd/freebsd/pkgs/bin.nix
index 27cd34d9e935..0e058a790030 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/bin.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/bin.nix
@@ -77,7 +77,7 @@ mkDerivation {
'';
preInstall = ''
- makeFlags="$makeFlags ROOTDIR=$out/root"
+ appendToVar makeFlags "ROOTDIR=$out/root"
'';
outputs = [
diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix
index c3547aae44ed..8f283c6bec54 100644
--- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix
@@ -12,30 +12,8 @@
let
mkStub = callPackage ../apple-sdk/mk-stub.nix { } "11.0";
-
- stdenvs =
- {
- stdenv = overrideSDK stdenv "11.0";
- }
- // builtins.listToAttrs (
- map
- (v: {
- name = "llvmPackages_${v}";
- value = pkgs."llvmPackages_${v}" // {
- stdenv = overrideSDK pkgs."llvmPackages_${v}".stdenv "11.0";
- };
- })
- [
- "12"
- "13"
- "14"
- "15"
- "16"
- ]
- );
in
-stdenvs
-// lib.genAttrs [
+lib.genAttrs [
"CLTools_Executables"
"IOKit"
"Libsystem"
@@ -276,30 +254,17 @@ stdenvs
"simd"
] mkStub;
- callPackage = newScope (
- lib.optionalAttrs stdenv.hostPlatform.isDarwin (
- stdenvs // { inherit (pkgs.darwin.apple_sdk_11_0) rustPlatform; }
- )
- );
-
- rustPlatform =
- pkgs.makeRustPlatform {
- inherit (pkgs.darwin.apple_sdk_11_0) stdenv;
- inherit (pkgs) rustc cargo;
- }
- // {
- inherit
- (pkgs.callPackage ../../../build-support/rust/hooks {
- inherit (pkgs.darwin.apple_sdk_11_0) stdenv;
- inherit (pkgs) cargo rustc;
- })
- bindgenHook
- ;
- };
-
- stdenv = overrideSDK stdenv "11.0";
-
- xcodebuild = pkgs.xcodebuild;
+ inherit (pkgs)
+ callPackage
+ stdenv
+ llvmPackages_12
+ llvmPackages_13
+ llvmPackages_14
+ llvmPackages_15
+ llvmPackages_16
+ rustPlatform
+ xcodebuild
+ ;
version = "11.0";
}
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix
deleted file mode 100644
index 388de3730380..000000000000
--- a/pkgs/os-specific/darwin/apple-sdk/default.nix
+++ /dev/null
@@ -1,272 +0,0 @@
-# Compatibility stubs for packages that used the old SDK frameworks.
-# TODO(@reckenrode) Make these stubs warn after framework usage has been cleaned up in nixpkgs.
-{ lib, callPackage }:
-
-let
- mkStub = callPackage ./mk-stub.nix { } "10.12";
-
- frameworks = lib.genAttrs [
- "AGL"
- "AVFoundation"
- "AVKit"
- "Accelerate"
- "Accounts"
- "AddressBook"
- "AppKit"
- "AppKitScripting"
- "AppleScriptKit"
- "AppleScriptObjC"
- "ApplicationServices"
- "AudioToolbox"
- "AudioUnit"
- "AudioVideoBridging"
- "Automator"
- "CFNetwork"
- "CalendarStore"
- "Carbon"
- "Cocoa"
- "Collaboration"
- "ContactsPersistence"
- "CoreAudio"
- "CoreAudioKit"
- "CoreBluetooth"
- "CoreData"
- "CoreFoundation"
- "CoreGraphics"
- "CoreImage"
- "CoreLocation"
- "CoreMIDI"
- "CoreMIDIServer"
- "CoreMedia"
- "CoreMediaIO"
- "CoreServices"
- "CoreSymbolication"
- "CoreText"
- "CoreVideo"
- "CoreWLAN"
- "DVDPlayback"
- "DebugSymbols"
- "DirectoryService"
- "DiscRecording"
- "DiscRecordingUI"
- "DiskArbitration"
- "DisplayServices"
- "EventKit"
- "ExceptionHandling"
- "FWAUserLib"
- "ForceFeedback"
- "Foundation"
- "GLKit"
- "GLUT"
- "GSS"
- "GameCenter"
- "GameController"
- "GameKit"
- "GameplayKit"
- "Hypervisor"
- "ICADevices"
- "IMServicePlugIn"
- "IOBluetooth"
- "IOBluetoothUI"
- "IOKit"
- "IOSurface"
- "ImageCaptureCore"
- "ImageIO"
- "InputMethodKit"
- "InstallerPlugins"
- "InstantMessage"
- "JavaFrameEmbedding"
- "JavaNativeFoundation"
- "JavaRuntimeSupport"
- "JavaScriptCore"
- "JavaVM"
- "Kerberos"
- "Kernel"
- "LDAP"
- "LatentSemanticMapping"
- "LocalAuthentication"
- "MapKit"
- "MediaAccessibility"
- "MediaPlayer"
- "MediaToolbox"
- "Metal"
- "MetalKit"
- "ModelIO"
- "MultitouchSupport"
- "NetFS"
- "OSAKit"
- "OpenAL"
- "OpenCL"
- "OpenDirectory"
- "OpenGL"
- "PCSC"
- "PreferencePanes"
- "PubSub"
- "QTKit"
- "Quartz"
- "QuartzCore"
- "QuickLook"
- "QuickTime"
- "SceneKit"
- "ScreenSaver"
- "Scripting"
- "ScriptingBridge"
- "Security"
- "SecurityFoundation"
- "SecurityInterface"
- "ServiceManagement"
- "SkyLight"
- "Social"
- "SpriteKit"
- "StoreKit"
- "SyncServices"
- "System"
- "SystemConfiguration"
- "TWAIN"
- "Tcl"
- "UIFoundation"
- "VideoDecodeAcceleration"
- "VideoToolbox"
- "WebKit"
- "vmnet"
- ] mkStub;
-
- bareFrameworks = lib.genAttrs [
- "AGL"
- "AVFoundation"
- "AVKit"
- "Accelerate"
- "Accounts"
- "AddressBook"
- "AppKit"
- "AppKitScripting"
- "AppleScriptKit"
- "AppleScriptObjC"
- "ApplicationServices"
- "AudioToolbox"
- "AudioUnit"
- "AudioVideoBridging"
- "Automator"
- "CFNetwork"
- "CalendarStore"
- "Carbon"
- "Cocoa"
- "Collaboration"
- "CoreAudio"
- "CoreAudioKit"
- "CoreBluetooth"
- "CoreData"
- "CoreFoundation"
- "CoreGraphics"
- "CoreImage"
- "CoreLocation"
- "CoreMIDI"
- "CoreMIDIServer"
- "CoreMedia"
- "CoreMediaIO"
- "CoreServices"
- "CoreText"
- "CoreVideo"
- "CoreWLAN"
- "DVDPlayback"
- "DirectoryService"
- "DiscRecording"
- "DiscRecordingUI"
- "DiskArbitration"
- "EventKit"
- "ExceptionHandling"
- "FWAUserLib"
- "ForceFeedback"
- "Foundation"
- "GLKit"
- "GLUT"
- "GSS"
- "GameCenter"
- "GameController"
- "GameKit"
- "GameplayKit"
- "Hypervisor"
- "ICADevices"
- "IMServicePlugIn"
- "IOBluetooth"
- "IOBluetoothUI"
- "IOKit"
- "IOSurface"
- "ImageCaptureCore"
- "ImageIO"
- "InputMethodKit"
- "InstallerPlugins"
- "InstantMessage"
- "JavaFrameEmbedding"
- "JavaNativeFoundation"
- "JavaRuntimeSupport"
- "JavaScriptCore"
- "JavaVM"
- "Kerberos"
- "Kernel"
- "LDAP"
- "LatentSemanticMapping"
- "LocalAuthentication"
- "MapKit"
- "MediaAccessibility"
- "MediaPlayer"
- "MediaToolbox"
- "Metal"
- "MetalKit"
- "ModelIO"
- "NetFS"
- "OSAKit"
- "OpenAL"
- "OpenCL"
- "OpenDirectory"
- "OpenGL"
- "PCSC"
- "PreferencePanes"
- "PubSub"
- "QTKit"
- "Quartz"
- "QuartzCore"
- "QuickLook"
- "QuickTime"
- "SceneKit"
- "ScreenSaver"
- "Scripting"
- "ScriptingBridge"
- "Security"
- "SecurityFoundation"
- "SecurityInterface"
- "ServiceManagement"
- "Social"
- "SpriteKit"
- "StoreKit"
- "SyncServices"
- "System"
- "SystemConfiguration"
- "TWAIN"
- "Tcl"
- "VideoDecodeAcceleration"
- "VideoToolbox"
- "WebKit"
- "vmnet"
- ] mkStub;
-in
-{
- inherit bareFrameworks frameworks;
-
- libs = lib.genAttrs [
- "Xplugin"
- "sandbox"
- "simd"
- "utmp"
- "xpc"
- ] mkStub;
-
- version = "10.12";
-}
-// lib.genAttrs [
- "darwin-stubs"
- "Libsystem"
- "objc4"
- "sdk"
- "sdkRoot"
-] mkStub
diff --git a/pkgs/os-specific/darwin/apple-source-releases/IOKitTools/package.nix b/pkgs/os-specific/darwin/apple-source-releases/IOKitTools/package.nix
index 21426257fe35..7d3077b10e4e 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/IOKitTools/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/IOKitTools/package.nix
@@ -1,7 +1,6 @@
{
lib,
- apple-sdk_11,
- darwinMinVersionHook,
+ apple-sdk,
mkAppleDerivation,
ncurses,
pkg-config,
@@ -9,8 +8,8 @@
}:
let
- iokitUser = apple-sdk_11.sourceRelease "IOKitUser";
- xnu = apple-sdk_11.sourceRelease "xnu";
+ iokitUser = apple-sdk.sourceRelease "IOKitUser";
+ xnu = apple-sdk.sourceRelease "xnu";
privateHeaders = stdenvNoCC.mkDerivation {
name = "IOKitTools-deps-private-headers";
@@ -52,9 +51,7 @@ mkAppleDerivation {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
- apple-sdk_11
- apple-sdk_11.privateFrameworksHook
- (darwinMinVersionHook "11.0")
+ apple-sdk.privateFrameworksHook
ncurses
];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/meson.build.in
index 69b7d270f17b..66fa5116bf0d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/meson.build.in
+++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/meson.build.in
@@ -4,8 +4,6 @@
# Project settings
project('adv_cmds', 'c', 'cpp', version : '@version@')
-sdk_version = get_option('sdk_version')
-
# Dependencies
cc = meson.get_compiler('c')
@@ -190,8 +188,7 @@ install_man('ps/ps.1')
executable(
'stty',
- build_by_default : sdk_version.version_compare('>=11.3'),
- install : sdk_version.version_compare('>=11.3'),
+ install : true,
sources : [
'stty/cchar.c',
'stty/gfmt.c',
@@ -202,9 +199,7 @@ executable(
'stty/util.c',
],
)
-if sdk_version.version_compare('>=11.3')
- install_man('stty/stty.1')
-endif
+install_man('stty/stty.1')
executable(
'tabs',
diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/meson.options b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/meson.options
deleted file mode 100644
index 8c4ce874c64c..000000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/meson.options
+++ /dev/null
@@ -1 +0,0 @@
-option('sdk_version', type : 'string')
diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/package.nix
index 646351716678..f994ab88d029 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/package.nix
@@ -1,7 +1,6 @@
{
lib,
apple-sdk,
- apple-sdk_11,
bison,
flex,
libxo,
@@ -12,9 +11,9 @@
}:
let
- Libc = apple-sdk_11.sourceRelease "Libc";
- libplatform = apple-sdk_11.sourceRelease "libplatform";
- xnu = apple-sdk_11.sourceRelease "xnu";
+ Libc = apple-sdk.sourceRelease "Libc";
+ libplatform = apple-sdk.sourceRelease "libplatform";
+ xnu = apple-sdk.sourceRelease "xnu";
privateHeaders = stdenvNoCC.mkDerivation {
name = "adv_cmds-deps-private-headers";
@@ -41,11 +40,6 @@ mkAppleDerivation {
xcodeHash = "sha256-2p/JyMPw6acHphvzkaJXPXGwxCUEoxryCejww5kPHvQ=";
- patches = [
- # Use older API when running on systems prior to 11.3.
- ./patches/0001-Fall-back-to-task_read_pid-on-older-systems.patch
- ];
-
postPatch = ''
# Meson generators require using @BASENAME@ in the output.
substituteInPlace mklocale/lex.l \
@@ -67,8 +61,6 @@ mkAppleDerivation {
env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include";
buildInputs = [
- # Use the 11.3 SDK because CMake depends on adv_cmds.ps, so it can’t simply be omitted when using an older SDK.
- apple-sdk_11
libxo
ncurses
];
@@ -79,12 +71,6 @@ mkAppleDerivation {
pkg-config
];
- mesonFlags = [
- # Even though adv_cmds is built with a newer SDK, the default SDK is still the deployment target.
- # Don’t build packages that use newer APIs unnecessarily.
- (lib.mesonOption "sdk_version" (lib.getVersion apple-sdk))
- ];
-
postInstall = ''
moveToOutput bin/ps "$ps"
ln -s "$ps/bin/ps" "$out/bin/ps"
diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/patches/0001-Fall-back-to-task_read_pid-on-older-systems.patch b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/patches/0001-Fall-back-to-task_read_pid-on-older-systems.patch
deleted file mode 100644
index 8e5f344f6490..000000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/patches/0001-Fall-back-to-task_read_pid-on-older-systems.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From c05a83d29349c6ae2fd8084a48ea51c8e8bf23f2 Mon Sep 17 00:00:00 2001
-From: Randy Eckenrode
-Date: Sun, 18 Aug 2024 10:29:16 -0400
-Subject: [PATCH] Fall back to `task_read_pid` on older systems
-
----
- ps/tasks.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/ps/tasks.c b/ps/tasks.c
-index d2fcb07..068c985 100644
---- a/ps/tasks.c
-+++ b/ps/tasks.c
-@@ -25,8 +25,6 @@
- #include
- #include
-
--extern kern_return_t task_read_for_pid(task_port_t task, pid_t pid, task_port_t *target);
--
- #define STATE_MAX 7
-
- int
-@@ -98,7 +96,11 @@ int get_task_info (KINFO *ki)
- ki->state = STATE_MAX;
-
- pid = KI_PROC(ki)->p_pid;
-- error = task_read_for_pid(mach_task_self(), pid, &ki->task);
-+ if (__builtin_available(macos 11.3, *)) {
-+ error = task_read_for_pid(mach_task_self(), pid, &ki->task);
-+ } else {
-+ error = task_for_pid(mach_task_self(), pid, &ki->task);
-+ }
- if (error != KERN_SUCCESS) {
- #ifdef DEBUG
- mach_error("Error calling task_read_for_pid()", error);
---
-2.44.1
-
diff --git a/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix b/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix
index 3382128b0e91..1edde5a1d8c6 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix
@@ -1,16 +1,12 @@
{
lib,
apple-sdk,
- apple-sdk_10_13,
- apple-sdk_11,
mkAppleDerivation,
stdenvNoCC,
}:
let
- # The 10.12 SDK doesn’t have the files needed in the same places or possibly at all.
- # Just use the 11.x SDK to make things easier.
- xnu = apple-sdk_11.sourceRelease "xnu";
+ xnu = apple-sdk.sourceRelease "xnu";
privateHeaders = stdenvNoCC.mkDerivation {
name = "copyfile-deps-private-headers";
@@ -90,9 +86,5 @@ mkAppleDerivation {
env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include";
- buildInputs = lib.optionals (lib.versionOlder (lib.getVersion apple-sdk) "10.13") [
- (apple-sdk_10_13.override { enableBootstrap = true; })
- ];
-
meta.description = "Darwin file copying library";
}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/meson.build.in
index 719f602ec60d..00270488507a 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/meson.build.in
+++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/meson.build.in
@@ -110,7 +110,6 @@ executable(
'-DMNT_STRICTATIME=0x80000000',
# https://github.com/apple-oss-distributions/xnu/blob/94d3b452840153a99b38a3a9659680b2a006908e/bsd/sys/attr.h#L300
'-DVOL_CAP_FMT_SEALED=0x02000000',
- '-D_DARWIN_USE_64_BIT_INODE=1', # Needed with older SDKs to ensure 64-bit `struct statfs`.
],
dependencies : [ apfs, libdisk ],
include_directories : [ 'edt_fstab', 'fsck.tproj', 'mount_flags_dir' ],
diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/package.nix
index 9487eb189c85..edc71e50e868 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/package.nix
@@ -1,7 +1,6 @@
{
lib,
apple-sdk,
- apple-sdk_11,
libutil,
mkAppleDerivation,
removefile,
@@ -9,8 +8,8 @@
}:
let
- Libc = apple-sdk_11.sourceRelease "Libc";
- xnu = apple-sdk_11.sourceRelease "xnu";
+ Libc = apple-sdk.sourceRelease "Libc";
+ xnu = apple-sdk.sourceRelease "xnu";
privateHeaders = stdenvNoCC.mkDerivation {
name = "diskdev_cmds-deps-private-headers";
@@ -55,13 +54,6 @@ mkAppleDerivation {
''
substituteInPlace mount.tproj/mount.c \
--replace-fail 'sysctlbyname ("vfs.generic.apfs.rosp", &is_rosp, &rospsize, NULL, NULL);' 'sysctlbyname ("vfs.generic.apfs.rosp", &is_rosp, &rospsize, NULL, 0);'
- ''
- # The first reserved uint32 is used for the extended flags on 11.0 and newer, and
- # only use sysexit_np when the version is 10.14 or newer.
- + lib.optionalString (lib.versionOlder (lib.getVersion apple-sdk) "11.0") ''
- substituteInPlace mount.tproj/mount.c \
- --replace-fail 'sfp->f_flags_ext' 'sfp->f_reserved[0]' \
- --replace-fail 'sysexit == -1' '__builtin_available(macOS 10.14, *) && sysexit == -1'
'';
env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include";
diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/meson.build.in
index 170f9ac24243..638742f978c2 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/meson.build.in
+++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/meson.build.in
@@ -13,9 +13,9 @@ cc = meson.get_compiler('c')
core_foundation = dependency('appleframeworks', modules : 'CoreFoundation')
-libbsd = dependency('libbsd-overlay', required : false)
bzip2 = dependency('bzip2')
xz = dependency('liblzma')
+libmd = dependency('libmd')
libxo = dependency('libxo')
zlib = dependency('zlib')
@@ -24,34 +24,6 @@ removefile = cc.find_library('removefile')
libutil = cc.find_library('util')
-# Compatibility tests
-utimensat_test = '''
-#include
-#include
-#include
-int main(int argc, char* argv[]) {
- return utimensat(AT_FDCWD, NULL, NULL, 0);
-}
-'''
-
-rpmatch_test = '''
-#include
-int main(int argc, char* argv[]) {
- return rpmatch("NO");
-}
-'''
-
-has_utimensat = cc.compiles(utimensat_test, name : 'supports utimensat')
-utimensat_c_args = has_utimensat ? [ ] : [ '-include', 'time_compat.h', '-I' + meson.source_root() + '/compat' ]
-utimensat_sources = has_utimensat ? [ ] : [ 'compat/time_compat.c' ]
-
-has_rpmatch = cc.compiles(rpmatch_test, name : 'supports rpmatch')
-rpmatch_c_args = has_rpmatch ? [ ] : [ '-include', 'rpmatch_compat.h', '-I' + meson.source_root() + '/compat' ]
-rpmatch_sources = has_rpmatch ? [ ] : [ 'compat/rpmatch_compat.c' ]
-
-compat_link_args = not (has_utimensat and has_rpmatch) ? [ '-Wl,-undefined,dynamic_lookup' ] : [ ]
-
-
# Binaries
executable(
'chflags',
@@ -107,14 +79,10 @@ install_man('cksum/sum.1')
executable(
'compress',
- c_args : [ utimensat_c_args, rpmatch_c_args ],
install : true,
- link_args : compat_link_args,
sources: [
'compress/compress.c',
'compress/zopen.c',
- utimensat_sources,
- rpmatch_sources,
]
)
install_man('compress/compress.1')
@@ -130,18 +98,11 @@ install_man('compress/zopen.3')
executable(
'cp',
- c_args : [
- utimensat_c_args,
- rpmatch_c_args,
- ],
dependencies : [ copyfile ],
install : true,
- link_args : compat_link_args,
sources: [
'cp/cp.c',
'cp/utils.c',
- utimensat_sources,
- rpmatch_sources,
]
)
install_man('cp/cp.1')
@@ -213,13 +174,10 @@ install_symlink(
executable(
'install-bin', # Meson reserves the name “install”, so use a different name and rename in install phase.
- c_args : utimensat_c_args,
- dependencies : [ copyfile ],
+ dependencies : [ copyfile, libmd ],
install : true,
- link_args : compat_link_args,
sources: [
'install/xinstall.c',
- utimensat_sources,
],
)
install_man('install/install.1')
@@ -260,7 +218,7 @@ executable(
# https://github.com/apple-oss-distributions/xnu/blob/94d3b452840153a99b38a3a9659680b2a006908e/bsd/sys/stat.h#L520
'-DSF_DATALESS=0x40000000',
],
- dependencies : [ libbsd, libutil ],
+ dependencies : [ libutil ],
install : true,
sources: [
'ls/cmp.c',
@@ -297,17 +255,6 @@ install_man('mknod/mknod.8')
executable(
'mtree',
- # Define these flags for the 10.12 SDK assuming that users on older systems can’t encounter dataless files.
- c_args : [
- # https://github.com/apple-oss-distributions/xnu/blob/94d3b452840153a99b38a3a9659680b2a006908e/bsd/sys/stat.h#L520
- '-DSF_DATALESS=0x40000000',
- # https://github.com/apple-oss-distributions/xnu/blob/94d3b452840153a99b38a3a9659680b2a006908e/bsd/sys/resource.h#L598
- '-DIOPOL_TYPE_VFS_MATERIALIZE_DATALESS_FILES=3',
- # https://github.com/apple-oss-distributions/xnu/blob/94d3b452840153a99b38a3a9659680b2a006908e/bsd/sys/resource.h#L640
- '-DIOPOL_MATERIALIZE_DATALESS_FILES_OFF=1',
- # https://github.com/apple-oss-distributions/xnu/blob/94d3b452840153a99b38a3a9659680b2a006908e/bsd/sys/attr.h#L562
- '-DATTR_CMNEXT_LINKID=0x00000010',
- ],
dependencies : [ core_foundation, removefile ],
install : true,
sources: [
@@ -328,14 +275,10 @@ install_man('mtree/mtree.8')
executable(
'mv',
- c_args : [ utimensat_c_args, rpmatch_c_args ],
dependencies : [ copyfile ],
install : true,
- link_args : compat_link_args,
sources: [
'mv/mv.c',
- utimensat_sources,
- rpmatch_sources,
],
)
install_man('mv/mv.1')
@@ -375,13 +318,10 @@ install_man('pax/pax.1')
executable(
'rm',
- c_args : rpmatch_c_args,
dependencies : [ removefile ],
install : true,
- link_args : compat_link_args,
sources: [
'rm/rm.c',
- rpmatch_sources,
],
)
install_man('rm/rm.1')
@@ -424,12 +364,9 @@ install_man('stat/readlink.1')
executable(
'touch',
- c_args : utimensat_c_args,
install : true,
- link_args : compat_link_args,
sources: [
'touch/touch.c',
- utimensat_sources,
],
)
install_man('touch/touch.1')
diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix
index a4751bf0757a..584d2a312a60 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix
@@ -1,11 +1,10 @@
{
lib,
apple-sdk,
- apple-sdk_11,
bzip2,
copyfile,
less,
- libbsd,
+ libmd,
libutil,
libxo,
mkAppleDerivation,
@@ -20,12 +19,9 @@
let
Libc = apple-sdk.sourceRelease "Libc";
Libinfo = apple-sdk.sourceRelease "Libinfo";
-
- # The 10.12 SDK doesn’t have the files needed in the same places or possibly at all.
- # Just use the 11.0 SDK to make things easier.
- CommonCrypto = apple-sdk_11.sourceRelease "CommonCrypto";
- libplatform = apple-sdk_11.sourceRelease "libplatform";
- xnu = apple-sdk_11.sourceRelease "xnu";
+ CommonCrypto = apple-sdk.sourceRelease "CommonCrypto";
+ libplatform = apple-sdk.sourceRelease "libplatform";
+ xnu = apple-sdk.sourceRelease "xnu";
privateHeaders = stdenvNoCC.mkDerivation {
name = "file_cmds-deps-private-headers";
@@ -46,9 +42,6 @@ let
install -D -t "$out/include/System/sys" \
'${xnu}/bsd/sys/fsctl.h'
- # Needed by older private headers.
- touch "$out/include/CrashReporterClient.h"
-
mkdir -p "$out/include/apfs"
# APFS group is 'J' per https://github.com/apple-oss-distributions/xnu/blob/94d3b452840153a99b38a3a9659680b2a006908e/bsd/vfs/vfs_fsevents.c#L1054
cat < "$out/include/apfs/apfs_fsctl.h"
@@ -64,11 +57,6 @@ let
#define APFSIOC_XDSTREAM_OBJ_ID _IOWR('J', 53, struct xdstream_obj_id)
EOF
- # Prevent an error when using the old availability headers from the 10.12 SDK.
- substituteInPlace "$out/include/CommonCrypto/CommonDigestSPI.h" \
- --replace-fail 'API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.13), ios(5.0, 11.0))' "" \
- --replace-fail 'API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.15), ios(5.0, 13.0))' ""
-
cat < "$out/include/sys/types.h"
#pragma once
#include
@@ -108,26 +96,22 @@ mkAppleDerivation {
./patches/0001-Add-missing-extern-unix2003_compat-to-ls.patch
# Add missing conditional to avoid using private APFS APIs that we lack headers for using.
./patches/0002-Add-missing-ifdef-for-private-APFS-APIs.patch
- # Add implementations of missing functions for older SDKs
- ./patches/0003-Add-implementations-of-missing-APIs-for-older-SDKs.patch
];
nativeBuildInputs = [ pkg-config ];
env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include";
- buildInputs =
- [
- bzip2
- copyfile
- libutil
- libxo
- removefile
- xz
- zlib
- ]
- # ls needs strtonum, which requires the 11.0 SDK.
- ++ lib.optionals (lib.versionOlder (lib.getVersion apple-sdk) "11.0") [ libbsd ];
+ buildInputs = [
+ bzip2
+ copyfile
+ libmd
+ libutil
+ libxo
+ removefile
+ xz
+ zlib
+ ];
postInstall = ''
HOST_PATH='${lib.getBin shell_cmds}/bin' patchShebangs --host "$out/bin"
diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/patches/0003-Add-implementations-of-missing-APIs-for-older-SDKs.patch b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/patches/0003-Add-implementations-of-missing-APIs-for-older-SDKs.patch
deleted file mode 100644
index d54ac1fbd295..000000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/patches/0003-Add-implementations-of-missing-APIs-for-older-SDKs.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 9d21ed4cb6b56966a7962227a33c0e1986996cb1 Mon Sep 17 00:00:00 2001
-From: Randy Eckenrode
-Date: Sun, 8 Sep 2024 09:46:49 -0400
-Subject: [PATCH 3/3] Add implementations of missing APIs for older SDKs
-
----
- compat/rpmatch_compat.c | 10 ++++++++++
- compat/rpmatch_compat.h | 6 ++++++
- compat/time_compat.c | 38 ++++++++++++++++++++++++++++++++++++++
- compat/time_compat.h | 16 ++++++++++++++++
- 4 files changed, 70 insertions(+)
- create mode 100644 compat/rpmatch_compat.c
- create mode 100644 compat/rpmatch_compat.h
- create mode 100644 compat/time_compat.c
- create mode 100644 compat/time_compat.h
-
-diff --git a/compat/rpmatch_compat.c b/compat/rpmatch_compat.c
-new file mode 100644
-index 0000000..8eb99c3
---- /dev/null
-+++ b/compat/rpmatch_compat.c
-@@ -0,0 +1,10 @@
-+// SPDX-License-Identifier: APSL-2.0
-+// utimensat written by Randy Eckenrode © 2024
-+
-+#include "rpmatch_compat.h"
-+
-+#include
-+
-+int rpmatch(const char *response) {
-+ return response != NULL && (response[0] == 'y' || response[0] == 'Y');
-+}
-diff --git a/compat/rpmatch_compat.h b/compat/rpmatch_compat.h
-new file mode 100644
-index 0000000..a13b64b
---- /dev/null
-+++ b/compat/rpmatch_compat.h
-@@ -0,0 +1,6 @@
-+// SPDX-License-Identifier: APSL-2.0
-+// utimensat written by Randy Eckenrode © 2024
-+
-+#pragma once
-+
-+extern int rpmatch(const char *response);
-diff --git a/compat/time_compat.c b/compat/time_compat.c
-new file mode 100644
-index 0000000..becf778
---- /dev/null
-+++ b/compat/time_compat.c
-@@ -0,0 +1,38 @@
-+// SPDX-License-Identifier: APSL-2.0
-+// utimensat written by Randy Eckenrode © 2024
-+
-+#include "time_compat.h"
-+
-+#define futimens gzip_futimens
-+#include "gzip/futimens.c"
-+#undef futimens
-+
-+#include
-+#include
-+
-+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101300
-+extern int utimensat(int dirfd, const char* pathname, const struct timespec times[_Nullable 2], int flags);
-+extern int futimens(int fd, const struct timespec times[_Nullable 2]);
-+#endif
-+
-+int compat_utimensat(int dirfd, const char* pathname, const struct timespec times[_Nullable 2], int flags) {
-+ if (__builtin_available(macOS 10.13, *)) {
-+ return utimensat(dirfd, pathname, times, flags);
-+ } else {
-+ int fd = openat(dirfd, pathname, flags);
-+ if (fd == -1) { return -1; }
-+
-+ int retval = compat_futimens(fd, times);
-+ if (close(fd) == -1) { return -1; }
-+
-+ return retval;
-+ }
-+}
-+
-+int compat_futimens(int fd, const struct timespec times[_Nullable 2]) {
-+ if (__builtin_available(macOS 10.13, *)) {
-+ return futimens(fd, times);
-+ } else {
-+ return gzip_futimens(fd, times);
-+ }
-+}
-diff --git a/compat/time_compat.h b/compat/time_compat.h
-new file mode 100644
-index 0000000..f07a7ed
---- /dev/null
-+++ b/compat/time_compat.h
-@@ -0,0 +1,16 @@
-+// SPDX-License-Identifier: APSL-2.0
-+// utimensat written by Randy Eckenrode © 2024
-+
-+#pragma once
-+
-+#include
-+
-+// https://github.com/apple-oss-distributions/xnu/blob/94d3b452840153a99b38a3a9659680b2a006908e/bsd/sys/stat.h#L578-L579
-+#define UTIME_NOW -1
-+#define UTIME_OMIT -2
-+
-+#define utimensat compat_utimensat
-+#define futimens compat_futimens
-+
-+extern int compat_utimensat(int dirfd, const char* pathname, const struct timespec times[_Nullable 2], int flags);
-+extern int compat_futimens(int fd, const struct timespec times[_Nullable 2]);
---
-2.46.0
-
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libpcap/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libpcap/package.nix
index 223dc3858a94..0cc81e440070 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libpcap/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libpcap/package.nix
@@ -1,6 +1,5 @@
{
lib,
- apple-sdk_11,
apple-sdk_15,
bison,
bluez,
@@ -110,8 +109,6 @@ mkAppleDerivation {
flex
] ++ lib.optionals withBluez [ bluez.dev ];
- buildInputs = [ apple-sdk_11 ];
-
meta = {
description = "Packet Capture Library (with Apple modifications)";
mainProgram = "pcap-config";
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix
index 8bfdeb6bfa27..285ee3b616e3 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix
@@ -1,15 +1,15 @@
{
lib,
- apple-sdk_11,
+ apple-sdk,
mkAppleDerivation,
}:
let
- configd = apple-sdk_11.sourceRelease "configd";
- Libinfo = apple-sdk_11.sourceRelease "Libinfo";
+ configd = apple-sdk.sourceRelease "configd";
+ Libinfo = apple-sdk.sourceRelease "Libinfo";
# `arpa/nameser_compat.h` is included in the Libc source release instead of libresolv.
- Libc = apple-sdk_11.sourceRelease "Libc";
+ Libc = apple-sdk.sourceRelease "Libc";
in
mkAppleDerivation {
releaseName = "libresolv";
@@ -27,13 +27,6 @@ mkAppleDerivation {
ln -s "$NIX_BUILD_TOP/$sourceRoot/nameser.h" "$sourceRoot/arpa/nameser.h"
'';
- # Remove unsupported availability annotations to support SDK without updated availability headers.
- postPatch = ''
- substituteInPlace dns_util.h \
- --replace-fail 'API_DEPRECATED_BEGIN("dns_util is deprecated.", macos(10.0, 13.0), ios(1.0, 16.0), watchos(1.0, 9.0), tvos(1.0, 16.0))' "" \
- --replace-fail API_DEPRECATED_END ""
- '';
-
env.NIX_CFLAGS_COMPILE = "-I${configd}/dnsinfo -I${Libinfo}/lookup.subproj";
postInstall = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/mail_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/mail_cmds/meson.build.in
index cacd64bb7b55..b4f4f9556a1a 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/mail_cmds/meson.build.in
+++ b/pkgs/os-specific/darwin/apple-source-releases/mail_cmds/meson.build.in
@@ -9,28 +9,10 @@ project('mail_cmds', 'c', version : '@version@')
cc = meson.get_compiler('c')
-# Compatibility tests
-utimensat_test = '''
-#include
-#include
-#include
-int main(int argc, char* argv[]) {
- return utimensat(AT_FDCWD, NULL, NULL, 0);
-}
-'''
-
-has_utimensat = cc.compiles(utimensat_test, name : 'supports utimensat')
-utimensat_c_args = has_utimensat ? [ ] : [ '-include', 'time_compat.h', '-I' + meson.source_root() + '/compat' ]
-utimensat_sources = has_utimensat ? [ ] : [ 'compat/time_compat.c' ]
-
-compat_link_args = not has_utimensat ? [ '-Wl,-undefined,dynamic_lookup' ] : [ ]
-
# Binaries
executable(
'mail',
- c_args : utimensat_c_args,
install : true,
- link_args : compat_link_args,
sources : [
'mail/cmd1.c',
'mail/cmd2.c',
@@ -55,7 +37,6 @@ executable(
'mail/v7.local.c',
'mail/vars.c',
'mail/version.c',
- utimensat_sources,
],
)
install_man('mail/mail.1')
diff --git a/pkgs/os-specific/darwin/apple-source-releases/mail_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/mail_cmds/package.nix
index b4bbf77a21d9..b29e711251d6 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/mail_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/mail_cmds/package.nix
@@ -16,14 +16,5 @@ mkAppleDerivation {
xcodeHash = "sha256-6rBflDgQkqWDc8XPLgKIO703bMamg2QlhUnP71hBX3I=";
- patches = [
- # Add implementations of missing functions for older SDKs
- ./patches/0003-Add-implementations-of-missing-APIs-for-older-SDKs.patch
- ];
-
- postPatch = ''
- cp '${file_cmds.src}/gzip/futimens.c' compat/futimens.c
- '';
-
meta.description = "Traditional mail command for Darwin";
}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/mail_cmds/patches/0003-Add-implementations-of-missing-APIs-for-older-SDKs.patch b/pkgs/os-specific/darwin/apple-source-releases/mail_cmds/patches/0003-Add-implementations-of-missing-APIs-for-older-SDKs.patch
deleted file mode 100644
index 7838aa2b7fe9..000000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/mail_cmds/patches/0003-Add-implementations-of-missing-APIs-for-older-SDKs.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 9d21ed4cb6b56966a7962227a33c0e1986996cb1 Mon Sep 17 00:00:00 2001
-From: Randy Eckenrode
-Date: Sun, 8 Sep 2024 09:46:49 -0400
-Subject: [PATCH 3/3] Add implementations of missing APIs for older SDKs
-
----
- compat/rpmatch_compat.c | 10 ++++++++++
- compat/rpmatch_compat.h | 6 ++++++
- compat/time_compat.c | 38 ++++++++++++++++++++++++++++++++++++++
- compat/time_compat.h | 16 ++++++++++++++++
- 4 files changed, 70 insertions(+)
- create mode 100644 compat/rpmatch_compat.c
- create mode 100644 compat/rpmatch_compat.h
- create mode 100644 compat/time_compat.c
- create mode 100644 compat/time_compat.h
-
-diff --git a/compat/rpmatch_compat.c b/compat/rpmatch_compat.c
-new file mode 100644
-index 0000000..8eb99c3
---- /dev/null
-+++ b/compat/rpmatch_compat.c
-@@ -0,0 +1,10 @@
-+// SPDX-License-Identifier: APSL-2.0
-+// utimensat written by Randy Eckenrode © 2024
-+
-+#include "rpmatch_compat.h"
-+
-+#include
-+
-+int rpmatch(const char *response) {
-+ return response != NULL && (response[0] == 'y' || response[0] == 'Y');
-+}
-diff --git a/compat/rpmatch_compat.h b/compat/rpmatch_compat.h
-new file mode 100644
-index 0000000..a13b64b
---- /dev/null
-+++ b/compat/rpmatch_compat.h
-@@ -0,0 +1,6 @@
-+// SPDX-License-Identifier: APSL-2.0
-+// utimensat written by Randy Eckenrode © 2024
-+
-+#pragma once
-+
-+extern int rpmatch(const char *response);
-diff --git a/compat/time_compat.c b/compat/time_compat.c
-new file mode 100644
-index 0000000..becf778
---- /dev/null
-+++ b/compat/time_compat.c
-@@ -0,0 +1,38 @@
-+// SPDX-License-Identifier: APSL-2.0
-+// utimensat written by Randy Eckenrode © 2024
-+
-+#include "time_compat.h"
-+
-+#define futimens gzip_futimens
-+#include "compat/futimens.c"
-+#undef futimens
-+
-+#include
-+#include
-+
-+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101300
-+extern int utimensat(int dirfd, const char* pathname, const struct timespec times[_Nullable 2], int flags);
-+extern int futimens(int fd, const struct timespec times[_Nullable 2]);
-+#endif
-+
-+int compat_utimensat(int dirfd, const char* pathname, const struct timespec times[_Nullable 2], int flags) {
-+ if (__builtin_available(macOS 10.13, *)) {
-+ return utimensat(dirfd, pathname, times, flags);
-+ } else {
-+ int fd = openat(dirfd, pathname, flags);
-+ if (fd == -1) { return -1; }
-+
-+ int retval = compat_futimens(fd, times);
-+ if (close(fd) == -1) { return -1; }
-+
-+ return retval;
-+ }
-+}
-+
-+int compat_futimens(int fd, const struct timespec times[_Nullable 2]) {
-+ if (__builtin_available(macOS 10.13, *)) {
-+ return futimens(fd, times);
-+ } else {
-+ return gzip_futimens(fd, times);
-+ }
-+}
-diff --git a/compat/time_compat.h b/compat/time_compat.h
-new file mode 100644
-index 0000000..f07a7ed
---- /dev/null
-+++ b/compat/time_compat.h
-@@ -0,0 +1,16 @@
-+// SPDX-License-Identifier: APSL-2.0
-+// utimensat written by Randy Eckenrode © 2024
-+
-+#pragma once
-+
-+#include
-+
-+// https://github.com/apple-oss-distributions/xnu/blob/94d3b452840153a99b38a3a9659680b2a006908e/bsd/sys/stat.h#L578-L579
-+#define UTIME_NOW -1
-+#define UTIME_OMIT -2
-+
-+#define utimensat compat_utimensat
-+#define futimens compat_futimens
-+
-+extern int compat_utimensat(int dirfd, const char* pathname, const struct timespec times[_Nullable 2], int flags);
-+extern int compat_futimens(int fd, const struct timespec times[_Nullable 2]);
---
-2.46.0
-
diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix
index d9b115db5742..58defd296f18 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix
@@ -1,6 +1,6 @@
{
lib,
- apple-sdk_11,
+ apple-sdk,
developer_cmds,
fetchurl,
libpcap,
@@ -67,7 +67,7 @@ let
};
};
- xnu = apple-sdk_11.sourceRelease "xnu";
+ xnu = apple-sdk.sourceRelease "xnu";
privateHeaders = stdenvNoCC.mkDerivation {
name = "network_cmds-deps-private-headers";
@@ -449,7 +449,6 @@ mkAppleDerivation {
];
buildInputs = [
- apple-sdk_11
libpcap
libresolv
openssl
diff --git a/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/meson.build.in
index 731c60420a12..9d657d702b7d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/meson.build.in
+++ b/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/meson.build.in
@@ -8,7 +8,6 @@ project('patch_cmds', 'c', version : '@version@')
# Dependencies
cc = meson.get_compiler('c')
-libbsd = dependency('libbsd-overlay', required : false)
libutil = cc.find_library('util')
@@ -30,7 +29,6 @@ install_man('cmp/cmp.1')
executable(
'diff',
- dependencies : [ libbsd ],
include_directories : 'diff',
install : true,
sources : [
@@ -79,7 +77,6 @@ install_man('diffstat/diffstat.1')
executable(
'patch',
- dependencies : [ libbsd ],
include_directories : 'patch',
install : true,
sources : [
@@ -96,7 +93,6 @@ install_man('patch/patch.1')
executable(
'sdiff',
- dependencies : [ libbsd ],
include_directories : 'sdiff',
install : true,
sources : [
diff --git a/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/package.nix
index 8f1f213ae5c4..86eaba2136e5 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/package.nix
@@ -1,7 +1,6 @@
{
lib,
apple-sdk,
- libbsd,
libutil,
mkAppleDerivation,
pkg-config,
@@ -19,10 +18,7 @@ mkAppleDerivation {
nativeBuildInputs = [ pkg-config ];
- buildInputs =
- [ libutil ]
- # diff, patch, and sdiff need `strtonum`, which requires the 11.0 SDK.
- ++ lib.optionals (lib.versionOlder (lib.getVersion apple-sdk) "11.0") [ libbsd ];
+ buildInputs = [ libutil ];
meta = {
description = "BSD patch commands for Darwin";
diff --git a/pkgs/os-specific/darwin/apple-source-releases/removefile/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/removefile/meson.build.in
index 672a15a40b8e..ad3f05939d5b 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/removefile/meson.build.in
+++ b/pkgs/os-specific/darwin/apple-source-releases/removefile/meson.build.in
@@ -14,15 +14,6 @@ library(
'removefile',
c_args : [
'-D__DARWIN_NOW_CANCELABLE=1',
- # Define these flags for the 10.12 SDK assuming that users on older systems can’t encounter dataless files.
- # https://github.com/apple-oss-distributions/xnu/blob/94d3b452840153a99b38a3a9659680b2a006908e/bsd/sys/stat.h#L520
- '-DSF_DATALESS=0x40000000',
- # https://github.com/apple-oss-distributions/xnu/blob/94d3b452840153a99b38a3a9659680b2a006908e/bsd/sys/resource.h#L598
- '-DIOPOL_TYPE_VFS_MATERIALIZE_DATALESS_FILES=3',
- # https://github.com/apple-oss-distributions/xnu/blob/94d3b452840153a99b38a3a9659680b2a006908e/bsd/sys/resource.h#L640
- '-DIOPOL_MATERIALIZE_DATALESS_FILES_OFF=1',
- # https://github.com/apple-oss-distributions/xnu/blob/94d3b452840153a99b38a3a9659680b2a006908e/bsd/sys/attr.h#L562
- # '-DATTR_CMNEXT_LINKID=0x00000010',
],
install : true,
sources : [
diff --git a/pkgs/os-specific/darwin/apple-source-releases/removefile/package.nix b/pkgs/os-specific/darwin/apple-source-releases/removefile/package.nix
index b5163b6b4d95..ab9f28605b5a 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/removefile/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/removefile/package.nix
@@ -1,15 +1,11 @@
{
apple-sdk,
- apple-sdk_10_13,
- apple-sdk_11,
mkAppleDerivation,
stdenvNoCC,
}:
let
- # The 10.12 SDK doesn’t have the files needed in the same places or possibly at all.
- # Just use the 11.x SDK to make things easier.
- xnu = apple-sdk_11.sourceRelease "xnu";
+ xnu = apple-sdk.sourceRelease "xnu";
privateHeaders = stdenvNoCC.mkDerivation {
name = "removefile-deps-private-headers";
diff --git a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/meson.build.in
index 33612f0cd1f9..d3582b5013f3 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/meson.build.in
+++ b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/meson.build.in
@@ -15,7 +15,6 @@ host_cxx = meson.get_compiler('cpp')
# pam = cc.find_library('pam')
-libbsd = dependency('libbsd-overlay', required : false)
libedit = dependency('libedit')
libresolv = host_cc.find_library('resolv')
libsbuf = host_cc.find_library('sbuf')
@@ -259,7 +258,6 @@ endforeach
executable(
'lockf',
- dependencies : [ libbsd ],
install : true,
sources : [ 'lockf/lockf.c' ],
)
@@ -415,7 +413,6 @@ install_man('who/who.1')
executable(
'xargs',
- dependencies : [ libbsd ],
include_directories : 'xargs',
install : true,
sources : [
diff --git a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/package.nix
index 98c83c1b6306..9d8cd9be2e53 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/package.nix
@@ -4,7 +4,6 @@
bison,
clang,
fetchurl,
- libbsd,
libedit,
libresolv,
libsbuf,
@@ -17,15 +16,6 @@
let
# nohup requires vproc_priv.h from launchd
launchd = apple-sdk.sourceRelease "launchd";
-
- oldTime_c = fetchurl {
- url = "https://github.com/apple-oss-distributions/shell_cmds/raw/shell_cmds-207.11.1/time/time.c";
- hash = "sha256-f7aRwIaKq6r37jpw0V+1Z/sZs5Rm7vy2S774HNBnwmY=";
- };
- oldTime_1 = fetchurl {
- url = "https://github.com/apple-oss-distributions/shell_cmds/raw/shell_cmds-207.11.1/time/time.1";
- hash = "sha256-ZIbNJPHLQVGq2tdUB6j0DEp9Hie+XUZkfuQm676Vpwc=";
- };
in
mkAppleDerivation {
releaseName = "shell_cmds";
@@ -37,31 +27,18 @@ mkAppleDerivation {
xcodeHash = "sha256-26N7AZV/G+ryc2Nu1v91rEdb1a6jDpnj6t5rzEG2YA4=";
- postPatch =
- ''
- # Fix `mktemp` templates
- substituteInPlace sh/mkbuiltins \
- --replace-fail '-t ka' '-t ka.XXXXXX'
- substituteInPlace sh/mktokens \
- --replace-fail '-t ka' '-t ka.XXXXXX'
+ postPatch = ''
+ # Fix `mktemp` templates
+ substituteInPlace sh/mkbuiltins \
+ --replace-fail '-t ka' '-t ka.XXXXXX'
+ substituteInPlace sh/mktokens \
+ --replace-fail '-t ka' '-t ka.XXXXXX'
- # Update `/etc/locate.rc` paths to point to the store.
- for path in locate/locate/locate.updatedb.8 locate/locate/locate.rc locate/locate/updatedb.sh; do
- substituteInPlace $path --replace-fail '/etc/locate.rc' "$out/etc/locate.rc"
- done
- ''
- # Use an older version of `time.c` that’s compatible with the 10.12 SDK.
- + lib.optionalString (lib.versionOlder (lib.getVersion apple-sdk) "10.13") ''
- cp '${oldTime_c}' time/time.c
- cp '${oldTime_1}' time/time.1
- ''
- + lib.optionalString (lib.versionOlder (lib.getVersion apple-sdk) "11.0") ''
- # `rpmatch` was added in 11.0, so revert it to a simpler check on older SDKs.
- substituteInPlace find/misc.c \
- --replace-fail 'return (rpmatch(resp) == 1);' "return (resp[0] == 'y');"
- # Add missing header for older SDKs.
- sed -e '1i #include ' -i w/proc_compare.c
- '';
+ # Update `/etc/locate.rc` paths to point to the store.
+ for path in locate/locate/locate.updatedb.8 locate/locate/locate.rc locate/locate/updatedb.sh; do
+ substituteInPlace $path --replace-fail '/etc/locate.rc' "$out/etc/locate.rc"
+ done
+ '';
env.NIX_CFLAGS_COMPILE = "-I${launchd}/liblaunch";
@@ -72,16 +49,13 @@ mkAppleDerivation {
pkg-config
];
- buildInputs =
- [
- libedit
- libresolv
- libsbuf
- libutil
- libxo
- ]
- # xargs needs `strtonum`, which was added in 11.0.
- ++ lib.optionals (lib.versionOlder (lib.getVersion apple-sdk) "11.0") [ libbsd ];
+ buildInputs = [
+ libedit
+ libresolv
+ libsbuf
+ libutil
+ libxo
+ ];
postInstall = ''
# Patch the shebangs to use `sh` from shell_cmds.
diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build.in
index 1d6647869cc6..f12b3fe41b92 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build.in
+++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build.in
@@ -76,17 +76,14 @@ install_man('accton/accton.8')
executable(
'arch',
- build_by_default : sdk_version.version_compare('>=11'),
dependencies : [ core_foundation ],
- install : sdk_version.version_compare('>=11'),
+ install : true,
sources : 'arch/arch.c',
)
-if sdk_version.version_compare('>=11')
- install_man(
- 'arch/arch.1',
- 'arch/machine.1',
- )
-endif
+install_man(
+ 'arch/arch.1',
+ 'arch/machine.1',
+)
executable(
'at',
@@ -192,8 +189,8 @@ install_man('fs_usage/fs_usage.1')
executable(
'gcore',
# Requires XPC private APIs
- build_by_default : false and sdk_version.version_compare('>=11'),
- install : false and sdk_version.version_compare('>=11'),
+ build_by_default : false,
+ install : false,
sources : [
'gcore/convert.c',
'gcore/corefile.c',
@@ -359,13 +356,10 @@ install_man('mkfile/mkfile.8')
executable(
'mslutil',
- build_by_default : sdk_version.version_compare('>=10.13'),
- install : sdk_version.version_compare('>=10.13'),
+ install : true,
sources : 'mslutil/mslutil.c',
)
-if sdk_version.version_compare('>=10.13')
- install_man('mslutil/mslutil.1')
-endif
+install_man('mslutil/mslutil.1')
executable(
'newgrp',
@@ -495,8 +489,8 @@ executable('shutdown',
executable(
'stackshot',
# Requires private entitlements
- build_by_default : false and sdk_version.version_compare('>=10.13'),
- install : false and sdk_version.version_compare('>=10.13'),
+ build_by_default : false,
+ install : false,
sources : 'stackshot/stackshot.c',
)
# No man pages for `stackshot`.
@@ -520,13 +514,10 @@ install_man(
executable(
'taskpolicy',
- build_by_default : sdk_version.version_compare('>=11'),
- install : sdk_version.version_compare('>=11'),
+ install : true,
sources : 'taskpolicy/taskpolicy.c',
)
-if sdk_version.version_compare('>=11')
- install_man('taskpolicy/taskpolicy.8')
-endif
+install_man('taskpolicy/taskpolicy.8')
executable(
'vifs',
@@ -546,13 +537,10 @@ executable(
install_man('vipw/vipw.8')
executable('vm_purgeable_stat',
- build_by_default : sdk_version.version_compare('>=11'),
- install : sdk_version.version_compare('>=11'),
+ install : true,
sources : 'vm_purgeable_stat/vm_purgeable_stat.c',
)
-if sdk_version.version_compare('>=11')
- install_man('vm_purgeable_stat/vm_purgeable_stat.1')
-endif
+install_man('vm_purgeable_stat/vm_purgeable_stat.1')
executable(
'vm_stat',
@@ -593,18 +581,15 @@ install_man('zic/zic.8')
executable(
'zlog',
- build_by_default : sdk_version.version_compare('>=11'),
c_args : '-DKERN_NOT_FOUND=56',
dependencies : [ core_foundation, core_symbolication ],
- install : sdk_version.version_compare('>=11'),
+ install : true,
sources : [
'zlog/SymbolicationHelper.c',
'zlog/zlog.c',
],
)
-if sdk_version.version_compare('>=11')
- install_man('zlog/zlog.1')
-endif
+install_man('zlog/zlog.1')
executable(
'zprint',
diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix
index b7239730e283..f4d1b83f8c29 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix
@@ -51,6 +51,9 @@ let
chmod -R u+w "$out/include/dispatch"
find "$out/include/dispatch" -name '*.h' -exec sed -i {} -e 's/, bridgeos([^)]*)//g' \;
+ install -D -t "$out/include/System/i386" \
+ '${xnu}/osfmk/i386/cpu_capabilities.h'
+
install -D -t "$out/include/kern" \
'${xnu}/osfmk/kern/debug.h'
@@ -81,11 +84,6 @@ mkAppleDerivation {
xcodeHash = "sha256-gdtn3zNIneZKy6+X0mQ51CFVLNM6JQYLbd/lotG5/Tw=";
- patches = [
- # Use availability checks to fall back to older APIs on older macOS versions.
- ./patches/0001-Add-availability-checks-to-vm_purgeable_stat.patch
- ];
-
postPatch = ''
# Replace hard-coded, impure system paths with the output path in the store.
sed -e "s|PATH=[^;]*|PATH='$out/bin'|" -i "pagesize/pagesize.sh"
diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/patches/0001-Add-availability-checks-to-vm_purgeable_stat.patch b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/patches/0001-Add-availability-checks-to-vm_purgeable_stat.patch
deleted file mode 100644
index 08e5b68cad8f..000000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/patches/0001-Add-availability-checks-to-vm_purgeable_stat.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 18a676bc44a8bc24374ab35a258a18049b56b6d4 Mon Sep 17 00:00:00 2001
-From: Randy Eckenrode
-Date: Mon, 2 Sep 2024 21:46:34 -0400
-Subject: [PATCH] Add availability checks to vm_purgeable_stat
-
----
- vm_purgeable_stat/vm_purgeable_stat.c | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/vm_purgeable_stat/vm_purgeable_stat.c b/vm_purgeable_stat/vm_purgeable_stat.c
-index 330704d..9d9041b 100644
---- a/vm_purgeable_stat/vm_purgeable_stat.c
-+++ b/vm_purgeable_stat/vm_purgeable_stat.c
-@@ -88,7 +88,11 @@ int get_task_from_pid(int pid, task_t *task)
- fprintf(stderr, "%s\n", PRIV_ERR_MSG);
- return -1;
- }
-- kr = task_inspect_for_pid(mach_task_self(), pid, task);
-+ if (__builtin_available(macOS 11.3, *)) {
-+ kr = task_inspect_for_pid(mach_task_self(), pid, task);
-+ } else {
-+ kr = task_for_pid(mach_task_self(), pid, task);
-+ }
- if (kr != KERN_SUCCESS) {
- fprintf(stderr, "Failed to get task port for pid: %d\n", pid);
- return -1;
-@@ -128,7 +132,11 @@ int get_system_tasks(task_array_t *tasks, mach_msg_type_number_t *count)
- vm_deallocate(mach_task_self(), (vm_address_t)psets, (vm_size_t)psetCount * sizeof(mach_port_t));
-
- /* convert the processor-set-priv to a list of tasks for the processor set */
-- ret = processor_set_tasks_with_flavor(pset_priv, TASK_FLAVOR_INSPECT, tasks, count);
-+ if (__builtin_available(macOS 11.0, *)) {
-+ ret = processor_set_tasks_with_flavor(pset_priv, TASK_FLAVOR_INSPECT, tasks, count);
-+ } else {
-+ ret = processor_set_tasks(pset_priv, tasks, count);
-+ }
- if (ret != KERN_SUCCESS) {
- fprintf(stderr, "processor_set_tasks_with_flavor() failed: %s\n", mach_error_string(ret));
- return -1;
---
-2.44.1
-
diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/meson.build.in
index 6f89b31236b4..c77ea6ef4ffe 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/meson.build.in
+++ b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/meson.build.in
@@ -18,7 +18,6 @@ fs = import('fs')
cc = meson.get_compiler('c')
bzip2 = dependency('bzip2')
-libbsd = dependency('libbsd-overlay', required : false)
libmd = dependency('libmd')
libresolv = cc.find_library('resolv')
libutil = cc.find_library('util')
@@ -81,7 +80,6 @@ install_man('cat/cat.1')
executable(
'col',
- dependencies : [ libbsd ],
install : true,
sources : [
'col/col.c',
@@ -316,7 +314,7 @@ executable(
executable(
'split',
- dependencies : [ libbsd, libutil ],
+ dependencies : [ libutil ],
install : true,
sources : [ 'split/split.c' ],
)
@@ -366,7 +364,6 @@ executable(
executable(
'uniq',
- dependencies : [ libbsd ],
install : true,
sources : [ 'uniq/uniq.c' ],
)
diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix
index e97ca8081b75..95867cad1186 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix
@@ -1,10 +1,8 @@
{
lib,
apple-sdk,
- apple-sdk_11,
apple-sdk_13,
bzip2,
- libbsd,
libmd,
libresolv,
libutil,
@@ -22,11 +20,9 @@ let
Libc = apple-sdk.sourceRelease "Libc";
Libc_13 = apple-sdk_13.sourceRelease "Libc";
- # The 10.12 SDK doesn’t have the files needed in the same places or possibly at all.
- # Just use the 11.0 SDK to make things easier.
- CommonCrypto = apple-sdk_11.sourceRelease "CommonCrypto";
- libplatform = apple-sdk_11.sourceRelease "libplatform";
- xnu = apple-sdk_11.sourceRelease "xnu";
+ CommonCrypto = apple-sdk.sourceRelease "CommonCrypto";
+ libplatform = apple-sdk.sourceRelease "libplatform";
+ xnu = apple-sdk.sourceRelease "xnu";
privateHeaders = stdenvNoCC.mkDerivation {
name = "text_cmds-deps-private-headers";
@@ -40,12 +36,6 @@ let
'${xnu}/libkern/os/base_private.h'
install -D -t "$out/include/CommonCrypto" \
'${CommonCrypto}/include/Private/CommonDigestSPI.h'
-
- # Prevent an error when using the old availability headers from the 10.12 SDK.
- substituteInPlace "$out/include/CommonCrypto/CommonDigestSPI.h" \
- --replace-fail 'API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.13), ios(5.0, 11.0))' "" \
- --replace-fail 'API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.15), ios(5.0, 13.0))' ""
- touch "$out/include/CrashReporterClient.h" # Needed by older SDK `os/assumes.h`
'';
};
in
@@ -59,10 +49,6 @@ mkAppleDerivation {
xcodeHash = "sha256-dZ+yJyfflhmUyx3gitRXC115QxS87SGC4/HjMa199Ts=";
- patches = lib.optionals (lib.versionOlder (lib.getVersion apple-sdk) "11.0") [
- ./patches/0001-Use-availability-check-for-__collate_lookup_l.patch
- ];
-
postPatch =
''
# Improve compatiblity with libmd in nixpkgs.
@@ -102,7 +88,7 @@ mkAppleDerivation {
ncurses
xz
zlib
- ] ++ lib.optionals (lib.versionOlder (lib.getVersion apple-sdk) "11.0") [ libbsd ];
+ ];
postInstall = ''
# Patch the shebangs to use `sh` from shell_cmds.
diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/patches/0001-Use-availability-check-for-__collate_lookup_l.patch b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/patches/0001-Use-availability-check-for-__collate_lookup_l.patch
deleted file mode 100644
index 55d24e5e27e6..000000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/patches/0001-Use-availability-check-for-__collate_lookup_l.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 11ad41c2d3af88b5cf85d4bc2f5388b65e5ff347 Mon Sep 17 00:00:00 2001
-From: Randy Eckenrode
-Date: Mon, 16 Sep 2024 12:42:59 -0400
-Subject: [PATCH] Use availability check for __collate_lookup_l
-
----
- tr/str.c | 17 +++++++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/tr/str.c b/tr/str.c
-index 6a79df2..8226abe 100644
---- a/tr/str.c
-+++ b/tr/str.c
-@@ -69,6 +69,7 @@ static void genseq(STR *);
- * Using libc internal function __collate_lookup_l for character
- * equivalence
- */
-+void __collate_lookup(const __darwin_wchar_t *, int *, int *, int *);
- void __collate_lookup_l(const __darwin_wchar_t *, int *, int *, int *,
- locale_t);
- /*
-@@ -255,7 +256,13 @@ genequiv(STR *s)
- */
- int tprim, tsec;
- int len;
-- __collate_lookup_l(s->equiv, &len, &tprim, &tsec, LC_GLOBAL_LOCALE);
-+ if (__builtin_available(macOS 11.0, *)) {
-+ __collate_lookup_l(s->equiv, &len, &tprim, &tsec, LC_GLOBAL_LOCALE);
-+ } else {
-+ locale_t old = uselocale(LC_GLOBAL_LOCALE);
-+ __collate_lookup(s->equiv, &len, &tprim, &tsec);
-+ uselocale(old);
-+ }
-
- if (tprim != -1) {
- for (p = 1, i = 1; i < NCHARS_SB; i++) {
-@@ -270,7 +277,13 @@ genequiv(STR *s)
- * perform lookup of primary weight and fill cache
- */
- int csec;
-- __collate_lookup_l((__darwin_wchar_t *)&i, &len, &cprim, &csec, LC_GLOBAL_LOCALE);
-+ if (__builtin_available(macOS 11.0, *)) {
-+ __collate_lookup_l((__darwin_wchar_t *)&i, &len, &cprim, &csec, LC_GLOBAL_LOCALE);
-+ } else {
-+ locale_t old = uselocale(LC_GLOBAL_LOCALE);
-+ __collate_lookup((__darwin_wchar_t *)&i, &len, &cprim, &csec);
-+ uselocale(old);
-+ }
- collation_weight_cache[i] = cprim;
- }
-
---
-2.46.0
-
diff --git a/pkgs/os-specific/darwin/apple-source-releases/top/package.nix b/pkgs/os-specific/darwin/apple-source-releases/top/package.nix
index f08b9efce1a2..35737d5f748b 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/top/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/top/package.nix
@@ -1,5 +1,5 @@
{
- apple-sdk_11,
+ apple-sdk,
fetchpatch2,
libutil,
mkAppleDerivation,
@@ -8,7 +8,7 @@
}:
let
- xnu = apple-sdk_11.sourceRelease "xnu";
+ xnu = apple-sdk.sourceRelease "xnu";
in
mkAppleDerivation {
releaseName = "top";
@@ -33,7 +33,6 @@ mkAppleDerivation {
'';
buildInputs = [
- apple-sdk_11
libutil
ncurses
];
diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix
index afaa91ca2f37..b0bd2c08082d 100644
--- a/pkgs/os-specific/linux/iptables/default.nix
+++ b/pkgs/os-specific/linux/iptables/default.nix
@@ -6,12 +6,12 @@
}:
stdenv.mkDerivation rec {
- version = "1.8.10";
+ version = "1.8.11";
pname = "iptables";
src = fetchurl {
url = "https://www.netfilter.org/projects/${pname}/files/${pname}-${version}.tar.xz";
- sha256 = "XMJVwYk1bjF9BwdVzpNx62Oht4PDRJj7jDAmTzzFnJw=";
+ sha256 = "2HMD1V74ySvK1N0/l4sm0nIBNkKwKUJXdfW60QCf57I=";
};
outputs = [ "out" "dev" "man" ];
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index b149b3f08d5c..054457edf256 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -111,12 +111,12 @@ let
in {
inherit makeLinuxHeaders;
- linuxHeaders = let version = "6.10"; in
+ linuxHeaders = let version = "6.12"; in
makeLinuxHeaders {
inherit version;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${version}.tar.xz";
- hash = "sha256-d0aYQi7lTF8ecERW83xlwGtRtOmosIZvNFgNhv744iY=";
+ hash = "sha256-saJWK+VuQq+z+EidTCp6xHKsIwmPHvHB5A2mAfVGJes=";
};
patches = [
./no-relocs.patch # for building x86 kernel headers on non-ELF platforms
diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix
index b690a19de29f..830464053a05 100644
--- a/pkgs/os-specific/linux/lvm2/common.nix
+++ b/pkgs/os-specific/linux/lvm2/common.nix
@@ -6,7 +6,7 @@
, coreutils
, libuuid
, libaio
-, substituteAll
+, replaceVars
, enableCmdlib ? false
, enableDmeventd ? false
, udevSupport ? !stdenv.hostPlatform.isStatic, udev
@@ -91,15 +91,15 @@ stdenv.mkDerivation rec {
patches = [
# fixes paths to and checks for tools
- (substituteAll (let
+ (replaceVars ./fix-blkdeactivate.patch (let
optionalTool = cond: pkg: if cond then pkg else "/run/current-system/sw";
in {
- src = ./fix-blkdeactivate.patch;
inherit coreutils;
util_linux = optionalTool enableUtilLinux util-linux;
mdadm = optionalTool enableMdadm mdadm;
multipath_tools = optionalTool enableMultipath multipath-tools;
vdo = optionalTool enableVDO vdo;
+ SBINDIR = null; # part of original source code in the patch's context
}))
./fix-stdio-usage.patch
];
diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix
index 37fc0a2e8a57..bd7f8ae61ec2 100644
--- a/pkgs/servers/nosql/mongodb/mongodb.nix
+++ b/pkgs/servers/nosql/mongodb/mongodb.nix
@@ -136,12 +136,12 @@ in stdenv.mkDerivation rec {
hardeningDisable = [ "fortify3" ];
preBuild = ''
- sconsFlags+=" CC=$CC"
- sconsFlags+=" CXX=$CXX"
+ appendToVar sconsFlags "CC=$CC"
+ appendToVar sconsFlags "CXX=$CXX"
'' + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
- sconsFlags+=" AR=$AR"
+ appendToVar sconsFlags "AR=$AR"
'' + lib.optionalString stdenv.hostPlatform.isAarch64 ''
- sconsFlags+=" CCFLAGS='-march=armv8-a+crc'"
+ appendToVar sconsFlags "CCFLAGS=-march=armv8-a+crc"
'';
preInstall = ''
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 76ce8d6b6dc9..921510a07f91 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -14,7 +14,7 @@ let
, bzip2, lz4, lzo, snappy, xz, zlib, zstd
, cracklib, judy, libevent, libxml2
, linux-pam, numactl
- , fmt_8
+ , fmt_11
, withStorageMroonga ? true, kytea, libsodium, msgpack, zeromq
, withStorageRocks ? true
, withEmbedded ? false
@@ -26,7 +26,7 @@ let
libExt = stdenv.hostPlatform.extensions.sharedLibrary;
- mytopEnv = buildPackages.perl.withPackages (p: with p; [ DBDmysql DBI TermReadKey ]);
+ mytopEnv = buildPackages.perl.withPackages (p: with p; [ DBDMariaDB DBI TermReadKey ]);
common = rec { # attributes common to both builds
inherit version;
@@ -149,7 +149,7 @@ let
];
buildInputs = common.buildInputs
- ++ lib.optionals (lib.versionAtLeast common.version "10.7") [ fmt_8 ];
+ ++ lib.optionals (lib.versionAtLeast common.version "10.11") [ fmt_11 ];
cmakeFlags = common.cmakeFlags ++ [
"-DPLUGIN_AUTH_PAM=NO"
@@ -179,7 +179,7 @@ let
++ lib.optionals stdenv.hostPlatform.isLinux [ linux-pam ]
++ lib.optional (!stdenv.hostPlatform.isDarwin) mytopEnv
++ lib.optionals withStorageMroonga [ kytea libsodium msgpack zeromq ]
- ++ lib.optionals (lib.versionAtLeast common.version "10.7") [ fmt_8 ];
+ ++ lib.optionals (lib.versionAtLeast common.version "10.11") [ fmt_11 ];
propagatedBuildInputs = lib.optional withNuma numactl;
diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix
index e4427a495680..de8036a55bcc 100644
--- a/pkgs/servers/sql/mysql/8.0.x.nix
+++ b/pkgs/servers/sql/mysql/8.0.x.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-At/ZQ/lnQvf5zXiFWzJwjqTfVIycFK+Sc4F/O72dIrI=";
};
- nativeBuildInputs = [ bison cmake pkg-config ]
+ nativeBuildInputs = [ bison cmake pkg-config protobuf ]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ];
patches = [
@@ -34,6 +34,8 @@ stdenv.mkDerivation (finalAttrs: {
cctools CoreServices developer_cmds DarwinTools
];
+ strictDeps = true;
+
outputs = [ "out" "static" ];
cmakeFlags = [
diff --git a/pkgs/servers/sql/postgresql/13.nix b/pkgs/servers/sql/postgresql/13.nix
index 56db6b090804..72a8dd8bb392 100644
--- a/pkgs/servers/sql/postgresql/13.nix
+++ b/pkgs/servers/sql/postgresql/13.nix
@@ -1,6 +1,6 @@
import ./generic.nix {
- version = "13.17";
- hash = "sha256-AisKbnvDdKd37s4zcIiV17YMrgfUkrKGspaknXOV14s=";
+ version = "13.18";
+ hash = "sha256-zuqSq+4qjBlAjSeLaN5qeLa9PbtPotZT+nynRdZmqrE=";
muslPatches = {
disable-test-collate-icu-utf8 = {
url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b";
diff --git a/pkgs/servers/sql/postgresql/14.nix b/pkgs/servers/sql/postgresql/14.nix
index 02292b9a18fb..e5011f5314ca 100644
--- a/pkgs/servers/sql/postgresql/14.nix
+++ b/pkgs/servers/sql/postgresql/14.nix
@@ -1,6 +1,6 @@
import ./generic.nix {
- version = "14.14";
- hash = "sha256-hHJ/vM29Hv4B2N5kvBszCV23c60kV8787cLYJY68CdY=";
+ version = "14.15";
+ hash = "sha256-AuiR4xS06e4ky9eAKNq3xz+cG6PjCDW8vvcf4iBAH8U=";
muslPatches = {
disable-test-collate-icu-utf8 = {
url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7";
diff --git a/pkgs/servers/sql/postgresql/15.nix b/pkgs/servers/sql/postgresql/15.nix
index 85a128fbfb13..bf17a088f2bd 100644
--- a/pkgs/servers/sql/postgresql/15.nix
+++ b/pkgs/servers/sql/postgresql/15.nix
@@ -1,6 +1,6 @@
import ./generic.nix {
- version = "15.9";
- hash = "sha256-dPLUVlA18M9ynssFmUn6rxECy9k3WbNZgi+Y+CGYx4M=";
+ version = "15.10";
+ hash = "sha256-VavnONRB8OWGWLPsb4gJenE7XjtzE59iMNe1xMOJ5XM=";
muslPatches = {
dont-use-locale-a = {
url = "https://git.alpinelinux.org/aports/plain/main/postgresql15/dont-use-locale-a-on-musl.patch?id=f424e934e6d076c4ae065ce45e734aa283eecb9c";
diff --git a/pkgs/servers/sql/postgresql/16.nix b/pkgs/servers/sql/postgresql/16.nix
index d8322f42d387..fd1957b89386 100644
--- a/pkgs/servers/sql/postgresql/16.nix
+++ b/pkgs/servers/sql/postgresql/16.nix
@@ -1,6 +1,6 @@
import ./generic.nix {
- version = "16.5";
- hash = "sha256-psu7cDf5jLivp9OXC3xIBAzwKxFeOSU6DAN6i7jnePA=";
+ version = "16.6";
+ hash = "sha256-Izac2szUUnCsXcww+p2iBdW+M/pQXh8XoEGNLK7KR3s=";
muslPatches = {
dont-use-locale-a = {
url = "https://git.alpinelinux.org/aports/plain/main/postgresql16/dont-use-locale-a-on-musl.patch?id=08a24be262339fd093e641860680944c3590238e";
diff --git a/pkgs/servers/sql/postgresql/17.nix b/pkgs/servers/sql/postgresql/17.nix
index 07335b44570b..34d2ddeccb27 100644
--- a/pkgs/servers/sql/postgresql/17.nix
+++ b/pkgs/servers/sql/postgresql/17.nix
@@ -1,6 +1,6 @@
import ./generic.nix {
- version = "17.1";
- hash = "sha256-eEnbdO9qhVXQcj+H6BU5MBQi+pyOnyHM5h/cFOkZnc0=";
+ version = "17.2";
+ hash = "sha256-gu8nwK83UWldf2Ti2WNYMAX7tqDD32PQ5LQiEdcCEWQ=";
muslPatches = {
dont-use-locale-a = {
url = "https://git.alpinelinux.org/aports/plain/main/postgresql17/dont-use-locale-a-on-musl.patch?id=d69ead2c87230118ae7f72cef7d761e761e1f37e";
diff --git a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix
index 46b5fac3852b..23bccca34ab2 100644
--- a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix
+++ b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, postgresql, boost182, postgresqlTestExtension, buildPostgresqlExtension }:
+{ stdenv, lib, fetchFromGitHub, postgresql, boost, postgresqlTestExtension, buildPostgresqlExtension }:
let
version = "1.7.0";
@@ -28,7 +28,7 @@ buildPostgresqlExtension (finalAttrs: {
sourceRoot = main_src.name;
- buildInputs = [ boost182 ];
+ buildInputs = [ boost ];
patchPhase = ''
runHook prePatch
diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix
index 673ddf4b9eac..1611fe05600e 100644
--- a/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -89,14 +89,6 @@ buildPostgresqlExtension (finalAttrs: {
"--disable-extension-upgrades-install"
];
- postConfigure = ''
- mkdir -p $out/bin
-
- # postgis' build system assumes it is being installed to the same place as postgresql, and looks
- # for the postgres binary relative to $PREFIX. We gently support this system using an illusion.
- ln -s ${postgresql}/bin/postgres $out/bin/postgres
- '';
-
makeFlags = [
"PERL=${perl}/bin/perl"
];
@@ -111,9 +103,6 @@ buildPostgresqlExtension (finalAttrs: {
# create aliases for all commands adding version information
postInstall = ''
- # Teardown the illusory postgres used for building; see postConfigure.
- rm $out/bin/postgres
-
for prog in $out/bin/*; do # */
ln -s $prog $prog-${finalAttrs.version}
done
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index af643c6c0e2b..1cf030c64951 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -1,34 +1,106 @@
let
generic =
- # dependencies
- { stdenv, lib, fetchurl, fetchpatch, makeWrapper
- , glibc, zlib, readline, openssl, icu, lz4, zstd, systemdLibs, libuuid
- , pkg-config, libxml2, tzdata, libkrb5, substituteAll, darwin
- , linux-pam, bison, flex, perl, docbook_xml_dtd_45, docbook-xsl-nons, libxslt
-
- , removeReferencesTo, writeShellScriptBin
-
- , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs
- , gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic
-
- # for postgresql.pkgs
- , self, newScope, buildEnv
- , stdenvNoCC, postgresqlTestHook
+ # utils
+ { stdenv
+ , fetchpatch
+ , fetchurl
+ , lib
+ , substituteAll
+ , writeShellScriptBin
# source specification
- , version, hash, muslPatches ? {}
+ , hash
+ , muslPatches ? {}
+ , version
- # for tests
- , testers, nixosTests
+ # runtime dependencies
+ , darwin
+ , glibc
+ , libuuid
+ , libxml2
+ , lz4
+ , openssl
+ , readline
+ , tzdata
+ , zlib
+ , zstd
+
+ # build dependencies
+ , bison
+ , docbook-xsl-nons
+ , docbook_xml_dtd_45
+ , flex
+ , libxslt
+ , makeWrapper
+ , pkg-config
+ , removeReferencesTo
+
+ # passthru
+ , buildEnv
+ , newScope
+ , nixosTests
+ , postgresqlTestHook
+ , self
+ , stdenvNoCC
+ , testers
+
+ # bonjour
+ , bonjourSupport ? false
+
+ # GSSAPI
+ , gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic
+ , libkrb5
+
+ # icu
+ # Building with icu in pkgsStatic gives tons of "undefined reference" errors like this:
+ # /nix/store/452lkaak37d3mzzn3p9ak7aa3wzhdqaj-icu4c-74.2-x86_64-unknown-linux-musl/lib/libicuuc.a(chariter.ao):
+ # (.data.rel.ro._ZTIN6icu_7417CharacterIteratorE[_ZTIN6icu_7417CharacterIteratorE]+0x0):
+ # undefined reference to `vtable for __cxxabiv1::__si_class_type_info'
+ , icuSupport ? !stdenv.hostPlatform.isStatic
+ , icu
# JIT
- , jitSupport
- , nukeReferences, llvmPackages, overrideCC
+ , jitSupport # not default on purpose, this is set via "_jit or not" attributes
+ , llvmPackages
+ , nukeReferences
+ , overrideCC
+
+ # LDAP
+ , ldapSupport ? false
+ , openldap
+
+ # NLS
+ , nlsSupport ? false
+ , gettext
+
+ # PAM
+ # Building with linux-pam in pkgsStatic gives a few "undefined reference" errors like this:
+ # /nix/store/3s55icpsbc36sgn7sa8q3qq4z6al6rlr-linux-pam-static-x86_64-unknown-linux-musl-1.6.1/lib/libpam.a(pam_audit.o):
+ # in function `pam_modutil_audit_write':(.text+0x571):
+ # undefined reference to `audit_close'
+ , pamSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isStatic
+ , linux-pam
+
+ # PL/Perl
+ , perlSupport ? false
+ , perl
# PL/Python
, pythonSupport ? false
, python3
+
+ # PL/Tcl
+ , tclSupport ? false
+ , tcl
+
+ # SELinux
+ , selinuxSupport ? false
+ , libselinux
+
+ # Systemd
+ , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs
+ , systemdLibs
} @args:
let
atLeast = lib.versionAtLeast version;
@@ -68,40 +140,46 @@ let
disallowedReferences = [ "dev" "doc" "man" ];
disallowedRequisites = [
stdenv'.cc
+ llvmPackages.llvm.out
] ++ (
map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs)
- ) ++ lib.optionals jitSupport [
- llvmPackages.llvm.out
- ];
+ );
};
outputChecks.lib = {
disallowedReferences = [ "out" "dev" "doc" "man" ];
disallowedRequisites = [
stdenv'.cc
+ llvmPackages.llvm.out
] ++ (
map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs)
- ) ++ lib.optionals jitSupport [
- llvmPackages.llvm.out
- ];
+ );
};
+ strictDeps = true;
+
buildInputs = [
zlib
readline
openssl
(libxml2.override {enableHttp = true;})
- icu
libuuid
]
+ ++ lib.optionals icuSupport [ icu ]
++ lib.optionals jitSupport [ llvmPackages.llvm ]
++ lib.optionals lz4Enabled [ lz4 ]
++ lib.optionals zstdEnabled [ zstd ]
++ lib.optionals systemdSupport [ systemdLibs ]
++ lib.optionals pythonSupport [ python3 ]
++ lib.optionals gssSupport [ libkrb5 ]
- ++ lib.optionals stdenv'.hostPlatform.isLinux [ linux-pam ];
+ ++ lib.optionals pamSupport [ linux-pam ]
+ ++ lib.optionals perlSupport [ perl ]
+ ++ lib.optionals ldapSupport [ openldap ]
+ ++ lib.optionals tclSupport [ tcl ]
+ ++ lib.optionals selinuxSupport [ libselinux ]
+ ++ lib.optionals nlsSupport [ gettext ];
nativeBuildInputs = [
+ libxml2
makeWrapper
pkg-config
removeReferencesTo
@@ -123,10 +201,10 @@ let
env.CFLAGS = "-fdata-sections -ffunction-sections"
+ (if stdenv'.cc.isClang then " -flto" else " -fmerge-constants -Wl,--gc-sections");
- configureFlags = [
+ configureFlags = let inherit (lib) withFeature; in [
"--with-openssl"
"--with-libxml"
- "--with-icu"
+ (withFeature icuSupport "icu")
"--sysconfdir=/etc"
"--with-system-tzdata=${tzdata}/share/zoneinfo"
"--enable-debug"
@@ -137,11 +215,15 @@ let
++ lib.optionals gssSupport [ "--with-gssapi" ]
++ lib.optionals pythonSupport [ "--with-python" ]
++ lib.optionals jitSupport [ "--with-llvm" ]
- ++ lib.optionals stdenv'.hostPlatform.isLinux [ "--with-pam" ]
- # This could be removed once the upstream issue is resolved:
- # https://postgr.es/m/flat/427c7c25-e8e1-4fc5-a1fb-01ceff185e5b%40technowledgy.de
- ++ lib.optionals (stdenv'.hostPlatform.isDarwin && atLeast "16") [ "LDFLAGS_EX_BE=-Wl,-export_dynamic" ]
- ++ lib.optionals (atLeast "17") [ "--without-perl" ];
+ ++ lib.optionals pamSupport [ "--with-pam" ]
+ # This can be removed once v17 is removed. v18+ ships with it.
+ ++ lib.optionals (stdenv'.hostPlatform.isDarwin && atLeast "16" && olderThan "18") [ "LDFLAGS_EX_BE=-Wl,-export_dynamic" ]
+ ++ lib.optionals (atLeast "17" && !perlSupport) [ "--without-perl" ]
+ ++ lib.optionals ldapSupport [ "--with-ldap" ]
+ ++ lib.optionals tclSupport [ "--with-tcl" ]
+ ++ lib.optionals selinuxSupport [ "--with-selinux" ]
+ ++ lib.optionals nlsSupport [ "--enable-nls" ]
+ ++ lib.optionals bonjourSupport [ "--with-bonjour" ];
patches = [
(if atLeast "16" then ./patches/relative-to-symlinks-16+.patch else ./patches/relative-to-symlinks.patch)
@@ -190,7 +272,7 @@ let
# because there is a realistic use-case for extensions to locate the /lib directory to
# load other shared modules.
remove-references-to -t "$dev" -t "$doc" -t "$man" "$out/bin/postgres"
-
+ '' + lib.optionalString (!stdenv'.hostPlatform.isStatic) ''
if [ -z "''${dontDisableStatic:-}" ]; then
# Remove static libraries in case dynamic are available.
for i in $lib/lib/*.a; do
@@ -201,6 +283,7 @@ let
fi
done
fi
+ '' + ''
# The remaining static libraries are libpgcommon.a, libpgport.a and related.
# Those are only used when building e.g. extensions, so go to $dev.
moveToOutput "lib/*.a" "$dev"
@@ -210,6 +293,12 @@ let
# Stop lib depending on the -dev output of llvm
remove-references-to -t ${llvmPackages.llvm.dev} "$out/lib/llvmjit${dlSuffix}"
+ '' + lib.optionalString stdenv'.hostPlatform.isDarwin ''
+ # The darwin specific Makefile for PGXS contains a reference to the postgres
+ # binary. Some extensions (here: postgis), which are able to set bindir correctly
+ # to their own output for installation, will then fail to find "postgres" during linking.
+ substituteInPlace "$dev/lib/pgxs/src/Makefile.port" \
+ --replace-fail '-bundle_loader $(bindir)/postgres' "-bundle_loader $out/bin/postgres"
'';
postFixup = lib.optionalString stdenv'.hostPlatform.isGnu
@@ -218,9 +307,13 @@ let
wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin
'';
- doCheck = !stdenv'.hostPlatform.isDarwin;
- # autodetection doesn't seem to able to find this, but it's there.
- checkTarget = "check-world";
+ # Running tests as "install check" to work around SIP issue on macOS:
+ # https://www.postgresql.org/message-id/flat/4D8E1BC5-BBCF-4B19-8226-359201EA8305%40gmail.com
+ # Also see /doc/stdenv/platform-notes.chapter.md
+ doCheck = false;
+ # Tests just get stuck on macOS 14.x for v13 and v14
+ doInstallCheck = !(stdenv'.hostPlatform.isDarwin && olderThan "15") && !(stdenv'.hostPlatform.isStatic);
+ installCheckTarget = "check-world";
passthru = let
this = self.callPackage generic args;
diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh
index 833acf43a5b0..1ed163690f89 100644
--- a/pkgs/servers/x11/xorg/builder.sh
+++ b/pkgs/servers/x11/xorg/builder.sh
@@ -21,14 +21,14 @@ postInstall() {
for p in "${pkgsHostHost[@]}" "${pkgsHostTarget[@]}"; do
if test -e $p/lib/pkgconfig/$r.pc; then
echo " found requisite $r in $p"
- propagatedBuildInputs+=" $p"
+ appendToVar propagatedBuildInputs "$p"
fi
done
done
}
-installFlags="appdefaultdir=$out/share/X11/app-defaults $installFlags"
+prependToVar installFlags "appdefaultdir=$out/share/X11/app-defaults"
if test -n "$x11BuildHook"; then
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 3cb95ad14bc2..912f70e3b39d 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1238,11 +1238,11 @@ self: with self; {
# THIS IS A GENERATED FILE. DO NOT EDIT!
libXcursor = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes, libXrender, testers }: stdenv.mkDerivation (finalAttrs: {
pname = "libXcursor";
- version = "1.2.2";
+ version = "1.2.3";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/lib/libXcursor-1.2.2.tar.xz";
- sha256 = "1vl87819mnhlbnccchysv9nmax4abil5x3cr61x52vn55jyp3l2k";
+ url = "mirror://xorg/individual/lib/libXcursor-1.2.3.tar.xz";
+ sha256 = "1h62narayrhrkqalrmx7z3s6yppw1acbp5id3skrvrygshnl1sgx";
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index ee5e5282ea7e..71b5b18de3f2 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -178,7 +178,7 @@ mirror://xorg/individual/lib/libXau-1.0.11.tar.xz
mirror://xorg/individual/lib/libXaw-1.0.16.tar.xz
mirror://xorg/individual/lib/libxcb-1.17.0.tar.xz
mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz
-mirror://xorg/individual/lib/libXcursor-1.2.2.tar.xz
+mirror://xorg/individual/lib/libXcursor-1.2.3.tar.xz
mirror://xorg/individual/lib/libxcvt-0.1.2.tar.xz
mirror://xorg/individual/lib/libXdamage-1.1.6.tar.xz
mirror://xorg/individual/lib/libXdmcp-1.1.5.tar.xz
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index e6bad23bfacd..6cc22dd8bb0d 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -28,14 +28,7 @@ assert crossSystem == localSystem;
let
inherit (localSystem) system;
- sdkMajorVersion =
- let
- inherit (localSystem) darwinSdkVersion;
- in
- if lib.versionOlder darwinSdkVersion "11" then
- lib.versions.majorMinor darwinSdkVersion
- else
- lib.versions.major darwinSdkVersion;
+ sdkMajorVersion = lib.versions.major localSystem.darwinSdkVersion;
commonImpureHostDeps = [
"/bin/sh"
@@ -678,8 +671,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
self = self.python3-bootstrap;
pythonAttr = "python3-bootstrap";
enableLTO = false;
- # Workaround for ld64 crashes on x86_64-darwin. Remove after 11.0 is made the default.
- inherit (prevStage) apple-sdk_11;
};
scons = super.scons.override { python3Packages = self.python3.pkgs; };
@@ -692,12 +683,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
postLinkSignHook = prevStage.darwin.postLinkSignHook.override { inherit (selfDarwin) sigtool; };
- adv_cmds = superDarwin.adv_cmds.override {
- # Break an infinite recursion between CMake and libtapi. CMake requires adv_cmds.ps, and adv_cmds
- # requires a newer SDK that requires libtapi to build, which requires CMake.
- inherit (prevStage) apple-sdk_11;
- };
-
# Rewrap binutils with the real libSystem
binutils = superDarwin.binutils.override {
inherit (self) coreutils;
@@ -1296,24 +1281,32 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
}
);
}
- (lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) (
- (bintoolsPackages prevStage)
+ # These have to be dropped from the overlay when cross-compiling. Wrappers are obviously target-specific.
+ # darwin.binutils is not yet ready to be target-independent.
+ (
+ lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) (bintoolsPackages prevStage)
// {
inherit (prevStage.llvmPackages) clang;
- # Need to get rid of these when cross-compiling.
- "llvmPackages_${lib.versions.major prevStage.llvmPackages.release_version}" =
- let
- llvmVersion = lib.versions.major prevStage.llvmPackages.release_version;
- tools = super."llvmPackages_${llvmVersion}".tools.extend (
- _: _: llvmToolsPackages prevStage // { inherit (prevStage.llvmPackages) clang; }
- );
- libraries = super."llvmPackages_${llvmVersion}".libraries.extend (
- _: _: llvmLibrariesPackages prevStage
- );
- in
- super."llvmPackages_${llvmVersion}" // { inherit tools libraries; } // tools // libraries;
}
- ))
+ )
+ # Since LLVM should be the same regardless of target platform, overlay it to avoid an unnecessary
+ # rebuild when cross-compiling from Darwin to another platform using clang.
+ {
+
+ "llvmPackages_${lib.versions.major prevStage.llvmPackages.release_version}" =
+ let
+ llvmVersion = lib.versions.major prevStage.llvmPackages.release_version;
+ tools = super."llvmPackages_${llvmVersion}".tools.extend (_: _: llvmToolsPackages prevStage);
+ libraries = super."llvmPackages_${llvmVersion}".libraries.extend (
+ _: _:
+ llvmLibrariesPackages prevStage
+ // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) {
+ inherit (prevStage.llvmPackages) clang;
+ }
+ );
+ in
+ super."llvmPackages_${llvmVersion}" // { inherit tools libraries; } // tools // libraries;
+ }
];
};
}
diff --git a/pkgs/stdenv/darwin/override-sdk.nix b/pkgs/stdenv/darwin/override-sdk.nix
index 243b8e2633d7..482c11ce0cb2 100644
--- a/pkgs/stdenv/darwin/override-sdk.nix
+++ b/pkgs/stdenv/darwin/override-sdk.nix
@@ -9,33 +9,23 @@
stdenv: sdkVersion:
let
- newVersion = {
- inherit (stdenv.hostPlatform) darwinMinVersion darwinSdkVersion;
- } // (if lib.isAttrs sdkVersion then sdkVersion else { darwinSdkVersion = sdkVersion; });
-
- inherit (newVersion) darwinMinVersion darwinSdkVersion;
-
- sdkMapping = {
- "11.0" = pkgsHostTarget.apple-sdk_11;
- "12.3" = pkgsHostTarget.apple-sdk_12;
- };
-
- minVersionHook = pkgsHostTarget.darwinMinVersionHook darwinMinVersion;
-
- resolvedSdk =
- sdkMapping.${darwinSdkVersion} or (lib.throw ''
- `overrideSDK` and `darwin.apple_sdk_11_0.callPackage` are deprecated.
- Only the 11.0 and 12.3 SDKs are supported using them. Please use
- the versioned `apple-sdk` variants to use other SDK versions.
-
- See the stdenv documentation for how to use `apple-sdk`.
- '');
+ darwinSdkVersion =
+ if lib.isAttrs sdkVersion then sdkVersion.darwinSdkVersion or "11.0" else sdkVersion;
in
+assert lib.assertMsg (darwinSdkVersion == "11.0" || darwinSdkVersion == "12.3") ''
+ `overrideSDK` and `darwin.apple_sdk_11_0.callPackage` are deprecated.
+ Only the 11.0 and 12.3 SDKs are supported using them. Please use
+ the versioned `apple-sdk` variants to use other SDK versions.
+
+ See the stdenv documentation for how to use `apple-sdk`.
+'';
stdenv.override (old: {
mkDerivationFromStdenv = extendMkDerivationArgs old (args: {
buildInputs =
args.buildInputs or [ ]
- ++ lib.optional (stdenv.hostPlatform.darwinMinVersion != darwinMinVersion) minVersionHook
- ++ lib.optional (stdenv.hostPlatform.darwinSdkVersion != darwinSdkVersion) resolvedSdk;
+ ++ lib.optional (darwinSdkVersion == "12.3") pkgsHostTarget.apple-sdk_12
+ ++ lib.optional (sdkVersion ? darwinMinVersion) (
+ pkgsHostTarget.darwinMinVersionHook sdkVersion.darwinMinVersion
+ );
});
})
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index c4e4bd930936..8e85deb72046 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -134,6 +134,8 @@ let
"__darwinAllowLocalNetworking"
"__impureHostDeps" "__propagatedImpureHostDeps"
"sandboxProfile" "propagatedSandboxProfile"
+ "disallowedReferences" "disallowedRequisites"
+ "allowedReferences" "allowedRequisites"
];
# Turn a derivation into its outPath without a string context attached.
@@ -143,6 +145,42 @@ let
then builtins.unsafeDiscardStringContext drv.outPath
else drv;
+ makeOutputChecks = attrs:
+ # If we use derivations directly here, they end up as build-time dependencies.
+ # This is especially problematic in the case of disallowed*, since the disallowed
+ # derivations will be built by nix as build-time dependencies, while those
+ # derivations might take a very long time to build, or might not even build
+ # successfully on the platform used.
+ # We can improve on this situation by instead passing only the outPath,
+ # without an attached string context, to nix. The out path will be a placeholder
+ # which will be replaced by the actual out path if the derivation in question
+ # is part of the final closure (and thus needs to be built). If it is not
+ # part of the final closure, then the placeholder will be passed along,
+ # but in that case we know for a fact that the derivation is not part of the closure.
+ # This means that passing the out path to nix does the right thing in either
+ # case, both for disallowed and allowed references/requisites, and we won't
+ # build the derivation if it wouldn't be part of the closure, saving time and resources.
+ # While the problem is less severe for allowed*, since we want the derivation
+ # to be built eventually, we would still like to get the error early and without
+ # having to wait while nix builds a derivation that might not be used.
+ # See also https://github.com/NixOS/nix/issues/4629
+ optionalAttrs (attrs ? disallowedReferences) {
+ disallowedReferences =
+ map unsafeDerivationToUntrackedOutpath attrs.disallowedReferences;
+ } //
+ optionalAttrs (attrs ? disallowedRequisites) {
+ disallowedRequisites =
+ map unsafeDerivationToUntrackedOutpath attrs.disallowedRequisites;
+ } //
+ optionalAttrs (attrs ? allowedReferences) {
+ allowedReferences =
+ mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedReferences;
+ } //
+ optionalAttrs (attrs ? allowedRequisites) {
+ allowedRequisites =
+ mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedRequisites;
+ };
+
makeDerivationArgument =
@@ -455,40 +493,16 @@ else let
"/bin/sh"
];
__propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps;
- }) //
- # If we use derivations directly here, they end up as build-time dependencies.
- # This is especially problematic in the case of disallowed*, since the disallowed
- # derivations will be built by nix as build-time dependencies, while those
- # derivations might take a very long time to build, or might not even build
- # successfully on the platform used.
- # We can improve on this situation by instead passing only the outPath,
- # without an attached string context, to nix. The out path will be a placeholder
- # which will be replaced by the actual out path if the derivation in question
- # is part of the final closure (and thus needs to be built). If it is not
- # part of the final closure, then the placeholder will be passed along,
- # but in that case we know for a fact that the derivation is not part of the closure.
- # This means that passing the out path to nix does the right thing in either
- # case, both for disallowed and allowed references/requisites, and we won't
- # build the derivation if it wouldn't be part of the closure, saving time and resources.
- # While the problem is less severe for allowed*, since we want the derivation
- # to be built eventually, we would still like to get the error early and without
- # having to wait while nix builds a derivation that might not be used.
- # See also https://github.com/NixOS/nix/issues/4629
- optionalAttrs (attrs ? disallowedReferences) {
- disallowedReferences =
- map unsafeDerivationToUntrackedOutpath attrs.disallowedReferences;
- } //
- optionalAttrs (attrs ? disallowedRequisites) {
- disallowedRequisites =
- map unsafeDerivationToUntrackedOutpath attrs.disallowedRequisites;
- } //
- optionalAttrs (attrs ? allowedReferences) {
- allowedReferences =
- mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedReferences;
- } //
- optionalAttrs (attrs ? allowedRequisites) {
- allowedRequisites =
- mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedRequisites;
+ }) // lib.optionalAttrs (!__structuredAttrs) (
+ makeOutputChecks attrs
+ ) // lib.optionalAttrs (__structuredAttrs) {
+ outputChecks = builtins.listToAttrs (map (name: {
+ inherit name;
+ value = lib.zipAttrsWith (_: builtins.concatLists) [
+ (makeOutputChecks attrs)
+ (makeOutputChecks attrs.outputChecks.${name} or {})
+ ];
+ }) outputs);
};
in
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 72fdbef981da..79997237482f 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -432,6 +432,11 @@ concatTo() {
# $ flags=("lorem ipsum" "dolor" "sit amet")
# $ concatStringsSep ";" flags
# lorem ipsum;dolor;sit amet
+#
+# Also supports multi-character separators;
+# $ flags=("lorem ipsum" "dolor" "sit amet")
+# $ concatStringsSep " and " flags
+# lorem ipsum and dolor and sit amet
concatStringsSep() {
local sep="$1"
local name="$2"
@@ -443,11 +448,15 @@ concatStringsSep() {
echo "concatStringsSep(): ERROR: trying to use concatStringsSep on an associative array." >&2
return 1 ;;
-a*)
- local IFS="$sep"
- echo -n "${nameref[*]}" ;;
+ # \036 is the "record separator" character. We assume that this will never need to be part of
+ # an argument string we create here. If anyone ever hits this limitation: Feel free to refactor.
+ local IFS=$'\036' ;;
*)
- echo -n "${nameref// /"${sep}"}" ;;
+ local IFS=" " ;;
+
esac
+ local ifs_separated="${nameref[*]}"
+ echo -n "${ifs_separated//"$IFS"/"$sep"}"
fi
}
@@ -1211,7 +1220,7 @@ _defaultUnpack() {
# We can't preserve hardlinks because they may have been
# introduced by store optimization, which might break things
# in the build.
- cp -pr --reflink=auto -- "$fn" "$destination"
+ cp -r --preserve=mode,timestamps --reflink=auto -- "$fn" "$destination"
else
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index b8111f34e30a..e5a225f15838 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -385,6 +385,9 @@ in
configureFlags = (a.configureFlags or []) ++ [
"--with-native-system-header-dir=/include"
"--with-build-sysroot=${lib.getDev self.stdenv.cc.libc}"
+ # Don't assume that `gettext` was built with iconv support, since we don't have
+ # our own `glibc` yet.
+ "--disable-nls"
];
# This is a separate phase because gcc assembles its phase scripts
@@ -507,7 +510,7 @@ in
overrides = self: super: rec {
inherit (prevStage)
ccWrapperStdenv
- binutils coreutils gnugrep gettext
+ binutils coreutils gnugrep
perl patchelf linuxHeaders gnum4 bison libidn2 libunistring libxcrypt;
# We build a special copy of libgmp which doesn't use libstdc++, because
# xgcc++'s libstdc++ references the bootstrap-files (which is what
diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix
index 9f477ccdc3b3..22991e0dc07d 100644
--- a/pkgs/test/cc-wrapper/default.nix
+++ b/pkgs/test/cc-wrapper/default.nix
@@ -8,7 +8,7 @@ let
|| (stdenv.cc.isGNU && stdenv.hostPlatform.isLinux)
);
staticLibc = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "-L ${glibc.static}/lib";
- emulator = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) (stdenv.hostPlatform.emulator buildPackages);
+ emulator = stdenv.hostPlatform.emulator buildPackages;
isCxx = stdenv.cc.libcxx != null;
libcxxStdenvSuffix = lib.optionalString isCxx "-libcxx";
CC = "PATH= ${lib.getExe' stdenv.cc "${stdenv.cc.targetPrefix}cc"}";
diff --git a/pkgs/test/replace-vars/default.nix b/pkgs/test/replace-vars/default.nix
index 76dc81de49c8..115836ba22ed 100644
--- a/pkgs/test/replace-vars/default.nix
+++ b/pkgs/test/replace-vars/default.nix
@@ -69,6 +69,49 @@ in
# Shouldn't see the "cannot detect" version.
! grep -q -F "cannot detect due to space" $failed/testBuildFailure.log
+ touch $out
+ '';
+
+ replaceVars-succeeds-with-exemption = testEqualContents {
+ assertion = "replaceVars-succeeds-with-exemption";
+ actual = replaceVars ./source.txt {
+ free = "free";
+ "equal in" = "are the same in";
+ brotherhood = null;
+ };
+
+ expected = builtins.toFile "expected" ''
+ All human beings are born free and are the same in dignity and rights.
+ They are endowed with reason and conscience and should act towards
+ one another in a spirit of @brotherhood@.
+
+ -- eroosevelt@humanrights.un.org
+ '';
+ };
+
+ replaceVars-fails-in-check-phase-with-exemption =
+ runCommand "replaceVars-fails-with-exemption"
+ {
+ failed =
+ let
+ src = builtins.toFile "source.txt" ''
+ @a@
+ @b@
+ @c@
+ '';
+ in
+ testBuildFailure (
+ replaceVars src {
+ a = "a";
+ b = null;
+ }
+ );
+ }
+ ''
+ grep -e "unsubstituted Nix identifiers.*source.txt" $failed/testBuildFailure.log
+ grep -F "@c@" $failed/testBuildFailure.log
+ ! grep -F "@b@" $failed/testBuildFailure.log
+
touch $out
'';
}
diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix
index d8f11f98e9b8..cd333ccf04be 100644
--- a/pkgs/test/stdenv/default.nix
+++ b/pkgs/test/stdenv/default.nix
@@ -161,6 +161,14 @@ let
arrayWithSep="$(concatStringsSep "&" array)"
[[ "$arrayWithSep" == "lorem ipsum&dolor&sit amet" ]] || (echo "'\$arrayWithSep' was not 'lorem ipsum&dolor&sit amet'" && false)
+ array=("lorem ipsum" "dolor" "sit amet")
+ arrayWithSep="$(concatStringsSep "++" array)"
+ [[ "$arrayWithSep" == "lorem ipsum++dolor++sit amet" ]] || (echo "'\$arrayWithSep' was not 'lorem ipsum++dolor++sit amet'" && false)
+
+ array=("lorem ipsum" "dolor" "sit amet")
+ arrayWithSep="$(concatStringsSep " and " array)"
+ [[ "$arrayWithSep" == "lorem ipsum and dolor and sit amet" ]] || (echo "'\$arrayWithSep' was not 'lorem ipsum and dolor and sit amet'" && false)
+
touch $out
'';
};
diff --git a/pkgs/tools/cd-dvd/cdrtools/default.nix b/pkgs/tools/cd-dvd/cdrtools/default.nix
index d264a0f8bdb3..0d90b7c5cc2e 100644
--- a/pkgs/tools/cd-dvd/cdrtools/default.nix
+++ b/pkgs/tools/cd-dvd/cdrtools/default.nix
@@ -12,6 +12,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ m4 ];
buildInputs = if stdenv.hostPlatform.isDarwin then [ Carbon IOKit ] else [ acl libcap ];
+ env.CFLAGS = toString [
+ "-Wno-error=implicit-int"
+ "-Wno-error=implicit-function-declaration"
+ ];
+
postPatch = ''
sed "/\.mk3/d" -i libschily/Targets.man
substituteInPlace man/Makefile --replace "man4" ""
diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix
index 4f546932c733..739caa5402b0 100644
--- a/pkgs/tools/filesystems/encfs/default.nix
+++ b/pkgs/tools/filesystems/encfs/default.nix
@@ -23,8 +23,9 @@ stdenv.mkDerivation rec {
})
];
- buildInputs = [ gettext fuse openssl tinyxml2 ];
- nativeBuildInputs = [ cmake pkg-config perl ];
+ buildInputs = [ fuse openssl tinyxml2 ];
+ nativeBuildInputs = [ cmake pkg-config perl gettext ];
+ strictDeps = true;
cmakeFlags =
[ "-DUSE_INTERNAL_TINYXML=OFF"
diff --git a/pkgs/tools/misc/file/32-bit-time_t.patch b/pkgs/tools/misc/file/32-bit-time_t.patch
deleted file mode 100644
index 19c595215d65..000000000000
--- a/pkgs/tools/misc/file/32-bit-time_t.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://github.com/file/file/commit/218fdf813fd5ccecbb8887a1b62509cd1c6dd3a1.patch
-
-From 218fdf813fd5ccecbb8887a1b62509cd1c6dd3a1 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas
-Date: Fri, 28 Jul 2023 14:38:25 +0000
-Subject: [PATCH] deal with 32 bit time_t
-
----
- src/file.h | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/file.h b/src/file.h
-index 2e0494d2f..78f574ea1 100644
---- a/src/file.h
-+++ b/src/file.h
-@@ -27,7 +27,7 @@
- */
- /*
- * file.h - definitions for file(1) program
-- * @(#)$File: file.h,v 1.247 2023/07/27 19:40:22 christos Exp $
-+ * @(#)$File: file.h,v 1.248 2023/07/28 14:38:25 christos Exp $
- */
-
- #ifndef __file_h__
-@@ -159,9 +159,11 @@
- /*
- * Dec 31, 23:59:59 9999
- * we need to make sure that we don't exceed 9999 because some libc
-- * implementations like muslc crash otherwise
-+ * implementations like muslc crash otherwise. If you are unlucky
-+ * to be running on a system with a 32 bit time_t, then it is even less.
- */
--#define MAX_CTIME CAST(time_t, 0x3afff487cfULL)
-+#define MAX_CTIME \
-+ CAST(time_t, sizeof(time_t) > 4 ? 0x3afff487cfULL : 0x7fffffffULL)
-
- #define FILE_BADSIZE CAST(size_t, ~0ul)
- #define MAXDESC 64 /* max len of text description/MIME type */
diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index f0bc89d466f5..9fa3bd053859 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -10,24 +10,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "file";
- version = "5.45";
+ version = "5.46";
src = fetchurl {
urls = [
"https://astron.com/pub/file/file-${finalAttrs.version}.tar.gz"
"https://distfiles.macports.org/file/file-${finalAttrs.version}.tar.gz"
];
- hash = "sha256-/Jf1ECm7DiyfTjv/79r2ePDgOe6HK53lwAKm0Jx4TYI=";
+ hash = "sha256-ycx3x8VgxUMTXtxVWvYJ1WGdvvARmX6YjOQKPXXYYIg=";
};
outputs = [ "out" "dev" "man" ];
- patches = [
- # Upstream patch to fix 32-bit tests.
- # Will be included in 5.46+ releases.
- ./32-bit-time_t.patch
- ];
-
strictDeps = true;
enableParallelBuilding = true;
diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix
index 495a3dad8330..1eca97e7d7c7 100644
--- a/pkgs/tools/misc/fontforge/default.nix
+++ b/pkgs/tools/misc/fontforge/default.nix
@@ -29,6 +29,11 @@ stdenv.mkDerivation rec {
url = "https://github.com/fontforge/fontforge/commit/216eb14b558df344b206bf82e2bdaf03a1f2f429.patch";
hash = "sha256-aRnir09FSQMT50keoB7z6AyhWAVBxjSQsTRvBzeBuHU=";
})
+ # Fixes translation compatibility with gettext 0.22
+ (fetchpatch {
+ url = "https://github.com/fontforge/fontforge/commit/55d58f87ab1440f628f2071a6f6cc7ef9626c641.patch";
+ hash = "sha256-rkYnKPXA8Ztvh9g0zjG2yTUCPd3lE1uqwvBuEd8+Oyw=";
+ })
# https://github.com/fontforge/fontforge/pull/5423
./replace-distutils.patch
diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix
index f41d3b34971a..1ad1a0682b81 100644
--- a/pkgs/tools/misc/timidity/default.nix
+++ b/pkgs/tools/misc/timidity/default.nix
@@ -3,7 +3,6 @@
, fetchurl
, nixosTests
, pkg-config
-, memstreamHook
, CoreAudio
, libobjc
, libjack2
@@ -31,9 +30,7 @@ stdenv.mkDerivation rec {
./configure-compat.patch
];
- nativeBuildInputs = [ pkg-config ]
- ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ memstreamHook ];
-
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [
libjack2
ncurses
diff --git a/pkgs/tools/misc/torrenttools/default.nix b/pkgs/tools/misc/torrenttools/default.nix
index 6daa39dd7e73..3a634ec17373 100644
--- a/pkgs/tools/misc/torrenttools/default.nix
+++ b/pkgs/tools/misc/torrenttools/default.nix
@@ -54,6 +54,10 @@ stdenv.mkDerivation rec {
];
sourceRoot = "torrenttools";
+ patches = [
+ ./fmt-9.patch
+ ];
+
postUnpack = ''
cp -pr cliprogress torrenttools/external/cliprogress
cp -pr dottorrent torrenttools/external/dottorrent
diff --git a/pkgs/tools/misc/torrenttools/fmt-9.patch b/pkgs/tools/misc/torrenttools/fmt-9.patch
new file mode 100644
index 000000000000..5bdc666d4bd2
--- /dev/null
+++ b/pkgs/tools/misc/torrenttools/fmt-9.patch
@@ -0,0 +1,29 @@
+diff --git a/include/file_matcher.hpp b/include/file_matcher.hpp
+index c10c7be405..b67baec0ef 100644
+--- a/include/file_matcher.hpp
++++ b/include/file_matcher.hpp
+@@ -47,7 +47,7 @@
+ }
+
+ std::string error;
+- std::string pattern = ".*.{}$"_format(extension);
++ std::string pattern = fmt::format(".*.{}$", extension);
+ file_include_list_.Add(pattern, &error);
+ file_include_list_empty_ = false;
+ Ensures(error.empty());
+@@ -62,7 +62,7 @@
+ }
+
+ std::string error;
+- std::string pattern = ".*\\.{}$"_format(extension);
++ std::string pattern = fmt::format(".*\\.{}$", extension);
+ file_exclude_list_.Add(pattern, &error);
+ file_exclude_list_empty_ = false;
+ Ensures(error.empty());
+@@ -243,4 +243,4 @@
+ };
+
+
+-} // namespace torrenttools
+\ No newline at end of file
++} // namespace torrenttools
diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix
index a4d233b2b128..f72ea296eac6 100644
--- a/pkgs/tools/package-management/nix/common.nix
+++ b/pkgs/tools/package-management/nix/common.nix
@@ -45,7 +45,6 @@ in
, coreutils
, curl
, darwin
-, darwinMinVersionHook
, docbook_xsl_ns
, docbook5
, editline
@@ -166,15 +165,6 @@ self = stdenv.mkDerivation {
aws-sdk-cpp
] ++ lib.optional (atLeast218 && stdenv.hostPlatform.isDarwin) [
darwin.apple_sdk.libs.sandbox
- ] ++ lib.optional (atLeast224 && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
- # Fix the following error with the default x86_64-darwin SDK:
- #
- # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer
- #
- # Despite the use of the 10.13 deployment target here, the aligned
- # allocation function Clang uses with this setting actually works
- # all the way back to 10.6.
- (darwinMinVersionHook "10.13")
];
propagatedBuildInputs = [
diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index c42bcca20c90..321b1ec1203e 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -1,24 +1,18 @@
{ stdenv
, lib
, pkg-config
-, autoreconfHook
-, pandoc
-, fetchpatch2
+, cmake
, fetchurl
-, cpio
, zlib
, bzip2
, file
, elfutils
-, libbfd
-, libgcrypt
, libarchive
-, nspr
-, nss
+, readline
+, audit
, popt
-, db
, xz
-, python
+, python3
, lua
, llvmPackages
, sqlite
@@ -26,88 +20,70 @@
, libcap
, apple-sdk_13
, darwinMinVersionHook
+, openssl
+#, libselinux
+, rpm-sequoia
+, gettext
+, systemd
+, bubblewrap
+, autoconf
+, gnupg
}:
stdenv.mkDerivation rec {
pname = "rpm";
- version = "4.18.1";
+ version = "4.20.0";
src = fetchurl {
url = "https://ftp.osuosl.org/pub/rpm/releases/rpm-${lib.versions.majorMinor version}.x/rpm-${version}.tar.bz2";
- hash = "sha256-N/O0LAlmlB4q0/EP3jY5gkplkdBxl7qP0IacoHeeH1Y=";
+ hash = "sha256-Vv92OM/5i1bUp1A/9ZvHnygabd/82g0jjAgr7ftfvns=";
};
- patches = [
- # Resolves `error: expected expression` on clang
- # See: https://github.com/rpm-software-management/rpm/issues/2435.
- (fetchpatch2 {
- url = "https://github.com/rpm-software-management/rpm/commit/b960c0b43a080287a7c13533eeb2d9f288db1414.diff?full_index=1";
- hash = "sha256-0f7YOL2xR07xgAEN32oRbOjPsAsVmKFVtTLXUOeFAa8=";
- })
- # Fix missing includes required to build on Darwin.
- # See: https://github.com/rpm-software-management/rpm/pull/2571.
- (fetchpatch2 {
- url = "https://github.com/rpm-software-management/rpm/commit/f07875392a09228b1a25c1763a50bbbd0f6798c2.diff?full_index=1";
- hash = "sha256-DLpzMApRCgI9zqheglFtqL8E1vq9X/aQa0HMnIAQgk8=";
- })
- (fetchpatch2 {
- url = "https://github.com/rpm-software-management/rpm/commit/b2e67642fd8cb64d8cb1cca9e759396c1c10807d.diff?full_index=1";
- hash = "sha256-q3fIBfiUJVmw6Vi2/Bo/zX6/cqTM7aFnskKfMVK3DlU=";
- })
- ];
+ postPatch = ''
+ sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python3.sitePackages}#' python/CMakeLists.txt
+ sed -i 's#PATHS ENV MYPATH#PATHS ENV PATH#' CMakeLists.txt
+ '';
- outputs = [ "out" "dev" "man" ];
+ outputs = [
+ "out" "man"
+ ] ++ lib.optionals stdenv.hostPlatform.isLinux [
+ "dev"
+ ];
separateDebugInfo = true;
- nativeBuildInputs = [ autoreconfHook pkg-config pandoc ];
- buildInputs = [ cpio zlib zstd bzip2 file libarchive libgcrypt nspr nss db xz python lua sqlite ]
+ nativeBuildInputs = [ cmake pkg-config autoconf python3 gettext ]
+ ++ lib.optionals stdenv.hostPlatform.isLinux [ bubblewrap ];
+ buildInputs = [ bzip2 zlib zstd file libarchive xz lua sqlite openssl readline rpm-sequoia gnupg ]
++ lib.optional stdenv.cc.isClang llvmPackages.openmp
- ++ lib.optional stdenv.hostPlatform.isLinux libcap
+ ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap audit systemd ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_13 (darwinMinVersionHook "13.0") ];
+ patches = lib.optionals stdenv.hostPlatform.isDarwin [
+ ./sighandler_t-macos.patch
+ ];
+
+ cmakeFlags = [
+ "-DWITH_DBUS=OFF"
+ # libselinux is missing propagatedBuildInputs
+ "-DWITH_SELINUX=OFF"
+ ] ++ lib.optionals stdenv.hostPlatform.isLinux [
+ "-DMKTREE_BACKEND=rootfs"
+ ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
+ # Test suite rely on either podman or bubblewrap
+ "-DENABLE_TESTSUITE=OFF"
+
+ "-DWITH_CAP=OFF"
+ "-DWITH_AUDIT=OFF"
+ "-DWITH_ACL=OFF"
+ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ "-DWITH_LIBELF=OFF"
+ "-DWITH_LIBDW=OFF"
+ ];
+
# rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements
- propagatedBuildInputs = [ popt nss db bzip2 libarchive libbfd ]
+ propagatedBuildInputs = [ popt ]
++ lib.optional (lib.meta.availableOn stdenv.hostPlatform elfutils) elfutils;
- env.NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss";
-
- configureFlags = [
- "--with-external-db"
- "--with-lua"
- "--enable-python"
- "--enable-ndb"
- "--enable-sqlite"
- "--enable-zstd"
- "--localstatedir=/var"
- "--sharedstatedir=/com"
- ] ++ lib.optional stdenv.hostPlatform.isLinux "--with-cap";
-
- postPatch = ''
- substituteInPlace Makefile.am --replace '@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp' ""
- '';
-
- preFixup = ''
- # Don't keep a reference to RPM headers or manpages
- for f in $out/lib/rpm/platform/*/macros; do
- substituteInPlace $f --replace "$dev" "/rpm-dev-path-was-here"
- substituteInPlace $f --replace "$man" "/rpm-man-path-was-here"
- done
-
- # Avoid macros like '%__ld' pointing to absolute paths
- for tool in ld nm objcopy objdump strip; do
- sed -i $out/lib/rpm/macros -e "s/^%__$tool.*/%__$tool $tool/"
- done
-
- # Avoid helper scripts pointing to absolute paths
- for tool in find-provides find-requires; do
- sed -i $out/lib/rpm/$tool -e "s#/usr/lib/rpm/#$out/lib/rpm/#"
- done
-
- # symlinks produced by build are incorrect
- ln -sf $out/bin/{rpm,rpmquery}
- ln -sf $out/bin/{rpm,rpmverify}
- '';
-
enableParallelBuilding = true;
meta = with lib; {
diff --git a/pkgs/tools/package-management/rpm/sighandler_t-macos.patch b/pkgs/tools/package-management/rpm/sighandler_t-macos.patch
new file mode 100644
index 000000000000..e406c8c23f41
--- /dev/null
+++ b/pkgs/tools/package-management/rpm/sighandler_t-macos.patch
@@ -0,0 +1,19 @@
+Revert "signal() returns sighandler_t, not void *"
+
+sadly, on darwin, sighandler_t is not defined
+
+This reverts commit 7bb4dfd0bcadc7c6177d6fe88a4bcccf7fac98b9
+
+diff --git a/build/rpmfc.c b/build/rpmfc.c
+index 86dd36d14..48643a321 100644
+--- a/build/rpmfc.c
++++ b/build/rpmfc.c
+@@ -295,7 +295,7 @@ static int getOutputFrom(ARGV_t argv,
+ return -1;
+ }
+
+- sighandler_t oldhandler = signal(SIGPIPE, SIG_IGN);
++ void *oldhandler = signal(SIGPIPE, SIG_IGN);
+
+ child = fork();
+ if (child < 0) {
diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix
index 73c1ade5bd63..f38764b79163 100644
--- a/pkgs/tools/security/chipsec/default.nix
+++ b/pkgs/tools/security/chipsec/default.nix
@@ -44,6 +44,7 @@ python3.pkgs.buildPythonApplication rec {
preBuild = lib.optionalString withDriver ''
export CHIPSEC_BUILD_LIB=$(mktemp -d)
mkdir -p $CHIPSEC_BUILD_LIB/chipsec/helper/linux
+ appendToVar setupPyBuildFlags "--build-lib=$CHIPSEC_BUILD_LIB"
'';
env.NIX_CFLAGS_COMPILE = toString [
@@ -57,9 +58,7 @@ python3.pkgs.buildPythonApplication rec {
$out/${python3.pkgs.python.sitePackages}/drivers/linux/chipsec.ko
'';
- setupPyBuildFlags = [
- "--build-lib=$CHIPSEC_BUILD_LIB"
- ] ++ lib.optionals (!withDriver) [
+ setupPyBuildFlags = lib.optionals (!withDriver) [
"--skip-driver"
];
diff --git a/pkgs/tools/typesetting/tex/nix/run-latex.sh b/pkgs/tools/typesetting/tex/nix/run-latex.sh
index 3f8a16580ea5..9c1807687284 100644
--- a/pkgs/tools/typesetting/tex/nix/run-latex.sh
+++ b/pkgs/tools/typesetting/tex/nix/run-latex.sh
@@ -99,7 +99,7 @@ fi
if test -f $rootNameBase.idx; then
echo "MAKING INDEX..."
if test -n "$compressBlanksInIndex"; then
- makeindexFlags="$makeindexFlags -c"
+ appendToVar makeindexFlags "-c"
fi
makeindex $makeindexFlags $rootNameBase.idx
runNeeded=1
diff --git a/pkgs/tools/virtualization/mkosi/default.nix b/pkgs/tools/virtualization/mkosi/default.nix
index 2f5dea5481fb..a39bec7ae876 100644
--- a/pkgs/tools/virtualization/mkosi/default.nix
+++ b/pkgs/tools/virtualization/mkosi/default.nix
@@ -68,7 +68,7 @@ buildPythonApplication rec {
(replaceVars ./0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch {
UKIFY = "${systemdForMkosi}/lib/systemd/ukify";
PYTHON_PEFILE = "${python3pefile}/bin/python3.12";
- MKOSI_SANDBOX = "~MKOSI_SANDBOX~"; # to satisfy replaceVars, will be replaced in postPatch
+ MKOSI_SANDBOX = null; # will be replaced in postPatch
})
(replaceVars ./0002-Fix-library-resolving.patch {
LIBC = "${stdenv.cc.libc}/lib/libc.so.6";
@@ -84,7 +84,7 @@ buildPythonApplication rec {
postPatch = ''
# As we need the $out reference, we can't use `replaceVars` here.
substituteInPlace mkosi/run.py \
- --replace-fail '~MKOSI_SANDBOX~' "\"$out/bin/mkosi-sandbox\""
+ --replace-fail '@MKOSI_SANDBOX@' "\"$out/bin/mkosi-sandbox\""
'';
nativeBuildInputs = [
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 61f8f88d0745..e5dc288d3b41 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -112,6 +112,10 @@ mapAliases {
apacheKafka_3_5 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-06-13
antimicroX = throw "'antimicroX' has been renamed to/replaced by 'antimicrox'"; # Converted to throw 2024-10-17
apacheAnt = ant; # Added 2024-11-28
+ apple-sdk_10_12 = throw "apple-sdk_10_12 was removed as Nixpkgs no longer supports macOS 10.12; see the 25.05 release notes"; # Added 2024-10-27
+ apple-sdk_10_13 = throw "apple-sdk_10_13 was removed as Nixpkgs no longer supports macOS 10.13; see the 25.05 release notes"; # Added 2024-10-27
+ apple-sdk_10_14 = throw "apple-sdk_10_14 was removed as Nixpkgs no longer supprots macOS 10.14; see the 25.05 release notes"; # Added 2024-10-27
+ apple-sdk_10_15 = throw "apple-sdk_10_15 was removed as Nixpkgs no longer supports macOS 10.15; see the 25.05 release notes"; # Added 2024-10-27
appthreat-depscan = dep-scan; # Added 2024-04-10
arcanist = throw "arcanist was removed as phabricator is not supported and does not accept fixes"; # Added 2024-06-07
aria = aria2; # Added 2024-03-26
@@ -155,6 +159,8 @@ mapAliases {
bloom = throw "'bloom' has been removed because it was unmaintained upstream."; # Added 2024-11-02
bmap-tools = bmaptool; # Added 2024-08-05
boost175 = throw "Boost 1.75 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2024-11-24
+ boost184 = throw "Boost 1.84 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2024-11-24
+ boost185 = throw "Boost 1.85 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2024-11-24
boost_process = throw "boost_process has been removed as it is included in regular boost"; # Added 2024-05-01
bpb = throw "bpb has been removed as it is unmaintained and not compatible with recent Rust versions"; # Added 2024-04-30
bpftool = throw "'bpftool' has been renamed to/replaced by 'bpftools'"; # Converted to throw 2024-10-17
@@ -388,6 +394,7 @@ mapAliases {
flutter316 = throw "flutter316 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05
flutter322 = throw "flutter322 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05
flutter323 = throw "flutter323 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05
+ fmt_8 = throw "fmt_8 has been removed as it is obsolete and was no longer used in the tree"; # Added 2024-11-12
foldingathome = throw "'foldingathome' has been renamed to/replaced by 'fahclient'"; # Converted to throw 2024-10-17
forgejo-actions-runner = forgejo-runner; # Added 2024-04-04
@@ -795,6 +802,10 @@ mapAliases {
mcomix3 = mcomix; # Added 2022-06-05
mdt = md-tui; # Added 2024-09-03
meme = throw "'meme' has been renamed to/replaced by 'meme-image-generator'"; # Converted to throw 2024-10-17
+ memorymapping = throw "memorymapping has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05
+ memorymappingHook = throw "memorymapping has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05
+ memstream = throw "memstream has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05
+ memstreamHook = throw "memstream has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05
mhwaveedit = throw "'mkwaveedit' has been removed due to lack of maintenance upstream. Consider using 'audacity' or 'tenacity' instead";
microcodeAmd = microcode-amd; # Added 2024-09-08
microcodeIntel = microcode-intel; # Added 2024-09-08
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb4126e3f906..305a9a0ea407 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1516,10 +1516,6 @@ with pkgs;
inherit (darwin) autoSignDarwinBinariesHook;
};
- saunafs = callPackage ../by-name/sa/saunafs/package.nix {
- boost = boost185;
- };
-
vifm-full = vifm.override {
mediaSupport = true;
inherit lib udisks2 python3;
@@ -3849,7 +3845,7 @@ with pkgs;
stdenv = llvmPackages_13.libcxxStdenv;
libcxx = llvmPackages_13.libcxx;
boost = boost178.override { inherit stdenv; };
- fmt = fmt_8.override { inherit stdenv; };
+ fmt = fmt_9.override { inherit stdenv; };
nanodbc_llvm = nanodbc.override { inherit stdenv; };
avro-cpp_llvm = avro-cpp.override { inherit stdenv boost; };
spdlog_llvm = spdlog.override { inherit stdenv fmt; };
@@ -4227,9 +4223,9 @@ with pkgs;
nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { };
- nodejs = hiPrio nodejs_20;
- nodejs-slim = nodejs-slim_20;
- corepack = hiPrio corepack_20;
+ nodejs = hiPrio nodejs_22;
+ nodejs-slim = nodejs-slim_22;
+ corepack = hiPrio corepack_22;
nodejs_18 = callPackage ../development/web/nodejs/v18.nix { };
nodejs-slim_18 = callPackage ../development/web/nodejs/v18.nix { enableNpm = false; };
@@ -4742,7 +4738,6 @@ with pkgs;
};
osl = libsForQt5.callPackage ../development/compilers/osl {
- boost = boost179;
libclang = llvmPackages_15.libclang;
clang = clang_15;
llvm = llvm_15;
@@ -5126,7 +5121,6 @@ with pkgs;
rosenpass-tools = callPackage ../tools/networking/rosenpass/tools.nix { };
rpm = callPackage ../tools/package-management/rpm {
- python = python3;
lua = lua5_4;
};
@@ -6052,7 +6046,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 = 13;
+ default-gcc-version = 14;
gcc = pkgs.${"gcc${toString default-gcc-version}"};
gccFun = callPackage ../development/compilers/gcc;
gcc-unwrapped = gcc.cc;
@@ -6647,18 +6641,7 @@ with pkgs;
libllvm = llvmPackages.libllvm;
llvm-manpages = llvmPackages.llvm-manpages;
- # Please remove all this logic when bumping to LLVM 19 and make this
- # a simple alias.
- llvmPackages = let
- # This returns the minimum supported version for the platform. The
- # assumption is that or any later version is good.
- choose = platform: if platform.isDarwin then 16 else 18;
- # We take the "max of the mins". Why? Since those are lower bounds of the
- # supported version set, this is like intersecting those sets and then
- # taking the min bound of that.
- minSupported = toString (lib.trivial.max (choose stdenv.hostPlatform) (choose
- stdenv.targetPlatform));
- in pkgs.${"llvmPackages_${minSupported}"};
+ llvmPackages = llvmPackages_19;
inherit (rec {
llvmPackagesSet = recurseIntoAttrs (callPackages ../development/compilers/llvm { });
@@ -6825,11 +6808,11 @@ with pkgs;
wrapRustcWith = { rustc-unwrapped, ... } @ args: callPackage ../build-support/rust/rustc-wrapper args;
wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; };
- rust_1_82 = callPackage ../development/compilers/rust/1_82.nix {
+ rust_1_83 = callPackage ../development/compilers/rust/1_83.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
- llvm_18 = llvmPackages_18.libllvm;
+ llvm_19 = llvmPackages_19.libllvm;
};
- rust = rust_1_82;
+ rust = rust_1_83;
mrustc = callPackage ../development/compilers/mrustc { };
mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { };
@@ -6837,8 +6820,8 @@ with pkgs;
openssl = openssl_1_1;
};
- rustPackages_1_82 = rust_1_82.packages.stable;
- rustPackages = rustPackages_1_82;
+ rustPackages_1_83 = rust_1_83.packages.stable;
+ rustPackages = rustPackages_1_83;
inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform;
@@ -7510,9 +7493,9 @@ with pkgs;
python27Packages = python27.pkgs;
python39Packages = python39.pkgs;
python310Packages = python310.pkgs;
- python311Packages = recurseIntoAttrs python311.pkgs;
+ python311Packages = python311.pkgs;
python312Packages = recurseIntoAttrs python312.pkgs;
- python313Packages = python313.pkgs;
+ python313Packages = recurseIntoAttrs python313.pkgs;
python314Packages = python314.pkgs;
pypyPackages = pypy.pkgs;
pypy2Packages = pypy2.pkgs;
@@ -8817,12 +8800,10 @@ with pkgs;
boost181
boost182
boost183
- boost184
- boost185
boost186
;
- boost = boost181;
+ boost = boost186;
inherit (callPackages ../development/libraries/botan { })
botan2
@@ -9080,7 +9061,7 @@ with pkgs;
fltk = fltk13;
fltk-minimal = fltk13-minimal;
- inherit (callPackages ../development/libraries/fmt { }) fmt_8 fmt_9 fmt_10 fmt_11;
+ inherit (callPackages ../development/libraries/fmt { }) fmt_9 fmt_10 fmt_11;
fmt = fmt_10;
@@ -9523,10 +9504,7 @@ with pkgs;
autoreconfHook = buildPackages.autoreconfHook269;
};
- hpx = callPackage ../development/libraries/hpx {
- boost = boost179;
- asio = asio.override { boost = boost179; };
- };
+ hpx = callPackage ../development/libraries/hpx { };
hspell = callPackage ../development/libraries/hspell { };
@@ -10210,18 +10188,6 @@ with pkgs;
mediastreamer-openh264 = callPackage ../development/libraries/mediastreamer/msopenh264.nix { };
- memorymapping = callPackage ../development/libraries/memorymapping { };
- memorymappingHook = makeSetupHook {
- name = "memorymapping-hook";
- propagatedBuildInputs = [ memorymapping ];
- } ../development/libraries/memorymapping/setup-hook.sh;
-
- memstream = callPackage ../development/libraries/memstream { };
- memstreamHook = makeSetupHook {
- name = "memstream-hook";
- propagatedBuildInputs = [ memstream ];
- } ../development/libraries/memstream/setup-hook.sh;
-
mergerfs = callPackage ../tools/filesystems/mergerfs { };
mergerfs-tools = callPackage ../tools/filesystems/mergerfs/tools.nix { };
@@ -10588,7 +10554,7 @@ with pkgs;
prospector = callPackage ../development/tools/prospector { };
- protobuf = protobuf_28;
+ protobuf = protobuf_29;
inherit
({
@@ -10945,7 +10911,7 @@ with pkgs;
inherit (callPackage ../development/libraries/sqlite/tools.nix {
inherit (darwin.apple_sdk.frameworks) Foundation;
- }) sqlite-analyzer sqldiff;
+ }) sqlite-analyzer sqldiff sqlite-rsync;
sqlar = callPackage ../development/libraries/sqlite/sqlar.nix { };
@@ -10988,6 +10954,7 @@ with pkgs;
termbench-pro = callPackage ../by-name/te/termbench-pro/package.nix {
stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_17.stdenv else stdenv;
+ fmt = fmt_11;
};
texpresso = callPackage ../tools/typesetting/tex/texpresso {
@@ -11193,10 +11160,6 @@ with pkgs;
### DEVELOPMENT / LIBRARIES / DARWIN SDKS
- apple-sdk_10_12 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "10.12"; };
- apple-sdk_10_13 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "10.13"; };
- apple-sdk_10_14 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "10.14"; };
- apple-sdk_10_15 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "10.15"; };
apple-sdk_11 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "11"; };
apple-sdk_12 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "12"; };
apple-sdk_13 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "13"; };
@@ -11994,8 +11957,8 @@ with pkgs;
postgresql_16_jit
postgresql_17_jit
;
- postgresql = postgresql_16;
- postgresql_jit = postgresql_16_jit;
+ postgresql = postgresql_17;
+ postgresql_jit = postgresql_17_jit;
postgresqlPackages = recurseIntoAttrs postgresql.pkgs;
postgresqlJitPackages = recurseIntoAttrs postgresql_jit.pkgs;
postgresql13Packages = recurseIntoAttrs postgresql_13.pkgs;
@@ -15828,7 +15791,7 @@ with pkgs;
};
torrenttools = callPackage ../tools/misc/torrenttools {
- fmt = fmt_8;
+ fmt = fmt_9;
};
tony = libsForQt5.callPackage ../applications/audio/tony { };
@@ -18164,7 +18127,7 @@ with pkgs;
kmonad = haskellPackages.kmonad.bin;
kompute = callPackage ../development/libraries/kompute {
- fmt = fmt_8;
+ fmt = fmt_10;
};
# In general we only want keep the last three minor versions around that
diff --git a/pkgs/top-level/darwin-aliases.nix b/pkgs/top-level/darwin-aliases.nix
index 3bd8248805d2..0a45f6e01b7b 100644
--- a/pkgs/top-level/darwin-aliases.nix
+++ b/pkgs/top-level/darwin-aliases.nix
@@ -47,6 +47,10 @@ let
in
mapAliases ({
+ ### A ###
+
+ apple_sdk_10_12 = throw "darwin.apple_sdk_10_12 was removed as Nixpkgs no longer supports macOS 10.12; see the 25.05 release notes"; # Added 2024-10-27
+
### B ###
builder = throw "'darwin.builder' has been changed and renamed to 'darwin.linux-builder'. The default ssh port is now 31022. Please update your configuration or override the port back to 22. See https://nixos.org/manual/nixpkgs/unstable/#sec-darwin-builder"; # added 2023-07-06
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index 89e10d8b0ab0..c7fa43030705 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -57,24 +57,16 @@ makeScopeWithSplicing' {
# Must use pkgs.callPackage to avoid infinite recursion.
impure-cmds = pkgs.callPackage ../os-specific/darwin/impure-cmds { };
- # macOS 10.12 SDK
- apple_sdk_10_12 = pkgs.callPackage ../os-specific/darwin/apple-sdk { };
-
# macOS 11.0 SDK
apple_sdk_11_0 = pkgs.callPackage ../os-specific/darwin/apple-sdk-11.0 { };
# macOS 12.3 SDK
apple_sdk_12_3 = pkgs.callPackage ../os-specific/darwin/apple-sdk-12.3 { };
- # Pick an SDK
- apple_sdk = {
- "10.12" = apple_sdk_10_12;
- "11.0" = apple_sdk_11_0;
- }.${stdenv.hostPlatform.darwinSdkVersion}
- or (throw "Unsupported sdk: ${stdenv.hostPlatform.darwinSdkVersion}");
+ apple_sdk = apple_sdk_11_0;
stubs = {
- inherit apple_sdk apple_sdk_10_12 apple_sdk_11_0 apple_sdk_12_3;
+ inherit apple_sdk apple_sdk_11_0 apple_sdk_12_3;
libobjc = self.objc4;
} // lib.genAttrs [
"CF"
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ab8605ba7055..40a2dca4974b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7194,17 +7194,29 @@ with self; {
DBDmysql = buildPerlPackage {
pname = "DBD-mysql";
- version = "4.050";
+ version = "5.010";
src = fetchurl {
- url = "mirror://cpan/authors/id/D/DV/DVEEDEN/DBD-mysql-4.050.tar.gz";
- hash = "sha256-T0hUH/FaCnQF92rcEPgWJ8M5lvv1bJXCbAlERMCSjXg=";
+ url = "mirror://cpan/authors/id/D/DV/DVEEDEN/DBD-mysql-5.010.tar.gz";
+ hash = "sha256-LKL/Odk+idT3RG5fD68DgF6RZ+6bigS6fLJG4stG7uc=";
};
- buildInputs = [ pkgs.libmysqlclient DevelChecklib TestDeep TestDistManifest TestPod ];
+ nativeBuildInputs = [
+ pkgs.mysql80 # for mysql_config
+ ];
+ buildInputs = [
+ DevelChecklib
+ TestDeep
+ TestDistManifest
+ TestPod
+ pkgs.libmysqlconnectorcpp
+ pkgs.libxcrypt
+ pkgs.openssl
+ pkgs.zstd
+ ];
propagatedBuildInputs = [ DBI ];
- doCheck = false;
+ doCheck = false; # require running database
# makeMakerFlags = "MYSQL_HOME=${mysql}";
meta = {
@@ -8829,9 +8841,9 @@ with self; {
hash = "sha256-F2+gJ3H1QqTvsdvCpMko6PQ5G/QHhHO9YEDY8RrbDsE=";
};
preCheck = if stdenv.hostPlatform.isCygwin then ''
- sed -i"" -e "s@plan tests => 13@plan tests => 10@" t/env.t
- sed -i"" -e "s@ok(env(\"\\\x@#ok(env(\"\\\x@" t/env.t
- sed -i"" -e "s@ok(\$ENV{\"\\\x@#ok(\$ENV{\"\\\x@" t/env.t
+ sed -i -e "s@plan tests => 13@plan tests => 10@" t/env.t
+ sed -i -e "s@ok(env(\"\\\x@#ok(env(\"\\\x@" t/env.t
+ sed -i -e "s@ok(\$ENV{\"\\\x@#ok(\$ENV{\"\\\x@" t/env.t
'' else null;
meta = {
description = "Determine the locale encoding";
@@ -24443,7 +24455,7 @@ with self; {
perl_lib = "${host_perl}/lib/perl5/${host_perl.version}";
self_lib = "${host_self}/lib/perl5/site_perl/${host_perl.version}";
in ''
- sed -ie 's|"-I$(INST_ARCHLIB)"|"-I${perl_lib}" "-I${self_lib}"|g' Makefile
+ sed -i -e 's|"-I$(INST_ARCHLIB)"|"-I${perl_lib}" "-I${self_lib}"|g' Makefile
'');
# TermReadKey uses itself in the build process
@@ -28499,7 +28511,7 @@ with self; {
};
buildInputs = [ pkgs.xorg.libXext pkgs.xorg.libXScrnSaver pkgs.xorg.libX11 ];
propagatedBuildInputs = [ InlineC ];
- patchPhase = "sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11.out}/lib/ -L${pkgs.xorg.libXext.out}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm";
+ patchPhase = "sed -i -e 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11.out}/lib/ -L${pkgs.xorg.libXext.out}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm";
meta = {
description = "Get the idle time of X11";
license = with lib.licenses; [ artistic1 gpl1Plus ];
@@ -28833,7 +28845,7 @@ with self; {
postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
substituteInPlace Expat/Makefile.PL --replace 'use English;' '#'
'' + lib.optionalString stdenv.hostPlatform.isCygwin ''
- sed -i"" -e "s@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. \$Config{_exe};@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. (\$^O eq 'cygwin' ? \"\" : \$Config{_exe});@" inc/Devel/CheckLib.pm
+ sed -i -e "s@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. \$Config{_exe};@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. (\$^O eq 'cygwin' ? \"\" : \$Config{_exe});@" inc/Devel/CheckLib.pm
'';
makeMakerFlags = [ "EXPATLIBPATH=${pkgs.expat.out}/lib" "EXPATINCPATH=${pkgs.expat.dev}/include" ];
propagatedBuildInputs = [ LWP ];
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 1eff1b03fab4..d4f2a437a0bc 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -40,6 +40,7 @@ mapAliases ({
adafruit-nrfutil = throw "adafruit-nrfutil has been promoted to a top-level attribute name: `pkgs.adafruit-nrfutil`."; # Added 2023-11-19
aioaladdinconnect = throw "aioaladdinconnect has been removed, as the API is supported was obsoleted on 2024-01-24."; # Added 2024-06-07
aiohttp-isal = throw "aiohttp-isal has been removed, as it has been archived and replace by aiohttp-fast-zlib"; # Added 2024-08-11
+ aiohttp-zlib-ng = throw "aiohttp-zlib-ng has been removed, as it has been archived and replaced by aiohttp-fast-zlib"; # Added 2024-11-14
aiomysensors = throw "aiomysensors has been removed, as it was packaged for Home Assistant, which migrated to pymysensors."; # Added 2024-07-07
aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30
aiolip = throw "aiolip has been removed because the upstream repository was archived in 2021"; # Added 2024-10-04
@@ -271,6 +272,7 @@ mapAliases ({
homeassistant-pyozw = throw "homeassistant-pyozw has been removed, as it was packaged for home-assistant which has removed it as a dependency."; # added 2024-01-05
htmllaundry = throw "htmllaundry has been removed because it is abandoned"; # added 2024-06-04
HTSeq = htseq; # added 2023-02-19
+ hug = throw "hug was marked broken since 2021 and has not established compatibility with newer dependency versions. It has therefore been removed."; # added 2024-11-15
hyperkitty = throw "Please use pkgs.mailmanPackages.hyperkitty"; # added 2022-04-29
ihatemoney = throw "ihatemoney was removed because it is no longer maintained downstream"; # added 2023-04-08
IMAPClient = imapclient; # added 2021-10-28
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f70bdaa44a04..066b969f91f9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -285,8 +285,6 @@ self: super: with self; {
aiohttp-wsgi = callPackage ../development/python-modules/aiohttp-wsgi { };
- aiohttp-zlib-ng = callPackage ../development/python-modules/aiohttp-zlib-ng { };
-
aioitertools = callPackage ../development/python-modules/aioitertools { };
aiobiketrax = callPackage ../development/python-modules/aiobiketrax { };
@@ -998,6 +996,8 @@ self: super: with self; {
audio-metadata = callPackage ../development/python-modules/audio-metadata { };
+ audioop-lts = callPackage ../development/python-modules/audioop-lts { };
+
audioread = callPackage ../development/python-modules/audioread { };
audiotools = callPackage ../development/python-modules/audiotools {
@@ -1420,6 +1420,8 @@ self: super: with self; {
enablePython = true;
});
+ baize = callPackage ../development/python-modules/baize { };
+
bambi = callPackage ../development/python-modules/bambi { };
pad4pi = callPackage ../development/python-modules/pad4pi { };
@@ -1466,8 +1468,6 @@ self: super: with self; {
bagit = callPackage ../development/python-modules/bagit { };
- baize = callPackage ../development/python-modules/baize { };
-
banal = callPackage ../development/python-modules/banal { };
bandcamp-api = callPackage ../development/python-modules/bandcamp-api { };
@@ -5460,10 +5460,9 @@ self: super: with self; {
gplaycli = callPackage ../development/python-modules/gplaycli { };
- gpgme = toPythonModule (pkgs.gpgme.override {
- pythonSupport = true;
- python3 = python;
- });
+ gpgme = callPackage ../development/python-modules/gpgme {
+ inherit (pkgs) gpgme;
+ };
gphoto2 = callPackage ../development/python-modules/gphoto2 { };
@@ -6017,8 +6016,6 @@ self: super: with self; {
huey = callPackage ../development/python-modules/huey { };
- hug = callPackage ../development/python-modules/hug { };
-
huggingface-hub = callPackage ../development/python-modules/huggingface-hub { };
huisbaasje-client = callPackage ../development/python-modules/huisbaasje-client { };
@@ -7362,6 +7359,7 @@ self: super: with self; {
p.override {
enablePython = true;
python3 = python;
+ python3Packages = pythonPackages;
})
(p: p.py)
];
@@ -9324,7 +9322,7 @@ self: super: with self; {
numpy_1 = callPackage ../development/python-modules/numpy/1.nix { };
numpy_2 = callPackage ../development/python-modules/numpy/2.nix { };
- numpy = if self.pythonOlder "3.13" then numpy_1 else numpy_2;
+ numpy = numpy_2;
numpy-groupies = callPackage ../development/python-modules/numpy-groupies { };
@@ -14126,7 +14124,7 @@ self: super: with self; {
rply = callPackage ../development/python-modules/rply { };
rpm = toPythonModule (pkgs.rpm.override {
- inherit python;
+ python3 = self.python;
});
rpmfile = callPackage ../development/python-modules/rpmfile { };
@@ -16270,9 +16268,7 @@ self: super: with self; {
trino-python-client = callPackage ../development/python-modules/trino-python-client { };
- trio = callPackage ../development/python-modules/trio {
- inherit (pkgs) coreutils;
- };
+ trio = callPackage ../development/python-modules/trio { };
trio-asyncio = callPackage ../development/python-modules/trio-asyncio { };
@@ -17469,9 +17465,7 @@ self: super: with self; {
uuid6 = callPackage ../development/python-modules/uuid6 { };
- uv = toPythonModule (pkgs.uv.override {
- python3Packages = self;
- });
+ uv = callPackage ../development/python-modules/uv { };
uvcclient = callPackage ../development/python-modules/uvcclient { };