diff --git a/.editorconfig b/.editorconfig
index 1d2259154e486..29e0a4aa85668 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/.github/labeler.yml b/.github/labeler.yml
index ff0ef5e6f1ef9..cf00b6e3e4b60 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -181,6 +181,7 @@
- pkgs/development/compilers/corretto/**/*
- pkgs/development/compilers/graalvm/**/*
- pkgs/development/compilers/openjdk/**/*
+ - pkgs/by-name/op/openjfx/**/*
- pkgs/development/compilers/semeru-bin/**/*
- pkgs/development/compilers/temurin-bin/**/*
- pkgs/development/compilers/zulu/**/*
diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md
index 4bb2b6e4f2550..0b5c26ef44a08 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 `nvimRequireCheck` 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 c43fcc152c135..cd44c2da1bed7 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -3769,6 +3769,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 63511e7e8b21b..c7b0b664940e2 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).
-
-| 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` |
+Generally, only the last SDK release for a major version is packaged.
+
+| Xcode version | SDK version | Nixpkgs attribute |
+|--------------------|--------------------|------------------------------|
+| 12.0–12.5.1 | 11.3 | `apple-sdk_11` / `apple-sdk` |
+| 13.0–13.4.1 | 12.3 | `apple-sdk_12` |
+| 14.0–14.3.1 | 13.3 | `apple-sdk_13` |
+| 15.0–15.4 | 14.4 | `apple-sdk_14` |
+| 16.0 | 15.0 | `apple-sdk_15` |
#### 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 d682eb815003c..00f7f3523aa48 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 87731089a9dd8..999215622dd2a 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
-
- 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 < {
+ 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
+
+ # 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 37461d7e49301..9a0eb89d55dbe 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -4,10 +4,21 @@
+- **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.
- `nixos-rebuild-ng`, a full rewrite of `nixos-rebuild` in Python, is available for testing. You can enable it by setting [system.rebuild.enableNg](options.html#opt-system.rebuild.enableNg) in your configuration (this will replace the old `nixos-rebuild`), or by adding `nixos-rebuild-ng` to your `environment.systemPackages` (in this case, it will live side-by-side with `nixos-rebuild` as `nixos-rebuild-ng`). It is expected that the next major version of NixOS (25.11) will enable `system.rebuild.enableNg` by default.
-
- A `nixos-rebuild build-image` sub-command has been added.
It allows users to build platform-specific (disk) images from their NixOS configurations. `nixos-rebuild build-image` works similar to the popular [nix-community/nixos-generators](https://github.com/nix-community/nixos-generators) project. See new [section on image building in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-image-nixos-rebuild-build-image).
diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix
index a40ef748f1f5c..b46910505f7d5 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
{
@@ -572,7 +567,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 6ea841b4d9ea5..c15a3fd20b021 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/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index c1c6fb225c3eb..a178dac8b47f5 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -6,7 +6,7 @@
makeWrapper,
pkg-config,
cmake,
- llvm,
+ llvm_18, # does not build with 19+ due to API changes
emscripten,
openssl,
libsndfile,
@@ -64,7 +64,7 @@ let
which
];
buildInputs = [
- llvm
+ llvm_18
emscripten
openssl
libsndfile
diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix
index bbb71ab8c8360..8d709faedf94a 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 81ac1609c4af4..9455874ded687 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -50,13 +50,19 @@ 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 1d4c619fb3491..5a90ea44a14c5 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/applications/audio/mpg123/default.nix
@@ -23,11 +23,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 = [
diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix
index 534c951092728..883ea94bf29c7 100644
--- a/pkgs/applications/audio/snapcast/default.nix
+++ b/pkgs/applications/audio/snapcast/default.nix
@@ -7,7 +7,7 @@
alsa-lib,
asio,
avahi,
- boost179,
+ boost,
flac,
libogg,
libvorbis,
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
# not needed
buildInputs =
[
- boost179
+ boost
asio
avahi
flac
diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix
index 2cf404acec5ee..9a45ba77ca6a4 100644
--- a/pkgs/applications/audio/sonic-pi/default.nix
+++ b/pkgs/applications/audio/sonic-pi/default.nix
@@ -109,6 +109,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;
@@ -140,9 +141,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/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix
index 54291ef25b9d9..3fb9f6a41b6e0 100644
--- a/pkgs/applications/audio/vorbis-tools/default.nix
+++ b/pkgs/applications/audio/vorbis-tools/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1c7h4ivgfdyygz2hyh6nfibxlkz8kdk868a576qkkjgj5gn78xyv";
};
- patches = lib.optionals stdenv.cc.isClang [
+ patches = [
# Fixes a call to undeclared function `utf8_decode`.
# https://github.com/xiph/vorbis-tools/pull/33
(fetchpatch {
diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix
index a11388ef4764f..14ca8b1a88b01 100644
--- a/pkgs/applications/blockchains/zcash/default.nix
+++ b/pkgs/applications/blockchains/zcash/default.nix
@@ -1,6 +1,6 @@
{
autoreconfHook,
- boost180,
+ boost,
cargo,
coreutils,
curl,
@@ -56,7 +56,7 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec {
buildInputs =
[
- boost180
+ boost
db62
libevent
libsodium
@@ -88,7 +88,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/build-support/wrapper.nix b/pkgs/applications/editors/emacs/build-support/wrapper.nix
index 606a7a500e33a..7a844759c5010 100644
--- a/pkgs/applications/editors/emacs/build-support/wrapper.nix
+++ b/pkgs/applications/editors/emacs/build-support/wrapper.nix
@@ -82,7 +82,7 @@ runCommand (lib.appendToName "with-packages" emacs).name
# well :D.
local varSlice="$var[*]"
# ''${..-} to hack around old bash empty array problem
- case "''${!varSlice-}" in
+ case " ''${!varSlice-} " in
*" $pkg "*) return 0 ;;
esac
unset -v varSlice
@@ -205,6 +205,8 @@ runCommand (lib.appendToName "with-packages" emacs).name
--subst-var-by bash ${emacs.stdenv.shell} \
--subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \
--subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp" \
+ --subst-var-by wrapperInvocationDirectory "$out/bin/" \
+ --subst-var-by wrapperInvocationName "$progname" \
--subst-var prog
chmod +x $out/bin/$progname
# Create a “NOP” binary wrapper for the pure sake of it becoming a
@@ -229,6 +231,8 @@ runCommand (lib.appendToName "with-packages" emacs).name
--subst-var-by bash ${emacs.stdenv.shell} \
--subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \
--subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp" \
+ --subst-var-by wrapperInvocationDirectory "$out/Applications/Emacs.app/Contents/MacOS/" \
+ --subst-var-by wrapperInvocationName "Emacs" \
--subst-var-by prog "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs"
chmod +x $out/Applications/Emacs.app/Contents/MacOS/Emacs
wrapProgramBinary $out/Applications/Emacs.app/Contents/MacOS/Emacs
diff --git a/pkgs/applications/editors/emacs/build-support/wrapper.sh b/pkgs/applications/editors/emacs/build-support/wrapper.sh
old mode 100644
new mode 100755
index 44762bd4582b0..e83308bf5b325
--- a/pkgs/applications/editors/emacs/build-support/wrapper.sh
+++ b/pkgs/applications/editors/emacs/build-support/wrapper.sh
@@ -50,4 +50,7 @@ export emacsWithPackages_siteLisp=@wrapperSiteLisp@
export EMACSNATIVELOADPATH="${newNativeLoadPath[*]}"
export emacsWithPackages_siteLispNative=@wrapperSiteLispNative@
+export emacsWithPackages_invocationDirectory=@wrapperInvocationDirectory@
+export emacsWithPackages_invocationName=@wrapperInvocationName@
+
exec @prog@ "$@"
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
index 0033e3e5cbbd6..fbbfc835bdc38 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
@@ -228,10 +228,10 @@
elpaBuild {
pname = "agitate";
ename = "agitate";
- version = "0.0.20240117.23316";
+ version = "0.0.20241021.65229";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/agitate-0.0.20240117.23316.tar";
- sha256 = "0md795hvmz15bb3vsji4p12g9lm8j34mj9wqq338dhn6zw91n5hi";
+ url = "https://elpa.gnu.org/devel/agitate-0.0.20241021.65229.tar";
+ sha256 = "11f1yj937wfnn6d12845pwa8045wp5pk9mbcvzhigni3jkm8820p";
};
packageRequires = [ ];
meta = {
@@ -312,10 +312,10 @@
elpaBuild {
pname = "altcaps";
ename = "altcaps";
- version = "1.2.0.0.20240913.70017";
+ version = "1.2.0.0.20241025.80421";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/altcaps-1.2.0.0.20240913.70017.tar";
- sha256 = "1pblmksnvjm88acv3l08zn6cm8h6kxdiiimxbsxdc16ldxhf9iji";
+ url = "https://elpa.gnu.org/devel/altcaps-1.2.0.0.20241025.80421.tar";
+ sha256 = "1qnrahxi23xyzqlp3hqmhhqj87w1yfsw4cbh3hd36h44f344nxp0";
};
packageRequires = [ ];
meta = {
@@ -419,10 +419,10 @@
elpaBuild {
pname = "async";
ename = "async";
- version = "1.9.9.0.20241005.182443";
+ version = "1.9.9.0.20241126.81020";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/async-1.9.9.0.20241005.182443.tar";
- sha256 = "11a8hy4y0rad9c38w74gpczzb45zgv63mikx9slkv5hfbhihjz2a";
+ url = "https://elpa.gnu.org/devel/async-1.9.9.0.20241126.81020.tar";
+ sha256 = "0h101k5s68kgki9s50pg2hgwqrbnf21mcvcwxgy9jbrbs64snh4a";
};
packageRequires = [ ];
meta = {
@@ -440,10 +440,10 @@
elpaBuild {
pname = "auctex";
ename = "auctex";
- version = "14.0.7.0.20241010.141835";
+ version = "14.0.7.0.20241129.84113";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/auctex-14.0.7.0.20241010.141835.tar";
- sha256 = "121b3xh5329mfwfm2zf19ddcp3hjbkwz4qnz1ybbd2y9yd6qw19z";
+ url = "https://elpa.gnu.org/devel/auctex-14.0.7.0.20241129.84113.tar";
+ sha256 = "0z7a9zsbljwzrn3xzn9hcl1zlqczafvcbx62cbmlrib0cknlxqp8";
};
packageRequires = [ ];
meta = {
@@ -462,10 +462,10 @@
elpaBuild {
pname = "auctex-cont-latexmk";
ename = "auctex-cont-latexmk";
- version = "0.2.0.20240625.221402";
+ version = "0.3.0.20241102.3051";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/auctex-cont-latexmk-0.2.0.20240625.221402.tar";
- sha256 = "1yxc34q68cnri7k9m2gdnhhwyqz0gs1ip2r956fbxv65s0s7nbab";
+ url = "https://elpa.gnu.org/devel/auctex-cont-latexmk-0.3.0.20241102.3051.tar";
+ sha256 = "0p054cf7hgn06chniz536ai8sj1j3n0mfssipmv101n5b7gw21p8";
};
packageRequires = [ auctex ];
meta = {
@@ -484,10 +484,10 @@
elpaBuild {
pname = "auctex-label-numbers";
ename = "auctex-label-numbers";
- version = "0.2.0.20240617.174703";
+ version = "0.2.0.20241019.12742";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/auctex-label-numbers-0.2.0.20240617.174703.tar";
- sha256 = "14zj8wgk1vs96z5sba4m3m0zhl02zr3mbapgpypf9ff4c28v8g1b";
+ url = "https://elpa.gnu.org/devel/auctex-label-numbers-0.2.0.20241019.12742.tar";
+ sha256 = "0y4y8267r3bmwshcb5qkfrpnaxs1zwy1rwdhngjci005n68bslk9";
};
packageRequires = [ auctex ];
meta = {
@@ -612,10 +612,10 @@
elpaBuild {
pname = "avy";
ename = "avy";
- version = "0.5.0.0.20230424.65712";
+ version = "0.5.0.0.20241101.125753";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/avy-0.5.0.0.20230424.65712.tar";
- sha256 = "1z7d59fif97j12jx9vmk2p91sr01d53gp57gjvqdcdr2lqvdsaz8";
+ url = "https://elpa.gnu.org/devel/avy-0.5.0.0.20241101.125753.tar";
+ sha256 = "0rg6jgq1iyhw7vwf8kv3mzjpwzbq44n5csv3lgd3hj8f72y4jpvb";
};
packageRequires = [ cl-lib ];
meta = {
@@ -676,10 +676,10 @@
elpaBuild {
pname = "beframe";
ename = "beframe";
- version = "1.1.1.0.20240913.70315";
+ version = "1.2.1.0.20241117.91644";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/beframe-1.1.1.0.20240913.70315.tar";
- sha256 = "0didf8l9rnkvymyv8qv4vc1q47c2xc8n8n7n74akw021mfvyld8v";
+ url = "https://elpa.gnu.org/devel/beframe-1.2.1.0.20241117.91644.tar";
+ sha256 = "0s7cc79zd3cvmpn2i8lkn8xqy35yizps6nwhqgpf77xfbp8k3n13";
};
packageRequires = [ ];
meta = {
@@ -697,10 +697,10 @@
elpaBuild {
pname = "bicep-ts-mode";
ename = "bicep-ts-mode";
- version = "0.1.3.0.20240530.63226";
+ version = "0.1.3.0.20241101.92331";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/bicep-ts-mode-0.1.3.0.20240530.63226.tar";
- sha256 = "0xmljjfx7a5b3jfqf7cbpb9102ci5vnkqqww1b328rr42v5sdmqm";
+ url = "https://elpa.gnu.org/devel/bicep-ts-mode-0.1.3.0.20241101.92331.tar";
+ sha256 = "0fnkzb4m0ank7892cjqjzxdjf1amjnpfbm3wh0g5j3xf44g8hk44";
};
packageRequires = [ ];
meta = {
@@ -754,20 +754,26 @@
) { };
bluetooth = callPackage (
{
+ compat,
dash,
elpaBuild,
fetchurl,
lib,
+ transient,
}:
elpaBuild {
pname = "bluetooth";
ename = "bluetooth";
- version = "0.3.1.0.20241007.201319";
+ version = "0.4.1.0.20241028.70437";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/bluetooth-0.3.1.0.20241007.201319.tar";
- sha256 = "1zq3169ci5ysdxh3cvp8dnnzcg032swgh4akfymmi8swm7p1laz0";
+ url = "https://elpa.gnu.org/devel/bluetooth-0.4.1.0.20241028.70437.tar";
+ sha256 = "0j4znabnbzdj2kskvma63svhiq2l3nahd7saqk2v2jc1xrzllfvm";
};
- packageRequires = [ dash ];
+ packageRequires = [
+ compat
+ dash
+ transient
+ ];
meta = {
homepage = "https://elpa.gnu.org/devel/bluetooth.html";
license = lib.licenses.free;
@@ -1035,10 +1041,10 @@
elpaBuild {
pname = "cape";
ename = "cape";
- version = "1.7.0.20241007.50103";
+ version = "1.7.0.20241123.92531";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/cape-1.7.0.20241007.50103.tar";
- sha256 = "0gqyr8d7yh0sqwrl62h6kb9j6zv578xsas0skhm51bgkv5v7px92";
+ url = "https://elpa.gnu.org/devel/cape-1.7.0.20241123.92531.tar";
+ sha256 = "0f1l510lzhd2p6003mnp4bvrhjqpqfvvz30lrj1ic9x453z80fpq";
};
packageRequires = [ compat ];
meta = {
@@ -1197,7 +1203,6 @@
) { };
cobol-mode = callPackage (
{
- cl-lib ? null,
elpaBuild,
fetchurl,
lib,
@@ -1205,12 +1210,12 @@
elpaBuild {
pname = "cobol-mode";
ename = "cobol-mode";
- version = "1.1.0.20241012.193933";
+ version = "1.1.0.20241020.181020";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/cobol-mode-1.1.0.20241012.193933.tar";
- sha256 = "0l04al26n7b6nh9824r75jv60byx32s0xk3b943d4lqn1g7ww9bv";
+ url = "https://elpa.gnu.org/devel/cobol-mode-1.1.0.20241020.181020.tar";
+ sha256 = "05vxahbqs8an5s5c7v40yhziaa61n5yg4j92k8pqjypqrwhpw7vw";
};
- packageRequires = [ cl-lib ];
+ packageRequires = [ ];
meta = {
homepage = "https://elpa.gnu.org/devel/cobol-mode.html";
license = lib.licenses.free;
@@ -1227,10 +1232,10 @@
elpaBuild {
pname = "code-cells";
ename = "code-cells";
- version = "0.4.0.20241003.103649";
+ version = "0.5.0.20241119.142112";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/code-cells-0.4.0.20241003.103649.tar";
- sha256 = "1lzr37w7i2bb2sqh48i92s6hbih1q0j311mavb8xsdsf04dz1yzb";
+ url = "https://elpa.gnu.org/devel/code-cells-0.5.0.20241119.142112.tar";
+ sha256 = "1jzqp6d7xj2ya18x0dahqn2if46wphbk63f76pw09bhwh71qc9g3";
};
packageRequires = [ compat ];
meta = {
@@ -1263,19 +1268,24 @@
) { };
comint-mime = callPackage (
{
+ compat,
elpaBuild,
fetchurl,
lib,
+ mathjax,
}:
elpaBuild {
pname = "comint-mime";
ename = "comint-mime";
- version = "0.6.0.20240928.153818";
+ version = "0.7.0.20241116.123039";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/comint-mime-0.6.0.20240928.153818.tar";
- sha256 = "1vhkv3a2vccj2lbb5dn1gz9dfni0f5y03qwfkyl6r785i0ss976i";
+ url = "https://elpa.gnu.org/devel/comint-mime-0.7.0.20241116.123039.tar";
+ sha256 = "0sypcmpx5fyl92kkcaas3k877lwqvy02694riqp0rpm5rnpr182v";
};
- packageRequires = [ ];
+ packageRequires = [
+ compat
+ mathjax
+ ];
meta = {
homepage = "https://elpa.gnu.org/devel/comint-mime.html";
license = lib.licenses.free;
@@ -1312,10 +1322,10 @@
elpaBuild {
pname = "company";
ename = "company";
- version = "1.0.2.0.20240926.212727";
+ version = "1.0.2.0.20241106.200056";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/company-1.0.2.0.20240926.212727.tar";
- sha256 = "1qp8k5f0pa4c3mlk48dw3j9y67fhlfyfb123jbl213gdc6wlqjp9";
+ url = "https://elpa.gnu.org/devel/company-1.0.2.0.20241106.200056.tar";
+ sha256 = "10pn52y3pgi2cbqi96sr3gghashsqvinc7lbylwg7mrhjgj0jdnv";
};
packageRequires = [ ];
meta = {
@@ -1408,10 +1418,10 @@
elpaBuild {
pname = "compat";
ename = "compat";
- version = "30.0.0.0.0.20240910.150701";
+ version = "30.0.0.0.0.20241120.163841";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/compat-30.0.0.0.0.20240910.150701.tar";
- sha256 = "1mi1fk574fdi1xx6pj0i449ng9y8a8hpj46dxmjjl8kgzipi79pq";
+ url = "https://elpa.gnu.org/devel/compat-30.0.0.0.0.20241120.163841.tar";
+ sha256 = "0a67xpvjfzzbhwflldqhs8gd6cb38m6gqlv6il33d4w7wsnch4p2";
};
packageRequires = [ seq ];
meta = {
@@ -1451,10 +1461,10 @@
elpaBuild {
pname = "consult";
ename = "consult";
- version = "1.8.0.20241001.205748";
+ version = "1.8.0.20241201.134410";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/consult-1.8.0.20241001.205748.tar";
- sha256 = "1y9mc132c4azj0jzcwy4dw22ch78aq0c3zl3amrvmj2ypnbjxmyg";
+ url = "https://elpa.gnu.org/devel/consult-1.8.0.20241201.134410.tar";
+ sha256 = "11ndnrjfk9s99kyyygyip8bwx0icb2n8bfxk05g3ll43scblpnpx";
};
packageRequires = [ compat ];
meta = {
@@ -1474,10 +1484,10 @@
elpaBuild {
pname = "consult-denote";
ename = "consult-denote";
- version = "0.2.1.0.20240915.62227";
+ version = "0.2.2.0.20241104.75213";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/consult-denote-0.2.1.0.20240915.62227.tar";
- sha256 = "062wzk3yq2bbav24mxw184chv0g76xn7l1panvl4nwjsxsr3vxra";
+ url = "https://elpa.gnu.org/devel/consult-denote-0.2.2.0.20241104.75213.tar";
+ sha256 = "17pqw2l9qdfqi5scbq7n7kr7x3ypv1l06hf6ck6s36cly8mnk6rb";
};
packageRequires = [
consult
@@ -1494,21 +1504,17 @@
consult,
elpaBuild,
fetchurl,
- haskell-mode,
lib,
}:
elpaBuild {
pname = "consult-hoogle";
ename = "consult-hoogle";
- version = "0.2.2.0.20240922.132051";
+ version = "0.3.0.0.20241110.114039";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/consult-hoogle-0.2.2.0.20240922.132051.tar";
- sha256 = "11x88j0j7lxfrf2lww4h9dw1m4sbxwz5d615cl8qsr2hsa46bv75";
+ url = "https://elpa.gnu.org/devel/consult-hoogle-0.3.0.0.20241110.114039.tar";
+ sha256 = "1ghirvjn26dhhh9ivdwc20z0ydd6k682mbs9l1i3xk1vha6fxni6";
};
- packageRequires = [
- consult
- haskell-mode
- ];
+ packageRequires = [ consult ];
meta = {
homepage = "https://elpa.gnu.org/devel/consult-hoogle.html";
license = lib.licenses.free;
@@ -1525,10 +1531,10 @@
elpaBuild {
pname = "consult-recoll";
ename = "consult-recoll";
- version = "0.8.1.0.20231211.122134";
+ version = "0.8.1.0.20241119.180703";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/consult-recoll-0.8.1.0.20231211.122134.tar";
- sha256 = "1hpgcqbnvqcd6vzhxqi4axihjyp764hvbggk1skviys2apywk4s1";
+ url = "https://elpa.gnu.org/devel/consult-recoll-0.8.1.0.20241119.180703.tar";
+ sha256 = "0bha88jfb68bmgn4mfi04762ik8f3d6sxhrbpjc4ra0k3yyn2286";
};
packageRequires = [ consult ];
meta = {
@@ -1568,10 +1574,10 @@
elpaBuild {
pname = "corfu";
ename = "corfu";
- version = "1.5.0.20241001.155010";
+ version = "1.5.0.20241127.155437";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/corfu-1.5.0.20241001.155010.tar";
- sha256 = "0xmki9d0szqpqg1agyx9l6viqmcw6ndwj9mi4zkmxqyy8589qf16";
+ url = "https://elpa.gnu.org/devel/corfu-1.5.0.20241127.155437.tar";
+ sha256 = "15xs0mdbw5h84m5msviw6vp73yxjxkh6hynzaa011a8xwaz7r5v1";
};
packageRequires = [ compat ];
meta = {
@@ -1637,10 +1643,10 @@
elpaBuild {
pname = "cpio-mode";
ename = "cpio-mode";
- version = "0.17.0.20211211.193556";
+ version = "0.17.0.20241101.133717";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/cpio-mode-0.17.0.20211211.193556.tar";
- sha256 = "0z9dkdz1s1b7gfd0fgfxjdvbjlwwqwa6q4jjf8kkvvkgwwvqv3yq";
+ url = "https://elpa.gnu.org/devel/cpio-mode-0.17.0.20241101.133717.tar";
+ sha256 = "0kf5h4x3yz69360vp3ikqxrg1nx4cxnlv01kgfpm5kcr94zdzyka";
};
packageRequires = [ ];
meta = {
@@ -1679,10 +1685,10 @@
elpaBuild {
pname = "crdt";
ename = "crdt";
- version = "0.3.5.0.20230213.22302";
+ version = "0.3.5.0.20241129.104719";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/crdt-0.3.5.0.20230213.22302.tar";
- sha256 = "0cl97di7s5a1v6widil63pwzywxpcxmhvhp34kqn256czsliv4pw";
+ url = "https://elpa.gnu.org/devel/crdt-0.3.5.0.20241129.104719.tar";
+ sha256 = "0aad3acn44av7c3cfdiyivqryvf3f330mm38w5hirv5v3zyx5arx";
};
packageRequires = [ ];
meta = {
@@ -1785,10 +1791,10 @@
elpaBuild {
pname = "cursory";
ename = "cursory";
- version = "1.1.0.0.20240914.63105";
+ version = "1.1.0.0.20241025.80704";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/cursory-1.1.0.0.20240914.63105.tar";
- sha256 = "0g5mv4sabmyz5d9b43zby6cm2bg6sfh3s0hn1wm86zv5zpzpy0hq";
+ url = "https://elpa.gnu.org/devel/cursory-1.1.0.0.20241025.80704.tar";
+ sha256 = "1d4wwpmzvyspdz0igazh5v4nskxfbr6kh4xawfnh01fxg3i5m4dk";
};
packageRequires = [ ];
meta = {
@@ -1828,10 +1834,10 @@
elpaBuild {
pname = "dape";
ename = "dape";
- version = "0.16.0.0.20241013.222215";
+ version = "0.17.0.0.20241203.221759";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/dape-0.16.0.0.20241013.222215.tar";
- sha256 = "0nfs1293sb5m5dn7cz7z983q7kp5qb7b5bmv54zp9lx33kxm5z9z";
+ url = "https://elpa.gnu.org/devel/dape-0.17.0.0.20241203.221759.tar";
+ sha256 = "1clhs99fh4d15mn2r5rpj9ag63nk8dksnr99zb81ywnvhf1934i0";
};
packageRequires = [ jsonrpc ];
meta = {
@@ -1915,10 +1921,10 @@
elpaBuild {
pname = "debbugs";
ename = "debbugs";
- version = "0.41.0.20241011.103524";
+ version = "0.42.0.20241107.85529";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/debbugs-0.41.0.20241011.103524.tar";
- sha256 = "1lgr0bcaqifxmf27mhlhbyxbfbz98ykdzfmjhp8hbhjab08wxisg";
+ url = "https://elpa.gnu.org/devel/debbugs-0.42.0.20241107.85529.tar";
+ sha256 = "0vmd0qmfp05xbq504mh2xh98l0h48vn3ki8c1sl26i2y2pjvy6bf";
};
packageRequires = [ soap-client ];
meta = {
@@ -1962,10 +1968,10 @@
elpaBuild {
pname = "denote";
ename = "denote";
- version = "3.1.0.0.20241011.101951";
+ version = "3.1.0.0.20241203.81843";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/denote-3.1.0.0.20241011.101951.tar";
- sha256 = "0m38i2pzl4182bxk356hwcja2j9xs0syq8qjdsydh80jaq8j2rsy";
+ url = "https://elpa.gnu.org/devel/denote-3.1.0.0.20241203.81843.tar";
+ sha256 = "1irr0z942qdjypaxx6q1scndzzkby0kcsa18jqsxnrc5np4f8p3i";
};
packageRequires = [ ];
meta = {
@@ -2023,16 +2029,20 @@
elpaBuild,
fetchurl,
lib,
+ mathjax,
}:
elpaBuild {
pname = "devdocs";
ename = "devdocs";
- version = "0.6.1.0.20241006.5137";
+ version = "0.6.1.0.20241113.134137";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/devdocs-0.6.1.0.20241006.5137.tar";
- sha256 = "19xbq406mlj6nm7dfp38kisxabjdqr89nsvnaghjilpc59bjqnxj";
+ url = "https://elpa.gnu.org/devel/devdocs-0.6.1.0.20241113.134137.tar";
+ sha256 = "0p8p0bp9wyrl4xqnj60k2hxmqcg40angzhsc240cvlyfg965ixx1";
};
- packageRequires = [ compat ];
+ packageRequires = [
+ compat
+ mathjax
+ ];
meta = {
homepage = "https://elpa.gnu.org/devel/devdocs.html";
license = lib.licenses.free;
@@ -2098,10 +2108,10 @@
elpaBuild {
pname = "diff-hl";
ename = "diff-hl";
- version = "1.10.0.0.20241012.214233";
+ version = "1.10.0.0.20241128.233206";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/diff-hl-1.10.0.0.20241012.214233.tar";
- sha256 = "0i681c501a6hyzik6hrlwdgmq46ajj62hizm7j525wpwlv45012g";
+ url = "https://elpa.gnu.org/devel/diff-hl-1.10.0.0.20241128.233206.tar";
+ sha256 = "1728i37sz52hf2bsbr5msvzciqdcn98xlnv812sd7mc7zz6j2q27";
};
packageRequires = [ cl-lib ];
meta = {
@@ -2225,10 +2235,10 @@
elpaBuild {
pname = "dired-preview";
ename = "dired-preview";
- version = "0.3.0.0.20240916.102011";
+ version = "0.3.0.0.20241025.80757";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/dired-preview-0.3.0.0.20240916.102011.tar";
- sha256 = "1yap9a1ywdld13pcbqgx42sczyah9rg398jpdlg93dl6a2df5ccw";
+ url = "https://elpa.gnu.org/devel/dired-preview-0.3.0.0.20241025.80757.tar";
+ sha256 = "0xw629nhbcbk5sndgxgwl6nwf5rva7nj2h87fx73dy1fb89jz827";
};
packageRequires = [ ];
meta = {
@@ -2554,10 +2564,10 @@
elpaBuild {
pname = "eev";
ename = "eev";
- version = "20241002.0.20241013.214806";
+ version = "20241123.0.20241202.94858";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/eev-20241002.0.20241013.214806.tar";
- sha256 = "19694hal4v7qfrpjmpm1m6yfgqmgyvzf5cwkiz290m3nc65znnzw";
+ url = "https://elpa.gnu.org/devel/eev-20241123.0.20241202.94858.tar";
+ sha256 = "0id1rqva96hpn6hfn3iiprwh5k99g3cs6bn368263m2h6xvrgzsh";
};
packageRequires = [ ];
meta = {
@@ -2575,10 +2585,10 @@
elpaBuild {
pname = "ef-themes";
ename = "ef-themes";
- version = "1.8.0.0.20241007.133203";
+ version = "1.9.0.0.20241116.183040";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/ef-themes-1.8.0.0.20241007.133203.tar";
- sha256 = "07dzmvbzvyyxd747kgdsjwgg95minzfn5kw74qhy8x3xh95n6wwl";
+ url = "https://elpa.gnu.org/devel/ef-themes-1.9.0.0.20241116.183040.tar";
+ sha256 = "1xyw2pq4mv5pmssngqbvqbzqkirxm4xwg4xfbninwrk5474kmhip";
};
packageRequires = [ ];
meta = {
@@ -2605,10 +2615,10 @@
elpaBuild {
pname = "eglot";
ename = "eglot";
- version = "1.17.0.20241012.55327";
+ version = "1.17.0.20241024.85007";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/eglot-1.17.0.20241012.55327.tar";
- sha256 = "14clgkni1awzac58ffqx9cwjy939y4y0fmzjkhnahii5sj1hp2mj";
+ url = "https://elpa.gnu.org/devel/eglot-1.17.0.20241024.85007.tar";
+ sha256 = "158022p4711xymcnkgck2bnv6w2bxj78kd7zgnxh7wp5424h4zd0";
};
packageRequires = [
compat
@@ -2708,10 +2718,10 @@
elpaBuild {
pname = "elisa";
ename = "elisa";
- version = "1.0.4.0.20240721.124701";
+ version = "1.1.3.0.20241123.220535";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/elisa-1.0.4.0.20240721.124701.tar";
- sha256 = "0p903ljagaza0n2kw2hicvara903mwwjia4587wqwvydrfvhal7a";
+ url = "https://elpa.gnu.org/devel/elisa-1.1.3.0.20241123.220535.tar";
+ sha256 = "0zvjnz4qxaxm2akg0hppyn8vn77zvmbgnw85mms2cq4148w7br2z";
};
packageRequires = [
async
@@ -2754,19 +2764,21 @@
lib,
llm,
spinner,
+ transient,
}:
elpaBuild {
pname = "ellama";
ename = "ellama";
- version = "0.11.14.0.20240915.152338";
+ version = "0.13.0.0.20241129.214739";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/ellama-0.11.14.0.20240915.152338.tar";
- sha256 = "0qxwhk6kdj9w1436p7hxlwhi7c9mb8j3ghrp8sskcqy6dck7mqn3";
+ url = "https://elpa.gnu.org/devel/ellama-0.13.0.0.20241129.214739.tar";
+ sha256 = "1242ra8fbyq5lci44myvl62k76c234kxa0lsim1rmnbpsa3w3h0p";
};
packageRequires = [
compat
llm
spinner
+ transient
];
meta = {
homepage = "https://elpa.gnu.org/devel/ellama.html";
@@ -2861,10 +2873,10 @@
elpaBuild {
pname = "ement";
ename = "ement";
- version = "0.16.0.20241012.164056";
+ version = "0.17pre0.20241122.210222";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/ement-0.16.0.20241012.164056.tar";
- sha256 = "0fsck2gx84y8r94770zhjiq37g97vgc61dkrp9k7f3q4xb05gqvi";
+ url = "https://elpa.gnu.org/devel/ement-0.17pre0.20241122.210222.tar";
+ sha256 = "1gn5hjlggcs7p31mkr8vg398jgzsnhjv04g1hpx4b03j31rxwhxl";
};
packageRequires = [
map
@@ -2893,10 +2905,10 @@
elpaBuild {
pname = "emms";
ename = "emms";
- version = "20.1.0.20240924.230829";
+ version = "20.2.0.20241129.151319";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/emms-20.1.0.20240924.230829.tar";
- sha256 = "1prhwlhfvfr81j02xsadh8gw1qbirmmzlhafnwq9w1qcaz9jnclw";
+ url = "https://elpa.gnu.org/devel/emms-20.2.0.20241129.151319.tar";
+ sha256 = "17rqxmrcr3p150nhi2yyn21g7hg68yjpxdg7bjdpif5086h8snff";
};
packageRequires = [
cl-lib
@@ -2982,10 +2994,10 @@
elpaBuild {
pname = "erc";
ename = "erc";
- version = "5.6.1snapshot0.20241011.161309";
+ version = "5.6.1snapshot0.20241201.105608";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/erc-5.6.1snapshot0.20241011.161309.tar";
- sha256 = "1pps1r3b49zppdqdfd4ikh121myw7fwpnk0glmr27d7fdrihwfmk";
+ url = "https://elpa.gnu.org/devel/erc-5.6.1snapshot0.20241201.105608.tar";
+ sha256 = "080ppzpc7r1myl2xig9jlzns9j8sbyd7qdmmijiwcfwgl6dsjg3b";
};
packageRequires = [ compat ];
meta = {
@@ -3029,10 +3041,10 @@
elpaBuild {
pname = "ess";
ename = "ess";
- version = "24.1.1.0.20240821.145259";
+ version = "24.1.1.0.20241127.102031";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/ess-24.1.1.0.20240821.145259.tar";
- sha256 = "15qani3cvb5sb087k8rmsm55h3fx6dhhhjkv18c50060phwxr2q5";
+ url = "https://elpa.gnu.org/devel/ess-24.1.1.0.20241127.102031.tar";
+ sha256 = "19gkxkslg9y84fc9shc655fqgcr27rbjnn4rsnhkpqvwbzn54kkq";
};
packageRequires = [ ];
meta = {
@@ -3149,10 +3161,10 @@
elpaBuild {
pname = "exwm";
ename = "exwm";
- version = "0.32.0.20241006.3203";
+ version = "0.32.0.20241118.90416";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/exwm-0.32.0.20241006.3203.tar";
- sha256 = "0rbn0w867wihfpg2d1hffnnvif300f8b7ss6a4r0ls6929i8qcr5";
+ url = "https://elpa.gnu.org/devel/exwm-0.32.0.20241118.90416.tar";
+ sha256 = "1ssryfd1x9cidch3w0xq8750c1ifg58b672grw8x70spy2mrvqr1";
};
packageRequires = [
compat
@@ -3304,10 +3316,10 @@
elpaBuild {
pname = "flymake";
ename = "flymake";
- version = "1.3.7.0.20240829.203038";
+ version = "1.3.7.0.20241024.85007";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20240829.203038.tar";
- sha256 = "1iswrkqxhsfrqgm976iyd5rdvf6q99h805b4cdnbynfix3xp207j";
+ url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20241024.85007.tar";
+ sha256 = "0vhfxvml2s678pxivss1nmm0ym62nxc4ab221jm6x8jpd6j1lff5";
};
packageRequires = [
eldoc
@@ -3820,10 +3832,10 @@
elpaBuild {
pname = "greader";
ename = "greader";
- version = "0.11.18.0.20240921.191926";
+ version = "0.11.18.0.20241025.123748";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/greader-0.11.18.0.20240921.191926.tar";
- sha256 = "1bnss7xgzzclkk715i3v6bpr2zn1b85hr7mpxvpprm3hknpalq5p";
+ url = "https://elpa.gnu.org/devel/greader-0.11.18.0.20241025.123748.tar";
+ sha256 = "17sh65y476zd5lwmvialk399g5gl11d52p4jmhgjv7kpb4xl3jly";
};
packageRequires = [
compat
@@ -3865,10 +3877,10 @@
elpaBuild {
pname = "gtags-mode";
ename = "gtags-mode";
- version = "1.8.1.0.20240808.153728";
+ version = "1.8.2.0.20241113.2312";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/gtags-mode-1.8.1.0.20240808.153728.tar";
- sha256 = "1bfblsay8qsglhh4iqhv9wl8s445piwykyx4lz7cbn74wpn2prin";
+ url = "https://elpa.gnu.org/devel/gtags-mode-1.8.2.0.20241113.2312.tar";
+ sha256 = "0mxw27kn5f85rprk13171k56q2dq2gfmvgyhfxrbz3zj7ijvrfg1";
};
packageRequires = [ ];
meta = {
@@ -4060,10 +4072,10 @@
elpaBuild {
pname = "hyperbole";
ename = "hyperbole";
- version = "9.0.2pre0.20241008.11453";
+ version = "9.0.2pre0.20241126.91748";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20241008.11453.tar";
- sha256 = "015cwlrqz4pyxk6ffki0l44ycajzd509vlbz10skwikl2xqmp01x";
+ url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20241126.91748.tar";
+ sha256 = "136xbqhm4gwfw7cyd1p45hx6pnc6wbqc7dmv6q620vall1r9s7nb";
};
packageRequires = [ ];
meta = {
@@ -4124,10 +4136,10 @@
elpaBuild {
pname = "indent-bars";
ename = "indent-bars";
- version = "0.8.0.20241013.161522";
+ version = "0.8.2.0.20241126.83433";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/indent-bars-0.8.0.20241013.161522.tar";
- sha256 = "0h7r1lm06rybqp7lq3ggclgv8b2akgqabizqy6xzimmibgf61vwj";
+ url = "https://elpa.gnu.org/devel/indent-bars-0.8.2.0.20241126.83433.tar";
+ sha256 = "1jzw83jwg3pwl0y0dpmvzjmwykfgmrd0fr0ik2l4kplwcyv5hrwj";
};
packageRequires = [ compat ];
meta = {
@@ -4145,10 +4157,10 @@
elpaBuild {
pname = "inspector";
ename = "inspector";
- version = "0.38.0.20240911.94847";
+ version = "0.38.0.20241108.155318";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/inspector-0.38.0.20240911.94847.tar";
- sha256 = "1w7zaxf77f7r0bdwqa276vqnhql1jsxl3y13gc13ikibhxb5jf2w";
+ url = "https://elpa.gnu.org/devel/inspector-0.38.0.20241108.155318.tar";
+ sha256 = "1x0cgn7w1gdm60hg7a2ym82hvf60l594v7k4mrln87m1yk4wqgak";
};
packageRequires = [ ];
meta = {
@@ -4327,10 +4339,10 @@
elpaBuild {
pname = "ivy-posframe";
ename = "ivy-posframe";
- version = "0.6.3.0.20211217.23411";
+ version = "0.6.3.0.20241023.25839";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/ivy-posframe-0.6.3.0.20211217.23411.tar";
- sha256 = "03v4k7hx2bdxhjghanpmy9r50q9ksmz2xcwypxxhyywlglfk0d69";
+ url = "https://elpa.gnu.org/devel/ivy-posframe-0.6.3.0.20241023.25839.tar";
+ sha256 = "01wiviygb0c5kjdds1fk10jf9rcf6f59iychqp42yk2lghhw9k1z";
};
packageRequires = [
ivy
@@ -4393,10 +4405,10 @@
elpaBuild {
pname = "javaimp";
ename = "javaimp";
- version = "0.9.1.0.20221221.80314";
+ version = "0.9.1.0.20241129.211411";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/javaimp-0.9.1.0.20221221.80314.tar";
- sha256 = "0dj7mzdfj1gvd18mdnf19pv5zljhhada6a5s3bm5drpw12vx5334";
+ url = "https://elpa.gnu.org/devel/javaimp-0.9.1.0.20241129.211411.tar";
+ sha256 = "1i7jga44n7rdfb51y72x6c3j0k2pwb90x1xz3m0j0iq4avy89dj9";
};
packageRequires = [ ];
meta = {
@@ -4437,10 +4449,10 @@
elpaBuild {
pname = "jinx";
ename = "jinx";
- version = "1.10.0.20240926.181428";
+ version = "1.10.0.20241201.134324";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/jinx-1.10.0.20240926.181428.tar";
- sha256 = "1qn5lrc2843x1bihg38iba8dc4r24d257hwnyqjfpgpffak7ma4b";
+ url = "https://elpa.gnu.org/devel/jinx-1.10.0.20241201.134324.tar";
+ sha256 = "19clhxy5p41ri0b2fsdk2rc9wf37nn90ya5mkhpn8mccfcs9kh7y";
};
packageRequires = [ compat ];
meta = {
@@ -4523,10 +4535,10 @@
elpaBuild {
pname = "jsonrpc";
ename = "jsonrpc";
- version = "1.0.25.0.20240720.4208";
+ version = "1.0.25.0.20241130.63516";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/jsonrpc-1.0.25.0.20240720.4208.tar";
- sha256 = "0r5aw8w5qxf2kqxh4x4q1lyhci2cbcxf31shshagf16zpcm71qz3";
+ url = "https://elpa.gnu.org/devel/jsonrpc-1.0.25.0.20241130.63516.tar";
+ sha256 = "1z2vwqj213bpygq5lp8b7inxjki9kzha6ymz315ls5w06kccvw3v";
};
packageRequires = [ ];
meta = {
@@ -4630,10 +4642,10 @@
elpaBuild {
pname = "kubed";
ename = "kubed";
- version = "0.4.1.0.20241004.194446";
+ version = "0.4.2.0.20241022.131056";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/kubed-0.4.1.0.20241004.194446.tar";
- sha256 = "1ja8kk7vpwfayqkcf7maz8y25xlxl77i1mk8s4qq9q6fm06n14w5";
+ url = "https://elpa.gnu.org/devel/kubed-0.4.2.0.20241022.131056.tar";
+ sha256 = "02sg5h2iv9zb2i1prxab9xcm682j8y5c3h10cqd66gcvpiwb790f";
};
packageRequires = [ ];
meta = {
@@ -4698,10 +4710,10 @@
elpaBuild {
pname = "leaf";
ename = "leaf";
- version = "4.5.5.0.20230803.74443";
+ version = "4.5.5.0.20241018.51628";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/leaf-4.5.5.0.20230803.74443.tar";
- sha256 = "1xkqwkkk3k5k3lg10amh2lvric2xcqd35ad30c0jyvzn9fsxkbn0";
+ url = "https://elpa.gnu.org/devel/leaf-4.5.5.0.20241018.51628.tar";
+ sha256 = "1d2y0qhy9qz0wahclwnskf5kdqhr51iljnrki7jmkzxfya3r1dwa";
};
packageRequires = [ ];
meta = {
@@ -4888,10 +4900,10 @@
elpaBuild {
pname = "llm";
ename = "llm";
- version = "0.17.4.0.20241003.232025";
+ version = "0.19.1.0.20241129.152751";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/llm-0.17.4.0.20241003.232025.tar";
- sha256 = "1wsbf0c0hmspw3sx94ji0xr9h65q1xbls1nhhadajayclrp3rxhq";
+ url = "https://elpa.gnu.org/devel/llm-0.19.1.0.20241129.152751.tar";
+ sha256 = "07jcm718wivagwnr53rriwa7gp3zkxgybff5wivi1n6xdfhm9b1y";
};
packageRequires = [
plz
@@ -5127,10 +5139,10 @@
elpaBuild {
pname = "marginalia";
ename = "marginalia";
- version = "1.7.0.20240926.91821";
+ version = "1.7.0.20241124.113844";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/marginalia-1.7.0.20240926.91821.tar";
- sha256 = "1rdv3jkc7g59gypa949har94wl0sqpr6qpbjcravailbhd8a4zsn";
+ url = "https://elpa.gnu.org/devel/marginalia-1.7.0.20241124.113844.tar";
+ sha256 = "19b1xc3q4mdzlipjn47drhg4k818iigf95jy2cj4hcmg6d6k37r7";
};
packageRequires = [ compat ];
meta = {
@@ -5181,6 +5193,27 @@
};
}
) { };
+ mathjax = callPackage (
+ {
+ elpaBuild,
+ fetchurl,
+ lib,
+ }:
+ elpaBuild {
+ pname = "mathjax";
+ ename = "mathjax";
+ version = "0.1.0.20241113.83941";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/devel/mathjax-0.1.0.20241113.83941.tar";
+ sha256 = "1n49nj70bpxpm72caffx0lmcnlfqdljy8sn8mzwhfiingrif2spb";
+ };
+ packageRequires = [ ];
+ meta = {
+ homepage = "https://elpa.gnu.org/devel/mathjax.html";
+ license = lib.licenses.free;
+ };
+ }
+ ) { };
mct = callPackage (
{
elpaBuild,
@@ -5190,10 +5223,10 @@
elpaBuild {
pname = "mct";
ename = "mct";
- version = "1.0.0.0.20240913.71126";
+ version = "1.0.0.0.20241025.81140";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/mct-1.0.0.0.20240913.71126.tar";
- sha256 = "0nxw6vnc9q63vnly9ffvrj8m1dnn9wlhcidld478p07qlighp8lm";
+ url = "https://elpa.gnu.org/devel/mct-1.0.0.0.20241025.81140.tar";
+ sha256 = "121mb4aa0bgwndbvgxh8j9ra52ji7qn5vdrf7whn93rqaaygpk87";
};
packageRequires = [ ];
meta = {
@@ -5382,10 +5415,10 @@
elpaBuild {
pname = "modus-themes";
ename = "modus-themes";
- version = "4.5.0.0.20241007.133219";
+ version = "4.6.0.0.20241120.54202";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/modus-themes-4.5.0.0.20241007.133219.tar";
- sha256 = "1smf7zlwvkinjm6kdlmb5qm2dc9qxg5dpn0nyd7vjz1krycmvni6";
+ url = "https://elpa.gnu.org/devel/modus-themes-4.6.0.0.20241120.54202.tar";
+ sha256 = "189vcdd2895x3smydr84s8ldjvi92bkh4samk4qi1gxdj9r397hg";
};
packageRequires = [ ];
meta = {
@@ -5724,10 +5757,10 @@
elpaBuild {
pname = "notmuch-indicator";
ename = "notmuch-indicator";
- version = "1.2.0.0.20240913.71211";
+ version = "1.2.0.0.20241025.81216";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/notmuch-indicator-1.2.0.0.20240913.71211.tar";
- sha256 = "1h6ain7zhr6qv29r9i9zwyha3074198igq61swpx3xhajskkxa0y";
+ url = "https://elpa.gnu.org/devel/notmuch-indicator-1.2.0.0.20241025.81216.tar";
+ sha256 = "1n29yddv4pbiwjfpa0ra3gvalhvcr5pxbzaqrg14z2grgqwbi4rh";
};
packageRequires = [ ];
meta = {
@@ -5813,10 +5846,10 @@
elpaBuild {
pname = "ob-asymptote";
ename = "ob-asymptote";
- version = "1.0.0.20230908.121002";
+ version = "1.0.1.0.20241018.115612";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/ob-asymptote-1.0.0.20230908.121002.tar";
- sha256 = "1lpv4rf7qf1yvpm4j3wiajdk72lgl4gk8qgwflzyq9yvmksakdvp";
+ url = "https://elpa.gnu.org/devel/ob-asymptote-1.0.1.0.20241018.115612.tar";
+ sha256 = "0hr0rfj344yshrplcavncphrl16a1n7gx1r906dma53x7nmkhcf7";
};
packageRequires = [ ];
meta = {
@@ -5963,10 +5996,10 @@
elpaBuild {
pname = "org";
ename = "org";
- version = "9.8pre0.20241013.101728";
+ version = "9.8pre0.20241127.183434";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/org-9.8pre0.20241013.101728.tar";
- sha256 = "1lr95jkjdp19cv5k21h5yn29sy744sxr2995v4a6pkjif0dnvj5v";
+ url = "https://elpa.gnu.org/devel/org-9.8pre0.20241127.183434.tar";
+ sha256 = "1v7inlp4mm2c9395jw814krg2yp5h70h0cj0q86m26zgg9f2wicy";
};
packageRequires = [ ];
meta = {
@@ -5985,10 +6018,10 @@
elpaBuild {
pname = "org-contacts";
ename = "org-contacts";
- version = "1.1.0.20240807.73345";
+ version = "1.1.0.20241203.194117";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/org-contacts-1.1.0.20240807.73345.tar";
- sha256 = "1j0qwzhxaj1499qk0bjfvvgywi34v7p9cmpc585kxcanb8g1lvg2";
+ url = "https://elpa.gnu.org/devel/org-contacts-1.1.0.20241203.194117.tar";
+ sha256 = "03mbak4dv1z49j3sa3v97vmk82b4s5j5fhnwxdy7qqkf7v06jrha";
};
packageRequires = [ org ];
meta = {
@@ -6055,10 +6088,10 @@
elpaBuild {
pname = "org-modern";
ename = "org-modern";
- version = "1.5.0.20240926.92259";
+ version = "1.5.0.20241022.103450";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/org-modern-1.5.0.20240926.92259.tar";
- sha256 = "0i99ky6csk3gvshvr2f6gpql1k3a8dl6xvnyd8nk33jydacjs6bl";
+ url = "https://elpa.gnu.org/devel/org-modern-1.5.0.20241022.103450.tar";
+ sha256 = "1hbgf2yggrp2jfcgi1d9wk2fg3f7f082g8xn60znkyaa7zfsn5nb";
};
packageRequires = [ compat ];
meta = {
@@ -6124,10 +6157,10 @@
elpaBuild {
pname = "org-remark";
ename = "org-remark";
- version = "1.2.2.0.20241010.195850";
+ version = "1.2.2.0.20241102.192817";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/org-remark-1.2.2.0.20241010.195850.tar";
- sha256 = "1y260csn6810dbv7libfyjlrx6r1rcna3kh4wbd5mn79ik1f8f6z";
+ url = "https://elpa.gnu.org/devel/org-remark-1.2.2.0.20241102.192817.tar";
+ sha256 = "0mac9diswm1pavhbf5hc7hw7p60ppajcbnyak9b8insp1spfbbbw";
};
packageRequires = [ org ];
meta = {
@@ -6232,10 +6265,10 @@
elpaBuild {
pname = "osm";
ename = "osm";
- version = "1.4.0.20241006.1334";
+ version = "1.4.0.20241122.13029";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/osm-1.4.0.20241006.1334.tar";
- sha256 = "0k6ncc3xlvz804m0ixqn2p18ggq6knx7xpvzcl99fcn85x0wqals";
+ url = "https://elpa.gnu.org/devel/osm-1.4.0.20241122.13029.tar";
+ sha256 = "0c4b0ddb5l2pipnnwcqqfjj08v9ppr93ailxq000hd683mw48kaz";
};
packageRequires = [ compat ];
meta = {
@@ -6487,10 +6520,10 @@
elpaBuild {
pname = "pinentry";
ename = "pinentry";
- version = "0.1.0.20231126.141402";
+ version = "0.1.0.20241123.141";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/pinentry-0.1.0.20231126.141402.tar";
- sha256 = "056h9zfbk4mfpvfpli2kr48i5cdcrf73v15id0dk762iy7iz38af";
+ url = "https://elpa.gnu.org/devel/pinentry-0.1.0.20241123.141.tar";
+ sha256 = "14ssm8hrkx70iaww77yrhsbp7k6962bp4k2w7mgj4mj4wkfyrw89";
};
packageRequires = [ ];
meta = {
@@ -6530,10 +6563,10 @@
elpaBuild {
pname = "plz-event-source";
ename = "plz-event-source";
- version = "0.1.2pre0.20240924.181709";
+ version = "0.1.2pre0.20241106.190958";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/plz-event-source-0.1.2pre0.20240924.181709.tar";
- sha256 = "0ydi2xs9sbbc3qz4dp0jpaipdbmzc1nw36wm0cgmqk71a3s5aw67";
+ url = "https://elpa.gnu.org/devel/plz-event-source-0.1.2pre0.20241106.190958.tar";
+ sha256 = "1kpwrc4c48dspyk1zm0b2wp7xmr7h1wm1j7ppqi0wrl350wjzh6f";
};
packageRequires = [ plz-media-type ];
meta = {
@@ -6552,10 +6585,10 @@
elpaBuild {
pname = "plz-media-type";
ename = "plz-media-type";
- version = "0.2.2pre0.20240924.181631";
+ version = "0.2.3pre0.20241106.190902";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/plz-media-type-0.2.2pre0.20240924.181631.tar";
- sha256 = "0pm4hh03bgrq1c7xmb4xw4x7ns967biq0nq7y0bqn42bzcjfxbh9";
+ url = "https://elpa.gnu.org/devel/plz-media-type-0.2.3pre0.20241106.190902.tar";
+ sha256 = "1yx1yqqqps6cj1bwr0dq9n850jr0vh6nph85rw4b70qy6g63k473";
};
packageRequires = [ plz ];
meta = {
@@ -6658,10 +6691,10 @@
elpaBuild {
pname = "polymode";
ename = "polymode";
- version = "0.2.2.0.20230317.121821";
+ version = "0.2.2.0.20241129.123411";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/polymode-0.2.2.0.20230317.121821.tar";
- sha256 = "17dl20fzn15km0d2ypsrzij247yjr3nx5lk1sn5hwr3dvsapvagz";
+ url = "https://elpa.gnu.org/devel/polymode-0.2.2.0.20241129.123411.tar";
+ sha256 = "0mrs7a8kp2mlidps76h5w0xgnilhpka7qi5pq2xc0i0lk09jd9gv";
};
packageRequires = [ ];
meta = {
@@ -6679,10 +6712,10 @@
elpaBuild {
pname = "popper";
ename = "popper";
- version = "0.4.6.0.20240701.211603";
+ version = "0.4.6.0.20241130.171037";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/popper-0.4.6.0.20240701.211603.tar";
- sha256 = "0jhcpz0y5girsqqfliyg3a4h798hz316i813qdhz1s1xivpd91pk";
+ url = "https://elpa.gnu.org/devel/popper-0.4.6.0.20241130.171037.tar";
+ sha256 = "1gypxgkzaf422pdv9v2rfj010mbvb0qcw3hl3aw99qd7w1ndrd9k";
};
packageRequires = [ ];
meta = {
@@ -6700,10 +6733,10 @@
elpaBuild {
pname = "posframe";
ename = "posframe";
- version = "1.4.4.0.20240827.65408";
+ version = "1.4.4.0.20241202.131153";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/posframe-1.4.4.0.20240827.65408.tar";
- sha256 = "0bpakrjgasx911k9niqmd4zf3g08zvwydfyxj6fr8096wazqyrrc";
+ url = "https://elpa.gnu.org/devel/posframe-1.4.4.0.20241202.131153.tar";
+ sha256 = "1rlzgl2bjc46g261m513dgl52n2vq0xlfmfpdm1qrdww06jjklg6";
};
packageRequires = [ ];
meta = {
@@ -6764,10 +6797,10 @@
elpaBuild {
pname = "preview-auto";
ename = "preview-auto";
- version = "0.3.0.20240915.183530";
+ version = "0.4.0.20241109.62806";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/preview-auto-0.3.0.20240915.183530.tar";
- sha256 = "0di2idjrxz5xb9klb6cvcwdgnd9q5h8b3pl6qkg4m8nb30w71mka";
+ url = "https://elpa.gnu.org/devel/preview-auto-0.4.0.20241109.62806.tar";
+ sha256 = "0vcrwi3pjvp46k1c52l4q774fkq93hn3dbbvrhaz160r6d9b477b";
};
packageRequires = [ auctex ];
meta = {
@@ -6786,10 +6819,10 @@
elpaBuild {
pname = "preview-tailor";
ename = "preview-tailor";
- version = "0.2.0.20240617.174356";
+ version = "0.2.0.20241018.170554";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/preview-tailor-0.2.0.20240617.174356.tar";
- sha256 = "17x74wzfi7kc08x1kwlzvsyiqmimxf77k58amskyg73l1iqmr8s8";
+ url = "https://elpa.gnu.org/devel/preview-tailor-0.2.0.20241018.170554.tar";
+ sha256 = "0wcqrannqgyd1fzydia3q8c5dgk8c89irfrikkz568g2jgwnih16";
};
packageRequires = [ auctex ];
meta = {
@@ -6808,10 +6841,10 @@
elpaBuild {
pname = "project";
ename = "project";
- version = "0.11.1.0.20241007.234715";
+ version = "0.11.1.0.20241204.74033";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/project-0.11.1.0.20241007.234715.tar";
- sha256 = "185nx2ww47c8808b0z8gsf2f4arc4cj3i31fp735i5qamxlx1bxp";
+ url = "https://elpa.gnu.org/devel/project-0.11.1.0.20241204.74033.tar";
+ sha256 = "15npdg1cm3c1h6isq2j87djvslv4c4wan4qni09pra5hqyjmd767";
};
packageRequires = [ xref ];
meta = {
@@ -6871,10 +6904,10 @@
elpaBuild {
pname = "pulsar";
ename = "pulsar";
- version = "1.1.0.0.20241006.54333";
+ version = "1.1.0.0.20241126.85951";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/pulsar-1.1.0.0.20241006.54333.tar";
- sha256 = "03q0mxkm06mdp9y11nmwxfbgcc4r4h2w41lj6ba67npawjc0m5mg";
+ url = "https://elpa.gnu.org/devel/pulsar-1.1.0.0.20241126.85951.tar";
+ sha256 = "01mqy0yl72kzydqq250a2vzyyk0w1q7fpf6bb1a49yh2hkd1g5s3";
};
packageRequires = [ ];
meta = {
@@ -6942,10 +6975,10 @@
elpaBuild {
pname = "python";
ename = "python";
- version = "0.28.0.20241013.93011";
+ version = "0.28.0.20241123.154630";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/python-0.28.0.20241013.93011.tar";
- sha256 = "01rcnwk7hdzx5qlrhd8mnkqzsn7x5dpn3zwh16941cjc3fr9xq7r";
+ url = "https://elpa.gnu.org/devel/python-0.28.0.20241123.154630.tar";
+ sha256 = "09ir2jxjk7jvzv7mz5iir3wzx0zas4ikhhh3ig9kbrsj7bsdz6dd";
};
packageRequires = [
compat
@@ -7093,10 +7126,10 @@
elpaBuild {
pname = "rcirc-sqlite";
ename = "rcirc-sqlite";
- version = "1.0.3.0.20240926.134441";
+ version = "1.0.4.0.20241108.161537";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/rcirc-sqlite-1.0.3.0.20240926.134441.tar";
- sha256 = "1pz9gflnyz0p6bg0x87gs7byy34yhi1qf84f3mah79489wad1x84";
+ url = "https://elpa.gnu.org/devel/rcirc-sqlite-1.0.4.0.20241108.161537.tar";
+ sha256 = "0x5pngsnmny2ppg3cgdp5g3nmds6ys3zvamaj8wr6n1qw6k5b4z1";
};
packageRequires = [ ];
meta = {
@@ -7196,10 +7229,10 @@
elpaBuild {
pname = "realgud-lldb";
ename = "realgud-lldb";
- version = "1.0.2.0.20230319.171320";
+ version = "1.0.2.0.20241118.210939";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/realgud-lldb-1.0.2.0.20230319.171320.tar";
- sha256 = "0isnyflg507qngv8xjw8zwzwh4qy0d3c123d5rirwbissjcfxmrs";
+ url = "https://elpa.gnu.org/devel/realgud-lldb-1.0.2.0.20241118.210939.tar";
+ sha256 = "1wpl9608rg6a6nbrnqmhhd8wwwdaf6cpw4lxv59bz2n903bbyr1d";
};
packageRequires = [
load-relative
@@ -7633,10 +7666,10 @@
elpaBuild {
pname = "setup";
ename = "setup";
- version = "1.4.0.0.20240413.75454";
+ version = "1.4.0.0.20241123.145918";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/setup-1.4.0.0.20240413.75454.tar";
- sha256 = "1ryxa0991mzvx2ai4bkmjxnikpnalmr4gdggakfg8i8ag65149rn";
+ url = "https://elpa.gnu.org/devel/setup-1.4.0.0.20241123.145918.tar";
+ sha256 = "01s4dv75r850nq1g84ccjqzlr2xhvd1f6d3zyvdni98qm0vg9si5";
};
packageRequires = [ ];
meta = {
@@ -7738,10 +7771,10 @@
elpaBuild {
pname = "show-font";
ename = "show-font";
- version = "0.1.1.0.20240915.55011";
+ version = "0.1.1.0.20241025.81606";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/show-font-0.1.1.0.20240915.55011.tar";
- sha256 = "0rfav8axwqkgihnhf51c3w1igi9w6ia2ambw6vd2zg7gl54ga2vm";
+ url = "https://elpa.gnu.org/devel/show-font-0.1.1.0.20241025.81606.tar";
+ sha256 = "0ha8fnnjx3j57g0gjz4p65xyys47p0qsy0wr5k858zvw61ka2jdn";
};
packageRequires = [ ];
meta = {
@@ -8015,10 +8048,10 @@
elpaBuild {
pname = "spacious-padding";
ename = "spacious-padding";
- version = "0.5.0.0.20240801.94014";
+ version = "0.5.0.0.20241114.85358";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/spacious-padding-0.5.0.0.20240801.94014.tar";
- sha256 = "0nv1gg30kwdcb0isp159ir03xh3l28yv11m9rznch48axwd1bjwp";
+ url = "https://elpa.gnu.org/devel/spacious-padding-0.5.0.0.20241114.85358.tar";
+ sha256 = "1xs9mac6mrhk6519g13rf8s7q9iivd021bnwmxn54pal904x6q83";
};
packageRequires = [ ];
meta = {
@@ -8100,10 +8133,10 @@
elpaBuild {
pname = "sql-indent";
ename = "sql-indent";
- version = "1.7.0.20240323.40057";
+ version = "1.7.0.20241109.2223";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/sql-indent-1.7.0.20240323.40057.tar";
- sha256 = "0zrsglgw2zjxn9810r022kanvfj0zrhvr696yxlnvd05f9hv9bpp";
+ url = "https://elpa.gnu.org/devel/sql-indent-1.7.0.20241109.2223.tar";
+ sha256 = "0hrpal1di201x62hq2xhck0xhv2vnn972j6nb2mca9lxyvz6h625";
};
packageRequires = [ cl-lib ];
meta = {
@@ -8168,10 +8201,10 @@
elpaBuild {
pname = "ssh-deploy";
ename = "ssh-deploy";
- version = "3.1.16.0.20230702.92809";
+ version = "3.1.16.0.20241117.185025";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/ssh-deploy-3.1.16.0.20230702.92809.tar";
- sha256 = "0zjkc1gb3hpknx8012crcbdy3w1w597qk8qajhpaijhjhispm507";
+ url = "https://elpa.gnu.org/devel/ssh-deploy-3.1.16.0.20241117.185025.tar";
+ sha256 = "03slq2jz6npx33n8ygs761mgqzbain6gqyyl38581gsl8kawx9zs";
};
packageRequires = [ ];
meta = {
@@ -8189,10 +8222,10 @@
elpaBuild {
pname = "standard-themes";
ename = "standard-themes";
- version = "2.1.0.0.20240913.71400";
+ version = "2.1.0.0.20241025.81655";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/standard-themes-2.1.0.0.20240913.71400.tar";
- sha256 = "1zxspsd2mca3pkwbkkkdy32lh5krqjlsi7p9z73xah68r8jyps7j";
+ url = "https://elpa.gnu.org/devel/standard-themes-2.1.0.0.20241025.81655.tar";
+ sha256 = "0bba7mwilxhzjxcvqhgmj1gw8iw46wv6s6frx12cczfjdigjjxl4";
};
packageRequires = [ ];
meta = {
@@ -8210,10 +8243,10 @@
elpaBuild {
pname = "stream";
ename = "stream";
- version = "2.3.0.0.20230908.74447";
+ version = "2.3.0.0.20241117.211530";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/stream-2.3.0.0.20230908.74447.tar";
- sha256 = "1zfw7plnlsijs8aw5726adjwd65g1x3xs4vcs3rcc2ybv8cz886s";
+ url = "https://elpa.gnu.org/devel/stream-2.3.0.0.20241117.211530.tar";
+ sha256 = "1hhvp3rikl1dv2ca090cy5jh61nq3mvxznjwz8p39y0gn6ym3x7x";
};
packageRequires = [ ];
meta = {
@@ -8231,10 +8264,10 @@
elpaBuild {
pname = "substitute";
ename = "substitute";
- version = "0.3.1.0.20240913.71434";
+ version = "0.3.1.0.20241025.81721";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/substitute-0.3.1.0.20240913.71434.tar";
- sha256 = "1a217jx9lwjl4hl7a3rd982004780d1p2pg1qqph9g16y0k36b7q";
+ url = "https://elpa.gnu.org/devel/substitute-0.3.1.0.20241025.81721.tar";
+ sha256 = "1lprh07yanx0m042nbdv667jd78i6dlbkg32niyn9zv4ic3xiiq7";
};
packageRequires = [ ];
meta = {
@@ -8317,10 +8350,10 @@
elpaBuild {
pname = "svg-tag-mode";
ename = "svg-tag-mode";
- version = "0.3.2.0.20240828.82058";
+ version = "0.3.3.0.20241021.134153";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/svg-tag-mode-0.3.2.0.20240828.82058.tar";
- sha256 = "1jx2dx1d8w4p37q4x5shj1xf1fqbclv10i6a8q8inq05qjlfq1ak";
+ url = "https://elpa.gnu.org/devel/svg-tag-mode-0.3.3.0.20241021.134153.tar";
+ sha256 = "1zhmjpskaqsv2rl8lqbnb93b08d0xjk0d84ksjzwgr3bzmscpz5n";
};
packageRequires = [ svg-lib ];
meta = {
@@ -8562,10 +8595,10 @@
elpaBuild {
pname = "tempel";
ename = "tempel";
- version = "1.2.0.20240926.233155";
+ version = "1.2.0.20241116.82753";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/tempel-1.2.0.20240926.233155.tar";
- sha256 = "0qflff5c96pipxnnjnb960qbh1dqr6bnjixqk86hnnddwv67p414";
+ url = "https://elpa.gnu.org/devel/tempel-1.2.0.20241116.82753.tar";
+ sha256 = "13qakkcx260iscxa8w6160bzdxg7n0mr3dfa44jnb9l7dc5cs6vh";
};
packageRequires = [ compat ];
meta = {
@@ -8626,10 +8659,10 @@
elpaBuild {
pname = "tex-parens";
ename = "tex-parens";
- version = "0.6.0.20241012.150939";
+ version = "0.6.0.20241101.151607";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/tex-parens-0.6.0.20241012.150939.tar";
- sha256 = "0f48c5x6mpf0c456d0jy2jprbclhcifmjid8s77ghmlnvazypg7b";
+ url = "https://elpa.gnu.org/devel/tex-parens-0.6.0.20241101.151607.tar";
+ sha256 = "16b5s137jnjln3l3x97cxxhn4bsxhn6gs6xkbszp4vkx3cww8kzk";
};
packageRequires = [ ];
meta = {
@@ -8704,7 +8737,6 @@
) { };
tmr = callPackage (
{
- compat,
elpaBuild,
fetchurl,
lib,
@@ -8712,12 +8744,12 @@
elpaBuild {
pname = "tmr";
ename = "tmr";
- version = "1.0.0.0.20240913.71556";
+ version = "1.0.0.0.20241111.101250";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/tmr-1.0.0.0.20240913.71556.tar";
- sha256 = "11y91803ldwvij73zw7g7dchdpzz9qrx1jv37rlrav7j52rc1awx";
+ url = "https://elpa.gnu.org/devel/tmr-1.0.0.0.20241111.101250.tar";
+ sha256 = "19g5xz0vfxjrfghdl8h4566v6sdr8cf4svm5yx98jijdr5np2a6s";
};
- packageRequires = [ compat ];
+ packageRequires = [ ];
meta = {
homepage = "https://elpa.gnu.org/devel/tmr.html";
license = lib.licenses.free;
@@ -8780,10 +8812,10 @@
elpaBuild {
pname = "track-changes";
ename = "track-changes";
- version = "1.2.0.20241003.143209";
+ version = "1.2.0.20241018.155615";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/track-changes-1.2.0.20241003.143209.tar";
- sha256 = "1xzx886gzvm0rchzchnd4cl675mlkgnjbmkvzjkx9wpi42xnw94j";
+ url = "https://elpa.gnu.org/devel/track-changes-1.2.0.20241018.155615.tar";
+ sha256 = "02m70rh2qzv3nnrs8ykwmpn6fsd2v9lvspiwx1q0yndgvhxwg5d4";
};
packageRequires = [ ];
meta = {
@@ -8801,10 +8833,10 @@
elpaBuild {
pname = "tramp";
ename = "tramp";
- version = "2.7.1.3.0.20240929.75703";
+ version = "2.7.1.5.0.20241130.82948";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/tramp-2.7.1.3.0.20240929.75703.tar";
- sha256 = "0bcxhgbjaysrvj3y4dhq0xzwna3nlm332yvswsy4qw7fwa4n9x6c";
+ url = "https://elpa.gnu.org/devel/tramp-2.7.1.5.0.20241130.82948.tar";
+ sha256 = "0ypb44lhdv6hnx2rzpn8746sqa0wafknkf4bjxsvlh402xfjbypq";
};
packageRequires = [ ];
meta = {
@@ -8887,10 +8919,10 @@
elpaBuild {
pname = "transient";
ename = "transient";
- version = "0.7.7.0.20241008.182431";
+ version = "0.7.9.0.20241203.214158";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/transient-0.7.7.0.20241008.182431.tar";
- sha256 = "1vih4zkjzklj00fnp3yjj99vs0xy528316qf9b9bidgpqnsfk9mi";
+ url = "https://elpa.gnu.org/devel/transient-0.7.9.0.20241203.214158.tar";
+ sha256 = "0yrc8y035yxrirjnbq3hl4jb3mj5xdnv0sy6aji4pdln2ywv122d";
};
packageRequires = [
compat
@@ -8981,10 +9013,10 @@
elpaBuild {
pname = "triples";
ename = "triples";
- version = "0.4.0.0.20240831.171334";
+ version = "0.4.1.0.20241017.213639";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/triples-0.4.0.0.20240831.171334.tar";
- sha256 = "1xa6yhgjpj8vb5i9znx7nhavz21yv0wbiknwiv2ccal03dfs3n1c";
+ url = "https://elpa.gnu.org/devel/triples-0.4.1.0.20241017.213639.tar";
+ sha256 = "1kzzpdaimk8bixf0fi2sba6958szmyp5vk08b60v5x80qzghmq9n";
};
packageRequires = [ seq ];
meta = {
@@ -9110,10 +9142,10 @@
elpaBuild {
pname = "urgrep";
ename = "urgrep";
- version = "0.5.2snapshot0.20240822.215612";
+ version = "0.5.2snapshot0.20241024.210047";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/urgrep-0.5.2snapshot0.20240822.215612.tar";
- sha256 = "01bkcz0zmzgf75x9zqm67i6bgz7rj5kazqqv0yjvnz4657cb5isr";
+ url = "https://elpa.gnu.org/devel/urgrep-0.5.2snapshot0.20241024.210047.tar";
+ sha256 = "0m12x3mrryc0czihavx8kc48df6404bi534dicnjia2v9xv574jv";
};
packageRequires = [
compat
@@ -9205,10 +9237,10 @@
elpaBuild {
pname = "use-package";
ename = "use-package";
- version = "2.4.6.0.20240907.62515";
+ version = "2.4.6.0.20241109.73512";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/use-package-2.4.6.0.20240907.62515.tar";
- sha256 = "0z6iz3v3k6jay4xp471nxlkaqvnwngdl3gq6r6d6s682svfs8hy7";
+ url = "https://elpa.gnu.org/devel/use-package-2.4.6.0.20241109.73512.tar";
+ sha256 = "1qxcl0nsry3in6n301240fg8n2bvxs58fxr8cf83vbwcfkp8n7sj";
};
packageRequires = [ bind-key ];
meta = {
@@ -9423,10 +9455,10 @@
elpaBuild {
pname = "vertico";
ename = "vertico";
- version = "1.9.0.20241004.135012";
+ version = "1.9.0.20241130.70347";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/vertico-1.9.0.20241004.135012.tar";
- sha256 = "1dfhnn1n3i8a916adgzbvpy1fiqbam40r4k0c8ildxg1rhq5zmwg";
+ url = "https://elpa.gnu.org/devel/vertico-1.9.0.20241130.70347.tar";
+ sha256 = "0xqyzmsyxrqvr1r25qyw59r5997f5ldj0c7nl8l821855dnm2c2y";
};
packageRequires = [ compat ];
meta = {
@@ -9446,10 +9478,10 @@
elpaBuild {
pname = "vertico-posframe";
ename = "vertico-posframe";
- version = "0.7.7.0.20241010.24145";
+ version = "0.7.7.0.20241023.25940";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/vertico-posframe-0.7.7.0.20241010.24145.tar";
- sha256 = "05np5iassbia1acn99cy4l4947lkq7vggcnh5gp21xjjm1mpk0jw";
+ url = "https://elpa.gnu.org/devel/vertico-posframe-0.7.7.0.20241023.25940.tar";
+ sha256 = "0gvi8z5jhgy5jqp4q80ax01djzswp2ygq9rfryy8p3m3pgf36g4n";
};
packageRequires = [
posframe
@@ -9682,10 +9714,10 @@
elpaBuild {
pname = "which-key";
ename = "which-key";
- version = "3.6.1.0.20240928.75916";
+ version = "3.6.1.0.20241123.44609";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/which-key-3.6.1.0.20240928.75916.tar";
- sha256 = "0z2vl3w5yhy77y96c7hxkncwi0pgxanb712hhdyjybmkg73v8qmn";
+ url = "https://elpa.gnu.org/devel/which-key-3.6.1.0.20241123.44609.tar";
+ sha256 = "0gn2z7l4fj5cff44k6xbqfbksbafm90i0wssak7c4ghai57wqqa2";
};
packageRequires = [ ];
meta = {
@@ -9725,10 +9757,10 @@
elpaBuild {
pname = "window-tool-bar";
ename = "window-tool-bar";
- version = "0.2.1.0.20240609.122134";
+ version = "0.2.1.0.20241024.85007";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/window-tool-bar-0.2.1.0.20240609.122134.tar";
- sha256 = "1xfwirfdy69c349052jx31c3ib708mwl68458lj8dar5y2cqwk0q";
+ url = "https://elpa.gnu.org/devel/window-tool-bar-0.2.1.0.20241024.85007.tar";
+ sha256 = "16226fm8hq862s9f4ja8wpkar4yp8v86pkq9kdv3mpbmw9lywq54";
};
packageRequires = [ compat ];
meta = {
@@ -9989,10 +10021,10 @@
elpaBuild {
pname = "xref";
ename = "xref";
- version = "1.7.0.0.20241005.224023";
+ version = "1.7.0.0.20241127.14322";
src = fetchurl {
- url = "https://elpa.gnu.org/devel/xref-1.7.0.0.20241005.224023.tar";
- sha256 = "0526agg3b6aj1pfdcr22yf666vpsbwhj2clskilk8axa0ki0cn2h";
+ url = "https://elpa.gnu.org/devel/xref-1.7.0.0.20241127.14322.tar";
+ sha256 = "12983qax1jwbbcbd8zs1spi3z1hnnnmqih75dx0wy281zv1vwzp4";
};
packageRequires = [ ];
meta = {
@@ -10022,6 +10054,27 @@
};
}
) { };
+ yaml = callPackage (
+ {
+ elpaBuild,
+ fetchurl,
+ lib,
+ }:
+ elpaBuild {
+ pname = "yaml";
+ ename = "yaml";
+ version = "1.0.0.0.20241129.211417";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/devel/yaml-1.0.0.0.20241129.211417.tar";
+ sha256 = "0wvyq8hwh10ldpd56xw7n6z4w2zhn4nyk949pyf78vigvr7rv8ll";
+ };
+ packageRequires = [ ];
+ meta = {
+ homepage = "https://elpa.gnu.org/devel/yaml.html";
+ license = lib.licenses.free;
+ };
+ }
+ ) { };
yasnippet = callPackage (
{
cl-lib ? null,
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
index b343604a9b6ff..ba7e41e8bf2bf 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
@@ -441,10 +441,10 @@
elpaBuild {
pname = "auctex-cont-latexmk";
ename = "auctex-cont-latexmk";
- version = "0.2";
+ version = "0.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/auctex-cont-latexmk-0.2.tar";
- sha256 = "0ggyjxjqwpx3h1963i8w96m6kisc65ni9hksn2kjfjddnj1hx0hf";
+ url = "https://elpa.gnu.org/packages/auctex-cont-latexmk-0.3.tar";
+ sha256 = "1s1fp8cajwcsvrnvbhnlzfsphpflsv6fzmc624578sz2m0p1wg6n";
};
packageRequires = [ auctex ];
meta = {
@@ -655,10 +655,10 @@
elpaBuild {
pname = "beframe";
ename = "beframe";
- version = "1.1.1";
+ version = "1.2.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/beframe-1.1.1.tar";
- sha256 = "0xx2zvgjilivi6nnr2x9bwwcifinj66j6r07wxjawqkrsknyypas";
+ url = "https://elpa.gnu.org/packages/beframe-1.2.1.tar";
+ sha256 = "0a92n45dy5f0d69a2dxzqfy7wvi9d7mrfjqy2z52gr2f8nkl7qgf";
};
packageRequires = [ ];
meta = {
@@ -733,20 +733,26 @@
) { };
bluetooth = callPackage (
{
+ compat,
dash,
elpaBuild,
fetchurl,
lib,
+ transient,
}:
elpaBuild {
pname = "bluetooth";
ename = "bluetooth";
- version = "0.3.1";
+ version = "0.4.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/bluetooth-0.3.1.tar";
- sha256 = "1yjqjm6cis6bq18li63hbhc4qzki3486xvdjkzs2gj4chc1yw1x4";
+ url = "https://elpa.gnu.org/packages/bluetooth-0.4.1.tar";
+ sha256 = "1chi9xjg5zcg6qycn2n442adhhmip1vpvg12szf1raq3zhg7lr01";
};
- packageRequires = [ dash ];
+ packageRequires = [
+ compat
+ dash
+ transient
+ ];
meta = {
homepage = "https://elpa.gnu.org/packages/bluetooth.html";
license = lib.licenses.free;
@@ -1198,6 +1204,7 @@
) { };
code-cells = callPackage (
{
+ compat,
elpaBuild,
fetchurl,
lib,
@@ -1205,12 +1212,12 @@
elpaBuild {
pname = "code-cells";
ename = "code-cells";
- version = "0.4";
+ version = "0.5";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/code-cells-0.4.tar";
- sha256 = "0kxpnydxlj8pqh54c4c80jlyc6jcplf89bkh3jmm509fmyr7sf20";
+ url = "https://elpa.gnu.org/packages/code-cells-0.5.tar";
+ sha256 = "04fvn0lwvnvf907k13822jpxyyi6cf55v543i9iqy57dav6sn2jx";
};
- packageRequires = [ ];
+ packageRequires = [ compat ];
meta = {
homepage = "https://elpa.gnu.org/packages/code-cells.html";
license = lib.licenses.free;
@@ -1241,19 +1248,24 @@
) { };
comint-mime = callPackage (
{
+ compat,
elpaBuild,
fetchurl,
lib,
+ mathjax,
}:
elpaBuild {
pname = "comint-mime";
ename = "comint-mime";
- version = "0.6";
+ version = "0.7";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/comint-mime-0.6.tar";
- sha256 = "017d62n3n2jmsxb3r9jm4vk8vpapddbxfjjh8ww1vgcbzqr76zwy";
+ url = "https://elpa.gnu.org/packages/comint-mime-0.7.tar";
+ sha256 = "1scf7b72kzqcf51svww3rbamdnm607pvzg04rdcglc2cna1n2apa";
};
- packageRequires = [ ];
+ packageRequires = [
+ compat
+ mathjax
+ ];
meta = {
homepage = "https://elpa.gnu.org/packages/comint-mime.html";
license = lib.licenses.free;
@@ -1452,10 +1464,10 @@
elpaBuild {
pname = "consult-denote";
ename = "consult-denote";
- version = "0.2.1";
+ version = "0.2.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/consult-denote-0.2.1.tar";
- sha256 = "15hih62a6lyfgw3ha86hppc9wp468gslrdcnx8kcz0dlkvp0k1kx";
+ url = "https://elpa.gnu.org/packages/consult-denote-0.2.2.tar";
+ sha256 = "1dpl9aq25j9nbrxa469gl584km93ry2rnkm0ydxljid9w15szpls";
};
packageRequires = [
consult
@@ -1472,21 +1484,17 @@
consult,
elpaBuild,
fetchurl,
- haskell-mode,
lib,
}:
elpaBuild {
pname = "consult-hoogle";
ename = "consult-hoogle";
- version = "0.2.2";
+ version = "0.3.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/consult-hoogle-0.2.2.tar";
- sha256 = "07z98nnxcaaws18by4id6c45yxlfwb9fk3p0gzll4ngym29zkd8c";
+ url = "https://elpa.gnu.org/packages/consult-hoogle-0.3.0.tar";
+ sha256 = "0jpyncx1zc8kzmnr0wlq81qz0y3jgk421yw0picjj8yflj6905ix";
};
- packageRequires = [
- consult
- haskell-mode
- ];
+ packageRequires = [ consult ];
meta = {
homepage = "https://elpa.gnu.org/packages/consult-hoogle.html";
license = lib.licenses.free;
@@ -1806,10 +1814,10 @@
elpaBuild {
pname = "dape";
ename = "dape";
- version = "0.16.0";
+ version = "0.17.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/dape-0.16.0.tar";
- sha256 = "0zv2l2d91ywbi2v36kn7na94lm09zz5yyq50xdf5i44h9ridz7zw";
+ url = "https://elpa.gnu.org/packages/dape-0.17.0.tar";
+ sha256 = "113lmy0q1yk81cfi9dbig8p9bmhyqy6w1bvhn91m79my05ny2rxd";
};
packageRequires = [ jsonrpc ];
meta = {
@@ -1893,10 +1901,10 @@
elpaBuild {
pname = "debbugs";
ename = "debbugs";
- version = "0.41";
+ version = "0.42";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/debbugs-0.41.tar";
- sha256 = "0nchb7dnkrn34nh3bi0k5xmsn3da9m9v4iksh18045mfj6wn6bl5";
+ url = "https://elpa.gnu.org/packages/debbugs-0.42.tar";
+ sha256 = "0n0kvkyzggn8q72dpy6c7rsjwn1rjx0r33y5jc080j7sw85xpigg";
};
packageRequires = [ soap-client ];
meta = {
@@ -2531,10 +2539,10 @@
elpaBuild {
pname = "eev";
ename = "eev";
- version = "20241002";
+ version = "20241123";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/eev-20241002.tar";
- sha256 = "0cl65zxryr6mlhbbpb9nbmabn8vnwc17vpqr7611s79jb9a7xsvf";
+ url = "https://elpa.gnu.org/packages/eev-20241123.tar";
+ sha256 = "1bb2134jggj4xg49cwy8ivfb12yafxyy2p5k4rca9an3cr4s8ci7";
};
packageRequires = [ ];
meta = {
@@ -2552,10 +2560,10 @@
elpaBuild {
pname = "ef-themes";
ename = "ef-themes";
- version = "1.8.0";
+ version = "1.9.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ef-themes-1.8.0.tar";
- sha256 = "0fv7m4cd4sdn8skx5li8g41kyjniwzfp8sn7jd9s4f7wzls5rnay";
+ url = "https://elpa.gnu.org/packages/ef-themes-1.9.0.tar";
+ sha256 = "03gi3gwrng9arffypmlnd96404yxac78k59q5yb1y1f8fahy199k";
};
packageRequires = [ ];
meta = {
@@ -2681,10 +2689,10 @@
elpaBuild {
pname = "elisa";
ename = "elisa";
- version = "1.0.4";
+ version = "1.1.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/elisa-1.0.4.tar";
- sha256 = "07f9micfp3p8r58kdnqv0pa7i8nyqaz35llahwp2jl16c63pl9wn";
+ url = "https://elpa.gnu.org/packages/elisa-1.1.3.tar";
+ sha256 = "0370gvj3r701i2acp3wq705a9n534g719nzz8bg9a4lry76f2crv";
};
packageRequires = [
async
@@ -2727,19 +2735,21 @@
lib,
llm,
spinner,
+ transient,
}:
elpaBuild {
pname = "ellama";
ename = "ellama";
- version = "0.11.14";
+ version = "0.13.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ellama-0.11.14.tar";
- sha256 = "1xd1pj02kgz83wsvygi5p7hlzx2898d38jmwq899qzpjn80jajb1";
+ url = "https://elpa.gnu.org/packages/ellama-0.13.0.tar";
+ sha256 = "0wfn8fv124qxf9yxl4lsa3hwlicmaiv2zzn8w4vhmlni1kf37nlw";
};
packageRequires = [
compat
llm
spinner
+ transient
];
meta = {
homepage = "https://elpa.gnu.org/packages/ellama.html";
@@ -2866,10 +2876,10 @@
elpaBuild {
pname = "emms";
ename = "emms";
- version = "20.1";
+ version = "20.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/emms-20.1.tar";
- sha256 = "0h0v31f1q7k45k8s9kncvim3a7np7fgjz4qg9v8gjc5ag01dzwkx";
+ url = "https://elpa.gnu.org/packages/emms-20.2.tar";
+ sha256 = "0amc956amyfsjlq5aqc7nk2cs2ph2zcpci5wkms6w973wx67z2j6";
};
packageRequires = [
cl-lib
@@ -3836,10 +3846,10 @@
elpaBuild {
pname = "gtags-mode";
ename = "gtags-mode";
- version = "1.8.1";
+ version = "1.8.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/gtags-mode-1.8.1.tar";
- sha256 = "1n4mc33hz12p0fljrs4big317148272vz2zn16n98sakpv7jk4b6";
+ url = "https://elpa.gnu.org/packages/gtags-mode-1.8.2.tar";
+ sha256 = "1lmaaqlklsifjzagi3miplr17vmzqjzglbkxccffj50mi6y5w4cs";
};
packageRequires = [ ];
meta = {
@@ -4099,10 +4109,10 @@
elpaBuild {
pname = "indent-bars";
ename = "indent-bars";
- version = "0.8";
+ version = "0.8.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/indent-bars-0.8.tar";
- sha256 = "0sy34xkghlwndyrismdrrsgnsz2901j8pdpfy8drbka6x4g6x36k";
+ url = "https://elpa.gnu.org/packages/indent-bars-0.8.2.tar";
+ sha256 = "1bhdrykkklsscgiz3p29x8kdkw0kbc4mlpnhxghvphx159clhgym";
};
packageRequires = [ compat ];
meta = {
@@ -4605,10 +4615,10 @@
elpaBuild {
pname = "kubed";
ename = "kubed";
- version = "0.4.1";
+ version = "0.4.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/kubed-0.4.1.tar";
- sha256 = "1p0r6jcwydh25ff613imr49yjw4hhy9wcxlzxrk3d2szipj4q8hs";
+ url = "https://elpa.gnu.org/packages/kubed-0.4.2.tar";
+ sha256 = "0qbc8cw8a823dhqa34xhbf3mdbdihzdg1v0ya7ykm3789c2dhddb";
};
packageRequires = [ ];
meta = {
@@ -4857,16 +4867,22 @@
fetchurl,
lib,
plz,
+ plz-event-source,
+ plz-media-type,
}:
elpaBuild {
pname = "llm";
ename = "llm";
- version = "0.17.4";
+ version = "0.19.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/llm-0.17.4.tar";
- sha256 = "01a4vnbffrh53q1j2if63a05j4859rzrrf7p3fisfbfj1cr2ywvw";
+ url = "https://elpa.gnu.org/packages/llm-0.19.1.tar";
+ sha256 = "03f8yvnq1n2pns62iji2iz50f30wxw50n9a6cxgd9p2vkd4pjb0g";
};
- packageRequires = [ plz ];
+ packageRequires = [
+ plz
+ plz-event-source
+ plz-media-type
+ ];
meta = {
homepage = "https://elpa.gnu.org/packages/llm.html";
license = lib.licenses.free;
@@ -5148,6 +5164,27 @@
};
}
) { };
+ mathjax = callPackage (
+ {
+ elpaBuild,
+ fetchurl,
+ lib,
+ }:
+ elpaBuild {
+ pname = "mathjax";
+ ename = "mathjax";
+ version = "0.1";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/mathjax-0.1.tar";
+ sha256 = "16023kbzkc2v455bx7l4pfy3j7z1iba7rpv0ykzk2rz21i4jan7w";
+ };
+ packageRequires = [ ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/mathjax.html";
+ license = lib.licenses.free;
+ };
+ }
+ ) { };
mct = callPackage (
{
elpaBuild,
@@ -5349,10 +5386,10 @@
elpaBuild {
pname = "modus-themes";
ename = "modus-themes";
- version = "4.5.0";
+ version = "4.6.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/modus-themes-4.5.0.tar";
- sha256 = "1f75rkl6bvqsc2s4fz67rk3h3fl9qw4vay0dj1agas4x0zskm89v";
+ url = "https://elpa.gnu.org/packages/modus-themes-4.6.0.tar";
+ sha256 = "19hg2gqpa19rnlj0pn7v8sd52q5mkinf39l7rb0a6xqbkfzqvsnd";
};
packageRequires = [ ];
meta = {
@@ -5777,10 +5814,10 @@
elpaBuild {
pname = "ob-asymptote";
ename = "ob-asymptote";
- version = "1.0";
+ version = "1.0.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ob-asymptote-1.0.tar";
- sha256 = "1hmqbkrqg18w454xg37rg5cg0q3vd0b0fm14n5chihqrwwnwrf4l";
+ url = "https://elpa.gnu.org/packages/ob-asymptote-1.0.1.tar";
+ sha256 = "0f1vpq691pna1p1lgqw2nzmdw25sjsmpcvgm2lj7n14kg7dizxal";
};
packageRequires = [ ];
meta = {
@@ -5927,10 +5964,10 @@
elpaBuild {
pname = "org";
ename = "org";
- version = "9.7.12";
+ version = "9.7.16";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/org-9.7.12.tar";
- sha256 = "0v0mims57k5ffaf9i8szmrq3zvk3zd7xz7386k8lwc58mmhhdw15";
+ url = "https://elpa.gnu.org/packages/org-9.7.16.tar";
+ sha256 = "1d6vxd7ssfb1v00a37dr723v9cg8i8v78lcymqndqhy6f2ji1f06";
};
packageRequires = [ ];
meta = {
@@ -6516,10 +6553,10 @@
elpaBuild {
pname = "plz-media-type";
ename = "plz-media-type";
- version = "0.2.1";
+ version = "0.2.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/plz-media-type-0.2.1.tar";
- sha256 = "05hr78iw9s34vf2lpyh79xfnd4gs4q07rha1ahdrmxvkk9mnmk90";
+ url = "https://elpa.gnu.org/packages/plz-media-type-0.2.2.tar";
+ sha256 = "0m1hm2myc5pqax8kkz910wn3443pxdsav7rcf7bcqnim4l0ismvn";
};
packageRequires = [ plz ];
meta = {
@@ -6686,10 +6723,10 @@
elpaBuild {
pname = "preview-auto";
ename = "preview-auto";
- version = "0.3";
+ version = "0.4";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/preview-auto-0.3.tar";
- sha256 = "19jih2bn6ac82jx6w7jhv9hbz47c8argv24lfglvv6532fda218r";
+ url = "https://elpa.gnu.org/packages/preview-auto-0.4.tar";
+ sha256 = "0jsahj6ylrs4hlr57i0ibkj9bhc3jbg84k3pk8g5rg27xiwncczy";
};
packageRequires = [ auctex ];
meta = {
@@ -7010,10 +7047,10 @@
elpaBuild {
pname = "rcirc-sqlite";
ename = "rcirc-sqlite";
- version = "1.0.3";
+ version = "1.0.4";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/rcirc-sqlite-1.0.3.tar";
- sha256 = "11m6n93qwfkn6jhn3vlvdz48wsqixlkbwbxsx3qdyj8jmjqpjvz6";
+ url = "https://elpa.gnu.org/packages/rcirc-sqlite-1.0.4.tar";
+ sha256 = "0bxih4m3rn76lq5q2hbq04fb0yqfy848cqfzl7gii1qsrfplqcal";
};
packageRequires = [ ];
meta = {
@@ -8192,10 +8229,10 @@
elpaBuild {
pname = "svg-tag-mode";
ename = "svg-tag-mode";
- version = "0.3.2";
+ version = "0.3.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/svg-tag-mode-0.3.2.tar";
- sha256 = "0wzcq00kbjpbwz7acn4d7jd98v5kicq3iwgf6dnmz2kflvkfwkvr";
+ url = "https://elpa.gnu.org/packages/svg-tag-mode-0.3.3.tar";
+ sha256 = "14vkjy3dvvvkhxi3m8d56m0dpvg9gpbwmmb0dchz8ap8wjbvc85j";
};
packageRequires = [ svg-lib ];
meta = {
@@ -8651,10 +8688,10 @@
elpaBuild {
pname = "tramp";
ename = "tramp";
- version = "2.7.1.3";
+ version = "2.7.1.5";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/tramp-2.7.1.3.tar";
- sha256 = "0ii16y283yidql05f69yx0x2jf71w8niq5k8mlrqq05z5h4h3sw3";
+ url = "https://elpa.gnu.org/packages/tramp-2.7.1.5.tar";
+ sha256 = "11a2zyk0d1y9bxhdqfzcx4ynazfs6hb3mdgpz5kp9p3lk8l6bz5g";
};
packageRequires = [ ];
meta = {
@@ -8737,10 +8774,10 @@
elpaBuild {
pname = "transient";
ename = "transient";
- version = "0.7.7";
+ version = "0.7.9";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/transient-0.7.7.tar";
- sha256 = "07c1n76nlchm5pp74hnx7bkwiibpal1ajdkmj559ja3099rgghkx";
+ url = "https://elpa.gnu.org/packages/transient-0.7.9.tar";
+ sha256 = "07d5pzd7nalnjxn6wpj6vpfg8pldnwh69l85immmiww03vl8ngrf";
};
packageRequires = [
compat
@@ -8831,10 +8868,10 @@
elpaBuild {
pname = "triples";
ename = "triples";
- version = "0.4.0";
+ version = "0.4.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/triples-0.4.0.tar";
- sha256 = "0g29i33bmh9gh4mmk92h6vhhw42k1f2ph02qlrasn0w5fq3pg8vp";
+ url = "https://elpa.gnu.org/packages/triples-0.4.1.tar";
+ sha256 = "1x5sws7zhm9wz5d430bs8g8rnxn4y57pqkqhxcsi9d3vbs39wfn8";
};
packageRequires = [ seq ];
meta = {
@@ -9870,6 +9907,27 @@
};
}
) { };
+ yaml = callPackage (
+ {
+ elpaBuild,
+ fetchurl,
+ lib,
+ }:
+ elpaBuild {
+ pname = "yaml";
+ ename = "yaml";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/yaml-1.0.0.tar";
+ sha256 = "0yvfrijjjm17qidyi50nrsvw2m3bqw6p72za7w8v4ywxfl7b59c6";
+ };
+ packageRequires = [ ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/yaml.html";
+ license = lib.licenses.free;
+ };
+ }
+ ) { };
yasnippet = callPackage (
{
cl-lib ? null,
diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
index 91abc49f4c2b3..02932d6a8ee75 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@@ -800,6 +800,18 @@ let
# depends on distel which is not on any ELPA https://github.com/massemanet/distel/issues/21
auto-complete-distel = ignoreCompilationError super.auto-complete-distel;
+ auto-virtualenv = super.auto-virtualenv.overrideAttrs (
+ finalAttrs: previousAttrs: {
+ patches = previousAttrs.patches or [ ] ++ [
+ (pkgs.fetchpatch {
+ name = "do-not-error-if-the-optional-projectile-is-not-available.patch";
+ url = "https://github.com/marcwebbie/auto-virtualenv/pull/14/commits/9a068974a4e12958200c12c6a23372fa736523c1.patch";
+ hash = "sha256-bqrroFf5AD5SHx6uzBFdVwTv3SbFiO39T+0x03Ves/k=";
+ })
+ ];
+ }
+ );
+
aws-ec2 = ignoreCompilationError super.aws-ec2; # elisp error
badger-theme = ignoreCompilationError super.badger-theme; # elisp error
@@ -1503,6 +1515,18 @@ let
scad-preview = ignoreCompilationError super.scad-preview; # elisp error
+ sdml-mode = super.sdml-mode.overrideAttrs (
+ finalAttrs: previousAttrs: {
+ patches = previousAttrs.patches or [ ] ++ [
+ (pkgs.fetchpatch {
+ name = "make-pretty-hydra-optional.patch";
+ url = "https://github.com/sdm-lang/emacs-sdml-mode/pull/3/commits/2368afe31c72073488411540e212c70aae3dd468.patch";
+ hash = "sha256-Wc4pquKV9cTRey9SdjY++UgcP+pGI0hVOOn1Cci8dpk=";
+ })
+ ];
+ }
+ );
+
# https://github.com/wanderlust/semi/pull/29
# missing optional dependencies
semi = addPackageRequires super.semi [ self.bbdb-vcard ];
diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix
index b4b009d0ac9c5..c2e25c45e7e4a 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix
@@ -93,10 +93,10 @@
elpaBuild {
pname = "annotate";
ename = "annotate";
- version = "2.2.2.0.20240509.114401";
+ version = "2.2.3.0.20241017.150805";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/annotate-2.2.2.0.20240509.114401.tar";
- sha256 = "0b78ilx6qwn2g0l6c1fn3vrm6bc2dgylpj8vm2wxwqyx621rf513";
+ url = "https://elpa.nongnu.org/nongnu-devel/annotate-2.2.3.0.20241017.150805.tar";
+ sha256 = "19m3xg2yhf9gxyvp3n143dkyb6r592b2bv7sxcj4g8fhm7qlj6jc";
};
packageRequires = [ ];
meta = {
@@ -177,10 +177,10 @@
elpaBuild {
pname = "apropospriate-theme";
ename = "apropospriate-theme";
- version = "0.2.0.0.20240921.102210";
+ version = "0.2.0.0.20241118.190153";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/apropospriate-theme-0.2.0.0.20240921.102210.tar";
- sha256 = "04x4s341lvygxxnjq3wjy8sp8p9y66kx3csklp46x33qyqbbdx82";
+ url = "https://elpa.nongnu.org/nongnu-devel/apropospriate-theme-0.2.0.0.20241118.190153.tar";
+ sha256 = "0nqnf57bf21wg2vlw85msg927618hhsn4qfwd60vrx70260432kf";
};
packageRequires = [ ];
meta = {
@@ -284,10 +284,10 @@
elpaBuild {
pname = "bash-completion";
ename = "bash-completion";
- version = "3.1.1.0.20240914.174817";
+ version = "3.1.1.0.20241118.194353";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/bash-completion-3.1.1.0.20240914.174817.tar";
- sha256 = "1s5wx8374naay0silh95vlci5qrxxz04av4f5iz94iwvi6jz0fa0";
+ url = "https://elpa.nongnu.org/nongnu-devel/bash-completion-3.1.1.0.20241118.194353.tar";
+ sha256 = "10cirfnwz34yc7glf1xzshq3926jdwdf3s7bdarykrkxmsrha4f7";
};
packageRequires = [ ];
meta = {
@@ -544,10 +544,10 @@
elpaBuild {
pname = "cider";
ename = "cider";
- version = "1.16.0.0.20240925.134028";
+ version = "1.16.1.0.20241203.160720";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/cider-1.16.0.0.20240925.134028.tar";
- sha256 = "1j874gyrdiy90f8hlxjkvxjdwzs8pixi19l28d009npj69mv0f6n";
+ url = "https://elpa.nongnu.org/nongnu-devel/cider-1.16.1.0.20241203.160720.tar";
+ sha256 = "0b6nqhg5c0ny8ilm4653c7pd34aj02bh6ya9bzc9swdpyq7pwnqr";
};
packageRequires = [
clojure-mode
@@ -573,10 +573,10 @@
elpaBuild {
pname = "clojure-mode";
ename = "clojure-mode";
- version = "5.20.0snapshot0.20240611.73422";
+ version = "5.20.0snapshot0.20241125.112305";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/clojure-mode-5.20.0snapshot0.20240611.73422.tar";
- sha256 = "1jlmg2f4gvxqknyw5lqs7aqaar0ghw21hqphsmcvakpcn7d0nqiz";
+ url = "https://elpa.nongnu.org/nongnu-devel/clojure-mode-5.20.0snapshot0.20241125.112305.tar";
+ sha256 = "0hh17w63j5x4687kbd2vmlj9qs468ivq54mwwcm6p43wr7rvk2cj";
};
packageRequires = [ ];
meta = {
@@ -594,10 +594,10 @@
elpaBuild {
pname = "clojure-ts-mode";
ename = "clojure-ts-mode";
- version = "0.2.2.0.20240930.131600";
+ version = "0.2.2.0.20241104.213550";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/clojure-ts-mode-0.2.2.0.20240930.131600.tar";
- sha256 = "0qs76xj2fjhp42882ay1sg7ihzanzdh8mq4yffmqj1ljhkdyxsxc";
+ url = "https://elpa.nongnu.org/nongnu-devel/clojure-ts-mode-0.2.2.0.20241104.213550.tar";
+ sha256 = "0b37iccwh8l6z0q3ls3ysfy7pjp8q52kbiw4lipjgljg0lmj5lsv";
};
packageRequires = [ ];
meta = {
@@ -638,10 +638,10 @@
elpaBuild {
pname = "consult-flycheck";
ename = "consult-flycheck";
- version = "1.0.0.20240926.91748";
+ version = "1.0.0.20241114.112007";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/consult-flycheck-1.0.0.20240926.91748.tar";
- sha256 = "1f5869y8614hv91f3sc7i10wr3393mygz841crw4an4m03kxkq7f";
+ url = "https://elpa.nongnu.org/nongnu-devel/consult-flycheck-1.0.0.20241114.112007.tar";
+ sha256 = "1jzli50sjr8pv2j9qg7glxdgm54sx2yw6xr7ka738gisa1r0iscl";
};
packageRequires = [
consult
@@ -710,10 +710,10 @@
elpaBuild {
pname = "csv2ledger";
ename = "csv2ledger";
- version = "1.5.4.0.20240605.63224";
+ version = "1.5.4.0.20241109.230511";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/csv2ledger-1.5.4.0.20240605.63224.tar";
- sha256 = "0vh626mic3nd4ci7hc1ci8rmfh3k6frh8azgkj4784n3nhgr18h8";
+ url = "https://elpa.nongnu.org/nongnu-devel/csv2ledger-1.5.4.0.20241109.230511.tar";
+ sha256 = "1ank47lk4qgmbgr7qb9fgkramc7qngs93rq0rnlvkdh2fm198ywj";
};
packageRequires = [ csv-mode ];
meta = {
@@ -774,10 +774,10 @@
elpaBuild {
pname = "d-mode";
ename = "d-mode";
- version = "202408131340.0.20240813.65913";
+ version = "202408131340.0.20241126.105644";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/d-mode-202408131340.0.20240813.65913.tar";
- sha256 = "1lf78x8bkb41mr5p8api0f447z9k5yd2v9w97qw6l4dxcj2dldv5";
+ url = "https://elpa.nongnu.org/nongnu-devel/d-mode-202408131340.0.20241126.105644.tar";
+ sha256 = "11hc3dyxyr1pcq25jvw9x3ys4v73rbqw9p19s4i59p9mdb0bnxpy";
};
packageRequires = [ ];
meta = {
@@ -892,6 +892,28 @@
};
}
) { };
+ dirvish = callPackage (
+ {
+ elpaBuild,
+ fetchurl,
+ lib,
+ transient,
+ }:
+ elpaBuild {
+ pname = "dirvish";
+ ename = "dirvish";
+ version = "2.0.53.0.20230519.150010";
+ src = fetchurl {
+ url = "https://elpa.nongnu.org/nongnu-devel/dirvish-2.0.53.0.20230519.150010.tar";
+ sha256 = "0n73giyvg244s0cxfrkc3j0jrq20bs1zili6liab0s3ks02kvqdg";
+ };
+ packageRequires = [ transient ];
+ meta = {
+ homepage = "https://elpa.nongnu.org/nongnu-devel/dirvish.html";
+ license = lib.licenses.free;
+ };
+ }
+ ) { };
doc-show-inline = callPackage (
{
elpaBuild,
@@ -943,10 +965,10 @@
elpaBuild {
pname = "dracula-theme";
ename = "dracula-theme";
- version = "1.8.2.0.20240912.203213";
+ version = "1.8.2.0.20241102.130126";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/dracula-theme-1.8.2.0.20240912.203213.tar";
- sha256 = "1wkyn7wswrgda7y267mxb6bi0h5ywp7hh2d4cmz3yfglnq1pmp1g";
+ url = "https://elpa.nongnu.org/nongnu-devel/dracula-theme-1.8.2.0.20241102.130126.tar";
+ sha256 = "01f3g7cy9snm4f2b2rx7zd82kwxzlf9g0wapwa83k3i60p23rf5s";
};
packageRequires = [ ];
meta = {
@@ -986,10 +1008,10 @@
elpaBuild {
pname = "dslide";
ename = "dslide";
- version = "0.5.3.0.20240704.131127";
+ version = "0.5.5.0.20241128.111432";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/dslide-0.5.3.0.20240704.131127.tar";
- sha256 = "0mr4p3w5932bz9cj9b4b2lmp5dkrix79s6vf4s2h2rr8cjhgbb6s";
+ url = "https://elpa.nongnu.org/nongnu-devel/dslide-0.5.5.0.20241128.111432.tar";
+ sha256 = "1d2rsqzn8w6w3qvsfsgpmjwn53nsj30jivli02d7n24q30pxzpv6";
};
packageRequires = [ ];
meta = {
@@ -1050,10 +1072,10 @@
elpaBuild {
pname = "editorconfig";
ename = "editorconfig";
- version = "0.11.0.0.20240813.80135";
+ version = "0.11.0.0.20241027.181535";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/editorconfig-0.11.0.0.20240813.80135.tar";
- sha256 = "1ak09a6ay4234x4x9b8k6mqayb99129yk0p45iv782xsyc9r05h8";
+ url = "https://elpa.nongnu.org/nongnu-devel/editorconfig-0.11.0.0.20241027.181535.tar";
+ sha256 = "17vx1rf8dnyfkj1c7cv2zw9kvrc9cllm3wr4r0wik31xrkw7zpdj";
};
packageRequires = [ ];
meta = {
@@ -1092,10 +1114,10 @@
elpaBuild {
pname = "elpher";
ename = "elpher";
- version = "3.6.3.0.20240930.91332";
+ version = "3.6.4.0.20241022.162545";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/elpher-3.6.3.0.20240930.91332.tar";
- sha256 = "1mf0d6gzykvpyjk2kxivlqs5xwxqdsxj9adfi92bna01dv5vrj3n";
+ url = "https://elpa.nongnu.org/nongnu-devel/elpher-3.6.4.0.20241022.162545.tar";
+ sha256 = "070njpzhspzgpry9wy69l76kmfdwzy8c5nx32kr0isx7b6qzvb5v";
};
packageRequires = [ ];
meta = {
@@ -1113,10 +1135,10 @@
elpaBuild {
pname = "emacsql";
ename = "emacsql";
- version = "4.0.3.0.20240906.134234";
+ version = "4.1.0.0.20241201.155153";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/emacsql-4.0.3.0.20240906.134234.tar";
- sha256 = "0a9456snizy8w47vh8zj00180kncg0h3vv3iq86lckqhv2qbp0az";
+ url = "https://elpa.nongnu.org/nongnu-devel/emacsql-4.1.0.0.20241201.155153.tar";
+ sha256 = "10sqyqba0jsf1w6i7x77vxgj13wjzr3k9bcpzmzxhqgprakndixy";
};
packageRequires = [ ];
meta = {
@@ -1385,10 +1407,10 @@
elpaBuild {
pname = "evil-matchit";
ename = "evil-matchit";
- version = "3.0.4.0.20240418.73107";
+ version = "3.0.4.0.20241111.120111";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/evil-matchit-3.0.4.0.20240418.73107.tar";
- sha256 = "01fsamf87a35xmw03b93yvvlkz2mi7xg9pblzakacwfnwksxr76i";
+ url = "https://elpa.nongnu.org/nongnu-devel/evil-matchit-3.0.4.0.20241111.120111.tar";
+ sha256 = "1jv7rs102i00kwdkj1n3l0j9as0kbrylhkkn2rrgwv9b97lmlirs";
};
packageRequires = [ ];
meta = {
@@ -1428,10 +1450,10 @@
elpaBuild {
pname = "evil-numbers";
ename = "evil-numbers";
- version = "0.7.0.20240416.14058";
+ version = "0.7.0.20241204.12906";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/evil-numbers-0.7.0.20240416.14058.tar";
- sha256 = "1xn9r9iycrha64n379q8kqdbywcfqcwc9qqlnxi268rcxzsq99rx";
+ url = "https://elpa.nongnu.org/nongnu-devel/evil-numbers-0.7.0.20241204.12906.tar";
+ sha256 = "1r4ic5db8vl3mslp48w8lqx904raxi8lzp512jcjv21vs36gjl97";
};
packageRequires = [ evil ];
meta = {
@@ -1519,10 +1541,10 @@
elpaBuild {
pname = "exec-path-from-shell";
ename = "exec-path-from-shell";
- version = "2.2.0.20240411.85903";
+ version = "2.2.0.20241107.71915";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/exec-path-from-shell-2.2.0.20240411.85903.tar";
- sha256 = "1z8dxx8x87ndx4mfq2nhj2q6m0h5zd2v80pbwxirz4qnvivqspgv";
+ url = "https://elpa.nongnu.org/nongnu-devel/exec-path-from-shell-2.2.0.20241107.71915.tar";
+ sha256 = "17wyy2agi9j7vny0wdi5mxp1nz7zpzi6ayx55ls1cdxwd7v2jyvf";
};
packageRequires = [ ];
meta = {
@@ -1588,10 +1610,10 @@
elpaBuild {
pname = "flycheck";
ename = "flycheck";
- version = "35.0snapshot0.20240726.45656";
+ version = "35.0snapshot0.20241130.150233";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/flycheck-35.0snapshot0.20240726.45656.tar";
- sha256 = "09hy61g6rcvl1xng2bnav9x58rg0ddq39mj4gicsyyxyqfyp2gc7";
+ url = "https://elpa.nongnu.org/nongnu-devel/flycheck-35.0snapshot0.20241130.150233.tar";
+ sha256 = "08viqbba50alfj3783ykymjqwpi08si6bi411sm29gagga1cjxr6";
};
packageRequires = [ ];
meta = {
@@ -1681,10 +1703,10 @@
elpaBuild {
pname = "focus";
ename = "focus";
- version = "1.0.1.0.20240528.90117";
+ version = "1.0.1.0.20241029.150652";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/focus-1.0.1.0.20240528.90117.tar";
- sha256 = "0krfsxswwjzajxzr6kjxnkmzgi5nysnwa1yrhd205z1spb36i9i0";
+ url = "https://elpa.nongnu.org/nongnu-devel/focus-1.0.1.0.20241029.150652.tar";
+ sha256 = "08ryv68xfvlgbsyq80r9bycj4d9dbdz0v7ipdgjxnxfkp3di2s01";
};
packageRequires = [ cl-lib ];
meta = {
@@ -1834,10 +1856,10 @@
elpaBuild {
pname = "geiser-chicken";
ename = "geiser-chicken";
- version = "0.17.0.20220717.113055";
+ version = "0.17.0.20241204.11932";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/geiser-chicken-0.17.0.20220717.113055.tar";
- sha256 = "1ajdmkykm23rxcnsbqadc39h72r30cdqzhxasq9s5hnnpk8qmyxk";
+ url = "https://elpa.nongnu.org/nongnu-devel/geiser-chicken-0.17.0.20241204.11932.tar";
+ sha256 = "1l95d72wl74mlfa50m9m999skj993vqdmm13qm42n0lp0y9ndvyf";
};
packageRequires = [ geiser ];
meta = {
@@ -2068,10 +2090,10 @@
elpaBuild {
pname = "gnosis";
ename = "gnosis";
- version = "0.4.5.0.20241009.160730";
+ version = "0.4.8.0.20241115.104152";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/gnosis-0.4.5.0.20241009.160730.tar";
- sha256 = "0kmmxhbmxi7l1ig01b2v36diidlz0192y8nxjr3znycx0qzdbn7x";
+ url = "https://elpa.nongnu.org/nongnu-devel/gnosis-0.4.8.0.20241115.104152.tar";
+ sha256 = "143pmwp5g2wzmmhmbwc1q6hhf86j1cywi8x2hzvlq0p5mhkkilr1";
};
packageRequires = [
compat
@@ -2242,10 +2264,10 @@
elpaBuild {
pname = "gptel";
ename = "gptel";
- version = "0.9.5.0.20241013.125757";
+ version = "0.9.6.0.20241202.163036";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.5.0.20241013.125757.tar";
- sha256 = "123bvwfh6anp6arwznzinyckakpadagz6pn7381848k9zp5xz6lg";
+ url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.6.0.20241202.163036.tar";
+ sha256 = "0zlfrnp01hb6syrkgkwfi1hjxm9l4j9sqrwn7a8nmk5wlw4bi6xm";
};
packageRequires = [
compat
@@ -2266,10 +2288,10 @@
elpaBuild {
pname = "graphql-mode";
ename = "graphql-mode";
- version = "1.0.0.0.20240918.121927";
+ version = "1.0.0.0.20241020.75405";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/graphql-mode-1.0.0.0.20240918.121927.tar";
- sha256 = "198kbpazgczyb0qjclm8xgaha6wh6spr8ybvrbhm6nsf90zgv5kw";
+ url = "https://elpa.nongnu.org/nongnu-devel/graphql-mode-1.0.0.0.20241020.75405.tar";
+ sha256 = "0bds1zv0syg1jfdak2hk3kank4c532r6ki095wamxy06rwdbm2il";
};
packageRequires = [ ];
meta = {
@@ -2373,10 +2395,10 @@
elpaBuild {
pname = "haskell-mode";
ename = "haskell-mode";
- version = "17.5.0.20241007.132004";
+ version = "17.5.0.20241111.151419";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20241007.132004.tar";
- sha256 = "1dj72kjy3jjxbfxxhj27yspc7n0059p7bxrv66hrzb0iginip45f";
+ url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20241111.151419.tar";
+ sha256 = "1pshx7i45smkwg09w2am9q87iqawfds2nn48jczdyxh6bnk558zz";
};
packageRequires = [ ];
meta = {
@@ -2416,10 +2438,10 @@
elpaBuild {
pname = "haskell-ts-mode";
ename = "haskell-ts-mode";
- version = "1.0.20240925.24042";
+ version = "1.0.20241108.150811";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/haskell-ts-mode-1.0.20240925.24042.tar";
- sha256 = "1kkfg9b0cfa2ygxkp5da98sc0w2b8q2q99rcfdqm00i8l6lj5wm9";
+ url = "https://elpa.nongnu.org/nongnu-devel/haskell-ts-mode-1.0.20241108.150811.tar";
+ sha256 = "1ycbcwhj9j77jgpb3ag7hy8474qdj4rzzg7z5z79f0fqvlnv94m7";
};
packageRequires = [ ];
meta = {
@@ -2439,10 +2461,10 @@
elpaBuild {
pname = "helm";
ename = "helm";
- version = "4.0.0.20240929.41608";
+ version = "4.0.0.20241204.51511";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.0.20240929.41608.tar";
- sha256 = "1xf7nbnd2399cz2qkpvb0h38cdwx76jk9sq9wk67y6l23kvqh0sr";
+ url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.0.20241204.51511.tar";
+ sha256 = "1dzc1jg6p9r589mzwdzhlhj58239ssy85mz27kwr7yyg36cz3m3l";
};
packageRequires = [
helm-core
@@ -2464,10 +2486,10 @@
elpaBuild {
pname = "helm-core";
ename = "helm-core";
- version = "4.0.0.20240929.41608";
+ version = "4.0.0.20241204.51511";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.0.20240929.41608.tar";
- sha256 = "0lfk8hamfbaz0ifs4fkl836dqlcyw4g7kbsnmi5qjlyqc27yk8f9";
+ url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.0.20241204.51511.tar";
+ sha256 = "1xvx1x6p7r1ak40n3740q9iyah2d1npqg7aw1zybshcrai5bm9jm";
};
packageRequires = [ async ];
meta = {
@@ -2597,10 +2619,10 @@
elpaBuild {
pname = "hyperdrive";
ename = "hyperdrive";
- version = "0.5pre0.20241012.232703";
+ version = "0.5pre0.20241106.231359";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-0.5pre0.20241012.232703.tar";
- sha256 = "1wj52cs86jzl2cx9a3599fjncnra1x8as9md6i5afwmm9flb3yn6";
+ url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-0.5pre0.20241106.231359.tar";
+ sha256 = "11b3dvwzrsgg2nj3kasgrz5bwhd2i3ig4v9blzlzhyybw6wy0i1f";
};
packageRequires = [
compat
@@ -2628,10 +2650,10 @@
elpaBuild {
pname = "hyperdrive-org-transclusion";
ename = "hyperdrive-org-transclusion";
- version = "0.3pre0.20240930.224512";
+ version = "0.3.1.0.20241027.212737";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-org-transclusion-0.3pre0.20240930.224512.tar";
- sha256 = "13wacgy29zm9yly58hznj0k1liah9kqw2b6gkpk8804yrjzjhgd4";
+ url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-org-transclusion-0.3.1.0.20241027.212737.tar";
+ sha256 = "1lwiqhjlanxkbv556m6f8xfp63b5xk66zhmg2zazw4sx0zy97s75";
};
packageRequires = [
hyperdrive
@@ -2873,10 +2895,10 @@
elpaBuild {
pname = "julia-mode";
ename = "julia-mode";
- version = "1.0.0.0.20240926.152808";
+ version = "1.0.1.0.20241120.85729";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/julia-mode-1.0.0.0.20240926.152808.tar";
- sha256 = "0hhpzarz8xa61mp6drm0j98832h8sdammkp55ap6bj35vlyppc13";
+ url = "https://elpa.nongnu.org/nongnu-devel/julia-mode-1.0.1.0.20241120.85729.tar";
+ sha256 = "0a6xi5zcq1nfbsjqk84x6avlrzbjdh6fbq1h6jkqcczy7mm5rg5h";
};
packageRequires = [ ];
meta = {
@@ -2981,10 +3003,10 @@
elpaBuild {
pname = "macrostep";
ename = "macrostep";
- version = "0.9.4.0.20240608.12616";
+ version = "0.9.4.0.20241025.145629";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/macrostep-0.9.4.0.20240608.12616.tar";
- sha256 = "0wl8v174428vaxzf9ghyzm1ljsv0r5xw445lwzzj21yc4x1y2vh1";
+ url = "https://elpa.nongnu.org/nongnu-devel/macrostep-0.9.4.0.20241025.145629.tar";
+ sha256 = "1xbi45ymsqc2vbhl1s3wphirgqz5ky9880fzr949bhd0ff18bw6x";
};
packageRequires = [
cl-lib
@@ -3011,10 +3033,10 @@
elpaBuild {
pname = "magit";
ename = "magit";
- version = "4.1.1.0.20241001.205222";
+ version = "4.1.2.0.20241102.130025";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/magit-4.1.1.0.20241001.205222.tar";
- sha256 = "1qfaaqhm8m7cg4lrllv770w7bl2mfnpyx551accw757jxpnw8qdn";
+ url = "https://elpa.nongnu.org/nongnu-devel/magit-4.1.2.0.20241102.130025.tar";
+ sha256 = "1y3fr2qj8a1h7hkrh47zshbmrcfxhw6i8wiqcrrba7ypnas53gcg";
};
packageRequires = [
compat
@@ -3042,10 +3064,10 @@
elpaBuild {
pname = "magit-section";
ename = "magit-section";
- version = "4.1.1.0.20241001.205222";
+ version = "4.1.2.0.20241102.130025";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.1.1.0.20241001.205222.tar";
- sha256 = "1lad3vqflf4fdsjfiyarjgcl7w73k8rj0bbsndc3xd6j5q53azfr";
+ url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.1.2.0.20241102.130025.tar";
+ sha256 = "1cnpklpsvbsi1wsmfbp5m8379cbr6jdifxm07zj4hnvi8lyr49vn";
};
packageRequires = [
compat
@@ -3067,10 +3089,10 @@
elpaBuild {
pname = "markdown-mode";
ename = "markdown-mode";
- version = "2.7alpha0.20240829.32430";
+ version = "2.7alpha0.20241203.113852";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/markdown-mode-2.7alpha0.20240829.32430.tar";
- sha256 = "0npgvcni0h5nr253fsn0d1cm3fnq1s662ba7aa23vsvkyk1x54d9";
+ url = "https://elpa.nongnu.org/nongnu-devel/markdown-mode-2.7alpha0.20241203.113852.tar";
+ sha256 = "14kkg7wj6qkq84jsa5cdwc7i7lqvilx21nb9lyddqxqxm8h7sld8";
};
packageRequires = [ ];
meta = {
@@ -3086,18 +3108,20 @@
lib,
persist,
request,
+ tp,
}:
elpaBuild {
pname = "mastodon";
ename = "mastodon";
- version = "1.0.27.0.20240920.183931";
+ version = "1.1.7.0.20241202.183936";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/mastodon-1.0.27.0.20240920.183931.tar";
- sha256 = "0wy6ibdbj984aycscvsg24k4z3a0dlzi2ghbvrb8zq3lma8sy2a6";
+ url = "https://elpa.nongnu.org/nongnu-devel/mastodon-1.1.7.0.20241202.183936.tar";
+ sha256 = "08683fah6xkfzgxi6si4qgl4mxccczj4dcaivif1qlhfrc3bh66f";
};
packageRequires = [
persist
request
+ tp
];
meta = {
homepage = "https://elpa.nongnu.org/nongnu-devel/mastodon.html";
@@ -3165,10 +3189,10 @@
elpaBuild {
pname = "meow";
ename = "meow";
- version = "1.4.5.0.20241014.63605";
+ version = "1.5.0.0.20241203.160407";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/meow-1.4.5.0.20241014.63605.tar";
- sha256 = "1ws4i72gmr6g8fxvc27p28rm6wjdm71xpi03xiwy33x7m960g470";
+ url = "https://elpa.nongnu.org/nongnu-devel/meow-1.5.0.0.20241203.160407.tar";
+ sha256 = "0a3zdx91j5q0mllm71951392hgnn5q9l960qs2lazs8plpv4pn9f";
};
packageRequires = [ ];
meta = {
@@ -3249,10 +3273,10 @@
elpaBuild {
pname = "mpv";
ename = "mpv";
- version = "0.2.0.0.20220801.191738";
+ version = "0.2.0.0.20241121.230837";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/mpv-0.2.0.0.20220801.191738.tar";
- sha256 = "0fanxxgmpjmy13lawr15ccnlzc5k89pix6m020kxbpi6aj2n1apc";
+ url = "https://elpa.nongnu.org/nongnu-devel/mpv-0.2.0.0.20241121.230837.tar";
+ sha256 = "1aynlwp90xrprri3m1v8yxa5zvbx6d12m662lsn9qdzvhl2dy5hk";
};
packageRequires = [ ];
meta = {
@@ -3270,10 +3294,10 @@
elpaBuild {
pname = "multiple-cursors";
ename = "multiple-cursors";
- version = "1.4.0.0.20240223.113445";
+ version = "1.4.0.0.20241202.163103";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/multiple-cursors-1.4.0.0.20240223.113445.tar";
- sha256 = "17wq8apfvcrmx4mvyw2pbkp9jg5c960w8j81blzxq1qxh1ggdv3z";
+ url = "https://elpa.nongnu.org/nongnu-devel/multiple-cursors-1.4.0.0.20241202.163103.tar";
+ sha256 = "018f3fpv0ganvhcwykpb2rfw41nqlkj87dx1zfzkf7s9011grkfv";
};
packageRequires = [ ];
meta = {
@@ -3424,10 +3448,10 @@
elpaBuild {
pname = "org-contrib";
ename = "org-contrib";
- version = "0.6.0.20240907.102556";
+ version = "0.6.0.20241029.204012";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/org-contrib-0.6.0.20240907.102556.tar";
- sha256 = "16dv65jz0ykzi0dk2zd1gj46113wq1bnzxzbacpbddix53vkfbc1";
+ url = "https://elpa.nongnu.org/nongnu-devel/org-contrib-0.6.0.20241029.204012.tar";
+ sha256 = "12pfmv5ns5igdvc06glcc8nxqcj7lwjqc3s86720ys57y4py566w";
};
packageRequires = [ org ];
meta = {
@@ -3657,10 +3681,10 @@
elpaBuild {
pname = "package-lint";
ename = "package-lint";
- version = "0.24.0.20241007.131950";
+ version = "0.24.0.20241127.182614";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/package-lint-0.24.0.20241007.131950.tar";
- sha256 = "1srjs8xwwiqzjh550snzk0yzd4vy3ynk0d3i41y2i7wgfdggyl0p";
+ url = "https://elpa.nongnu.org/nongnu-devel/package-lint-0.24.0.20241127.182614.tar";
+ sha256 = "0wlz1hc387jcbh75hqjkxmydlsl0ai2adiam2axmqfdfn5p68llq";
};
packageRequires = [ let-alist ];
meta = {
@@ -3700,10 +3724,10 @@
elpaBuild {
pname = "page-break-lines";
ename = "page-break-lines";
- version = "0.15.0.20240911.171451";
+ version = "0.15.0.20241107.72714";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/page-break-lines-0.15.0.20240911.171451.tar";
- sha256 = "142s6q9fyr030rkdj1i349nbsfab7r742h2i1x430g8m19qai4zr";
+ url = "https://elpa.nongnu.org/nongnu-devel/page-break-lines-0.15.0.20241107.72714.tar";
+ sha256 = "0661kz0f8rippn1pi0jdzxa000vvakqv0s4y5f7f6vg41vhcna54";
};
packageRequires = [ ];
meta = {
@@ -3721,10 +3745,10 @@
elpaBuild {
pname = "paredit";
ename = "paredit";
- version = "27beta0.20230718.202710";
+ version = "27beta0.20241103.213959";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/paredit-27beta0.20230718.202710.tar";
- sha256 = "0fz65pr6p6dz3i78rzprzznzhyw34w8msnd4mzkls63bm4548gmd";
+ url = "https://elpa.nongnu.org/nongnu-devel/paredit-27beta0.20241103.213959.tar";
+ sha256 = "00xb4lzkbfsz7f7pnsjfzbhigp4r2piimj7cplq7fxjl80j39lka";
};
packageRequires = [ ];
meta = {
@@ -3857,10 +3881,10 @@
elpaBuild {
pname = "php-mode";
ename = "php-mode";
- version = "1.26.1.0.20240912.223846";
+ version = "1.26.1.0.20241024.124149";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.26.1.0.20240912.223846.tar";
- sha256 = "09jppnrpl6y1y41g7bshy674c3p39l8r060zq57kr2f022z93mg8";
+ url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.26.1.0.20241024.124149.tar";
+ sha256 = "0h5lzvsssk0nf3g408a7jg25crglsjkhcfp1ckjnzpgiwf59i6w8";
};
packageRequires = [ ];
meta = {
@@ -3920,10 +3944,10 @@
elpaBuild {
pname = "projectile";
ename = "projectile";
- version = "2.9.0snapshot0.20241009.115247";
+ version = "2.9.0snapshot0.20241113.45011";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/projectile-2.9.0snapshot0.20241009.115247.tar";
- sha256 = "0lns0g1b52ib512dc0mqr8si6yqvnpcv148s262j5jqmm4a2sdm5";
+ url = "https://elpa.nongnu.org/nongnu-devel/projectile-2.9.0snapshot0.20241113.45011.tar";
+ sha256 = "1hnyq1rfldda4csmdykwsngh317cxgj0bmlqy8xjbfqpy4876gar";
};
packageRequires = [ ];
meta = {
@@ -3941,10 +3965,10 @@
elpaBuild {
pname = "proof-general";
ename = "proof-general";
- version = "4.6snapshot0.20241004.113700";
+ version = "4.6snapshot0.20241126.3245";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/proof-general-4.6snapshot0.20241004.113700.tar";
- sha256 = "1kki60ds5mqkm89lfyx2ac510200bqfnmlkfcjkn7zcrkkcl6s7r";
+ url = "https://elpa.nongnu.org/nongnu-devel/proof-general-4.6snapshot0.20241126.3245.tar";
+ sha256 = "12py1s85wrvxqiha2bfbdmszy4dl9wh8pbbhfx2q7qds2hd9c3wc";
};
packageRequires = [ ];
meta = {
@@ -3984,10 +4008,10 @@
elpaBuild {
pname = "racket-mode";
ename = "racket-mode";
- version = "1.0.20241001.105847";
+ version = "1.0.20241129.85359";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20241001.105847.tar";
- sha256 = "0yhvr3c6f2hsdj4i699h7z4gjjim359wk09z917lb8dqdd3ddjdv";
+ url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20241129.85359.tar";
+ sha256 = "0j6hs2wpaknzprcm18y1ayqjcr2sl0z22fhw1yla5rv74lyqzglx";
};
packageRequires = [ ];
meta = {
@@ -4068,10 +4092,10 @@
elpaBuild {
pname = "reformatter";
ename = "reformatter";
- version = "0.8.0.20241007.102705";
+ version = "0.8.0.20241106.203153";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/reformatter-0.8.0.20241007.102705.tar";
- sha256 = "1z3zdmq78vziv45g133y1bnyzaszx0v16vdmwdfpcakj7b11qqw7";
+ url = "https://elpa.nongnu.org/nongnu-devel/reformatter-0.8.0.20241106.203153.tar";
+ sha256 = "1gni5f8x8d6m063k9bgaqah80w2hnb12d7qwdw1ai0xg7jb92vp7";
};
packageRequires = [ ];
meta = {
@@ -4152,10 +4176,10 @@
elpaBuild {
pname = "rust-mode";
ename = "rust-mode";
- version = "1.0.6.0.20240919.160702";
+ version = "1.0.6.0.20241112.43839";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/rust-mode-1.0.6.0.20240919.160702.tar";
- sha256 = "10ack1z2zpfsn2li5nl6l7rpsm43hivgikjdqz5zgiskmqdfy1m5";
+ url = "https://elpa.nongnu.org/nongnu-devel/rust-mode-1.0.6.0.20241112.43839.tar";
+ sha256 = "1jmby08vp18qr2cx3k6skw9mar7vb7wr5ph9q2g95wx8836g6mbp";
};
packageRequires = [ ];
meta = {
@@ -4327,10 +4351,10 @@
elpaBuild {
pname = "slime";
ename = "slime";
- version = "2.30snapshot0.20241013.100856";
+ version = "2.31.0.20241201.210325";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/slime-2.30snapshot0.20241013.100856.tar";
- sha256 = "19i9vgb1h20lmfskr13b7jkj7xg16dkm0ymhndi41xbimdnvav42";
+ url = "https://elpa.nongnu.org/nongnu-devel/slime-2.31.0.20241201.210325.tar";
+ sha256 = "05skikmrfcwbahph8z50kf1zh5vps7459zw7l1bipgyvhfvpq9fn";
};
packageRequires = [ macrostep ];
meta = {
@@ -4411,10 +4435,10 @@
elpaBuild {
pname = "spacemacs-theme";
ename = "spacemacs-theme";
- version = "0.2.0.20240825.170904";
+ version = "0.2.0.20241101.103011";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/spacemacs-theme-0.2.0.20240825.170904.tar";
- sha256 = "196nby3c283qls06m6vgjr0g964jpyy760y1mmllkczbm4ia34aw";
+ url = "https://elpa.nongnu.org/nongnu-devel/spacemacs-theme-0.2.0.20241101.103011.tar";
+ sha256 = "1sxj7xghkkayvpa1qb4d3ws81931r8s737wk3akwhayh50czh3fi";
};
packageRequires = [ ];
meta = {
@@ -4516,10 +4540,10 @@
elpaBuild {
pname = "subed";
ename = "subed";
- version = "1.2.16.0.20241006.204608";
+ version = "1.2.21.0.20241117.83905";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/subed-1.2.16.0.20241006.204608.tar";
- sha256 = "0xqqdjpkbf27yaixh60k79xnqpj8kppy9lc1z2ij73sp3lync0gb";
+ url = "https://elpa.nongnu.org/nongnu-devel/subed-1.2.21.0.20241117.83905.tar";
+ sha256 = "0v95g129yp9s3kknbw1fp4iqn0f0g65bhvw4433v3dbinw9l3k74";
};
packageRequires = [ ];
meta = {
@@ -4538,10 +4562,10 @@
elpaBuild {
pname = "sweeprolog";
ename = "sweeprolog";
- version = "0.27.6.0.20240905.90947";
+ version = "0.27.6.0.20241107.191437";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/sweeprolog-0.27.6.0.20240905.90947.tar";
- sha256 = "0wsl9dnz1vrr5qajcps5095gaxpqwspb16qac72sdafxidjfgabh";
+ url = "https://elpa.nongnu.org/nongnu-devel/sweeprolog-0.27.6.0.20241107.191437.tar";
+ sha256 = "0y543svzd7sqqb2izlflvmv0mdyfwwzjgli107ra89w5jl6jxawh";
};
packageRequires = [ compat ];
meta = {
@@ -4645,10 +4669,10 @@
elpaBuild {
pname = "tangotango-theme";
ename = "tangotango-theme";
- version = "0.0.7.0.20240522.132740";
+ version = "0.0.7.0.20241117.114955";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/tangotango-theme-0.0.7.0.20240522.132740.tar";
- sha256 = "1psr1amscknyw41dmsw6mvy73v271l8mzibwhl6kfp41a97cnlki";
+ url = "https://elpa.nongnu.org/nongnu-devel/tangotango-theme-0.0.7.0.20241117.114955.tar";
+ sha256 = "1p9j3pqgp0nzsypqdx9bc1qhkgyc3s3p9rbm3la356yfc3d3wxa3";
};
packageRequires = [ ];
meta = {
@@ -4770,6 +4794,28 @@
};
}
) { };
+ tp = callPackage (
+ {
+ elpaBuild,
+ fetchurl,
+ lib,
+ transient,
+ }:
+ elpaBuild {
+ pname = "tp";
+ ename = "tp";
+ version = "0.6.0.20241031.72940";
+ src = fetchurl {
+ url = "https://elpa.nongnu.org/nongnu-devel/tp-0.6.0.20241031.72940.tar";
+ sha256 = "1m8qhar75cglg8qjh3sbgwkzkhfp3640nm73nddxrshnajn978bf";
+ };
+ packageRequires = [ transient ];
+ meta = {
+ homepage = "https://elpa.nongnu.org/nongnu-devel/tp.html";
+ license = lib.licenses.free;
+ };
+ }
+ ) { };
treesit-fold = callPackage (
{
elpaBuild,
@@ -4800,10 +4846,10 @@
elpaBuild {
pname = "treeview";
ename = "treeview";
- version = "1.2.0.0.20230728.234322";
+ version = "1.3.1.0.20241101.11503";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/treeview-1.2.0.0.20230728.234322.tar";
- sha256 = "0cf64zj3iv1qzzddr5hg9rsjilczfn2c84dcgpfny7l3wzqrmwl1";
+ url = "https://elpa.nongnu.org/nongnu-devel/treeview-1.3.1.0.20241101.11503.tar";
+ sha256 = "0hf893bhnqg4ixfvs16h3rdiizkd14gsiq0cfg63cz077vp9bskh";
};
packageRequires = [ ];
meta = {
@@ -4843,10 +4889,10 @@
elpaBuild {
pname = "typescript-mode";
ename = "typescript-mode";
- version = "0.4.0.20240603.115709";
+ version = "0.4.0.20241119.194738";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/typescript-mode-0.4.0.20240603.115709.tar";
- sha256 = "0v00kk4035i7b4b7clcwqxiavz89l2zxfpgk7f773ymamxpr3g82";
+ url = "https://elpa.nongnu.org/nongnu-devel/typescript-mode-0.4.0.20241119.194738.tar";
+ sha256 = "0yndbfnalj22bp2bzmrsa24a0v4cbk85b5yiqcg2diknrvsxkg2c";
};
packageRequires = [ ];
meta = {
@@ -4864,10 +4910,10 @@
elpaBuild {
pname = "ujelly-theme";
ename = "ujelly-theme";
- version = "1.2.9.0.20180214.162459";
+ version = "1.3.6.0.20241111.2243";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/ujelly-theme-1.2.9.0.20180214.162459.tar";
- sha256 = "1frl87liqd9wdd6i1wwi94qzbwdx24p5shr90flrnpj6hs2yx1n3";
+ url = "https://elpa.nongnu.org/nongnu-devel/ujelly-theme-1.3.6.0.20241111.2243.tar";
+ sha256 = "16q5n2854x9km0kd4vfr0wskbkw66pd1rf1qy34v1yacq2phb77b";
};
packageRequires = [ ];
meta = {
@@ -4969,10 +5015,10 @@
elpaBuild {
pname = "visual-fill-column";
ename = "visual-fill-column";
- version = "2.6.3.0.20240411.65626";
+ version = "2.6.3.0.20241109.231059";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/visual-fill-column-2.6.3.0.20240411.65626.tar";
- sha256 = "0hyhxpqj39say3w9rpw3mhx7r9aici1wfsrr9631bnc0249qylj2";
+ url = "https://elpa.nongnu.org/nongnu-devel/visual-fill-column-2.6.3.0.20241109.231059.tar";
+ sha256 = "1k6ih7fw0xmbm6m249cdinyx8g5k3gpdglla8242w64bqrxxcpr8";
};
packageRequires = [ ];
meta = {
@@ -4992,10 +5038,10 @@
elpaBuild {
pname = "vm";
ename = "vm";
- version = "8.3.0snapshot0.20240917.131054";
+ version = "8.3.0snapshot0.20241026.45603";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.0snapshot0.20240917.131054.tar";
- sha256 = "0csg8ng38jqw5jlj5db24ngh5ay9qi8p8bvfgg3acxa26qjma03l";
+ url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.0snapshot0.20241026.45603.tar";
+ sha256 = "1ipasfr8g64n2i5yn992yw8aikkjzqw1lshlai90sxrdd1s3vlgm";
};
packageRequires = [
cl-lib
@@ -5039,10 +5085,10 @@
elpaBuild {
pname = "webpaste";
ename = "webpaste";
- version = "3.2.2.0.20241002.53654";
+ version = "3.2.2.0.20241125.141806";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/webpaste-3.2.2.0.20241002.53654.tar";
- sha256 = "0y63yrid0cxszfsm99pj6nig2siq85flma5l12fiydkpa6xh3ybj";
+ url = "https://elpa.nongnu.org/nongnu-devel/webpaste-3.2.2.0.20241125.141806.tar";
+ sha256 = "0356h3x2l0iaqk04zyp870r7bd1kzsldlqgdfn61x32krwml3iif";
};
packageRequires = [
cl-lib
@@ -5127,10 +5173,10 @@
elpaBuild {
pname = "with-editor";
ename = "with-editor";
- version = "3.4.2.0.20240831.223035";
+ version = "3.4.3.0.20241201.141907";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.4.2.0.20240831.223035.tar";
- sha256 = "120v2n8py0qjcmlnf8l7p83w3bb5vg614ci65gliqhgmikhbwafh";
+ url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.4.3.0.20241201.141907.tar";
+ sha256 = "1srqg86809lb1b0dj421gb6n522cx19snhvhvxb4nxkk98afiywp";
};
packageRequires = [ compat ];
meta = {
@@ -5216,10 +5262,10 @@
elpaBuild {
pname = "ws-butler";
ename = "ws-butler";
- version = "0.6.0.20201117.102839";
+ version = "0.7.0.20241107.1911";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/ws-butler-0.6.0.20201117.102839.tar";
- sha256 = "0k1dwxw22ar3837i05a17pr52nzxjdcs1fldwlq0b5xynjfj2i3k";
+ url = "https://elpa.nongnu.org/nongnu-devel/ws-butler-0.7.0.20241107.1911.tar";
+ sha256 = "1571dns6zdvdqvz5mnca207jpbijm9aiaf6x4iy69w91hszsdda0";
};
packageRequires = [ ];
meta = {
@@ -5237,10 +5283,10 @@
elpaBuild {
pname = "xah-fly-keys";
ename = "xah-fly-keys";
- version = "26.6.20241009212806.0.20241009.212859";
+ version = "26.8.20241118173945.0.20241118.174137";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-26.6.20241009212806.0.20241009.212859.tar";
- sha256 = "07vpnsrifc6nkf7zrhahzgxn196wm3w71zvsvb249sjf3za9gz07";
+ url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-26.8.20241118173945.0.20241118.174137.tar";
+ sha256 = "196hv8hjzp87b8y9k65w2zag46bx2jhmah1w9mdjxwkfbq6bjcmq";
};
packageRequires = [ ];
meta = {
@@ -5323,10 +5369,10 @@
elpaBuild {
pname = "yasnippet-snippets";
ename = "yasnippet-snippets";
- version = "1.0.0.20240911.80118";
+ version = "1.0.0.20241014.94920";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/yasnippet-snippets-1.0.0.20240911.80118.tar";
- sha256 = "1wn5ckrlpacrlil6ap9j1x1lfr1yydnf0hcy268ji52hwvkdf55p";
+ url = "https://elpa.nongnu.org/nongnu-devel/yasnippet-snippets-1.0.0.20241014.94920.tar";
+ sha256 = "065wcvb295dhyi6jvb80vagzb8idqycchqgy32pj0fr6vcxx7y88";
};
packageRequires = [ yasnippet ];
meta = {
@@ -5366,10 +5412,10 @@
elpaBuild {
pname = "zig-mode";
ename = "zig-mode";
- version = "0.0.8.0.20240507.233944";
+ version = "0.0.8.0.20241104.162434";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu-devel/zig-mode-0.0.8.0.20240507.233944.tar";
- sha256 = "1skx0if2ac40csgsrfvkd73ydsvr24ijkmqrpya65n67388gibfv";
+ url = "https://elpa.nongnu.org/nongnu-devel/zig-mode-0.0.8.0.20241104.162434.tar";
+ sha256 = "01g51mvsg578hcnr8kbda8pbgy7yrk57p9djy3bn1rp4vwjh2f46";
};
packageRequires = [ reformatter ];
meta = {
diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
index e4b11ec07df73..34b460fecaa0a 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
@@ -93,10 +93,10 @@
elpaBuild {
pname = "annotate";
ename = "annotate";
- version = "2.2.2";
+ version = "2.2.3";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/annotate-2.2.2.tar";
- sha256 = "0hrb7kjzhgy46hxaa77rv5ilsdsv6zxpawnkx4viw5jq0v5s4fl6";
+ url = "https://elpa.nongnu.org/nongnu/annotate-2.2.3.tar";
+ sha256 = "1x0v51rbnyzwvjwp4xwsd2a4xisid65zgww6yk0bb81421i54ps3";
};
packageRequires = [ ];
meta = {
@@ -544,10 +544,10 @@
elpaBuild {
pname = "cider";
ename = "cider";
- version = "1.16.0";
+ version = "1.16.1";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/cider-1.16.0.tar";
- sha256 = "1chp9ixd0k6yv4m727si6pgn2kys3zi5xkiq88xbv7bjcjryqmgz";
+ url = "https://elpa.nongnu.org/nongnu/cider-1.16.1.tar";
+ sha256 = "12nzhxy614fbmck7k7yy5yfknvmrsafc06vysc7c6ya6q4mmb91x";
};
packageRequires = [
clojure-mode
@@ -915,6 +915,28 @@
};
}
) { };
+ dirvish = callPackage (
+ {
+ elpaBuild,
+ fetchurl,
+ lib,
+ transient,
+ }:
+ elpaBuild {
+ pname = "dirvish";
+ ename = "dirvish";
+ version = "2.0.53";
+ src = fetchurl {
+ url = "https://elpa.nongnu.org/nongnu/dirvish-2.0.53.tar";
+ sha256 = "02ji38zsb7lw43s919a8xfxcz2fl5cdrs3rk99cfqyvc4c1lywql";
+ };
+ packageRequires = [ transient ];
+ meta = {
+ homepage = "https://elpa.nongnu.org/nongnu/dirvish.html";
+ license = lib.licenses.free;
+ };
+ }
+ ) { };
doc-show-inline = callPackage (
{
elpaBuild,
@@ -1009,10 +1031,10 @@
elpaBuild {
pname = "dslide";
ename = "dslide";
- version = "0.5.3";
+ version = "0.5.5";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/dslide-0.5.3.tar";
- sha256 = "11q807jp90y37s1njmr6qlnqi9pk371gj8mwg57kgjvc55qdyas5";
+ url = "https://elpa.nongnu.org/nongnu/dslide-0.5.5.tar";
+ sha256 = "1hnmnl6ildr2cyc8hx1maa3vnz621d41yhsx8naxq3mssz4rkajp";
};
packageRequires = [ ];
meta = {
@@ -1116,10 +1138,10 @@
elpaBuild {
pname = "elpher";
ename = "elpher";
- version = "3.6.3";
+ version = "3.6.4";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/elpher-3.6.3.tar";
- sha256 = "0vjsb2jfgnf9jya14zigy2jcd8agxsncm7cxg61jm940jyvs8fsq";
+ url = "https://elpa.nongnu.org/nongnu/elpher-3.6.4.tar";
+ sha256 = "0f6hsw50a36jyp1ikawcdj9yn3isks03ax47x8vflmayydndir4g";
};
packageRequires = [ ];
meta = {
@@ -1137,10 +1159,10 @@
elpaBuild {
pname = "emacsql";
ename = "emacsql";
- version = "4.0.3";
+ version = "4.1.0";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/emacsql-4.0.3.tar";
- sha256 = "1179z8d5mzhmnq2b1q9pf450jflxvrk5y2i3hzdl8lvd4nrm6kgw";
+ url = "https://elpa.nongnu.org/nongnu/emacsql-4.1.0.tar";
+ sha256 = "1nf7piakf1v23bnqdyivp4l9vq6xyzjxrgxaswncmvzqxb4qvhyx";
};
packageRequires = [ ];
meta = {
@@ -2085,10 +2107,10 @@
elpaBuild {
pname = "gnosis";
ename = "gnosis";
- version = "0.4.5";
+ version = "0.4.8";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/gnosis-0.4.5.tar";
- sha256 = "00rca3rfij2c8120kzs8wc6xsarpcj20gzwys05c7fhf7j8l5bdy";
+ url = "https://elpa.nongnu.org/nongnu/gnosis-0.4.8.tar";
+ sha256 = "1sf6213qj6i306rqbp1a5wj7haw5vkmc1684fdfqzyqa1gw2ni5v";
};
packageRequires = [
compat
@@ -2259,10 +2281,10 @@
elpaBuild {
pname = "gptel";
ename = "gptel";
- version = "0.9.5";
+ version = "0.9.6";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/gptel-0.9.5.tar";
- sha256 = "0ixji76xaqkm0ziidjmanax4q0xqyj1qcwva6r5sbsks6gpmrziv";
+ url = "https://elpa.nongnu.org/nongnu/gptel-0.9.6.tar";
+ sha256 = "0n7d8plabgmpyl224079cqrwlgqq7wwysba0wd0ry75h6z388rcb";
};
packageRequires = [
compat
@@ -2644,10 +2666,10 @@
elpaBuild {
pname = "hyperdrive-org-transclusion";
ename = "hyperdrive-org-transclusion";
- version = "0.2";
+ version = "0.3.1";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/hyperdrive-org-transclusion-0.2.tar";
- sha256 = "1zbhbsfrdcc5mfkpbzwkyn9bgapf8hs0jzy14lv9d5g99wskzbis";
+ url = "https://elpa.nongnu.org/nongnu/hyperdrive-org-transclusion-0.3.1.tar";
+ sha256 = "074ylcblg6wg2yg8jv1i6cn8vig56br0bqp5xwmhkslwrkqj05cj";
};
packageRequires = [
hyperdrive
@@ -2889,10 +2911,10 @@
elpaBuild {
pname = "julia-mode";
ename = "julia-mode";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/julia-mode-1.0.0.tar";
- sha256 = "02xab8qhf1z4cdn847n9ar2g65843qknca88jkaa94zzkxpv2bi1";
+ url = "https://elpa.nongnu.org/nongnu/julia-mode-1.0.1.tar";
+ sha256 = "0203h99yia5k37ansy2wshkiyn105jaahmkm0ncf54far8dw6mwx";
};
packageRequires = [ ];
meta = {
@@ -3027,10 +3049,10 @@
elpaBuild {
pname = "magit";
ename = "magit";
- version = "4.1.1";
+ version = "4.1.2";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/magit-4.1.1.tar";
- sha256 = "0rjxlrs5ik6mqnvs9mz2pjmz23np3ch0ybkzimd9ji70283fyif6";
+ url = "https://elpa.nongnu.org/nongnu/magit-4.1.2.tar";
+ sha256 = "1jyivrk78fnp7kcrac9sm2ldbxg9c96qhnlz06wv1m7hbvd3fgfx";
};
packageRequires = [
compat
@@ -3058,10 +3080,10 @@
elpaBuild {
pname = "magit-section";
ename = "magit-section";
- version = "4.1.1";
+ version = "4.1.2";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/magit-section-4.1.1.tar";
- sha256 = "1vbfvnmmm026zk098vxk21zh8r444cy476br4b6y20lhnniybh7s";
+ url = "https://elpa.nongnu.org/nongnu/magit-section-4.1.2.tar";
+ sha256 = "0g24aj030fh55y44f3c33708fbm02jwzggh75zvg63bka3g6j242";
};
packageRequires = [
compat
@@ -3102,18 +3124,20 @@
lib,
persist,
request,
+ tp,
}:
elpaBuild {
pname = "mastodon";
ename = "mastodon";
- version = "1.0.27";
+ version = "1.1.7";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.27.tar";
- sha256 = "0kbbzmqnnh0pvd215660p1c2wljnxr5139vs17k9cnh8n5qsddjr";
+ url = "https://elpa.nongnu.org/nongnu/mastodon-1.1.7.tar";
+ sha256 = "0qnkbab6y0gpqq0kvil4gnbajflpv0mz3pzcimcvz79dnmb0vc9p";
};
packageRequires = [
persist
request
+ tp
];
meta = {
homepage = "https://elpa.nongnu.org/nongnu/mastodon.html";
@@ -3181,10 +3205,10 @@
elpaBuild {
pname = "meow";
ename = "meow";
- version = "1.4.5";
+ version = "1.5.0";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/meow-1.4.5.tar";
- sha256 = "1d63mw88vq97rq3a7qhkxid2xaag5dp21ijisw9s3fk972kcks3s";
+ url = "https://elpa.nongnu.org/nongnu/meow-1.5.0.tar";
+ sha256 = "1fwd6lwaci23scgv65fxrxg51w334pw92l4c51ci9s0qgh1vjb01";
};
packageRequires = [ ];
meta = {
@@ -4007,10 +4031,10 @@
elpaBuild {
pname = "racket-mode";
ename = "racket-mode";
- version = "1.0.20241001.105847";
+ version = "1.0.20241129.85359";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20241001.105847.tar";
- sha256 = "0wwg30wbigmnb7yz9wc2yrq58jzysd2vp1g2324lbc95z61ng5yd";
+ url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20241129.85359.tar";
+ sha256 = "0ish7ysdqypw849k9d3cw0bl69r5ksc3hrqdmyh8k2ipq2xbcn2w";
};
packageRequires = [ ];
meta = {
@@ -4346,10 +4370,10 @@
elpaBuild {
pname = "slime";
ename = "slime";
- version = "2.30";
+ version = "2.31";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/slime-2.30.tar";
- sha256 = "0gzgwrx6llj35kga21m3m4vp0g7f7dypim7pdnhy9sxrvl0k8v5f";
+ url = "https://elpa.nongnu.org/nongnu/slime-2.31.tar";
+ sha256 = "1s77j55nwz1s1c6763v0agsip5vrzd6f157q7i5z1jdmj3y0psck";
};
packageRequires = [ macrostep ];
meta = {
@@ -4535,10 +4559,10 @@
elpaBuild {
pname = "subed";
ename = "subed";
- version = "1.2.16";
+ version = "1.2.21";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/subed-1.2.16.tar";
- sha256 = "0fsxsp8g70mr36njmv2h3qrmp1mw3r4clrlzib33iq02wmw7q3rg";
+ url = "https://elpa.nongnu.org/nongnu/subed-1.2.21.tar";
+ sha256 = "1d0w96amchcpblcbkl16yiwsvj8qfpax66ysjg02550lhpb493x7";
};
packageRequires = [ ];
meta = {
@@ -4811,6 +4835,28 @@
};
}
) { };
+ tp = callPackage (
+ {
+ elpaBuild,
+ fetchurl,
+ lib,
+ transient,
+ }:
+ elpaBuild {
+ pname = "tp";
+ ename = "tp";
+ version = "0.6";
+ src = fetchurl {
+ url = "https://elpa.nongnu.org/nongnu/tp-0.6.tar";
+ sha256 = "1a4n6bhaxiiwy11ig09w7p1jxrsl5gfk7ikma9jzv2z54f2p97kz";
+ };
+ packageRequires = [ transient ];
+ meta = {
+ homepage = "https://elpa.nongnu.org/nongnu/tp.html";
+ license = lib.licenses.free;
+ };
+ }
+ ) { };
treeview = callPackage (
{
elpaBuild,
@@ -4820,10 +4866,10 @@
elpaBuild {
pname = "treeview";
ename = "treeview";
- version = "1.2.0";
+ version = "1.3.1";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/treeview-1.2.0.tar";
- sha256 = "1dmix7hn5yl69r987f0g2m00p866ln8412dm7fj399pmn1kdfsvy";
+ url = "https://elpa.nongnu.org/nongnu/treeview-1.3.1.tar";
+ sha256 = "02xac8kfh5j6vz0k44wif5v9h9xzs7srwxk0jff21qw32wy4accl";
};
packageRequires = [ ];
meta = {
@@ -4884,10 +4930,10 @@
elpaBuild {
pname = "ujelly-theme";
ename = "ujelly-theme";
- version = "1.2.9";
+ version = "1.3.6";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/ujelly-theme-1.2.9.tar";
- sha256 = "1yyjsdcwprynwk86phpqfifv6xkmn49yrj6fkh5s57w5sbby4fp0";
+ url = "https://elpa.nongnu.org/nongnu/ujelly-theme-1.3.6.tar";
+ sha256 = "19z3nf8avsipyywwlr77sy1bmf6gx5kk3fyph6nn4sn5vhcmgg0p";
};
packageRequires = [ ];
meta = {
@@ -5121,10 +5167,10 @@
elpaBuild {
pname = "with-editor";
ename = "with-editor";
- version = "3.4.2";
+ version = "3.4.3";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/with-editor-3.4.2.tar";
- sha256 = "0z6zi271p2ch4gylkz4ynj44hyxjmvvmg7xjsxwjmsyi800kwr58";
+ url = "https://elpa.nongnu.org/nongnu/with-editor-3.4.3.tar";
+ sha256 = "1n0cnxhbqb49i6pknx47f81vlpwi9a6cjbjzr8b349fh6yv3q9w7";
};
packageRequires = [ compat ];
meta = {
@@ -5210,10 +5256,10 @@
elpaBuild {
pname = "ws-butler";
ename = "ws-butler";
- version = "0.6";
+ version = "0.7";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/ws-butler-0.6.tar";
- sha256 = "1jzlwj2pqan3bj0mipvh8vzvmgynrxf1dqphix7g86ppjv1ivmfy";
+ url = "https://elpa.nongnu.org/nongnu/ws-butler-0.7.tar";
+ sha256 = "1rwkwcb4079czdsccldzq4kjrl25y53k4zy2n7026cd7hxxvc959";
};
packageRequires = [ ];
meta = {
@@ -5231,10 +5277,10 @@
elpaBuild {
pname = "xah-fly-keys";
ename = "xah-fly-keys";
- version = "26.6.20241009212806";
+ version = "26.8.20241118173945";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-26.6.20241009212806.tar";
- sha256 = "17xyb1dvsi2hqnhhk8vzbrskhlbh6w869c1iy14cdy3yndj7y8v2";
+ url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-26.8.20241118173945.tar";
+ sha256 = "1l6wwv1zmpsf64v23zzi2idjb14wnbpv5fcspiygiah62zag44vf";
};
packageRequires = [ ];
meta = {
diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
index 44e12d675eefe..241182b919d27 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
+++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
@@ -1426,14 +1426,14 @@
"repo": "abo-abo/ace-link",
"unstable": {
"version": [
- 20220901,
- 1710
+ 20241101,
+ 1344
],
"deps": [
"avy"
],
- "commit": "06ab398df85e81d1dc763b3210732dd26cba60a1",
- "sha256": "184n89m4daalzz10c6wyqxi8nzpki7bna9b0am39vxbi699k3pdk"
+ "commit": "d9bd4a25a02bdfde4ea56247daf3a9ff15632ea4",
+ "sha256": "0zdrxnd35dl9bdy2mb03zflb4mr8yw5s3qnpph2hvhlapkf19vwv"
},
"stable": {
"version": [
@@ -2167,11 +2167,11 @@
"url": "https://bitbucket.org/agriggio/ahg",
"unstable": {
"version": [
- 20230904,
- 701
+ 20241113,
+ 748
],
- "commit": "6a8dd876d767b50431db2c695a8c21d5df9944e2",
- "sha256": "1jq411g0ryxkqw4wig6mlm0dpjzx87cw3x277bcj796s3nxl95ln"
+ "commit": "d57b91d52e5c2c501cb7112af53c6549397ea1b5",
+ "sha256": "1whzlwad6fgg88fby7fsbzqdipz6s6xhqlnjna9vlcckbdzhs23b"
}
},
{
@@ -3283,11 +3283,11 @@
"repo": "anki-editor/anki-editor",
"unstable": {
"version": [
- 20240928,
- 843
+ 20241122,
+ 614
],
- "commit": "be75eb8b3f476770349b3fe0446fd7ae0edc5357",
- "sha256": "1qx1q12z0cx87i2mqwfggbn0gbw7vim7dvf15g8z5i01r7dgh0qs"
+ "commit": "32706314adf6d02a407f2b0b411741d9c4722c05",
+ "sha256": "0kzqrz2dyx67jwhfqjv6j4fjvwn45jy7kxqfxd16iii4kqh24fr8"
}
},
{
@@ -3398,11 +3398,11 @@
"repo": "bastibe/annotate.el",
"unstable": {
"version": [
- 20240509,
- 1144
+ 20241017,
+ 1508
],
- "commit": "bc82194ca5b10a05cab4169f6eacc5c18af61ec0",
- "sha256": "0vzvy7bxp6pb42x16jms7sw2l1mp7m0xfz3xk55hwyxfz8rh66gp"
+ "commit": "c5a41ce5ac861e3fcd95669eb68c886ce702d39b",
+ "sha256": "1pqgqr3mq3iw8k6gi72kb328wi3i5mc0c5y5ca48cj9qndwslv37"
},
"stable": {
"version": [
@@ -3520,28 +3520,28 @@
"repo": "emacs-ansible/emacs-ansible",
"unstable": {
"version": [
- 20240926,
- 2144
+ 20241129,
+ 309
],
"deps": [
"f",
"s"
],
- "commit": "e171dacc12eeaba5dbd7fd887f94d11b357fe958",
- "sha256": "11ls81zr5b62cykc28rldw1y1hx0bhf2s6xqypdsxblk5ymgr491"
+ "commit": "03e285bb54a687e3fd9e21026b088fdac46679a0",
+ "sha256": "0hpb8bcpyynzkc90jygp284l79vfgl5xb2hig0h5j7n5xvjcg1g9"
},
"stable": {
"version": [
0,
- 3,
- 2
+ 4,
+ 0
],
"deps": [
"f",
"s"
],
- "commit": "40af0d2bbb6c5bbcf7aa9269ac9a07e22622d263",
- "sha256": "12k8mwlyiipsdjq5h1v04g3aa7ymjyhmy14j6vzjil4w9l6xyvdh"
+ "commit": "a005c70be00de6b8d45b51807fe1e049dd945fb3",
+ "sha256": "1i9fymfw8s05s3cy4rbldd6pya6y7gpaqcjcrkcyd96y5awb0w34"
}
},
{
@@ -3796,17 +3796,17 @@
},
{
"ename": "apel",
- "commit": "235012164f093451c0f7409f57e271d8b895833c",
- "sha256": "1w2ljg3pfxjp9jpl3f4p5iggd44gab7ps19xxdp8iz8dq0rxgpf9",
+ "commit": "8fe101b6d26bc501d5dc3515f10f972a53078a46",
+ "sha256": "0bx1fpy57ph08b7azrhhfryng84w90p6d6ncpb308qdrwdhj157a",
"fetcher": "github",
- "repo": "wanderlust/apel",
+ "repo": "emacsmirror/apel",
"unstable": {
"version": [
- 20221214,
- 1337
+ 20241127,
+ 1623
],
- "commit": "1a6fd3bab2cc6b0a450c2d801f77a1c9da0f72fb",
- "sha256": "03yjg14rvcxn59wga4jvx28ii16bx5ym93fzfyssm67gqwgyb2gf"
+ "commit": "c58622cc6d2f6b503d3a930a2c48050be8e695cf",
+ "sha256": "0whqwnmd97gam65hc5pbk1li8v2jfi7ncjnps528gk8sx9zp8963"
}
},
{
@@ -3817,19 +3817,19 @@
"repo": "radian-software/apheleia",
"unstable": {
"version": [
- 20241006,
- 142
+ 20241113,
+ 351
],
- "commit": "d6f520752a77923a420f2ef894a6f2d26d29d7d0",
- "sha256": "0zsaxm72qbnjb35sain605zlrlxfia2m9yfp371cfgvn6bgpgn31"
+ "commit": "543f6d651d11322f26665f017f051fbcfc21ceb0",
+ "sha256": "0pw16nh2pbb33fkwk2wmr73x6z405w2acsjfli77j2j9vg4nxh52"
},
"stable": {
"version": [
4,
- 2
+ 3
],
- "commit": "3e347cff47eb0072b47c56f6188c4f440e477770",
- "sha256": "1an8k1zgahsjscmdm5s4mp71afb1mf86s63vg3pc8kalj4yw9gbj"
+ "commit": "543f6d651d11322f26665f017f051fbcfc21ceb0",
+ "sha256": "0pw16nh2pbb33fkwk2wmr73x6z405w2acsjfli77j2j9vg4nxh52"
}
},
{
@@ -3892,11 +3892,11 @@
"repo": "Greybeard-Entertainment/app-monochrome",
"unstable": {
"version": [
- 20240611,
- 1623
+ 20241110,
+ 1142
],
- "commit": "e319fcfeb56d0fe28bbda7fc813537593c2f368d",
- "sha256": "0qgj8l22cyyxwknkwc0104nhi5kcswgx5amd1b67pmrxj6cni0ws"
+ "commit": "6fedc38316ecf9529bd700cfb691cd1248a31c77",
+ "sha256": "133jvvjmc8q8hqrz53cf308ajxc77iqn7mqfzvrflkm3j785c8iv"
}
},
{
@@ -3961,29 +3961,6 @@
"sha256": "1z0z0pxy5f5lsw4pskk77dfql5s89iqb6zzkm4pr5r5pcqbhla1s"
}
},
- {
- "ename": "aproject",
- "commit": "de10c48976352f273e8363c2f6fa60602ee86c9b",
- "sha256": "0v3gx2mff2s7knm69y253pm1yr4svy8w00pqbn1chrvymb62jhp2",
- "fetcher": "github",
- "repo": "vietor/aproject",
- "unstable": {
- "version": [
- 20220410,
- 541
- ],
- "commit": "13e176ee69851403bec6471c5cceed17b7912b6f",
- "sha256": "1kb1vlqla4l2mixkd5awmgbh0bzwbngj8sq5mjvrw6slf7i35xjn"
- },
- "stable": {
- "version": [
- 0,
- 4
- ],
- "commit": "702caf5392288dfd821b1e744fef0bb4fd9f9281",
- "sha256": "18n3gsghj7sxxd6kpp21b2p7qwv93giwyr1zfvgbs8pzsbc8i9rx"
- }
- },
{
"ename": "apropospriate-theme",
"commit": "1da33013f15825ab656260ce7453b8127e0286f4",
@@ -3992,11 +3969,11 @@
"repo": "waymondo/apropospriate-theme",
"unstable": {
"version": [
- 20240921,
- 1422
+ 20241119,
+ 1
],
- "commit": "055693f52b5179f896a49c0570b5a6ca441fb2b9",
- "sha256": "0n9xyfxsd1ypn6psa4qwlbiwa5vvprh6js18rlhki67v6df3lwgp"
+ "commit": "56c8c1b575106e72bcab2227fd73cf34f7f3df79",
+ "sha256": "1ll2j35z2bgxfz4nkiminlfsmqb7gjcjapsmj001qb5sfzcy52p9"
},
"stable": {
"version": [
@@ -4010,10 +3987,10 @@
},
{
"ename": "apt-sources-list",
- "commit": "141a22e593415302d64cf8ebd2635a1baf35eb38",
- "sha256": "1gnl6zqv6imk2qpv4lj7qyjgf1ldxib3k14gsmwqm0c1zwjsid3j",
- "fetcher": "git",
- "url": "https://git.korewanetadesu.com/apt-sources-list.git",
+ "commit": "81c510927c3794cccd0a54feb5c1e82d7a6bd03b",
+ "sha256": "0hjn8ri29zksjgiv8wzm1gymdg29a44268sfx1767l5pyw1wyp2m",
+ "fetcher": "gitlab",
+ "repo": "joewreschnig/apt-sources-list-mode",
"unstable": {
"version": [
20180527,
@@ -4474,11 +4451,11 @@
"repo": "rnkn/astute",
"unstable": {
"version": [
- 20240910,
- 1312
+ 20241015,
+ 444
],
- "commit": "54ed0a94b1f0ce03becf91847a026403c697d2b6",
- "sha256": "02zgk44hv17qqp5065a84fdpqkwa5wzs6r68fqy0r6lag38j1aih"
+ "commit": "69d413c952771c0d06cda161fb25fe495fb895b0",
+ "sha256": "1jb00y23gk1rpm1gz11v4b4y087bblqyih2ca70y31i9gmyz7rq2"
}
},
{
@@ -4522,11 +4499,11 @@
"repo": "jwiegley/emacs-async",
"unstable": {
"version": [
- 20241005,
- 1824
+ 20241126,
+ 810
],
- "commit": "af47d6f930f93d4fdc4ca46e19e17547bf486c4c",
- "sha256": "1kxxkjv9cys3z25g3bcq5sdm99s1kfj909vzi12dfyrzmxh30kk0"
+ "commit": "b99658e831bc7e7d20ed4bb0a85bdb5c7dd74142",
+ "sha256": "19vszyfvbp3gh73yxq0wzqigfihgk8jzpp27ihirpy3v6kc3bkr7"
},
"stable": {
"version": [
@@ -5813,16 +5790,26 @@
"repo": "marcwebbie/auto-virtualenv",
"unstable": {
"version": [
- 20240115,
- 1548
+ 20241112,
+ 1959
],
"deps": [
- "cl-lib",
- "pyvenv",
- "s"
+ "cl-lib"
+ ],
+ "commit": "1f8efba02ef455aaa9cb84ab179949810e20213a",
+ "sha256": "0w9rfky6ms16c2ayr7bcd6cf9mn8imp6pcmqpi64s67f51vrqang"
+ },
+ "stable": {
+ "version": [
+ 2,
+ 2,
+ 0
],
- "commit": "5771eb59fc2f589aa3066297ff3bbeeae474d846",
- "sha256": "0vnl8k5dm9jjm5sr5gdp1405l20g2gx72nz26ha0g9r9qc6k4j8k"
+ "deps": [
+ "cl-lib"
+ ],
+ "commit": "1f8efba02ef455aaa9cb84ab179949810e20213a",
+ "sha256": "0w9rfky6ms16c2ayr7bcd6cf9mn8imp6pcmqpi64s67f51vrqang"
}
},
{
@@ -6085,14 +6072,14 @@
"repo": "abo-abo/avy",
"unstable": {
"version": [
- 20230420,
- 404
+ 20241101,
+ 1357
],
"deps": [
"cl-lib"
],
- "commit": "be612110cb116a38b8603df367942e2bb3d9bdbe",
- "sha256": "0bv65i5n15shiq6cg6a2rvbkf9kigc4920rimn954ahncfn5x73i"
+ "commit": "933d1f36cca0f71e4acb5fac707e9ae26c536264",
+ "sha256": "1x3fbz7b3wq15rl05n3k17mfjij8133nkvvhlac2x21c17b1i0m7"
},
"stable": {
"version": [
@@ -6797,11 +6784,11 @@
"repo": "szermatt/emacs-bash-completion",
"unstable": {
"version": [
- 20230612,
- 1103
+ 20241118,
+ 1847
],
- "commit": "f1daac0386c24cbe8a244a62c7588cc6847b07ae",
- "sha256": "0s8p5xj2v3zgqj9z1iqpnca6wd78jhzvgfkpsd4bqwbrhi543sjm"
+ "commit": "f3a85184ef9cc925bedcdbd62f66dd63a658f181",
+ "sha256": "0nk62c0qkw4f365sxv21xnv6hk32mkrzr0bv0m5sl9n1li98b9kk"
},
"stable": {
"version": [
@@ -7478,11 +7465,11 @@
"repo": "technomancy/better-defaults",
"unstable": {
"version": [
- 20230611,
- 432
+ 20241028,
+ 4
],
- "commit": "7d0e56b3a7f84bea6ee2dd9fda09da9df335f89e",
- "sha256": "17gbbf6m548wiw6ra40vf2q0nl7sxrfia29ssx3ikn7j59q6cc7g"
+ "commit": "fde8d8f9cf8c038c8ef902d939df4745e88fac88",
+ "sha256": "1kdin9c9lnzfy096l3hf3g54czpds4kgg13drj0d6aa2i0d6n78l"
}
},
{
@@ -7699,8 +7686,8 @@
"repo": "jrasband/biblio-gbooks",
"unstable": {
"version": [
- 20240102,
- 2034
+ 20241025,
+ 1400
],
"deps": [
"biblio-core",
@@ -7708,16 +7695,16 @@
"let-alist",
"seq"
],
- "commit": "991f214b8af23f168462a0006cf4d6216fbd7371",
- "sha256": "0bsm51pz69q938wfbr9kc84mizwjbnclvs17ski1s30s6xkinfra"
+ "commit": "c7bdaba4dde8fca8b8e923f3c004d050a32c06c2",
+ "sha256": "18fg3anm09bigv8zlb2hd3mf83kghf8261xjpklpxy77d80j7gv7"
}
},
{
"ename": "bibliothek",
- "commit": "8b8308e72c4437237fded29db1f60b3eba0edd26",
- "sha256": "011wnya65vfnn17fn1vhq0sk8c1mli81x0nb44yi6zl1hwxivb55",
- "fetcher": "github",
- "repo": "cadadr/elisp",
+ "commit": "04fdd633207a28b91f0a6e64aa25d114ab229a13",
+ "sha256": "1hsk56nxy765h4ag672xh0dgx1zh66vmijhw3f277q4vsadjrqc3",
+ "fetcher": "codeberg",
+ "repo": "kutuptiyini/elisp",
"unstable": {
"version": [
20190124,
@@ -7795,8 +7782,8 @@
"repo": "tmalsburg/helm-bibtex",
"unstable": {
"version": [
- 20240220,
- 1216
+ 20241116,
+ 726
],
"deps": [
"biblio",
@@ -7806,8 +7793,8 @@
"parsebib",
"s"
],
- "commit": "8b71b4f5ce62eeaf18067f57faaddc06449fbe1c",
- "sha256": "1zlg1bdjxjh1m3rb7i49il48ybj08wkbs17zcl0sxxmbldw3cvhp"
+ "commit": "6064e8625b2958f34d6d40312903a85c173b5261",
+ "sha256": "1q8dm14wdxx14rnlgmz88j6gskvrrsc0f2z2639jwmfhyibw7d77"
},
"stable": {
"version": [
@@ -7950,21 +7937,21 @@
},
{
"ename": "bind-chord",
- "commit": "6240afa625290187785e4b7535ee7b0d7aad8969",
- "sha256": "1hyhs3iypyg5730a20axcfzrrglm4nbgdz8x1ifkaa0iy5zc9hb0",
+ "commit": "6c1d8ed99c3769f6a789fb51dc37794b95f8bb37",
+ "sha256": "01a3c298kq8cfsxsscpic0shkjm77adiamgbgk8laqkbrlsrrcsb",
"fetcher": "github",
- "repo": "jwiegley/use-package",
+ "repo": "waymondo/use-package-chords",
"unstable": {
"version": [
- 20221117,
- 1610
+ 20241115,
+ 2228
],
"deps": [
"bind-key",
"key-chord"
],
- "commit": "9090080b15486c3e337be254226efe7e5fde4c99",
- "sha256": "03mqkv63ink2ysy86slac8ac7a5g22bi0pwvxyncfasm43q9d0sx"
+ "commit": "a2b16a1e64b19ae9428a6cd8f3e09b8159707a29",
+ "sha256": "0krskz087vy4iws01w5wxsn7b0pkncsn6s1vj9ywagn5i1z6a34x"
},
"stable": {
"version": [
@@ -7980,30 +7967,6 @@
"sha256": "03mqkv63ink2ysy86slac8ac7a5g22bi0pwvxyncfasm43q9d0sx"
}
},
- {
- "ename": "bind-key",
- "commit": "d39d33af6b6c9af9fe49bda319ea05c711a1b16e",
- "sha256": "1qw2c27016d3yfg0w10is1v72y2jvzhq07ca4h6v17yi94ahj5xm",
- "fetcher": "github",
- "repo": "jwiegley/use-package",
- "unstable": {
- "version": [
- 20230203,
- 2004
- ],
- "commit": "77945e002f11440eae72d8730d3de218163d551e",
- "sha256": "1irr8a8r28n8c0c2x5w1flgv1f3z5jy2i5r5dknddiqa93b3rm84"
- },
- "stable": {
- "version": [
- 2,
- 4,
- 4
- ],
- "commit": "9090080b15486c3e337be254226efe7e5fde4c99",
- "sha256": "03mqkv63ink2ysy86slac8ac7a5g22bi0pwvxyncfasm43q9d0sx"
- }
- },
{
"ename": "bind-map",
"commit": "f58800af5965a6e7c9314aa00e971196ea0d036e",
@@ -8036,14 +7999,14 @@
"repo": "divyaranjan/binder",
"unstable": {
"version": [
- 20241002,
- 1408
+ 20241023,
+ 1154
],
"deps": [
"seq"
],
- "commit": "0a86e1e60c04b525c9017b0479c1135044273f32",
- "sha256": "0nbczlvcdygfjy0grlxqpc5ygnwk8nyxi3pk8kkgp681c19bcpdi"
+ "commit": "928a68ff2cb186404f4247499a9d8a7a7a8c1f84",
+ "sha256": "0c1zfvfj0zgv6v6xvchyn63lsfni4vrg40ladf193ds9vz44mxjh"
},
"stable": {
"version": [
@@ -8090,14 +8053,14 @@
"repo": "liuyinz/binky.el",
"unstable": {
"version": [
- 20241011,
- 1931
+ 20241029,
+ 355
],
"deps": [
"dash"
],
- "commit": "604cbee86e829f9db47887e092b0835a6dbf47dd",
- "sha256": "1zlnwg5ggpjywqvdj2xxmk55bh8q50l8f1hh7anfqfkgfqr843lg"
+ "commit": "8841382a2b0925aca6644a2a0f1b87244b3e63c1",
+ "sha256": "15sl9dn5m59pprpqxbjc2kxa3rnk5kgi1rxzf8c3pdwvx5ll3fh0"
},
"stable": {
"version": [
@@ -8994,28 +8957,28 @@
"repo": "emacscollective/borg",
"unstable": {
"version": [
- 20240831,
- 2310
+ 20241201,
+ 1406
],
"deps": [
"epkg",
"magit"
],
- "commit": "cdae2c905ea5f819dec3b183214f5e19670d35f4",
- "sha256": "0m2h4mka751vxjac4c2ijznb8lwf473660d2nrrb84zh4h505xqf"
+ "commit": "497e1c02555852ee92d1c0ec70839e9ed93a02b8",
+ "sha256": "0vsazlnl3fa5i71cn74wk4pf4wakmx5navpfmf5f6aj475f1yk0s"
},
"stable": {
"version": [
4,
1,
- 0
+ 2
],
"deps": [
"epkg",
"magit"
],
- "commit": "cdae2c905ea5f819dec3b183214f5e19670d35f4",
- "sha256": "0m2h4mka751vxjac4c2ijznb8lwf473660d2nrrb84zh4h505xqf"
+ "commit": "497e1c02555852ee92d1c0ec70839e9ed93a02b8",
+ "sha256": "0vsazlnl3fa5i71cn74wk4pf4wakmx5navpfmf5f6aj475f1yk0s"
}
},
{
@@ -9661,11 +9624,11 @@
"repo": "ideasman42/emacs-buffer-name-relative",
"unstable": {
"version": [
- 20240421,
- 324
+ 20241015,
+ 1226
],
- "commit": "2e681c7277f599a319d99182284eebe13cd654e3",
- "sha256": "1flkps9v7dgggbd7pbz0pgj8p3gwyjlzzpbgv9xbpdmyfqxbb1m3"
+ "commit": "fdfd46bb14be76ad4de15f77d394f8ed1640cedd",
+ "sha256": "11lx849jj9zd7wgp6d1ljb7qy4gs4shrb8yqcmqb6f9azxka5zpd"
}
},
{
@@ -10782,17 +10745,16 @@
"repo": "emacsattic/call-graph",
"unstable": {
"version": [
- 20230222,
- 525
+ 20241111,
+ 117
],
"deps": [
"beacon",
- "hierarchy",
"ivy",
"tree-mode"
],
- "commit": "5fd5f3aad35e3561c253870e4d7fa34353b70b7b",
- "sha256": "1x4s5h4qpw3cm2bqnpwz0fkpznbs2fyvdk2zssbikwn9wxvpfapi"
+ "commit": "c19effc6d230822e08d181fb5943582878a8903b",
+ "sha256": "12my47321jjajgdqniajxl7wv7r7nh0gnlk8s55qdvi742127zmh"
},
"stable": {
"version": [
@@ -10921,14 +10883,14 @@
"repo": "minad/cape",
"unstable": {
"version": [
- 20241007,
- 501
+ 20241123,
+ 925
],
"deps": [
"compat"
],
- "commit": "485d8d4ad5aeb17a0f5d3337e600070276448c54",
- "sha256": "0r9igz35h3w3rqx9r34p9lwjs69xfq9cic4s6rwhsnix7n32apmf"
+ "commit": "9a7c44fe8b7ace73fa8ebf6b5805474f0ca07d01",
+ "sha256": "0qa4911y61y4nshb4nqq7yf7fp8ms39wjm1da51k48lypmw013yb"
},
"stable": {
"version": [
@@ -11083,20 +11045,20 @@
"repo": "ayrat555/cargo-mode",
"unstable": {
"version": [
- 20240928,
- 1910
+ 20241121,
+ 638
],
- "commit": "8321d01fa4d30391a9918bd9782fadbab27843fd",
- "sha256": "1ng8kwx45ycjglwywnyimzfsny11a1a1dczi8740vr8s9cpfjp9a"
+ "commit": "1b97dec6fc5f8ff3a531f8d6dd33fbcc4ae1ba27",
+ "sha256": "08031wl8jz0b1rh14v6d9x5igc2nccazwqdxlp20vnmv2sqj05p7"
},
"stable": {
"version": [
0,
0,
- 6
+ 7
],
- "commit": "8321d01fa4d30391a9918bd9782fadbab27843fd",
- "sha256": "1ng8kwx45ycjglwywnyimzfsny11a1a1dczi8740vr8s9cpfjp9a"
+ "commit": "1b97dec6fc5f8ff3a531f8d6dd33fbcc4ae1ba27",
+ "sha256": "08031wl8jz0b1rh14v6d9x5igc2nccazwqdxlp20vnmv2sqj05p7"
}
},
{
@@ -11291,35 +11253,33 @@
}
},
{
- "ename": "casual-agenda",
- "commit": "f77aab9a5e31ccc0fc45876572172d234d204463",
- "sha256": "08kygh0wxsan6qq26wp894pp1mkf04m2rzpb25cr0j72h65m0q7c",
+ "ename": "casual",
+ "commit": "b89f2ab853d0dd1c684591d5f05c12de8d3785e4",
+ "sha256": "0s2nagcj1v9mw77ag60fdxhivrraxs3gk7i1xnj2d48gwjksai18",
"fetcher": "github",
- "repo": "kickingvegas/casual-agenda",
+ "repo": "kickingvegas/casual",
"unstable": {
"version": [
- 20241001,
- 714
+ 20241126,
+ 133
],
"deps": [
- "casual-lib",
- "org"
+ "transient"
],
- "commit": "ca0433e257297d0adcd96238f64a1116d25b4372",
- "sha256": "1y7idm7v9yxfddj9vrwwj98j610bc61r2wrcgkc0ganfm9fglvp3"
+ "commit": "a84775d63b5a85b0254f8b80d412f3421d001204",
+ "sha256": "19rzqzhy2z03lx65712p1p23c5ji1nv1gxk3hq5q5fhvlm7r8qlz"
},
"stable": {
"version": [
- 1,
- 0,
- 5
+ 2,
+ 2,
+ 2
],
"deps": [
- "casual-lib",
- "org"
+ "transient"
],
- "commit": "ca0433e257297d0adcd96238f64a1116d25b4372",
- "sha256": "1y7idm7v9yxfddj9vrwwj98j610bc61r2wrcgkc0ganfm9fglvp3"
+ "commit": "a84775d63b5a85b0254f8b80d412f3421d001204",
+ "sha256": "19rzqzhy2z03lx65712p1p23c5ji1nv1gxk3hq5q5fhvlm7r8qlz"
}
},
{
@@ -11330,304 +11290,28 @@
"repo": "kickingvegas/casual-avy",
"unstable": {
"version": [
- 20241001,
- 649
- ],
- "deps": [
- "avy",
- "casual-lib"
- ],
- "commit": "9aa3e63326d65590c22d42c3ed9f37626c2a2c31",
- "sha256": "1fscfv91ii1pg7wi42xvk330f4fjq81334fk28ya47vwq3132ccn"
- },
- "stable": {
- "version": [
- 1,
- 4,
- 3
+ 20241021,
+ 2353
],
"deps": [
"avy",
- "casual-lib"
- ],
- "commit": "9aa3e63326d65590c22d42c3ed9f37626c2a2c31",
- "sha256": "1fscfv91ii1pg7wi42xvk330f4fjq81334fk28ya47vwq3132ccn"
- }
- },
- {
- "ename": "casual-bookmarks",
- "commit": "19999b89a2fb2eddd3edbf0df4b9c674b4c2ef29",
- "sha256": "18w9l94y9zzvdib8im232asw7vhqq49qhylph07ilj5gmqawdwfh",
- "fetcher": "github",
- "repo": "kickingvegas/casual-bookmarks",
- "unstable": {
- "version": [
- 20241001,
- 635
- ],
- "deps": [
- "casual-lib"
- ],
- "commit": "99aea407da07aef1a87d67b12648280347bdeed8",
- "sha256": "0q3nrx4fwx2nm8mxc52rynishqp8zlaj7431z9nmb7ap1jhvbw1g"
- },
- "stable": {
- "version": [
- 1,
- 1,
- 2
- ],
- "deps": [
- "casual-lib"
- ],
- "commit": "99aea407da07aef1a87d67b12648280347bdeed8",
- "sha256": "0q3nrx4fwx2nm8mxc52rynishqp8zlaj7431z9nmb7ap1jhvbw1g"
- }
- },
- {
- "ename": "casual-calc",
- "commit": "47f061be179f0c7f8b86faa99ff0d3e9d8552ac1",
- "sha256": "1c0wk9zbh7rzi9s0jcdxnzxy989545ccz1xmj7cs9jw4dq0i63z6",
- "fetcher": "github",
- "repo": "kickingvegas/casual-calc",
- "unstable": {
- "version": [
- 20241001,
- 611
- ],
- "deps": [
- "casual-lib"
- ],
- "commit": "fa4a1bf695025908245651ee641262bce6de0369",
- "sha256": "1695vgysn17zhk5wnrfh1cqp8rzrfmcxg3vj80axs961qd1mrm9w"
- },
- "stable": {
- "version": [
- 1,
- 11,
- 4
- ],
- "deps": [
- "casual-lib"
- ],
- "commit": "fa4a1bf695025908245651ee641262bce6de0369",
- "sha256": "1695vgysn17zhk5wnrfh1cqp8rzrfmcxg3vj80axs961qd1mrm9w"
- }
- },
- {
- "ename": "casual-dired",
- "commit": "ee1942517d15e34316ce3d9cc60d22e41556e232",
- "sha256": "1g3vrlfl9482rcx1bmqbprf921ywz5dbcm685yxmfbr2fwbbgad5",
- "fetcher": "github",
- "repo": "kickingvegas/casual-dired",
- "unstable": {
- "version": [
- 20241001,
- 709
- ],
- "deps": [
- "casual-lib"
- ],
- "commit": "9b42c976dcaeb3ea3baacfd67c850b82ef9d164c",
- "sha256": "1ps2ffsl0smfp1zqp24slzw5zd7jrmacplnxbg714fb1r5z2pfya"
- },
- "stable": {
- "version": [
- 1,
- 8,
- 3
- ],
- "deps": [
- "casual-lib"
- ],
- "commit": "9b42c976dcaeb3ea3baacfd67c850b82ef9d164c",
- "sha256": "1ps2ffsl0smfp1zqp24slzw5zd7jrmacplnxbg714fb1r5z2pfya"
- }
- },
- {
- "ename": "casual-editkit",
- "commit": "401fe3e5097d3187a67632e8cb2279043aa82227",
- "sha256": "1h2hbyv9rn229x2gdnqdala3hvz24vvc615sy8bg00iwgwf90kyf",
- "fetcher": "github",
- "repo": "kickingvegas/casual-editkit",
- "unstable": {
- "version": [
- 20241009,
- 2252
- ],
- "deps": [
- "casual-lib",
- "casual-symbol-overlay",
- "magit",
- "transpose-frame"
+ "casual"
],
- "commit": "53ea0e05e275f9359b5a3aed8a0c864eb3cf8b50",
- "sha256": "08ixzsm4xml3mas0scnc2qcwq3if5v2r18p4qxj89fg4flbqmkm7"
+ "commit": "7e8f7703f4ab4886f27241664aa5e1510103f74e",
+ "sha256": "0ln5abq0fvlph5zz008m5jajshdqj62c9y734mb6hn9pgfvh5hay"
},
"stable": {
"version": [
- 1,
+ 2,
0,
- 13
- ],
- "deps": [
- "casual-lib",
- "casual-symbol-overlay",
- "magit",
- "transpose-frame"
- ],
- "commit": "53ea0e05e275f9359b5a3aed8a0c864eb3cf8b50",
- "sha256": "08ixzsm4xml3mas0scnc2qcwq3if5v2r18p4qxj89fg4flbqmkm7"
- }
- },
- {
- "ename": "casual-ibuffer",
- "commit": "de711e92fd2f8ff1c626c3f7f789f402e8e92007",
- "sha256": "1gynvk22nhm8l7dix7hracr7m3y3d0h065mplkj78hpx2pkmhvja",
- "fetcher": "github",
- "repo": "kickingvegas/casual-ibuffer",
- "unstable": {
- "version": [
- 20241001,
- 622
- ],
- "deps": [
- "casual-lib"
- ],
- "commit": "6d58d18d42e5433d5eac271a7b987ee9756c9c89",
- "sha256": "0wnfz5i0xrafqln9lsv6drfa5hc2mqq4d3fd84lhyn74ya86w2mc"
- },
- "stable": {
- "version": [
- 1,
- 1,
- 5
- ],
- "deps": [
- "casual-lib"
- ],
- "commit": "6d58d18d42e5433d5eac271a7b987ee9756c9c89",
- "sha256": "0wnfz5i0xrafqln9lsv6drfa5hc2mqq4d3fd84lhyn74ya86w2mc"
- }
- },
- {
- "ename": "casual-info",
- "commit": "1b06cc08de41e82f3f148aa9e35663e2e06427ae",
- "sha256": "1d6jmjhc0xalw1ll15k69bazbvprmw519lcsm2gd2jpkbngw9rmy",
- "fetcher": "github",
- "repo": "kickingvegas/casual-info",
- "unstable": {
- "version": [
- 20241001,
- 706
- ],
- "deps": [
- "casual-lib"
- ],
- "commit": "79d9bae486e92c0eabf82cc566d5578cf05015b3",
- "sha256": "1cw3pcwp08bv6hrfkza2iprpqppas63v2sxyhn2b3z8wywh65vg6"
- },
- "stable": {
- "version": [
- 1,
- 3,
- 3
- ],
- "deps": [
- "casual-lib"
- ],
- "commit": "79d9bae486e92c0eabf82cc566d5578cf05015b3",
- "sha256": "1cw3pcwp08bv6hrfkza2iprpqppas63v2sxyhn2b3z8wywh65vg6"
- }
- },
- {
- "ename": "casual-isearch",
- "commit": "7280670087e28ed08575c71165c095ee7be7da49",
- "sha256": "02qb1bpx30cxyjrd821g4qc5v7xwv4rc1f67p1dx3fglms8p2zc5",
- "fetcher": "github",
- "repo": "kickingvegas/casual-isearch",
- "unstable": {
- "version": [
- 20241001,
- 700
- ],
- "deps": [
- "casual-lib"
- ],
- "commit": "1568edca4aeb280a10e943f38cff8d744d5822f4",
- "sha256": "1913r2hf62zhldii1w175i5fg21c1famb8742nvikv8n6vj8d0p7"
- },
- "stable": {
- "version": [
- 1,
- 10,
- 1
- ],
- "deps": [
- "casual-lib"
- ],
- "commit": "1568edca4aeb280a10e943f38cff8d744d5822f4",
- "sha256": "1913r2hf62zhldii1w175i5fg21c1famb8742nvikv8n6vj8d0p7"
- }
- },
- {
- "ename": "casual-lib",
- "commit": "fd3bb4b191bf416dd419c5c76d510c7f5890e673",
- "sha256": "18g739n2dbcywamvkkpnrhsmmnk1l5b9v05d173b9qq1fj06pn8p",
- "fetcher": "github",
- "repo": "kickingvegas/casual-lib",
- "unstable": {
- "version": [
- 20241001,
- 704
- ],
- "deps": [
- "transient"
- ],
- "commit": "212313b1cd80e2757224d34ab34a098ff1cb37ee",
- "sha256": "0s9yx9s1d4zr35j3pd6dnhldax1h0sgr5zrraqva4ysbflwlvy50"
- },
- "stable": {
- "version": [
- 1,
- 1,
- 4
- ],
- "deps": [
- "transient"
- ],
- "commit": "212313b1cd80e2757224d34ab34a098ff1cb37ee",
- "sha256": "0s9yx9s1d4zr35j3pd6dnhldax1h0sgr5zrraqva4ysbflwlvy50"
- }
- },
- {
- "ename": "casual-re-builder",
- "commit": "4963d8a23ffb1ed7222f3672e35239798ee1560d",
- "sha256": "0li8vx0vq8abjnnssm2kx29mqzlpc7x8gcxjl1n4za315m3007wb",
- "fetcher": "github",
- "repo": "kickingvegas/casual-re-builder",
- "unstable": {
- "version": [
- 20241001,
- 655
- ],
- "deps": [
- "casual-lib"
- ],
- "commit": "5b4af74b7e7a82cc15122035e4e6286d843f1ef0",
- "sha256": "09cqpji9zshwn9gaf7rw34w8pggkkp3g5rq8a7pizx7hxjlaskkd"
- },
- "stable": {
- "version": [
- 1,
- 1,
- 3
+ 0
],
"deps": [
- "casual-lib"
+ "avy",
+ "casual"
],
- "commit": "5b4af74b7e7a82cc15122035e4e6286d843f1ef0",
- "sha256": "09cqpji9zshwn9gaf7rw34w8pggkkp3g5rq8a7pizx7hxjlaskkd"
+ "commit": "7e8f7703f4ab4886f27241664aa5e1510103f74e",
+ "sha256": "0ln5abq0fvlph5zz008m5jajshdqj62c9y734mb6hn9pgfvh5hay"
}
},
{
@@ -11638,46 +11322,30 @@
"repo": "kickingvegas/casual-suite",
"unstable": {
"version": [
- 20241001,
- 607
+ 20241022,
+ 3
],
"deps": [
- "casual-agenda",
+ "casual",
"casual-avy",
- "casual-bookmarks",
- "casual-calc",
- "casual-dired",
- "casual-editkit",
- "casual-ibuffer",
- "casual-info",
- "casual-isearch",
- "casual-re-builder",
"casual-symbol-overlay"
],
- "commit": "fbab88e8390085079df60b2295979d73205bc64f",
- "sha256": "0d0xjnfyab26xki89nb2q0r1zplir99ywa0p661njvj5gqmviwxg"
+ "commit": "c590e78d756bc6b3d43ab5cf8618e41b2a5bc88b",
+ "sha256": "0i1n0bnlmgzp9yk0kgss3pyffwc42gbh1ymha2yjqjf4kf9004aq"
},
"stable": {
"version": [
- 1,
- 7,
- 4
+ 2,
+ 0,
+ 0
],
"deps": [
- "casual-agenda",
+ "casual",
"casual-avy",
- "casual-bookmarks",
- "casual-calc",
- "casual-dired",
- "casual-editkit",
- "casual-ibuffer",
- "casual-info",
- "casual-isearch",
- "casual-re-builder",
"casual-symbol-overlay"
],
- "commit": "fbab88e8390085079df60b2295979d73205bc64f",
- "sha256": "0d0xjnfyab26xki89nb2q0r1zplir99ywa0p661njvj5gqmviwxg"
+ "commit": "c590e78d756bc6b3d43ab5cf8618e41b2a5bc88b",
+ "sha256": "0i1n0bnlmgzp9yk0kgss3pyffwc42gbh1ymha2yjqjf4kf9004aq"
}
},
{
@@ -11688,28 +11356,28 @@
"repo": "kickingvegas/casual-symbol-overlay",
"unstable": {
"version": [
- 20241008,
- 2317
+ 20241021,
+ 2358
],
"deps": [
- "casual-lib",
+ "casual",
"symbol-overlay"
],
- "commit": "9481daf1b9b027dbd12cfed8219b89e73ec3728a",
- "sha256": "1m1bfds64adfa3r1al1fchb7skfj6m19dv3k9vi67nd50sal7w4r"
+ "commit": "1453e7486dd0921f0319f21dd8c8b603e4eb7300",
+ "sha256": "0pdck93ijdxjcmss763cg0ap4wm5pqymylbqkkwjib3cmas6fvsv"
},
"stable": {
"version": [
- 1,
- 1,
+ 2,
+ 0,
0
],
"deps": [
- "casual-lib",
+ "casual",
"symbol-overlay"
],
- "commit": "9481daf1b9b027dbd12cfed8219b89e73ec3728a",
- "sha256": "1m1bfds64adfa3r1al1fchb7skfj6m19dv3k9vi67nd50sal7w4r"
+ "commit": "1453e7486dd0921f0319f21dd8c8b603e4eb7300",
+ "sha256": "0pdck93ijdxjcmss763cg0ap4wm5pqymylbqkkwjib3cmas6fvsv"
}
},
{
@@ -11744,11 +11412,11 @@
"repo": "catppuccin/emacs",
"unstable": {
"version": [
- 20241006,
- 2057
+ 20241016,
+ 2258
],
- "commit": "f579a6aa26234f067c06e85e203ac2b89db99b4d",
- "sha256": "1bxamcmh8qzz2ncmy7yhlr05zry2np0l5y5cw8sglivnbfcnb054"
+ "commit": "4441d5114fdcc2eb05186a974b4bbad7224e43b5",
+ "sha256": "1y2ads0w5l3mm0mxxbi2ppb6csq8hw2fd9cmak3myv13qzw92x3w"
},
"stable": {
"version": [
@@ -12290,15 +11958,15 @@
"repo": "plandes/cframe",
"unstable": {
"version": [
- 20240223,
- 2335
+ 20241109,
+ 1403
],
"deps": [
"buffer-manage",
"dash"
],
- "commit": "580a20573ef413c269c032221de04abc1c97a6a8",
- "sha256": "0s2n4b7g1b48j2mmfjmp1ir8bacbyiqffmjh6g62vxabbhnyc6fh"
+ "commit": "b5259f8e5f7e8788ab412224933d8f12f0d2ccc0",
+ "sha256": "0d50n0yl8qhkyjwkw28g9wpr69zfc8ca4wj1aj4xvhcqkxxqs227"
},
"stable": {
"version": [
@@ -12523,32 +12191,32 @@
},
{
"ename": "chatgpt-shell",
- "commit": "c7f36f62391f888e2485c096890739de0c71305a",
- "sha256": "1sggzb13i70n81q7jr96hyq179p6g7b4yxh37wwfxwlvqrkik2y7",
+ "commit": "bd7bfd8814e2e81d4022984f6b2baf2b1d1d0225",
+ "sha256": "17x7c6fhm01shphd28k85bsr6ylkq882xzncps5lzp1f77qjwvhm",
"fetcher": "github",
"repo": "xenodium/chatgpt-shell",
"unstable": {
"version": [
- 20241011,
- 1057
+ 20241201,
+ 2252
],
"deps": [
"shell-maker"
],
- "commit": "433f7625e885ef72b5fdc6ea0ada95a6c529367d",
- "sha256": "13ms3kazw1z01hmg00hbdxnja8973q1hmd6x2bwdijv7agxzcbxc"
+ "commit": "5fc6c7dba6ef16e57d14f90c1ae05a0b0d36ba36",
+ "sha256": "12raxg5lf3cicj5rib48kc4mh4jdzp8nxhfxjkf807amp6rrlw74"
},
"stable": {
"version": [
- 1,
- 8,
- 1
+ 2,
+ 2,
+ 7
],
"deps": [
"shell-maker"
],
- "commit": "08c8a6dec6a5b1a23d4ae3f4312dc6c92d1a09a1",
- "sha256": "04byw3zz06fr1g185p55pdaf5bqxj3mssldbh089pmx10qdmaxqi"
+ "commit": "63c7c092d80daa02d85890178bb879ddcfd04bde",
+ "sha256": "022wgc2mdd7b4xs7xjabmy95dx30yjgfbnv773vxfaq7z1c4ymbi"
}
},
{
@@ -13214,8 +12882,8 @@
"repo": "clojure-emacs/cider",
"unstable": {
"version": [
- 20240924,
- 1959
+ 20241115,
+ 343
],
"deps": [
"clojure-mode",
@@ -13226,8 +12894,8 @@
"spinner",
"transient"
],
- "commit": "0b70bf86ef726dd8947b9fdfd459e805a2487c89",
- "sha256": "0qkhl1q0araykzdvxqagc5in1nghb6fsp6f88jcxb8pa9h1sv94b"
+ "commit": "c228dec27df6b2c68262f17158208fe699e1ce02",
+ "sha256": "0gxrmi9ykhmhmldrrijl73cz38473y8wapr4i9an4yv34r5g9mng"
},
"stable": {
"version": [
@@ -13448,14 +13116,14 @@
"repo": "emacs-circe/circe",
"unstable": {
"version": [
- 20240630,
- 2055
+ 20241101,
+ 1641
],
"deps": [
"cl-lib"
],
- "commit": "3ae38790506311fd32b2d499804af69b16307652",
- "sha256": "1gmzjcsk7vyp0mnx1ak4a5xi1wz9j1jcz5lvia68sx5wrwn2vicg"
+ "commit": "0346f3f64383d88bb3ea49a492fcb80334a55cc4",
+ "sha256": "0m8fyd3g0xhd9ihzdd8mb82fl3difz2061xbslfahcgpxa49d6f4"
},
"stable": {
"version": [
@@ -13526,16 +13194,16 @@
"repo": "emacs-citar/citar",
"unstable": {
"version": [
- 20240907,
- 1157
+ 20241027,
+ 1331
],
"deps": [
"citeproc",
"org",
"parsebib"
],
- "commit": "0f1786b7fee58452a3225e4b9b7c94176fff9b5a",
- "sha256": "032k6wi8kxcgfbff6qbawkl8cvicp7hzaf8agj70451qxqiav8xi"
+ "commit": "46bc177f53147a387407b1578ca38a3e96ad49a3",
+ "sha256": "0alzz664l1c062zzk3vzwnqxd1sd5l85lycqyyid6ipk1x5k0r7y"
},
"stable": {
"version": [
@@ -13626,15 +13294,15 @@
"repo": "emacs-citar/citar-org-roam",
"unstable": {
"version": [
- 20240212,
- 2159
+ 20241124,
+ 1352
],
"deps": [
"citar",
"org-roam"
],
- "commit": "999268c7a077aad6a8f4dfc88d0eeabdf4267fea",
- "sha256": "0fhi42jg3h7iba9dpyd4lp2y4yvj6fb5vnrvxi62z1sd06h8qaqm"
+ "commit": "e2cd111456d59fbf0b79e6684ad46c3686169f53",
+ "sha256": "1772k4jg1pr1a43bn80i0f4qhayhvlzvrmfcdh3nv0bxs14ssmwr"
},
"stable": {
"version": [
@@ -13740,11 +13408,11 @@
"repo": "universal-ctags/citre",
"unstable": {
"version": [
- 20240630,
- 721
+ 20241028,
+ 1548
],
- "commit": "d99483767016cada88a2877a77b9b76f8e118b80",
- "sha256": "10sp5256354p6f3wcgvgniv7jsvb000nffzhq4lkc4kzf3b579q3"
+ "commit": "9220f430b5588f7e2d9ca82797eb37d1d7752620",
+ "sha256": "14698vwnsm1q3s3waz2mq5f36amgxyns2ygsg32dnxlssi3yai04"
},
"stable": {
"version": [
@@ -13835,14 +13503,14 @@
"repo": "emacsmirror/clang-format",
"unstable": {
"version": [
- 20240828,
- 1832
+ 20241019,
+ 2151
],
"deps": [
"cl-lib"
],
- "commit": "7a955a4ed7e92fdb82983e307cb523547bb0285a",
- "sha256": "1x9zw2css02cmy3l7wy96qh4zhv4c5z04xg94xwb6vc33ca09lgx"
+ "commit": "f01d16be89a4421169c421d25cfdddb3ad62460f",
+ "sha256": "0f53sbr970spyl9k4mnh03y6kc3gxzh77b70s04bw8sda5sb980b"
}
},
{
@@ -13886,14 +13554,33 @@
"repo": "arminfriedl/claude-shell",
"unstable": {
"version": [
- 20240707,
- 1743
+ 20241130,
+ 2024
],
"deps": [
"shell-maker"
],
- "commit": "6fb330578a84a8753e32b9ffc50a2506406f1099",
- "sha256": "1v6jbqd3djk4h3id4spqax6wzg1sgqc7mypci1j1qvgxafg6iqyh"
+ "commit": "8e9e7e22b6fab50e19b293d1ebcf435ad937a41f",
+ "sha256": "00zipqxp4dy06mj0wyk3vnvqz0jls9bf99mw4pavjy77j8j50gfn"
+ }
+ },
+ {
+ "ename": "claudia",
+ "commit": "f164afd56fe77159209247c648c8f3adc21067dc",
+ "sha256": "0fbp1w50jv0z6s4s056ym3njlzwc5y9dz3qd1y0zlmvxhqa3dsqn",
+ "fetcher": "github",
+ "repo": "mzacho/claudia",
+ "unstable": {
+ "version": [
+ 20241104,
+ 2217
+ ],
+ "deps": [
+ "markdown-mode",
+ "uuidgen"
+ ],
+ "commit": "f041f619a0e93ac5b07a05862bcb38a811d56d24",
+ "sha256": "141z590hb2cmrg5q1lv6f5z54gbyxaxl1v91ailsa22jxxr4qnq8"
}
},
{
@@ -13904,14 +13591,14 @@
"repo": "martianh/clause.el",
"unstable": {
"version": [
- 20230405,
- 1235
+ 20241020,
+ 1144
],
"deps": [
"mark-thing-at"
],
- "commit": "0ea166fa218618c1b80b60c995f927310c25b02a",
- "sha256": "0v5xf51f1imricf9rn9f3iwz37cljk3iwq50dad1wzm1pamggzw1"
+ "commit": "e51261495d88e80709443817af3159633c9a2d7b",
+ "sha256": "0b2rc8s1x1gc1xr8v1p63nnza6f30iwzjd2nrf6wpg8nkbf9a9ix"
}
},
{
@@ -14550,11 +14237,11 @@
"repo": "clojure-emacs/clojure-mode",
"unstable": {
"version": [
- 20240526,
- 1825
+ 20241125,
+ 1123
],
- "commit": "815bc387ec1436fb2fcac00ba8a61207636d0186",
- "sha256": "0rx7r4v6dfz26n9bqhfbd4jv0fj9zqnc22jk8pa5y4ldjzkas35c"
+ "commit": "63356ee3bd6903e7b17822022f5a6ded2512b979",
+ "sha256": "1g1wac0nwlp0kl6wq1aivv0fymrwxb81sd3zy6k20yjg4s5aagvg"
},
"stable": {
"version": [
@@ -14666,11 +14353,11 @@
"repo": "clojure-emacs/clojure-ts-mode",
"unstable": {
"version": [
- 20240930,
- 1316
+ 20241104,
+ 2135
],
- "commit": "dc74c4546f3bd9e026eef5b0519e8b5aff9781cc",
- "sha256": "0a6pdkzcmv23yj5bj26wp7n4m7h36h6fw0g5aymnr50hl9r695f2"
+ "commit": "3ca382c3ccf2ad560d0974229ec88963e82d2fe7",
+ "sha256": "194sw4fb9845sysn23dv64c7qwj4kfz02hzdij05wn01xkjscgph"
},
"stable": {
"version": [
@@ -14725,28 +14412,28 @@
"repo": "magit/closql",
"unstable": {
"version": [
- 20240808,
- 1934
+ 20241201,
+ 1553
],
"deps": [
"compat",
"emacsql"
],
- "commit": "c1a346d56ecee16d1f0d7707f0d62c72604a8802",
- "sha256": "0fh7mvm2qcwkkmzpkagwzrsi11nm4laj2bvjdmyrv8pnmjigwwqw"
+ "commit": "b1522c4bcb3a30eba0b49513c6d61dd7817baf1a",
+ "sha256": "17i5gni6hw8lvg0660c0hldr0xbrdry4hmx9n5i4pry3wwnhzngr"
},
"stable": {
"version": [
2,
- 0,
+ 1,
0
],
"deps": [
"compat",
"emacsql"
],
- "commit": "c1a346d56ecee16d1f0d7707f0d62c72604a8802",
- "sha256": "0fh7mvm2qcwkkmzpkagwzrsi11nm4laj2bvjdmyrv8pnmjigwwqw"
+ "commit": "b1522c4bcb3a30eba0b49513c6d61dd7817baf1a",
+ "sha256": "17i5gni6hw8lvg0660c0hldr0xbrdry4hmx9n5i4pry3wwnhzngr"
}
},
{
@@ -14919,20 +14606,20 @@
"url": "https://gitlab.kitware.com/cmake/cmake.git",
"unstable": {
"version": [
- 20240814,
- 1725
+ 20241121,
+ 1615
],
- "commit": "cf1bc1b9371dc6063a1734a1cd80d6cb654ad53e",
- "sha256": "1anxrj0bdl1z811dqz6cmxqyw0ipsim0hgxlqc0kngms9dnjilnx"
+ "commit": "eb281d34548f4234e68ff31d1050aca7e8441d86",
+ "sha256": "1r0s0scrdakp6fiwp91zj7i5svq3wyszhp0cq2lg2wssgkiphgz4"
},
"stable": {
"version": [
3,
- 30,
- 5
+ 31,
+ 1
],
- "commit": "9c4a0a9ff09735b847bbbc38caf6da7f6c7238f2",
- "sha256": "0v6aqbrmk2mlbjd03319panq9zsz03rph230ypb9njliv7lxd6kv"
+ "commit": "eb281d34548f4234e68ff31d1050aca7e8441d86",
+ "sha256": "1r0s0scrdakp6fiwp91zj7i5svq3wyszhp0cq2lg2wssgkiphgz4"
}
},
{
@@ -15000,11 +14687,11 @@
"repo": "tumashu/cnfonts",
"unstable": {
"version": [
- 20240430,
- 536
+ 20241120,
+ 2133
],
- "commit": "1f57d4f64f50e4dbc7ab4d963278b746f904c454",
- "sha256": "1jrrpmlagncv46pyq10182bi7mcqy85iy46nw33fskaswypxhwji"
+ "commit": "0b4fb8c2f743594010bb8137db6e71087efdaf67",
+ "sha256": "01dkmzc88knh06r0fb78vknjlh006v8rkrjwr88g5757jf3bvlb5"
},
"stable": {
"version": [
@@ -15046,6 +14733,24 @@
"sha256": "1sx8grp3j7zcma3nb7zj6kijkdqx166vw1qgmm29hvx48bys6vlp"
}
},
+ {
+ "ename": "coc-dc",
+ "commit": "df9255e363e96363a7d976abd3276a3cb08dd601",
+ "sha256": "1zfd2pzgmisksq7jprwhrpx7x92fhjfk4camrjqhlkwmanlbql67",
+ "fetcher": "github",
+ "repo": "S0mbr3/coc-damage-calculator",
+ "unstable": {
+ "version": [
+ 20241104,
+ 1739
+ ],
+ "deps": [
+ "hydra"
+ ],
+ "commit": "097bc2496263fc1e69a04d0528b41baf2fd08115",
+ "sha256": "0y8x197zlmg0ipbk6jjcjcwmw2ncfplbdpjhpdk4lj684hacxsr9"
+ }
+ },
{
"ename": "codcut",
"commit": "0fcd1c7a483dd377674a71a07fd86297f05cc83b",
@@ -15084,14 +14789,14 @@
"repo": "astoff/code-cells.el",
"unstable": {
"version": [
- 20241003,
- 1036
+ 20241119,
+ 1421
],
"deps": [
"compat"
],
- "commit": "6511793ce9092c3f68f7cd5340267472a4b1b7dc",
- "sha256": "1gpfzgv32mfms2x0k3d5wjp6vbsayhsk6hpbis7wrq6x0a6m8m2j"
+ "commit": "caffb420be106cebbdfe4474ed0507a601603f83",
+ "sha256": "0ba5125pq0im27rl964il78543n56jm88129zv05dfq6pv7fkplv"
}
},
{
@@ -15102,8 +14807,8 @@
"repo": "ag91/code-compass",
"unstable": {
"version": [
- 20231108,
- 1618
+ 20241125,
+ 2243
],
"deps": [
"async",
@@ -15111,8 +14816,8 @@
"s",
"simple-httpd"
],
- "commit": "67ec53f9ca43bea941ec5ba6fccba8565c1d937f",
- "sha256": "1k6cc2m7kdr6g69cn7r3i43cq6iww74sqimlw6q1paf66lm35xld"
+ "commit": "6510b97280892d8831ff35dedefe9a7aa7b6326a",
+ "sha256": "0bs5kn9jr7lfaw472aq2c80ii7i76a0pdbijmh2dvdf33k6hy88l"
}
},
{
@@ -15317,11 +15022,11 @@
"repo": "liuyinz/coercion.el",
"unstable": {
"version": [
- 20240107,
- 2154
+ 20241029,
+ 401
],
- "commit": "a96ecfa3a44f2e15349abf265905c6c607cf2c07",
- "sha256": "0200bq5qv5dkf1mvyhnza0m08z5p7g5irbrmwxd65znr99d648lh"
+ "commit": "62da6ca2d18cb627de48f5b590309001c69864a8",
+ "sha256": "18skc9j48hrgiqm747r13vk0901p5wqgamczb36h3ap14psa387g"
},
"stable": {
"version": [
@@ -15419,14 +15124,14 @@
"repo": "ankurdave/color-identifiers-mode",
"unstable": {
"version": [
- 20240930,
- 2149
+ 20241023,
+ 2217
],
"deps": [
"dash"
],
- "commit": "3a11607d7b02d7783572d7f4a1a6e30441f3cd4b",
- "sha256": "0sivgxz18sr9dcy48fv3wsahky37yg29d6ap47i2b54cq1rph5lm"
+ "commit": "89343c624ae64f568b5305ceca3db48d65711863",
+ "sha256": "1dly1xf2im3x1ikyrdc613jici16xgbhdb3sz357w1bfkxjhxzbj"
},
"stable": {
"version": [
@@ -15536,14 +15241,11 @@
"repo": "purcell/color-theme-sanityinc-solarized",
"unstable": {
"version": [
- 20240712,
- 1038
- ],
- "deps": [
- "cl-lib"
+ 20241126,
+ 1028
],
- "commit": "e1854917d84051393b64de54883f2df7b9cec797",
- "sha256": "121y3hb2v17shv5r0y4vqsbw1avc19rv9bk99l3ls7apx6xma8ji"
+ "commit": "f42431850e0ff0cff90c6cc39edc222faa40323d",
+ "sha256": "1772ragmyj7jzyqc3qlwx6q288vhcggrfbzl33dznf8jp888d288"
},
"stable": {
"version": [
@@ -15562,11 +15264,11 @@
"repo": "purcell/color-theme-sanityinc-tomorrow",
"unstable": {
"version": [
- 20240621,
- 1005
+ 20241028,
+ 1458
],
- "commit": "ddf2920a8866040e57359d2e1c5517fffcad2e38",
- "sha256": "0qnn3dxzi40skrmi6a2w68c1dcn89zbdxnm18nw7axa7c0q0wcqs"
+ "commit": "2548eb47dcf09ce433f48f5d027890ef259dabe7",
+ "sha256": "1xj1k23mj78wnpvgndfd9lisfm8ax67dps3gbvfzdm38sp4wkkq5"
},
"stable": {
"version": [
@@ -15758,11 +15460,14 @@
"repo": "hying-caritas/comint-intercept",
"unstable": {
"version": [
- 20230930,
- 956
+ 20241021,
+ 629
],
- "commit": "79cfa3f15558f99285734ff36e80e3c4628565ae",
- "sha256": "1v34m2f0ni8zvvbqnv0i8daa05rg22wb11468xyq3c0h7pd0k7xv"
+ "deps": [
+ "vterm"
+ ],
+ "commit": "99b17be632ff1d892f427244cad9e37752cbf71b",
+ "sha256": "0z3z0xh726z1k27zmw56bj5b01x12vcrhspynwahaqvhkn1qp0vs"
}
},
{
@@ -16005,20 +15710,20 @@
"repo": "mekeor/communinfo",
"unstable": {
"version": [
- 20240709,
- 913
+ 20241126,
+ 2028
],
- "commit": "2e1481c2441725f1938d8b11848e954906d118b8",
- "sha256": "01vf2fz8s02ph3ppnx4sprk7cl7m3ifd5qfbz5d777swhar0wdsl"
+ "commit": "294aadda671ca53b802394e3bbb39a984a48bb2f",
+ "sha256": "1zxdk4ffy8589m9v5nx99gbsbaaibnb19r85fqyrfq0qlr42hici"
},
"stable": {
"version": [
0,
1,
- 1
+ 2
],
- "commit": "07bc9343c13809619f2c2229841d690df7f78312",
- "sha256": "0f5yd86dym98jgf0h4ns6gq22cf9fgk3m382n18kiwpkgzxcdqx0"
+ "commit": "2e1481c2441725f1938d8b11848e954906d118b8",
+ "sha256": "01vf2fz8s02ph3ppnx4sprk7cl7m3ifd5qfbz5d777swhar0wdsl"
}
},
{
@@ -16029,11 +15734,11 @@
"repo": "company-mode/company-mode",
"unstable": {
"version": [
- 20240926,
- 2127
+ 20241106,
+ 2000
],
- "commit": "9c273fc7c1a9dd69ccf508589211c4f8bd0e0765",
- "sha256": "0p55yaf8ac2q53l9palsyw8qrxjiylbs0npid8v5rdgf8ah9n6ag"
+ "commit": "0ae7c293112248a0c36377d6859a95d216ae5e96",
+ "sha256": "0rg1i31qg4212i9d0020p37snzcaq22fb9lmv4p4x0xysk3wgp8v"
},
"stable": {
"version": [
@@ -16341,19 +16046,18 @@
"repo": "tsukimizake/company-dcd",
"unstable": {
"version": [
- 20240218,
- 1726
+ 20241024,
+ 1152
],
"deps": [
"cl-lib",
"company",
"flycheck-dmd-dub",
- "ivy",
"popwin",
"yasnippet"
],
- "commit": "29dc3dc7fd0f7effe8f6a3dfbe7028a2019de48e",
- "sha256": "1w9d5qa6zvsvf56q3flgw7xz1sq47c72iii0mqvdl6s7ribaz6mn"
+ "commit": "d1f0bf4ed3b86ba6e4173450d237185df37ef464",
+ "sha256": "08x8j9fx8pq9kxdp73mgddwvndcdm97nn3a765y844mw8wchczyi"
}
},
{
@@ -16836,28 +16540,6 @@
"sha256": "1ihqapp4dv92794rsgyq0rmhwika60cmradqd4bn9b72ss6plxs1"
}
},
- {
- "ename": "company-lean",
- "commit": "0bad7f91094d96d387bf0b121d6223afdc0f236c",
- "sha256": "1grfa9944ssbpprrrz77jk6x0r8840kx6cb9pnd4mxwckgb7p2hv",
- "fetcher": "github",
- "repo": "leanprover/lean3-mode",
- "unstable": {
- "version": [
- 20210305,
- 1705
- ],
- "deps": [
- "company",
- "dash",
- "f",
- "lean-mode",
- "s"
- ],
- "commit": "5c50338ac149ca5225fc737be291db1f63c45f1d",
- "sha256": "13vrg0pp7ca0lh4j9cyg4pgfnbvf2kvbrgvvcmn1h7l9py2n8alj"
- }
- },
{
"ename": "company-ledger",
"commit": "546bc62530136a7fdf3886731e4316c6c8081ead",
@@ -17087,10 +16769,10 @@
},
{
"ename": "company-nixos-options",
- "commit": "6846c7d86e70a9dd8300b89b61435aa7e146be96",
- "sha256": "1yrqqdadmf7qfxpqp8wwb325zjnwwjmn2hhnl7i3j0ckg6hqyqf0",
+ "commit": "7f298cdc6773f3aeb7baf9c6a32c97d2b60f55a3",
+ "sha256": "100xpwnjrs92vlw9zndc7nlrax3s1vhpmr90678zkx4rs4l2m88i",
"fetcher": "github",
- "repo": "travisbhartwell/nix-emacs",
+ "repo": "nix-community/nix-emacs",
"unstable": {
"version": [
20160215,
@@ -17974,6 +17656,30 @@
"sha256": "07l495vv3by6r62i48jbfyr5pp1p6896cz25gkc7p3xqwrhi2min"
}
},
+ {
+ "ename": "compile-angel",
+ "commit": "6b476137c3d87eaaa96a0884d7a3db3cfea9e7d3",
+ "sha256": "1w7i1b8c5msmy1zjvs2hspr9fiz8rqq6iqjbn58ihlzzdk1yifhy",
+ "fetcher": "github",
+ "repo": "jamescherti/compile-angel.el",
+ "unstable": {
+ "version": [
+ 20241130,
+ 442
+ ],
+ "commit": "67a12504ebf2cc43a6846a3e05b6e5c2e179db2f",
+ "sha256": "1kyrcpd5q938byc83f5a100jb4igzxgpj82f7ql39alzhibzskcn"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 4
+ ],
+ "commit": "67a12504ebf2cc43a6846a3e05b6e5c2e179db2f",
+ "sha256": "1kyrcpd5q938byc83f5a100jb4igzxgpj82f7ql39alzhibzskcn"
+ }
+ },
{
"ename": "compile-multi",
"commit": "608806259721eaa046b8a3cb653deb0827b682da",
@@ -18094,8 +17800,8 @@
"repo": "mkcms/compiler-explorer.el",
"unstable": {
"version": [
- 20241009,
- 2026
+ 20241129,
+ 809
],
"deps": [
"eldoc",
@@ -18103,13 +17809,13 @@
"plz",
"seq"
],
- "commit": "0d94e8b8a7ac81777cb8cccd801db7a2e082f0d6",
- "sha256": "0kv0kd5qqaa4vvhkp3dnbsvd9kfyawhppnxvzxzfdpvvd6rkms8b"
+ "commit": "b8e7c34757c6b77aec948c143d8c89df08d4b7e8",
+ "sha256": "1lrjxkaf5979k0v0p20p9lk4azwbi629krqq66mybr1bmlw00vi6"
},
"stable": {
"version": [
0,
- 5,
+ 6,
0
],
"deps": [
@@ -18118,8 +17824,8 @@
"plz",
"seq"
],
- "commit": "f7b440125264efc043b9d61186e4ac662cb8b67c",
- "sha256": "0yih4rl037f14v1cq13g49fx1dy6yl6v7ps13lrklv0pjjf7gc9c"
+ "commit": "b8e7c34757c6b77aec948c143d8c89df08d4b7e8",
+ "sha256": "1lrjxkaf5979k0v0p20p9lk4azwbi629krqq66mybr1bmlw00vi6"
}
},
{
@@ -18154,15 +17860,15 @@
"repo": "emacs-php/composer.el",
"unstable": {
"version": [
- 20240618,
- 1112
+ 20241016,
+ 1900
],
"deps": [
"php-runtime",
"seq"
],
- "commit": "42cf9848d438f8dc4c07ac684a83280ace7bb94c",
- "sha256": "0a7hwikxzw1y6i4ny9bxj4lnyaz2p25sx5w97rhnkagr0859jflg"
+ "commit": "6c7e19256ff964546cea682edd21446c465a663c",
+ "sha256": "1s0vridw8fgc8zjhdznfqcvgixx42wvfgp8na5qbxfvb19y39dfh"
},
"stable": {
"version": [
@@ -18442,14 +18148,14 @@
"repo": "minad/consult",
"unstable": {
"version": [
- 20241001,
- 2057
+ 20241201,
+ 1337
],
"deps": [
"compat"
],
- "commit": "07ea5421fbcb65b2207a43a0941124a95a47abc7",
- "sha256": "0xhn7sxzx7qwij76mi5s52xrvh2af6sjppmqspd445vxpl8pgffx"
+ "commit": "eb26bdd008c4c92b1d79e49e2df71acc2a42faa3",
+ "sha256": "1xydhja0hrjv851vs66nwd8amm93qraccad78nxwhlimw2lw1fgn"
},
"stable": {
"version": [
@@ -18599,14 +18305,14 @@
"repo": "karthink/consult-dir",
"unstable": {
"version": [
- 20240506,
- 236
+ 20241114,
+ 454
],
"deps": [
"consult"
],
- "commit": "15891383f34d43acc5bb82bda92239b1f54cf178",
- "sha256": "1jq931w66iawc1rf01n9mfmnxwvrv2zc711nwnmykdv6ynd636dm"
+ "commit": "26fd5516511747ecefe98ef8e4592e330d99e6ae",
+ "sha256": "1sl6cwsj7jnylv4idjmcfs2z2i17a5b3aqb93q00hkbmqig94gam"
},
"stable": {
"version": [
@@ -18629,16 +18335,16 @@
"repo": "mohkale/consult-eglot",
"unstable": {
"version": [
- 20240324,
- 1211
+ 20241107,
+ 2125
],
"deps": [
"consult",
"eglot",
"project"
],
- "commit": "64262e72452f8fe6dd49d31bcdd4bd577b7d682d",
- "sha256": "0mn9d87m05bhqrw7sscx4a2a5h7gkqyhv06a80ky9vbzlfjfk6hh"
+ "commit": "c5f87d92448cd9c22a33ebd1feb54ca2fb89afa8",
+ "sha256": "0l7fg36zqcy0mzcs1fx515mppkf94r4fvss65vhambblrcd7z6nd"
},
"stable": {
"version": [
@@ -18663,15 +18369,15 @@
"repo": "mohkale/consult-eglot",
"unstable": {
"version": [
- 20240324,
- 1211
+ 20241107,
+ 2125
],
"deps": [
"consult-eglot",
"embark-consult"
],
- "commit": "64262e72452f8fe6dd49d31bcdd4bd577b7d682d",
- "sha256": "0mn9d87m05bhqrw7sscx4a2a5h7gkqyhv06a80ky9vbzlfjfk6hh"
+ "commit": "c5f87d92448cd9c22a33ebd1feb54ca2fb89afa8",
+ "sha256": "0l7fg36zqcy0mzcs1fx515mppkf94r4fvss65vhambblrcd7z6nd"
}
},
{
@@ -18682,15 +18388,15 @@
"repo": "minad/consult-flycheck",
"unstable": {
"version": [
- 20240926,
- 917
+ 20241114,
+ 1120
],
"deps": [
"consult",
"flycheck"
],
- "commit": "bad8a8a25328782dfce3a9e4de6ad6d325b353d7",
- "sha256": "1wg8n0lxmrwm8m7rv3bkjrj33qyms1fvg7cqb3cj8cazsqrz92h2"
+ "commit": "fa7a3a3b5d31d318582f7a1935a3c812fcdc4368",
+ "sha256": "1adwmvx48dfp5qrcy02k2d1972ysrazpdl5c7m90b8allcg01y60"
},
"stable": {
"version": [
@@ -18905,14 +18611,14 @@
"repo": "rcj/consult-ls-git",
"unstable": {
"version": [
- 20240529,
- 641
+ 20241023,
+ 1113
],
"deps": [
"consult"
],
- "commit": "b1ca94f7c43cbd3811d09a0c9ab04f67f6318e95",
- "sha256": "1r8d42r4dszg7jdabgs60inn6hkd293fddps1sjrs8y4ygkxcp61"
+ "commit": "beb253374e2cee10b8682fb8b377ca1f2caa4e27",
+ "sha256": "1znlvjplgmkp0zl94xf8z9jlkr9f4r39kv2nfd47ajnqccczkr85"
}
},
{
@@ -19076,14 +18782,14 @@
"repo": "jao/consult-recoll",
"unstable": {
"version": [
- 20231211,
- 1221
+ 20241119,
+ 1807
],
"deps": [
"consult"
],
- "commit": "ba68d052d9479aeaa5dda15a57a2c070df7d9bca",
- "sha256": "02igkdhqpl3zylh5v3aw0a93krr2rzdy5kb6azvf4s461jpmwgqv"
+ "commit": "c81d40c70b73a7351d7a4591b14f222682b7a084",
+ "sha256": "07ihnmh1jk42cmkrvhb8y2nn6mwba35q9jx640ypal7msc13cs5a"
},
"stable": {
"version": [
@@ -19155,15 +18861,15 @@
"repo": "liuyinz/consult-todo",
"unstable": {
"version": [
- 20231022,
- 2059
+ 20241029,
+ 409
],
"deps": [
"consult",
"hl-todo"
],
- "commit": "84f3c9876a285f733d75053076a97cc30f7d8eb9",
- "sha256": "0v336l9dary68i910yvpk9c24b9vrc1cx615hiv9dz8zi1khz8rr"
+ "commit": "bd67bca32a69bf09f137cacb01c0310da9e76575",
+ "sha256": "1xmvwwr4wpp6kq2l3rmn4axprxl32s700jy28swg94l3px3ah9la"
},
"stable": {
"version": [
@@ -19364,25 +19070,31 @@
"repo": "chep/copilot-chat.el",
"unstable": {
"version": [
- 20241008,
- 2152
+ 20241126,
+ 815
],
"deps": [
"chatgpt-shell",
+ "magit",
"markdown-mode",
"request"
],
- "commit": "48445c1d42f29cea7d02fc1aa15c38c47a0d4119",
- "sha256": "1ndgf0p70s7yi2rwihm05hs1ysg7yjlfvvv5bax78244l9ca186p"
+ "commit": "b6d919022a81ae6f8e024a9cce2a8250a2451d09",
+ "sha256": "1s1g45h2mbs7xsl8wdra5zlgw5rvvamgvc9iicvhbsjhxhpr48vv"
},
"stable": {
"version": [
1,
- 1,
+ 2,
0
],
- "commit": "80918ac52c118f987fa1bc2eec8aeb6f76a5c92f",
- "sha256": "001niz36am46mfn1a6z2w9jmq5zv92hpb1bdk8gv2zdgr9pkqg9x"
+ "deps": [
+ "chatgpt-shell",
+ "markdown-mode",
+ "request"
+ ],
+ "commit": "e8235960cc568bf2026e8c4206b4e43a7a9b9c02",
+ "sha256": "1p5jm19awr9azjjjwk8ywckl1riv5g1j221azwhsak24zb5y8l0i"
}
},
{
@@ -19453,14 +19165,14 @@
"repo": "zonuexe/emacs-copyit",
"unstable": {
"version": [
- 20190919,
- 1258
+ 20241030,
+ 543
],
"deps": [
"s"
],
- "commit": "c4f2c28e5b6270e8e3364341619f1154bb4e682e",
- "sha256": "17xqpshwc48srwljpbad7vhx3rkxqav0ygp0ff4xh7wgy21fp2mp"
+ "commit": "09556ba8407dc2b132b7f76cd1b458c0773a1fe8",
+ "sha256": "1rf670pfxlks2nbqm2gl1a46xxvz3qqsga5n8glvghy0f8ixlwap"
},
"stable": {
"version": [
@@ -19535,14 +19247,14 @@
"repo": "minad/corfu",
"unstable": {
"version": [
- 20241014,
- 915
+ 20241127,
+ 1554
],
"deps": [
"compat"
],
- "commit": "fa2be6c66ff2eb10b4b609832f25df49e90381af",
- "sha256": "15fmwmsbbb4609rcg0xmcip88rzy6vv9ri8camdysy6lisi9fhsa"
+ "commit": "f10f58f446e2cbda738ae8738cf4a7464a8aeeab",
+ "sha256": "186y5x8hhq46l7a3m6k8cxg2wm2g4yynrm3fgasy9ys4xb7kjb7r"
},
"stable": {
"version": [
@@ -19648,14 +19360,14 @@
"repo": "rob137/Corsair",
"unstable": {
"version": [
- 20241007,
- 922
+ 20241018,
+ 1015
],
"deps": [
"gptel"
],
- "commit": "bb46a8004de71f715bc60ed52fbcb5fd7a27103f",
- "sha256": "1k8lxh8z0k1hjcwyb8dz7pi3lnm50w7zy3kk2495fqkwcjj5b35w"
+ "commit": "f750a435d6be68f0d75dc5a90f8aa3cb58e8c16a",
+ "sha256": "0xwkfv63klpyqkgx1ihwqh1aqyk8yi3z3appygp28q60rybsyiyl"
}
},
{
@@ -19666,15 +19378,15 @@
"repo": "conao3/cort.el",
"unstable": {
"version": [
- 20211020,
- 18
+ 20241019,
+ 936
],
"deps": [
"ansi",
"cl-lib"
],
- "commit": "3f64a7b03a4c5b768ec21fd5987acd0d62d16c7b",
- "sha256": "1bkyx8sd2qqnhmmqbl9wyxk3xhrplq9zprmfpyhf5k0zin3zd31y"
+ "commit": "262966c9bc7fd3aa7bcf2dc3b9edc286c7f19e58",
+ "sha256": "01n7rcvdw98q0dvc51pk6nyrjwcf76cfs7r7c93xnjv5pmpjczfr"
},
"stable": {
"version": [
@@ -20598,6 +20310,30 @@
"sha256": "12g6l6xlbs9h24q5lk8yjgk91xqd7r3v7r6czy10r09cmfjmkxbb"
}
},
+ {
+ "ename": "crc",
+ "commit": "28cbd69b950ff176f82da0bacaadebbe1ef12348",
+ "sha256": "03d93i4a8yl4igsdds2d51gj69nvq4q9kldqhqa9c4d2mjgzwcbl",
+ "fetcher": "codeberg",
+ "repo": "WammKD/Emacs-CRC",
+ "unstable": {
+ "version": [
+ 20241115,
+ 253
+ ],
+ "commit": "0c2d6bd56963c3a8b36e88d748a6cbaf3541c6a1",
+ "sha256": "02i6d0dyh1wfd5rcq91vk516n11mcp7w18m11z2nqdpr588b7zn2"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 1,
+ 2
+ ],
+ "commit": "0c2d6bd56963c3a8b36e88d748a6cbaf3541c6a1",
+ "sha256": "02i6d0dyh1wfd5rcq91vk516n11mcp7w18m11z2nqdpr588b7zn2"
+ }
+ },
{
"ename": "creamsody-theme",
"commit": "488f95b9e425726d641120130d894babcc3b3e85",
@@ -21103,15 +20839,15 @@
"repo": "neeasade/ct.el",
"unstable": {
"version": [
- 20230519,
- 1319
+ 20241106,
+ 2223
],
"deps": [
"dash",
"hsluv"
],
- "commit": "02f209fe6c8ad85c832d8f80193255d0bf78e218",
- "sha256": "1vgjp6py9rf8xqv6lklk3l1p6sb57jfdskwpzna5y0rajg39bygr"
+ "commit": "6cb398e3a04545153a7428af263ae2fa1a4c4737",
+ "sha256": "0qrcm7zl5j992xd7ar6mnrs15pa47wh7xj9vqjxc6qrbbnys8dyl"
}
},
{
@@ -21766,11 +21502,11 @@
"repo": "Emacs-D-Mode-Maintainers/Emacs-D-Mode",
"unstable": {
"version": [
- 20240813,
- 659
+ 20241126,
+ 1056
],
- "commit": "9b1676d70edbc2f2788130adfd5797515a5c8538",
- "sha256": "1fwrf9iy85z1hz1g65k52yyg9z17lmnk4bwci5p6pvcqb8dm2qgm"
+ "commit": "de2a20eb21ae9bddfa86468a7522b0ba29f0c387",
+ "sha256": "18d9ndgsx66f0w3a6gsvff6l7lqbmfqqjahm3zzjj50yk43yykig"
},
"stable": {
"version": [
@@ -21790,20 +21526,20 @@
"repo": "andorsk/d2-mode",
"unstable": {
"version": [
- 20240707,
- 1850
+ 20241107,
+ 236
],
- "commit": "69374e0249df20139f3f2d475de9eae2b201d019",
- "sha256": "0hr2q2d3qfrbd7vpxbcamawvdzvak30rdsbrkxcqz9d36grhsj97"
+ "commit": "872a0d79223d2fe0ecad02fd4474831ec623672f",
+ "sha256": "1hrxn43wavi1q3djbrqrsv732kzadkpnfm58prqrsv8k010ws886"
},
"stable": {
"version": [
0,
1,
- 2
+ 3
],
- "commit": "cbe7b16141bd80fe4344f0403e61fd7ee4e0fd89",
- "sha256": "1mdiafxbfz31blp7c86m6sp0dmn4yhnbs2mhzh75mczsg0gzqc4v"
+ "commit": "872a0d79223d2fe0ecad02fd4474831ec623672f",
+ "sha256": "1hrxn43wavi1q3djbrqrsv732kzadkpnfm58prqrsv8k010ws886"
}
},
{
@@ -21852,15 +21588,15 @@
"repo": "cbowdon/daemons.el",
"unstable": {
"version": [
- 20231212,
- 1324
+ 20241127,
+ 1211
],
"deps": [
"compat",
"s"
],
- "commit": "6b6b97b7bac3040cfc58ea5ca7bd9dc9003068fb",
- "sha256": "1ay1dchhnq1kjp8ygpdimylrnwwacdpxnfnllgwcps9w9cwslipx"
+ "commit": "0dc7f1ec81fa70b3cafdc394413fe14fd3a413e4",
+ "sha256": "1p5f2lf6jlsvyh6zhd6drc2njadlkn73djrykridsphzh92q88k0"
},
"stable": {
"version": [
@@ -21904,32 +21640,32 @@
},
{
"ename": "dall-e-shell",
- "commit": "578e261826b0825cdcae0ab07bea4226bdef7fa3",
- "sha256": "016x2fga6iq3llxp7yd7f4pc4w0gi0bxv9abhhznncsn008mgnj1",
+ "commit": "bd7bfd8814e2e81d4022984f6b2baf2b1d1d0225",
+ "sha256": "1ivbi9z7gld8dzh91gs3msfyw77dgqjfrd8clgr6kci3h4akyw9w",
"fetcher": "github",
- "repo": "xenodium/chatgpt-shell",
+ "repo": "xenodium/dall-e-shell",
"unstable": {
"version": [
- 20241011,
- 805
+ 20241118,
+ 1015
],
"deps": [
"shell-maker"
],
- "commit": "08c8a6dec6a5b1a23d4ae3f4312dc6c92d1a09a1",
- "sha256": "04byw3zz06fr1g185p55pdaf5bqxj3mssldbh089pmx10qdmaxqi"
+ "commit": "d7f54f002c9271bc46c7403af898ed12e3abea69",
+ "sha256": "0cf81h9acc1ql5148y00jsl7v80190s2q71wd0q9j70vdghz8xhv"
},
"stable": {
"version": [
1,
- 8,
+ 20,
1
],
"deps": [
"shell-maker"
],
- "commit": "08c8a6dec6a5b1a23d4ae3f4312dc6c92d1a09a1",
- "sha256": "04byw3zz06fr1g185p55pdaf5bqxj3mssldbh089pmx10qdmaxqi"
+ "commit": "a24c003c79a720eafffc79bc3885070735f667f6",
+ "sha256": "161q8d2b4sq481jh4zwagvh88wg51dsnf76n2l2b7wv3nh7cjh2m"
}
},
{
@@ -21980,11 +21716,11 @@
"repo": "rails-to-cosmos/danneskjold-theme",
"unstable": {
"version": [
- 20240723,
- 1000
+ 20241114,
+ 749
],
- "commit": "d495ba64e4a9e3e44b028b9fbc3898da3348ffdc",
- "sha256": "00x2r95xivww43al98w0pak7dh9rrh1vdjhkspyw8cdvq4259s3y"
+ "commit": "96c000887d5bf7be17ff315c939bb7c8c962b86a",
+ "sha256": "1vbb5s5vl08lx0rjvn4a0czhnfdndn70vsk68kzfbchycpd3m7pp"
}
},
{
@@ -22036,8 +21772,8 @@
"repo": "emacs-lsp/dap-mode",
"unstable": {
"version": [
- 20240611,
- 1356
+ 20241101,
+ 659
],
"deps": [
"bui",
@@ -22050,8 +21786,8 @@
"posframe",
"s"
],
- "commit": "b407773ebca56e3bd8e6a4643854e91cbde0c35e",
- "sha256": "1a1iwx299xcm5ldd2sh7sjhmpb6wndyrwx7q0q6nih6j8ly0nppr"
+ "commit": "605448b4fd90ca25924bf029acf2bdd047045133",
+ "sha256": "1lpw7pgkq2nq5br8am8jz34lvgnkx61nkwf54b83w1rk2rrssam9"
},
"stable": {
"version": [
@@ -22164,11 +21900,11 @@
"repo": "grtcdr/darkman.el",
"unstable": {
"version": [
- 20240919,
- 651
+ 20241019,
+ 1404
],
- "commit": "f4c11edc86f16b7ce88c33dc6112e17e751171dc",
- "sha256": "0bg99fz8f94p81p4zvihli7nh0m0r4p9j7bb0y7m54h3hhj6p1cz"
+ "commit": "beb2186e6eaf13ebe1ae56e460bcd1a4c0cb4f07",
+ "sha256": "0mw1rfv0nmpb2h79wg5mk23wr9cfyhgd6jjaxllr8gabkvajpsvg"
},
"stable": {
"version": [
@@ -22411,11 +22147,11 @@
"repo": "emacs-dashboard/emacs-dashboard",
"unstable": {
"version": [
- 20240923,
- 2345
+ 20241120,
+ 2030
],
- "commit": "946b9957470a3cac6b089bdf2d9edd07a29fcc9c",
- "sha256": "0baz0kyzmp9zjdsh79sh4shfx4wbkgq8fcrp8rhih9x1jwg2bk4k"
+ "commit": "9479466d39652a8e32b74ee83822421fa08024d9",
+ "sha256": "0xch9w4l1zs52pwlcyy6nrxnp31ysaxkbqpx4wx5nf2sglc8jixc"
},
"stable": {
"version": [
@@ -22741,20 +22477,20 @@
"repo": "KeyWeeUsr/dbml-mode",
"unstable": {
"version": [
- 20240928,
- 1643
+ 20241116,
+ 752
],
- "commit": "42ddcf4f19a823120477a9f22881d02099b85f1f",
- "sha256": "1dxr5xzx5qa5bq4p138l6nkdjzfshxjysz0gnzqv8bd62lj3rf20"
+ "commit": "8baafca584012247859fe1a9e1d55eeed757a714",
+ "sha256": "0sf7qd5dsd11bawchf6mykxz2nmmisx2yjy933bphn3lqaczkg1a"
},
"stable": {
"version": [
1,
- 0,
+ 2,
0
],
- "commit": "42ddcf4f19a823120477a9f22881d02099b85f1f",
- "sha256": "1dxr5xzx5qa5bq4p138l6nkdjzfshxjysz0gnzqv8bd62lj3rf20"
+ "commit": "8baafca584012247859fe1a9e1d55eeed757a714",
+ "sha256": "0sf7qd5dsd11bawchf6mykxz2nmmisx2yjy933bphn3lqaczkg1a"
}
},
{
@@ -22842,16 +22578,16 @@
"repo": "Wilfred/deadgrep",
"unstable": {
"version": [
- 20241012,
- 1511
+ 20241130,
+ 2235
],
"deps": [
"dash",
"s",
"spinner"
],
- "commit": "8d9213990a50e55b8fd1ab6bed99e5c6a4ae229b",
- "sha256": "187i1pzz8fspislj0c6d2bd08wzzxngpn3wpgj72zdgqx9y99yd3"
+ "commit": "d89468d82abb778ef0938c5753be4498d5802a10",
+ "sha256": "0yaik954w89mg3vi6490p3c7aqjq885v5wg8gccdkaa2hl7acsdm"
},
"stable": {
"version": [
@@ -22875,11 +22611,11 @@
"url": "https://salsa.debian.org/emacsen-team/debian-el.git",
"unstable": {
"version": [
- 20241009,
- 2240
+ 20241026,
+ 559
],
- "commit": "7a955451f923c05eba40b56488dacff9f0fcc893",
- "sha256": "1rlkj0gs3abg2dp6nzl86qy6zx7y0f85pvwrhjxghrhzv01h2cqc"
+ "commit": "89e0fdfb0c6a387c1fd693b34ee9608d758d0742",
+ "sha256": "1qzg2yky3mjygl8347pn8kms6k6y6br9bii1yq9qnwvwabbxxln4"
},
"stable": {
"version": [
@@ -22943,11 +22679,11 @@
"repo": "lifelike/decide-mode",
"unstable": {
"version": [
- 20241013,
- 2142
+ 20241014,
+ 1927
],
- "commit": "cdd1cf76fdf4f08fb9dbe7de25b59af81337cce6",
- "sha256": "00ns3kss0pir3ig0zqfww3k3lc7dpn9mzf56f8q2zsw47fisqn3w"
+ "commit": "fa97462f9c9237551e99ec56dbfe13af14391ca6",
+ "sha256": "0i9gc1hg18biw2b1x3crfjmam6v0qc2hr1hy5fgvrpagdbxg9lkf"
},
"stable": {
"version": [
@@ -23472,21 +23208,6 @@
"sha256": "0cd9207b9gwbxgv1vvlfk9yv9fy51697fwpr6j0s9v2px3jv9ahj"
}
},
- {
- "ename": "derl",
- "commit": "f661504203b6990094307244a1c93cb62c1521d9",
- "sha256": "03j9jn4xidbvs2llp7nm0lx55x4ian6dk5d54ji58zkis3qpjy84",
- "fetcher": "github",
- "repo": "axelf4/derl.el",
- "unstable": {
- "version": [
- 20231004,
- 821
- ],
- "commit": "6f31592bb3083de366cdb13a7db0ed69fc72de47",
- "sha256": "1nqzw42vn1w1dh871izyalwkxvrq73ykyzkggrv070cyfyhbc177"
- }
- },
{
"ename": "describe-hash",
"commit": "8c6c5cd96acd3deeb86503341dd9cd729e20185e",
@@ -23690,14 +23411,15 @@
"repo": "astoff/devdocs.el",
"unstable": {
"version": [
- 20241006,
- 51
+ 20241113,
+ 1341
],
"deps": [
- "compat"
+ "compat",
+ "mathjax"
],
- "commit": "98518166efe18c2f2dd9a1c4c89430b83fdbbe3c",
- "sha256": "0nm9ryq29hsgvmis2f51vwlhm5lw1571smmb2gq0qbm4zrd1h9pk"
+ "commit": "d2214d34cdeb4483a594dd6973fcd095cef4653f",
+ "sha256": "0qgc2wb5bmpqjm7r9127cby97ps2bfxx5cx3yqcm0crmlgrayw2p"
}
},
{
@@ -23963,14 +23685,14 @@
"repo": "dgutov/diff-hl",
"unstable": {
"version": [
- 20241012,
- 2142
+ 20241128,
+ 2332
],
"deps": [
"cl-lib"
],
- "commit": "9e39dfc666ac03a8474b3a05da17e0c935894414",
- "sha256": "0dclq2v92n2raaj80p9k6z44a5ini56z7gf3d5japllqqys2cn9q"
+ "commit": "d9f54b512a0f583c6c3b51ce0c8ef62bffac7763",
+ "sha256": "1piy6ivq504zcgam9wabs5k2hinsmwj37wxlq0iy9qb0jhdakpdr"
},
"stable": {
"version": [
@@ -24086,15 +23808,15 @@
"repo": "pkryger/difftastic.el",
"unstable": {
"version": [
- 20240528,
- 1657
+ 20241030,
+ 1038
],
"deps": [
"compat",
"magit"
],
- "commit": "79753bfec7c32f44dc0d5ed57a8bc6b370392a87",
- "sha256": "02rl4zrh871cck7gr0b7jgw2xzlx50lgldbdcx2vdmd3ljkq383h"
+ "commit": "4980c08f7ad7777c364a3251bcc314b0f0d4d7dc",
+ "sha256": "1yrj9alg55rd4n9n3jsv3w2v8xv3b0bwi6xnw8fzs7zcdi4zn1n1"
}
},
{
@@ -24456,14 +24178,26 @@
"repo": "tilmanrassy/emacs-dir-treeview",
"unstable": {
"version": [
- 20230922,
- 2328
+ 20241025,
+ 2251
+ ],
+ "deps": [
+ "treeview"
+ ],
+ "commit": "09cf976b0f5999e378141bb66361395f1832aeae",
+ "sha256": "020ywr028af4kqy4n1hh3m7j9gg2c10118bwr37q3dcwy6mg1dm2"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 4,
+ 0
],
"deps": [
"treeview"
],
- "commit": "9024df99284414aa9dc2dff5f3ee9f874830ab74",
- "sha256": "11wzi9wfib1gaag3g88mn3yfx313vzky93cgjxxc0040zrqlxfp5"
+ "commit": "09cf976b0f5999e378141bb66361395f1832aeae",
+ "sha256": "020ywr028af4kqy4n1hh3m7j9gg2c10118bwr37q3dcwy6mg1dm2"
}
},
{
@@ -24694,20 +24428,20 @@
"repo": "knu/dired-fdclone.el",
"unstable": {
"version": [
- 20231128,
- 1614
+ 20241201,
+ 1626
],
- "commit": "82f161e4d0d9994d128c922170df54f966af182a",
- "sha256": "0135pr0wqkfj60iq270nglkq111ljyqqqcsh2s1n293qmyr288b9"
+ "commit": "e77bf1d5d2dcea903201e9c03fcdff9f0be72aa4",
+ "sha256": "1ch3kqidszva0cyhk3aj05jabcqcwj1xg93fx7zsd8qdir69s98f"
},
"stable": {
"version": [
1,
6,
- 1
+ 3
],
- "commit": "38555dc5a9427664b9b24af352de7550939625de",
- "sha256": "0n84wyzvr05kkyfzzdz7fm4n4mcxrznknm37l070qzww2rarq96f"
+ "commit": "e77bf1d5d2dcea903201e9c03fcdff9f0be72aa4",
+ "sha256": "1ch3kqidszva0cyhk3aj05jabcqcwj1xg93fx7zsd8qdir69s98f"
}
},
{
@@ -25276,14 +25010,14 @@
"stable": {
"version": [
0,
- 2,
+ 3,
0
],
"deps": [
"dired-subtree"
],
- "commit": "cfc70763131ae668ff7b4884651f894fd102ffb6",
- "sha256": "090dqaqyjmkzrz4szjpk1iip0bdvb0frp4l79393f8ki8w7c16c1"
+ "commit": "702165ad53a473992d84e0207b984b9be5114bde",
+ "sha256": "0f9cikyb53ybsawkm9g1sja2wsz2lmnc9zq63sx2h8d86acza2cp"
}
},
{
@@ -25420,11 +25154,11 @@
"repo": "purcell/diredfl",
"unstable": {
"version": [
- 20240909,
- 1723
+ 20241201,
+ 1141
],
- "commit": "bca8f0f7b3e9e46b9c7692275ced8c1d59e0d208",
- "sha256": "125a49ibbaicp6kxv0ja9mz9paryqgz30xhl0pk3kvnm8z40hlr6"
+ "commit": "fe72d2e42ee18bf6228bba9d7086de4098f18a70",
+ "sha256": "19nzg9h0hi516c9xqifbdy9mdr4lj0hmba94dl4qfin9j4c8wgqm"
},
"stable": {
"version": [
@@ -25853,6 +25587,36 @@
"sha256": "1hmawlnd2l89p48pviwn4khvjs0iry8x67cyqw70r10dd0ybn851"
}
},
+ {
+ "ename": "disproject",
+ "commit": "c3539929eec8fc91f31dab208122a96f8c959c00",
+ "sha256": "10d722rbmkjf4f7pdgdr0ar4m2g34h0j82fl4hfa59ydm6n5sdx2",
+ "fetcher": "github",
+ "repo": "aurtzy/disproject",
+ "unstable": {
+ "version": [
+ 20241128,
+ 2134
+ ],
+ "deps": [
+ "transient"
+ ],
+ "commit": "15431e0d6947682ffba80f89e70918c86745eb57",
+ "sha256": "0d5bbkzzklr2v2b431mxf5xqm4vdbk220ihwyf90m12b5iq6gzp0"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 2,
+ 0
+ ],
+ "deps": [
+ "transient"
+ ],
+ "commit": "15431e0d6947682ffba80f89e70918c86745eb57",
+ "sha256": "0d5bbkzzklr2v2b431mxf5xqm4vdbk220ihwyf90m12b5iq6gzp0"
+ }
+ },
{
"ename": "dispwatch",
"commit": "580cee72ac9871f8f256069b371f7fb66367a048",
@@ -25953,14 +25717,14 @@
"repo": "unhammer/dix",
"unstable": {
"version": [
- 20230126,
- 1017
+ 20241128,
+ 1111
],
"deps": [
"cl-lib"
],
- "commit": "5eeed9362fbeaf5a032bccd69b861b8a36877516",
- "sha256": "0w23qcmlpy23v481nqikjpd3kgwpjapihlwhxdxmpd5h90khkj9j"
+ "commit": "9770a2edd1fd0f872cc4ca72fa8f4b1007cb3da8",
+ "sha256": "050xh28jhk6gqm4psqkgjh3wqh5jrggrp9ky380f05x8v1ijgvhq"
},
"stable": {
"version": [
@@ -26228,14 +25992,14 @@
"repo": "emacs-jp/dmacro",
"unstable": {
"version": [
- 20200803,
- 633
+ 20241027,
+ 830
],
"deps": [
"cl-lib"
],
- "commit": "0008e7d2403a20f444b29a63fad65819aefabe18",
- "sha256": "0ij0mafvgc3fxgnp27gx19i80z6cbr80ddmwl1fjl0gzc1ivqrxl"
+ "commit": "cb3ce0e1d6ce868baf47cb9225c8daae4b610dab",
+ "sha256": "1fvinc3gmxzqklcrrh723n5axcxv6s8pj16q1xmfmzlhb8ldv2xl"
}
},
{
@@ -26331,8 +26095,8 @@
"repo": "Silex/docker.el",
"unstable": {
"version": [
- 20240917,
- 1355
+ 20241111,
+ 859
],
"deps": [
"aio",
@@ -26341,8 +26105,8 @@
"tablist",
"transient"
],
- "commit": "6f8bba0d11a5143872dfc25afdabe16cae410d11",
- "sha256": "00bc768jknzym99k56jhbrj1hyzj7yygi513vw2wz89vq2axjdkg"
+ "commit": "ec2391a8e3404958cefee3dda23b2c89dcf807a2",
+ "sha256": "1wn3wks97vx74hgqc42q7fwblyarvjrbgcy2h1r7yf5cliwsl0v5"
},
"stable": {
"version": [
@@ -26732,16 +26496,16 @@
"repo": "seagle0128/doom-modeline",
"unstable": {
"version": [
- 20241002,
- 1003
+ 20241201,
+ 1338
],
"deps": [
"compat",
"nerd-icons",
"shrink-path"
],
- "commit": "ec6bc00ac035e75ad10b52e516ea5d95cc9e0bd9",
- "sha256": "0sk1h3g3dslngzrl5ghw1g8a4gpz59pcm5ivyafiv2qqw5gvdjwi"
+ "commit": "d4985f0f6ebbc125995fdfd5a909ba6afe692d7d",
+ "sha256": "175c8qa0bfa15d85dn1sajpyajbv1kmsqcn8z9a6xc9g88y8midd"
},
"stable": {
"version": [
@@ -26785,14 +26549,14 @@
"repo": "doomemacs/themes",
"unstable": {
"version": [
- 20240909,
- 2117
+ 20241120,
+ 157
],
"deps": [
"cl-lib"
],
- "commit": "1cac71a4b2434036496a49b4440fdba3d0b5b387",
- "sha256": "0423xhs2vd08adh1ar3qz651fdi6a2131c5haq3a9jx3fk464pdd"
+ "commit": "3c03f525d5c0ac0859f31231778f97e10a705e0d",
+ "sha256": "0mw0lvl3a3fz2xrh2cy7d48kzjgsf545m9lknab566wp2f7mg4ng"
},
"stable": {
"version": [
@@ -27012,14 +26776,14 @@
"url": "https://salsa.debian.org/emacsen-team/dpkg-dev-el.git",
"unstable": {
"version": [
- 20240924,
- 529
+ 20241026,
+ 627
],
"deps": [
"debian-el"
],
- "commit": "eb37cb7a464f205650962d7dc7b0e39d72daeb7d",
- "sha256": "1gk5vi1v7bd4j597h1fwgar88mas66264gl3vqkblkjk2ynnqkif"
+ "commit": "719c1dbea93f4b524937d280f18871981714a012",
+ "sha256": "1q28dhdx6bc4sr6qrg6in8a21np1bwi3b4adl3d9yrdv65b1dxzx"
},
"stable": {
"version": [
@@ -27065,11 +26829,11 @@
"repo": "dracula/emacs",
"unstable": {
"version": [
- 20240912,
- 2032
+ 20241102,
+ 1301
],
- "commit": "c1614c68bb7cb6f9a6f4f779f47cf0d24b938b6f",
- "sha256": "1n1pdgm6xa2g1bk5wnb8lhwabzl05cms3qn52sag8xngph2p43vh"
+ "commit": "4e521e716c2c914d7003243238a00ed330cd17c9",
+ "sha256": "11jqkp1h2v05k7iasfhgx9j675md13iy8cf2bviyd3g2jz4p99fs"
},
"stable": {
"version": [
@@ -27277,20 +27041,20 @@
"repo": "positron-solutions/dslide",
"unstable": {
"version": [
- 20240703,
- 1523
+ 20241128,
+ 1102
],
- "commit": "2d8a9ac3e37157ce8b78880ebc1defc61303a44d",
- "sha256": "177cfim8hd6292lhvvsapk695i0q378v4wk221l57nv197rnmy4n"
+ "commit": "c0e4aff0ac8a51df4020bd591d19bd749c92f024",
+ "sha256": "1ah1319lnjzvja5yv0qjb6jz5b0i3xaa5m708c1xgr4mxk3blzvs"
},
"stable": {
"version": [
0,
5,
- 3
+ 5
],
- "commit": "2d8a9ac3e37157ce8b78880ebc1defc61303a44d",
- "sha256": "177cfim8hd6292lhvvsapk695i0q378v4wk221l57nv197rnmy4n"
+ "commit": "0d9a1f6c27e0543e912213d0a5047999f9e5deb5",
+ "sha256": "02c4v3zv8q2dqln3lfn2055bnffafc7yczrn3jyvw0f9hcw77ibr"
}
},
{
@@ -27490,6 +27254,25 @@
"sha256": "18d2ll5wlll6pm909hiw8w9ijdbrjvy86q6ljzx8yyrjphgn0y1y"
}
},
+ {
+ "ename": "dumber-jump",
+ "commit": "6b421a7803bfcbb14761524960cfbd1d43d1cd82",
+ "sha256": "1xki5ckrd0crj5vwpkzdg3djrgrnc575b7fqd2i6ah8fby4z4cij",
+ "fetcher": "github",
+ "repo": "zenspider/dumber-jump",
+ "unstable": {
+ "version": [
+ 20241028,
+ 1822
+ ],
+ "deps": [
+ "dash",
+ "s"
+ ],
+ "commit": "37ca96bd065ac6869549e17dec98940edfc59f5a",
+ "sha256": "1y9gqy1nyhhlfk5aihp97fzzp1mq81h7mz20ayz9h3s2cm6qmq4v"
+ }
+ },
{
"ename": "dummyparens",
"commit": "e1f6199a9afece4d6eb581dc8e513601d55a5833",
@@ -27581,14 +27364,14 @@
"repo": "liuyinz/duplexer.el",
"unstable": {
"version": [
- 20240919,
- 1018
+ 20241029,
+ 356
],
"deps": [
"dash"
],
- "commit": "883e9e24f1c7bb7132c1eac0bf5bedf78081058f",
- "sha256": "0mpjjyqnr8izirpgnyckci2fmnxfnmlblzayribgzqrj8mgyzdhy"
+ "commit": "e46b9414de3913f7fbfa9b0e8b2a33f6bbf57cb5",
+ "sha256": "013y7j5np0hybwxna9q9hgg2cf267qrcy0iivaa6p31vpk0zqiq7"
},
"stable": {
"version": [
@@ -27665,11 +27448,11 @@
"repo": "sadiq/dwim-coder-mode",
"unstable": {
"version": [
- 20240712,
- 1047
+ 20241121,
+ 1117
],
- "commit": "02f5fa0c3ae5cc17ca860c792d988705f41b0eee",
- "sha256": "0p1yz2lnzifqsjqcbk2jk9darj72icnydaxwhs2h0hmvl786g4gi"
+ "commit": "dda1e9b991c9dc7ff2a2779731783db3176c3b61",
+ "sha256": "1kq29hrbdyfa2gc13w5f2c92pb9k2hr4m86f9s7vjc1lhx32v7gw"
}
},
{
@@ -27680,11 +27463,11 @@
"repo": "xenodium/dwim-shell-command",
"unstable": {
"version": [
- 20240925,
- 2058
+ 20241115,
+ 845
],
- "commit": "9ee831bf05eb54f04baeb3d2e57d70752661e286",
- "sha256": "0izngjxkv0ffn81hha0jd211anr0k5wyigmps7mppx5bcjv5dgax"
+ "commit": "1fa8b9d361f01618bf65111ac0b253adb0599a09",
+ "sha256": "1alkd06m9f7p16a1fw1c8kmgg9az21fkc4xfspai122az1wpp83n"
},
"stable": {
"version": [
@@ -27722,11 +27505,11 @@
"repo": "dylan-lang/dylan-emacs-support",
"unstable": {
"version": [
- 20220115,
- 1804
+ 20241102,
+ 2315
],
- "commit": "9d2891e3e06405b75072d296f385fa795aeb9835",
- "sha256": "0fxyl50n2s1pb86z46s1f0lh361q34i2x8hir91wvqsqkfajbhz0"
+ "commit": "21e5953e2b1832f6a2c72012bd13795dc1ede52f",
+ "sha256": "01jkk7gq6pqls6yvc6j77zmnppm2qpx876s596y7vz1q1c5i2fii"
},
"stable": {
"version": [
@@ -27834,19 +27617,19 @@
"repo": "countvajhula/dynaring",
"unstable": {
"version": [
- 20240615,
- 129
+ 20241126,
+ 252
],
- "commit": "90daf413abee1723c37697e72bb700a06727ff4b",
- "sha256": "12634kmx7fdb3lndyjgf7hisdzcqg3hn90xqr56gjdj0m5yzq310"
+ "commit": "42333fcb734f675cab5d25d1b9d142d502914388",
+ "sha256": "1i17i0rigxm8isri5ygb1pk695ywlfmgkpgmbgqyzw5zmb9w4gm1"
},
"stable": {
"version": [
0,
- 3
+ 4
],
- "commit": "c17de670bc5ab4cc866d470f44faf733351428d6",
- "sha256": "02ffmssibnx78m352f6qr705cswyzz5lvgpryv9d7kjpbzvqya6k"
+ "commit": "42333fcb734f675cab5d25d1b9d142d502914388",
+ "sha256": "1i17i0rigxm8isri5ygb1pk695ywlfmgkpgmbgqyzw5zmb9w4gm1"
}
},
{
@@ -27893,14 +27676,14 @@
"repo": "kiwanami/emacs-window-manager",
"unstable": {
"version": [
- 20170215,
- 36
+ 20241104,
+ 914
],
"deps": [
"window-layout"
],
- "commit": "4353d3394c77a49f8f0291c239858c8c5e877549",
- "sha256": "12midsrx07pdrsr1qbl2rpi7xyhxqx08bkz7n7gf8vsmqkpfp56s"
+ "commit": "33efca5504db9d8b3fdbd412c3d79663c9eec77a",
+ "sha256": "1a1n9b5gw6985qi1dm56vyw8jacx4k3jyl4cadkhj38rz24yiyx8"
},
"stable": {
"version": [
@@ -28134,6 +27917,21 @@
"sha256": "1d2krw9x1mw6jn1q07nbq2qi92fms85q3i9wa2q5drs3368l55vr"
}
},
+ {
+ "ename": "earl",
+ "commit": "900e956e83f8ef7ef8a88827602677b11acf605f",
+ "sha256": "0jilp5ppavyxk4qnk0pily7nr2rz9bqi05xkyv26q77zkhnf3knc",
+ "fetcher": "github",
+ "repo": "axelf4/earl",
+ "unstable": {
+ "version": [
+ 20241020,
+ 1847
+ ],
+ "commit": "aa10aae9891a599f523f269cc391ed316775d12a",
+ "sha256": "18pi10csnxbjpx6naym1mnz16fz9lv7wc6n6xqcm55wqppf7ln4i"
+ }
+ },
{
"ename": "earthfile-mode",
"commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
@@ -28157,11 +27955,11 @@
"repo": "emacs-eask/eask",
"unstable": {
"version": [
- 20241014,
- 738
+ 20241123,
+ 1454
],
- "commit": "34fd32468a62604b5d75e3ad562cb9e84a5e5ac7",
- "sha256": "10sv8d22zqrh7qijh19byddbry971xk72b7lvdmp15i1ra3842xv"
+ "commit": "106755df719ceb202d52146d436f370f5bf8f095",
+ "sha256": "04k7q2jka4dr2sbxx54i18y2j78rfky8fmghxk5sb3pvmkz0j7c1"
},
"stable": {
"version": [
@@ -28423,26 +28221,26 @@
"repo": "jamescherti/easysession.el",
"unstable": {
"version": [
- 20241014,
- 1422
+ 20241118,
+ 1601
],
"deps": [
"f"
],
- "commit": "d8a5a491cbfe0536348713b556bd2790450136bb",
- "sha256": "0rx9j64c4rlf2g4ch5zc9fisrncwziwki8plhmyjm0n8yfd32a40"
+ "commit": "157f2d2130280720190198f74b850e228348ffaa",
+ "sha256": "0h4801v9fspqhd920c19nv6kdsl6lja51ymkr7az9jgnc3vxbjs4"
},
"stable": {
"version": [
1,
1,
- 0
+ 1
],
"deps": [
"f"
],
- "commit": "0ed3925e768ccf177328242dd2403838de52d13d",
- "sha256": "0x0wp5m3rma1sr983017wgmyqr799fs49y9q3b88cj45i1ffr94h"
+ "commit": "f45896a6d29966c7a9f63f0a4c603245c1609877",
+ "sha256": "1rcav779l4xbml9157cqrj4fkxan19q2lpj8wg0cj6gmvw536agv"
}
},
{
@@ -28518,27 +28316,28 @@
"repo": "joostkremers/ebib",
"unstable": {
"version": [
- 20240925,
- 2235
+ 20241125,
+ 1941
],
"deps": [
"compat",
"parsebib"
],
- "commit": "92da7850b864af89f4b546bb8f562fcbbe042392",
- "sha256": "0sk5q205cw0cihidmaakg3jyp6z1b8rib0x57gsh3qw5g5bzhbq1"
+ "commit": "dabc7d5b14e4371475ddc1061e9c52f0ef91e671",
+ "sha256": "0y9w0b09djji6v1ayrqins7awms121q2k1z9mxyc0kl9d8q72n4d"
},
"stable": {
"version": [
2,
- 44
+ 44,
+ 1
],
"deps": [
"compat",
"parsebib"
],
- "commit": "73159eba01c34ec103db9e15e959eee87c2242eb",
- "sha256": "1fl3spc2090nwswsqxmkw55ibw0ncdmi4igac0ywqs515cw07ywl"
+ "commit": "315a8b067059f7d2c4e19220586dfbb042161fc4",
+ "sha256": "1lba6556ilml3kq8fxd1nkmx3dank36n68v3msad0npkj8083xlb"
}
},
{
@@ -29092,11 +28891,11 @@
"repo": "editorconfig/editorconfig-emacs",
"unstable": {
"version": [
- 20240813,
- 801
+ 20241027,
+ 1815
],
- "commit": "648f0cf9aeb72db77b252832a58367332b7bc055",
- "sha256": "03fms46mfdqi9czp1nkccm9zpi1g5n41djfh299phs4sz8nl19lk"
+ "commit": "24f5b2b1cd4e37adc245fb59f7edeb6872a707a4",
+ "sha256": "1yh5pz34aldn75z6vpfmc93jklvd7fd8azvwcq1d7cl352jf5i5r"
},
"stable": {
"version": [
@@ -29235,11 +29034,11 @@
"repo": "sinic/ednc",
"unstable": {
"version": [
- 20240209,
- 2028
+ 20241129,
+ 1636
],
- "commit": "2580ada68ecc93aa693c61f997c9cf581698242e",
- "sha256": "0fr36z0fgz4k9mdv1297dyp2rpdxv8pzx3sklx1nayq4raavnmx3"
+ "commit": "e181e0bbf12b6516afba3785192d88432d8ebc6c",
+ "sha256": "1b545ibacpvjvwh0lhyx6g483xkdf8lqiiddddch3pq3dnm38yzg"
},
"stable": {
"version": [
@@ -29252,14 +29051,14 @@
},
{
"ename": "edts",
- "commit": "949da8f16687bad96f53714ccbde895587d439ff",
+ "commit": "6d23ade0346f071f0302453a8ecba340901b15e9",
"sha256": "0nabh5xfpskxjm2fvhg5blvh8xlnalfvq0qs57lraqc42699f8pk",
"fetcher": "github",
"repo": "sebastiw/edts",
"unstable": {
"version": [
- 20230926,
- 2146
+ 20241202,
+ 25
],
"deps": [
"auto-complete",
@@ -29270,8 +29069,8 @@
"popup",
"s"
],
- "commit": "5c3cded3fab56baa60874f4e1efd14155cec587f",
- "sha256": "1gqb7v51xgwjd68nb2msfbg8s83f5082ha0ybqh7765qdlhrxfpf"
+ "commit": "d38f538c8e3fb285fb3c66b87eb68eba4ed074c3",
+ "sha256": "00yzvgvriak3ykgr13hvsvb51gai4p2m2wijjrrs3m5bzrsg0qkm"
},
"stable": {
"version": [
@@ -29605,20 +29404,26 @@
"repo": "kennethloeffler/eglot-luau",
"unstable": {
"version": [
- 20240401,
- 2209
+ 20241102,
+ 1924
+ ],
+ "deps": [
+ "eglot"
],
- "commit": "3926860036402cce4a55faec534b88c0bf6006fd",
- "sha256": "03zva7sykc1ja5kz8x21z5r10d49iwa67i4wafi8vnymmw3rfcai"
+ "commit": "23335f45fb91de606e6971e93179df0fee0fd062",
+ "sha256": "1k43zsw82l07i9va9w9fxhl9cnz1vbpl90m6jvbnrl8fxhzw2kvh"
},
"stable": {
"version": [
0,
- 1,
- 2
+ 2,
+ 0
+ ],
+ "deps": [
+ "eglot"
],
- "commit": "3926860036402cce4a55faec534b88c0bf6006fd",
- "sha256": "03zva7sykc1ja5kz8x21z5r10d49iwa67i4wafi8vnymmw3rfcai"
+ "commit": "23335f45fb91de606e6971e93179df0fee0fd062",
+ "sha256": "1k43zsw82l07i9va9w9fxhl9cnz1vbpl90m6jvbnrl8fxhzw2kvh"
}
},
{
@@ -29663,16 +29468,16 @@
"repo": "fejfighter/eglot-tempel",
"unstable": {
"version": [
- 20241012,
- 1053
+ 20241115,
+ 1110
],
"deps": [
"eglot",
"peg",
"tempel"
],
- "commit": "72d5069809084db4447cad40531449714d75041e",
- "sha256": "00v94h3zvl2pm1yizjmdfqgmzwqq8aghjixdcb23x703inq5p82x"
+ "commit": "c6c9a18eba61f6bae7167fa62bab9b637592d20d",
+ "sha256": "0wgkcfyj9a22kxizippnx2nca16vs2y7qzmi487530w9f17lm17y"
},
"stable": {
"version": [
@@ -29806,16 +29611,16 @@
"repo": "kostafey/ejc-sql",
"unstable": {
"version": [
- 20240106,
- 1848
+ 20241111,
+ 117
],
"deps": [
"clomacs",
"dash",
"spinner"
],
- "commit": "b80b773238719fa7160e598219f300dfbc4db06d",
- "sha256": "1whgbwdv3zrhxq2casxj784bx95j0vzlpnvi51i4xdxpdf77g521"
+ "commit": "1fc5a38d974aed401424ecd3b49a74e0a0ebc3bb",
+ "sha256": "1ry9ylnbkd2p0xswnh8cd9qac1j6idysak4lb4fplvamff4nc2v5"
},
"stable": {
"version": [
@@ -29856,28 +29661,28 @@
"repo": "ahyatt/ekg",
"unstable": {
"version": [
- 20240928,
- 1903
+ 20241118,
+ 224
],
"deps": [
"llm",
"triples"
],
- "commit": "839c6ce9a40bd7b7a12b791dc74f172ac1f378e6",
- "sha256": "0953qmg8mfpd018w95y90sns41gcng9fw6spb31a496yvqs85z68"
+ "commit": "942457bb75574f17058cba1da25e46aeee3fde4b",
+ "sha256": "0cmridxl0ngvh93lbndpbvzp4wbi5wd3hm30hhh4wp8qw280xygj"
},
"stable": {
"version": [
0,
6,
- 3
+ 4
],
"deps": [
"llm",
"triples"
],
- "commit": "12d2524b4b7fdbb2e60b564456c463e594919ca2",
- "sha256": "0pqdlwwm67r26pf90q93xkxhsbpv02pac3b9d8p7haxxdsdv10vd"
+ "commit": "942457bb75574f17058cba1da25e46aeee3fde4b",
+ "sha256": "0cmridxl0ngvh93lbndpbvzp4wbi5wd3hm30hhh4wp8qw280xygj"
}
},
{
@@ -30035,6 +29840,36 @@
"sha256": "1488wv0f9ihzzf9fl8cki044k61b0kva604hdwpb2qk9gnjr4g1l"
}
},
+ {
+ "ename": "el-job",
+ "commit": "ccf13778c703948af96a4e0cc356acc907180452",
+ "sha256": "0cav794g0a1rkdjfdp6r4gk30xk53n4jnwwppal1ifbwimr8i15s",
+ "fetcher": "github",
+ "repo": "meedstrom/el-job",
+ "unstable": {
+ "version": [
+ 20241201,
+ 1208
+ ],
+ "deps": [
+ "compat"
+ ],
+ "commit": "1bb6865aae4368b6e9f7491bd7c3f3e6fb1d7e7c",
+ "sha256": "1762ck9zp5p9qykf6spl0fs89k7drznjrm3q59j2lgwf1i0dzb9m"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 3,
+ 15
+ ],
+ "deps": [
+ "compat"
+ ],
+ "commit": "1bb6865aae4368b6e9f7491bd7c3f3e6fb1d7e7c",
+ "sha256": "1762ck9zp5p9qykf6spl0fs89k7drznjrm3q59j2lgwf1i0dzb9m"
+ }
+ },
{
"ename": "el-mock",
"commit": "b1989beb927657c0ff7e79fe448f62ac58c11be7",
@@ -30413,11 +30248,11 @@
"repo": "vilij/slurpbarf-elcute",
"unstable": {
"version": [
- 20240920,
- 1226
+ 20241115,
+ 1459
],
- "commit": "481b7ea70b8ba6c972b33abad169494097e699cd",
- "sha256": "0kc3m1khd8fnq15c8hzfi12yh8mykl16sxfj8dxbrvmwhyx4k7gg"
+ "commit": "c6e7d4b5da6f1116b479c71d9c7fa0aca71d4030",
+ "sha256": "1xd8nd55dhdf1dx622x2618zj3xk196p2yr4123hk8hlqlb46h2d"
}
},
{
@@ -30428,20 +30263,20 @@
"repo": "emacs-eldev/eldev",
"unstable": {
"version": [
- 20241012,
- 1650
+ 20241129,
+ 2121
],
- "commit": "9e11978ad72a1c97a2d35ef72176226b58fc9800",
- "sha256": "1wzq4hmj0qp55i8h1gfm68hvzfnd2lqzh0qav1ap35xxja3cqzff"
+ "commit": "7001727c9cbb8ee29de7b9761afd887db8cb0a94",
+ "sha256": "1ckhr6h57d5rqzw30079pc92yv6125vls17nwylxvawbj24imng9"
},
"stable": {
"version": [
1,
10,
- 2
+ 3
],
- "commit": "260f13a21e3733d24ccaffccd04c4de6196cb21c",
- "sha256": "0qs2n7zwsn4gffdl67329ww0dfr403q5c7229wpkc92zg29xi979"
+ "commit": "b5f583c70742ba371ff5c176d515c71d5407cf79",
+ "sha256": "0ha2ppxqp36m26nv6lyspq6m6xvvr03cf82rygq45w729gakdw9r"
}
},
{
@@ -30452,11 +30287,11 @@
"repo": "casouri/eldoc-box",
"unstable": {
"version": [
- 20240928,
- 1746
+ 20241026,
+ 259
],
- "commit": "0af5a65934f2fc4d83a1936c02cb3551b2563fae",
- "sha256": "1bap3xq398rqvjv95bhn8wn9wg5g2s7a6plyi333w26r8vbq7awv"
+ "commit": "cd01cc9cc9aee1f604f4259a41b0ab2659c946af",
+ "sha256": "14dn43v8plz3m9r79jpx60h13g2vs0jcjrkmh7fgi80cdzyf54rn"
},
"stable": {
"version": [
@@ -30646,27 +30481,25 @@
"repo": "davidshepherd7/electric-operator",
"unstable": {
"version": [
- 20231014,
- 1107
+ 20241201,
+ 1151
],
"deps": [
"dash"
],
- "commit": "18e555a5cdfd7264c179f810d7fd4c71a80b715a",
- "sha256": "1r5g2n4lzns65lil9291jhxzwm3q4s1z99zhmyj9nmnxl3mf7aax"
+ "commit": "1dbda747a3164018a0bb11cf39088627cc892019",
+ "sha256": "12lndaqg2nx1ls4srmy9xrmr94yz2k817xzj2bcfc4z1xmhh53yh"
},
"stable": {
"version": [
- 1,
- 1,
- 0
+ 2,
+ 1
],
"deps": [
- "dash",
- "names"
+ "dash"
],
- "commit": "21e6b84754118912768263a393442a7aefb4742b",
- "sha256": "1bgz5vn4piax8jm0ixqlds0qj5my26zczaxs21fah11pwbdc0xyk"
+ "commit": "92c3eae146cb9bfcebef4b33498ab7d0973033fe",
+ "sha256": "0200358i9hgn8wmzzw1b7qn3mv85qmhc55cvh5vn3i0kn6nrkmqj"
}
},
{
@@ -30811,11 +30644,11 @@
"repo": "skeeto/elfeed",
"unstable": {
"version": [
- 20240729,
- 1741
+ 20241202,
+ 22
],
- "commit": "904b6d4feca78e7e5336d7dbb7b8ba53b8c4dac1",
- "sha256": "0yq93abyadzrmcd40pi06wcr4jg9ddhlz2phg0wjypprqvv4q49z"
+ "commit": "a39fb78e34ee25dc8baea83376f929d7c128344f",
+ "sha256": "1rys5z7shn45z07dfcm5g06pnpx5kccdz94xkwizmrf882xzmmvh"
},
"stable": {
"version": [
@@ -31229,8 +31062,8 @@
"repo": "s-kostyaev/elisa",
"unstable": {
"version": [
- 20240721,
- 1247
+ 20241123,
+ 2205
],
"deps": [
"async",
@@ -31238,14 +31071,14 @@
"llm",
"plz"
],
- "commit": "85373924896c92b7c27d6737d247f0084df99d6a",
- "sha256": "09w1vvpx8zbsnp8sxk3ywzmim4w6msqg2cg19azgyd1kllxzsz0q"
+ "commit": "322d7eb839f1e981b8aa09a6ee4a7d6a22173772",
+ "sha256": "0slmp0fzmkww8al6w3h2b0vimbsppxbjrz29braw4j3lskq1isd7"
},
"stable": {
"version": [
1,
- 0,
- 4
+ 1,
+ 3
],
"deps": [
"async",
@@ -31253,8 +31086,8 @@
"llm",
"plz"
],
- "commit": "85373924896c92b7c27d6737d247f0084df99d6a",
- "sha256": "09w1vvpx8zbsnp8sxk3ywzmim4w6msqg2cg19azgyd1kllxzsz0q"
+ "commit": "322d7eb839f1e981b8aa09a6ee4a7d6a22173772",
+ "sha256": "0slmp0fzmkww8al6w3h2b0vimbsppxbjrz29braw4j3lskq1isd7"
}
},
{
@@ -31579,30 +31412,32 @@
"repo": "s-kostyaev/ellama",
"unstable": {
"version": [
- 20240915,
- 1523
+ 20241129,
+ 2147
],
"deps": [
"compat",
"llm",
- "spinner"
+ "spinner",
+ "transient"
],
- "commit": "74767cbd6dc582bd6ce99a83bc84d41bfad4b4ee",
- "sha256": "1nkd6dvmad54w2x13agmzfqmhil3rh8dw5v23brna9ldl1x0ap57"
+ "commit": "d4927093e2988084eac86c3254a7b7f5d4cbd761",
+ "sha256": "1abjp70q9ms6kdd1rs4zcrqzz0hfy7a5bizgl0ddrx7r0sfk9r06"
},
"stable": {
"version": [
0,
- 11,
- 14
+ 13,
+ 0
],
"deps": [
"compat",
"llm",
- "spinner"
+ "spinner",
+ "transient"
],
- "commit": "74767cbd6dc582bd6ce99a83bc84d41bfad4b4ee",
- "sha256": "1nkd6dvmad54w2x13agmzfqmhil3rh8dw5v23brna9ldl1x0ap57"
+ "commit": "d4927093e2988084eac86c3254a7b7f5d4cbd761",
+ "sha256": "1abjp70q9ms6kdd1rs4zcrqzz0hfy7a5bizgl0ddrx7r0sfk9r06"
}
},
{
@@ -31962,20 +31797,20 @@
"url": "https://thelambdalab.xyz/git/elpher.git",
"unstable": {
"version": [
- 20240930,
- 913
+ 20241022,
+ 1625
],
- "commit": "e3760dfedbd803dd8ff2a5d4fbbda249c1963bd1",
- "sha256": "0w8n30wdpf9alx7cjb2d8vb9a6a66dn181va2sg2cb2vl5j87lpj"
+ "commit": "a1c5fbf16b528fb67d087437d44d66e9edc99664",
+ "sha256": "0pkgk7608w31kvdjid54xfrc5zrbrzwi98wrglwl07s429xlbai2"
},
"stable": {
"version": [
3,
6,
- 0
+ 4
],
- "commit": "56bc74e224d9835c41b6e6b68c9705b60e6dbbe2",
- "sha256": "00z41vw63vm71i5szmvrxspvnzkpzflpip56jnmkjc94qfla2l8s"
+ "commit": "a1c5fbf16b528fb67d087437d44d66e9edc99664",
+ "sha256": "0pkgk7608w31kvdjid54xfrc5zrbrzwi98wrglwl07s429xlbai2"
}
},
{
@@ -32344,15 +32179,15 @@
"repo": "emacscollective/elx",
"unstable": {
"version": [
- 20240805,
- 1311
+ 20241123,
+ 2125
],
"deps": [
"compat",
"llama"
],
- "commit": "be1afda54a182c726d7f0c584b2ac4854384ffda",
- "sha256": "02wy4wsp2lk07kwb2pzi9bsb947walsndbjgllqpc35bhky50l0k"
+ "commit": "02ceae51c97ee0b05433c58faf874f68a88fa255",
+ "sha256": "0m67xcb1aks29c9zymlwmvkaswzpb8vx9m6x3s6qg9y13kvnxmhh"
},
"stable": {
"version": [
@@ -32376,14 +32211,14 @@
"repo": "lanceberge/elysium",
"unstable": {
"version": [
- 20241012,
- 2351
+ 20241102,
+ 2222
],
"deps": [
"gptel"
],
- "commit": "89d025337aae6aff2f32e06865d20d9a7ee4bb22",
- "sha256": "086nxx6pzn77q1dchkg4fsd80fagyrv4dm7f56fwbj5275n7hn6j"
+ "commit": "dcb194e0e49e2c1864e0fa2ccec3d7e37b0a44b6",
+ "sha256": "0cygwyg0x136h6im8n87lpw8vck2zava87bqhjv2pp6ibjw3nsqw"
},
"stable": {
"version": [
@@ -32421,21 +32256,20 @@
"repo": "knu/emacsc",
"unstable": {
"version": [
- 20240629,
- 1325
+ 20241119,
+ 1435
],
- "commit": "49b0bbbcd021424da4000bf47193bd2d928b2228",
- "sha256": "0fyxhbng9cckdbmp0jc2x88azajr68r14jzak2zqh5pqlvs6hcjz"
+ "commit": "0868b7f52adae264fb79e10e57a7481632eee76e",
+ "sha256": "1hs8arpbw1q1y3mwz2kyanqp2qs6pfbzfk9icba0cavk481whhjv"
},
"stable": {
"version": [
1,
5,
- 20240629,
- 1
+ 20241119
],
- "commit": "49b0bbbcd021424da4000bf47193bd2d928b2228",
- "sha256": "0fyxhbng9cckdbmp0jc2x88azajr68r14jzak2zqh5pqlvs6hcjz"
+ "commit": "0868b7f52adae264fb79e10e57a7481632eee76e",
+ "sha256": "1hs8arpbw1q1y3mwz2kyanqp2qs6pfbzfk9icba0cavk481whhjv"
}
},
{
@@ -32461,164 +32295,20 @@
"repo": "magit/emacsql",
"unstable": {
"version": [
- 20240906,
- 1342
- ],
- "commit": "fb05d0f72729a4b4452a3b1168a9b7b35a851a53",
- "sha256": "15nmp5dl2a1iyc99wlaywclnqsi2p34vgrp2x62671ccxnvzg8ii"
- },
- "stable": {
- "version": [
- 4,
- 0,
- 3
- ],
- "commit": "fb05d0f72729a4b4452a3b1168a9b7b35a851a53",
- "sha256": "15nmp5dl2a1iyc99wlaywclnqsi2p34vgrp2x62671ccxnvzg8ii"
- }
- },
- {
- "ename": "emacsql-mysql",
- "commit": "9875de56d4c4f5e1d6f127a0b2e408e87a9dd932",
- "sha256": "1bpi5iqfydcii7di990l5nskgxk0cqg6zg1yddadbdfdznsi37hm",
- "fetcher": "github",
- "repo": "magit/emacsql",
- "unstable": {
- "version": [
- 20240825,
- 1837
- ],
- "commit": "b9f19ac5e17a90d5b7314d67e3b790992be7d82d",
- "sha256": "1n11zkjh0x30n1ny0fw44w3k64yydcmyhlnfvycvf879k4j9r2zj"
- },
- "stable": {
- "version": [
- 4,
- 0,
- 3
- ],
- "commit": "fb05d0f72729a4b4452a3b1168a9b7b35a851a53",
- "sha256": "15nmp5dl2a1iyc99wlaywclnqsi2p34vgrp2x62671ccxnvzg8ii"
- }
- },
- {
- "ename": "emacsql-pg",
- "commit": "9875de56d4c4f5e1d6f127a0b2e408e87a9dd932",
- "sha256": "0pryfj9wi3kd6cbxnh8wwgyxhj17ihnic26a9a21rd769m2bsg5a",
- "fetcher": "github",
- "repo": "magit/emacsql",
- "unstable": {
- "version": [
- 20240825,
- 1837
- ],
- "commit": "b9f19ac5e17a90d5b7314d67e3b790992be7d82d",
- "sha256": "1n11zkjh0x30n1ny0fw44w3k64yydcmyhlnfvycvf879k4j9r2zj"
- },
- "stable": {
- "version": [
- 4,
- 0,
- 3
- ],
- "commit": "fb05d0f72729a4b4452a3b1168a9b7b35a851a53",
- "sha256": "15nmp5dl2a1iyc99wlaywclnqsi2p34vgrp2x62671ccxnvzg8ii"
- }
- },
- {
- "ename": "emacsql-psql",
- "commit": "9875de56d4c4f5e1d6f127a0b2e408e87a9dd932",
- "sha256": "1kgpmjc81y1851cwn3z2hfs4ia3hllh5b7h7iw5kzpb44kpicqpl",
- "fetcher": "github",
- "repo": "magit/emacsql",
- "unstable": {
- "version": [
- 20240825,
- 1837
- ],
- "commit": "b9f19ac5e17a90d5b7314d67e3b790992be7d82d",
- "sha256": "1n11zkjh0x30n1ny0fw44w3k64yydcmyhlnfvycvf879k4j9r2zj"
- },
- "stable": {
- "version": [
- 4,
- 0,
- 3
- ],
- "commit": "fb05d0f72729a4b4452a3b1168a9b7b35a851a53",
- "sha256": "15nmp5dl2a1iyc99wlaywclnqsi2p34vgrp2x62671ccxnvzg8ii"
- }
- },
- {
- "ename": "emacsql-sqlite",
- "commit": "9875de56d4c4f5e1d6f127a0b2e408e87a9dd932",
- "sha256": "1dxc8iyshlg5k4hn3alpg4wwfs138f0i65bdjj9rlwl6qinxq0ab",
- "fetcher": "github",
- "repo": "magit/emacsql",
- "unstable": {
- "version": [
- 20240825,
- 1837
- ],
- "commit": "b9f19ac5e17a90d5b7314d67e3b790992be7d82d",
- "sha256": "1n11zkjh0x30n1ny0fw44w3k64yydcmyhlnfvycvf879k4j9r2zj"
- },
- "stable": {
- "version": [
- 4,
- 0,
- 3
- ],
- "commit": "fb05d0f72729a4b4452a3b1168a9b7b35a851a53",
- "sha256": "15nmp5dl2a1iyc99wlaywclnqsi2p34vgrp2x62671ccxnvzg8ii"
- }
- },
- {
- "ename": "emacsql-sqlite-builtin",
- "commit": "9875de56d4c4f5e1d6f127a0b2e408e87a9dd932",
- "sha256": "0yyabz7ai276lhqyc9w7jac8rky96635p34jy9bssh3nq2l99b9b",
- "fetcher": "github",
- "repo": "magit/emacsql",
- "unstable": {
- "version": [
- 20240825,
- 1837
- ],
- "commit": "b9f19ac5e17a90d5b7314d67e3b790992be7d82d",
- "sha256": "1n11zkjh0x30n1ny0fw44w3k64yydcmyhlnfvycvf879k4j9r2zj"
- },
- "stable": {
- "version": [
- 4,
- 0,
- 3
- ],
- "commit": "fb05d0f72729a4b4452a3b1168a9b7b35a851a53",
- "sha256": "15nmp5dl2a1iyc99wlaywclnqsi2p34vgrp2x62671ccxnvzg8ii"
- }
- },
- {
- "ename": "emacsql-sqlite-module",
- "commit": "9875de56d4c4f5e1d6f127a0b2e408e87a9dd932",
- "sha256": "07flj471cxdbhx4z8qzqghgk0n4y72mnw947ighasg9042564vqs",
- "fetcher": "github",
- "repo": "magit/emacsql",
- "unstable": {
- "version": [
- 20240825,
- 1837
+ 20241201,
+ 1551
],
- "commit": "b9f19ac5e17a90d5b7314d67e3b790992be7d82d",
- "sha256": "1n11zkjh0x30n1ny0fw44w3k64yydcmyhlnfvycvf879k4j9r2zj"
+ "commit": "d6529f010a0573630122b826230e72157ab8fa88",
+ "sha256": "1wp6sx6nwjvn1laxgsm5pciilq59sigk85l1iwlchhi5i94ma29z"
},
"stable": {
"version": [
4,
- 0,
- 3
+ 1,
+ 0
],
- "commit": "fb05d0f72729a4b4452a3b1168a9b7b35a851a53",
- "sha256": "15nmp5dl2a1iyc99wlaywclnqsi2p34vgrp2x62671ccxnvzg8ii"
+ "commit": "d6529f010a0573630122b826230e72157ab8fa88",
+ "sha256": "1wp6sx6nwjvn1laxgsm5pciilq59sigk85l1iwlchhi5i94ma29z"
}
},
{
@@ -32963,29 +32653,29 @@
"url": "https://git.savannah.gnu.org/git/emms.git",
"unstable": {
"version": [
- 20240925,
- 308
+ 20241129,
+ 1513
],
"deps": [
"cl-lib",
"nadvice",
"seq"
],
- "commit": "ccbcc509d09301289e2be279e34304ba06644073",
- "sha256": "16kqxf2k744hh45sv114pym8cmrkxi4v8g7andx59r78nzgxl304"
+ "commit": "c8b56ade72452b3fe1d3eed7b6d2518d592db386",
+ "sha256": "0xwcyq1i4jf51rzp5nam9wk1mmd12n00459z443r5fc390vgzi0p"
},
"stable": {
"version": [
20,
- 1
+ 2
],
"deps": [
"cl-lib",
"nadvice",
"seq"
],
- "commit": "e0331bd7c480b3ac326140bd5b312bfdbc4881c9",
- "sha256": "06vsf3mlj0sxhmcgz70haihsrskr98w2jnhy68h7g3b9rkbxgmhc"
+ "commit": "b7e4a4cdbdb7e55300882d6c9a4f71048ec298d5",
+ "sha256": "1csgnhczw761j9kl1kfb173rla31lyyjq5f48m98h92nb07yc9xc"
}
},
{
@@ -33555,6 +33245,38 @@
"sha256": "1jpiyjb5291jk6pd649d6i8nxaazqjznb3zpksp7ykrqqgw4wgjm"
}
},
+ {
+ "ename": "enhanced-evil-paredit",
+ "commit": "aa5f922022cd20eb8908a67e27a3f8f57f4a4271",
+ "sha256": "1f52wzf9jpff2b8arj91bl4h51y44ncbyh6hrc2vyn8qlq1wcicr",
+ "fetcher": "github",
+ "repo": "jamescherti/enhanced-evil-paredit.el",
+ "unstable": {
+ "version": [
+ 20241201,
+ 2142
+ ],
+ "deps": [
+ "evil",
+ "paredit"
+ ],
+ "commit": "cc5218d3487605d67056a5738a82875363c61eeb",
+ "sha256": "1annrn991yvqjy5nbxjkxr06xjnwa4prijlilklsc2d8a20n5cyr"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 1
+ ],
+ "deps": [
+ "evil",
+ "paredit"
+ ],
+ "commit": "3e43209270bcce1141a13bbffd7b3b372cc3d31c",
+ "sha256": "0m7i10a43acps9fb83clncbif5xndajdimmhxp35r5hh8qq4n9si"
+ }
+ },
{
"ename": "enlight",
"commit": "b7f467a2dcf96f67e641b6bea9262bee469bea3a",
@@ -33708,14 +33430,15 @@
"repo": "purcell/envrc",
"unstable": {
"version": [
- 20240613,
- 907
+ 20241118,
+ 1700
],
"deps": [
- "inheritenv"
+ "inheritenv",
+ "seq"
],
- "commit": "2316e004c1574234fe4d991bd75a254cdeaa83ae",
- "sha256": "1kx5p85p2c682j50cah18njdraj07v9dg8imi7p97bkx7n5malxm"
+ "commit": "9bbe723eb0749b66da0dead9d7eb49aa62a36bb9",
+ "sha256": "06gh4nm80gzz5h1364rrb60qq77n8y48pr75lii275gyxpx2663x"
},
"stable": {
"version": [
@@ -33851,8 +33574,8 @@
"repo": "emacscollective/epkg",
"unstable": {
"version": [
- 20241001,
- 1037
+ 20241123,
+ 2129
],
"deps": [
"closql",
@@ -33860,8 +33583,8 @@
"emacsql",
"llama"
],
- "commit": "f568083014664cc63eb942ee04a925634527793e",
- "sha256": "1kg0jd8067brd4772sd6r0lj7vbf5pxhbj916nd6293a0hc10i58"
+ "commit": "cb104ca2f22686f94bbaba6b96eda0f22c094184",
+ "sha256": "0sym9q4i35cgp02vk3an52j9v9ysj1fnyv0nryi4g78jlxnawhn0"
},
"stable": {
"version": [
@@ -34568,20 +34291,20 @@
"repo": "erlang/otp",
"unstable": {
"version": [
- 20241004,
- 914
+ 20241107,
+ 1409
],
- "commit": "088d904d0abdc68f031fa3e17b1aa67d903bfc7f",
- "sha256": "0j66glb69i0kbcsy2a95jscmv23004x5ql2syf0yw8q2kkpvgxx5"
+ "commit": "7cbfeee1e0d5a7645fa5931ae916eb944520fb17",
+ "sha256": "0v1b2aq5klpwk7jiiyyllcnyv8h2x14ah62q3d87sw6qblm0yq2s"
},
"stable": {
"version": [
27,
1,
- 1
+ 2
],
- "commit": "f4d130fd3512875ee95ce05b30f77e7c7689915f",
- "sha256": "1j4n8zl79hnskpncc0jcgkqjpi15xkmmma77vpmpmzznk43zignb"
+ "commit": "44ffe8811dfcf3d2fe04d530c6e8fac5ca384e02",
+ "sha256": "1j4dihlbrfz95552fmb5dj8341w4qimnk0hv42n6yp1xz8qckcds"
}
},
{
@@ -35630,11 +35353,11 @@
"repo": "emacs-ess/ESS",
"unstable": {
"version": [
- 20240821,
- 1952
+ 20241127,
+ 1620
],
- "commit": "d60c13a6a347ea7a91ea3408bb464cff0ab4fef6",
- "sha256": "1i3g0bm0nih8ww3qp8rq8zr7chiz5bhm5rli4yq6sa02h7imviz5"
+ "commit": "e7b0bbc4ac40e6ea209c345042e280d3af0c6d07",
+ "sha256": "0ikp872gfhibc0q5rd5h5lxvnj7vqb2sqz1lbf26wy1j5bzn9lf7"
},
"stable": {
"version": [
@@ -36227,11 +35950,11 @@
"repo": "crmsnbleyd/evangelion-theme",
"unstable": {
"version": [
- 20240907,
- 723
+ 20241116,
+ 1036
],
- "commit": "59fb3f39611d995c2e322a22e661165b87f4667e",
- "sha256": "0r5c1s0in6al72b3hrhnfiqixsmxabgi31b60m13292hfm4f13ks"
+ "commit": "89577330e93f1c11b3e75d1c8bbae6accc18fc48",
+ "sha256": "107x89654dyvp3zm134kmqcybph1bhnx4zfdyzc6s2c3qyahhdfn"
}
},
{
@@ -36253,6 +35976,36 @@
"sha256": "19s6cid42q0lm2w94a7f6sxvmy3zpjdj5r5dbwcxxp5n3qfs7nip"
}
},
+ {
+ "ename": "evedel",
+ "commit": "5bcbd3b3db68a50d8a67ece2c834d6a91b9ba4b8",
+ "sha256": "00j790q3vvp039vqq8cpdzfcwfyzcv70xmj2dwnpd06iynry3mii",
+ "fetcher": "github",
+ "repo": "daedsidog/evedel",
+ "unstable": {
+ "version": [
+ 20241124,
+ 1710
+ ],
+ "deps": [
+ "gptel"
+ ],
+ "commit": "baba80b7e38935cd9209aa24867f87aa862ee4ab",
+ "sha256": "0alkmfrqqqpxdfj1gkxr0v1hwf8ixa6wgbd7x2pbbkj89srsp61s"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 4,
+ 16
+ ],
+ "deps": [
+ "gptel"
+ ],
+ "commit": "bea64bd0475d1c2a4a84b9533740ae03712d0d6f",
+ "sha256": "0qz1x1zah1zm51pf2qh2vr9c96d2d2w5z4izb9djmaqrw112gara"
+ }
+ },
{
"ename": "evenok",
"commit": "c2568edb7d30ce34acd64ce0a211699ae87a0cb1",
@@ -36261,11 +36014,11 @@
"repo": "mekeor/evenok",
"unstable": {
"version": [
- 20240718,
- 723
+ 20241031,
+ 2134
],
- "commit": "2963a451b12c3287879e3872dcc85c9ac476ac3d",
- "sha256": "0sqgyks726lsy3lqasvkkm10pvm57s8ksj4d6qrvcnn43h7g54yq"
+ "commit": "06a84eea4cf9a845266f8bde68abe25d85bd2b77",
+ "sha256": "0fblw7h0w40ipixa0jiwli7hrc8bw7gva61wzblw9xdb0hscx3rk"
},
"stable": {
"version": [
@@ -36510,15 +36263,15 @@
"repo": "emacs-evil/evil-collection",
"unstable": {
"version": [
- 20241011,
- 2043
+ 20241201,
+ 1942
],
"deps": [
"annalist",
"evil"
],
- "commit": "d9399cb3eb03b54bbf535d5be96a15d4b51c42a4",
- "sha256": "1dk47pdi9nhh8rrg2c3lkj9hjr0mima54fg38yg21r98zi99kg2c"
+ "commit": "ed8c652b1f49e3b01d787bf33ccb2345399572d4",
+ "sha256": "15ivxqdp90snkq40qvsvf86ndd6c58nsqsd87fvdp1y0f7v97clz"
},
"stable": {
"version": [
@@ -36728,14 +36481,14 @@
"repo": "edkolev/evil-expat",
"unstable": {
"version": [
- 20190521,
- 714
+ 20241120,
+ 1350
],
"deps": [
"evil"
],
- "commit": "f4fcd0aa3edc359adb5c986b5dd9188d220d84e2",
- "sha256": "0872ix682hkdz0k8pn6sb54rqkx00rz5fxpd5j2snx406yagpaxz"
+ "commit": "23610598a9f1450f2deafc47726d5b7ce61e8695",
+ "sha256": "09yvysacsaka7pw2jkf0208igi10cclkdr2gk9zx4xc8khkd2213"
}
},
{
@@ -36957,14 +36710,14 @@
"repo": "edkolev/evil-lion",
"unstable": {
"version": [
- 20220317,
- 1030
+ 20241120,
+ 1351
],
"deps": [
"evil"
],
- "commit": "4da660e124731ed65e7aaa6c067c30e876619429",
- "sha256": "0akhw0a9qsk65lvanb57fqh7hf601xdzkbyi560ximfrsr7f94pi"
+ "commit": "5a0bca151466960e090d1803c4c5ded88875f90a",
+ "sha256": "1fmb5rdzc063rhrkm7945xabyzjm1j84nh9spg7caydbndkhhva3"
}
},
{
@@ -37088,11 +36841,11 @@
"repo": "redguardtoo/evil-matchit",
"unstable": {
"version": [
- 20240418,
- 731
+ 20241111,
+ 1201
],
- "commit": "c75b2c6c3123824ff7ae35deef22a3a5d9b619b2",
- "sha256": "050r48nv2w13jj1d4n4y442p4vmwwqnnqb691nvlz48vfymdx6mm"
+ "commit": "19a6cad56bf1080fc526107ff48f2948f2511970",
+ "sha256": "1qri6gnbyblmmvc3lygil6gfinpa9ygprjd38svczj756vrr95js"
},
"stable": {
"version": [
@@ -37112,15 +36865,15 @@
"repo": "gabesoft/evil-mc",
"unstable": {
"version": [
- 20240701,
- 140
+ 20241025,
+ 2045
],
"deps": [
"cl-lib",
"evil"
],
- "commit": "cff3374bfe1b7b1932743425d7fc5d4ab66d747e",
- "sha256": "1kmc9vmryqnzkc1xmdkycrrakcyscg2apixff63hdcr715bljrm9"
+ "commit": "7e363dd6b0a39751e13eb76f2e9b7b13c7054a43",
+ "sha256": "0gzy2mqcdxhkg0hmxqzbjy5ihfal1s21wxd04mrikqri54sck4z5"
},
"stable": {
"version": [
@@ -38073,11 +37826,11 @@
"repo": "meain/evil-textobj-tree-sitter",
"unstable": {
"version": [
- 20240829,
- 247
+ 20241118,
+ 1711
],
- "commit": "b4ef204ff80ed00b03cf8839ee29101ed867dd58",
- "sha256": "0jjvx0p78wqxba22llvayrl9lyd4fqhb2qgbhr99r85m5ksixn73"
+ "commit": "bce236e5d2cc2fa4eae7d284ffd19ad18d46349a",
+ "sha256": "1w8ghsgi41kb08hwfcd4a5wr87aas93iyxp16ivwxj2rb4r4cc3h"
},
"stable": {
"version": [
@@ -38318,38 +38071,6 @@
"sha256": "11y2jrwbsw4fcx77zkhj1cn2hl1zcdqy00bv3mpbcrs03jywssrk"
}
},
- {
- "ename": "evm",
- "commit": "bbcead697f745d197459f90ee05b172e35af2411",
- "sha256": "19l6cs5schbnph0pwhhj66gkxsswd4bmjpy79l9kxzpjf107wc03",
- "fetcher": "github",
- "repo": "rejeep/evm.el",
- "unstable": {
- "version": [
- 20141007,
- 1156
- ],
- "deps": [
- "dash",
- "f"
- ],
- "commit": "d0623b2355436a5fd9f7238b419782080c79196b",
- "sha256": "0739v0m9vj70a55z0canslyqgafzys815i7a0r6bxj2f9iwq6rhb"
- },
- "stable": {
- "version": [
- 0,
- 4,
- 2
- ],
- "deps": [
- "dash",
- "f"
- ],
- "commit": "d0623b2355436a5fd9f7238b419782080c79196b",
- "sha256": "0739v0m9vj70a55z0canslyqgafzys815i7a0r6bxj2f9iwq6rhb"
- }
- },
{
"ename": "evm-mode",
"commit": "6318c712774eff8dab62bcf13f9c70290d5d48ec",
@@ -38620,8 +38341,8 @@
"repo": "anonimitoraf/exercism.el",
"unstable": {
"version": [
- 20240831,
- 715
+ 20241019,
+ 1120
],
"deps": [
"a",
@@ -38633,8 +38354,8 @@
"s",
"transient"
],
- "commit": "44fb97fe6e34925b13bfb1dc027a7a3f55ab145d",
- "sha256": "0v4j84whlnf2rl5b92yg9lh4zdfnbisbpfjrcvs8hx9xg362w2zj"
+ "commit": "62c008b0e845c26f2e855969e9f87b405011a3ec",
+ "sha256": "1d56rwr8nnxfbrx3jws07jy12kl6qmla8ih4z8bbybkm508pkqyd"
}
},
{
@@ -38853,11 +38574,11 @@
"url": "https://repo.or.cz/external-dict.el.git",
"unstable": {
"version": [
- 20240817,
- 149
+ 20241101,
+ 1326
],
- "commit": "0399b1c086417030f914bd26fff636dfdd55833a",
- "sha256": "032ydp8vcl576hamq16wwmk6fl2j13yp6bimsscxjjz0lwiwsr39"
+ "commit": "3515a8d3485cede35e8cfcf791a83ce30d0f728e",
+ "sha256": "1286isnlxj5lgx7yw4m1a4k9crgc0a8in60hkcizizh3amy4jspw"
}
},
{
@@ -39809,14 +39530,14 @@
"repo": "martianh/fedi.el",
"unstable": {
"version": [
- 20241010,
- 725
+ 20241020,
+ 1139
],
"deps": [
"markdown-mode"
],
- "commit": "9d4f0d501e4b65210e233554ff90941adff2ebac",
- "sha256": "0z9zhw9hijh68zfq5jdbgxijlk2vwbfzy673dvd6ngc1my4kdkvv"
+ "commit": "0b59528b738229421faf4c0b32033150902e5af4",
+ "sha256": "0sl1yq9c9yvb8vrmg4a4dd4x93ajpr3c8mbkiv4yxd4nrxy6myfp"
},
"stable": {
"version": [
@@ -39906,11 +39627,11 @@
"repo": "technomancy/fennel-mode",
"unstable": {
"version": [
- 20240721,
- 1732
+ 20241110,
+ 2157
],
- "commit": "f4bd34e1c3b14313c20af94dd34430b40c0ef35f",
- "sha256": "1wfk3blx89afdllr47xgqz2ikfl8ya3lblrfwdydwcnbhv2jvq7w"
+ "commit": "259470b29748fdfec3d3a4f9603f3f42ddd9cc50",
+ "sha256": "0wb5hqzll4b4s2505cwnvldaxi8cp7dnhlfs2n8mq2kv5na5a7wf"
},
"stable": {
"version": [
@@ -40446,8 +40167,8 @@
"repo": "LaurenceWarne/finito.el",
"unstable": {
"version": [
- 20240818,
- 1003
+ 20241109,
+ 1535
],
"deps": [
"async",
@@ -40458,8 +40179,8 @@
"s",
"transient"
],
- "commit": "9ad22dbf34574c5d6070724eba0d22350b347e6b",
- "sha256": "1vigknjchsz60pg9qgx95h3xkng5yhrn118rdldsyv03725ld7h8"
+ "commit": "d5b48c426e4f236127ff256a16be0299c743271f",
+ "sha256": "1bggi8jj5dqhmd71ld4cqr81w8v5f1q1y07chjp96bwrpchbngkf"
},
"stable": {
"version": [
@@ -41042,27 +40763,27 @@
"repo": "plandes/flex-compile",
"unstable": {
"version": [
- 20240930,
- 2208
+ 20241018,
+ 2140
],
"deps": [
"buffer-manage",
"dash"
],
- "commit": "a31aa3b8c2844829b8a2ddd0f56ad31ecfb2eb70",
- "sha256": "0w3c7w108rgcqk0911m5s4n8l2jihzqai2bfw04y9mddxz6cc6zg"
+ "commit": "713c07b6be627fc05417d477ec6d1526ab1797fe",
+ "sha256": "01afnw8hw6k4h2xs23k41aaf3v4aqw4pzias7sy9s82bczx70ya6"
},
"stable": {
"version": [
1,
- 4
+ 5
],
"deps": [
"buffer-manage",
"dash"
],
- "commit": "58890e08800059550565a20dc7029e8bcccc55de",
- "sha256": "1q5604da9b9gmg1ci5931fzwrqzkc5n5f02mcfvdk7vfhsakdlaj"
+ "commit": "713c07b6be627fc05417d477ec6d1526ab1797fe",
+ "sha256": "01afnw8hw6k4h2xs23k41aaf3v4aqw4pzias7sy9s82bczx70ya6"
}
},
{
@@ -41097,21 +40818,21 @@
},
{
"ename": "flim",
- "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683",
- "sha256": "0s1xjvizn3jwn9h5iq83vdmw6lgmpfk7dhvlj2ayb59q7bmf4xla",
+ "commit": "5e4ccfc8ab211349b577a06dea355ea59b3eb888",
+ "sha256": "05dm9wvchjmf32j6p4ghw32sf4q5v9icr2zf1d1kddv2b9znnywr",
"fetcher": "github",
- "repo": "wanderlust/flim",
+ "repo": "emacsmirror/flim",
"unstable": {
"version": [
- 20240221,
- 1353
+ 20241125,
+ 2201
],
"deps": [
"apel",
"oauth2"
],
- "commit": "23bb29d70a13cada2eaab425ef80071564586a6d",
- "sha256": "14ihl59sj829hycbw182byk4npmrsmhcgl98j5v7i81vmxdfrcm9"
+ "commit": "4ee02945854e4dc94327aad5da2e43d85a777420",
+ "sha256": "04crqqgxwbfkfj1f3rpmbq00w6bakpg1fdv99q2l7dwjksbn35ca"
}
},
{
@@ -41404,11 +41125,11 @@
"repo": "flycheck/flycheck",
"unstable": {
"version": [
- 20240726,
- 456
+ 20241130,
+ 1502
],
- "commit": "7a6398ea3538a898eba0276f0f89b2f878325a89",
- "sha256": "12y29m1gp0gdq8lfc2cd80869xsyasgsp4n2ck8rn4h164bnnn4q"
+ "commit": "ebaf48359b3e21879c8f6f3c1b5d0221b345035e",
+ "sha256": "1spbkhsdf7crns2wr4ghs1pdfwz2ff001pbbzmcc39v5d71pb5ri"
},
"stable": {
"version": [
@@ -42614,8 +42335,8 @@
"repo": "flycheck/flycheck-haskell",
"unstable": {
"version": [
- 20230706,
- 1439
+ 20241119,
+ 1046
],
"deps": [
"dash",
@@ -42624,8 +42345,8 @@
"let-alist",
"seq"
],
- "commit": "b7c4861aa754220b7d0cfc05aa0895bb35665683",
- "sha256": "0fmmzwnrrki8bw6nsspcsgzkcxmsrgfkm2200nqgk27fqppjgpgw"
+ "commit": "0977232112d02b9515e272ab85fe0eb9e07bbc50",
+ "sha256": "0sxqxskflnhx1n83knm817j5l4svx9szkfy5yzsfwm7gnn7piixs"
},
"stable": {
"version": [
@@ -42700,14 +42421,14 @@
"repo": "DamienCassou/flycheck-hledger",
"unstable": {
"version": [
- 20240423,
- 1307
+ 20241029,
+ 1710
],
"deps": [
"flycheck"
],
- "commit": "77369d78c8a00cd55a3ff8b12dc99db136748a4e",
- "sha256": "0kzfil5nyk9y1nmvz3hn5vgaycid2r34p9vx4m1j02r3y5z0amhm"
+ "commit": "66e12fce7d4875327bce06b2fc33043924c710ed",
+ "sha256": "1r3g9v5035nyp0gb7g4qjspag9cn5nf0xz1c12q3hinn21c69yna"
},
"stable": {
"version": [
@@ -42997,26 +42718,26 @@
"repo": "emacs-languagetool/flycheck-languagetool",
"unstable": {
"version": [
- 20240101,
- 851
+ 20241018,
+ 1225
],
"deps": [
"flycheck"
],
- "commit": "e80a23bcdc91df09f6013b553d60a813481086ff",
- "sha256": "1gvhmaq9ka28hvm8gv2rd8v3sk0a9w9rd1zsz2xkv1hhw5ch4hf1"
+ "commit": "03d023c78cca177901afe7223ee57a8e396dcf49",
+ "sha256": "0s11sn0qbq3g6dwrr9r476c59zmp5fya89pf71pl02jijd4a3gr4"
},
"stable": {
"version": [
0,
4,
- 0
+ 1
],
"deps": [
"flycheck"
],
- "commit": "8f488c0d765c3d42e84612561530c5ba925e8c9b",
- "sha256": "0zynqp7r1k3ycgrk93mkwg3ycl14gny1sspgaxb1z3gsc54ya7sv"
+ "commit": "03d023c78cca177901afe7223ee57a8e396dcf49",
+ "sha256": "0s11sn0qbq3g6dwrr9r476c59zmp5fya89pf71pl02jijd4a3gr4"
}
},
{
@@ -43374,15 +43095,15 @@
"repo": "emacs-php/phpstan.el",
"unstable": {
"version": [
- 20240527,
- 2142
+ 20241107,
+ 408
],
"deps": [
"flycheck",
"phpstan"
],
- "commit": "6f1c7bb357b1eb90b10a081f1831c1c548c40456",
- "sha256": "1hnnhbma3mgbralp1f5c1gvm9pfswzf5xzi2nr22rs5d9r0zk2fj"
+ "commit": "b616f5fa5f8aff9aa220c7fe63b39df6d10588a5",
+ "sha256": "0xjr6vi158qm6rnrfvpcmh2grrlvixdd44kik333250298vc3nx3"
},
"stable": {
"version": [
@@ -44243,20 +43964,20 @@
"repo": "jamescherti/flymake-ansible-lint.el",
"unstable": {
"version": [
- 20240922,
- 1632
+ 20241026,
+ 2053
],
- "commit": "77a4488e7d13b556db81c6b3edb40e3bca999dfa",
- "sha256": "1wqaazggarv39ms51228xxqdycfr11880bpxg5sjh21rap95zm4p"
+ "commit": "0503a9b7ace1d0909ba5d20f9474451621c2011a",
+ "sha256": "0bfv9mpxdd767gxjgyw56h8z18gbhrjl6rqv57wc30vbc3p5frpv"
},
"stable": {
"version": [
1,
0,
- 0
+ 1
],
- "commit": "77a4488e7d13b556db81c6b3edb40e3bca999dfa",
- "sha256": "1wqaazggarv39ms51228xxqdycfr11880bpxg5sjh21rap95zm4p"
+ "commit": "0503a9b7ace1d0909ba5d20f9474451621c2011a",
+ "sha256": "0bfv9mpxdd767gxjgyw56h8z18gbhrjl6rqv57wc30vbc3p5frpv"
}
},
{
@@ -44371,15 +44092,15 @@
"repo": "mohkale/flymake-collection",
"unstable": {
"version": [
- 20240903,
- 1828
+ 20241117,
+ 1157
],
"deps": [
"flymake",
"let-alist"
],
- "commit": "ecc15c74630fa75e7792aa23cec79ea4afc28cc2",
- "sha256": "1fqqjl9nd6gam790m7d3pzq162w2q7lwvk38cmh0nq9v318h8vqv"
+ "commit": "1b62fd9b5844b231cb48b4919064420d64a123ff",
+ "sha256": "0rqviv2m50f2z4kigylfpyprldi5y0hsc69ni1cc84jnwwn8x915"
},
"stable": {
"version": [
@@ -45154,9 +44875,9 @@
},
{
"ename": "flymake-markdownlint",
- "commit": "0cdb9c33a827d870da79a63d3c0b923fb5b02073",
- "sha256": "1myfk8pk02svr6506ccgs4qhcgq89jhyf91hpwvf1jfc1icr1ph6",
- "fetcher": "github",
+ "commit": "601cff5eb7caa70232a63d497dcbfb9578fd136c",
+ "sha256": "019mrnaa81fcgpqbxpys48fphvhrcif6jcwknpbdg8354hncs6ls",
+ "fetcher": "codeberg",
"repo": "shaohme/flymake-markdownlint",
"unstable": {
"version": [
@@ -45515,14 +45236,14 @@
"repo": "erickgnavar/flymake-ruff",
"unstable": {
"version": [
- 20240721,
- 2006
+ 20241016,
+ 1600
],
"deps": [
"project"
],
- "commit": "6405c8a8eb48f371581a05c34ac1110a3d585dd7",
- "sha256": "0lqjqp8v6ykvpm137cj2fmdw9y3vf2h0rxv5hhls88r72qh0wsdc"
+ "commit": "17a8345f95761090d86e7c97d14f58fad77c0e29",
+ "sha256": "07lqqvpnaffc77aczg5d7p9agwhlqllj9pqiyf514bvrr4nn2jhr"
}
},
{
@@ -45708,9 +45429,9 @@
},
{
"ename": "flymake-yamllint",
- "commit": "b8420c724747b635fb7cc208561e03ebca463c90",
- "sha256": "1mkmwdv53hz4xzmb6kl74wll74zfs8wm4v5bjnp1caf8c6flvzja",
- "fetcher": "github",
+ "commit": "601cff5eb7caa70232a63d497dcbfb9578fd136c",
+ "sha256": "0r4xndn5q973rgjdk0dq8w0lngnw31kg0vabcs1amn538gba62hb",
+ "fetcher": "codeberg",
"repo": "shaohme/flymake-yamllint",
"unstable": {
"version": [
@@ -45724,10 +45445,10 @@
"version": [
0,
1,
- 5
+ 4
],
- "commit": "0134f9f864749f30f8ea3c6a86865b35d4352cea",
- "sha256": "00ys5k6xx3wcccj37n326749ypifc43dafjp28kmqgf218lrfng4"
+ "commit": "f269e6614993f3c56d545e7d7b225ca2ba1da342",
+ "sha256": "0pw2c22nvy4fkcqbhkrj94q66sx7ggcan26wvy9z6wp04qzaiva8"
}
},
{
@@ -46046,14 +45767,14 @@
"repo": "larstvei/Focus",
"unstable": {
"version": [
- 20240528,
- 901
+ 20241029,
+ 1506
],
"deps": [
"cl-lib"
],
- "commit": "17c471544f540f2cf9a05fd6cd87e52e5de317e2",
- "sha256": "0aqcnvnla4rmpc9iy679jaw1vqqg16j2fw7m9iis7j3w0wcw5c77"
+ "commit": "29b412b209c3542a7932c201f0166e48c9fd7fee",
+ "sha256": "01h1wxmrf954azwj1kgr8yxlzrg5bri0wpd6mhjr5yr8nddcd2ix"
},
"stable": {
"version": [
@@ -46361,10 +46082,10 @@
},
{
"ename": "forecast",
- "commit": "a7ea18a56370348715dec91f75adc162c800dd10",
- "sha256": "0zng8xdficpfccq484pghzg8yylihcy8aq0vpxd1w6l40m2qf6zn",
- "fetcher": "github",
- "repo": "cadadr/elisp",
+ "commit": "04fdd633207a28b91f0a6e64aa25d114ab229a13",
+ "sha256": "0k8g6xwqgaw2ngwcyjyx7gdiizlcswbr3rnrx3xw50qrcbn8xmbq",
+ "fetcher": "codeberg",
+ "repo": "kutuptiyini/elisp",
"unstable": {
"version": [
20191004,
@@ -46448,8 +46169,8 @@
"repo": "magit/forge",
"unstable": {
"version": [
- 20241014,
- 1340
+ 20241201,
+ 700
],
"deps": [
"closql",
@@ -46464,8 +46185,8 @@
"transient",
"yaml"
],
- "commit": "c819271dd056d9608e6dd7e788bb3007f0a44517",
- "sha256": "01gvx5imldgx3mmj1glgrspvxwnp8x068d1x6k8c928ad535z60x"
+ "commit": "8f9e94949f4490273c4991b45f1ef02b9503dfcd",
+ "sha256": "02d5wxv0hnpjf83az96jz8hbldfp48za80ql0xc3ccah6s0hp7mn"
},
"stable": {
"version": [
@@ -46537,15 +46258,15 @@
"repo": "lassik/emacs-format-all-the-code",
"unstable": {
"version": [
- 20241001,
- 839
+ 20241126,
+ 829
],
"deps": [
"inheritenv",
"language-id"
],
- "commit": "9ae47456dad2925e4d41f58bd2c864b87f82aa8b",
- "sha256": "17ighxn3nk6i6k03hdri572z5d1dv7jbvcbhyib3p48clvqki0qb"
+ "commit": "fd9c013f5f8094fef99ddabde07d9041737b8454",
+ "sha256": "17cdnncilrqwa4x72vzbcpgx24d8zi9ng3fdpv89ffwbx5s4ny0r"
},
"stable": {
"version": [
@@ -46685,14 +46406,14 @@
"repo": "rnkn/fountain-mode",
"unstable": {
"version": [
- 20240914,
- 535
+ 20241106,
+ 219
],
"deps": [
"seq"
],
- "commit": "c809fe6f44ef765cae2a33124705b41febb80f6e",
- "sha256": "0qxzs5ph0ajq9fnf5ac0q8nx56kmx1dalv1pi1fgnby73k44fl10"
+ "commit": "74ddc5a783e8204beeda3343ea6725a3c198f4bc",
+ "sha256": "1rbhcnn6cdxdhalhy3nw9s4m6adrqz1c6v0aljd0wq9bs56b1w89"
},
"stable": {
"version": [
@@ -46838,15 +46559,15 @@
"repo": "davidshepherd7/frames-only-mode",
"unstable": {
"version": [
- 20240716,
- 706
+ 20241201,
+ 1533
],
"deps": [
"dash",
"s"
],
- "commit": "057462df122e588dceef472023343dee3315ceea",
- "sha256": "00cirlblx28q5b6691l93v9ay8ry1gl4v2sxzn1r61d9ni8ig7c5"
+ "commit": "9c82e779d89ead844ebd0e1a008af413e4cfc185",
+ "sha256": "0brbrhd6anz3lcigic695011s2yqmyni4n06ap3bkls8y49iis9i"
},
"stable": {
"version": [
@@ -47533,25 +47254,26 @@
"repo": "jojojames/fussy",
"unstable": {
"version": [
- 20240607,
- 2153
+ 20241202,
+ 6
],
"deps": [
+ "compat",
"flx"
],
- "commit": "21f4ac6b971f61890d46308d7ac5db64c20228e6",
- "sha256": "0skjr9pqjbr4am3cdq78frf5bckpv5761j0ppp0pg6pfbrcdbaa3"
+ "commit": "5c8165619f4c94f7f620df69ab67d7d5bcd15501",
+ "sha256": "1vcqf3pjmhqfsppjvdx0lzqxzr1kia5b21ypdhqxx3b8splg86si"
},
"stable": {
"version": [
- 1,
- 6
+ 2,
+ 0
],
"deps": [
"flx"
],
- "commit": "27baf4c5bd7c38876f8c408628e4a8d966849cd1",
- "sha256": "1ysi6mbcsjm4z2s66ads0g41gp2gyhqnajiw5bpl258y7pcj4ml2"
+ "commit": "cd2c93b9b5fd0fe6c61fcc6e1d62b4c1cbb142aa",
+ "sha256": "11i6228xbw4g8ks2z073lzdrsmyilppr1dbcg91r9y267ppl1ijw"
}
},
{
@@ -47562,15 +47284,15 @@
"repo": "diku-dk/futhark-mode",
"unstable": {
"version": [
- 20241003,
- 1821
+ 20241120,
+ 854
],
"deps": [
"cl-lib",
"reformatter"
],
- "commit": "54246aa75867d72648effd9cbb8d8b41a4d448e4",
- "sha256": "0pkvg0l2a27kz8xwc8lx9lv16ivjda5d94xw017km6whrh94q925"
+ "commit": "a9cb4ee550d1ae14a7274d4e0c9bb6a2dff17c5a",
+ "sha256": "0kl8xcg5lp26cx5r8ikprzw2py7d0s4gibfkn525fnx94fdqcswr"
}
},
{
@@ -47807,11 +47529,11 @@
"repo": "ShiroTakeda/gams-mode",
"unstable": {
"version": [
- 20240709,
- 410
+ 20241024,
+ 448
],
- "commit": "6fb90d9c83747ac020743cd7a8c2efda0c5936eb",
- "sha256": "09ldm491m1zf47x6gwdylilc5slcwzsbl498axlpzy723ysf916y"
+ "commit": "0bbce5fd884960f7d797dbae4d2b27b0c6dc2241",
+ "sha256": "09xh3ymx7agh4vg46dkmyzhkh2ck9a464gg57r3vf4qn343jbv73"
},
"stable": {
"version": [
@@ -47929,11 +47651,11 @@
"repo": "godotengine/emacs-gdscript-mode",
"unstable": {
"version": [
- 20240509,
- 1523
+ 20241104,
+ 821
],
- "commit": "32086df83335ce0e5120b21b80cf7996edb2232e",
- "sha256": "1w4bkqg17abxzpcb4w5askspps6zcq503544qnj1j97fmc2zmvha"
+ "commit": "bee7f99c6f780497ec112bf01196181fc83511c8",
+ "sha256": "0808lgdca1vpsj1rwyvqcxrqiq60z9ww5yjsrg7fg28c9vba44b2"
},
"stable": {
"version": [
@@ -48415,11 +48137,11 @@
"repo": "arjca/gemtext-mode.el",
"unstable": {
"version": [
- 20231029,
- 2010
+ 20241129,
+ 820
],
- "commit": "431b3b1d7c4310ef09ba16adbc870bc0af2c0e9b",
- "sha256": "1zizjq3cx5y7mdgapm2kzc4bs13fcg55nay996350ha986isa834"
+ "commit": "9e6a7373759afbb8b05e322a3c7b52fc9255c16c",
+ "sha256": "0balbk2rj33v6m2gicrgsfkg2iflk5jq38wn4hgrz9disvrybwa7"
}
},
{
@@ -48585,16 +48307,16 @@
"repo": "twmr/gerrit.el",
"unstable": {
"version": [
- 20240306,
- 1947
+ 20241014,
+ 1940
],
"deps": [
"dash",
"magit",
"s"
],
- "commit": "8a98747155712d751239e5699e3a6fd090848b33",
- "sha256": "1l02fm864j7ml8anm9ykf9yd5x8r12zrn2p4psadxpzkqa5r5zg0"
+ "commit": "58e5bbe1485cb15c02b74c327fac6a533e8663da",
+ "sha256": "1v2akprnfmc89iq68aprydgb28lrj497jm8bgmkf8cwljf4x1kh5"
}
},
{
@@ -48893,16 +48615,16 @@
"repo": "magit/ghub",
"unstable": {
"version": [
- 20241001,
- 1025
+ 20241123,
+ 2135
],
"deps": [
"compat",
"let-alist",
"treepy"
],
- "commit": "23d1cd6b089db6619d02d66957c6a274311abd60",
- "sha256": "1p5lx781z603q943p73p6q9k6qz75ldjwrr9z3h6zvi80gxd7afy"
+ "commit": "4f39b86544ab064204efd0dda381af90fae70f43",
+ "sha256": "1dxcm82q23djj51ic7j2702jyaygwganrsrcd3fpvg2nw3r5gz7i"
},
"stable": {
"version": [
@@ -49252,15 +48974,15 @@
"repo": "liuyinz/git-cliff.el",
"unstable": {
"version": [
- 20240915,
- 1127
+ 20241029,
+ 358
],
"deps": [
"dash",
"transient"
],
- "commit": "ca71436f8cdbdd37d07f91c94231234d3fc9c8b4",
- "sha256": "09zla0cblyg4am6d5g4h6s8l24f6z94k8zp34x1yy5ygxkw2xf7r"
+ "commit": "7b73709928770959ef731192726ade76f85da877",
+ "sha256": "0225n41dcqm53c4nl0m9a17zg63gnqf90cfhp777vjdfry0mxsfl"
},
"stable": {
"version": [
@@ -49327,10 +49049,10 @@
"version": [
4,
1,
- 1
+ 2
],
- "commit": "93e86ceca7bf5b0ff9023d7f138e5f06990fc276",
- "sha256": "1ckjq068728wwfm4fv0z4rrdmrj09zvarip2s5rqdr8ny722dxfn"
+ "commit": "4992c3d1f64e0e983692c7a61d47069f47380dbf",
+ "sha256": "16ix3wsihqpzpx3709fx3wm2087q2miaxwfsh62xnq0nx5z9fl72"
}
},
{
@@ -49649,11 +49371,11 @@
"repo": "sshaw/git-link",
"unstable": {
"version": [
- 20240923,
- 2245
+ 20241022,
+ 2208
],
- "commit": "2107af13e15fab4e42f52844af080e4485ea5470",
- "sha256": "0ybfwg7d4dqzilw4ka5i1zggzq4zhnpdpa2a7mn3mq3l8rdzkr0p"
+ "commit": "8df5f1f0a70c0668bafb1b70421b651df3bde999",
+ "sha256": "0fy0v3w7w23ch9z9bkjg7ssplgb5v8vng73c1xd2csja8kfkcirv"
},
"stable": {
"version": [
@@ -49790,14 +49512,14 @@
"repo": "pidu/git-timemachine",
"unstable": {
"version": [
- 20240427,
- 924
+ 20241125,
+ 750
],
"deps": [
"transient"
],
- "commit": "3780835fcd67c3703ffa768206121851e6895ece",
- "sha256": "1r2cjz0x30myy9hzbv5iwmq0j9n490rnv6pxfvb00g2kcbvknyna"
+ "commit": "62ebb0c6588d848b1b7b90bf1a3aa4c04e873822",
+ "sha256": "0bc742ifxwc70l5xbddybyz9ck7il4kx4y6abdv2dvg7bjqnangz"
},
"stable": {
"version": [
@@ -50340,14 +50062,14 @@
"repo": "TxGVNN/gitlab-pipeline",
"unstable": {
"version": [
- 20241008,
- 316
+ 20241101,
+ 356
],
"deps": [
"ghub"
],
- "commit": "3f60765ecb1d02f08f2cb5cde45216748a738140",
- "sha256": "1vggqy28ggqpcl0bkm59y0rflb1wsbbvnkb8g65qy8akvif6mm5l"
+ "commit": "9f6e7a1523b6ac63214a9d71b269360ebd0fa30e",
+ "sha256": "00r9k7gb3k7hl9lnwikljgcgw2hi9kdpsl211p27h0asrlglgyaf"
},
"stable": {
"version": [
@@ -50616,11 +50338,11 @@
"repo": "jimhourihan/glsl-mode",
"unstable": {
"version": [
- 20210808,
- 1945
+ 20241021,
+ 919
],
- "commit": "9b2e5f28e489a1f73c4aed734105618ac0dc0c43",
- "sha256": "101y46bdxxgp58li66pwqn6c3skww72gkfmhxpps2v2ijxcvqkl9"
+ "commit": "c5f2c2e7edf8a647eda74abe2cdf73fa6f62ebd2",
+ "sha256": "1ilx7zgkbnsxlq3np6yli7d6r09hww455kl9lsydpr448mqqifkm"
}
},
{
@@ -50826,30 +50548,30 @@
"url": "https://git.thanosapollo.org/gnosis",
"unstable": {
"version": [
- 20241009,
- 1607
+ 20241115,
+ 1041
],
"deps": [
"compat",
"emacsql",
"transient"
],
- "commit": "505ce5cff58923acec6e83351042f2b1d150f65c",
- "sha256": "15x7ny693ch8bsdjlf3mg2apvkyf9r49d7kv9qz3zdg574cnh0pf"
+ "commit": "eefd0abb3cb7ca8a09c249686ff67555724624da",
+ "sha256": "1g6a5vr5cqnjf15idzqnh6p377dia3bz8x260kiyf157n3h11ms8"
},
"stable": {
"version": [
0,
4,
- 4
+ 8
],
"deps": [
"compat",
"emacsql",
"transient"
],
- "commit": "4f437a3b23090d2591eb36a26c146ff3595a6256",
- "sha256": "1fmfhmsfkw3rhbgrwj59p0z8jfjyplprfb7rzdg19qwv4km680iq"
+ "commit": "b30a06fc16c18b6de7d5a21facf2b5fd8d90b613",
+ "sha256": "1y9f5ms7aivwjfc951m68jfmwncfq5f4h876xvivxhfph4xnc76y"
}
},
{
@@ -52384,8 +52106,8 @@
"stable": {
"version": [
0,
- 44,
- 1
+ 46,
+ 2
],
"deps": [
"dash",
@@ -52393,8 +52115,8 @@
"magit-popup",
"s"
],
- "commit": "8234db495a8d1a3362d328e30c8ea084ff5bf698",
- "sha256": "12a6x2cgq9p0j1s1wyf6lyqnmc396v0y6rxilkab0snkzbrqqmff"
+ "commit": "c3916ff7728451023ce84c2eaf726b1d23e623b6",
+ "sha256": "1jr9zwknxbz7f4vlnfjzzslzxy05m24x857rsh4aj9mnwawdppc3"
}
},
{
@@ -52444,11 +52166,11 @@
"repo": "brownts/gpr-ts-mode",
"unstable": {
"version": [
- 20240404,
- 1258
+ 20241127,
+ 2221
],
- "commit": "a92ab100759cddb51d042adf109f1831a57dbff8",
- "sha256": "0ijyn9x6i47h9rxnfj51mhkd8qh5mippnnbbh8h388wsbgkj470s"
+ "commit": "2f23e4ca2225c614314b4d66ab5312dd9cfdd419",
+ "sha256": "01hdip8ivldz00r3ci96zz5m2i2jc18272bx4riy7gn08sw5cdxs"
}
},
{
@@ -52477,11 +52199,11 @@
"repo": "stuhlmueller/gpt.el",
"unstable": {
"version": [
- 20240721,
- 1747
+ 20241020,
+ 1841
],
- "commit": "06afbecccac8bf0d7a47b4c1b768a74ed66c5e84",
- "sha256": "0jnaafsnridafqwndgjkp980pnz0lm4nrw2fqnhx15pzqz1w2v34"
+ "commit": "3f3d0c4c1f2d5460ed3296a63c7938c5040aaa8e",
+ "sha256": "1prb83vwr16jya920lbbd6pfk9xbdm6fh81s30j3jqyin3vpjkhq"
}
},
{
@@ -52548,28 +52270,28 @@
"repo": "karthink/gptel",
"unstable": {
"version": [
- 20241013,
- 1957
+ 20241130,
+ 1959
],
"deps": [
"compat",
"transient"
],
- "commit": "25c39a03771a8b2f71d7026fe06f0f5f21e29a9c",
- "sha256": "1s23cn069j40abv6kl2qgl09zwjp72d43izkisg6zqjvzcdgqvwx"
+ "commit": "7934106b74ce60fd5782e840c7efc4f0bbdbc646",
+ "sha256": "1rmfaymci96pf0qmy12cpgsyly04jzy93apa7bdjjnj017pshsyx"
},
"stable": {
"version": [
0,
9,
- 5
+ 6
],
"deps": [
"compat",
"transient"
],
- "commit": "37ca1069326aefc54bdb1722fcac1e81f90b2ff3",
- "sha256": "1ihcdxpwqawvrb1l8l8lnj20gn8m5z47q2fmpvzwdqbjd0nl2xnp"
+ "commit": "f24e5ad4740ce5f9829b14e499c9181f9bd7c76e",
+ "sha256": "0cb5wxlc598fs1cmjvkbc76x098ljmik3s39hjfjzn6537yps4da"
}
},
{
@@ -53043,15 +52765,15 @@
"repo": "michelangelo-rodriguez/greader",
"unstable": {
"version": [
- 20240921,
- 1919
+ 20241025,
+ 1237
],
"deps": [
"compat",
"seq"
],
- "commit": "e163aec6109ba24ec543f087d9be7bf6b6efa389",
- "sha256": "054jlv1vrb7wbhr0w97xirjwp42mx0k07j7f0383jxsjn08qik5g"
+ "commit": "0977a4aea839a6f3907d5475baf4012151a4e556",
+ "sha256": "1jhscp9q5b9qdg9b6k5vypgmnj7hgflx6a68v7b5pg0qj2rxxk8p"
}
},
{
@@ -53200,10 +52922,10 @@
"repo": "seagle0128/grip-mode",
"unstable": {
"version": [
- 20240820,
- 825
+ 20241111,
+ 936
],
- "commit": "9adac9c98902e42d73a64788b69f2c07e21f7851",
+ "commit": "d6c7e33e40d10b529b059ea1d237161dc3e88428",
"sha256": "0918ycvbfv5ckmgvjn413v39bz7948f03sjqw6wzcha88hgdizv6"
},
"stable": {
@@ -53932,11 +53654,11 @@
"repo": "idlip/haki",
"unstable": {
"version": [
- 20241007,
- 1441
+ 20241118,
+ 1802
],
- "commit": "9d5771e23140b02101b8d6c410b56143df3d7756",
- "sha256": "1v2zx6mkdkpc42snqrrdh64h782kdlzarc49790m4gb7lp5a9s47"
+ "commit": "3b13b5dd594d6cc5798117f216b266d86f1ffa16",
+ "sha256": "19wk54k2z0s073yk84f1wq76a28srqd9wsh1qhs8sr26vjldg24y"
}
},
{
@@ -54422,11 +54144,11 @@
"repo": "haskell/haskell-mode",
"unstable": {
"version": [
- 20240911,
- 1020
+ 20241111,
+ 1514
],
- "commit": "cf387f92b160ee87ce3e247542558d1b6ed84b3c",
- "sha256": "0671fxy312cx1sqgpjy6p63q0l5n3ia829xg1d6l08i4cwxjbkz6"
+ "commit": "1a285fc4c50ca74bb5cd9b2a8c1a46a64a77384a",
+ "sha256": "13z6bvhg8lflk0y42x5pjdfkxyy8nvd2xxx6jbfydwq4a87n3gbi"
},
"stable": {
"version": [
@@ -54764,15 +54486,15 @@
"repo": "emacs-helm/helm",
"unstable": {
"version": [
- 20240929,
- 416
+ 20241130,
+ 526
],
"deps": [
"helm-core",
"wfnames"
],
- "commit": "c0fd64b5491576853ecad9337996b38743effeee",
- "sha256": "102s2gzcnrv73xa7xsj3i5caja1w6zmcazg6vv0k9ww0c6hjqihl"
+ "commit": "3ca35edd5a5e8f1bee1b03facbbf44df8c729e3f",
+ "sha256": "00xfzw7nvas0x68s9q4s3k737jgrganqyizvr10pybqjyhzlllzm"
},
"stable": {
"version": [
@@ -54864,14 +54586,14 @@
"repo": "emacsorphanage/helm-ag",
"unstable": {
"version": [
- 20240925,
- 744
+ 20241028,
+ 144
],
"deps": [
"helm"
],
- "commit": "c9d514c5c0a7283f730d237f7ae69b96736c7c9e",
- "sha256": "0cf3r6bqmbgkp6a9g5nbmzv1m3l0hka1599kri23fi3s2k88c70h"
+ "commit": "01d36d6eb689305ea3aae0a23aa8be0029f0410f",
+ "sha256": "1fipr4vaafsvkkypj3qlyigq2dqiy1jgkm99djzv0378g7mk25k8"
},
"stable": {
"version": [
@@ -55653,14 +55375,14 @@
"repo": "emacs-helm/helm",
"unstable": {
"version": [
- 20240929,
- 353
+ 20241201,
+ 648
],
"deps": [
"async"
],
- "commit": "77c1663455c77f2e3a407414db37e06ea1d4cf33",
- "sha256": "1lhid932hnwwnj2ahrzms6iz92sp2idg748v1z770pqh55in040q"
+ "commit": "05c2a8262fb47762bbd7112b8149578b02d4e44e",
+ "sha256": "06x4xlbq63h4mjr3hcbp9kdaz0xhzlph2z5knhmglny6riqqilyz"
},
"stable": {
"version": [
@@ -57111,26 +56833,6 @@
"sha256": "0pri9zsjg0zii7dpsr56dy5204q0mld5wi22iay3kqpiyxghhssv"
}
},
- {
- "ename": "helm-lean",
- "commit": "0bad7f91094d96d387bf0b121d6223afdc0f236c",
- "sha256": "0aszjrv08n8lzpzsj694kldnmmx9b9qh9xmwnb6d7qxygzmbw1dj",
- "fetcher": "github",
- "repo": "leanprover/lean3-mode",
- "unstable": {
- "version": [
- 20210305,
- 1705
- ],
- "deps": [
- "dash",
- "helm",
- "lean-mode"
- ],
- "commit": "5c50338ac149ca5225fc737be291db1f63c45f1d",
- "sha256": "13vrg0pp7ca0lh4j9cyg4pgfnbvf2kvbrgvvcmn1h7l9py2n8alj"
- }
- },
{
"ename": "helm-lib-babel",
"commit": "d6718da5d8849a8c3ec17188b89a1273cf963047",
@@ -57287,29 +56989,29 @@
"repo": "emacs-lsp/helm-lsp",
"unstable": {
"version": [
- 20210419,
- 2014
+ 20241118,
+ 1931
],
"deps": [
"dash",
"helm",
"lsp-mode"
],
- "commit": "c2c6974dadfac459b1a69a1217441283874cea92",
- "sha256": "0xpz9qrcbxknnncqf0hw7hs9k6sv9dckzsf081k2zmsks3l5qh4p"
+ "commit": "e740efb2abbc0ffd43f6dbcdb4527bc55723b842",
+ "sha256": "0cmxdd3fgyiixg81zmxa0j68slhkq8rg5z840cx4dbb3j9w06yd1"
},
"stable": {
"version": [
0,
- 2
+ 3
],
"deps": [
"dash",
"helm",
"lsp-mode"
],
- "commit": "5c960e7800dc8f4432f3a1466a637d484b87dc35",
- "sha256": "1vq3qpqm3ndqyvf5bk8qhqcr60x9ykc0ipk2a43rr3yjm4z1b6s9"
+ "commit": "e740efb2abbc0ffd43f6dbcdb4527bc55723b842",
+ "sha256": "0cmxdd3fgyiixg81zmxa0j68slhkq8rg5z840cx4dbb3j9w06yd1"
}
},
{
@@ -57510,10 +57212,10 @@
},
{
"ename": "helm-nixos-options",
- "commit": "6846c7d86e70a9dd8300b89b61435aa7e146be96",
- "sha256": "1nsi4hfw53iwn29fp33dkri1c6w8kdyn4sa0yn2fi6144ilmq933",
+ "commit": "7f298cdc6773f3aeb7baf9c6a32c97d2b60f55a3",
+ "sha256": "0657p0wlzdcjj3al32d20ysjp3visxs1198l0fhy4g0dc0am3lzw",
"fetcher": "github",
- "repo": "travisbhartwell/nix-emacs",
+ "repo": "nix-community/nix-emacs",
"unstable": {
"version": [
20151013,
@@ -57693,7 +57395,7 @@
"version": [
0,
8,
- 9
+ 10
],
"deps": [
"dash",
@@ -57701,8 +57403,8 @@
"org-ql",
"s"
],
- "commit": "81281350d44a3903a0866431342299f5f3c74beb",
- "sha256": "1mw07y82r3b9brphx2j8gj95rbs4632fgq0b79824zqpwm8m291j"
+ "commit": "9c53c1bddfcbda3475ffd8810f012be6de07d963",
+ "sha256": "043m90flbmmcaiv1n5lfw6pd5hr978r9kqbhy34rgyzm0k34sk72"
}
},
{
@@ -59833,30 +59535,6 @@
"sha256": "1dr06b9njzih8z97k62l9w3x0a801x4bp043zvk7av9qkz8izl2r"
}
},
- {
- "ename": "hierarchy",
- "commit": "7aea238a2d14e9f58c0474251984b6c617b6854d",
- "sha256": "0fh1a590pdq21b4mwh9wrfsmm2lw2faw18r35cdzy8fgyf89yimp",
- "fetcher": "github",
- "repo": "DamienCassou/hierarchy",
- "unstable": {
- "version": [
- 20190425,
- 842
- ],
- "commit": "a5bc6bf2e1bbd48cc17c508043134f24abb41944",
- "sha256": "18y5xj8j07hca7qk5ygxqpiybv58qf4c85hqw52a59fkn0vvdbhg"
- },
- "stable": {
- "version": [
- 0,
- 7,
- 0
- ],
- "commit": "4ab1372c252847c316f8978a81e2fe92ff79579e",
- "sha256": "1kykbb1sil5cycfa5aj8dhsxc5yrx1641i2np5kwdjid6ahdlz5r"
- }
- },
{
"ename": "highlight",
"commit": "38433e95f73ab20f27254a084d0b245c6e62d882",
@@ -60304,26 +59982,26 @@
"repo": "mihaimaruseac/hindent",
"unstable": {
"version": [
- 20240907,
- 1847
+ 20241128,
+ 1601
],
"deps": [
"cl-lib"
],
- "commit": "3295a2f0b6d3b98255a82c11c329c5f5275a6ae1",
- "sha256": "0c2z2sfr42fj35w7yw4flq34r6kd0zn7p5m44hx2mn90y0jbvql1"
+ "commit": "beafb2610fb9a724bdd78339375e6673d46c23fe",
+ "sha256": "1hx0sj5afy0glxr3lfr6hvnk0iphmfnfg3wilx2s013a5v0drmxc"
},
"stable": {
"version": [
6,
2,
- 0
+ 1
],
"deps": [
"cl-lib"
],
- "commit": "3295a2f0b6d3b98255a82c11c329c5f5275a6ae1",
- "sha256": "0c2z2sfr42fj35w7yw4flq34r6kd0zn7p5m44hx2mn90y0jbvql1"
+ "commit": "beafb2610fb9a724bdd78339375e6673d46c23fe",
+ "sha256": "1hx0sj5afy0glxr3lfr6hvnk0iphmfnfg3wilx2s013a5v0drmxc"
}
},
{
@@ -60722,16 +60400,16 @@
"repo": "thanhvg/emacs-hnreader",
"unstable": {
"version": [
- 20221117,
- 650
+ 20241109,
+ 1931
],
"deps": [
"org",
"promise",
"request"
],
- "commit": "8444e177035e236e991f9ea73074c053a45426ad",
- "sha256": "0v49fvc3phvff2scwlvjdy98y91dmkywij9dl8j95i5iahksq2fp"
+ "commit": "b422628a272d7672cc2c7dfcef1c8bf06371afd5",
+ "sha256": "1zi7v0bkssl8pv6hgpgkyww1645zxpwr8s2rxw5yw8ddxm5b7zzr"
}
},
{
@@ -60898,11 +60576,19 @@
"repo": "axelf4/hotfuzz",
"unstable": {
"version": [
- 20240907,
- 1735
+ 20241125,
+ 2036
+ ],
+ "commit": "cb0ce382d98cbc35ea55f4533b3c321119ed18b7",
+ "sha256": "04x9dy4nhg6zvs0h4zsbp1vbbm58capnpsc995gnr78gqxlya9vk"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0
],
- "commit": "e41827ef0226de7874e60b2f6c7ceb13116cd4ee",
- "sha256": "06vhls7yz7gnzvmplvla5l697bj3r9rhn4aa9h0sm2whny5vzhs5"
+ "commit": "cb0ce382d98cbc35ea55f4533b3c321119ed18b7",
+ "sha256": "04x9dy4nhg6zvs0h4zsbp1vbbm58capnpsc995gnr78gqxlya9vk"
}
},
{
@@ -61010,14 +60696,14 @@
"repo": "kaorahi/howm",
"unstable": {
"version": [
- 20241014,
- 1050
+ 20241018,
+ 1153
],
"deps": [
"cl-lib"
],
- "commit": "280eead4fffdc2ef78aee4fcb522f24a3f1f4dec",
- "sha256": "00w8dnszispfv1y7zqggmjfn2xhmn0fls1gdx8gx7vhkyjyzpvqr"
+ "commit": "f7c0b6a71a7dcc97a4ba15295373c3d627ab9a6c",
+ "sha256": "0sl1fzkf29qb7m9m523rzrv5w90f2vhyhw71n7ir844jwlwmhpga"
},
"stable": {
"version": [
@@ -61336,11 +61022,11 @@
"repo": "pnor/huecycle",
"unstable": {
"version": [
- 20240614,
- 49
+ 20241129,
+ 1717
],
- "commit": "8f3e8641f950072ebf4bb03afd49b87aad147ad9",
- "sha256": "0v5d96sgfmglm4q2gi676ardkigdqws5k5cwcg8bk72cc2b35di1"
+ "commit": "60eed50ffe83e2e139c8a675ff8e53cf94c8a1ee",
+ "sha256": "1n9n39h3i4nq3664d5b92zp0cycqs833sjbi5rrjf5kfp5ffcs5c"
},
"stable": {
"version": [
@@ -61637,11 +61323,11 @@
"url": "https://git.savannah.gnu.org/git/hyperbole.git",
"unstable": {
"version": [
- 20241008,
- 514
+ 20241126,
+ 917
],
- "commit": "a8d5eaae30162e61dc854c904f831a83fcd4da8a",
- "sha256": "041sx0qliacn9lwa8iwsxzvb3ya9jhqjxs44f4nv65dvrjm91ll4"
+ "commit": "e2749c6348f4783c5175b225e0f964d23c1ccc1f",
+ "sha256": "1rnf3kdwwhhpzcmlix8795zcrlkzhsy31l73pgmvr2fpd36agrli"
},
"stable": {
"version": [
@@ -61661,8 +61347,8 @@
"repo": "ushin/hyperdrive.el",
"unstable": {
"version": [
- 20241012,
- 2253
+ 20241101,
+ 2353
],
"deps": [
"compat",
@@ -61673,8 +61359,8 @@
"taxy-magit-section",
"transient"
],
- "commit": "640585f58623e9e1f00f36055b7ec247aaff64e0",
- "sha256": "16yzpndf8fdhljg47gs1c8037w4sw5a2p27vrbzm4j5iz3c2ivdq"
+ "commit": "581752cad8bcd701c863b08a779e4ca982325cae",
+ "sha256": "0f6h20jq10b1drad7j3m7k47l6ddphm2s8fc2sc1cjlbhzn5q70j"
},
"stable": {
"version": [
@@ -61695,6 +61381,38 @@
"sha256": "1banr2v1gp9ng7ls32w5yavsb2mks7pazp9pn27570329nl40cy7"
}
},
+ {
+ "ename": "hyperdrive-org-transclusion",
+ "commit": "929e1d7654b2f927363c595a9636ed98eb1c9332",
+ "sha256": "1icd35spamkbbbyf12vafjcwy99j01zszgd5igaa21h7bl9bkhkk",
+ "fetcher": "sourcehut",
+ "repo": "ushin/hyperdrive-org-transclusion",
+ "unstable": {
+ "version": [
+ 20241028,
+ 427
+ ],
+ "deps": [
+ "hyperdrive",
+ "org-transclusion"
+ ],
+ "commit": "252e2df3fe7a07a122a365a637c47a43b26e179c",
+ "sha256": "1abay7xrwnfv19ap45spynd95qhyrm36fc29yrwdx0byhhbchd1h"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 3,
+ 1
+ ],
+ "deps": [
+ "hyperdrive",
+ "org-transclusion"
+ ],
+ "commit": "25570c6e4b90dce0858b80b7f557db19744b3955",
+ "sha256": "0b393icpm0fpsnl7s934dswmzi25zj226x2n32wm4gmz0dasai4i"
+ }
+ },
{
"ename": "hyperkitty",
"commit": "d9cec9706c0f06b631777c30ae38198d60b61c7f",
@@ -61802,14 +61520,14 @@
"repo": "zzkt/i-ching",
"unstable": {
"version": [
- 20240729,
- 1054
+ 20241113,
+ 1642
],
"deps": [
"request"
],
- "commit": "0870cb1fa5bca0b7848e3f4e902e6d58445eab09",
- "sha256": "19prq2kmzk33i2w4bargls7zad41rvmdflbw7f1gyz4lyh7spgzg"
+ "commit": "e4339cb64a97e0d04a4cb8e7183aeec4e4ae6a29",
+ "sha256": "08827zq4jni4bxlmjq24nbj6k2q07ks6mb47xfs2bp8hjqb0m07f"
}
},
{
@@ -61835,11 +61553,11 @@
"repo": "Stebalien/i3bar.el",
"unstable": {
"version": [
- 20230724,
- 305
+ 20241025,
+ 1417
],
- "commit": "82efd5c87a3b3e9bcb5257c0a678f861f24e477e",
- "sha256": "15wqx8jhms9w22v9jdc2c3lshbaqfm0192qmckygjh86iyjqv041"
+ "commit": "2e8df32559bad0a77ef87daa13d0740c5328a50a",
+ "sha256": "0sa08gp39cjmdac11mp7ckwm3igy61bfiybrghqdkdh8sm1by5ih"
}
},
{
@@ -62069,14 +61787,14 @@
"repo": "purcell/ibuffer-vc",
"unstable": {
"version": [
- 20230817,
- 606
+ 20241106,
+ 1518
],
"deps": [
"seq"
],
- "commit": "1388d2ea18287c74a79d053619dbdfa9090c26a2",
- "sha256": "0mnxh6annmys4h1xhc2c7l7ajp4pwvdg68n30x7a21ad9qlvizil"
+ "commit": "890c692da9348ef071a4b27940082a4dad05b27c",
+ "sha256": "1xqwvid17wgr850zhh6n5ihnayai87363kkmhmminicci2bp6sjw"
},
"stable": {
"version": [
@@ -62128,11 +61846,11 @@
"repo": "CeleritasCelery/icl-mode",
"unstable": {
"version": [
- 20221003,
- 2316
+ 20241030,
+ 1743
],
- "commit": "1ef19c3c1c7f2667796907391d5337bbc2d73df3",
- "sha256": "0jzly3l4a6769ins869chb752297p4702xcbxq8qx96wdigipsdz"
+ "commit": "9cc7fbb7f290fd8c63795765cf309e8a57a49b14",
+ "sha256": "10b3wk136mzzgwwy95y6bbizxczl7hijj41ycp2nvx1fwg1gb36d"
}
},
{
@@ -62803,28 +62521,28 @@
"repo": "KarimAziev/igist",
"unstable": {
"version": [
- 20240713,
- 920
+ 20241108,
+ 1947
],
"deps": [
"ghub",
"transient"
],
- "commit": "b3d6d3d95d0a394e19b3068e3ff553009b498fbc",
- "sha256": "0byfi9ksms0hdzqx51qmv6as9bhjfmf5l0mpp48lcz0b0mbj542z"
+ "commit": "13193a29544dc50a442a1a336e5d82c50f6663c0",
+ "sha256": "1pznh051rpwzpydgxw2j8ky36iqb5azb50p0zz0azrf134k8dcav"
},
"stable": {
"version": [
1,
6,
- 3
+ 4
],
"deps": [
"ghub",
"transient"
],
- "commit": "b3d6d3d95d0a394e19b3068e3ff553009b498fbc",
- "sha256": "0byfi9ksms0hdzqx51qmv6as9bhjfmf5l0mpp48lcz0b0mbj542z"
+ "commit": "13193a29544dc50a442a1a336e5d82c50f6663c0",
+ "sha256": "1pznh051rpwzpydgxw2j8ky36iqb5azb50p0zz0azrf134k8dcav"
}
},
{
@@ -63167,6 +62885,30 @@
"sha256": "1fhhpz29x9vkhzms2qkxblic96kqzg0rqsxj71vgz6fpwdb4f9gy"
}
},
+ {
+ "ename": "imgur",
+ "commit": "a68ccf73c00cedbe00eb5c252b007754d0cfe6d5",
+ "sha256": "0qiv4hzkq43f2ks70w7wqxvfr55bfrkm69izvpm565shdd25gvvk",
+ "fetcher": "github",
+ "repo": "KeyWeeUsr/imgur",
+ "unstable": {
+ "version": [
+ 20241201,
+ 1257
+ ],
+ "commit": "9a7f47d6da3f6a7365f8575c0403f05398ad05c5",
+ "sha256": "0m117q2jr2hfah23isaz0jsawyzrrqhmvyiv7w6aycr2hhhx76g1"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 1,
+ 0
+ ],
+ "commit": "3eb96d58909c5c62613ee57495bdfe7e92d0c4b7",
+ "sha256": "0imi8b6gc3wrw0h1ligqfkzm7drlpmrmmahl3l4gds9s2l7lwy07"
+ }
+ },
{
"ename": "immaterial-theme",
"commit": "9a95d88bb00b1313da82929bc2733d726d2041d7",
@@ -64008,11 +63750,11 @@
"repo": "purcell/inheritenv",
"unstable": {
"version": [
- 20230804,
- 651
+ 20241119,
+ 1355
],
- "commit": "00106bb208d06e5f1ec25d0c2f41c000cbb25076",
- "sha256": "04na9m3z3k94jjqcqps95xcmvjklnddhli2xaac16m4ackw2wv9b"
+ "commit": "b9e67cc20c069539698a9ac54d0e6cc11e616c6f",
+ "sha256": "0ghd8iy9g2h8pw3drrxhwdswam8xiwkq59wrqhr38famxawkncxb"
},
"stable": {
"version": [
@@ -64023,6 +63765,30 @@
"sha256": "04na9m3z3k94jjqcqps95xcmvjklnddhli2xaac16m4ackw2wv9b"
}
},
+ {
+ "ename": "inhibit-mouse",
+ "commit": "f1945a7004f8bbe4043a8579b16e1147f19d7623",
+ "sha256": "0wyg2yd4yycdq1dssqfgwjwxlap4gf7mgbs8bdgm22ycdy71izc7",
+ "fetcher": "github",
+ "repo": "jamescherti/inhibit-mouse.el",
+ "unstable": {
+ "version": [
+ 20241114,
+ 1902
+ ],
+ "commit": "ce8180dd631d4aadd8b3c434ecbb77c2f5e31012",
+ "sha256": "0nmwx9nckq4gn3nxsf3gpqmk5cyvgy8lhr89gzvl12070npy8r4z"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 0
+ ],
+ "commit": "ce8180dd631d4aadd8b3c434ecbb77c2f5e31012",
+ "sha256": "0nmwx9nckq4gn3nxsf3gpqmk5cyvgy8lhr89gzvl12070npy8r4z"
+ }
+ },
{
"ename": "ini",
"commit": "7066abe705a1d76a262b364af01bc4fee4d21fa5",
@@ -64266,11 +64032,11 @@
"repo": "nverno/inputrc-mode",
"unstable": {
"version": [
- 20240908,
- 414
+ 20241109,
+ 10
],
- "commit": "e174b20ed043f4b0218e284b92a77bcfa1762aab",
- "sha256": "1cizy2k71cyj3vyhx64h3108iziy01lq8jbl7krmzsswalbw98yg"
+ "commit": "2ccf09ae19f3cbb2b8c35dcd54ed333d688fffae",
+ "sha256": "1c60cci5099wx8r6b4sh0czhg6blbj4yvjlc08wyqiabfi2vprcd"
}
},
{
@@ -64677,11 +64443,11 @@
"repo": "BriansEmacs/insert-pair-edit.el",
"unstable": {
"version": [
- 20240428,
- 852
+ 20241018,
+ 749
],
- "commit": "98a7dd345c20db85a5477272148d6fb7801ac651",
- "sha256": "0wdyv5i5p4banp100x7y6cldbg7dvrzsyj7z8pldyi4d6iardxy2"
+ "commit": "757a9c3bd7b2d1f803e7e83af1a07c1656f3ba1a",
+ "sha256": "006k6mll9p86c6iv34rlvqly4rx7r7mq7xbss9p82hms45za6jyl"
}
},
{
@@ -65762,15 +65528,15 @@
"repo": "tumashu/ivy-posframe",
"unstable": {
"version": [
- 20211217,
- 234
+ 20241023,
+ 258
],
"deps": [
"ivy",
"posframe"
],
- "commit": "533a8e368fcabfd534761a5c685ce713376fa594",
- "sha256": "137mh0jgvkawdrv1d7w9giazz57c40n0yw2580q8zmxmv5dvkrl7"
+ "commit": "660c773f559ac37f29ccf626af0103817c8d5e30",
+ "sha256": "05p2n86a57mdkqkr554maa85n47w8ma0ygszhp9jgfczf9c8qm64"
},
"stable": {
"version": [
@@ -66952,14 +66718,14 @@
"repo": "minad/jinx",
"unstable": {
"version": [
- 20240926,
- 1814
+ 20241201,
+ 1341
],
"deps": [
"compat"
],
- "commit": "316e470633d9bbe365079cf237e3ddef1f37a80e",
- "sha256": "0rvnpmr6hyp96i563vck53z72bhq09wvsv8wzrb9dbg0zgjgx8d0"
+ "commit": "1be1a91c14031b0cf152c87f2cd5341559b2a1ec",
+ "sha256": "0a1frjjdkbhxjsn97bsjmil8winycwdvd4qwabgrzk8c5flnjiaa"
},
"stable": {
"version": [
@@ -67336,11 +67102,11 @@
"repo": "redguardtoo/js-comint",
"unstable": {
"version": [
- 20231126,
- 230
+ 20241112,
+ 609
],
- "commit": "ef2ccccad5740f3d8b5295f52a35df4f62471480",
- "sha256": "0ll9yyj3p4yyvc00jvx72r06xhxyl7zrky77l750kx151mv1aixc"
+ "commit": "a2e6f01b999e26047808c1720b7be0805afc7cb6",
+ "sha256": "0ap744yp8m1wfws61k8xi53wj3dk4pg25wfzfafs1y6n2jx9r145"
},
"stable": {
"version": [
@@ -67702,26 +67468,20 @@
"repo": "DamienCassou/json-navigator",
"unstable": {
"version": [
- 20230904,
- 1757
- ],
- "deps": [
- "hierarchy"
+ 20241031,
+ 630
],
- "commit": "f3489153e8509f88296786cb00e31f59597a43f2",
- "sha256": "1sa4c4pxmfjp9k0549ljk2alan316n1ms2r4lcfqcci5ls51hv0l"
+ "commit": "8ab49b066bc23de731a29ef07bbafa29999e1852",
+ "sha256": "1nrvksg7ylvr1fhp4c2d3ng2r82akni0dgsdmm180z74z2wdra3m"
},
"stable": {
"version": [
- 0,
1,
- 1
- ],
- "deps": [
- "hierarchy"
+ 0,
+ 0
],
- "commit": "f4cde60c4203fc70cc7ff22ed1d6579159ce2598",
- "sha256": "0xrjbx6rkm8a6pmzhdph0r6l468hj827dvvq2hxhcm8v5gk6m690"
+ "commit": "8ab49b066bc23de731a29ef07bbafa29999e1852",
+ "sha256": "1nrvksg7ylvr1fhp4c2d3ng2r82akni0dgsdmm180z74z2wdra3m"
}
},
{
@@ -68054,11 +67814,11 @@
"repo": "JuliaEditorSupport/julia-emacs",
"unstable": {
"version": [
- 20240926,
- 1528
+ 20241120,
+ 857
],
- "commit": "09897a8cbab48adaacdef6f852d7cebd3945a645",
- "sha256": "01lyz25i41320jlcpykvg2zdm4klwzhf1lcbqfn8shjdjm41svw0"
+ "commit": "709c43410fb5da068d7d582cf3f545f7a7a68133",
+ "sha256": "0dmh3cd5mbsxz6fahvq2apzij53zdv2pvlxhqb3ix7ayb8l67a62"
},
"stable": {
"version": [
@@ -68077,14 +67837,14 @@
"repo": "tpapp/julia-repl",
"unstable": {
"version": [
- 20240408,
- 850
+ 20241120,
+ 1523
],
"deps": [
"s"
],
- "commit": "801d0fc3d8f6f08f66a11515e6517739a0b312a1",
- "sha256": "074m8hzg66j9xk44l5qh3fdzwbs5sn97nlwnr5b097431hxwk119"
+ "commit": "1f4f6b4e01ff1529b0d7917fbd9ce29451a66510",
+ "sha256": "0pp7sixpn0hh3743llxjz9rigq4ifsn249kvb4ph1fl0ys6ckj43"
},
"stable": {
"version": [
@@ -68346,8 +68106,8 @@
"repo": "emacs-jupyter/jupyter",
"unstable": {
"version": [
- 20241004,
- 241
+ 20241120,
+ 230
],
"deps": [
"cl-lib",
@@ -68356,8 +68116,8 @@
"websocket",
"zmq"
],
- "commit": "674af0481a94f2ce56c62aa7668a966254ef26ef",
- "sha256": "06nbmc136hb8bvrkqnpbhkd9sckk93ygsd9fdvzl59zfsvq0rgdc"
+ "commit": "577371744b36aa0afa117b7ded21d08f60331ff6",
+ "sha256": "1d2945irdi5s2cm2kzx87k28w2gcg1z8f5zm889rm5fv6dj6x1zj"
},
"stable": {
"version": [
@@ -68399,6 +68159,21 @@
"sha256": "103jwkmg3dphmr885rpbxjp3x8xw45c0zbcvwarkv4bjhph8y4vh"
}
},
+ {
+ "ename": "just-ts-mode",
+ "commit": "acca52a2fbedee1afee504cd6a665578fc42d94e",
+ "sha256": "1q08zyslgyg9hlmwgzmpsakly6f2jswimiqwcx3fr4nsyjj5a7bh",
+ "fetcher": "github",
+ "repo": "leon-barrett/just-ts-mode.el",
+ "unstable": {
+ "version": [
+ 20241014,
+ 2252
+ ],
+ "commit": "acb598f1edabae9f679a507c8e22c21b3f2da132",
+ "sha256": "0v9pgnlz7xm0kigpq3ymalx0jay1553rl3yra0fmggykmqi9gi17"
+ }
+ },
{
"ename": "justl",
"commit": "5a74b3213ab362fd00a11409e046854ec832c827",
@@ -68407,8 +68182,8 @@
"repo": "psibi/justl.el",
"unstable": {
"version": [
- 20240925,
- 455
+ 20241123,
+ 1442
],
"deps": [
"f",
@@ -68416,8 +68191,8 @@
"s",
"transient"
],
- "commit": "a46b95425c8f55d5ebfa674f09d606a6321e51e9",
- "sha256": "1bcaq8w0g77q49di99ffpbspv5bjl59wp03x7k2h41sij47dzsxk"
+ "commit": "16b6ed54ceae839da032e5850075cab43c46be08",
+ "sha256": "0k2m89y9j8i60iwj5pqphf8n9cqkzx7fz6q4if3rddbxp17n72l4"
},
"stable": {
"version": [
@@ -68472,20 +68247,20 @@
"repo": "joshbax189/jwt-el",
"unstable": {
"version": [
- 20240923,
- 1831
+ 20241031,
+ 2258
],
- "commit": "98c9fb2e8a45592062b9bf84cec1be0e51f70f7b",
- "sha256": "14dfwkvk7dm8hjgsnpv4an9fy2a401bcbg361b4ai0gs3m8691zh"
+ "commit": "d7deb62f8c2df58d5cfebf087a147c75207964e8",
+ "sha256": "01ngwb7xzzf6pdzv894dqwvmgj4nqkdjjnbmh67iv7xjd2m29dja"
},
"stable": {
"version": [
0,
- 1,
- 1
+ 2,
+ 0
],
- "commit": "98c9fb2e8a45592062b9bf84cec1be0e51f70f7b",
- "sha256": "14dfwkvk7dm8hjgsnpv4an9fy2a401bcbg361b4ai0gs3m8691zh"
+ "commit": "d7deb62f8c2df58d5cfebf087a147c75207964e8",
+ "sha256": "01ngwb7xzzf6pdzv894dqwvmgj4nqkdjjnbmh67iv7xjd2m29dja"
}
},
{
@@ -68776,11 +68551,11 @@
"repo": "Fabiokleis/kanagawa-emacs",
"unstable": {
"version": [
- 20240910,
- 1649
+ 20241028,
+ 1204
],
- "commit": "94418acc89f789f4172c5f68b2afacd784bf176d",
- "sha256": "1zihas9i1w679rir3vbvy3rjifl1y0nq5g1rx3y0ms2dy5nmy6x1"
+ "commit": "6fe28070d7b3581415faa3e61af786b596ef3bb0",
+ "sha256": "1akcgvl29lv01cvsrc0lrgkas680dq45lvhfq63prwmgbinb2x6y"
}
},
{
@@ -68806,11 +68581,11 @@
"repo": "wsgac/kanji-mode",
"unstable": {
"version": [
- 20230928,
- 1113
+ 20241120,
+ 1923
],
- "commit": "731b3a5447bcb899ba1d86b645a344e0915d04f3",
- "sha256": "0qgwl8iza0dkrpfsc5xpc1fgjmrxd6x4gxkid8wxn270s9mzal68"
+ "commit": "09719b00d60e22bd31c93b21c0c817eced9d0406",
+ "sha256": "07873z1adfa4mysldd0jid9s1zklsv20ms162x67z3p9jqpfz04x"
}
},
{
@@ -68855,28 +68630,28 @@
"repo": "ogdenwebb/emacs-kaolin-themes",
"unstable": {
"version": [
- 20241012,
- 1918
+ 20241104,
+ 1
],
"deps": [
"autothemer",
"cl-lib"
],
- "commit": "8ce06c0ecbd366663d07c2ee04ed9c2674112335",
- "sha256": "0xnry3w30zg7mxgc465q97ann7rk30srz5fszygnn8jlh3f5lkbg"
+ "commit": "343ad8cd73c7509af2ea7af5eb856ece97dee7a3",
+ "sha256": "0s4pnb8wblnj0kpqd35b6z7b719p7rfs0n2qcs6l8wyd8f3xdzwa"
},
"stable": {
"version": [
1,
7,
- 0
+ 1
],
"deps": [
"autothemer",
"cl-lib"
],
- "commit": "b03749c914b1319caccce4cf96630e3fba5335f5",
- "sha256": "15246nsiwdfy5zl5iml4qxslz8p7k9lrzdr7p6bn71afk721vz5y"
+ "commit": "343ad8cd73c7509af2ea7af5eb856ece97dee7a3",
+ "sha256": "0s4pnb8wblnj0kpqd35b6z7b719p7rfs0n2qcs6l8wyd8f3xdzwa"
}
},
{
@@ -69607,28 +69382,28 @@
"repo": "khoj-ai/khoj",
"unstable": {
"version": [
- 20241011,
- 107
+ 20241129,
+ 343
],
"deps": [
"dash",
"transient"
],
- "commit": "0a1c3e4f411ea3657428366acdce6c64a322289a",
- "sha256": "1g1brx4sqg9r2xkbvagng3zbqbzz9k3fszhx56ip75rgnlgvmf99"
+ "commit": "439b18c21f0d540fc6c6a9aea0c9b22e4259e6e0",
+ "sha256": "09bzvm603kzh3md5plcc01jwwj3mmb87z7c3p9wz0k662hg7nwdk"
},
"stable": {
"version": [
1,
- 25,
- 0
+ 30,
+ 10
],
"deps": [
"dash",
"transient"
],
- "commit": "0a1c3e4f411ea3657428366acdce6c64a322289a",
- "sha256": "1g1brx4sqg9r2xkbvagng3zbqbzz9k3fszhx56ip75rgnlgvmf99"
+ "commit": "439b18c21f0d540fc6c6a9aea0c9b22e4259e6e0",
+ "sha256": "09bzvm603kzh3md5plcc01jwwj3mmb87z7c3p9wz0k662hg7nwdk"
}
},
{
@@ -70201,8 +69976,8 @@
"repo": "abrochard/kubel",
"unstable": {
"version": [
- 20240822,
- 1507
+ 20241110,
+ 1456
],
"deps": [
"dash",
@@ -70210,8 +69985,8 @@
"transient",
"yaml-mode"
],
- "commit": "e124c555d1a889055ddb1426163d24652cc281b4",
- "sha256": "1i7ack3v0gm1q2lnsrs7fz6928n1mdx95c0n8sa618gr17h89p57"
+ "commit": "52d1bbdb74fd885b32188784144bb84b980da5e1",
+ "sha256": "0vcb5svjr7fp96z4svpg1wpb370c5m94chrbckpd7xigzg3n9win"
},
"stable": {
"version": [
@@ -70613,16 +70388,16 @@
"repo": "Deducteam/lambdapi",
"unstable": {
"version": [
- 20240729,
- 1656
+ 20241110,
+ 1640
],
"deps": [
"eglot",
"highlight",
"math-symbol-lists"
],
- "commit": "230d5726b91d11d4b356235f37445ead0a99f3f5",
- "sha256": "0azizlidvjxs9dhl5g669cbf13w7i17n5hjk1s41kys1jvc48faa"
+ "commit": "bd45582bb912bad97f614264ff3142d11a6399a1",
+ "sha256": "07aiywrdy4r2y5bm8pmf04lpdj4gwngkkyf2bl8h7kj07s8zy9pq"
},
"stable": {
"version": [
@@ -70786,11 +70561,11 @@
"repo": "lassik/emacs-language-id",
"unstable": {
"version": [
- 20240609,
- 1616
+ 20241024,
+ 854
],
- "commit": "44452e4f7962aca41cc2539fce1d27799d6e656c",
- "sha256": "1x87qrqyg12w5ncgv6592amp08bpdn4sybhwyf3nwfp8zpfficms"
+ "commit": "dbfbc4903ffb042552b458fac76ee9f67a022036",
+ "sha256": "0qiml5k43hhh5m9z7blzbhhl2492d2z3an1n0v4mia2c38ijsq1q"
},
"stable": {
"version": [
@@ -71215,26 +70990,26 @@
"repo": "christophermadsen/emacs-lazy-ruff",
"unstable": {
"version": [
- 20240911,
- 1201
+ 20241127,
+ 1434
],
"deps": [
"org"
],
- "commit": "7bf9650e9a2df381043ba26ac8930d0a8902dc6e",
- "sha256": "123l4p7wanwkdz8w5r7rxd9qvfr88kyy9a9xfpgiadagvx3kpkxw"
+ "commit": "4eeea363a133e0e7ed7c02a5e2f1f7b63a78c3f4",
+ "sha256": "16ykhkjjsgf2iqsk9vhg7fxb2ilwwjrj4rsifiznn436z6sivkn9"
},
"stable": {
"version": [
0,
3,
- 0
+ 1
],
"deps": [
"org"
],
- "commit": "7bf9650e9a2df381043ba26ac8930d0a8902dc6e",
- "sha256": "123l4p7wanwkdz8w5r7rxd9qvfr88kyy9a9xfpgiadagvx3kpkxw"
+ "commit": "4eeea363a133e0e7ed7c02a5e2f1f7b63a78c3f4",
+ "sha256": "16ykhkjjsgf2iqsk9vhg7fxb2ilwwjrj4rsifiznn436z6sivkn9"
}
},
{
@@ -71331,11 +71106,11 @@
"repo": "conao3/leaf.el",
"unstable": {
"version": [
- 20230803,
- 729
+ 20241018,
+ 516
],
- "commit": "fce3378f987bf118a0a5f1a24c4408ac920f858d",
- "sha256": "11fw6qh9fdy8f1zkfa0n1dkd0ppk9b96mgmaxnbb8zxivdhj9nhc"
+ "commit": "69c9b057cdeee560450c1d04a9a058235ecff0f7",
+ "sha256": "0jgdwx1g7k4dkbr1sp7y8vk1x9nbsav8sm35xh1j1r62mznlcpsf"
},
"stable": {
"version": [
@@ -71477,27 +71252,6 @@
"sha256": "1bgjhrpq6a239v8vfi6i9qcbyrg76mpy4yykkb5da8hlp23idwy7"
}
},
- {
- "ename": "lean-mode",
- "commit": "95d2d051c47697fa09c37a64ce9070aded61503d",
- "sha256": "1sgi79s2d511gb448cjd5sxrxrm2k0kv4ic7a27izm24vgfy77x4",
- "fetcher": "github",
- "repo": "leanprover/lean3-mode",
- "unstable": {
- "version": [
- 20230611,
- 728
- ],
- "deps": [
- "dash",
- "f",
- "flycheck",
- "s"
- ],
- "commit": "99d6a34dc5b12f6e996e9217fa9f6fe4a6af037a",
- "sha256": "1m6kzhlifzb2qyb1y578r4jbfm73lxs611zgqjng9nbhprymal33"
- }
- },
{
"ename": "leanote",
"commit": "b00b806ae4562ca5a74f41c12ef35bfa597bcfa8",
@@ -71588,11 +71342,11 @@
"repo": "ledger/ledger-mode",
"unstable": {
"version": [
- 20241007,
- 1655
+ 20241114,
+ 1751
],
- "commit": "9be25db0566d495299eaa8595eb4b6dd6b7a1080",
- "sha256": "0ybviqpqb2c1ai3ffizqgwjsmarxbg4qi4b6lfnfgczinslnh0fm"
+ "commit": "15b7d29f2539f9e9671ab3c062bd5165e5b80ae8",
+ "sha256": "1hn6lznhis7xgq0c14yp3jdazgq3c23k53zlm3fkqs9qzy1h1j4m"
},
"stable": {
"version": [
@@ -71627,17 +71381,16 @@
"repo": "kaiwk/leetcode.el",
"unstable": {
"version": [
- 20240807,
- 1731
+ 20241115,
+ 527
],
"deps": [
"aio",
- "dash",
"log4e",
"s"
],
- "commit": "064a03d3407d67391fd8c0f6494d0e0f0d867edc",
- "sha256": "0k0mqaj65sq6h45wh9y7qqv434n292r81iyam2ybxyxn99rzjmvh"
+ "commit": "bf259182a18a44c49ccc5449d1353ec4009a9480",
+ "sha256": "095cmlizfmpbygn9x6yavjnlkczfycay3ijfxqd64idagvwkx0dp"
},
"stable": {
"version": [
@@ -71679,15 +71432,15 @@
"repo": "martianh/lem.el",
"unstable": {
"version": [
- 20240630,
- 1228
+ 20241102,
+ 1553
],
"deps": [
"fedi",
"markdown-mode"
],
- "commit": "2dc5036f0991db352948ea93ae895654c0fe775d",
- "sha256": "0zf3wpzqxphzxlgvqhns4yf1aa6yfgkxi5r32wi2gcrwnd97qwqn"
+ "commit": "79c4b8112be95df0193e7dff99a097ec818b04cb",
+ "sha256": "0arhjcx9yzf9jgrl6f87lqviaq8sqkn8wfbxzbkk952fgp32v6h6"
},
"stable": {
"version": [
@@ -72314,11 +72067,11 @@
"repo": "janestreet/line-up-words",
"unstable": {
"version": [
- 20180219,
- 1024
+ 20241121,
+ 2033
],
- "commit": "2c236f5772e18d0e50d7ca2eee7eebbe356d9b60",
- "sha256": "0sazx4a6hn0z7318mdc80z87n5ix4hhyyh4p4f37pv5p9q6y8sd2"
+ "commit": "3c1339a3fb3840dfaea50d8cb966c90b19d14925",
+ "sha256": "1jrck3mx4mv3nrps02540i3c394789nwn9gl0jlf580p8hvzlcgk"
},
"stable": {
"version": [
@@ -72787,11 +72540,11 @@
"repo": "purcell/list-unicode-display",
"unstable": {
"version": [
- 20230216,
- 958
+ 20241119,
+ 1152
],
- "commit": "57b4384ebe0c5d10890ee0dfcf66d0b16e5f5060",
- "sha256": "0182irm3vai6ngl2xlqpj94qzx673rygzik36amrcw2ji9ssf4f9"
+ "commit": "68feedd776082c1743588c2b07dbb6539dbe51bf",
+ "sha256": "0sf1irb51l8n3732fllynsdvqc6c1m94swv7r7yy0qmngz9fqqss"
},
"stable": {
"version": [
@@ -72813,20 +72566,20 @@
"repo": "rolandwalker/list-utils",
"unstable": {
"version": [
- 20230422,
- 1740
+ 20241106,
+ 1849
],
- "commit": "f02dcef36330871855346f9eab97eef58d323d9a",
- "sha256": "1ry6dmfs10b30w37ffyhbz04nilbf5q5dyi73cxr2dbk0j92lzga"
+ "commit": "bbea0e7cc7ab7d96e7f062014bde438aa8ffcd43",
+ "sha256": "0rc7ql78qraa35lv6igkd81j5ap9zgn6ri9rp9cajp86s2b46dg6"
},
"stable": {
"version": [
0,
4,
- 6
+ 7
],
- "commit": "9bb2487c83ec46a0b6e6c4158af69334ac797b82",
- "sha256": "07hbz2md52ccy95gv4d5n6szrfmpfqf3w4kwqdg2cf54c7kgf7hw"
+ "commit": "bbea0e7cc7ab7d96e7f062014bde438aa8ffcd43",
+ "sha256": "0rc7ql78qraa35lv6igkd81j5ap9zgn6ri9rp9cajp86s2b46dg6"
}
},
{
@@ -73141,20 +72894,20 @@
"repo": "donkirkby/live-py-plugin",
"unstable": {
"version": [
- 20240720,
- 1532
+ 20241127,
+ 2323
],
- "commit": "86f27626ca3c1350cb459aa2b72c12219962e8d8",
- "sha256": "1i97jfmzq7q4xrp0h87s7kv2wszhjxa0z30sl4mxyqmv8q9qcc4x"
+ "commit": "b417ad93191e8eecaca347f5407dd4bb4c07b6f8",
+ "sha256": "101dd0b1czc28yjsdz0fdvkh8b76rd03a1br7sldlmsy3dfhk669"
},
"stable": {
"version": [
4,
- 11,
- 4
+ 12,
+ 0
],
- "commit": "bea9903bca0ece7546df9a00883f17e4eb49b4c7",
- "sha256": "0mv9fsmjvixdk3db8j1cw7i2bgi2phwbdwwr0fq96azxzzgqh5jx"
+ "commit": "b417ad93191e8eecaca347f5407dd4bb4c07b6f8",
+ "sha256": "101dd0b1czc28yjsdz0fdvkh8b76rd03a1br7sldlmsy3dfhk669"
}
},
{
@@ -73255,23 +73008,20 @@
"repo": "tarsius/llama",
"unstable": {
"version": [
- 20241003,
- 1906
+ 20241104,
+ 2206
],
- "commit": "8fdcde4aafbd6d5768fa135d9e2a7bc1ae95b23a",
- "sha256": "0rywy2awnixap2brp9p6pp6xbgpljjzl27snx92vq5znwx3iln28"
+ "commit": "f4e80a582f7ec857783274bee6614560ce49d497",
+ "sha256": "1km89ks7xg89sjqxiri9lxj58hc17z13z7mzcq3y66yv1dfrrziz"
},
"stable": {
"version": [
0,
- 3,
- 1
- ],
- "deps": [
- "seq"
+ 4,
+ 0
],
- "commit": "beddc6a85787e2a95910e284076c162068c6f0de",
- "sha256": "0rgm5jv9iv8b0xabdwicrpih2d3slchmv17xdjk705dqhfc18f4w"
+ "commit": "f4e80a582f7ec857783274bee6614560ce49d497",
+ "sha256": "1km89ks7xg89sjqxiri9lxj58hc17z13z7mzcq3y66yv1dfrrziz"
}
},
{
@@ -73699,27 +73449,27 @@
"repo": "doublep/logview",
"unstable": {
"version": [
- 20240924,
- 2033
+ 20241118,
+ 1819
],
"deps": [
"datetime",
"extmap"
],
- "commit": "8e020b9296b8e1adc810ebc9d36985f64d93dbc2",
- "sha256": "1hkjb37kjw34611n83f384si2623wgd5kx85yw8pvhk2shmrn00h"
+ "commit": "de9694cfdc7006017781e7d32bb8bad38c7fda46",
+ "sha256": "0rl05yy16x0gsc6y58a2zyxc0dbyh5w1c6jx67mkvjxldpqah1sl"
},
"stable": {
"version": [
0,
- 18
+ 19
],
"deps": [
"datetime",
"extmap"
],
- "commit": "0f957d4b8766f6bd927966090d0a0a311990dc60",
- "sha256": "0pfva621bgz7hgcdp6jp9fzvafxxjz1y9npjgkz7byydvy64j2vv"
+ "commit": "50f0b12f9cb3b8bdc9b28c16187495770ff6dff6",
+ "sha256": "1z9w1rdr1d7j6fw9rb05wjrpdj9zka683xj35cxws7qplk3dlz29"
}
},
{
@@ -73855,8 +73605,8 @@
"repo": "okamsn/loopy",
"unstable": {
"version": [
- 20240914,
- 1445
+ 20241129,
+ 1652
],
"deps": [
"compat",
@@ -73864,8 +73614,8 @@
"seq",
"stream"
],
- "commit": "7d76cee0a1c05f64457466fc183bc51497bc2633",
- "sha256": "1spnn8z98z15wjicdv2i9y6xxkjx31bjhnxma3dmhsklhf9fv4xa"
+ "commit": "159cf1811c2d27552166c9976f8612c487054d31",
+ "sha256": "1dzrh3wiqc8yb6kcrbb38pngygspm9zjm2wrhs041albkj7sz1cx"
},
"stable": {
"version": [
@@ -74013,8 +73763,8 @@
"repo": "emacs-lsp/lsp-dart",
"unstable": {
"version": [
- 20240520,
- 1834
+ 20241114,
+ 2005
],
"deps": [
"dap-mode",
@@ -74026,8 +73776,8 @@
"lsp-mode",
"lsp-treemacs"
],
- "commit": "1f52e81c9371055ff9188117ace81f009d1c79f2",
- "sha256": "18wvsbszdxgmjvpj6b32scg0g8lj54cm3fz725zph44brm98v391"
+ "commit": "7e3d3429418bc42cda7fa7b58e6644a705cf2f89",
+ "sha256": "06mxy8vw64szhik58g5qsw4a6jwzm92v474dkb2sfi8cxw5zp8vs"
},
"stable": {
"version": [
@@ -74080,15 +73830,15 @@
"repo": "emacs-lsp/lsp-focus",
"unstable": {
"version": [
- 20200906,
- 1917
+ 20241119,
+ 1451
],
"deps": [
"focus",
"lsp-mode"
],
- "commit": "d01f0af156e4e78dcb9fa8e080a652cf8f221d30",
- "sha256": "1pi6vmykp6x5c1yz9cgcf4nc5cbkbxhxqmp6g9aipwd8kwii1xx6"
+ "commit": "3420d82c6c8635b4184ebacd50e0902deeeb9845",
+ "sha256": "13vn09i2jna2vh55ql02nni3ys81v5n1540yxj1mw3mwgfv5icnc"
},
"stable": {
"version": [
@@ -74150,15 +73900,15 @@
"repo": "emacs-lsp/lsp-haskell",
"unstable": {
"version": [
- 20240921,
- 2345
+ 20241024,
+ 1701
],
"deps": [
"haskell-mode",
"lsp-mode"
],
- "commit": "d229fdcd25a2d557d9d05a74f6fb4731e1341671",
- "sha256": "037y70bri8ncfw1znj75px3pywziv3sg9fcnd8d6zz1zvqj1dkn0"
+ "commit": "6981f8d1225c038c1a130e8cf70530cfe15f976e",
+ "sha256": "1l51v2di8hgm2n8fb8kj5q6ns501vfkv5706v1q0fa8amvmralgb"
}
},
{
@@ -74187,16 +73937,16 @@
"repo": "emacs-lsp/lsp-ivy",
"unstable": {
"version": [
- 20220831,
- 1823
+ 20241119,
+ 1452
],
"deps": [
"dash",
"ivy",
"lsp-mode"
],
- "commit": "9ecf4dd9b1207109802bd1882aa621eb1c385106",
- "sha256": "1k9q5fsv6gqy4k5bprcvmybc2mv0zqj6m4j1wcbp5rkl2596mlhh"
+ "commit": "553276f3c8a6bc15859a9be666b0a50af65e9bc6",
+ "sha256": "10yij9ml3wwvk4z9hglpjydviwkc18czvv81s7hj99yarvn3ldg6"
},
"stable": {
"version": [
@@ -74377,14 +74127,14 @@
"repo": "emacs-languagetool/lsp-ltex",
"unstable": {
"version": [
- 20240425,
- 2049
+ 20241130,
+ 801
],
"deps": [
"lsp-mode"
],
- "commit": "c473ed37aa0f2769bb0b4c344cc28f95975dbc17",
- "sha256": "1bqvrhmvp0bxk10fqmra38aczgs6r6gwac2ppmn0fxz85g7ryvfp"
+ "commit": "8338c47dc2ea99dea4797ad110592139b2c66e59",
+ "sha256": "011x1daddvdbih3nawr1f4j0frjnmg8q8p0727bi9xm86yffln51"
},
"stable": {
"version": [
@@ -74409,8 +74159,8 @@
"repo": "emacs-lsp/lsp-metals",
"unstable": {
"version": [
- 20240821,
- 1959
+ 20241112,
+ 1142
],
"deps": [
"dap-mode",
@@ -74419,12 +74169,11 @@
"ht",
"lsp-mode",
"lsp-treemacs",
- "posframe",
"scala-mode",
"treemacs"
],
- "commit": "0dc938be1190d147e7013e3dce08ac8bff5d1662",
- "sha256": "06fbmw01ax5rybkhxya5fs6ndjx3p7zn6rjhxr0124dqhmq2jlzh"
+ "commit": "b5139c959336758a93d0e55458e6ca938d9fd16a",
+ "sha256": "1axbcmfnz176dfpd5nbx2f1nfad8pzl8ah9gddia4smad23cpvcm"
},
"stable": {
"version": [
@@ -74454,8 +74203,8 @@
"repo": "emacs-lsp/lsp-mode",
"unstable": {
"version": [
- 20241014,
- 1431
+ 20241201,
+ 2156
],
"deps": [
"dash",
@@ -74466,8 +74215,8 @@
"markdown-mode",
"spinner"
],
- "commit": "8200fa1e71f16e10f42fce95c47822c4bd756df1",
- "sha256": "0iq509iiy1xpdhpxk80v74lmwby2i1nl46iszlc7d07c2wvbjdm1"
+ "commit": "57ea512212b4cdd650b0bc4bcadd14fd678c212d",
+ "sha256": "0b11lqi7n00xqk9miyazi39nrhf0p110rl7177xy0gbzxjzpcvfm"
},
"stable": {
"version": [
@@ -74615,16 +74364,16 @@
"repo": "emacs-lsp/lsp-pyright",
"unstable": {
"version": [
- 20241011,
- 1620
+ 20241102,
+ 1425
],
"deps": [
"dash",
"ht",
"lsp-mode"
],
- "commit": "327edcea22b27b8ea133aad678123f6d177e247e",
- "sha256": "0k2j7rskc2z1jv70qj0wjcksnpzgdaga64c0j0a7hfkk93hidqwb"
+ "commit": "dd54b3ae7c22d34faaced7b1a89739063c552b1f",
+ "sha256": "1807i3127m08h47aj3jj92yrhlf4xjkj3irs02vwlgsbix6fnlqg"
},
"stable": {
"version": [
@@ -74812,15 +74561,15 @@
"repo": "merrickluo/lsp-tailwindcss",
"unstable": {
"version": [
- 20240420,
- 1411
+ 20241018,
+ 200
],
"deps": [
"f",
"lsp-mode"
],
- "commit": "3e3cc80a448e9dd24663eaa41742cda686dac5ab",
- "sha256": "1llnign4yb4v6c8r7q25b4s63swxlgfxr5acf51s8h4x8rrb11w2"
+ "commit": "ca5e611d2a38fea8802a365bcdd6fdc73e3d79af",
+ "sha256": "0632nrmdfcwgzl1cqf83rwsxrk3fckg7y8h3fhcaa3j47zd32q53"
},
"stable": {
"version": [
@@ -75238,14 +74987,14 @@
"repo": "amake/macports.el",
"unstable": {
"version": [
- 20240814,
- 1020
+ 20241130,
+ 1219
],
"deps": [
"transient"
],
- "commit": "594b0dcd596464270d5e954d7c78015df2132c33",
- "sha256": "1i6kh84z7cifyb5h0a0p2sajbq6xyqm4pbf9pspqxphgmaspi2mp"
+ "commit": "ff24e67cf1e5b3b009f82812049b0406aa3a9fab",
+ "sha256": "1rps0q2djyvxlvs926x15rkfc7iycdk7z54jfbn6si75dvs8qck8"
}
},
{
@@ -75279,27 +75028,28 @@
"repo": "emacsorphanage/macrostep",
"unstable": {
"version": [
- 20240513,
- 2203
+ 20241025,
+ 1456
],
"deps": [
"cl-lib",
"compat"
],
- "commit": "4939d88779761e8b5461b4cf73f86600172987db",
- "sha256": "03lriwibv3r8prkg8rih8p80ykxqg9hvax88bg64mdx2jv9l4ygb"
+ "commit": "419873665f3d0b3d5779aa119b58a3daa96e3326",
+ "sha256": "0271j0f9cb0nwbip2qc9pqr27si3vaalyv6l6w9n39pcmxdxvy8n"
},
"stable": {
"version": [
0,
9,
- 2
+ 4
],
"deps": [
- "cl-lib"
+ "cl-lib",
+ "compat"
],
- "commit": "633586421e7fc14072cc1ca1655c1103b81a9093",
- "sha256": "1sxvp1q8naf0328l9fs90nk8bzsv485sajx4khh77nwkz3v4sr9f"
+ "commit": "31d4adcca4f08cfd7a45f85e691aaa7a9316b355",
+ "sha256": "0f0rjpjwzpw6hxqbh8ghr7838slf7w22z7szy68bbg3bbnrjjlai"
}
},
{
@@ -75410,14 +75160,14 @@
"repo": "roadrunner1776/magik",
"unstable": {
"version": [
- 20241013,
- 815
+ 20241111,
+ 1446
],
"deps": [
"compat"
],
- "commit": "d2bf2ae285080173d57525ee59ba48f15494c8c0",
- "sha256": "1vxz8ys55krbdks081vyrvsqfycvnzfj6bf3g1mxak8jc6xsdvvp"
+ "commit": "441389f75bdf6990556b96597979bf4a0b9cbdec",
+ "sha256": "1df4dpaygy0nnkqw4f6df5i186396dg05cp6imf83ipg7jnlypsq"
},
"stable": {
"version": [
@@ -75440,8 +75190,8 @@
"repo": "magit/magit",
"unstable": {
"version": [
- 20241010,
- 1930
+ 20241130,
+ 1707
],
"deps": [
"compat",
@@ -75451,14 +75201,14 @@
"transient",
"with-editor"
],
- "commit": "66731bda44f3e7810306f2910f18fefb348415ae",
- "sha256": "1jmxi7h138wypm822r89qns64xxbgrpswx47gnr24k3kq9mr9s00"
+ "commit": "e8b85e43d491ca0c0a3fc41ee5d8c4aa34649cd3",
+ "sha256": "0zf8455gix847f8qf24a427mh0bi8bdjmha01fgd09dh4yxjrn4h"
},
"stable": {
"version": [
4,
1,
- 1
+ 2
],
"deps": [
"compat",
@@ -75468,8 +75218,8 @@
"transient",
"with-editor"
],
- "commit": "93e86ceca7bf5b0ff9023d7f138e5f06990fc276",
- "sha256": "1ckjq068728wwfm4fv0z4rrdmrj09zvarip2s5rqdr8ny722dxfn"
+ "commit": "4992c3d1f64e0e983692c7a61d47069f47380dbf",
+ "sha256": "16ix3wsihqpzpx3709fx3wm2087q2miaxwfsh62xnq0nx5z9fl72"
}
},
{
@@ -75510,14 +75260,14 @@
"repo": "ideasman42/emacs-magit-commit-mark",
"unstable": {
"version": [
- 20240421,
- 931
+ 20241110,
+ 245
],
"deps": [
"magit"
],
- "commit": "d09d0df6f8a697446e9fac77428b32997b94c59e",
- "sha256": "1cd1z9vrmavxdwzxnwbimzcq51c3g8rzd7va01z5k8alh6n98gim"
+ "commit": "e468518c7b8f90deda03cc4f0e2616b367cfdee8",
+ "sha256": "00daa22z32zksxgmrls6fkywf01wvr6h28fjhw3mrirgdwz5i7ab"
}
},
{
@@ -75662,15 +75412,15 @@
"repo": "emacsorphanage/magit-gerrit",
"unstable": {
"version": [
- 20240514,
- 1139
+ 20241026,
+ 1641
],
"deps": [
"magit",
"transient"
],
- "commit": "46fe81c76fd2d3e5e97207cd1d951f22ecb16573",
- "sha256": "16xb13mamx0rnlsxg4xs0nc1xif59rw3xa22y7fz4897cjyrlp84"
+ "commit": "ddf9c8db7c1c0d8063dc010c3a795a10e9eaa5e0",
+ "sha256": "0r668mk6rdw9ja39145mlb7rb8gkp534aksgnxndzidhllpk5cz7"
},
"stable": {
"version": [
@@ -75795,16 +75545,16 @@
"repo": "douo/magit-gptcommit",
"unstable": {
"version": [
- 20240625,
- 356
+ 20241127,
+ 131
],
"deps": [
"dash",
"llm",
"magit"
],
- "commit": "91b23fde4a880566a4e493240865e3582cad7306",
- "sha256": "0zbj8bk3vdzfpih8242gan7a8i4gkmixxzs952mm15wg2fd98gm5"
+ "commit": "dfec4f9a13af50b5506f375749f5d822ec7be71d",
+ "sha256": "0kwpi6wrdgvwamllf41k0amczw1d0m8djql9zfflzc2mgr95rfbc"
}
},
{
@@ -76029,30 +75779,30 @@
"repo": "magit/magit",
"unstable": {
"version": [
- 20241001,
- 2052
+ 20241122,
+ 1431
],
"deps": [
"compat",
"dash",
"seq"
],
- "commit": "93e86ceca7bf5b0ff9023d7f138e5f06990fc276",
- "sha256": "1ckjq068728wwfm4fv0z4rrdmrj09zvarip2s5rqdr8ny722dxfn"
+ "commit": "93a7752842b2d4feff6b5deba44411e9c4249dfe",
+ "sha256": "152i6p9snjpni3ywlfcvj6z6fxr8aa60bjfxvz8i4ddgkp7ymr6n"
},
"stable": {
"version": [
4,
1,
- 1
+ 2
],
"deps": [
"compat",
"dash",
"seq"
],
- "commit": "93e86ceca7bf5b0ff9023d7f138e5f06990fc276",
- "sha256": "1ckjq068728wwfm4fv0z4rrdmrj09zvarip2s5rqdr8ny722dxfn"
+ "commit": "4992c3d1f64e0e983692c7a61d47069f47380dbf",
+ "sha256": "16ix3wsihqpzpx3709fx3wm2087q2miaxwfsh62xnq0nx5z9fl72"
}
},
{
@@ -76859,14 +76609,14 @@
"repo": "minad/marginalia",
"unstable": {
"version": [
- 20240926,
- 918
+ 20241124,
+ 1138
],
"deps": [
"compat"
],
- "commit": "be2e57efff640880251c082ac93bd365b7202e6a",
- "sha256": "1r1gyjk6f4628xhl6mj811507da2zyagn6hvrsvvvsvj5bgwxhsj"
+ "commit": "643a5f50c9f9d0698c8b1d72678886aefcf69052",
+ "sha256": "0lh7hgqkm4vhnnizarjw5zlxdpmjcmjrvmazzirk9rb7i72b56ia"
},
"stable": {
"version": [
@@ -76903,14 +76653,14 @@
"repo": "plandes/mark-thing-at",
"unstable": {
"version": [
- 20231019,
- 1111
+ 20241022,
+ 2232
],
"deps": [
"choice-program"
],
- "commit": "06cc38fb92c0c1badb06f6744f0110742ffdfe6c",
- "sha256": "12dnkicqqk22sqf9vmrxf9bdlmjq2z0x9b3vv3qf817rskz7xkwh"
+ "commit": "d9499bc82e214e35eac074303a64c023fb10ea5c",
+ "sha256": "0lmagbhm9fjz4bh1zwp0wwzraihf4rd1pp8i1jc75hfas827k5hg"
},
"stable": {
"version": [
@@ -77001,11 +76751,11 @@
"repo": "jrblevin/markdown-mode",
"unstable": {
"version": [
- 20240829,
- 324
+ 20241117,
+ 1510
],
- "commit": "6102ac5b7301b4c4fc0262d9c6516693d5a33f2b",
- "sha256": "0zbbbiqna372h06c3xj8abrh8nixrjig9ip09m342saa4mcr6c5j"
+ "commit": "b8637bae075231d70fe7f845305eaba2c0240d89",
+ "sha256": "1sz7l7kbdahczqg52f4qnfpvykzczgrc9iwfn32i8n2cbby25clk"
},
"stable": {
"version": [
@@ -77109,16 +76859,16 @@
"repo": "ardumont/markdown-toc",
"unstable": {
"version": [
- 20210905,
- 738
+ 20241129,
+ 1248
],
"deps": [
"dash",
"markdown-mode",
"s"
],
- "commit": "4e8f97d7d94c53fd706da9e3d5006e1c9dff5ff8",
- "sha256": "1lihgisgsyhn8vxp6p8nhjsf4c0193jv6bbn8kf0qvl5624xnk95"
+ "commit": "ba74a85ec94a638054ee65cbc8d95581946d018b",
+ "sha256": "0rm8hx0a2ppp0z4jl5c6kyhlwkrla6xvr2nkw7bl7wk46i9hh2g5"
},
"stable": {
"version": [
@@ -77346,28 +77096,30 @@
"repo": "martianh/mastodon.el",
"unstable": {
"version": [
- 20240920,
- 1839
+ 20241121,
+ 1724
],
"deps": [
"persist",
- "request"
+ "request",
+ "tp"
],
- "commit": "e593ad461ae275c641c6c4c90f67d62a920610a0",
- "sha256": "1jq54rz27xabwswwas9j254r9ldymza2la288vbh2w0nfbmnr1m9"
+ "commit": "cf6416313084a04e5028f46274e88284e2d120ee",
+ "sha256": "0pc5xjkzxhjwmcbmn9zsqw9z2yyh4vp4qbihk14qyzhz00ni113h"
},
"stable": {
"version": [
1,
- 0,
- 27
+ 1,
+ 6
],
"deps": [
"persist",
- "request"
+ "request",
+ "tp"
],
- "commit": "e593ad461ae275c641c6c4c90f67d62a920610a0",
- "sha256": "1jq54rz27xabwswwas9j254r9ldymza2la288vbh2w0nfbmnr1m9"
+ "commit": "cf6416313084a04e5028f46274e88284e2d120ee",
+ "sha256": "0pc5xjkzxhjwmcbmn9zsqw9z2yyh4vp4qbihk14qyzhz00ni113h"
}
},
{
@@ -77499,17 +77251,17 @@
},
{
"ename": "matlab-mode",
- "commit": "08b700ce0068646b51cd856df98ca583e21da8a1",
- "sha256": "1qxbcklmhwn4478chnf9n8hwc4qznjb7y8cj78a179hhws70l97j",
- "fetcher": "git",
- "url": "https://git.code.sf.net/p/matlab-emacs/src",
+ "commit": "9f8a242497f554bb87e5069d12b2c1a79d479c06",
+ "sha256": "1v5vr5lm6ss9awk4ymgjdqcy99pcwb17ix654d3as8v98zgxd46s",
+ "fetcher": "github",
+ "repo": "mathworks/Emacs-MATLAB-Mode",
"unstable": {
"version": [
- 20241006,
- 1633
+ 20241117,
+ 1628
],
- "commit": "c021c7f7c95f01bf9b0f10ee1e466658e3e65a1d",
- "sha256": "14j33vr2lnxnkby5pnpzslph797rqp0dzrz0jpg3zh3n7jh0k84m"
+ "commit": "390bca3fd9ac440e6c3dcdc524e77c7590423f08",
+ "sha256": "1dfv6f05v7i7966q39knilqjnz1rif4zg6cdk31sy6h8prc6arc3"
}
},
{
@@ -78091,20 +77843,20 @@
"repo": "meow-edit/meow",
"unstable": {
"version": [
- 20241014,
- 636
+ 20241201,
+ 1935
],
- "commit": "2f6fac3410640437b4b1aaf1bc373a5c5d558a8c",
- "sha256": "0yr3dh85mmk6mhs89rbm00pi3frz756qx3r41q0p1q9l67wp40am"
+ "commit": "2d352b94df1a4e633d7941acdafd7b13363eccef",
+ "sha256": "05q2ri3b5m3l3c5nkwgb6nkzrb6df0r3ldy8ysa32qqsn9zyaw9x"
},
"stable": {
"version": [
1,
- 4,
- 5
+ 5,
+ 0
],
- "commit": "54d4e933039827c158a4f593a94681a64e0d8042",
- "sha256": "0xv6wg4lyi5bv68h5hk5hfxdwxa2g3ybxd8z0l420az4rnhr6zhq"
+ "commit": "ebf7ebb5eb3ac7bb3cfaca9c32d9063f385aee9a",
+ "sha256": "1gfvqzp00vwbhxgp2wdcm4waba0r280dx0qbb7vpzyx93bqiplig"
}
},
{
@@ -78115,14 +77867,14 @@
"repo": "skissue/meow-tree-sitter",
"unstable": {
"version": [
- 20240701,
- 1422
+ 20241124,
+ 2224
],
"deps": [
"meow"
],
- "commit": "d8dce964fac631a6d44b650a733075e14854159c",
- "sha256": "0fzj8hnf9qiylx2b2s2vj8js32rd79gnw0x2c6l35zs9mm9dxm2x"
+ "commit": "d8e80d5ab97c85340b21be125f1e17edec2f21dd",
+ "sha256": "13r4s6nr0p5fj38swrgz5hnd12cazyigligr18ikwc6sxzz9yj9z"
},
"stable": {
"version": [
@@ -78728,6 +78480,30 @@
"sha256": "00wgf4jia9cxjpykzndsgn1jbnm6yqc7l3svfk2hj5j2ga1fax7g"
}
},
+ {
+ "ename": "miasma-theme",
+ "commit": "ebe44ef0683356abec66e834ae732f187a229893",
+ "sha256": "0k6159r5s889j3f3s9hiyy5qcfd2c7llrk18xwbyrdl1wndhwy7n",
+ "fetcher": "github",
+ "repo": "daut/miasma-theme.el",
+ "unstable": {
+ "version": [
+ 20241201,
+ 2218
+ ],
+ "commit": "c7a424832aaf982cdb2853b269f2b6fc43685195",
+ "sha256": "1l3zs0jxbbpnn18n9f22jgqsgpnk7bpy99is1nl163dhphna4jzz"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 4,
+ 0
+ ],
+ "commit": "c7a424832aaf982cdb2853b269f2b6fc43685195",
+ "sha256": "1l3zs0jxbbpnn18n9f22jgqsgpnk7bpy99is1nl163dhphna4jzz"
+ }
+ },
{
"ename": "mic",
"commit": "5a37253a8a1b2f107705c2f323f104c091f39204",
@@ -78894,14 +78670,14 @@
"repo": "countvajhula/mindstream",
"unstable": {
"version": [
- 20240908,
- 2036
+ 20241121,
+ 19
],
"deps": [
"magit"
],
- "commit": "cdcd2d234dec2c143c4e5a302c8ffde59a864f72",
- "sha256": "0fg41gjf1hz533gbvshhrfkzk78pyvhahf4h7kp1vrzlndxhnqfm"
+ "commit": "cad6a33c7e45f7c52f627d38d3d1f8f35a53413e",
+ "sha256": "1xvmm53s59fkg0cibcim0ivi258w26a2sg9aizg1gw3iqhyjy1rr"
},
"stable": {
"version": [
@@ -78956,15 +78732,15 @@
"repo": "liuyinz/mini-echo.el",
"unstable": {
"version": [
- 20241013,
- 438
+ 20241201,
+ 2106
],
"deps": [
"dash",
"hide-mode-line"
],
- "commit": "83b6c6f36d318943f33b347b87f8ce6bdc0cb852",
- "sha256": "1vkm5r5hbbysgp5hvjbym42d0m4v5jbanbb89z9l87rk17n90cjr"
+ "commit": "0e6054359a1826694d50a1be18c419b485ab3d81",
+ "sha256": "04hx6rk1snwjkpvgapqf9naqqac0klk6f0wlxfb9ndx6j60865hj"
},
"stable": {
"version": [
@@ -79187,14 +78963,14 @@
"repo": "tarsius/minions",
"unstable": {
"version": [
- 20240805,
- 1422
+ 20241123,
+ 2136
],
"deps": [
"compat"
],
- "commit": "413b95a0d1c7c10d0f8d440d1982062b73d5ea4a",
- "sha256": "10pxhsl9yr1nkbkhhvz5iq1q2dbcl315b6q02v23wmns66a9akya"
+ "commit": "e04415dc028ba252f079cfc7d6dff3059a047fbd",
+ "sha256": "1y5a7najnfi2bxpigf0j686z0i07ss81z8dxxsw1vsjxfn47rhl2"
},
"stable": {
"version": [
@@ -79254,6 +79030,21 @@
"sha256": "1yrawvvn3ndzzrllh408v4a5n0y0n5p1jczdm9r8pbxqgyknbk1n"
}
},
+ {
+ "ename": "minizinc-ts-mode",
+ "commit": "7b8db9ce73c5f88f8a4e0f99bdf1ae9171cd2d1f",
+ "sha256": "199rrkphi8dkx3ibzh2ixbqm8y96062snibdy2p1xrk5ls1z547g",
+ "fetcher": "github",
+ "repo": "AjaiKN/minizinc-ts-mode",
+ "unstable": {
+ "version": [
+ 20241202,
+ 17
+ ],
+ "commit": "0587165602bcf8c6ab768be9cfdc5465d1f1febd",
+ "sha256": "17xihxspc0rii0zz5996rn5zh99vqqya4jwnynkmv2jbpr843k7l"
+ }
+ },
{
"ename": "minor-mode-hack",
"commit": "ad10a684b4b2f01bc65883374f36fef156ff55d2",
@@ -79355,15 +79146,15 @@
"repo": "liuyinz/mise.el",
"unstable": {
"version": [
- 20240707,
- 1428
+ 20241106,
+ 1515
],
"deps": [
"dash",
"inheritenv"
],
- "commit": "20179a58132e5518a0868eac01dcd1d72db2e254",
- "sha256": "0s81nsk500g5aqh1d8q3rbp4b9jkv4msfxsiqbgkf60ypzchc3zp"
+ "commit": "6e32b3787dd926cc9d8e9202b5aaa82682398261",
+ "sha256": "10irz22ph0ic9v6l4x1m072nwq63d5j1i7jj01mmh428dnwc84v5"
},
"stable": {
"version": [
@@ -79387,19 +79178,19 @@
"repo": "szermatt/mistty",
"unstable": {
"version": [
- 20241013,
- 1752
+ 20241124,
+ 1049
],
- "commit": "92ce320189c26b7368df5b52a8338c126eb5b7eb",
- "sha256": "0byxmxaqmh8v008al2420rw3ibwyf2jwk0ylfpci2h27r2cmpx9y"
+ "commit": "45f1b757a3c4bc75103a8eb3c687cd3c08b137c1",
+ "sha256": "0drssrc36pn6fafc45lgvk5iskz0970hjqr2v1ri8xrymvrb9idh"
},
"stable": {
"version": [
1,
- 1
+ 2
],
- "commit": "d2e1ba09bef4d8cac31c4128c29fdd275f065988",
- "sha256": "1j7ylsmly1ifq6qlx8xaxsd8cy7s47rf9zndcxg3xwj718mwdhdk"
+ "commit": "f70ea7f5c91f5df6ac0d3a09eaccc283fbdbce70",
+ "sha256": "16l0smp5y2ss9802jijjxs0v42sgcswlpambkc4fa17n47zbb4g1"
}
},
{
@@ -79467,20 +79258,20 @@
"repo": "jdtsmith/mlscroll",
"unstable": {
"version": [
- 20240606,
- 1855
+ 20241021,
+ 255
],
- "commit": "805d913771270f8157730f634108a237ca03137e",
- "sha256": "0id3jglmqvzdpl5r26czxyb5vf0namvcxrql9b8djanvkd1pasz4"
+ "commit": "c1bc37709c27d005190d7fcd6a17376b9413381f",
+ "sha256": "1fp166qgsj95smg2918r33pw5vpwwd395fr6xd7y7asjbwzaqpjy"
},
"stable": {
"version": [
0,
2,
- 1
+ 2
],
- "commit": "805d913771270f8157730f634108a237ca03137e",
- "sha256": "0id3jglmqvzdpl5r26czxyb5vf0namvcxrql9b8djanvkd1pasz4"
+ "commit": "c1bc37709c27d005190d7fcd6a17376b9413381f",
+ "sha256": "1fp166qgsj95smg2918r33pw5vpwwd395fr6xd7y7asjbwzaqpjy"
}
},
{
@@ -79984,20 +79775,20 @@
"repo": "protesilaos/modus-themes",
"unstable": {
"version": [
- 20241007,
- 1332
+ 20241120,
+ 542
],
- "commit": "817ff75d11599b65acf583e0f8b5d69163550299",
- "sha256": "0jd9xdc5d56zdvxqgmgg2wimn3ds20vw7ss0jhakl31ndr8izbp9"
+ "commit": "df1798234edd56678da975d0d65b64bdebafc314",
+ "sha256": "0n7sbap1y72l9z8ifngfkl1bm2zgmx570i2dc0yd41la54q9ka0r"
},
"stable": {
"version": [
4,
- 5,
+ 6,
0
],
- "commit": "db70c2ca923261591419de084f9e4c806b409b60",
- "sha256": "04nr06w7zvvkk0m368pkp4pdlv6m91qnxizrvns2530prddb4c7i"
+ "commit": "895e10936adac93aa8187c9cc91092dbca898677",
+ "sha256": "05vzbjhas9a4zapjk2d57a6ljabf2q24d9c1zxncyff8kyimzkq2"
}
},
{
@@ -80669,20 +80460,20 @@
"repo": "amnn/move-mode",
"unstable": {
"version": [
- 20240409,
- 2159
+ 20241118,
+ 1527
],
- "commit": "f974cc69f279c45026f7386e0194be74779334a8",
- "sha256": "1wz3dw39bv351gxqwis7lbsynr04fniprymjdb0xdcfhdfxnpy3x"
+ "commit": "6e4aaf6aae1e9b4aee096557c9f7b1f3550a1e59",
+ "sha256": "0fdksdq8dmi9ixmsn7yyc7y50kfqsv2zbv8gqg4ir6d0jqbrvnhz"
},
"stable": {
"version": [
1,
1,
- 0
+ 1
],
- "commit": "f974cc69f279c45026f7386e0194be74779334a8",
- "sha256": "1wz3dw39bv351gxqwis7lbsynr04fniprymjdb0xdcfhdfxnpy3x"
+ "commit": "6e4aaf6aae1e9b4aee096557c9f7b1f3550a1e59",
+ "sha256": "0fdksdq8dmi9ixmsn7yyc7y50kfqsv2zbv8gqg4ir6d0jqbrvnhz"
}
},
{
@@ -81020,11 +80811,11 @@
"repo": "kljohann/mpv.el",
"unstable": {
"version": [
- 20220801,
- 1917
+ 20241121,
+ 2308
],
- "commit": "2e0234bc21a3dcdf12d94d3285475e7f6769d3e8",
- "sha256": "0mvzg2wqpycny2dmiyp8jm0fflvll7ay6scvsb9rxgfwimr2vbw5"
+ "commit": "62cb8825d525d7c9475dd93d62ba84d419bc4832",
+ "sha256": "1r3z9mhz9mbjz82g5ljjh559f2awh5cfg1vv3qdgqk6djvwzhpay"
},
"stable": {
"version": [
@@ -81325,20 +81116,20 @@
"repo": "mkcms/mu4e-overview",
"unstable": {
"version": [
- 20240521,
- 1445
+ 20241201,
+ 1012
],
- "commit": "51327c894721680633292a43a4e610542b4eceb3",
- "sha256": "1pxapgihcf5c8ycmqzd2gysm0v6r0pw41kbym4xdwyqr6alhz94a"
+ "commit": "25a1c0c5fbac240e5faa1518b511609b709e3c53",
+ "sha256": "0q2xc3dpg70j3xk9f6c7wpiznvmscdfggzxkf8c4xxg4jfvbdcxh"
},
"stable": {
"version": [
0,
- 4,
- 1
+ 5,
+ 0
],
- "commit": "11e16c36aaa14da777a068761055b57c49168f1e",
- "sha256": "0hi2waz0bwzsq3sk6x7zdx7qn3dns82rphpnfd9r7cqyqjlmzy74"
+ "commit": "25a1c0c5fbac240e5faa1518b511609b709e3c53",
+ "sha256": "0q2xc3dpg70j3xk9f6c7wpiznvmscdfggzxkf8c4xxg4jfvbdcxh"
}
},
{
@@ -81445,8 +81236,8 @@
"repo": "mihaiolteanu/mugur",
"unstable": {
"version": [
- 20240517,
- 504
+ 20241028,
+ 828
],
"deps": [
"anaphora",
@@ -81454,8 +81245,8 @@
"dash",
"s"
],
- "commit": "7fe7f6a9dd80389fcd9754e9191192e697a88882",
- "sha256": "010jns9id9gxggxgd2d3wpjag1nf8ahqmq57a3mdmfrr1lnvvxzi"
+ "commit": "757e06ba7a062a12e5976a5ce2a47f23eaa454af",
+ "sha256": "1hfbib09a224dysh9synwqzdj3rrgcl2az9zm05xcnlbxcnhgjv4"
},
"stable": {
"version": [
@@ -81698,14 +81489,14 @@
"repo": "magnars/multiple-cursors.el",
"unstable": {
"version": [
- 20240223,
- 1134
+ 20241201,
+ 1841
],
"deps": [
"cl-lib"
],
- "commit": "c870c18462461df19382ecd2f9374c8b902cd804",
- "sha256": "1703ca0k0mlvjh7l0jv2nzgzah8ixb3n9av725cs2c07cih6vhsa"
+ "commit": "46635e7f693560213b56ca8eca1adb13559672e5",
+ "sha256": "19ldrdwpv7ga4vk3lx397zl875kdnr94apg3ni5manr2x0fdcl2c"
},
"stable": {
"version": [
@@ -82826,20 +82617,20 @@
"repo": "babashka/neil",
"unstable": {
"version": [
- 20240701,
- 1458
+ 20241017,
+ 1337
],
- "commit": "054ca51542837fec87e289a74ab139b4ae6e108b",
- "sha256": "1jhpk9h9dv1zqba9076lvvy5cayirb49fzw9gfrqi1qp8zqi41cb"
+ "commit": "78ffab1868dc04b2eec5d7195d2d8f92c416e528",
+ "sha256": "0z3imz4b2j64pri0nml3v4lhlycw5ah271q4qi5g8qifbfn9anms"
},
"stable": {
"version": [
0,
3,
- 67
+ 68
],
- "commit": "054ca51542837fec87e289a74ab139b4ae6e108b",
- "sha256": "1jhpk9h9dv1zqba9076lvvy5cayirb49fzw9gfrqi1qp8zqi41cb"
+ "commit": "78ffab1868dc04b2eec5d7195d2d8f92c416e528",
+ "sha256": "0z3imz4b2j64pri0nml3v4lhlycw5ah271q4qi5g8qifbfn9anms"
}
},
{
@@ -82927,11 +82718,11 @@
"repo": "rainstormstudio/nerd-icons.el",
"unstable": {
"version": [
- 20240816,
- 1555
+ 20241106,
+ 1533
],
- "commit": "c3d641d8e14bd11b5f98372da34ee5313636e363",
- "sha256": "0dmi01x8vk165i8161scqg3vmaspfih6pblr3iaw8ksp5ps1hnlf"
+ "commit": "a6ee08f1619bcde1a69b2defcfe8970c983640c1",
+ "sha256": "16k8wlvpxmjbvrn6abkgk6f97im9d1vhxlwmf81ypfrj9x05fwqg"
},
"stable": {
"version": [
@@ -82970,26 +82761,26 @@
"repo": "LuigiPiucco/nerd-icons-corfu",
"unstable": {
"version": [
- 20231019,
- 1618
+ 20241101,
+ 2309
],
"deps": [
"nerd-icons"
],
- "commit": "7077bb76fefc15aed967476406a19dc5c2500b3c",
- "sha256": "13m20k242zma6jw7pkbw89fk3dnbkwdajcpiyay5xx2l9241snb7"
+ "commit": "721830b42b35e326a88b338fc53e4752f333fad2",
+ "sha256": "0mls7hz1c2f68lzj4g38plgxyndr3km8lpzyi91ssg4j61zmrbgm"
},
"stable": {
"version": [
0,
- 3,
- 0
+ 4,
+ 2
],
"deps": [
"nerd-icons"
],
- "commit": "cbc14c73032ebe1b2043757221d198ff6be1b670",
- "sha256": "05hnq6yv0xcisk5vkdzjz2sdzn4cayirf3zyz40xj1pzf33lra4r"
+ "commit": "721830b42b35e326a88b338fc53e4752f333fad2",
+ "sha256": "0mls7hz1c2f68lzj4g38plgxyndr3km8lpzyi91ssg4j61zmrbgm"
}
},
{
@@ -83235,11 +83026,11 @@
"repo": "vekatze/neut-mode",
"unstable": {
"version": [
- 20240929,
- 553
+ 20241130,
+ 1223
],
- "commit": "4c2d56fdd6295589439ffef214666452cc45c7d6",
- "sha256": "0870c7wmvk1bbh1xh826qgjcnizm662db8n8i9iaqh0dslmr0qd3"
+ "commit": "2373c428f314948d433cb6070b237b6243922312",
+ "sha256": "1zvngs8fnpywgn7ryrdb78rj0b730fy1brbl1zqzqzhb4rj54pxh"
}
},
{
@@ -83557,17 +83348,17 @@
},
{
"ename": "ninja-mode",
- "commit": "f9103b6c58996e75c0e5c23fc0fb12afd65424c0",
- "sha256": "0r0hjrw79bj67r79kfqikcmxnn93d324l3zlh203kvnzvrggfwra",
+ "commit": "7c157fd47c9b7783c8bef103eaa42d0f5a626026",
+ "sha256": "1xsx71znz85afr73a3nz2ks85bak6fa7kanp48k2bmigy3r4b6j5",
"fetcher": "github",
- "repo": "ninja-build/ninja",
+ "repo": "ninja-build/ninja-emacs",
"unstable": {
"version": [
- 20240528,
- 1945
+ 20241103,
+ 1737
],
- "commit": "0b4b43aa3e2fee391443dcc0c961c9d2354d8954",
- "sha256": "1g779g7x1d0f7vi7d2sraqmd9zsccnmglp9fn7w5146swqpgsvqp"
+ "commit": "573c3aaedc6e90e9a8954bb70a24e079af7df390",
+ "sha256": "04cjm43fikdrwv5qg6czq6gkm1mv351b0m35nhvw520vyc79scgc"
},
"stable": {
"version": [
@@ -83706,10 +83497,10 @@
},
{
"ename": "nix-sandbox",
- "commit": "258a113cb0f7902ca083c931c064c093b3721b52",
- "sha256": "1kiscg761zx4mnq2hksfzmdz0g9b7z7lzm8ncy0dgs40yb803ijv",
+ "commit": "7f298cdc6773f3aeb7baf9c6a32c97d2b60f55a3",
+ "sha256": "1zs10qf28imnzhrh9r398m4zciar86m2j6r899pnlk7z1xllkbnj",
"fetcher": "github",
- "repo": "travisbhartwell/nix-emacs",
+ "repo": "nix-community/nix-emacs",
"unstable": {
"version": [
20210325,
@@ -83755,11 +83546,11 @@
"repo": "jwiegley/nix-update-el",
"unstable": {
"version": [
- 20220816,
- 2212
+ 20241123,
+ 2159
],
- "commit": "aab70a38165575a9cb41726f1cc67df60fbf2832",
- "sha256": "01cc86wvlwl5sy758vcjhwwh1has4ng6sqyrsd5y610qahs8cbib"
+ "commit": "77022ccd918d665acbb519b243e7e3dc5eae1c47",
+ "sha256": "18p4wf3f149n27d1divkzd39y1iy75ig2986flzfd06l8x1d2fa3"
}
},
{
@@ -83782,10 +83573,10 @@
},
{
"ename": "nixos-options",
- "commit": "6846c7d86e70a9dd8300b89b61435aa7e146be96",
- "sha256": "1m3jipidk10zj68rzjbacgjlal31jf80gqjxlgj4qs8lm671gxmm",
+ "commit": "7f298cdc6773f3aeb7baf9c6a32c97d2b60f55a3",
+ "sha256": "12dl59wa2b3qpdaprjllfbybaazxc9qp1bs2rq8ygdkr56v12nvx",
"fetcher": "github",
- "repo": "travisbhartwell/nix-emacs",
+ "repo": "nix-community/nix-emacs",
"unstable": {
"version": [
20160209,
@@ -83894,17 +83685,15 @@
"repo": "dickmao/nndiscourse",
"unstable": {
"version": [
- 20230705,
- 1229
+ 20241014,
+ 2134
],
"deps": [
- "anaphora",
- "dash",
"json-rpc",
"rbenv"
],
- "commit": "d54edbd7cf6b75c5101a961cab54efbafef7d80e",
- "sha256": "0c38j3drf89f98b6h3xcky6alggszrr86325g72mlbkknszkhh95"
+ "commit": "c8aaf40d3d8f10b0bbb40fa60a2d98c864b05aaf",
+ "sha256": "1kw023rc4a0p0k6zvq03nr4k6ndc6p6h7s70y2macabn4z1z3fyq"
}
},
{
@@ -83950,8 +83739,8 @@
"repo": "dickmao/nnreddit",
"unstable": {
"version": [
- 20240629,
- 2347
+ 20241014,
+ 1932
],
"deps": [
"anaphora",
@@ -83961,8 +83750,8 @@
"s",
"virtualenvwrapper"
],
- "commit": "f8e26834b523c03dfcb0c751373123ffd32b8522",
- "sha256": "1a0b0dk578kw33qgfbb4zvqnc4cmix4mfwrlqy2rcg13z3ax39c7"
+ "commit": "4f8f6e8d1bf584a2bdbb4e9039576ad361f9636d",
+ "sha256": "0mxqgx7dajlxzvpasj03n2sg42iv7aivzdrszkxmx2ayc8dlx1gz"
}
},
{
@@ -84026,26 +83815,26 @@
"repo": "emacscollective/no-littering",
"unstable": {
"version": [
- 20241001,
- 1020
+ 20241201,
+ 2109
],
"deps": [
"compat"
],
- "commit": "7474c55122f568212103efe325f347ee05878f70",
- "sha256": "04vwi1w6j80s2nlz7r1md82fxdckryncr93ixrif4xzqdwlbb0x9"
+ "commit": "74431db47edf44fc1f5f013033560f7bc4f26f24",
+ "sha256": "0l88l1np4s5925d6i33l1cas8mk0nwbgbyw7fa1akzj8qv6782sm"
},
"stable": {
"version": [
1,
7,
- 3
+ 4
],
"deps": [
"compat"
],
- "commit": "7474c55122f568212103efe325f347ee05878f70",
- "sha256": "04vwi1w6j80s2nlz7r1md82fxdckryncr93ixrif4xzqdwlbb0x9"
+ "commit": "74431db47edf44fc1f5f013033560f7bc4f26f24",
+ "sha256": "0l88l1np4s5925d6i33l1cas8mk0nwbgbyw7fa1akzj8qv6782sm"
}
},
{
@@ -84707,11 +84496,11 @@
"repo": "muirdm/emacs-nova-theme",
"unstable": {
"version": [
- 20230906,
- 1542
+ 20240904,
+ 2127
],
- "commit": "ca1a4cb71452ece3e18c0c46f9e7abc20f7123ca",
- "sha256": "1gi1zbgbwjlw7sd8433xplg1zm9a7kp8i4y76b4vfn0g5ybhvqcz"
+ "commit": "51b2899ac56c29638d11336d3b2a9894bb35b86e",
+ "sha256": "1bk5cg1kq62pg0gdw97vlfgjxkifj5xhr8ippyic04dv02b3kkz8"
}
},
{
@@ -85457,32 +85246,32 @@
},
{
"ename": "ob-chatgpt-shell",
- "commit": "deb0341c1559472ae28a2dbd72b3d83340232b8d",
- "sha256": "1gy5zcznzaialvnxfdyia847i974n41hzwsrg0fcgj4s6abhcsw4",
+ "commit": "bd7bfd8814e2e81d4022984f6b2baf2b1d1d0225",
+ "sha256": "025qr0jwf9w3px7azdrjh625r7rjp1cj4ynjczpqyfm8m0xzfipi",
"fetcher": "github",
- "repo": "xenodium/chatgpt-shell",
+ "repo": "xenodium/ob-chatgpt-shell",
"unstable": {
"version": [
- 20241011,
- 805
+ 20241118,
+ 1001
],
"deps": [
"chatgpt-shell"
],
- "commit": "08c8a6dec6a5b1a23d4ae3f4312dc6c92d1a09a1",
- "sha256": "04byw3zz06fr1g185p55pdaf5bqxj3mssldbh089pmx10qdmaxqi"
+ "commit": "754ddf54a99bd98427c91a6c7374757026f8bd45",
+ "sha256": "19xj8vm7kkv4a1xa7l5lrz1fk14v34pcbly8i3fpjqx1wgj04waa"
},
"stable": {
"version": [
1,
- 8,
+ 20,
1
],
"deps": [
"chatgpt-shell"
],
- "commit": "08c8a6dec6a5b1a23d4ae3f4312dc6c92d1a09a1",
- "sha256": "04byw3zz06fr1g185p55pdaf5bqxj3mssldbh089pmx10qdmaxqi"
+ "commit": "a24c003c79a720eafffc79bc3885070735f667f6",
+ "sha256": "161q8d2b4sq481jh4zwagvh88wg51dsnf76n2l2b7wv3nh7cjh2m"
}
},
{
@@ -85630,32 +85419,32 @@
},
{
"ename": "ob-dall-e-shell",
- "commit": "578e261826b0825cdcae0ab07bea4226bdef7fa3",
- "sha256": "1ljqcg9qa3av6r4512f7sym641dymjv4fnymhw1sqz8bjgq0m775",
+ "commit": "bd7bfd8814e2e81d4022984f6b2baf2b1d1d0225",
+ "sha256": "1b2xbnwr01fax1qsknh1vcwlhhd5phwvgjd8014bnf370xzwb4fi",
"fetcher": "github",
- "repo": "xenodium/chatgpt-shell",
+ "repo": "xenodium/ob-dall-e-shell",
"unstable": {
"version": [
- 20241011,
- 805
+ 20241112,
+ 2008
],
"deps": [
"dall-e-shell"
],
- "commit": "08c8a6dec6a5b1a23d4ae3f4312dc6c92d1a09a1",
- "sha256": "04byw3zz06fr1g185p55pdaf5bqxj3mssldbh089pmx10qdmaxqi"
+ "commit": "1ef7951bf47f63d2d0808c3f475f82eac8c9b219",
+ "sha256": "0188whx3yr0p8c6xzx5zmh1rxavan8a6z6ibmzfhsxgj8a1zid6f"
},
"stable": {
"version": [
1,
- 8,
+ 20,
1
],
"deps": [
"dall-e-shell"
],
- "commit": "08c8a6dec6a5b1a23d4ae3f4312dc6c92d1a09a1",
- "sha256": "04byw3zz06fr1g185p55pdaf5bqxj3mssldbh089pmx10qdmaxqi"
+ "commit": "a24c003c79a720eafffc79bc3885070735f667f6",
+ "sha256": "161q8d2b4sq481jh4zwagvh88wg51dsnf76n2l2b7wv3nh7cjh2m"
}
},
{
@@ -86642,15 +86431,15 @@
"repo": "xenodium/ob-swiftui",
"unstable": {
"version": [
- 20231009,
- 918
+ 20241119,
+ 1735
],
"deps": [
"org",
"swift-mode"
],
- "commit": "af65a8e60602ca90ab3f61811190a3da67ac0414",
- "sha256": "1cyv3f4h7dj9fhlgivgh7mqgaaf7q5mxs4mmp833sh0mgk4p6vmk"
+ "commit": "c16b4cddb5387fcebdd1d61a4c6c015f778d2d08",
+ "sha256": "0lqff7cjxc0x4xdza2jm58gbg6rbwfg0w7112jpfvyp98x025abm"
}
},
{
@@ -86941,20 +86730,20 @@
"repo": "ocaml-ppx/ocamlformat",
"unstable": {
"version": [
- 20240924,
- 756
+ 20241129,
+ 1514
],
- "commit": "f8e16b3d70e5418db11a096108093d2a55012704",
- "sha256": "1n0vc32kfmhqpygsqdga64hxvyyygq25g606dpqljydq425ncaq4"
+ "commit": "72cbfd716e619cb8ae3ae52cc0c5288eb2a2f2a8",
+ "sha256": "0fz8a92xdims2rnmhlv60yv5ylci80n4qgavg6jsfaf6fljz13gg"
},
"stable": {
"version": [
0,
- 26,
- 2
+ 27,
+ 0
],
- "commit": "f5727b32127730a2722f86c7119eb6d8f884e26d",
- "sha256": "0qkralffnq141ksl5y6564lmryqhks72kvf3rblg8pnzjbcsad5v"
+ "commit": "72cbfd716e619cb8ae3ae52cc0c5288eb2a2f2a8",
+ "sha256": "0fz8a92xdims2rnmhlv60yv5ylci80n4qgavg6jsfaf6fljz13gg"
}
},
{
@@ -87332,20 +87121,20 @@
"repo": "rnkn/olivetti",
"unstable": {
"version": [
- 20240727,
- 431
+ 20241030,
+ 542
],
- "commit": "1a6a521273e70173af6dcf34e3c9f8bb97dd7afc",
- "sha256": "0ngafkirgfhcq8vkphwd9z4whxwlv62y17a9ihav8f31v5d4kbm1"
+ "commit": "845eb7a95a3ca3325f1120c654d761b91683f598",
+ "sha256": "0hpw8q4x1ns6l838r2m0zfm7ykxsrfx893bvsn92nsn6k10p0yvr"
},
"stable": {
"version": [
2,
0,
- 6
+ 7
],
- "commit": "1a6a521273e70173af6dcf34e3c9f8bb97dd7afc",
- "sha256": "0ngafkirgfhcq8vkphwd9z4whxwlv62y17a9ihav8f31v5d4kbm1"
+ "commit": "b64c0ac8c3ec9bdc67373fa754fe493be4cc81bd",
+ "sha256": "0q1z07z0nkvzplmsqni25hqhv81x3r7f1xahjjkskmllrhksz0bh"
}
},
{
@@ -88232,26 +88021,26 @@
"repo": "rksm/org-ai",
"unstable": {
"version": [
- 20240806,
- 1340
+ 20241020,
+ 644
],
"deps": [
"websocket"
],
- "commit": "0184f063484cfd8079aa9aa30fa171a7a47f465e",
- "sha256": "18y9c86zj88kijl205h34ra6kqqb5bljshng6sfr51833yjd4vc7"
+ "commit": "5adfde1bc7db9026747fbfae4c154eeac4ef8e59",
+ "sha256": "1h7cmrvj64zfdxx28a4ajmbibf30ff5a680s5hvlv5lmn13isg12"
},
"stable": {
"version": [
0,
5,
- 1
+ 4
],
"deps": [
"websocket"
],
- "commit": "812b59f88851536ed3ded199fb55d303c16c7c12",
- "sha256": "00f6k2gcglcr5mwdr3ixy5gazn2p1dnw3cvzsvzz870pl855f8fk"
+ "commit": "5adfde1bc7db9026747fbfae4c154eeac4ef8e59",
+ "sha256": "1h7cmrvj64zfdxx28a4ajmbibf30ff5a680s5hvlv5lmn13isg12"
}
},
{
@@ -88467,6 +88256,36 @@
"sha256": "1slb8sy6zjdb3rs67vw0k1hd12fwlby1kbjyhn4n7v3kblxff2y3"
}
},
+ {
+ "ename": "org-auto-export-pandoc",
+ "commit": "caa8d7c66b896f468f578eb39c7887e62afcae3c",
+ "sha256": "0phx71gnrpadjcg267bhljpg6xp1n1ki6piv619k8icg30zih5hq",
+ "fetcher": "github",
+ "repo": "Y0ngg4n/org-auto-export-pandoc",
+ "unstable": {
+ "version": [
+ 20241026,
+ 832
+ ],
+ "deps": [
+ "ox-pandoc"
+ ],
+ "commit": "4c63da7ed3c6bae6fd512d2b886ed3c57c850219",
+ "sha256": "035c3plxyh14ipg8paqk8wzf85rml8g14jyssh0bjn7hfca0lyzk"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 0,
+ 1
+ ],
+ "deps": [
+ "ox-pandoc"
+ ],
+ "commit": "caba13b56e32ba49ab9eca01a60b7e6edcdbb786",
+ "sha256": "1sccpi70g1gdd2i82808c1vg5d0fbyn8jnipak8sfgykpk0vxccm"
+ }
+ },
{
"ename": "org-auto-tangle",
"commit": "8cdae87606068b7b47530e0744e91aead86d288e",
@@ -88505,25 +88324,25 @@
"repo": "zondo/org-autoexport",
"unstable": {
"version": [
- 20240902,
- 2253
+ 20241130,
+ 1655
],
"deps": [
"org"
],
- "commit": "54b5e836c36d8faa9a3cc67ec1fe52f38b2c3c83",
- "sha256": "1914rkjpfrmbdvcy1ac487v464bkynzi1vicp7ci2kv4fqjw4rnh"
+ "commit": "f5819f21ba4a92d1742371a3422102bb965f0706",
+ "sha256": "1fpn2f0fl32n4hqsdfvld1qfz5xz8d0hv16wak2mhn5ssw4qw68j"
},
"stable": {
"version": [
1,
- 0
+ 1
],
"deps": [
"org"
],
- "commit": "47acc4a367c621075cfd27ddc3ad7c9282865771",
- "sha256": "11a93qs86jxwvwsjvda6c51gg1db1w6zwp2disd3bnplbrsyskdr"
+ "commit": "0d3944d055ce4e8922991f892418a9bafd3eba15",
+ "sha256": "1fpn2f0fl32n4hqsdfvld1qfz5xz8d0hv16wak2mhn5ssw4qw68j"
}
},
{
@@ -88666,14 +88485,14 @@
"url": "https://repo.or.cz/org-bookmarks.git",
"unstable": {
"version": [
- 20240906,
- 1018
+ 20241115,
+ 1106
],
"deps": [
"nerd-icons"
],
- "commit": "42e1100b0e99bf91b532d7e06d246a2f2660d853",
- "sha256": "0kaawmf3d5smvpgyb411mp5zypznw9q715gz05kbb852y0qw31yw"
+ "commit": "22c8d837b01b0967910d731592402b57f6d2a3e9",
+ "sha256": "0j6yraf7h6iri6aq5qbxkg38p4rzvvg0b7i6cb20xvqp4sl9rv58"
},
"stable": {
"version": [
@@ -89313,14 +89132,14 @@
"repo": "abo-abo/org-download",
"unstable": {
"version": [
- 20220906,
- 1929
+ 20241118,
+ 1846
],
"deps": [
"async"
],
- "commit": "19e166f0a8c539b4144cfbc614309d47a9b2a9b7",
- "sha256": "0a2nw2vf9j335yz40x10q0vmnhxkn9frrm82apvjqsl5p7igvzvs"
+ "commit": "c8be2611786d1d8d666b7b4f73582de1093f25ac",
+ "sha256": "17i4fc0fy8icmw46i49y8vnmvf71r6zq7g2cz55f0v940b3g7ri7"
},
"stable": {
"version": [
@@ -90406,15 +90225,15 @@
"repo": "seokbeomKim/org-linenote",
"unstable": {
"version": [
- 20240410,
- 410
+ 20241201,
+ 1208
],
"deps": [
"projectile",
"vertico"
],
- "commit": "a015295ebf271c8b518238f7969a0b6e60429805",
- "sha256": "1jn22rvlxy5d2p56vm2jgs5jz4nm76ji4xmd71pnc18x2ci2p2c8"
+ "commit": "bbf8ea8667003ffbda497b8ec21aedeca0ab0ff0",
+ "sha256": "1zprrslqz0dzf6dfypgzs9xbsc25647r2xwd28pzag6yzd7mcf2z"
}
},
{
@@ -90425,16 +90244,16 @@
"url": "https://repo.or.cz/org-link-beautify.git",
"unstable": {
"version": [
- 20240930,
- 1046
+ 20241130,
+ 1258
],
"deps": [
"fb2-reader",
"nerd-icons",
"qrencode"
],
- "commit": "b232a19ed4cc45291d31c6a4ca1eb185fd0247cb",
- "sha256": "0ywyjm7pq4cxvbndkz5q6hbbxwrp3lprpix16cwmc8g2pyaz8wsv"
+ "commit": "d3428752d3e961087ccc462593bd1a0922d3bb67",
+ "sha256": "1dcnpmbww6w96nw2bckzmq0mfk3w2zgks7xfxi3bpvwiqm512h1g"
},
"stable": {
"version": [
@@ -90750,11 +90569,11 @@
"repo": "bpanthi977/org-mpv-notes",
"unstable": {
"version": [
- 20240926,
- 138
+ 20241119,
+ 1627
],
- "commit": "22b9ac4c0bf3144f0a8ac3fb370efe0ac074d128",
- "sha256": "0rapddcqsca5w9cfvdxwabw8qxql3dd03kfix1zlskwx1iiypvjj"
+ "commit": "f6c0fc5546cf7168d997a3605cce7c08714cb599",
+ "sha256": "013c90h8qajil7wk1m1q6kqxgl5812bd004lqn0k886mahfm75qn"
}
},
{
@@ -90924,28 +90743,30 @@
"repo": "meedstrom/org-node",
"unstable": {
"version": [
- 20241007,
- 2215
+ 20241201,
+ 2012
],
"deps": [
"compat",
+ "el-job",
"llama"
],
- "commit": "886a0a08b8ab9c8537cc15c39af9463926d04446",
- "sha256": "0ma5cn57dng5i1jmq9q7nh9a9sdnm5jlihyd4xgn465q4dqsch2p"
+ "commit": "c1e8d8b1e8bf9463c7b97f290a8307184a19c041",
+ "sha256": "05gniyrl3pffdaa6kbb5cssvmi0gjg6isnyk17zl3c23lf3s4mnf"
},
"stable": {
"version": [
1,
- 5,
- 2
+ 9,
+ 10
],
"deps": [
"compat",
+ "el-job",
"llama"
],
- "commit": "886a0a08b8ab9c8537cc15c39af9463926d04446",
- "sha256": "0ma5cn57dng5i1jmq9q7nh9a9sdnm5jlihyd4xgn465q4dqsch2p"
+ "commit": "c1e8d8b1e8bf9463c7b97f290a8307184a19c041",
+ "sha256": "05gniyrl3pffdaa6kbb5cssvmi0gjg6isnyk17zl3c23lf3s4mnf"
}
},
{
@@ -90956,8 +90777,8 @@
"repo": "meedstrom/org-node-fakeroam",
"unstable": {
"version": [
- 20241005,
- 1718
+ 20241127,
+ 1306
],
"deps": [
"compat",
@@ -90965,14 +90786,14 @@
"org-node",
"org-roam"
],
- "commit": "3e84dee8641191c87cc5a9e74999b2396db92972",
- "sha256": "13pkrzldbbn1n5hc967baqhd2ncdfh1fdcw8f4107mbvbfh3g3v9"
+ "commit": "288d897e12713db7d15162ccf3bdc93147f00943",
+ "sha256": "1lrkqv5bkz2f15vp50j95nnffhl3ibbh47nq4mbl14wqil1bp89m"
},
"stable": {
"version": [
1,
- 2,
- 6
+ 6,
+ 4
],
"deps": [
"compat",
@@ -90980,8 +90801,8 @@
"org-node",
"org-roam"
],
- "commit": "3e84dee8641191c87cc5a9e74999b2396db92972",
- "sha256": "13pkrzldbbn1n5hc967baqhd2ncdfh1fdcw8f4107mbvbfh3g3v9"
+ "commit": "288d897e12713db7d15162ccf3bdc93147f00943",
+ "sha256": "1lrkqv5bkz2f15vp50j95nnffhl3ibbh47nq4mbl14wqil1bp89m"
}
},
{
@@ -91503,8 +91324,8 @@
"repo": "alphapapa/org-ql",
"unstable": {
"version": [
- 20240916,
- 2325
+ 20241107,
+ 345
],
"deps": [
"compat",
@@ -91519,14 +91340,14 @@
"transient",
"ts"
],
- "commit": "b6f8a315e966123fbfd1ac240d35da5c2b48d6ac",
- "sha256": "0661v0rpiq2qa6kz8fl9h3i52idisf3azr8xmanqa3n339ib2z70"
+ "commit": "a5650e2be831ae130af8d9f5419bcb141e36b1d4",
+ "sha256": "1008hjqrlcc5pm6zw65p42ivf6gljj3mivvkinv8byyqkanrhklb"
},
"stable": {
"version": [
0,
8,
- 9
+ 10
],
"deps": [
"compat",
@@ -91541,8 +91362,8 @@
"transient",
"ts"
],
- "commit": "81281350d44a3903a0866431342299f5f3c74beb",
- "sha256": "1mw07y82r3b9brphx2j8gj95rbs4632fgq0b79824zqpwm8m291j"
+ "commit": "9c53c1bddfcbda3475ffd8810f012be6de07d963",
+ "sha256": "043m90flbmmcaiv1n5lfw6pd5hr978r9kqbhy34rgyzm0k34sk72"
}
},
{
@@ -91815,8 +91636,8 @@
"repo": "jkitchin/org-ref",
"unstable": {
"version": [
- 20240802,
- 1213
+ 20241124,
+ 2012
],
"deps": [
"avy",
@@ -91832,8 +91653,8 @@
"request",
"s"
],
- "commit": "fd178abf12a85f8e12005d1df683564bdc534124",
- "sha256": "0rdi1n4vay93xs7gwxxmivg3lq13sk10f0g505z0hagzcv2f48w7"
+ "commit": "a61fe2a76294dcf4b216c25f789c4dba15f5986d",
+ "sha256": "05fb0ihnflm14z4fhphjx3zfg172asmjl8lf602vgimyj28xbidy"
},
"stable": {
"version": [
@@ -91942,11 +91763,11 @@
"repo": "brabalan/org-review",
"unstable": {
"version": [
- 20230119,
- 1706
+ 20241115,
+ 701
],
- "commit": "77211e40db8a9558b866f5660c7127922b459e6c",
- "sha256": "1izm9aj8cqni8sjsxmlk5bbl4nn90476pa339jfxh812v5will1y"
+ "commit": "2d9c04776a58b94cfff790ed80a471a9e5b4873b",
+ "sha256": "19q8hw4cr01mfvh5bw4p3zjdc3sjfp0bsjw39l5m77jnkg35gjfn"
}
},
{
@@ -92050,18 +91871,19 @@
"repo": "ahmed-shariff/org-roam-ql",
"unstable": {
"version": [
- 20240826,
- 2002
+ 20241130,
+ 256
],
"deps": [
+ "dash",
"magit-section",
"org-roam",
"org-super-agenda",
"s",
"transient"
],
- "commit": "9071426d97b329bb98bc54b5287a322dc3814d95",
- "sha256": "1p6arv063z7vdx4x9s22xnna4iz7p599z5gp0x0mrwg9v6fvii7y"
+ "commit": "661e388bba2b71b2d8b3db287b7f77e400b452f6",
+ "sha256": "0l16gm93cyfvi9wcyrvrb20sdmgz6dgcrc2f2daxhdypkc4c3dzd"
},
"stable": {
"version": [
@@ -92156,8 +91978,8 @@
},
{
"ename": "org-ros",
- "commit": "a7b6aff1afbd525b43a53229be4e6faf166c6968",
- "sha256": "10jfdrrqqk0y43z32w0hsiih1l3rb6yafkqwxj64dgfd0iz4szsx",
+ "commit": "333bbda7a87518ef37b45a352b447b4e519b3926",
+ "sha256": "0cis880vq63z5zwnfan8sqimf8nc27yqh4w5z3ll1mdxif1kx87v",
"fetcher": "github",
"repo": "LionyxML/ros",
"unstable": {
@@ -92752,14 +92574,14 @@
"url": "https://repo.or.cz/org-tag-beautify.git",
"unstable": {
"version": [
- 20241003,
- 221
+ 20241109,
+ 445
],
"deps": [
"nerd-icons"
],
- "commit": "3b3f95b41c97abc9de3075419b9b30c754f749fc",
- "sha256": "03s1rjm7yhc64jwxii9hj277x975b47nx99fcrbdmrqkcfp5ngff"
+ "commit": "4eb1b403a004daf20bb622c6b708d1c743bbc01a",
+ "sha256": "1hh3f63pf88x9jabwhjis6cpcm9h3rzzq6jjfgqa8vig4fzsa85z"
}
},
{
@@ -92901,16 +92723,16 @@
"repo": "ichernyshovvv/org-timeblock",
"unstable": {
"version": [
- 20240212,
- 649
+ 20241027,
+ 805
],
"deps": [
"compat",
"org",
"svg"
],
- "commit": "b423b01712b9c25dff3e4203c7cde736225f62ef",
- "sha256": "1q0271nli4yw01rwybkzdlqcj8ivqwh5r70yv9x0qqwxa955c9k9"
+ "commit": "e61e5734b49f933ed178029f804a0499f3308e1e",
+ "sha256": "1p0ry4kx98fp15zhfd3dpdw0k27x1w48ljwasnx2dgjz7bkkirrl"
},
"stable": {
"version": [
@@ -93245,15 +93067,15 @@
"repo": "unhammer/org-upcoming-modeline",
"unstable": {
"version": [
- 20231124,
- 1726
+ 20241028,
+ 1217
],
"deps": [
"org-ql",
"ts"
],
- "commit": "37634ddeeda85a0036987b056ac71199ac3bd03e",
- "sha256": "1p1lphf50c71n0rp5k26kl37a02ahqxklpk1z133bwdmmnqi1ckm"
+ "commit": "66bfdbe847f398f87e8a05c0cf472eb673fac522",
+ "sha256": "1nmyrrqjmja3x318pjqcw208l2ir5v3fl9dhyvkah27nh0xxk11y"
},
"stable": {
"version": [
@@ -93271,10 +93093,10 @@
},
{
"ename": "org-variable-pitch",
- "commit": "9632b7e98772b584d6420f8d0f9652d67118e05e",
- "sha256": "1xci5zq1bpwnm3adlcsxzpskxywzalb1n3n14lvf787f77ib602c",
- "fetcher": "github",
- "repo": "cadadr/elisp",
+ "commit": "04fdd633207a28b91f0a6e64aa25d114ab229a13",
+ "sha256": "0v78akifa3mx2k42myr32swfdrijqjn7xwqqj4lx3ngib630k4wh",
+ "fetcher": "codeberg",
+ "repo": "kutuptiyini/elisp",
"unstable": {
"version": [
20220220,
@@ -93411,28 +93233,28 @@
"repo": "p-snow/org-web-track",
"unstable": {
"version": [
- 20241013,
- 820
+ 20241110,
+ 1121
],
"deps": [
"enlive",
"request"
],
- "commit": "3e41c415e932ab50fcbfadb3ae026c346cc3b35d",
- "sha256": "1brcjznpiqvs9qg4k0pq8yhl1n55rd85rzgvr8z7snpkig8i1hw9"
+ "commit": "3e75df16ec05960e973f044966cdc0b9d1a0fa6d",
+ "sha256": "1r6ksxkph8r0i5vfw5z7bi0c0d5r9sg4lam580wy0aap9srsnwgq"
},
"stable": {
"version": [
0,
- 0,
- 3
+ 1,
+ 0
],
"deps": [
"enlive",
"request"
],
- "commit": "eff66fc207411d5a5265d4ee5232f13d268f252f",
- "sha256": "18san6d7acfgz4fsjsv3w9bsbf41svf8p08jrc7rkqjp07h7hnwk"
+ "commit": "4371a177af1072076a5799a12bd37635b7e33942",
+ "sha256": "0c1rgz2harmp1si2fbdxiyfsxb6jnwkv58vzx28dh5v6ijf6hfd5"
}
},
{
@@ -94264,14 +94086,14 @@
"repo": "minad/osm",
"unstable": {
"version": [
- 20241006,
- 13
+ 20241122,
+ 130
],
"deps": [
"compat"
],
- "commit": "e9db7161f62459d61518888bb7d4aadea15c7b1c",
- "sha256": "1kpvbd31r6rp9nikbmab2g7ksd4llx3g5wpj50m3qmq1h293wqgn"
+ "commit": "6a2416dc4c3be22573cd9f5fb285df3f4bd6b6ea",
+ "sha256": "0cfwy4j5zv7axxkfg25cm4rs29d58w89gx58j4pprzf8pwxq6fvw"
},
"stable": {
"version": [
@@ -94537,26 +94359,26 @@
"repo": "abougouffa/one-tab-per-project",
"unstable": {
"version": [
- 20240824,
- 1650
+ 20241129,
+ 1654
],
"deps": [
"compat"
],
- "commit": "f515d0636426394af9c671bf58107091f9fac072",
- "sha256": "14840nzs563syrdpdn6a44x8vg6rzszr4b6qb4hrh96k4hrz2smh"
+ "commit": "5f3894c031cd0900739e3cabb3eca3b6eb56f78f",
+ "sha256": "0jwmlqia3h2rb0j1qnlylslajqiz5g28ll3qy7h1mlbh4vb7bk24"
},
"stable": {
"version": [
3,
- 0,
+ 1,
1
],
"deps": [
"compat"
],
- "commit": "124de45328e2b8188d92c5221c922dd5e99756fe",
- "sha256": "1m6m2jkq0bpclpbx067czzxqw0fp3r67ppq2kjwm7sn3xvh4mnvi"
+ "commit": "5f3894c031cd0900739e3cabb3eca3b6eb56f78f",
+ "sha256": "0jwmlqia3h2rb0j1qnlylslajqiz5g28ll3qy7h1mlbh4vb7bk24"
}
},
{
@@ -94587,20 +94409,20 @@
"repo": "jamescherti/outline-indent.el",
"unstable": {
"version": [
- 20240830,
- 340
+ 20241128,
+ 1742
],
- "commit": "77345373b5a5be4596b7f8826893bb787b82fb1f",
- "sha256": "1n6k3cjacb9pqhykbxl75jli6770cb0cfc2gmjx8xkhj4yrhb5nn"
+ "commit": "7767c4a5393fcac626bfc29ceeba2f884b189aec",
+ "sha256": "1l1cpfqldrpxl7k2m0vad3yjmhsa3d9ni5lv1zv9ib8rgr8aagq9"
},
"stable": {
"version": [
1,
- 0,
- 6
+ 1,
+ 0
],
- "commit": "77345373b5a5be4596b7f8826893bb787b82fb1f",
- "sha256": "1n6k3cjacb9pqhykbxl75jli6770cb0cfc2gmjx8xkhj4yrhb5nn"
+ "commit": "86f1ea4be8a0fa1f498bf317dcf54467033fd75b",
+ "sha256": "0m27vinajmdaks0qc9is4329z97g0avgrj1324hp87j55r87kx56"
}
},
{
@@ -95788,6 +95610,24 @@
"sha256": "05133n998sp3qymhrz6sarjc7ypzjiwpvpcgilq6z8i4sl2ip98q"
}
},
+ {
+ "ename": "ox-typst",
+ "commit": "468eb7d0c9aac3038c561659e69af0dc8ccc4456",
+ "sha256": "1hi1zhhzb4lwvcb8vs7zw3zzcdkrbsb15pj5yc5n0dq12v62fcrr",
+ "fetcher": "github",
+ "repo": "jmpunkt/ox-typst",
+ "unstable": {
+ "version": [
+ 20241130,
+ 1002
+ ],
+ "deps": [
+ "org"
+ ],
+ "commit": "d00fc1d21657f925c7bd92e9b9cab51047bbcb2f",
+ "sha256": "1qqcajy5kssjrd49nf8cl5gg82scl77z341kwrci5kz5jjkpbhhd"
+ }
+ },
{
"ename": "ox-wk",
"commit": "0947993df2d9bee493c2c25760f1ac5bcc1136ac",
@@ -96007,14 +95847,14 @@
"repo": "melpa/package-build",
"unstable": {
"version": [
- 20240930,
- 1924
+ 20241123,
+ 2136
],
"deps": [
"compat"
],
- "commit": "af2dc7784df675cfca7b307e77ec2084ca5432f4",
- "sha256": "1n2iyyjp4im6jhhm2rvphzifmjlrx31883a6a0l4mlkvkg4ffd3b"
+ "commit": "c1b276904278f0f89da2684f5e044760e3232c29",
+ "sha256": "0lwn4fd996lf4i4jmxfn09jn06k66k19ff76fzg6zzrs3hcsjg3j"
},
"stable": {
"version": [
@@ -96049,14 +95889,14 @@
"repo": "purcell/package-lint",
"unstable": {
"version": [
- 20240923,
- 1044
+ 20241127,
+ 1826
],
"deps": [
"let-alist"
],
- "commit": "ae5491c511cb49ddb75d6dd4cd934bf71e47a2d5",
- "sha256": "17m7wvaz7pyzqivkyg6wg2g2665xmd0vacbv2n847pxa8h2ayri1"
+ "commit": "0dee43756be149aac216cfa2794ba28f66137962",
+ "sha256": "1p3s7dl8gd54hyyvx0q7ficp60iiyim4js8195nksdqyb71df6vx"
},
"stable": {
"version": [
@@ -96434,15 +96274,15 @@
"repo": "joostkremers/pandoc-mode",
"unstable": {
"version": [
- 20240920,
- 2210
+ 20241109,
+ 2313
],
"deps": [
"dash",
"hydra"
],
- "commit": "3068a544fc2d1e2cdfd681f931e73f74d15be9ba",
- "sha256": "13hg9qf64drpz7ak0sz13gj0dblgrfypjszx8iprf6z5kvh33zpk"
+ "commit": "db94e520f1ef228b94664ffb748150007af1f40d",
+ "sha256": "1qbh06lj19rxx138j6zj9lrfvfj95qi8fwa9l5g1wqbqlwixcl3v"
},
"stable": {
"version": [
@@ -96482,10 +96322,10 @@
},
{
"ename": "paper-theme",
- "commit": "a7ea18a56370348715dec91f75adc162c800dd10",
- "sha256": "1ph6c6g907cnxzl74byc754119qia8rs8y7wvaj8i6q3fz2658zr",
- "fetcher": "github",
- "repo": "cadadr/elisp",
+ "commit": "04fdd633207a28b91f0a6e64aa25d114ab229a13",
+ "sha256": "0vi17q1fbpmm69p0izksvb2cw8j5cdhzcbr5fw86rnq1i7s12jyz",
+ "fetcher": "codeberg",
+ "repo": "kutuptiyini/elisp",
"unstable": {
"version": [
20230318,
@@ -96603,11 +96443,11 @@
"url": "https://mumble.net/~campbell/git/paredit.git",
"unstable": {
"version": [
- 20230718,
- 2027
+ 20241103,
+ 2046
],
- "commit": "037b9b8acbca75151f133b6c0f7f3ff97d9042e5",
- "sha256": "0s3ia5yrhcl0wr4y7v70a68bhsvgkkfm3wvm3kmj37i84bb0nlrc"
+ "commit": "89e75b4cb21f525a6f4cabcd12f1bd4204e682ab",
+ "sha256": "1whjrk3g6ynpzl4i3x3fxvf0w3y6v7ww1pr8ckwr7as8vzxhhbyq"
},
"stable": {
"version": [
@@ -96741,26 +96581,26 @@
"repo": "justinbarclay/parinfer-rust-mode",
"unstable": {
"version": [
- 20240912,
- 2130
+ 20241108,
+ 1719
],
"deps": [
"track-changes"
],
- "commit": "d617b2efd64695f3174f25e7d70e73e050efbfdc",
- "sha256": "0pcqiq58fqx1n4xqyyby9zrpkzlpz80xm4vqfyk79hsda9430gyq"
+ "commit": "044c3fe8f68e3e69d1157359bbfb1cf95423fe26",
+ "sha256": "1p00m757maw6dxig0x45gry1l7vm9dm6wg1anfm2rwl6hw1f5q25"
},
"stable": {
"version": [
0,
9,
- 2
+ 3
],
"deps": [
"track-changes"
],
- "commit": "a96c768e9dc4427c9ea18812a2f09e209a5e1a5e",
- "sha256": "17kkyqkn0r3s2rbgc6v5jygrq5bm5jcw54byjfkhnif90zvdch0n"
+ "commit": "044c3fe8f68e3e69d1157359bbfb1cf95423fe26",
+ "sha256": "1p00m757maw6dxig0x45gry1l7vm9dm6wg1anfm2rwl6hw1f5q25"
}
},
{
@@ -96840,19 +96680,19 @@
"repo": "joostkremers/parsebib",
"unstable": {
"version": [
- 20230228,
- 1530
+ 20241115,
+ 2225
],
- "commit": "ace9df707108b17759c004c7387655277122d4c1",
- "sha256": "02h5sbg2bqkmksj1ap4z7301hnsp5ga6951jrnwy89ds0xvrbg6l"
+ "commit": "c0ee4d5f10bf801af03f633b6b73ced4a0ffead7",
+ "sha256": "1c6j45fvs8k8d5smyi4rd9n2rg79i7dv69n98md32qm8w2w7yi5x"
},
"stable": {
"version": [
4,
- 3
+ 7
],
- "commit": "819f6f269caf7569d0ca5814b8938f7a100b18b5",
- "sha256": "0vcl2wvxwpr62c9ym0fm3qaxzhjcrpk4r6r0zaqhkvlf8qr3rg8y"
+ "commit": "26fb0fd165bacd160a5e89b966c6d080a740c4c4",
+ "sha256": "0rr1iy9j5s3m95j1kr2cqqk6mp5apva46g4zi3y07n120hz3ndw9"
}
},
{
@@ -97791,10 +97631,10 @@
},
{
"ename": "pelican-mode",
- "commit": "aede5994c2e76c7fd860661c1e3252fb741f9228",
- "sha256": "0z6w5j3qwb58pndqbmpsvy1l77w9jv90bss9qq9hicil8nlk4pvi",
- "fetcher": "git",
- "url": "https://git.korewanetadesu.com/pelican-mode.git",
+ "commit": "c238f6906d81b45acb30eea412fc5a5571f4c91c",
+ "sha256": "0mfhz1gyddqsd79y2b73kqq2knw7zhxv35jn9rkih1gcp07q870n",
+ "fetcher": "gitlab",
+ "repo": "joewreschnig/pelican-mode",
"unstable": {
"version": [
20190124,
@@ -98131,25 +97971,25 @@
"repo": "nex3/perspective-el",
"unstable": {
"version": [
- 20240414,
- 359
+ 20241030,
+ 1848
],
"deps": [
"cl-lib"
],
- "commit": "ec48cb3bdda8c5ea12da89a12aa925ed1905a0b7",
- "sha256": "1hg059nnyarnkx0wh1vl7qkdaqb2p7ifk9ciz35s6ffnc242jas5"
+ "commit": "e32d3ea731f6bc551ce196527b3cb0dc19d71151",
+ "sha256": "1vpjc9mk96siabl5j0k023bag00cwb852cpc9f89jyqhavm6011b"
},
"stable": {
"version": [
2,
- 18
+ 19
],
"deps": [
"cl-lib"
],
- "commit": "8a69512639ae915c32c5055d1308ebf4b278266c",
- "sha256": "1r026cw6p2ss5wg8mxgzf6iv1lb9pdnqyf6yrqb914aibkrvp9b6"
+ "commit": "e32d3ea731f6bc551ce196527b3cb0dc19d71151",
+ "sha256": "1vpjc9mk96siabl5j0k023bag00cwb852cpc9f89jyqhavm6011b"
}
},
{
@@ -98262,16 +98102,16 @@
"repo": "wyuenho/emacs-pet",
"unstable": {
"version": [
- 20240930,
- 2259
+ 20241127,
+ 2351
],
"deps": [
"f",
"map",
"seq"
],
- "commit": "75b371ac4638cb8c6d7190f21a9c3ff257798d61",
- "sha256": "16p91zwrp004hz6qndg3jiniy01ic24wd36hjfs2ksir83lsfg59"
+ "commit": "c2278f9bc1c3a5070021fe3251ed09b5a468d331",
+ "sha256": "0zr5vnbk3bgwx8nj563pbyv93rc0n7xmhqcdgv2nc8pdsvdd7sxi"
},
"stable": {
"version": [
@@ -98320,25 +98160,25 @@
"repo": "emarsden/pg-el",
"unstable": {
"version": [
- 20241012,
- 1954
+ 20241110,
+ 1633
],
"deps": [
"peg"
],
- "commit": "516f09df63d68b8bb1682e34ac8443f84ca9127d",
- "sha256": "0l4z3a60s7mj3blxz26y5zfp927vx50k4i1b20hjnchn4cv6c92f"
+ "commit": "3e7917dfe17d40c08f0028917915682dbf576ee7",
+ "sha256": "12k4y52rv7fwg8yqniq4d3bmhcxdn75kgzvr1qxn56l80hxzfhvs"
},
"stable": {
"version": [
0,
- 42
+ 44
],
"deps": [
"peg"
],
- "commit": "c4b050c52a31aab0ca27d9c24bdb5eb71cd8764e",
- "sha256": "1afyjzrb1q207as2vc9j3cjvr6f3d3zgajzisl3x3mv0kb0bk3jy"
+ "commit": "3e7917dfe17d40c08f0028917915682dbf576ee7",
+ "sha256": "12k4y52rv7fwg8yqniq4d3bmhcxdn75kgzvr1qxn56l80hxzfhvs"
}
},
{
@@ -98647,26 +98487,26 @@
"repo": "pivaldi/php-cs-fixer",
"unstable": {
"version": [
- 20240909,
- 1856
+ 20241103,
+ 1232
],
"deps": [
"cl-lib"
],
- "commit": "fa21b0f3b9be8604345a5fd276477dff3c77e39f",
- "sha256": "02cjlc4mkmp6ih6g24fs38wwa93vlls1da8wxv563a6g5g799yd1"
+ "commit": "710208cc2efc2e241d1e7421b3c2581d46a81a5c",
+ "sha256": "1681w4jsszcvva3xs9kj6a0crckwqhscy9lzsrk7zw8cjbb2q14b"
},
"stable": {
"version": [
2,
1,
- 0
+ 1
],
"deps": [
"cl-lib"
],
- "commit": "fa21b0f3b9be8604345a5fd276477dff3c77e39f",
- "sha256": "02cjlc4mkmp6ih6g24fs38wwa93vlls1da8wxv563a6g5g799yd1"
+ "commit": "710208cc2efc2e241d1e7421b3c2581d46a81a5c",
+ "sha256": "1681w4jsszcvva3xs9kj6a0crckwqhscy9lzsrk7zw8cjbb2q14b"
}
},
{
@@ -98692,11 +98532,11 @@
"repo": "emacs-php/php-mode",
"unstable": {
"version": [
- 20240912,
- 2234
+ 20241024,
+ 1241
],
- "commit": "3e8113c72a454f0f87a1593c22578b894549c53b",
- "sha256": "0b2j2jcrqmanli2307yhj7b59p3dap2190iyk09b7dygk6p1niyr"
+ "commit": "31f702ee2de35d514fb633c0c37531cb648bff70",
+ "sha256": "0rz0qdi82swvvqmb44jdzwfkaz9xl4y4ic70i6i950rmrbz970pd"
},
"stable": {
"version": [
@@ -98755,26 +98595,26 @@
"repo": "emacs-php/php-runtime.el",
"unstable": {
"version": [
- 20230404,
- 1713
+ 20241024,
+ 1622
],
"deps": [
"compat"
],
- "commit": "ba64f30e716f89f9cf2c3bd44c5d00da69736868",
- "sha256": "0642n7cf3vn90gm7a2bvy264mjq5ar20aw5lh79ls55i4mryvqnr"
+ "commit": "37beef404c70d7b80dc085b1ee1e13fd9c375fe6",
+ "sha256": "1sd65nhbcxr5r935z1ik3skz73kkpyr4r259nahn5gjvvww3if20"
},
"stable": {
"version": [
0,
3,
- 1
+ 2
],
"deps": [
"compat"
],
- "commit": "ba64f30e716f89f9cf2c3bd44c5d00da69736868",
- "sha256": "0642n7cf3vn90gm7a2bvy264mjq5ar20aw5lh79ls55i4mryvqnr"
+ "commit": "37beef404c70d7b80dc085b1ee1e13fd9c375fe6",
+ "sha256": "1sd65nhbcxr5r935z1ik3skz73kkpyr4r259nahn5gjvvww3if20"
}
},
{
@@ -98804,8 +98644,8 @@
"repo": "emacs-php/phpactor.el",
"unstable": {
"version": [
- 20240916,
- 1427
+ 20241128,
+ 1559
],
"deps": [
"async",
@@ -98813,8 +98653,8 @@
"f",
"php-runtime"
],
- "commit": "8707094ac0da0564e7a0cc6874e3087ffc7e137a",
- "sha256": "1nlaqwfd1klxplh6nwv6ci60mfl1d85i0dfnvcszbkn3nfmf0mnp"
+ "commit": "922a4339d796f16c393400ea273ddf61539edf82",
+ "sha256": "1dhss4qzllpgfp3xy2kdw2g2n70rzjzgz747rchx1rfb5vwhmwl8"
},
"stable": {
"version": [
@@ -98838,16 +98678,16 @@
"repo": "emacs-php/phpstan.el",
"unstable": {
"version": [
- 20240527,
- 2142
+ 20241107,
+ 408
],
"deps": [
"compat",
"php-mode",
"php-runtime"
],
- "commit": "6f1c7bb357b1eb90b10a081f1831c1c548c40456",
- "sha256": "1hnnhbma3mgbralp1f5c1gvm9pfswzf5xzi2nr22rs5d9r0zk2fj"
+ "commit": "b616f5fa5f8aff9aa220c7fe63b39df6d10588a5",
+ "sha256": "0xjr6vi158qm6rnrfvpcmh2grrlvixdd44kik333250298vc3nx3"
},
"stable": {
"version": [
@@ -99033,11 +98873,11 @@
"repo": "kljohann/pikchr-mode",
"unstable": {
"version": [
- 20210324,
- 2125
+ 20241127,
+ 2138
],
- "commit": "5d424c5c97ac854cc44c369e654e4f906fcae3c8",
- "sha256": "07qjz0mzl6cqgavv5sc9n1v7zq5q6f8is6nn126v0zk6rskp366q"
+ "commit": "27b5d06d6f55b4db45b9fc96d614f1dce8ee70fa",
+ "sha256": "00av07rn6pmds776nf18ypzg8ris4hwinjsl71k3pn9k3gv81qf7"
}
},
{
@@ -99911,6 +99751,24 @@
"sha256": "0s34nbqqy6aqi113xj452pbmqp43046wfbfbbfv1xwhybgq0c1j1"
}
},
+ {
+ "ename": "plumber",
+ "commit": "5c2cf71d984e5ebe6baf4e17a187f94efa2097ad",
+ "sha256": "17xhncxabz6a4m8jpwb8zklykamrx8p4qcgdhkk626sa53g179za",
+ "fetcher": "github",
+ "repo": "8dcc/plumber.el",
+ "unstable": {
+ "version": [
+ 20241110,
+ 2234
+ ],
+ "deps": [
+ "compat"
+ ],
+ "commit": "7655ed6d6d69249488abf57a3b39fc762792be6f",
+ "sha256": "19p7jq1d9sy8fpby0m1lj6v6z8hr1cgr0jvkasgl5l1gjn12fxrl"
+ }
+ },
{
"ename": "plur",
"commit": "38f6f53fcd1186efd5e6752166da4e23b712cdb1",
@@ -100851,11 +100709,11 @@
"repo": "karthink/popper",
"unstable": {
"version": [
- 20240325,
- 10
+ 20241201,
+ 110
],
- "commit": "c6b78fdd546e19582fa2195cf51f6753c45e7c03",
- "sha256": "121qil7y3n4p601y2j2sk077d8vzyb5ghdpj0f618pbw6pp8gyk4"
+ "commit": "faf155059e519fb036324af579c342365795dbbb",
+ "sha256": "17hgpyyr1p0501i8rqi83x8dhsfla8hy5pj7m73gs3aigcp173l5"
},
"stable": {
"version": [
@@ -101116,11 +100974,11 @@
"repo": "tumashu/posframe",
"unstable": {
"version": [
- 20240827,
- 654
+ 20241023,
+ 319
],
- "commit": "570273bcf6c21641f02ccfcc9478607728f0a2a2",
- "sha256": "1p1kfy0x8n1s2njfq70fix2jadfi6zb4m519scjmys51a7ahmy73"
+ "commit": "ac9f954ac4c546e68daf403f2ab2b5ad4397f26e",
+ "sha256": "0qq14z8qiwmx0dwbcz6nrhznj34jxkb47dcv1wf8v6qhnm4b7z2i"
},
"stable": {
"version": [
@@ -101383,8 +101241,8 @@
"repo": "blahgeek/emacs-pr-review",
"unstable": {
"version": [
- 20241014,
- 454
+ 20241105,
+ 1542
],
"deps": [
"ghub",
@@ -101392,8 +101250,8 @@
"magit-section",
"markdown-mode"
],
- "commit": "e0488e7b1225e67a88ad5a2da5c17d524e007848",
- "sha256": "1zls3bjp17fpkkird1h2v0gaz86nyxjkwj3jfzvfxyi3b9f8ciw6"
+ "commit": "bd9846fa0636bde8c6f9d88b9f2b9514903e82f8",
+ "sha256": "120ym24d2bccni9dwlk086sbqvfwmwj9kj61yfxh76j6dak28i9j"
}
},
{
@@ -101779,15 +101637,15 @@
"repo": "alphapapa/prism.el",
"unstable": {
"version": [
- 20240915,
- 1804
+ 20241024,
+ 40
],
"deps": [
"compat",
"dash"
],
- "commit": "646840f74ffa7c289426b54426f147e126812070",
- "sha256": "01s751khsbnlqhx1jh62laimi1fpsqljh02hw3gdgd2ka25jcq24"
+ "commit": "2fa8eb5a9ca62a548d33befef4517e5d0266eb28",
+ "sha256": "1sp53s39vq3np3a0vs8wnckjj5b5i0giqdkzmah4h3yvhjbd4m9n"
},
"stable": {
"version": [
@@ -102295,26 +102153,26 @@
"repo": "TxGVNN/project-tasks",
"unstable": {
"version": [
- 20240903,
- 343
+ 20241107,
+ 330
],
"deps": [
"project"
],
- "commit": "e5cc94cb65a18ea11aae7f65ee6f603a7808d4aa",
- "sha256": "1gdq96296s4glylhh1yp3j6gn8j97b8f2acbh9xq5bk2y1vd7m04"
+ "commit": "404723d0b16dd46a3c0a63675d1f0ab9083799db",
+ "sha256": "16krbqz3x0cfvwcc6iiw6ly4n5v38d664gfa7bslv4xgr25s9sm3"
},
"stable": {
"version": [
0,
- 6,
+ 7,
0
],
"deps": [
"project"
],
- "commit": "e5cc94cb65a18ea11aae7f65ee6f603a7808d4aa",
- "sha256": "1gdq96296s4glylhh1yp3j6gn8j97b8f2acbh9xq5bk2y1vd7m04"
+ "commit": "ff1b159faae5e4f4756e5fc5f01b4a2a304ded13",
+ "sha256": "0fmppgiz7p4kc7rvs6m73gmcbvg44z30wfs79p1dqba3wsn7xp4j"
}
},
{
@@ -102343,11 +102201,11 @@
"repo": "bbatsov/projectile",
"unstable": {
"version": [
- 20241009,
- 1152
+ 20241102,
+ 1410
],
- "commit": "41f8a8e7bdc50467256af632108989b5c980cd56",
- "sha256": "18sd8vim7pib5v13hk610l1fkndydv4sfhdmvxb3pb4p536xm6ch"
+ "commit": "9b466af28bac6d61fd0e717f1a4b0fcd2f18f37f",
+ "sha256": "1mbrvp1irjlsd3k2qajhlr44c2pc7sbbw57skisl3h2a5fbhygd1"
},
"stable": {
"version": [
@@ -102608,8 +102466,8 @@
"repo": "mohkale/projection",
"unstable": {
"version": [
- 20241013,
- 1520
+ 20241107,
+ 2107
],
"deps": [
"compat",
@@ -102617,8 +102475,8 @@
"project",
"s"
],
- "commit": "c2a5522e22b292c9ce94f1d5ece338c4e7117ddb",
- "sha256": "1wbwkmf7fg1hamzidzf6wib2fbcjybh3ch9yr9y9l4946wxnca1h"
+ "commit": "50d4f0ec4edfddd24f7c1c540f299a919aa4c151",
+ "sha256": "0s0bs395cczxq53axii514kjk32kj1rv3x68l16ni8jcys8bdy1w"
}
},
{
@@ -102629,15 +102487,15 @@
"repo": "mohkale/projection",
"unstable": {
"version": [
- 20240325,
- 1931
+ 20241107,
+ 2107
],
"deps": [
"dape",
"projection"
],
- "commit": "68abb9dfab5e85daa31961be10362ca02effeeeb",
- "sha256": "1zksskn924v4la718326gyafwgmlbrrj6k78wrv422a1n9wrq0s2"
+ "commit": "50d4f0ec4edfddd24f7c1c540f299a919aa4c151",
+ "sha256": "0s0bs395cczxq53axii514kjk32kj1rv3x68l16ni8jcys8bdy1w"
}
},
{
@@ -102648,15 +102506,15 @@
"repo": "mohkale/projection",
"unstable": {
"version": [
- 20240919,
- 2050
+ 20241107,
+ 2107
],
"deps": [
"compile-multi",
"projection"
],
- "commit": "c875330e69087f96ddbcb4b0f0e15b820adcc8ae",
- "sha256": "13p1k2g6kciqhg4bhdxms9ifwx51vc8xh3wcm44ja3bhgi3ajlcs"
+ "commit": "50d4f0ec4edfddd24f7c1c540f299a919aa4c151",
+ "sha256": "0s0bs395cczxq53axii514kjk32kj1rv3x68l16ni8jcys8bdy1w"
}
},
{
@@ -102667,15 +102525,15 @@
"repo": "mohkale/projection",
"unstable": {
"version": [
- 20240803,
- 1509
+ 20241107,
+ 2107
],
"deps": [
"compile-multi-embark",
"projection"
],
- "commit": "719be9e5cda7324eed0a82ce14a92f88c8608080",
- "sha256": "0jjpx3ckm99yn4izn922dcpc42zfs5p5ji2b2qaxl6mnzrg86mpg"
+ "commit": "50d4f0ec4edfddd24f7c1c540f299a919aa4c151",
+ "sha256": "0s0bs395cczxq53axii514kjk32kj1rv3x68l16ni8jcys8bdy1w"
}
},
{
@@ -102842,11 +102700,11 @@
"repo": "ProofGeneral/PG",
"unstable": {
"version": [
- 20240912,
- 1558
+ 20241126,
+ 32
],
- "commit": "1ffca70b2fcfd1c524f9b9e5ceebae07d3b745b6",
- "sha256": "1kmgih45qkgqzas09bhy0xlvjssb187b1ki7a088za2kwcyw89hn"
+ "commit": "d6689469298b4140dc1f0f8b0ff7e8f937041ffe",
+ "sha256": "1d12z41rn5nh15qj4sf0w8xrbd9djxlrz0r6g38fiq63i7krbm4x"
},
"stable": {
"version": [
@@ -102954,11 +102812,11 @@
},
"stable": {
"version": [
- 28,
- 2
+ 29,
+ 0
],
- "commit": "9fff46d7327c699ef970769d5c9fd0e44df08fc7",
- "sha256": "1cd8hfszy6sqjwwwf95znvzic1nn3hd1ywij25m4hg8vddz2727s"
+ "commit": "2d4414f384dc499af113b5991ce3eaa9df6dd931",
+ "sha256": "0hrd4xm94nn4kazf86ca5wrmca4ss02m262zvm21i1dwq8pmmppf"
}
},
{
@@ -103523,11 +103381,11 @@
"repo": "smoeding/puppet-ts-mode",
"unstable": {
"version": [
- 20240626,
- 646
+ 20241129,
+ 1040
],
- "commit": "9622188612f3be347bd92f5a195999b36f95f988",
- "sha256": "0jrrmd77i5md8psxq313i8amw2f8hmmh518f1bsajm4wg46pfh3c"
+ "commit": "5dbce9c6785af03d47561329d38c436f0e18e3f3",
+ "sha256": "1zybz6ikz4i03glc4p659jr5n9i9cxb6yaamnsyavlq8lrjdbhkd"
}
},
{
@@ -104779,11 +104637,11 @@
"repo": "psaris/q-mode",
"unstable": {
"version": [
- 20230412,
- 53
+ 20241129,
+ 100
],
- "commit": "d89b359d5a26234336487ab4e42eb5878ad3c5a5",
- "sha256": "0632mh9yhs4cs8xzq7d86gyklvzvvlja729d6vlzam3nw6s89c4d"
+ "commit": "b4bbee3ef8cfa5f98fe141dfc61da77385da3b90",
+ "sha256": "1qsj9ng0zxpcqpdgmwkxi9v9p2hr0p6zya5qdjpnag2h2hzcdksv"
}
},
{
@@ -105085,6 +104943,30 @@
"sha256": "07qipy0r0v8y5rm2g1kqqqy81635wbclzvjgq8y9sziwchww2v20"
}
},
+ {
+ "ename": "quick-sdcv",
+ "commit": "b626190c9f6e709acb1f7bff7d72c13d447b507f",
+ "sha256": "1a3mnn903hgf5fpr3a189y69iwq1rvmfkq6yzb2k3k2bm651bh3n",
+ "fetcher": "github",
+ "repo": "jamescherti/quick-sdcv.el",
+ "unstable": {
+ "version": [
+ 20241130,
+ 2051
+ ],
+ "commit": "1f0a38c8de2ddea93f2e42b2201c8d642f300008",
+ "sha256": "0m14vzs4ds3f1d2gq1gc10sgcas67nq76w5a5qx1mfzknv54h3zn"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 0
+ ],
+ "commit": "ef24026f1f03d3df8ed999e5c75f5c3bbc70860e",
+ "sha256": "0z83fziijw6262i4iq4wd881ps3w1wd9f2x4966bjxgavd0ijfp7"
+ }
+ },
{
"ename": "quick-shell-keybind",
"commit": "e9bf4d78da24d88476545f97b2af0527dde73600",
@@ -105310,11 +105192,11 @@
"repo": "greghendershott/racket-mode",
"unstable": {
"version": [
- 20241001,
- 1458
+ 20241129,
+ 1353
],
- "commit": "ec8b5142abaaef8335c23b98c18dee1f960b6e0b",
- "sha256": "1q6vdp2rhb6r3s17vqy6qbq0kzbix8a4fd9ikxxlgj8gc4xg6dv5"
+ "commit": "986c9ad883a1b96076a0da6ae75761c75baaac09",
+ "sha256": "1952y4xjyfxw7m748lbcfkjyf0199ziskycmmqnbivqj2cv7c8wc"
}
},
{
@@ -106189,15 +106071,15 @@
"repo": "realgud/realgud-lldb",
"unstable": {
"version": [
- 20230201,
- 948
+ 20241119,
+ 209
],
"deps": [
"load-relative",
"realgud"
],
- "commit": "74d442abc8469bb6277702f9c60fa479848009b2",
- "sha256": "150p7yk0x4apszvkh6sv9iwjv5amzjvlj9ydk9w46bxfypxr29p1"
+ "commit": "deacd070e8ab8830f4d577fee37136ad89183d13",
+ "sha256": "1yn51aavvz5v4l27afzqbmh77fi1gpqsb89l7ladlv1d6fbzh3z9"
},
"stable": {
"version": [
@@ -106471,6 +106353,21 @@
"sha256": "1xh9nxqfg9abcl41ni69rnwjfgyfr0pbl55dzyxsbh6sb36r3h8z"
}
},
+ {
+ "ename": "recall",
+ "commit": "b42cd347f93cb1be86fc8171b90e4b3dc56042de",
+ "sha256": "18vdyfvyj8ciq4azixyi4jaljsla81szx2lj398ymq46ak5bqzi5",
+ "fetcher": "github",
+ "repo": "svaante/recall",
+ "unstable": {
+ "version": [
+ 20241201,
+ 2002
+ ],
+ "commit": "1921316d8ab02c735454b0d51153f1a657430bff",
+ "sha256": "001dgrdfmy3n2qyv7ai84129j463a62yqkdzcpar62iil0sq7n58"
+ }
+ },
{
"ename": "recentf-ext",
"commit": "ad10a684b4b2f01bc65883374f36fef156ff55d2",
@@ -107282,8 +107179,8 @@
"repo": "alhassy/repl-driven-development",
"unstable": {
"version": [
- 20231123,
- 1917
+ 20241110,
+ 1611
],
"deps": [
"bind-key",
@@ -107291,15 +107188,14 @@
"devdocs",
"eros",
"f",
- "hierarchy",
"json-navigator",
"lf",
"peg",
"pulsar",
"s"
],
- "commit": "05bd1cee8f298173010ed17a98ba2b94cb08d830",
- "sha256": "1ladm2gmvmhhccly1l2m0c1389xy50dacqbjzk1rw6mdbscgjqlm"
+ "commit": "2ffa5368a6db602a9f220935cd985999c60845ba",
+ "sha256": "175mkhj2q8xcxab8q9czfc6kck30xgln2xdkxycv3x2q969ziag3"
}
},
{
@@ -108055,15 +107951,15 @@
"repo": "dajva/rg.el",
"unstable": {
"version": [
- 20241002,
- 2036
+ 20241112,
+ 1353
],
"deps": [
"transient",
"wgrep"
],
- "commit": "d727fe8466502e29975067adf6f2ca3e0618279c",
- "sha256": "0kznbka5ssgs9cmdjbjlk8z7zl3vb294mvymy7nsm4w11phdz0w6"
+ "commit": "bd63cd3346fcabab0ff25e841e9d1ee56f5db705",
+ "sha256": "0j3vqnis4wgg9bf5b85xl9f3yrjyz1r5i64yc7ijfiin0cw8rgff"
},
"stable": {
"version": [
@@ -108298,8 +108194,8 @@
"repo": "DogLooksGood/emacs-rime",
"unstable": {
"version": [
- 20241003,
- 1750
+ 20241106,
+ 2056
],
"deps": [
"cl-lib",
@@ -108307,8 +108203,8 @@
"popup",
"posframe"
],
- "commit": "e5c5ffb57088aa7ec6b82a6ca3f9499294124954",
- "sha256": "13n9rkwkza1n91k2n5saxyijm9qsjywj9hlx6la4z1d3lvr4r1cy"
+ "commit": "8837e4b86d3cef73079a3f4ad6d3c79885236aa5",
+ "sha256": "1s5hx4gp0g66mnjwvmb1f8g9r5m3frzhxj0qphky0mssbd62dh60"
},
"stable": {
"version": [
@@ -108513,11 +108409,11 @@
"repo": "jgkamat/rmsbolt",
"unstable": {
"version": [
- 20240622,
- 1704
+ 20241030,
+ 607
],
- "commit": "484d9c06f0544532336ad2ac2ddf46a1a81272ef",
- "sha256": "1sky9qvrycqjmhlhrd3jn2mpdgii3m9m6r48nb6m6s7pshwlydw3"
+ "commit": "c152a1c591108a5244026a7e193f053a8e58e135",
+ "sha256": "18mwmcm6d4ii91kyjcmynwypi0ksw7ww16am9pyzlnvlv1clmy9v"
}
},
{
@@ -108630,11 +108526,11 @@
"repo": "tad-lispy/roc-ts-mode",
"unstable": {
"version": [
- 20240820,
- 1737
+ 20241202,
+ 15
],
- "commit": "8a85436227a9fdc07bce9ad773a46ba78cb3cdd0",
- "sha256": "1vrhh6xa1v4qfraw888xrz3izkk6zshbrzqdf21x9dwyd4wlr0is"
+ "commit": "de6a523be86c5ec925b8c58c950dcebef233b09a",
+ "sha256": "0f7002bzckinq14s5q9f39ad3jmzjps9fm4v215zw2lzcd5knlg1"
}
},
{
@@ -109530,11 +109426,11 @@
"repo": "rust-lang/rust-mode",
"unstable": {
"version": [
- 20240903,
- 1233
+ 20241112,
+ 438
],
- "commit": "c87f6f82bd484fb1c15009c8a3518ebb62942605",
- "sha256": "15nafhm0ssvqg1w55gpk91hsr7mq6ryswhnnhwmz007g8d6zc34q"
+ "commit": "542f1755d8929ca83564322d7030d558f3392fe1",
+ "sha256": "1a6p50hkw2qlgh2v1yivhbifp8l7ffsqs4712sd971scb00yv2r4"
},
"stable": {
"version": [
@@ -109577,8 +109473,8 @@
"repo": "emacs-rustic/rustic",
"unstable": {
"version": [
- 20241012,
- 1556
+ 20241110,
+ 729
],
"deps": [
"dash",
@@ -109592,8 +109488,8 @@
"spinner",
"xterm-color"
],
- "commit": "34abafbd0ff921681d4ee6d84ce4787483f1e8d2",
- "sha256": "0zh51a4gyp4hysha1phiyq9ray8s90iw9pfp1fkjnfsqx2gwaqbm"
+ "commit": "9fdf5c76b20cfc2985d518b3a4ae7b9634b39999",
+ "sha256": "0kwvvk2gx2dcm9y676n00jhaqicxlb0nf4kqwj3grwvhdjvr93wg"
},
"stable": {
"version": [
@@ -109624,15 +109520,15 @@
"repo": "ShuguangSun/rutils.el",
"unstable": {
"version": [
- 20220619,
- 1421
+ 20241027,
+ 1606
],
"deps": [
"ess",
"transient"
],
- "commit": "dd500ab8062ce40cb339ec8620bdfc63fdd28364",
- "sha256": "1hzly8kxdhddz4b4i7cxafl54aqpk6q4ziwh1k92s1767mjqwg2d"
+ "commit": "e39ca3c953ef395f28176f740ebf500d62edb429",
+ "sha256": "1ld22yz85ds0syf9cyldhc40rg1fd993dza52i8dj49q1jnby2xc"
}
},
{
@@ -110258,11 +110154,11 @@
"repo": "KaranAhlawat/scala-ts-mode",
"unstable": {
"version": [
- 20240917,
- 933
+ 20241027,
+ 701
],
- "commit": "a9faced661fddc76be9c8db8c2190309ec5eab3b",
- "sha256": "09cypfgwia25lk2liaj5rly34kmfp95bsp9nd6jby71g5z76j5c5"
+ "commit": "039af6d4e353726245e60756667f0b7378840f6c",
+ "sha256": "0b4f9zax2rgg3zrlsg40mgiz7f5z9dq52adg7xrgwrc1k65mlxlf"
}
},
{
@@ -110778,28 +110674,28 @@
"repo": "sdm-lang/emacs-sdml-mode",
"unstable": {
"version": [
- 20240821,
- 1835
+ 20241104,
+ 1705
],
"deps": [
"tree-sitter",
"tree-sitter-indent"
],
- "commit": "86d2f30a0f49c2ca35e07382ce9620aeff7c9960",
- "sha256": "1qlf1bcckw20y30iqxccscgdi1aqy3hiq5dh2ls0gg37q7ll8v8n"
+ "commit": "ec867931868b0bced385f9b7517a8b48cd146ac4",
+ "sha256": "0mzbllnpr6kqm7f3yr3yq6wr42k8kps7qrzw7023fb9kh3q1xg6g"
},
"stable": {
"version": [
0,
- 1,
- 8
+ 2,
+ 0
],
"deps": [
"tree-sitter",
"tree-sitter-indent"
],
- "commit": "105c0fd42269ba8a5c29fa71e617644fa385f68f",
- "sha256": "1axpf0cs4sk9aa23dhpxal1vwfpff2k10fg54iiqqbw4yvlckp8y"
+ "commit": "1f59deffa3186a9eafe3921fdb793549a4629a03",
+ "sha256": "07fkws8359hjd7wcacr4k9mknacccc4qnyz5fcb6z8m0s7i93b8p"
}
},
{
@@ -111062,14 +110958,14 @@
"repo": "captainflasmr/selected-window-accent-mode",
"unstable": {
"version": [
- 20240831,
- 1100
+ 20241019,
+ 1342
],
"deps": [
"transient"
],
- "commit": "f4c2e7fed2702072cc5a73f2c56a75624ea85cc1",
- "sha256": "0f9xlgl37cvpbn5vmp9kk4h0gywxp9r9cghrzgg0xnjak7b35bfx"
+ "commit": "32c0dc7d2bfc66fff1487019c03d7277f2411fe4",
+ "sha256": "1kd1qv0bnq9gsgmqfi1w7c0lnzvf0yhk1dx9xgdj63dpk6243668"
},
"stable": {
"version": [
@@ -111217,21 +111113,21 @@
},
{
"ename": "semi",
- "commit": "e78849c2d1df187b7f0ef4c34985a341e640ad3e",
- "sha256": "01wk3lgln5lac65hp6v83d292bdk7544z23xa1v6a756nhybwv25",
+ "commit": "5e4ccfc8ab211349b577a06dea355ea59b3eb888",
+ "sha256": "0v9d73adgsb6wmy0da4bqjrf1jk8g9wy58bl6svg07gq065w8lv0",
"fetcher": "github",
- "repo": "wanderlust/semi",
+ "repo": "emacsmirror/semi",
"unstable": {
"version": [
- 20240606,
- 1327
+ 20241125,
+ 2202
],
"deps": [
"apel",
"flim"
],
- "commit": "85a52b899ac89be504d9e38d8d406bba98f4b0b3",
- "sha256": "13sfwv889i99l5zv10ibzm221wvwbp3m45nf4nsr0dhvln90zrjj"
+ "commit": "6cffd97241d80b73133c5daf8680adb7ce954dd0",
+ "sha256": "1azr2zp5ap5d9ln1qdmc1r2jpscrvi109dq8vgfd62qmbi7lddbz"
}
},
{
@@ -111994,26 +111890,26 @@
},
{
"ename": "shell-maker",
- "commit": "c7f36f62391f888e2485c096890739de0c71305a",
- "sha256": "0a03brzbasnamry39nxybdh0r71igpkva8b0svsvw96j0dc4chbc",
+ "commit": "bd7bfd8814e2e81d4022984f6b2baf2b1d1d0225",
+ "sha256": "1c8zixkkn7xl7z89x006q15qhq3j4hzlbgqcrnbq4xy9w3vcwmj7",
"fetcher": "github",
- "repo": "xenodium/chatgpt-shell",
+ "repo": "xenodium/shell-maker",
"unstable": {
"version": [
- 20241011,
- 805
+ 20241128,
+ 934
],
- "commit": "08c8a6dec6a5b1a23d4ae3f4312dc6c92d1a09a1",
- "sha256": "04byw3zz06fr1g185p55pdaf5bqxj3mssldbh089pmx10qdmaxqi"
+ "commit": "d9330f283241142a13a11d5d83aca875c6796f88",
+ "sha256": "15v3hlcasfv6jzabhg9753hg0jhwfbjycsq75qg2q9vcf0ksacm6"
},
"stable": {
"version": [
- 1,
- 8,
+ 0,
+ 72,
1
],
- "commit": "08c8a6dec6a5b1a23d4ae3f4312dc6c92d1a09a1",
- "sha256": "04byw3zz06fr1g185p55pdaf5bqxj3mssldbh089pmx10qdmaxqi"
+ "commit": "d9330f283241142a13a11d5d83aca875c6796f88",
+ "sha256": "15v3hlcasfv6jzabhg9753hg0jhwfbjycsq75qg2q9vcf0ksacm6"
}
},
{
@@ -112241,20 +112137,20 @@
"repo": "redguardtoo/shenshou",
"unstable": {
"version": [
- 20230226,
- 320
+ 20241015,
+ 1227
],
- "commit": "0a00b9f5a86a54324f88c7d27b603f136ee2fb0b",
- "sha256": "0yr6pw3yglav07xg6l0dx1xc0dggcgv1xyfpds7y865iizvmc4i9"
+ "commit": "65163b449131ed0946ca6e817a660b4bbb7d35e9",
+ "sha256": "1d8462mrifp33pbkr5kgkb0m6fk98r6ysi6j9giyj83xih9rpxd5"
},
"stable": {
"version": [
0,
- 1,
- 2
+ 2,
+ 0
],
- "commit": "0a00b9f5a86a54324f88c7d27b603f136ee2fb0b",
- "sha256": "0yr6pw3yglav07xg6l0dx1xc0dggcgv1xyfpds7y865iizvmc4i9"
+ "commit": "65163b449131ed0946ca6e817a660b4bbb7d35e9",
+ "sha256": "1d8462mrifp33pbkr5kgkb0m6fk98r6ysi6j9giyj83xih9rpxd5"
}
},
{
@@ -112820,14 +112716,14 @@
"repo": "emacs-sideline/sideline",
"unstable": {
"version": [
- 20240824,
- 2024
+ 20241130,
+ 1105
],
"deps": [
"ht"
],
- "commit": "0994d4d78f79385e5830563d42a41118acc5a9ef",
- "sha256": "100wb249bmcc4ikj6zm0rwcyczabd994nakjb1w1kk4rxj5p2qjf"
+ "commit": "63c913aeb5836f2376d1ad01580e67f9d1c56e0a",
+ "sha256": "11agf4mzydyksbh869s1rq7z2vi4jk4w0mkbs9xqw69lnasr2iyx"
},
"stable": {
"version": [
@@ -112850,15 +112746,15 @@
"repo": "emacs-sideline/sideline-blame",
"unstable": {
"version": [
- 20240906,
- 1906
+ 20241130,
+ 1118
],
"deps": [
"sideline",
"vc-msg"
],
- "commit": "48288bc77a90b58c7609598d0a129ba1638d0098",
- "sha256": "17cnn5xga51j34z2m9c9mm6j9jgj9yqddk8g2idgli1sm9nv0mg4"
+ "commit": "24acacc766f7cc8ffb1a7dda695be6eb67ec5670",
+ "sha256": "18gvg5b89g88ijhx058lvdnwvwgm0jpkg6cnrrf86dj2sv2qzdcd"
},
"stable": {
"version": [
@@ -112882,16 +112778,16 @@
"repo": "emacs-sideline/sideline-flycheck",
"unstable": {
"version": [
- 20240629,
- 840
+ 20241130,
+ 1119
],
"deps": [
"flycheck",
"ht",
"sideline"
],
- "commit": "4147f2754c353e0b7920caf385b8dccc5e6301f7",
- "sha256": "1978b149d7mza2r2mknp01zvpf55sz49addaxd153fqdsmf8hxq8"
+ "commit": "1cc46a244d76027687136b3db0da1f5535d1352c",
+ "sha256": "0q16mblknwlvs9adg8vc919snr7m3qypz8xj2vbn2vf6m8prs0d3"
},
"stable": {
"version": [
@@ -112915,14 +112811,14 @@
"repo": "emacs-sideline/sideline-flymake",
"unstable": {
"version": [
- 20240509,
- 742
+ 20241130,
+ 1119
],
"deps": [
"sideline"
],
- "commit": "06e84875022a5645ece8f4c2c8b56aa5f003c65d",
- "sha256": "10gk7l93c13z8mpvd598x06bhv8zz21157madxdw1f7jarkssqh7"
+ "commit": "096b2fecfdb5a2192541e6099f761dde22b53aec",
+ "sha256": "0z8h403891swpprjfj5pvpnh129p9kmsn0hb7625k7iar6xnywc2"
},
"stable": {
"version": [
@@ -112945,8 +112841,8 @@
"repo": "emacs-sideline/sideline-lsp",
"unstable": {
"version": [
- 20240403,
- 2210
+ 20241130,
+ 1119
],
"deps": [
"dash",
@@ -112955,8 +112851,8 @@
"s",
"sideline"
],
- "commit": "69aca6403509abb4f5c5ba8499e98f80f81ebc88",
- "sha256": "0jh81bc7dl309v6bxfh2d39f9lbp61bsdanflym33lsvdyl59zrk"
+ "commit": "96fd13fa94fc7abfe84dbf1c966cdfe1b5273d94",
+ "sha256": "19jrhyyzsrc6vwj3kbpc9vh1wnyj81w46skk59dm91ws0isyvf6b"
},
"stable": {
"version": [
@@ -113414,11 +113310,11 @@
"repo": "laishulu/emacs-smart-input-source",
"unstable": {
"version": [
- 20231211,
- 1602
+ 20241125,
+ 217
],
- "commit": "23f3fe8b95e0570b65aa21b9db57c906aa9f35fd",
- "sha256": "1gc1z176nbc3hxx0wwid68bajbl1pwxllsmmsnpqx665zcn7qvnb"
+ "commit": "d55ea5c0271c9fb91cd1eeceadeb20f67b7cf5fb",
+ "sha256": "05c1fhvp29v76151l4pv1qkbxjlqkz4k60ps2yn2zlgmpygpzzkg"
}
},
{
@@ -113429,8 +113325,8 @@
"repo": "magit/sisyphus",
"unstable": {
"version": [
- 20240831,
- 2304
+ 20241015,
+ 1351
],
"deps": [
"compat",
@@ -113438,21 +113334,23 @@
"llama",
"magit"
],
- "commit": "9999af565f313507c8255c6c143963c9e8682c26",
- "sha256": "0szk06hf60s7c0vrrmbqmh61p3685spwms4jidmi3mclrz3ychvn"
+ "commit": "e6ec5d8687f34644b4d049a6be463269792c9fd6",
+ "sha256": "0kgx57liqqfdslxpzm7av1jj5yjpjbabdiijc95jqw47mvvnfj1b"
},
"stable": {
"version": [
0,
- 1,
+ 2,
0
],
"deps": [
"compat",
+ "elx",
+ "llama",
"magit"
],
- "commit": "ff5447669a6d208983e3d9897a5b247d8c5a215b",
- "sha256": "1nnb2l77bi58pg63w1sifxkj8hzzp14bzgldznk3q7b9hibjqlzd"
+ "commit": "e6ec5d8687f34644b4d049a6be463269792c9fd6",
+ "sha256": "0kgx57liqqfdslxpzm7av1jj5yjpjbabdiijc95jqw47mvvnfj1b"
}
},
{
@@ -113674,25 +113572,28 @@
},
{
"ename": "slack",
- "commit": "f0258cc41de809b67811a5dde3d475c429df0695",
- "sha256": "0mybjx08yskk9vi06ayiknl5ddyd8h0mnr8c0a3zr61p1x4s6anp",
+ "commit": "d2b2189ea2d354763dce759dcd5f6482e14024a7",
+ "sha256": "112r6nqcqgzjjbm3qd01vdirpkzb85qc5i27x4wq2gnzw559r4y4",
"fetcher": "github",
- "repo": "yuya373/emacs-slack",
+ "repo": "emacs-slack/emacs-slack",
"unstable": {
"version": [
- 20211129,
- 310
+ 20241126,
+ 6
],
"deps": [
"alert",
"circe",
+ "dash",
"emojify",
"oauth2",
"request",
+ "s",
+ "ts",
"websocket"
],
- "commit": "ff46d88726482211e3ac3d0b9c95dd4fdffe11c2",
- "sha256": "15g4dmy4iqqpk8ivhkpsngzllbw0nc5d2sc9j36sdnhwkajzhidj"
+ "commit": "661041b5c398a1e7c226b2805aaffd4387ec3e94",
+ "sha256": "0h66mb4mfdrwmbsxr5yfsqv580ipyqq0gyzfyz0cw11qwpxnq0x0"
}
},
{
@@ -113753,25 +113654,25 @@
"repo": "slime/slime",
"unstable": {
"version": [
- 20241013,
- 1008
+ 20241201,
+ 2103
],
"deps": [
"macrostep"
],
- "commit": "b37aff4842ed51b14ee583ee51d044e3aedb395d",
- "sha256": "1iz1a0i30fmw54h4y5kp52l8mnclwjb3nwzw6fvzy555f262r7k9"
+ "commit": "a71e133aa7d3c132bb3a00cedaeee3f76b5f17ab",
+ "sha256": "0rqjw2c5hzmrmvbf37l6fdx6pria6d360nvqka47qc74s4pw1hyi"
},
"stable": {
"version": [
2,
- 30
+ 31
],
"deps": [
"macrostep"
],
- "commit": "ef2af895a9e79306f0789e72b101aa39e960c900",
- "sha256": "0qb7m65gq0mbxfrdppkh3k4jn13i14i07ziga4r8b3rmrxhrmlv0"
+ "commit": "a71e133aa7d3c132bb3a00cedaeee3f76b5f17ab",
+ "sha256": "0rqjw2c5hzmrmvbf37l6fdx6pria6d360nvqka47qc74s4pw1hyi"
}
},
{
@@ -114005,11 +113906,11 @@
"repo": "vilij/slurpbarf-elcute",
"unstable": {
"version": [
- 20240922,
- 1741
+ 20241115,
+ 1459
],
- "commit": "98f0a9a124e46dd16683ff54208fee539945db46",
- "sha256": "1ygi7j21hwf8j5340ciskcrkaaqcsw25c1qnjmqzgkkrrjyb4nxh"
+ "commit": "c6e7d4b5da6f1116b479c71d9c7fa0aca71d4030",
+ "sha256": "1xd8nd55dhdf1dx622x2618zj3xk196p2yr4123hk8hlqlb46h2d"
}
},
{
@@ -114339,11 +114240,11 @@
"repo": "victorteokw/smart-mark",
"unstable": {
"version": [
- 20150912,
- 210
+ 20241104,
+ 1311
],
- "commit": "d179cdc3f53001a5ce99d5095f493cdf3a792567",
- "sha256": "0kd3rh6idlaqand9i6sc44s1iahg5jdhqs9jpvivxlycj6z9p7m8"
+ "commit": "d326cc77495f57beb4bc85614804976f1ae06fb7",
+ "sha256": "0zym233mvf2m565ppb4qx9l7845gxzr82sv31pff8f76221awxh0"
}
},
{
@@ -114858,14 +114759,14 @@
"repo": "nverno/sml-ts-mode",
"unstable": {
"version": [
- 20241009,
- 528
+ 20241015,
+ 632
],
"deps": [
"sml-mode"
],
- "commit": "649408a823f8aef23ea1697c5f897950e9b1cd9b",
- "sha256": "08xz2bjfzz4vlainkzlhj139wxxy27j7m7lxpn68pbgvn9w9vzna"
+ "commit": "d2dabcc9d8f91eeee7048641e4c80fabb3583194",
+ "sha256": "0wvp8vps9f7xxlas3vcs7l40047v3vr6w2byh6bphj0p19w9461d"
}
},
{
@@ -116058,11 +115959,11 @@
"repo": "nashamri/spacemacs-theme",
"unstable": {
"version": [
- 20240825,
- 1709
+ 20241101,
+ 1030
],
- "commit": "9f3781430106adfe512790d55a9705568b58d968",
- "sha256": "0q9rzih1c9r5bycvsr9iaimxz8fgh2r6z9wb4il69j3sbly81p12"
+ "commit": "6c74684c4d55713c8359bedf1936e429918a8c33",
+ "sha256": "0ijpgaa9p971r2gvrad0p52wz7x3ry2245g0vsmwds3lpahkyiwr"
},
"stable": {
"version": [
@@ -116201,11 +116102,11 @@
"repo": "condy0919/spdx.el",
"unstable": {
"version": [
- 20241011,
- 118
+ 20241117,
+ 126
],
- "commit": "28ccd3a7df1a417874e9c5ce05e5d372d42f24b8",
- "sha256": "0jvwm217maa9qcajqkc9s8hciw5jkh8iy0dxsxf01xmr6mmqxwqh"
+ "commit": "c036cfc6e6581b1c23d484d278e278c4d809fc23",
+ "sha256": "1isgv9fzdfgf2dn7nv5wypkm2g4yh508qxh1npgbfgwg38shpq1c"
}
},
{
@@ -116838,11 +116739,11 @@
"repo": "xenodium/sqlite-mode-extras",
"unstable": {
"version": [
- 20240319,
- 1312
+ 20241017,
+ 1030
],
- "commit": "376aabe26607d40fbd572290296edaaafdf61bd3",
- "sha256": "0xsk9b211nk2s6jxijvry5r75j64g3mazcd74iwkd21hq9hal5y8"
+ "commit": "2508fdd94b48517892a409a4cb725ece3bd015b6",
+ "sha256": "0fnd84fm37vkr64gvbdv6knaj2abmpl7p0h2w8ks26hbdb8g4wg0"
}
},
{
@@ -116976,11 +116877,11 @@
"repo": "srfi-explorations/emacs-srfi",
"unstable": {
"version": [
- 20240924,
- 1924
+ 20241121,
+ 1857
],
- "commit": "1dcf802700b39a078d970c2e18fcae91f674b0ff",
- "sha256": "0pdizm62plhk4j26fszb93vy1ijq5wv1g5gi9sdav52rim3pdgfp"
+ "commit": "e9f6edb09d9cce461249ad54505911d71ca81a45",
+ "sha256": "0hkri3rmyj303lhi4wr6ydc3b553lczra6al9n5i9mcvx2i43gx8"
},
"stable": {
"version": [
@@ -117108,11 +117009,11 @@
"repo": "cjohansson/emacs-ssh-deploy",
"unstable": {
"version": [
- 20230702,
- 928
+ 20241117,
+ 1850
],
- "commit": "95fb076c9b657c5f1bfad3ee5bf1f8691c50d428",
- "sha256": "0iwciwnlkpbasnwdvvip5g39jq4qc8srfw0s07ljb3c3njg3jhsg"
+ "commit": "dc8882d1806c0fdd635bc625b109179dfa3c929c",
+ "sha256": "022q31z4ybcrvp1wa16h623nyp2qcn0xrsrlzi0djfm1rxg80dx3"
},
"stable": {
"version": [
@@ -117291,11 +117192,11 @@
"repo": "SFTtech/starlit-emacs",
"unstable": {
"version": [
- 20240223,
- 1728
+ 20241130,
+ 2124
],
- "commit": "136bbc4fc4961c5b2cd0824eb0762e672322fbd1",
- "sha256": "1kdk7gb3244z50yxk7wdkvrh1l50ygx5h1flajv9sxqmfivmybfd"
+ "commit": "5427867db973d91bccb35a75f819591610a81024",
+ "sha256": "178q0j2g6ql3ng0gfgdp5nn546a49aw0yc0440sga6mf1az65nkk"
}
},
{
@@ -117519,11 +117420,11 @@
"repo": "motform/stimmung-themes",
"unstable": {
"version": [
- 20240117,
- 1324
+ 20241030,
+ 823
],
- "commit": "1a574973041cd5c318f39b95f6377b60337f2d6d",
- "sha256": "1whzhbvi1kzvxw8ciqm46p911pcd7ynh9zgkshlyzrgg2dcvamrp"
+ "commit": "c7fbe9f06fff0fca2f2fc9a448865c6fc1e6ce8a",
+ "sha256": "0b5dn4f1cgldf7a5y22297p42xhhjgqy6gky1dnyj2b5jzyryxyd"
}
},
{
@@ -118379,14 +118280,14 @@
"repo": "rougier/svg-tag-mode",
"unstable": {
"version": [
- 20240828,
- 820
+ 20241021,
+ 1341
],
"deps": [
"svg-lib"
],
- "commit": "91179d9576850312b00583910a55c798ba615382",
- "sha256": "17z1zkgz1phhfp1avh37wzp31n8092xjq5fw1vyg4wjyx019444q"
+ "commit": "13e888b8bd9a0664d060149a44a751b2113331b6",
+ "sha256": "0fbq5gcr4rfddjdfy5qcnlk64lb15pibg1bbgdnyqvyvvv0biw48"
}
},
{
@@ -118847,11 +118748,11 @@
"repo": "dimitri/switch-window",
"unstable": {
"version": [
- 20220812,
- 2137
+ 20241028,
+ 314
],
- "commit": "71ef2f54c97f3fd2e7ff7964d82e6562eb6282f7",
- "sha256": "186100j93in5dm1h3xl1sg892yfz8nvssap2hsy5kh6aw1am412y"
+ "commit": "61e425e703bee66825c33f4be11fabac1a3d992a",
+ "sha256": "1wj9rm2yvl72irahq486h78caqqmlf7v1r17ysz69l2kwiqfjidv"
},
"stable": {
"version": [
@@ -119098,8 +118999,8 @@
"repo": "drym-org/symex.el",
"unstable": {
"version": [
- 20240920,
- 2329
+ 20241126,
+ 352
],
"deps": [
"evil",
@@ -119112,8 +119013,8 @@
"tree-sitter",
"tsc"
],
- "commit": "6e9867002919576d8ab69d14c7d6095fe42d3a16",
- "sha256": "08kxgzv22x2ysqmlwhzpvh6y2rfd83vnqks42g26a120r942zpqs"
+ "commit": "2a5ad0113a906aca9f4adade2776706657b314bc",
+ "sha256": "056c5n21xq0r82nysjn7m230h85pd3z1fiz38asabcpkd5cxbbir"
},
"stable": {
"version": [
@@ -119199,20 +119100,20 @@
"repo": "KeyWeeUsr/emacs-syncthing",
"unstable": {
"version": [
- 20240101,
- 2334
+ 20241126,
+ 247
],
- "commit": "9f44d45a55b460b7eaeb9fb15d17d94e790705e0",
- "sha256": "13s6gnjxf5g1688hs30ha65nmmby3gyyzpb2wb82hckwgm0g8rqp"
+ "commit": "70569dd11762125205015b0e59638c6b1683f0f5",
+ "sha256": "11jynl1wg13vysnzl0xakwl6h3kqvjbdjcxxvc0gq2qg73iz4am1"
},
"stable": {
"version": [
- 2,
- 2,
+ 3,
+ 0,
0
],
- "commit": "9f44d45a55b460b7eaeb9fb15d17d94e790705e0",
- "sha256": "13s6gnjxf5g1688hs30ha65nmmby3gyyzpb2wb82hckwgm0g8rqp"
+ "commit": "70569dd11762125205015b0e59638c6b1683f0f5",
+ "sha256": "11jynl1wg13vysnzl0xakwl6h3kqvjbdjcxxvc0gq2qg73iz4am1"
}
},
{
@@ -119424,30 +119325,6 @@
"sha256": "03id3zjiq15nyw0by4fari837c8362fscl7y329gn9ikf7z6hxd9"
}
},
- {
- "ename": "system-packages",
- "commit": "7d3c7af03e0bca3f834c32827cbcca29e29ef4db",
- "sha256": "13nk3m8gw9kqjllk7hgkmpxsx9y5h03f0l7zydg388wc7cxsiy3l",
- "fetcher": "gitlab",
- "repo": "jabranham/system-packages",
- "unstable": {
- "version": [
- 20220409,
- 1023
- ],
- "commit": "c087d2c6e598f85fc2760324dce20104ea442fa3",
- "sha256": "00idwy8jzvkgs8qzafiy6s344rgms452n8mxbjg6yszwp3y3hmq1"
- },
- "stable": {
- "version": [
- 1,
- 1,
- 0
- ],
- "commit": "05add2fe051846e2ecb3c23ef22c41ecc59a1f36",
- "sha256": "0n4qr5qqy6hbc1hg4wi1d2ckdl870v5mf9xhv5m9vrlwaphvnnjr"
- }
- },
{
"ename": "system-specific-settings",
"commit": "3f52c584d7435c836ba3c95c598306ba0f5c06da",
@@ -119655,6 +119532,35 @@
"sha256": "09vbdzi1kgd1z92fkhi6g1wisj1r0mvr30l2sq6a0kswc3f99yrf"
}
},
+ {
+ "ename": "tab-line-nerd-icons",
+ "commit": "fcf5f86284a02746c2475522fbd73ae663b88239",
+ "sha256": "1hid372ja5r2j43944lbszm7d5ivss167i5cci1hn3jif0gwb3zl",
+ "fetcher": "github",
+ "repo": "lucius-martius/tab-line-nerd-icons",
+ "unstable": {
+ "version": [
+ 20241125,
+ 1048
+ ],
+ "deps": [
+ "nerd-icons"
+ ],
+ "commit": "7a49880f3ae39a8709d6887b26ec84ba2b92360c",
+ "sha256": "0iwxiixdhc5j4gx6mqplav4jcik1kvc0dnai84vdxiii7222zfq7"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1
+ ],
+ "deps": [
+ "nerd-icons"
+ ],
+ "commit": "e44d16276f5df80a2d2b86e5fafb132f43bfd550",
+ "sha256": "0plmb9m8hpini73v2z1kcpwkm5jvdikbkadp8x6p78d9wi2iss78"
+ }
+ },
{
"ename": "tabbar",
"commit": "806420d75561cbeffbc1b387345a56c21cc20179",
@@ -119771,8 +119677,24 @@
"repo": "shuxiao9058/tabnine",
"unstable": {
"version": [
- 20240629,
- 1347
+ 20241123,
+ 715
+ ],
+ "deps": [
+ "dash",
+ "editorconfig",
+ "language-id",
+ "s",
+ "transient"
+ ],
+ "commit": "1f7e417eb18e097c0c08c9d151f40f476aa64608",
+ "sha256": "0vd43cj7fmrjig6abibz5nlag8f3m8qgdb4ncqygq81fl39f5sif"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 0
],
"deps": [
"dash",
@@ -119793,14 +119715,14 @@
"repo": "mclear-tools/tabspaces",
"unstable": {
"version": [
- 20240924,
- 1414
+ 20241123,
+ 1957
],
"deps": [
"project"
],
- "commit": "49bd9508bade2962f72f4fab9ffc12ef31c271f7",
- "sha256": "1cn0ccv65n4j6q1g17rgz3acrzg6w65x0zfrnpxbm8dfid4r6zr5"
+ "commit": "4fd52c33f4a215360e2b2e1b237115a217ae9bbe",
+ "sha256": "0k17vaflbqm5n7jcllpaz4idmvmy79njsaq9i4r5py367g85qa7z"
}
},
{
@@ -119945,11 +119867,11 @@
"repo": "juba/color-theme-tangotango",
"unstable": {
"version": [
- 20220714,
- 2034
+ 20241117,
+ 1143
],
- "commit": "9036c4978965149ae9837bc0ad691b2ba9269052",
- "sha256": "08qmc43m02hpy34mc7fynd9jvwc3idaawn2mq4357y56m7d38f3r"
+ "commit": "897c1643bd2cfd3c0b265a5f7599d1d04de0c304",
+ "sha256": "0a73196mhwjv72j4rkkzq8gdwp3igvkqgd14qv06z4a7d5phaxgz"
}
},
{
@@ -119999,11 +119921,11 @@
"repo": "saf-dmitry/taskpaper-mode",
"unstable": {
"version": [
- 20241007,
- 837
+ 20241126,
+ 1304
],
- "commit": "eb3907798188f3117f24eec8f295b9490f6a0953",
- "sha256": "1pkhlnykawxkv4zaghqb1ssiypg6j5pjc73f60gmjpsxwb8ki0xj"
+ "commit": "fff056c76220ea87eb45ee115f3a54a1abf1273e",
+ "sha256": "1hn2mfafkzbv8cwz3ch83by3x9nxq6m4ymx75chg0np55l9hmdxg"
},
"stable": {
"version": [
@@ -120041,14 +119963,14 @@
"repo": "phillord/tawny-owl",
"unstable": {
"version": [
- 20231117,
- 1644
+ 20241104,
+ 1432
],
"deps": [
"cider"
],
- "commit": "b2708d693400a2010370df040d7571bc30fa4d75",
- "sha256": "02p8gw7pzawzq2zzkgfx8wpp4l4zlz9zyw0f298yqrwp2zsrw5fx"
+ "commit": "0baa9c3e9aea40bcf9c11c9a009f0e26efbc366f",
+ "sha256": "1rn0lmn0pcsyvh55kfv1afhwmgxyks8knlmncj95a53ydra0qriv"
},
"stable": {
"version": [
@@ -120190,16 +120112,15 @@
"repo": "zevlg/telega.el",
"unstable": {
"version": [
- 20240911,
- 638
+ 20241118,
+ 1404
],
"deps": [
- "rainbow-identifiers",
"transient",
"visual-fill-column"
],
- "commit": "aa891d2a5a6cba18ab79b42d396795f7b61f2e9f",
- "sha256": "04raas24bvrjsfk8div8822cgiyqy5n9bsqxwvrjjqy54jf2m2jp"
+ "commit": "f4f957253093a449c806397fd6157e19d84a7c02",
+ "sha256": "1v6v813lglgwcl8kv6jrvqjyqgp4crpbkv8qyckh9bhkjbmcgxma"
},
"stable": {
"version": [
@@ -120330,14 +120251,14 @@
"repo": "minad/tempel",
"unstable": {
"version": [
- 20240926,
- 925
+ 20241115,
+ 656
],
"deps": [
"compat"
],
- "commit": "7414b13cf9986f241f89149ccd2c39f1ec1d110c",
- "sha256": "15wd5gh8pni9kyflz317pdl24cr3cq7hmxy0bhckz4lmvs91vv9i"
+ "commit": "3659036edbc332746dec556d0dec69ac4c52dcac",
+ "sha256": "14xw8sf5frws7qrpq4p08nphj1hflrnzlxa0bd78p6dkr86pjnij"
},
"stable": {
"version": [
@@ -120359,14 +120280,14 @@
"repo": "Crandel/tempel-collection",
"unstable": {
"version": [
- 20240903,
- 1136
+ 20241107,
+ 1417
],
"deps": [
"tempel"
],
- "commit": "cb7367ac57e3ddec687e11d1567e8b3843e0d311",
- "sha256": "18m9pxk9shwdr80h18kzy8sgr0ifa3sma6y4k5n59lcq4nkmlpg1"
+ "commit": "85f8e1d80963bc717abb8bf160274455093e3b6f",
+ "sha256": "0nc23339y09r8ngx154bdcnlx1kbz1pr4l0j28nli79zcvxb4akf"
}
},
{
@@ -121509,21 +121430,21 @@
"repo": "facebook/fbthrift",
"unstable": {
"version": [
- 20241014,
- 1131
+ 20241125,
+ 830
],
- "commit": "f2c4e6c61f8235d909f0af06ac0bb3043a2ce3a5",
- "sha256": "07wz8di70q1cpb853rfkxa70bfqpkwidm31wmxxk8abar4zm0a3i"
+ "commit": "13a0cd43ea3f14bc58b7685dbb28bb5325c6a398",
+ "sha256": "126gb3z9y2jz74qx5hv4zpwlx9chhip996ihlzk7c8zcvyj86gdv"
},
"stable": {
"version": [
2024,
- 10,
- 7,
+ 11,
+ 25,
0
],
- "commit": "8d6d2cea014274c23db498400f1559e5a82995e7",
- "sha256": "17nxbjab5kr2hyy34mys22k7h7wz4b8ha1yy05cvrryhiyi45gf7"
+ "commit": "13a0cd43ea3f14bc58b7685dbb28bb5325c6a398",
+ "sha256": "126gb3z9y2jz74qx5hv4zpwlx9chhip996ihlzk7c8zcvyj86gdv"
}
},
{
@@ -121603,8 +121524,8 @@
"repo": "ananthakumaran/tide",
"unstable": {
"version": [
- 20230620,
- 1444
+ 20241019,
+ 2101
],
"deps": [
"cl-lib",
@@ -121612,8 +121533,8 @@
"flycheck",
"s"
],
- "commit": "b38dfc3f8fb754e64e48e76fc92d472cb3d1a3dc",
- "sha256": "0s1wfsn6z828zxydd0cmfy9c9nix77snx10cr2va8wdrsp0sy14s"
+ "commit": "6a35fe355f1442da34b976bf2decf008d6e4f991",
+ "sha256": "0sr7r7bbsj724s7k8g3a4sy462057n0v6l2wx512naxnzhkk56xq"
},
"stable": {
"version": [
@@ -121936,19 +121857,19 @@
"repo": "aimebertrand/timu-line",
"unstable": {
"version": [
- 20240405,
- 2022
+ 20241107,
+ 2145
],
- "commit": "3957234a4a7618376dc9ef40272f6aeabdf48843",
- "sha256": "0msa4c6h6y1kl1q5rqjbf7i1hkpgp7k9qif7ssjq7dj6dlhakmb1"
+ "commit": "cbb456f96f5a300d4705565660de7e6dbb225dbe",
+ "sha256": "0m6z0ckypp2lkh4s1yqlsq724axwh5spnx06jjcr0dcdv4rkj2sp"
},
"stable": {
"version": [
- 0,
- 9
+ 1,
+ 0
],
- "commit": "3957234a4a7618376dc9ef40272f6aeabdf48843",
- "sha256": "0msa4c6h6y1kl1q5rqjbf7i1hkpgp7k9qif7ssjq7dj6dlhakmb1"
+ "commit": "9744c8ac9070ca8b744c0207a6f573d8eddf5adc",
+ "sha256": "0zlaqdzij0pfqyq7ln8zpk5r2rx0vvv98a29f2wwxccspikps0sj"
}
},
{
@@ -122349,11 +122270,11 @@
"repo": "justinlime/toggle-term.el",
"unstable": {
"version": [
- 20240804,
- 117
+ 20241112,
+ 635
],
- "commit": "54605ed1d03dbfd324d9bec4ee314ab764a2a8dd",
- "sha256": "15cmn2zwcypx17zxii3m39a7jwb4fsxm9ix8ykbmnxnjfl7kzxha"
+ "commit": "64f7022d214d5701c6babfe4a975baa60ec999c8",
+ "sha256": "0kw1pyd8vywlad4kkh8rw7l941jmc86y6ahs76l1xzxs4lgwsm2s"
}
},
{
@@ -122394,11 +122315,11 @@
"repo": "topikettunen/tok-theme",
"unstable": {
"version": [
- 20231019,
- 947
+ 20241114,
+ 1637
],
- "commit": "61c86fd2902b6342efe4463230dffdd185159d1c",
- "sha256": "03n75dmsmlhpkra6scqpvanbcfplc08np8hzarn4jcnysybji0f4"
+ "commit": "fa495ad556079af8efff758d3705dbf22ca64ca1",
+ "sha256": "0abdvzww9lj20jjqygj6sp528dilry4368w2pc88j7whfv1wyp2i"
}
},
{
@@ -122510,11 +122431,11 @@
"repo": "jamescherti/tomorrow-night-deepblue-theme.el",
"unstable": {
"version": [
- 20240922,
- 114
+ 20241128,
+ 1605
],
- "commit": "83cdd101e8ff25e1fe6addd224ab726095616304",
- "sha256": "1qj3yf1izk9qlnpmq39dfdf0r5sq8csy8ynrkb6ari3xi7w68y3p"
+ "commit": "a6f73ee3cafd580a8704f6d1a596dc19c783e31c",
+ "sha256": "01mfial0jh595pk6imn6z0g4r3mk15c508xnkkrsazs3614brwq8"
},
"stable": {
"version": [
@@ -122781,6 +122702,35 @@
"sha256": "0fn8ivq9i48w26c09963chc5v8gnvz0nxgqzzvkk4b7qki1rav2j"
}
},
+ {
+ "ename": "tp",
+ "commit": "67589f7b4bad6d14792364e5106cedd93cb3c86f",
+ "sha256": "0pyiphw9fidrx353dijf5k92jmqb2vj3aaxpg0zr6kajzlf03ljm",
+ "fetcher": "codeberg",
+ "repo": "martianh/tp.el",
+ "unstable": {
+ "version": [
+ 20241031,
+ 729
+ ],
+ "deps": [
+ "transient"
+ ],
+ "commit": "df6490d86f24fff22f5ea4f7d887fc60caed1163",
+ "sha256": "14vdn5syv7jghxvqlih9gvh82755r5gd8yxskq8bv6wkm4b0y0cs"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 6
+ ],
+ "deps": [
+ "transient"
+ ],
+ "commit": "df6490d86f24fff22f5ea4f7d887fc60caed1163",
+ "sha256": "14vdn5syv7jghxvqlih9gvh82755r5gd8yxskq8bv6wkm4b0y0cs"
+ }
+ },
{
"ename": "tql-mode",
"commit": "6a7c3dec5d970a4e819c0166a4b9846d74484b08",
@@ -122965,11 +122915,11 @@
"repo": "fosskers/transducers.el",
"unstable": {
"version": [
- 20240308,
- 843
+ 20241103,
+ 35
],
- "commit": "2d452e4cdc3b5cfa29ee3d7a645ff53d4e993384",
- "sha256": "1k17mxkk7mdv07ji30njxdpkzgyjpn4v45p0am72wn1k1kyq4vim"
+ "commit": "f8f46db6ddba6641669160fffb3f98213ab5b213",
+ "sha256": "1xdiyzzy2ld7xv2wd9aghivzm90cnjykm3hfaa1wr75006bsm88f"
},
"stable": {
"version": [
@@ -123007,28 +122957,28 @@
"repo": "magit/transient",
"unstable": {
"version": [
- 20241008,
- 1824
+ 20241201,
+ 1616
],
"deps": [
"compat",
"seq"
],
- "commit": "8873c300b2cf8c648278210205c1d3234e387a30",
- "sha256": "0q0jsvl9irhsp3blnl4yfnfwgafr13kc4i4xlxjccf2y3q75qlf5"
+ "commit": "37be15575a8e7618de59b6aec5a42ba5656dc36f",
+ "sha256": "1whz9zkzid34rz5753xxyvsxnhs24xcnbv31bvc6n8l1szdncfzi"
},
"stable": {
"version": [
0,
7,
- 7
+ 9
],
"deps": [
"compat",
"seq"
],
- "commit": "fc03c0b75826aa771b682137aa3f4e24130a9e3c",
- "sha256": "0rdhjb2fcxwxpbr7lrjqqqdnag2zqs8l6g4yw59bkp4g7kxpmmar"
+ "commit": "00fabc76eb3dc75f742d8d2720c44e25e5772e8f",
+ "sha256": "17qhj3i57i6yz28bvznimls7z1y3f4mln0axk2782jcysz7f80bl"
}
},
{
@@ -123401,16 +123351,16 @@
"repo": "ShuguangSun/tree-sitter-ess-r",
"unstable": {
"version": [
- 20221012,
- 855
+ 20241120,
+ 1547
],
"deps": [
"ess",
"tree-sitter",
"tree-sitter-langs"
],
- "commit": "9669c00f3d3463e6769725af74c392891e269eed",
- "sha256": "083m21lqgic910fqbxc104fai0vh2hrb7s2nlln43l7hlb8939b4"
+ "commit": "5e5dbd4d1cf6417530bae2f620405d304fac7772",
+ "sha256": "12lami5z8ji19y79zpwvk1p15zzhnjawj1bp2i5gnr38r8h9k2qy"
},
"stable": {
"version": [
@@ -123483,26 +123433,26 @@
"repo": "emacs-tree-sitter/tree-sitter-langs",
"unstable": {
"version": [
- 20241006,
- 953
+ 20241201,
+ 1840
],
"deps": [
"tree-sitter"
],
- "commit": "62e169d3122658761581105c91d8a6aad103fed5",
- "sha256": "0ssf35m6ihbrh4gnp7ikv6jzbqarcpwarb9jbniiba378czas07h"
+ "commit": "c5ca30e1fa43ca1fdcb7f423ec4c97732ccb8753",
+ "sha256": "0cj6x17yc6j8byqvb7y0k8s2vpwzyq9myqbrj2jj5i38y7d6zcb8"
},
"stable": {
"version": [
0,
12,
- 226
+ 238
],
"deps": [
"tree-sitter"
],
- "commit": "62e169d3122658761581105c91d8a6aad103fed5",
- "sha256": "0ssf35m6ihbrh4gnp7ikv6jzbqarcpwarb9jbniiba378czas07h"
+ "commit": "c5ca30e1fa43ca1fdcb7f423ec4c97732ccb8753",
+ "sha256": "0cj6x17yc6j8byqvb7y0k8s2vpwzyq9myqbrj2jj5i38y7d6zcb8"
}
},
{
@@ -123579,8 +123529,8 @@
"repo": "Alexander-Miller/treemacs",
"unstable": {
"version": [
- 20240815,
- 1227
+ 20241113,
+ 2139
],
"deps": [
"ace-window",
@@ -123592,8 +123542,8 @@
"pfuture",
"s"
],
- "commit": "488dfc0a3aa7c1d35802d4f89be058e761578663",
- "sha256": "01gljyihn9wyishd39vxav8rdzy19wsp0jyd0kr7w7xv83rbm57n"
+ "commit": "2fd7745f1bc446fc590dc7ba2eb4e062a51fbb3e",
+ "sha256": "0pspxkja58zpic2gnprhg5jkdy49ydw09rgg9wpf6vjwr5zbxp5b"
},
"stable": {
"version": [
@@ -123684,14 +123634,14 @@
"repo": "Alexander-Miller/treemacs",
"unstable": {
"version": [
- 20240131,
- 2042
+ 20241017,
+ 2046
],
"deps": [
"treemacs"
],
- "commit": "bcba09c1581c4bd93ff0217d464aead04f6d26d4",
- "sha256": "051x78qpzclzr8mic5z3rpr1j3f5a5apcnn9rhah1rnxg5z9gqa7"
+ "commit": "63e80d4b96c2a411da0beaee8a1e46f116e05e27",
+ "sha256": "1bibbphybx0qbc0w8lhr8zpc9fl9pfcn3721vmjmr3qkh0w695rk"
},
"stable": {
"version": [
@@ -123941,11 +123891,11 @@
"repo": "erickgnavar/treesit-ispell.el",
"unstable": {
"version": [
- 20240816,
- 145
+ 20241104,
+ 1520
],
- "commit": "9e06b5a37945f3ff96a5cfbb79ea3e4c2986bd6a",
- "sha256": "1fq5j8rx1crwdjxsg18i8l83m0fql9z2rnkfjgjxwc75p83b77hi"
+ "commit": "fd1598fb16fe99dc8d8245974641c3e474dc31d1",
+ "sha256": "18373figl9l9wshv5m8dbkpnjlbqciv28miah5zs21c6m344l6g5"
}
},
{
@@ -123956,11 +123906,20 @@
"repo": "tilmanrassy/emacs-treeview",
"unstable": {
"version": [
- 20230728,
- 2343
+ 20241101,
+ 115
+ ],
+ "commit": "9a1a16f84fc3c368443641f7a71aa2407ad91d38",
+ "sha256": "1m1xxkhvd3pb6j2ljsf57jzksb2iap1ssnsy1l7amknnwfdk9hsi"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 3,
+ 0
],
- "commit": "c6888e5f3aa0d72a7b4db625fcc2a847fd3bb1ce",
- "sha256": "1jr9lw7hjwa2cajphy9y19gn3dlacdp1kggp823vpx5p1d5fsvgz"
+ "commit": "f8b678ba1dd52171002585bfc13921a509658af3",
+ "sha256": "0blggaqzz7rwycpp6v0n0fig1d9prdp63w25cprnq59ymczr7w85"
}
},
{
@@ -124618,20 +124577,20 @@
"repo": "KeyWeeUsr/typewriter-roll-mode",
"unstable": {
"version": [
- 20240817,
- 928
+ 20241127,
+ 1742
],
- "commit": "9ce34ea14616e478f10abc49727d9e9cee6c5dc3",
- "sha256": "0kjqimpgm8awjav0m796w3bb0qrbvm2i85cn6b37fxbxa6dsxhql"
+ "commit": "821a0c6e13e160e9a6f02c6232449c163043f75b",
+ "sha256": "0ijihkx1lnl8hkbl5m6hn9n9bf3a0w90b00hz3xlsw1i32wriik3"
},
"stable": {
"version": [
1,
2,
- 0
+ 1
],
- "commit": "9ce34ea14616e478f10abc49727d9e9cee6c5dc3",
- "sha256": "0kjqimpgm8awjav0m796w3bb0qrbvm2i85cn6b37fxbxa6dsxhql"
+ "commit": "821a0c6e13e160e9a6f02c6232449c163043f75b",
+ "sha256": "0ijihkx1lnl8hkbl5m6hn9n9bf3a0w90b00hz3xlsw1i32wriik3"
}
},
{
@@ -124977,11 +124936,11 @@
"repo": "marktran/color-theme-ujelly",
"unstable": {
"version": [
- 20180214,
- 1624
+ 20241111,
+ 822
],
- "commit": "bf724ce7806a738d2043544061e5f9bbfc56e674",
- "sha256": "0pz26q5qfq4wiqcpfkq26f19q5gyiv8q71sq4k77hkss5a5b5fqg"
+ "commit": "7345ab821739aafa2ec079a71fa7de350a869f0e",
+ "sha256": "057nvr00siib76ar86n9dw50xkc4likk5l1nrnz60wnmgvri80h8"
}
},
{
@@ -125561,14 +125520,14 @@
"repo": "tbanel/uniline",
"unstable": {
"version": [
- 20241014,
- 1600
+ 20241130,
+ 1714
],
"deps": [
"hydra"
],
- "commit": "51f8096af29bc67ab6defedf3bf71e82e64e67c2",
- "sha256": "04l48gaqyvsxfpvrgi412qjx95283yi30r6kcw9rldpx9hvqywwk"
+ "commit": "f9177e8b476db6f388ad4eac1a98b5d6129e7f61",
+ "sha256": "1vhan0dpxq7k5bi863hyb3fn8k8x7m6vidr4b4blj601bmdygk7k"
}
},
{
@@ -126116,46 +126075,16 @@
"sha256": "1aalrgyk8pwsc07qmczqhgccjli6mcckkbgpass3kvrkcfxdl2zk"
}
},
- {
- "ename": "use-package",
- "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953",
- "sha256": "0rlccqjdynh03ww9jqnnyvn86mr9cd4hlfni8hz2r7a726b70xf1",
- "fetcher": "github",
- "repo": "jwiegley/use-package",
- "unstable": {
- "version": [
- 20230426,
- 2324
- ],
- "deps": [
- "bind-key"
- ],
- "commit": "b59b4dc2361c7b351238990d0c34eece8d79ecf0",
- "sha256": "05995kr3chn918l0hywslqfvk0rbr2pzbdbfkdfij65hpmdjaznh"
- },
- "stable": {
- "version": [
- 2,
- 4,
- 4
- ],
- "deps": [
- "bind-key"
- ],
- "commit": "9090080b15486c3e337be254226efe7e5fde4c99",
- "sha256": "03mqkv63ink2ysy86slac8ac7a5g22bi0pwvxyncfasm43q9d0sx"
- }
- },
{
"ename": "use-package-chords",
- "commit": "6240afa625290187785e4b7535ee7b0d7aad8969",
- "sha256": "1217l0gpxcp8532p0d3g1xd2015qpx2g5xm0kwsbxdmffqqdaar3",
+ "commit": "6c1d8ed99c3769f6a789fb51dc37794b95f8bb37",
+ "sha256": "18av8gkz3nzyqigyd88ajvylsz2nswsfywxrk2w8d0ykc3p37ass",
"fetcher": "github",
- "repo": "jwiegley/use-package",
+ "repo": "waymondo/use-package-chords",
"unstable": {
"version": [
- 20221117,
- 1610
+ 20241115,
+ 2228
],
"deps": [
"bind-chord",
@@ -126163,8 +126092,8 @@
"key-chord",
"use-package"
],
- "commit": "9090080b15486c3e337be254226efe7e5fde4c99",
- "sha256": "03mqkv63ink2ysy86slac8ac7a5g22bi0pwvxyncfasm43q9d0sx"
+ "commit": "a2b16a1e64b19ae9428a6cd8f3e09b8159707a29",
+ "sha256": "0krskz087vy4iws01w5wxsn7b0pkncsn6s1vj9ywagn5i1z6a34x"
},
"stable": {
"version": [
@@ -126182,38 +126111,6 @@
"sha256": "03mqkv63ink2ysy86slac8ac7a5g22bi0pwvxyncfasm43q9d0sx"
}
},
- {
- "ename": "use-package-ensure-system-package",
- "commit": "6240afa625290187785e4b7535ee7b0d7aad8969",
- "sha256": "1cl61nwgsz5dh3v9rdiww8mq2k1sbx27gr6izb4ij4pnzjp7aaj6",
- "fetcher": "github",
- "repo": "jwiegley/use-package",
- "unstable": {
- "version": [
- 20221209,
- 2013
- ],
- "deps": [
- "system-packages",
- "use-package"
- ],
- "commit": "bcf0984cf55b70fe6896c6a15f61df92b24f8ffd",
- "sha256": "0pmz5x7ghwsjyr4lhaqa53c7190bjqxaczljpsr62s60bn55fdsi"
- },
- "stable": {
- "version": [
- 2,
- 4,
- 4
- ],
- "deps": [
- "system-packages",
- "use-package"
- ],
- "commit": "9090080b15486c3e337be254226efe7e5fde4c99",
- "sha256": "03mqkv63ink2ysy86slac8ac7a5g22bi0pwvxyncfasm43q9d0sx"
- }
- },
{
"ename": "use-package-hydra",
"commit": "28589bb76442601930a4591e200c8e1db119caf6",
@@ -126305,15 +126202,30 @@
"repo": "ushin/ushin-shapes.el",
"unstable": {
"version": [
- 20230702,
- 2210
+ 20241022,
+ 522
+ ],
+ "deps": [
+ "compat",
+ "svg-lib",
+ "svg-tag-mode"
+ ],
+ "commit": "fd2c4289c7d336528f1f855eb9378615417f4483",
+ "sha256": "0gjnnlldv9vxysn7s2sbz2hswkj6674alkzcgv97205yii4kgqsd"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 3,
+ 0
],
"deps": [
+ "compat",
"svg-lib",
"svg-tag-mode"
],
- "commit": "30171af499d8117a2dbc3e978473793eced49bcb",
- "sha256": "1gxjj1f9jdh572sdfh60z3a056a4clzssbyx12kkh60vak5g0fg3"
+ "commit": "fd2c4289c7d336528f1f855eb9378615417f4483",
+ "sha256": "0gjnnlldv9vxysn7s2sbz2hswkj6674alkzcgv97205yii4kgqsd"
}
},
{
@@ -126339,26 +126251,26 @@
"repo": "diml/utop",
"unstable": {
"version": [
- 20240226,
- 1308
+ 20241125,
+ 1512
],
"deps": [
"tuareg"
],
- "commit": "d4f6f5f7337eeeac9507801c8f147fff518f9d69",
- "sha256": "03lagf6s7rsxcgrqk1nklnrbsjrng5gpw0h0rza510y08k77gw52"
+ "commit": "3322adaa5267b1188d14b15e85c802c21fe061cb",
+ "sha256": "0g5inax35v3m8bxvbrdvjv0zg1b7q4jk8xp5jwhgjp5n3w3hryy1"
},
"stable": {
"version": [
2,
- 14,
+ 15,
0
],
"deps": [
"tuareg"
],
- "commit": "d4f6f5f7337eeeac9507801c8f147fff518f9d69",
- "sha256": "03lagf6s7rsxcgrqk1nklnrbsjrng5gpw0h0rza510y08k77gw52"
+ "commit": "3322adaa5267b1188d14b15e85c802c21fe061cb",
+ "sha256": "0g5inax35v3m8bxvbrdvjv0zg1b7q4jk8xp5jwhgjp5n3w3hryy1"
}
},
{
@@ -126587,11 +126499,11 @@
"repo": "arthurgleckler/validate-html",
"unstable": {
"version": [
- 20210420,
- 2344
+ 20241023,
+ 2029
],
- "commit": "748e874d50c3a95c61590ae293778e26de05c5f9",
- "sha256": "0b2b5dm85jwgkqvga23r3vfya07vxv2n7a3a6r1pxpk8asqlw41c"
+ "commit": "4285c492d8a28025ffce7ee717e2aefc905bea66",
+ "sha256": "1h413p278g1yz88paj27azyljray31fm5fr6r2ql7zra9yc1dv91"
}
},
{
@@ -127135,11 +127047,11 @@
"repo": "federicotdn/verb",
"unstable": {
"version": [
- 20241012,
- 1924
+ 20241021,
+ 1914
],
- "commit": "98934fef8cd2bc339f40abb36ee4a6776e50872d",
- "sha256": "12fcji7q50w174fvmdyf7fxpp2yi3g7dn8z75ril7s9c3ajgfr67"
+ "commit": "c05263f8cad09b9bf13b03ad9198c40400f31483",
+ "sha256": "1dihjsyi7qi7znqai3r2fa9ggb7mggzsap3723bhj5pkl0gfq9ld"
},
"stable": {
"version": [
@@ -127351,14 +127263,14 @@
"repo": "minad/vertico",
"unstable": {
"version": [
- 20241004,
- 1350
+ 20241105,
+ 2131
],
"deps": [
"compat"
],
- "commit": "e826dfcb14af5e2cfd88ed110d0208ddc2d37788",
- "sha256": "0f029jyjca1cis6mlj5ba4xn417q7sqxjdbp86am5nfvawglybqi"
+ "commit": "b0f9e7679be590b976576e4056b6af4b31212ab0",
+ "sha256": "0wsd1d5grrmpyywxl1fgfw2wd4i65fd6g5dml7a58i6fq44jr8r9"
},
"stable": {
"version": [
@@ -127458,8 +127370,8 @@
"repo": "gmlarumbe/vhdl-ext",
"unstable": {
"version": [
- 20240917,
- 1142
+ 20241016,
+ 1217
],
"deps": [
"ag",
@@ -127471,14 +127383,14 @@
"ripgrep",
"vhdl-ts-mode"
],
- "commit": "ee05144a17fa319f6acc001ff990def0796d757a",
- "sha256": "0qm3i1jicjjkivm46cwmqv5nl2dvnb7dass6r24d03xg624clrc9"
+ "commit": "28838b9722933889c8af4b9b543db07ccd2d2b66",
+ "sha256": "1fm42f0fhnychix1mzhlnrchnipi9qq5cl9sjlhmfxz0wflrbqij"
},
"stable": {
"version": [
0,
5,
- 2
+ 3
],
"deps": [
"ag",
@@ -127490,8 +127402,8 @@
"ripgrep",
"vhdl-ts-mode"
],
- "commit": "dee99805f375b5fc7f4821bf8fd6563fc53bf03e",
- "sha256": "1fsgfwazvhvbp06hrfm0xzlvs92d4i0x24znfavrib0s25in8pcv"
+ "commit": "28838b9722933889c8af4b9b543db07ccd2d2b66",
+ "sha256": "1fm42f0fhnychix1mzhlnrchnipi9qq5cl9sjlhmfxz0wflrbqij"
}
},
{
@@ -127744,11 +127656,11 @@
"repo": "nverno/vimscript-ts-mode",
"unstable": {
"version": [
- 20240426,
- 818
+ 20241020,
+ 7
],
- "commit": "e806f59f870e268bfe879bdc7b5134e641c42c0f",
- "sha256": "0n5k0rl7panzbzjfaj6y3qcirr9c809fh0p9156v33ah3jl71a2l"
+ "commit": "8ebe7746172caaa88d463c58e0bfe76ec7fc971a",
+ "sha256": "132814w2751k7jh20lrjhqp758h41s78pyvsffk1xzk6cvb6xn80"
}
},
{
@@ -127946,6 +127858,29 @@
"sha256": "1isqa4ck6pm4ykcrkr0g1qj8664jkpcsrq0f8dlb0sksns2dqkwj"
}
},
+ {
+ "ename": "visual-replace",
+ "commit": "88e516cf57f8fda6d475039cf9cbd9dd59689c43",
+ "sha256": "0nvrx15a1pp7034fh5ca6gz8492ghvs91gfa0w4jdlbxsylfalwb",
+ "fetcher": "github",
+ "repo": "szermatt/visual-replace",
+ "unstable": {
+ "version": [
+ 20241124,
+ 1051
+ ],
+ "commit": "19544555e7b5bba624238217a295fd4c80c0ed1d",
+ "sha256": "1sqxwl8ahn4sm553chidh281nj46ppn2yhwlgfj4d0bv7ng0fj8r"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 1
+ ],
+ "commit": "d9a89fa02c6170a1b417b3e71e85d481213f318b",
+ "sha256": "05s21qhq23mmv8in88qxfbq79h26j14vcw5pc112sjr1a4fl5306"
+ }
+ },
{
"ename": "vlc",
"commit": "bcb69969893a3f70fe9e7e3b2a836df3ba212fb8",
@@ -128184,11 +128119,11 @@
"repo": "jojojames/vscode-icon-emacs",
"unstable": {
"version": [
- 20230330,
- 2206
+ 20241201,
+ 2200
],
- "commit": "3976bc2e7e2fe0068ae59c11d226f67e0e87aaea",
- "sha256": "168hvmj3nlbi1p7w5m424sn6shn12kbgjd9spyj60pj1867jq7r1"
+ "commit": "27cbf4f178924de1e2a09b4d87f87b5fa67c8cf4",
+ "sha256": "1xbv2nih9lapxci1sqs0rg3k5mb447jlj1kl597pgh242r2xacgk"
}
},
{
@@ -128199,11 +128134,11 @@
"repo": "hardenedapple/vsh",
"unstable": {
"version": [
- 20240820,
- 1320
+ 20241104,
+ 1341
],
- "commit": "40daabb4b05e1dce8bc9b68cb437d9aff3cfa7d0",
- "sha256": "0bzl82dpga2nazpilrrih35mdqxp5ar360rbvk12b96xlas7lbnr"
+ "commit": "47b6190777be9e1c4c0efb94c166b29c83b10553",
+ "sha256": "1ywzd4mr3szcspv16k78cj4fn0m897sy6nx4cchy6bza92qw2k08"
}
},
{
@@ -128214,11 +128149,11 @@
"repo": "akermu/emacs-libvterm",
"unstable": {
"version": [
- 20240825,
- 133
+ 20241118,
+ 1627
],
- "commit": "988279316fc89e6d78947b48513f248597ba969a",
- "sha256": "1qk0fxzn3401b5kjb064bln199s6wn2abfdvfxgyswnygw1hdxav"
+ "commit": "fd50624723200f4ac261f122f6332f57796c782f",
+ "sha256": "0sfgpg6d4xj97sf3vsmxyh13vmdz9gsln1lcp05inkavyxz02xb1"
}
},
{
@@ -128491,11 +128426,11 @@
"repo": "emacs-w3m/emacs-w3m",
"unstable": {
"version": [
- 20240712,
- 248
+ 20241030,
+ 52
],
- "commit": "a3dd9b16224893ef1d75ee9bf0c2b088bc2a5d92",
- "sha256": "1sb2p0gxb8z9im0h5pky0fhvcxjhajsyd1gicfnhl8cqxmjjf907"
+ "commit": "cce39eb257b27f737b4264f7b41c70ae70dc3906",
+ "sha256": "0zzc7p2b8nqqp8gn0px5jds3fj895gx1n2igvkwmz4v429p7wkgb"
}
},
{
@@ -128750,22 +128685,22 @@
},
{
"ename": "wanderlust",
- "commit": "112fe41123b723cda52af773ebb161e5b189f68b",
- "sha256": "0d2j2nvh53563q2753kxpb0skg6qd7r0sa7swq7r8vi8s02zfhi7",
+ "commit": "8fe101b6d26bc501d5dc3515f10f972a53078a46",
+ "sha256": "08ivrdcfj7zj01jndp4lr76q6cd29xsbjwgdfkhh9iz89hsm4y7q",
"fetcher": "github",
- "repo": "wanderlust/wanderlust",
+ "repo": "emacsmirror/wanderlust",
"unstable": {
"version": [
- 20240913,
- 818
+ 20241125,
+ 2206
],
"deps": [
"apel",
"flim",
"semi"
],
- "commit": "8b413b33cdb5a1b715f99a3919573fde2cfb3053",
- "sha256": "060mfriavciqb71c6gp3l6va7vr87r9lvn4z4h344mx287g502d8"
+ "commit": "dddd7d64f27747cfa546d6656beee6ec4e5c55cf",
+ "sha256": "0qd6d6yd2sr3mv8wb22py7yvnib6nk9jpqfj0fkib0x0w9anfxz8"
}
},
{
@@ -129066,10 +129001,10 @@
"version": [
17,
3,
- 13
+ 20
],
- "commit": "90502d9cd2b5bc9a13d2628e48fd66b78243e090",
- "sha256": "0d4j97vywfqabc896w8d30niig19lg2q1bdd3kxyvz3b8027zn4g"
+ "commit": "0c83581d1e93d1d802c730a1d5e90cd1c740e1b2",
+ "sha256": "0lvixg4c5apwrpqljj11b3yrq8nklz4ky4njnh8y6h1j5bisx40p"
}
},
{
@@ -129280,15 +129215,15 @@
"repo": "etu/webpaste.el",
"unstable": {
"version": [
- 20241002,
- 536
+ 20241125,
+ 1418
],
"deps": [
"cl-lib",
"request"
],
- "commit": "5653e0994a10536db13b142b074e45894959d134",
- "sha256": "09z8ihykv3hcq1ja7vigrgwks5657r8706c1yb7y12fm6xzhmcvd"
+ "commit": "e2a41530257f04b7ad2198d333adcf247a05277c",
+ "sha256": "1zxk0fgv7hmqs8sccj5bhd6il5l2k7ahwnwiycnmkcylsrkyqrc4"
},
"stable": {
"version": [
@@ -129687,14 +129622,15 @@
"repo": "SalOrak/whaler.el",
"unstable": {
"version": [
- 20240714,
- 1833
+ 20241124,
+ 1732
],
"deps": [
+ "dash",
"f"
],
- "commit": "6909cc2280b9c0846255ca98b9f6420ec37efbc3",
- "sha256": "1nrdyxfh7jidl9826gx20xvawmk63hqla80vgkyw0ab212sbv9k8"
+ "commit": "8de85180c2a66f999f3effeef88aa9468d1499eb",
+ "sha256": "01h4srxrrjcqxg7x103q76k2ckzbsxld20g272wlh315mxji8dix"
}
},
{
@@ -130231,11 +130167,11 @@
"repo": "kiwanami/emacs-window-layout",
"unstable": {
"version": [
- 20170215,
- 33
+ 20241104,
+ 900
],
- "commit": "cd2e4f967b610c2bbef53182829e47250d027056",
- "sha256": "0wgqi8r844lbx52fn6az8c1n8m681rp6dkfzd54wmdk1ka7zmvv6"
+ "commit": "277d0a8247adf13707703574cbbc16ddcff7c5fd",
+ "sha256": "101gab1xm3a4ildwzfysmjcpxrzxj3a1l9fa03nc88if9pcsxjb9"
},
"stable": {
"version": [
@@ -130544,26 +130480,26 @@
"repo": "magit/with-editor",
"unstable": {
"version": [
- 20240831,
- 2230
+ 20241201,
+ 1419
],
"deps": [
"compat"
],
- "commit": "77cb2403158cfea9d8bfb8adad81b84d1d6d7c6a",
- "sha256": "1k86z7zjvs5mbxirxvn190ya7fj1vdzps5cm0659hh32373c1l7s"
+ "commit": "ca902ae02972bdd6919a902be2593d8cb6bd991b",
+ "sha256": "0h21qs60qihv4p72x5wbmc0xly4g74wc25qj8m9slfbc4am9mwys"
},
"stable": {
"version": [
3,
4,
- 2
+ 3
],
"deps": [
"compat"
],
- "commit": "77cb2403158cfea9d8bfb8adad81b84d1d6d7c6a",
- "sha256": "1k86z7zjvs5mbxirxvn190ya7fj1vdzps5cm0659hh32373c1l7s"
+ "commit": "ca902ae02972bdd6919a902be2593d8cb6bd991b",
+ "sha256": "0h21qs60qihv4p72x5wbmc0xly4g74wc25qj8m9slfbc4am9mwys"
}
},
{
@@ -130938,11 +130874,11 @@
"repo": "martianh/wordreference.el",
"unstable": {
"version": [
- 20240318,
- 2135
+ 20241020,
+ 1145
],
- "commit": "6cd9e43c809267fc37e21e99d49ded4e4731b48a",
- "sha256": "06m17drciv9nxb7344ir0gm7a3krz24krh78v167vnyvzv72abfr"
+ "commit": "698fa410232830a8acb249a422be33a58dd4c6ee",
+ "sha256": "0cbvg9pgclkf2mwnslnvalnl6z9gznkmzpap83g8pvgrbjrjbgcc"
}
},
{
@@ -131224,19 +131160,19 @@
"repo": "lewang/ws-butler",
"unstable": {
"version": [
- 20201117,
- 1528
+ 20241107,
+ 519
],
- "commit": "e3a38d93e01014cd47bf5af4924459bd145fd7c4",
- "sha256": "1vcgg8wr5zpkn9ynyx8sad7srmd31dzkc40wnrzs8aan8nsah5bx"
+ "commit": "d3927f6131f215e9cd3e1f747be5a91e5be8ca9a",
+ "sha256": "17f73isx2wdwzjcxparyy7ngl4cha0g69da1d72b3yidzim1kh6h"
},
"stable": {
"version": [
0,
- 6
+ 7
],
- "commit": "323b651dd70ee40a25accc940b8f80c3a3185205",
- "sha256": "1a4b0lsmwq84qfx51c5xy4fryhb1ysld4fhgw2vr37izf53379sb"
+ "commit": "d3927f6131f215e9cd3e1f747be5a91e5be8ca9a",
+ "sha256": "17f73isx2wdwzjcxparyy7ngl4cha0g69da1d72b3yidzim1kh6h"
}
},
{
@@ -131392,14 +131328,14 @@
"repo": "jobbflykt/x509-mode",
"unstable": {
"version": [
- 20240801,
- 719
+ 20241119,
+ 1907
],
"deps": [
"compat"
],
- "commit": "d62e83f1041680df8de7bbfe19aaaa0f2dfa79b6",
- "sha256": "0dbi5fwid24ilrvagj0s9v9gn1737889swycm20vggkdcij8fzh8"
+ "commit": "b4dc55ee6f9e22e6558fe72a0c350b2c3a771f66",
+ "sha256": "135pppf7xw1v8yzvxp0rdnimsr7jzz1scsb208xxq4s3x1g0vmax"
}
},
{
@@ -132220,11 +132156,11 @@
"repo": "zkry/yaml.el",
"unstable": {
"version": [
- 20231211,
- 1501
+ 20241129,
+ 2114
],
- "commit": "70c4fcead97e9bd6594e418c922ae769818f4245",
- "sha256": "0qq9jr1ihk1b5wfvppyvb8c2pq2gma9wysggd22iln4nqz2mjc81"
+ "commit": "cd3edfc02cb12514426c00e07160b87bd8340f4a",
+ "sha256": "1018s84pdvr8s4dg1g827w0ss78fbs5xj41vglnm5p9np29gfafz"
},
"stable": {
"version": [
@@ -132557,24 +132493,6 @@
"sha256": "0zqwrk1sssivjl9mjj9wm8s8c83hn23r3gxv13hg6dzh97rxllk8"
}
},
- {
- "ename": "yasnippet-lean",
- "commit": "e1cdcf88a7ff90570d8b09901de8b8b8a153c52e",
- "sha256": "0mhlg6ya4b232hgq5wh5w9h0ww35qi9br4501sc379zqwflvqcm7",
- "fetcher": "github",
- "repo": "leanprover-community/yasnippet-lean",
- "unstable": {
- "version": [
- 20220105,
- 2251
- ],
- "deps": [
- "yasnippet"
- ],
- "commit": "c75485757cc8675ad4f36c1eb028d9d54dc21733",
- "sha256": "0lki128rgk5nshpqkz2mndwvzl4a62nammy0xrm4m84ya4vb9mwi"
- }
- },
{
"ename": "yasnippet-snippets",
"commit": "42490bbdac871bce302fbc9a0488ff7de354627e",
@@ -132776,14 +132694,14 @@
"url": "https://git.thanosapollo.org/yeetube",
"unstable": {
"version": [
- 20241012,
- 758
+ 20241022,
+ 2200
],
"deps": [
"compat"
],
- "commit": "f73172433a944551558204554efae0e441388034",
- "sha256": "0issjdi1j1cvapxjxbansbmdmfs9khxmr2k0cr6pqm0hfzak4c9s"
+ "commit": "d3437030bcd8d64b2e5a3bc579e2f2f0b4581d1f",
+ "sha256": "1szi2ghx67vrs76dnv3bfjx12rdhyskm6bf2yjkrlf03fy1r8api"
},
"stable": {
"version": [
@@ -133023,16 +132941,16 @@
"repo": "tuedachu/ytdl",
"unstable": {
"version": [
- 20230331,
- 1804
+ 20241025,
+ 1913
],
"deps": [
"async",
"dash",
"transient"
],
- "commit": "2ea3daf2f6aa9d18b71fe3e15f05c30a56fca228",
- "sha256": "0y62lkgsg19j05dpd6sp6zify8vq8xvpc8caqiy4rwi7p4ahacsf"
+ "commit": "309ad5ce95368ad2e35d1c1701a1f3c0043415a3",
+ "sha256": "1rmh302hm0w0fp796aiq69pm1ic2hl7jpybd3gd5rz4p6la4zys9"
},
"stable": {
"version": [
@@ -133049,21 +132967,6 @@
"sha256": "010arhvibyw50lqhsr8bm0vj3pzry1h1vgcvxnmyryirk3dv40jl"
}
},
- {
- "ename": "ytel",
- "commit": "f01e793028a76e9033dd2e1e55e1ad475685fb69",
- "sha256": "0sg5bjv6zknwvdbklmai9ilisja97lv30dq8n9h3fp47kw19fhyf",
- "fetcher": "github",
- "repo": "manabiseijin/ytel",
- "unstable": {
- "version": [
- 20200725,
- 1056
- ],
- "commit": "d80c7964ec66589d5580fc13773e94f1834ab76f",
- "sha256": "124pvj39lcv3dfz2m42qyydyab0xk6c5da54ffhrqbg8vri34w9w"
- }
- },
{
"ename": "yuck-mode",
"commit": "12f786a873bf4f74045c342bd5f767892b69bebb",
@@ -133640,14 +133543,14 @@
"repo": "ziglang/zig-mode",
"unstable": {
"version": [
- 20240416,
- 1636
+ 20241104,
+ 1624
],
"deps": [
"reformatter"
],
- "commit": "b4170b747ae4c45d145ff8bcb7fafe095e17b4c6",
- "sha256": "1zzi7xlhhrzaxrwy20ida561n3rdjn25k3pkjvvjl073cr35hmyw"
+ "commit": "f0b4a487530146f99230f4a5ff67e8d56c8f3f80",
+ "sha256": "1cm4wvddvqyjhlp7wngls1lapsiq1n14qgi1ygiq3w2vryg96s1v"
}
},
{
@@ -133658,11 +133561,11 @@
"repo": "meow_king/zig-ts-mode",
"unstable": {
"version": [
- 20241012,
- 627
+ 20241026,
+ 1427
],
- "commit": "a1426d9f9d4d804aad452f6d902192505b061ee4",
- "sha256": "0cf3njlnk5ysqpizlv2l59c80xdqgqbhmpk327lfi168rrkl9rlq"
+ "commit": "020500ac3c9ac2cadedccb5cd6c506eb38327443",
+ "sha256": "0kq29pw124bcir5fgnb6xkhas9xqzywzsciv85d0rh0nfbbnbjxy"
}
},
{
@@ -133673,8 +133576,8 @@
"repo": "WillForan/zim-wiki-mode",
"unstable": {
"version": [
- 20241012,
- 1711
+ 20241020,
+ 2315
],
"deps": [
"dokuwiki-mode",
@@ -133683,8 +133586,8 @@
"link-hint",
"pretty-hydra"
],
- "commit": "fd43e6e8355a0943714aa3a1cd4dd3ccc8e665af",
- "sha256": "1bfy6dwpmi4c7radn7a4x00fr3g7vh7wp3g2pxybi5sszcc47kkp"
+ "commit": "8afce06846b9b8c62e7eeb2ac874ee4f68f31616",
+ "sha256": "09qijra2pfy2lrjlx7pkpqd5z1ba3ck4i6nwbyfb7cq2q0irclpx"
}
},
{
@@ -134026,20 +133929,20 @@
"repo": "cyrus-and/zoom",
"unstable": {
"version": [
- 20220411,
- 1126
+ 20241019,
+ 2101
],
- "commit": "2104abb074682db79b9ff3a748e8e2e760a4d8cf",
- "sha256": "0wp7a1ibyqll8rpirsiazpf51lnd0q3yrya9pqvlx9ik5r41jp2m"
+ "commit": "f5f635e1fc5a8f606b7386286546bb6439e7124c",
+ "sha256": "1zzm8kchm5wwxras4bfl46flyfj44bf7qazc5yyahx9qr2ksfnhd"
},
"stable": {
"version": [
0,
- 2,
- 4
+ 3,
+ 0
],
- "commit": "2104abb074682db79b9ff3a748e8e2e760a4d8cf",
- "sha256": "0wp7a1ibyqll8rpirsiazpf51lnd0q3yrya9pqvlx9ik5r41jp2m"
+ "commit": "f5f635e1fc5a8f606b7386286546bb6439e7124c",
+ "sha256": "1zzm8kchm5wwxras4bfl46flyfj44bf7qazc5yyahx9qr2ksfnhd"
}
},
{
diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix
index 63f4d1e59cb51..6ac71c07a33dd 100644
--- a/pkgs/applications/editors/emacs/make-emacs.nix
+++ b/pkgs/applications/editors/emacs/make-emacs.nix
@@ -13,6 +13,7 @@
Xaw3d,
acl,
alsa-lib,
+ apple-sdk,
autoreconfHook,
cairo,
dbus,
@@ -53,7 +54,7 @@
recurseIntoAttrs,
sigtool,
sqlite,
- substituteAll,
+ replaceVars,
systemd,
tree-sitter,
texinfo,
@@ -171,32 +172,40 @@ mkDerivation (finalAttrs: {
patches =
patches fetchpatch
++ lib.optionals withNativeCompilation [
- (substituteAll {
- src =
+ (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;
- backendPath = (
- lib.concatStringsSep " " (
- builtins.map (x: ''"-B${x}"'') (
- [
- # Paths necessary so the JIT compiler finds its libraries:
- "${lib.getLib libgccjit}/lib"
- ]
- ++ libGccJitLibraryPaths
- ++ [
- # Executable paths necessary for compilation (ld, as):
- "${lib.getBin stdenv.cc.cc}/bin"
- "${lib.getBin stdenv.cc.bintools}/bin"
- "${lib.getBin stdenv.cc.bintools.bintools}/bin"
- ]
+ ./native-comp-driver-options-30.patch
+ )
+ {
+
+ backendPath = (
+ lib.concatStringsSep " " (
+ builtins.map (x: ''"-B${x}"'') (
+ [
+ # Paths necessary so the JIT compiler finds its libraries:
+ "${lib.getLib libgccjit}/lib"
+ ]
+ ++ libGccJitLibraryPaths
+ ++ [
+ # Executable paths necessary for compilation (ld, as):
+ "${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"
+ ]
+ )
)
- )
- );
- })
+ );
+ }
+ )
];
postPatch = lib.concatStringsSep "\n" [
@@ -221,15 +230,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/emacs/site-start.el b/pkgs/applications/editors/emacs/site-start.el
index c844e703e385f..8c7ea3dfc9130 100644
--- a/pkgs/applications/editors/emacs/site-start.el
+++ b/pkgs/applications/editors/emacs/site-start.el
@@ -39,6 +39,16 @@ least specific (the system profile)"
(setenv "EMACSNATIVELOADPATH" (when new-env-list
(mapconcat 'identity new-env-list ":"))))))
+(let ((wrapper-invocation-directory (getenv "emacsWithPackages_invocationDirectory")))
+ (when wrapper-invocation-directory
+ (setq invocation-directory (file-name-as-directory wrapper-invocation-directory))
+ (setenv "emacsWithPackages_invocationDirectory" nil)))
+
+(let ((wrapper-invocation-name (getenv "emacsWithPackages_invocationName")))
+ (when wrapper-invocation-name
+ (setq invocation-name wrapper-invocation-name)
+ (setenv "emacsWithPackages_invocationName" nil)))
+
;;; Set up native-comp load path.
(when (featurep 'native-compile)
;; Append native-comp subdirectories from `NIX_PROFILES'.
diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix
index 926e0a5cf5c4e..bb0239c73ec07 100644
--- a/pkgs/applications/editors/neovim/utils.nix
+++ b/pkgs/applications/editors/neovim/utils.nix
@@ -108,7 +108,7 @@ let
# the function you would have passed to lua.withPackages
extraLuaPackages ? (_: [ ]),
withNodeJs ? false,
- withRuby ? true,
+ withRuby ? false,
vimAlias ? false,
viAlias ? false,
configure ? { },
diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 4dbf706a0a67e..7d33dfe0a01b8 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,6 +1,6 @@
{ lib, fetchFromGitHub }:
rec {
- version = "9.1.0787";
+ version = "9.1.0905";
outputs = [
"out"
@@ -11,7 +11,7 @@ rec {
owner = "vim";
repo = "vim";
rev = "v${version}";
- hash = "sha256-kV2SaIOUv+ZcDsqBibZZ38gCevVLhejcYtY0TCQVtig=";
+ hash = "sha256-sFsTONGeSocn1M8NZo5LjIhagmq/nR1zrGRN7p86Q4o=";
};
enableParallelBuilding = true;
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 1808442327a1e..d5bd1c515451b 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 () {
- echo "Executing 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=()
- if [ -n "$nvimRequireCheck" ]; then
- echo "Check whether the following module can be imported: $nvimRequireCheck"
+ 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")
- # editorconfig-checker-disable
- export HOME="$TMPDIR"
+ nvimRequireCheck=("${modules[@]}")
+ echo "Discovered modules: ${nvimRequireCheck[*]}"
- local deps="${dependencies[*]}"
- @nvimBinary@ -es --headless -n -u NONE -i NONE --clean -V1 \
- --cmd "set rtp+=$out,${deps// /,}" \
- --cmd "lua require('$nvimRequireCheck')"
+ if [ "${#nvimRequireCheck[@]}" -eq 0 ]; then
+ echo "No valid Lua modules found; skipping check"
+ return 1
fi
+ return 0
}
-echo "Using neovimRequireCheckHook"
-appendToVar preDistPhases neovimRequireCheckHook
+# 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 [ "${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 ebf03a88b777b..a397815beff57 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -392,6 +392,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: {
@@ -2596,6 +2603,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 164245be176fb..d1f7bf3440e23 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/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index c32f80bd89da2..0b5f20efd1654 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -11,7 +11,7 @@
at-spi2-atk,
autoPatchelfHook,
alsa-lib,
- mesa,
+ libgbm,
nss,
nspr,
xorg,
@@ -200,7 +200,7 @@ stdenv.mkDerivation (
alsa-lib
at-spi2-atk
libkrb5
- mesa
+ libgbm
nss
nspr
systemd
diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix
index a5f45b2e13e76..c47a04e9e42c6 100644
--- a/pkgs/applications/emulators/wine/base.nix
+++ b/pkgs/applications/emulators/wine/base.nix
@@ -105,7 +105,7 @@ lib.optionalAttrs (buildScript != null) { builder = buildScript; }
])
++ lib.optionals waylandSupport (with pkgs; [
wayland wayland-scanner libxkbcommon wayland-protocols wayland.dev libxkbcommon.dev
- mesa # for libgbm
+ libgbm
])));
inherit patches;
diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix
index b89e4fd339dcf..8f9d01d9273ab 100644
--- a/pkgs/applications/gis/grass/default.nix
+++ b/pkgs/applications/gis/grass/default.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
libpng
libsvm
libtiff
- (libxml2.override { enableHttp = true; })
+ libxml2
netcdf
pdal
postgresql
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 566b92eda2d04..b1c8f5a9ea094 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -6,6 +6,7 @@
, callPackage
, cmake
, desktopToDarwinBundle
+, fetchpatch
, fetchurl
, fd
, gettext
@@ -85,6 +86,12 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
patches = [
+ (fetchpatch {
+ # fix typo in gobjectptr member function. remove on update
+ name = "gobjectptr-fix-member-name.patch";
+ url = "https://gitlab.com/inkscape/inkscape/-/commit/eb6dadcf1a5c660167ba43f3606c8e7cc6529787.patch";
+ hash = "sha256-FvbJV/YrBwhHg0kFdbhyd/Y9g7YV2nPIrRqZt7yJ50Q=";
+ })
(substituteAll {
src = ./fix-python-paths.patch;
# Python is used at run-time to execute scripts,
diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix
index a7a38e6f75ab6..b660d5cc8c345 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/graphics/seamly2d/default.nix b/pkgs/applications/graphics/seamly2d/default.nix
index 295f688748879..c2d76ee9be8ac 100644
--- a/pkgs/applications/graphics/seamly2d/default.nix
+++ b/pkgs/applications/graphics/seamly2d/default.nix
@@ -8,7 +8,7 @@
poppler_utils,
qtxmlpatterns,
qtsvg,
- mesa,
+ libgbm,
xvfb-run,
fontconfig,
freetype,
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
poppler_utils
qtxmlpatterns
qtsvg
- mesa
+ libgbm
freetype
xorg.libXi
xorg.libXrender
diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers/default.nix b/pkgs/applications/kde/kdegraphics-thumbnailers/default.nix
index 94ff4fb6b5cf8..f3b59d2453382 100644
--- a/pkgs/applications/kde/kdegraphics-thumbnailers/default.nix
+++ b/pkgs/applications/kde/kdegraphics-thumbnailers/default.nix
@@ -2,7 +2,7 @@
mkDerivation,
lib,
ghostscript,
- substituteAll,
+ replaceVars,
extra-cmake-modules,
karchive,
kio,
@@ -29,9 +29,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 00a3d834ee3ca..e4a06dcd7a5df 100644
--- a/pkgs/applications/kde/marble.nix
+++ b/pkgs/applications/kde/marble.nix
@@ -47,7 +47,7 @@ mkDerivation {
knewstuff
gpsd
];
- preConfigure = ''
- cmakeFlags+=" -DINCLUDE_INSTALL_DIR=''${!outputDev}/include"
- '';
+ cmakeFlags = [
+ "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include"
+ ];
}
diff --git a/pkgs/applications/misc/1password-gui/linux.nix b/pkgs/applications/misc/1password-gui/linux.nix
index 925c3d9137ffb..9998860829a8a 100644
--- a/pkgs/applications/misc/1password-gui/linux.nix
+++ b/pkgs/applications/misc/1password-gui/linux.nix
@@ -30,7 +30,7 @@
libxshmfence,
libGL,
libappindicator-gtk3,
- mesa,
+ libgbm,
nspr,
nss,
pango,
@@ -94,7 +94,7 @@ stdenv.mkDerivation {
libxshmfence
libGL
libappindicator-gtk3
- mesa
+ libgbm
nspr
nss
pango
diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix
index 770ae39bd0d51..05a53714a9612 100644
--- a/pkgs/applications/misc/lutris/fhsenv.nix
+++ b/pkgs/applications/misc/lutris/fhsenv.nix
@@ -126,7 +126,7 @@ buildFHSEnv {
# Libretro
fluidsynth
hidapi
- mesa
+ libgbm
libdrm
# MAME
diff --git a/pkgs/applications/misc/maliit-framework/default.nix b/pkgs/applications/misc/maliit-framework/default.nix
index 99b3e75922d0c..e295ba09bf4d3 100644
--- a/pkgs/applications/misc/maliit-framework/default.nix
+++ b/pkgs/applications/misc/maliit-framework/default.nix
@@ -67,9 +67,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/misc/survex/default.nix b/pkgs/applications/misc/survex/default.nix
index 9eb4ebaacc11c..8638487d135ac 100644
--- a/pkgs/applications/misc/survex/default.nix
+++ b/pkgs/applications/misc/survex/default.nix
@@ -10,7 +10,7 @@
libGLU,
libICE,
libX11,
- mesa,
+ libgbm,
perl,
pkg-config,
proj,
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
# TODO: libGLU doesn't build for macOS because of Mesa issues
# (#233265); is it required for anything?
libGLU
- mesa
+ libgbm
libICE
libX11
];
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index e231afbe78596..e63dd5e56e4a2 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -64,7 +64,8 @@
libxshmfence,
libGLU,
libGL,
- mesa,
+ dri-pkgconfig-stub,
+ libgbm,
pciutils,
protobuf,
speechd-minimal,
@@ -350,7 +351,7 @@ let
libxshmfence
libGLU
libGL
- mesa # required for libgbm
+ libgbm
pciutils
protobuf
speechd-minimal
@@ -407,7 +408,8 @@ let
libxshmfence
libGLU
libGL
- mesa # required for libgbm
+ dri-pkgconfig-stub
+ libgbm
pciutils
protobuf
speechd-minimal
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index dba2d1edaa7ed..0a82f42569395 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -268,6 +268,29 @@ 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=";
+ })
+ # Python 3.12.8 compat
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1935621
+ # https://phabricator.services.mozilla.com/D231480
+ ./mozbz-1935621-attachment-9442305.patch
+ ]
++ extraPatches;
postPatch = ''
diff --git a/pkgs/applications/networking/browsers/firefox/mozbz-1935621-attachment-9442305.patch b/pkgs/applications/networking/browsers/firefox/mozbz-1935621-attachment-9442305.patch
new file mode 100644
index 0000000000000..bbf9b2fa10365
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/mozbz-1935621-attachment-9442305.patch
@@ -0,0 +1,119 @@
+diff --git a/python/mach/mach/site.py b/python/mach/mach/site.py
+--- a/python/mach/mach/site.py
++++ b/python/mach/mach/site.py
+@@ -15,10 +15,11 @@
+ import site
+ import subprocess
+ import sys
+ import sysconfig
+ import tempfile
++import warnings
+ from contextlib import contextmanager
+ from pathlib import Path
+ from typing import Callable, Optional
+
+ from mach.requirements import (
+@@ -817,37 +818,79 @@
+
+ class PythonVirtualenv:
+ """Calculates paths of interest for general python virtual environments"""
+
+ def __init__(self, prefix):
+- if _is_windows:
+- self.bin_path = os.path.join(prefix, "Scripts")
+- self.python_path = os.path.join(self.bin_path, "python.exe")
+- else:
+- self.bin_path = os.path.join(prefix, "bin")
+- self.python_path = os.path.join(self.bin_path, "python")
+ self.prefix = os.path.realpath(prefix)
++ self.paths = self._get_sysconfig_paths(self.prefix)
+
+- @functools.lru_cache(maxsize=None)
+- def resolve_sysconfig_packages_path(self, sysconfig_path):
+- # macOS uses a different default sysconfig scheme based on whether it's using the
+- # system Python or running in a virtualenv.
+- # Manually define the scheme (following the implementation in
+- # "sysconfig._get_default_scheme()") so that we're always following the
+- # code path for a virtualenv directory structure.
+- if os.name == "posix":
+- scheme = "posix_prefix"
+- else:
+- scheme = os.name
++ # Name of the Python executable to use in virtual environments.
++ # An executable with the same name as sys.executable might not exist in
++ # virtual environments. An executable with 'python' as the steam —
++ # without version numbers or ABI flags — will always be present in
++ # virtual environments, so we use that.
++ python_exe_name = "python" + sysconfig.get_config_var("EXE")
++
++ self.bin_path = self.paths["scripts"]
++ self.python_path = os.path.join(self.bin_path, python_exe_name)
+
+- sysconfig_paths = sysconfig.get_paths(scheme)
+- data_path = Path(sysconfig_paths["data"])
+- path = Path(sysconfig_paths[sysconfig_path])
+- relative_path = path.relative_to(data_path)
++ @staticmethod
++ def _get_sysconfig_paths(prefix):
++ """Calculate the sysconfig paths of a virtual environment in the given prefix.
+
+- # Path to virtualenv's "site-packages" directory for provided sysconfig path
+- return os.path.normpath(os.path.normcase(Path(self.prefix) / relative_path))
++ The virtual environment MUST be using the same Python distribution as us.
++ """
++ # Determine the sysconfig scheme used in virtual environments
++ if "venv" in sysconfig.get_scheme_names():
++ # A 'venv' scheme was added in Python 3.11 to allow users to
++ # calculate the paths for a virtual environment, since the default
++ # scheme may not always be the same as used on virtual environments.
++ # Some common examples are the system Python distributed by macOS,
++ # Debian, and Fedora.
++ # For more information, see https://github.com/python/cpython/issues/89576
++ venv_scheme = "venv"
++ elif os.name == "nt":
++ # We know that before the 'venv' scheme was added, on Windows,
++ # the 'nt' scheme was used in virtual environments.
++ venv_scheme = "nt"
++ elif os.name == "posix":
++ # We know that before the 'venv' scheme was added, on POSIX,
++ # the 'posix_prefix' scheme was used in virtual environments.
++ venv_scheme = "posix_prefix"
++ else:
++ # This should never happen with upstream Python, as the 'venv'
++ # scheme should always be available on >=3.11, and no other
++ # platforms are supported by the upstream on older Python versions.
++ #
++ # Since the 'venv' scheme isn't available, and we have no knowledge
++ # of this platform/distribution, fallback to the default scheme.
++ #
++ # Hitting this will likely be the result of running a custom Python
++ # distribution targetting a platform that is not supported by the
++ # upstream.
++ # In this case, unless the Python vendor patched the Python
++ # distribution in such a way as the default scheme may not always be
++ # the same scheme, using the default scheme should be correct.
++ # If the vendor did patch Python as such, to work around this issue,
++ # I would recommend them to define a 'venv' scheme that matches
++ # the layout used on virtual environments in their Python distribution.
++ # (rec. signed Filipe Laíns — upstream sysconfig maintainer)
++ venv_scheme = sysconfig.get_default_scheme()
++ warnings.warn(
++ f"Unknown platform '{os.name}', using the default install scheme '{venv_scheme}'. "
++ "If this is incorrect, please ask your Python vendor to add a 'venv' sysconfig scheme "
++ "(see https://github.com/python/cpython/issues/89576, or check the code comment).",
++ stacklevel=2,
++ )
++ # Build the sysconfig config_vars dictionary for the virtual environment.
++ venv_vars = sysconfig.get_config_vars().copy()
++ venv_vars["base"] = venv_vars["platbase"] = prefix
++ # Get sysconfig paths for the virtual environment.
++ return sysconfig.get_paths(venv_scheme, vars=venv_vars)
++
++ def resolve_sysconfig_packages_path(self, sysconfig_path):
++ return self.paths[sysconfig_path]
+
+ def site_packages_dirs(self):
+ dirs = []
+ if sys.platform.startswith("win"):
+ dirs.append(os.path.normpath(os.path.normcase(self.prefix)))
+
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 62723a3b113f7..9679e5d039c77 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -12,14 +12,13 @@
, udev
, libkrb5
, libva
-, mesa # firefox wants gbm for drm+dmabuf
+, libgbm
, cups
, pciutils
, vulkan-loader
, sndio
, libjack2
, speechd-minimal
-, removeReferencesTo
}:
## configurability of the wrapper itself
@@ -89,7 +88,7 @@ let
);
libs = lib.optionals stdenv.hostPlatform.isLinux (
- [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils vulkan-loader ]
+ [ udev libva libgbm libnotify xorg.libXScrnSaver cups pciutils vulkan-loader ]
++ lib.optional (cfg.speechSynthesisSupport or true) speechd-minimal
)
++ lib.optional pipewireSupport pipewire
@@ -243,7 +242,7 @@ let
};
}));
- nativeBuildInputs = [ makeWrapper lndir jq removeReferencesTo ];
+ nativeBuildInputs = [ makeWrapper lndir jq ];
buildInputs = [ browser.gtk3 ];
@@ -426,9 +425,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/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index b02811d36766e..5c693cb018157 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -6,7 +6,7 @@
, libxml2
, glib, gtk3, pango, gdk-pixbuf, cairo, atk, at-spi2-atk, at-spi2-core
, qt5
-, libdrm, mesa
+, libdrm, libgbm
, vulkan-loader
, nss, nspr
, patchelf, makeWrapper
@@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
qt5.qtbase
freetype fontconfig libXrender libuuid expat glib nss nspr libGL
libxml2 pango cairo
- libdrm mesa vulkan-loader
+ libdrm libgbm vulkan-loader
wayland pipewire
] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs
++ lib.optional pulseSupport libpulseaudio
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 330774a92817f..c90f342891869 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -46,7 +46,7 @@ buildFHSEnv {
libICE libSM libX11 libXcomposite libXdamage libXext libXfixes libXrender libXmu
libXxf86vm libGL libxcb xkeyboardconfig
curl dbus firefox-bin fontconfig freetype gcc glib gnutar libxml2 libxslt
- procps zlib mesa libxshmfence libpthreadstubs libappindicator
+ procps zlib libgbm libxshmfence libpthreadstubs libappindicator
];
extraInstallCommands = ''
diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix
index 6afa1f0589354..a0870e86efcde 100644
--- a/pkgs/applications/networking/instant-messengers/discord/linux.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix
@@ -43,7 +43,7 @@
libXtst,
libxcb,
libxshmfence,
- mesa,
+ libgbm,
nspr,
nss,
pango,
@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
libXtst
libxcb
libxshmfence
- mesa
+ libgbm
nss
wrapGAppsHook3
makeShellWrapper
@@ -115,7 +115,7 @@ stdenv.mkDerivation rec {
systemd
libpulseaudio
libdrm
- mesa
+ libgbm
stdenv.cc.cc
alsa-lib
atk
diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix
index ab586f0633599..9c9731455daf3 100644
--- a/pkgs/applications/networking/instant-messengers/franz/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix
@@ -23,7 +23,7 @@
udev,
libnotify,
xdg-utils,
- mesa,
+ libgbm,
libglvnd,
libappindicator-gtk3,
}:
@@ -83,7 +83,7 @@ stdenv.mkDerivation (
libXScrnSaver
])
++ [
- mesa # libgbm
+ libgbm
gtk3
atk
glib
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix
index 88884c6ba9d51..12ca1e63b9989 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix
@@ -20,7 +20,7 @@
libnotify,
libpulseaudio,
libxkbcommon,
- mesa,
+ libgbm,
nss,
udev,
xorg,
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
libnotify
libpulseaudio
libxkbcommon
- mesa
+ libgbm
nss
xorg.libX11
xorg.libXScrnSaver
diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
index a0cf6de02363e..60f4a0128ab8b 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
@@ -24,7 +24,7 @@
glib,
abseil-cpp,
pipewire,
- mesa,
+ libgbm,
libdrm,
libGL,
apple-sdk_15,
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \
--replace-fail '"libEGL.so.1"' '"${lib.getLib libGL}/lib/libEGL.so.1"' \
--replace-fail '"libGL.so.1"' '"${lib.getLib libGL}/lib/libGL.so.1"' \
- --replace-fail '"libgbm.so.1"' '"${lib.getLib mesa}/lib/libgbm.so.1"' \
+ --replace-fail '"libgbm.so.1"' '"${lib.getLib libgbm}/lib/libgbm.so.1"' \
--replace-fail '"libdrm.so.2"' '"${lib.getLib libdrm}/lib/libdrm.so.2"'
'';
@@ -85,7 +85,7 @@ stdenv.mkDerivation {
libXi
glib
pipewire
- mesa
+ libgbm
libdrm
libGL
]
diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index 891a4214fe782..048ba5a354961 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/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
index fc39b4ce622f8..f07ed6b3bf5a4 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook3, which, more
, file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk_4_0, gtk2-x11, gtk3
, heimdal, krb5, libsoup_2_4, libvorbis, speex, openssl, zlib, xorg, pango, gtk2
-, gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2
+, gnome2, libgbm, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2
, libjpeg, libredirect, tzdata, cacert, systemd, libcxx, symlinkJoin
, libpulseaudio, pcsclite, glib-networking, llvmPackages_12, opencv4
, libfaketime
@@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
libvorbis
libxml2
llvmPackages_12.libunwind
- mesa
+ libgbm
nspr
nss
opencv4'
diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index 0d4de207b00ad..e586c0e89c277 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -9,6 +9,7 @@
alsa-lib,
faac,
faad2,
+ fetchpatch,
ffmpeg,
glib,
openh264,
@@ -88,6 +89,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 d1e6501b5dcbf..fbea88a2e2e3e 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -58,6 +58,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 efd3b01a7d169..438500f41cc0f 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/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix
index 9e8adcd270443..738c03321013d 100644
--- a/pkgs/applications/office/morgen/default.nix
+++ b/pkgs/applications/office/morgen/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron
-, asar, alsa-lib, gtk3, libxshmfence, mesa, nss }:
+, asar, alsa-lib, gtk3, libxshmfence, libgbm, nss }:
stdenv.mkDerivation rec {
pname = "morgen";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
asar
];
- buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ];
+ buildInputs = [ alsa-lib gtk3 libxshmfence libgbm nss ];
installPhase = ''
runHook preInstall
diff --git a/pkgs/applications/office/trilium/desktop.nix b/pkgs/applications/office/trilium/desktop.nix
index f832951be3742..2a812f6d00b76 100644
--- a/pkgs/applications/office/trilium/desktop.nix
+++ b/pkgs/applications/office/trilium/desktop.nix
@@ -6,7 +6,7 @@
fetchurl,
makeWrapper,
alsa-lib,
- mesa,
+ libgbm,
nss,
nspr,
systemd,
@@ -49,7 +49,7 @@ let
buildInputs = [
alsa-lib
- mesa
+ libgbm
nss
nspr
stdenv.cc.cc
diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix
index 81d6e299bb6bf..808e9a87407d3 100644
--- a/pkgs/applications/office/wpsoffice/default.nix
+++ b/pkgs/applications/office/wpsoffice/default.nix
@@ -7,7 +7,7 @@
, libtool
, libxkbcommon
, nspr
-, mesa
+, libgbm
, libtiff
, udev
, gtk3
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
libjpeg
libxkbcommon
nspr
- mesa
+ libgbm
libtiff
udev
gtk3
diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix
index 05d4e4cdc279e..8b6d319d65789 100644
--- a/pkgs/applications/radio/gnuradio/default.nix
+++ b/pkgs/applications/radio/gnuradio/default.nix
@@ -1,5 +1,6 @@
{ lib, stdenv
, fetchFromGitHub
+, fetchpatch
, cmake
# Remove gcc and python references
, removeReferencesTo
@@ -292,6 +293,12 @@ stdenv.mkDerivation (finalAttrs: (shared // {
patches = [
# Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227
./modtool-newmod-permissions.patch
+ # https://github.com/gnuradio/gnuradio/issues/7458
+ (fetchpatch {
+ name = "gnuradio-numpy_2-compatibility.patch";
+ url = "https://github.com/gnuradio/gnuradio/commit/8fbc5eb4b7214a4cb029ccae97205a85d49bdd48.patch";
+ hash = "sha256-xYvjlyZ/Bcn23gT3EOee/GhkXzdpA+q33LgURVWOUQI=";
+ })
];
passthru = shared.passthru // {
# Deps that are potentially overridden and are used inside GR plugins - the same version must
diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix
index 28ee8e6bbe1e0..6ac7ef85e0752 100644
--- a/pkgs/applications/science/misc/boinc/default.nix
+++ b/pkgs/applications/science/misc/boinc/default.nix
@@ -72,12 +72,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 b5a588757ead3..7ec0a5b8b9918 100644
--- a/pkgs/applications/science/physics/crystfel/default.nix
+++ b/pkgs/applications/science/physics/crystfel/default.nix
@@ -32,7 +32,6 @@
gtk3,
gdk-pixbuf,
argp-standalone,
- memorymappingHook,
withGui ? true,
withBitshuffle ? true,
}:
@@ -254,9 +253,6 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.hostPlatform.isDarwin [
argp-standalone
]
- ++ lib.optionals (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64) [
- memorymappingHook
- ]
++ lib.optionals withBitshuffle [ hdf5-external-filter-plugins ];
patches = [
diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix
index 25f5d5333886f..5413ee142692e 100644
--- a/pkgs/applications/terminal-emulators/mlterm/default.nix
+++ b/pkgs/applications/terminal-emulators/mlterm/default.nix
@@ -165,14 +165,14 @@ 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/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix
index 00117185c5564..e00f8ede1e05d 100644
--- a/pkgs/applications/terminal-emulators/wezterm/default.nix
+++ b/pkgs/applications/terminal-emulators/wezterm/default.nix
@@ -20,15 +20,10 @@
xcbutilwm,
wayland,
zlib,
- CoreGraphics,
- Cocoa,
- Foundation,
- System,
- libiconv,
- UserNotifications,
nixosTests,
runCommand,
vulkan-loader,
+ fetchpatch2,
}:
rustPlatform.buildRustPackage rec {
@@ -43,6 +38,21 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-Az+HlnK/lRJpUSGm5UKyma1l2PaBKNCGFiaYnLECMX8=";
};
+ patches = [
+ # Remove unused `fdopen` in vendored zlib, which causes compilation failures with clang 19 on Darwin.
+ # Ref: https://github.com/madler/zlib/commit/4bd9a71f3539b5ce47f0c67ab5e01f3196dc8ef9
+ ./zlib-fdopen.patch
+
+ # Fix platform check in vendored libpng with clang 19 on Darwin.
+ (fetchpatch2 {
+ url = "https://github.com/pnggroup/libpng/commit/893b8113f04d408cc6177c6de19c9889a48faa24.patch?full_index=1";
+ extraPrefix = "deps/freetype/libpng/";
+ stripLen = 1;
+ excludes = [ "deps/freetype/libpng/AUTHORS" ];
+ hash = "sha256-zW/oUo2EGcnsxAfbbbhTKGui/lwCqovyrvUnylfRQzc=";
+ })
+ ];
+
postPatch = ''
cp ${./Cargo.lock} Cargo.lock
@@ -88,20 +98,10 @@ rustPlatform.buildRustPackage rec {
xcbutilimage
xcbutilkeysyms
xcbutilwm # contains xcb-ewmh among others
- ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [
- Cocoa
- CoreGraphics
- Foundation
- libiconv
- System
- UserNotifications
];
buildFeatures = [ "distro-defaults" ];
- env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework System";
-
postInstall = ''
mkdir -p $out/nix-support
echo "${passthru.terminfo}" >> $out/nix-support/propagated-user-env-packages
diff --git a/pkgs/applications/terminal-emulators/wezterm/zlib-fdopen.patch b/pkgs/applications/terminal-emulators/wezterm/zlib-fdopen.patch
new file mode 100644
index 0000000000000..c4f78035e01d9
--- /dev/null
+++ b/pkgs/applications/terminal-emulators/wezterm/zlib-fdopen.patch
@@ -0,0 +1,24 @@
+Submodule deps/freetype/zlib contains modified content
+diff --git a/deps/freetype/zlib/zutil.h b/deps/freetype/zlib/zutil.h
+index b079ea6..4e94f2f 100644
+--- a/deps/freetype/zlib/zutil.h
++++ b/deps/freetype/zlib/zutil.h
+@@ -130,17 +130,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+ # endif
+ #endif
+
+-#if defined(MACOS) || defined(TARGET_OS_MAC)
++#if defined(MACOS)
+ # define OS_CODE 7
+-# ifndef Z_SOLO
+-# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
+-# include /* for fdopen */
+-# else
+-# ifndef fdopen
+-# define fdopen(fd,mode) NULL /* No fdopen() */
+-# endif
+-# endif
+-# endif
+ #endif
+
+ #ifdef __acorn
diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix
index 60ccf5e850c4c..5f43c165dcba2 100644
--- a/pkgs/applications/version-management/monotone-viz/default.nix
+++ b/pkgs/applications/version-management/monotone-viz/default.nix
@@ -88,7 +88,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 b886e2093b333..289e2ff2554af 100644
--- a/pkgs/applications/version-management/sourcehut/default.nix
+++ b/pkgs/applications/version-management/sourcehut/default.nix
@@ -46,6 +46,7 @@ let
flask
sqlalchemy
];
+ disabledTests = [ "test_persist_selectable" ];
});
# flask-sqlalchemy 2.x requires flask 2.x
@@ -73,6 +74,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 7e4c5886c5c80..e78c6d5bcaa05 100644
--- a/pkgs/applications/version-management/vcprompt/default.nix
+++ b/pkgs/applications/version-management/vcprompt/default.nix
@@ -23,9 +23,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 9c9d4c68f9f4e..495e8f398b37e 100644
--- a/pkgs/applications/video/kodi/unwrapped.nix
+++ b/pkgs/applications/video/kodi/unwrapped.nix
@@ -18,7 +18,7 @@
, libcrossguid, libmicrohttpd
, bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn2, libpthreadstubs, libtasn1
, libplist, p11-kit, zlib, flatbuffers, fstrcmp, rapidjson
-, lirc
+, lirc, mesa
, x11Support ? true, libX11, xorgproto, libXt, libXmu, libXext, libXinerama, libXrandr, libXtst, libXfixes, xdpyinfo, libXdmcp
, dbusSupport ? true, dbus
, joystickSupport ? true, cwiid
@@ -33,7 +33,7 @@
, vdpauSupport ? true, libvdpau
, waylandSupport ? false, wayland, wayland-protocols
, waylandpp ? null, libxkbcommon
-, gbmSupport ? false, mesa, libinput, libdisplay-info
+, gbmSupport ? false, libgbm, libinput, libdisplay-info
, buildPackages
}:
@@ -126,7 +126,7 @@ in stdenv.mkDerivation (finalAttrs: {
bluez giflib glib harfbuzz lcms2 libpthreadstubs
ffmpeg flatbuffers fstrcmp rapidjson
lirc
- mesa # for libEGL
+ mesa # uses eglext_angle.h, which is not provided by glvnd
]
++ lib.optionals x11Support [
libX11 xorgproto libXt libXmu libXext.dev libXdmcp
@@ -151,7 +151,7 @@ in stdenv.mkDerivation (finalAttrs: {
]
++ lib.optionals gbmSupport [
libxkbcommon.dev
- mesa.dev
+ libgbm
libinput.dev
libdisplay-info
];
@@ -190,7 +190,7 @@ in stdenv.mkDerivation (finalAttrs: {
"-DENABLE_OPTICAL=${if opticalSupport then "ON" else "OFF"}"
"-DENABLE_VDPAU=${if vdpauSupport then "ON" else "OFF"}"
"-DLIRC_DEVICE=/run/lirc/lircd"
- "-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig"
+ "-DSWIG_EXECUTABLE=${buildPackages.swig3}/bin/swig"
"-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc"
"-DPYTHON_EXECUTABLE=${buildPackages.python3Packages.python}/bin/python"
"-DPYTHON_LIB_PATH=${python3Packages.python.sitePackages}"
@@ -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"
'';
postInstall = ''
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index e66f19778605f..ffdfb193bd410 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -39,7 +39,7 @@
libxkbcommon,
lua,
makeWrapper,
- mesa,
+ libgbm,
meson,
mujs,
ninja,
@@ -187,7 +187,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals cmsSupport [ lcms2 ]
++ lib.optionals drmSupport [
libdrm
- mesa
+ libgbm
]
++ lib.optionals dvdnavSupport [
libdvdnav
diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix
index dbcad3276b541..73ac7a9f7f9e0 100644
--- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix
+++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix
@@ -20,7 +20,7 @@
, gtk3-x11
, libudev0-shim
, libuuid
-, mesa
+, libgbm
, nss
, nspr
, xorg
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
glib
pango
gtk3-x11
- mesa
+ libgbm
nss
nspr
libuuid
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index fc498e4037674..df42117cc6d86 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -22,7 +22,7 @@
, xenSupport ? false, xen
, cephSupport ? false, ceph
, glusterfsSupport ? false, glusterfs, libuuid
-, openGLSupport ? sdlSupport, mesa, libepoxy, libdrm
+, openGLSupport ? sdlSupport, libgbm, libepoxy, libdrm
, rutabagaSupport ? openGLSupport && !minimal && lib.meta.availableOn stdenv.hostPlatform rutabaga_gfx, rutabaga_gfx
, virglSupport ? openGLSupport, virglrenderer
, libiscsiSupport ? !minimal, libiscsi
@@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals xenSupport [ xen ]
++ lib.optionals cephSupport [ ceph ]
++ lib.optionals glusterfsSupport [ glusterfs libuuid ]
- ++ lib.optionals openGLSupport [ mesa libepoxy libdrm ]
+ ++ lib.optionals openGLSupport [ libgbm libepoxy libdrm ]
++ lib.optionals rutabagaSupport [ rutabaga_gfx ]
++ lib.optionals virglSupport [ virglrenderer ]
++ lib.optionals libiscsiSupport [ libiscsi ]
diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix
index 69db37cbc9511..7459a96393f99 100644
--- a/pkgs/applications/window-managers/cage/default.nix
+++ b/pkgs/applications/window-managers/cage/default.nix
@@ -17,7 +17,6 @@
systemd,
libGL,
libX11,
- mesa,
xwayland ? null,
nixosTests,
}:
@@ -53,7 +52,6 @@ stdenv.mkDerivation rec {
pixman
libxkbcommon
xcbutilwm
- mesa # for libEGL headers
systemd
libGL
libX11
diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix
index 9bd7881e641a8..93aa7f55d0870 100644
--- a/pkgs/applications/window-managers/cagebreak/default.nix
+++ b/pkgs/applications/window-managers/cagebreak/default.nix
@@ -4,12 +4,12 @@
fetchFromGitHub,
cairo,
fontconfig,
+ libdrm,
libevdev,
libinput,
libxkbcommon,
xcbutilwm,
makeWrapper,
- mesa,
meson,
ninja,
nixosTests,
@@ -49,11 +49,11 @@ stdenv.mkDerivation rec {
buildInputs = [
cairo
fontconfig
+ libdrm
libevdev
libinput
libxkbcommon
xcbutilwm
- mesa # for libEGL headers
pango
pixman
systemd
diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
index 85f2c009139a4..09ff2fdc42a5b 100644
--- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
@@ -13,7 +13,7 @@
hyprutils,
hyprwayland-scanner,
libdrm,
- mesa,
+ libgbm,
pipewire,
qtbase,
qttools,
@@ -53,7 +53,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: {
hyprlang
hyprutils
libdrm
- mesa
+ libgbm
pipewire
qtbase
qttools
diff --git a/pkgs/applications/window-managers/sommelier/default.nix b/pkgs/applications/window-managers/sommelier/default.nix
index aaed7906a2217..bf7b4d1f6933b 100644
--- a/pkgs/applications/window-managers/sommelier/default.nix
+++ b/pkgs/applications/window-managers/sommelier/default.nix
@@ -9,7 +9,7 @@
python3Packages,
wayland-scanner,
libxkbcommon,
- mesa,
+ libgbm,
pixman,
xorg,
wayland,
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
];
buildInputs = [
libxkbcommon
- mesa
+ libgbm
pixman
wayland
xorg.libxcb
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index 4593bcd36f816..b46872439d769 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}
@@ -159,7 +160,7 @@ rec {
libidn
tbb
wayland
- mesa
+ libgbm
libxkbcommon
vulkan-loader
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 3ead71ebb6988..cb5b5fca22080 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 12d922770a8f0..7953032b09a78 100755
--- a/pkgs/build-support/buildenv/builder.pl
+++ b/pkgs/build-support/buildenv/builder.pl
@@ -77,7 +77,7 @@ sub isStorePath {
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 @@ sub findFiles {
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) {
@@ -235,6 +240,7 @@ sub addPkg {
for my $path (@{$pkg->{paths}}) {
addPkg($path,
$ENV{"ignoreCollisions"} eq "1",
+ $ENV{"ignoreSingleFileOutputs"} eq "1",
$ENV{"checkCollisionContents"} eq "1",
$pkg->{priority})
if -e $path;
@@ -251,7 +257,7 @@ sub addPkg {
my @pkgDirs = keys %postponed;
%postponed = ();
foreach my $pkgDir (sort @pkgDirs) {
- addPkg($pkgDir, 2, $ENV{"checkCollisionContents"} eq "1", $priorityCounter++);
+ addPkg($pkgDir, 2, $ENV{"ignoreSingleFileOutputs"} eq "1", $ENV{"checkCollisionContents"} eq "1", $priorityCounter++);
}
}
@@ -263,6 +269,7 @@ sub addPkg {
chomp $line;
addPkg($line,
$ENV{"ignoreCollisions"} eq "1",
+ $ENV{"ignoreSingleFileOutputs"} eq "1",
$ENV{"checkCollisionContents"} eq "1",
1000)
if -d $line;
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix
index a6e3df9f3ade5..df5bce5feed47 100644
--- a/pkgs/build-support/buildenv/default.nix
+++ b/pkgs/build-support/buildenv/default.nix
@@ -30,6 +30,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,
@@ -58,6 +61,8 @@ lib.makeOverridable (
passthru ? { },
meta ? { },
+ pname ? null,
+ version ? null,
}:
let
chosenOutputs = map (drv: {
@@ -86,26 +91,35 @@ lib.makeOverridable (
];
in
runCommand name
- rec {
- inherit
- manifest
- ignoreCollisions
- checkCollisionContents
- passthru
- meta
- pathsToLink
- extraPrefix
- postBuild
- nativeBuildInputs
- buildInputs
- ;
- pkgs = builtins.toJSON chosenOutputs;
- extraPathsFrom = lib.optional includeClosures (writeClosure pathsForClosure);
- preferLocalBuild = true;
- allowSubstitutes = false;
- # XXX: The size is somewhat arbitrary
- passAsFile = if builtins.stringLength pkgs >= 128 * 1024 then [ "pkgs" ] else [ ];
- }
+ (
+ rec {
+ inherit
+ manifest
+ ignoreCollisions
+ checkCollisionContents
+ ignoreSingleFileOutputs
+ passthru
+ meta
+ pathsToLink
+ extraPrefix
+ postBuild
+ nativeBuildInputs
+ buildInputs
+ ;
+ pkgs = builtins.toJSON chosenOutputs;
+ extraPathsFrom = lib.optional includeClosures (writeClosure pathsForClosure);
+ preferLocalBuild = true;
+ 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 001123fe3d857..d9174df31a2a1 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 bdff4a3e4be71..b03097a49a0c4 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 7b02b92b3c650..418e21b36c704 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 c6cb952e9db97..7063cada77d9d 100644
--- a/pkgs/build-support/go/module.nix
+++ b/pkgs/build-support/go/module.nix
@@ -48,10 +48,6 @@
# Go build flags.
, GOFLAGS ? [ ]
- # Needed for buildFlags{,Array} warning
-, buildFlags ? "" # deprecated
-, buildFlagsArray ? "" # deprecated
-
, ...
}@args':
@@ -223,8 +219,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"
''
@@ -242,12 +236,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)
@@ -277,10 +272,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/node/fetch-npm-deps/src/util.rs b/pkgs/build-support/node/fetch-npm-deps/src/util.rs
index 023ba56793b90..36e2333a3e1a8 100644
--- a/pkgs/build-support/node/fetch-npm-deps/src/util.rs
+++ b/pkgs/build-support/node/fetch-npm-deps/src/util.rs
@@ -1,3 +1,4 @@
+use anyhow::bail;
use backoff::{retry, ExponentialBackoff};
use data_encoding::BASE64;
use digest::Digest;
@@ -5,6 +6,7 @@ use isahc::{
config::{CaCertificate, Configurable, RedirectPolicy, SslOption},
Body, Request, RequestExt,
};
+use log::info;
use nix_nar::{Encoder, NarError};
use serde_json::{Map, Value};
use sha2::Sha256;
@@ -15,7 +17,7 @@ use std::{
};
use url::Url;
-pub fn get_url(url: &Url) -> Result {
+pub fn get_url(url: &Url) -> Result {
let mut request = Request::get(url.as_str()).redirect_policy(RedirectPolicy::Limit(10));
// Respect SSL_CERT_FILE if environment variable exists
@@ -37,16 +39,27 @@ pub fn get_url(url: &Url) -> Result {
if let Ok(npm_tokens) = env::var("NIX_NPM_TOKENS") {
if let Ok(tokens) = serde_json::from_str::>(&npm_tokens) {
if let Some(token) = tokens.get(host).and_then(serde_json::Value::as_str) {
+ info!("Found NPM token for {}. Adding authorization header to request.", host);
request = request.header("Authorization", format!("Bearer {token}"));
}
}
}
}
- Ok(request.body(())?.send()?.into_body())
+ let res = request.body(())?.send()?;
+ if !res.status().is_success() {
+ if res.status().is_client_error() {
+ bail!("Client error: {}", res.status());
+ }
+ if res.status().is_server_error() {
+ bail!("Server error: {}", res.status());
+ }
+ bail!("{}", res.status());
+ }
+ Ok(res.into_body())
}
-pub fn get_url_body_with_retry(url: &Url) -> Result, isahc::Error> {
+pub fn get_url_body_with_retry(url: &Url) -> Result, anyhow::Error> {
retry(ExponentialBackoff::default(), || {
get_url(url)
.and_then(|mut body| {
@@ -56,12 +69,15 @@ pub fn get_url_body_with_retry(url: &Url) -> Result, isahc::Error> {
Ok(buf)
})
- .map_err(|err| {
- if err.is_network() || err.is_timeout() {
- backoff::Error::transient(err)
- } else {
- backoff::Error::permanent(err)
+ .map_err(|err| match err.downcast_ref::() {
+ Some(isahc_err) => {
+ if isahc_err.is_network() || isahc_err.is_timeout() {
+ backoff::Error::transient(err)
+ } else {
+ backoff::Error::permanent(err)
+ }
}
+ None => backoff::Error::permanent(err),
})
})
.map_err(|backoff_err| match backoff_err {
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 d1b8a25c949db..82d8aa20bca3a 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 573b82c2baff4..d61e683725dab 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 9166c9d979347..35badccc36cb2 100644
--- a/pkgs/build-support/release/binary-tarball.nix
+++ b/pkgs/build-support/release/binary-tarball.nix
@@ -54,7 +54,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 a6fc94f4f376d..0088279ad9390 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 0060cb18bf76d..909ec8f4c05f8 100644
--- a/pkgs/build-support/rust/build-rust-package/default.nix
+++ b/pkgs/build-support/rust/build-rust-package/default.nix
@@ -172,8 +172,6 @@ stdenv.mkDerivation (
cargoCheckFeatures = checkFeatures;
- patchRegistryDeps = ./patch-registry-deps;
-
nativeBuildInputs =
nativeBuildInputs
++ lib.optionals 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 fbb0943045870..0000000000000
--- 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 ba605adeb9a04..92b248882e6f6 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 0000000000000..9c44f89d462eb
--- /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 22088853570a5..70c04d94aadd5 100644
--- a/pkgs/by-name/ad/adns/package.nix
+++ b/pkgs/by-name/ad/adns/package.nix
@@ -1,52 +1,48 @@
{
- stdenv,
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 ];
- configureFlags = lib.optional stdenv.hostPlatform.isStatic "--disable-dynamic";
+ nativeBuildInputs = [
+ gnum4
+ autoreconfHook
+ ];
- preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin "sed -i -e 's|-Wl,-soname=$(SHLIBSONAME)||' configure";
+ configureFlags = lib.optional stdenv.hostPlatform.isStatic "--disable-dynamic";
- # 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 {
@@ -54,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/ad/adriconf/package.nix b/pkgs/by-name/ad/adriconf/package.nix
index 6f69fe466fc95..c0feb726ce036 100644
--- a/pkgs/by-name/ad/adriconf/package.nix
+++ b/pkgs/by-name/ad/adriconf/package.nix
@@ -10,7 +10,7 @@
pcre,
gtkmm4,
pugixml,
- mesa,
+ libgbm,
pciutils,
}:
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
pcre
gtkmm4
pugixml
- mesa
+ libgbm
pciutils
];
diff --git a/pkgs/by-name/ae/aether-lv2/package.nix b/pkgs/by-name/ae/aether-lv2/package.nix
index f82464b18404f..ac81726cbdeeb 100644
--- a/pkgs/by-name/ae/aether-lv2/package.nix
+++ b/pkgs/by-name/ae/aether-lv2/package.nix
@@ -6,7 +6,7 @@
libX11,
libGL,
libGLU,
- mesa,
+ libgbm,
cmake,
}:
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
libX11
libGL
libGLU
- mesa
+ libgbm
];
env.NIX_CFLAGS_COMPILE = toString [
diff --git a/pkgs/by-name/al/alfaview/package.nix b/pkgs/by-name/al/alfaview/package.nix
index 2d77f145060e6..9c63d1c87b829 100644
--- a/pkgs/by-name/al/alfaview/package.nix
+++ b/pkgs/by-name/al/alfaview/package.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, dpkg, autoPatchelfHook, makeWrapper, wrapGAppsHook3
, alsa-lib, dbus, fontconfig, freetype, glib, gst_all_1, libGL
, libinput, libpulseaudio, libsecret, libtiff, libxkbcommon
-, mesa, openssl, systemd, xorg }:
+, libgbm, openssl, systemd, xorg }:
stdenv.mkDerivation rec {
pname = "alfaview";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
libsecret
libtiff
libxkbcommon
- mesa
+ libgbm
openssl
stdenv.cc.cc
systemd
diff --git a/pkgs/by-name/al/alsa-lib/package.nix b/pkgs/by-name/al/alsa-lib/package.nix
index adb621053e9a3..21234c648375d 100644
--- a/pkgs/by-name/al/alsa-lib/package.nix
+++ b/pkgs/by-name/al/alsa-lib/package.nix
@@ -9,11 +9,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "alsa-lib";
- version = "1.2.12";
+ version = "1.2.13";
src = fetchurl {
url = "mirror://alsa/lib/alsa-lib-${finalAttrs.version}.tar.bz2";
- hash = "sha256-SGjNkIYnJ52lpjT0aHAWJb6MwlHYQmLH5baiGDka0NI=";
+ hash = "sha256-jE/zdVPL6JYY4Yfkx3n3GpuyqLJ7kfh+1AmHzJIz2PY=";
};
patches = [
diff --git a/pkgs/by-name/an/ant/package.nix b/pkgs/by-name/an/ant/package.nix
index bedaa9b139494..073c14a0b57e3 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 840415d2e3b1e..5a5cd345ec065 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 0eca6b8836b38..0000000000000
--- 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 66700bbc07ad6..e68c2643ab7c6 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 608990bddd468..5a444c2c4eaa0 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 31017a6a9ae53..779ed45260ece 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/aq/aquamarine/package.nix b/pkgs/by-name/aq/aquamarine/package.nix
index a759e0ef7df39..e5f44520c15d0 100644
--- a/pkgs/by-name/aq/aquamarine/package.nix
+++ b/pkgs/by-name/aq/aquamarine/package.nix
@@ -11,7 +11,7 @@
libffi,
libGL,
libinput,
- mesa,
+ libgbm,
nix-update-script,
pixman,
pkg-config,
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
libffi
libGL
libinput
- mesa
+ libgbm
pixman
seatd
udev
diff --git a/pkgs/by-name/ar/arangodb/package.nix b/pkgs/by-name/ar/arangodb/package.nix
index 706c3c503afd9..ae27027bd9938 100644
--- a/pkgs/by-name/ar/arangodb/package.nix
+++ b/pkgs/by-name/ar/arangodb/package.nix
@@ -56,7 +56,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/ar/arcan/package.nix b/pkgs/by-name/ar/arcan/package.nix
index 70d291bea106a..b318d305f85c2 100644
--- a/pkgs/by-name/ar/arcan/package.nix
+++ b/pkgs/by-name/ar/arcan/package.nix
@@ -29,7 +29,7 @@
libxcb,
libxkbcommon,
makeWrapper,
- mesa,
+ libgbm,
mupdf,
openal,
openjpeg,
@@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
libvncserver
libxcb
libxkbcommon
- mesa
+ libgbm
mupdf
openal
openjpeg
diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix
index e972bf1d30808..f8ba34710dcb8 100644
--- a/pkgs/by-name/ar/arrow-cpp/package.nix
+++ b/pkgs/by-name/ar/arrow-cpp/package.nix
@@ -3,6 +3,7 @@
lib,
fetchurl,
fetchFromGitHub,
+ fetchpatch,
fixDarwinDylibNames,
autoconf,
aws-sdk-cpp,
@@ -93,6 +94,17 @@ stdenv.mkDerivation (finalAttrs: {
sourceRoot = "${finalAttrs.src.name}/cpp";
+ patches = [
+ # fixes build with libcxx-19 (llvm-19) remove on update
+ (fetchpatch {
+ name = "libcxx-19-fixes.patch";
+ url = "https://github.com/apache/arrow/commit/29e8ea011045ba4318a552567a26b2bb0a7d3f05.patch";
+ relative = "cpp";
+ includes = [ "src/arrow/buffer_test.cc" ];
+ hash = "sha256-ZHkznOilypi1J22d56PhLlw/hbz8RqwsOGDMqI1NsMs=";
+ })
+ ];
+
# versions are all taken from
# https://github.com/apache/arrow/blob/apache-arrow-${version}/cpp/thirdparty/versions.txt
diff --git a/pkgs/by-name/as/asusctl/package.nix b/pkgs/by-name/as/asusctl/package.nix
index 0ea6dad0640e6..856a9513e4c95 100644
--- a/pkgs/by-name/as/asusctl/package.nix
+++ b/pkgs/by-name/as/asusctl/package.nix
@@ -10,7 +10,7 @@
libGL,
libinput,
libxkbcommon,
- mesa,
+ libgbm,
seatd,
wayland,
}:
@@ -67,7 +67,7 @@ rustPlatform.buildRustPackage rec {
libGL
libinput
libxkbcommon
- mesa
+ libgbm
seatd
systemd
wayland
diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix
index 62115bfc2b4d3..f68c340e7c2c0 100644
--- a/pkgs/by-name/au/audit/package.nix
+++ b/pkgs/by-name/au/audit/package.nix
@@ -16,37 +16,32 @@
# 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"
+ "lib"
"dev"
"out"
"man"
diff --git a/pkgs/by-name/au/autopanosiftc/package.nix b/pkgs/by-name/au/autopanosiftc/package.nix
index b566852cbb001..358bce7edefd3 100644
--- a/pkgs/by-name/au/autopanosiftc/package.nix
+++ b/pkgs/by-name/au/autopanosiftc/package.nix
@@ -30,7 +30,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/av/avocode/package.nix b/pkgs/by-name/av/avocode/package.nix
index b10fe128b1ef7..9edb6cf583ac6 100644
--- a/pkgs/by-name/av/avocode/package.nix
+++ b/pkgs/by-name/av/avocode/package.nix
@@ -28,7 +28,7 @@
libuuid,
at-spi2-core,
libdrm,
- mesa,
+ libgbm,
libxkbcommon,
}:
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
libXScrnSaver
libuuid
libdrm
- mesa
+ libgbm
]
);
diff --git a/pkgs/by-name/aw/aws-c-auth/package.nix b/pkgs/by-name/aw/aws-c-auth/package.nix
index 7de2f221a0e63..dc840631bffb7 100644
--- a/pkgs/by-name/aw/aws-c-auth/package.nix
+++ b/pkgs/by-name/aw/aws-c-auth/package.nix
@@ -15,13 +15,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 8c3bf32db72ca..676f92e3baa7f 100644
--- a/pkgs/by-name/aw/aws-c-common/package.nix
+++ b/pkgs/by-name/aw/aws-c-common/package.nix
@@ -8,13 +8,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 ];
@@ -34,13 +35,9 @@ stdenv.mkDerivation rec {
# Prevent the execution of tests known to be flaky.
preCheck =
let
- ignoreTests =
- [
- "promise_test_multiple_waiters"
- ]
- ++ lib.optionals stdenv.hostPlatform.isMusl [
- "sba_metrics" # https://github.com/awslabs/aws-c-common/issues/839
- ];
+ ignoreTests = [
+ "promise_test_multiple_waiters"
+ ];
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 8ef11be4baf88..dfd3f53b29352 100644
--- a/pkgs/by-name/aw/aws-c-compression/package.nix
+++ b/pkgs/by-name/aw/aws-c-compression/package.nix
@@ -9,13 +9,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 1e5175a02f2c7..bca3de37d5abf 100644
--- a/pkgs/by-name/aw/aws-c-event-stream/package.nix
+++ b/pkgs/by-name/aw/aws-c-event-stream/package.nix
@@ -14,13 +14,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 4939dd9b54c4d..37a52c7c985f3 100644
--- a/pkgs/by-name/aw/aws-c-http/package.nix
+++ b/pkgs/by-name/aw/aws-c-http/package.nix
@@ -13,13 +13,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 51f6778bd44a9..1734aea049ad2 100644
--- a/pkgs/by-name/aw/aws-c-mqtt/package.nix
+++ b/pkgs/by-name/aw/aws-c-mqtt/package.nix
@@ -14,13 +14,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 ef861a87608e3..0282ca459b942 100644
--- a/pkgs/by-name/aw/aws-c-s3/package.nix
+++ b/pkgs/by-name/aw/aws-c-s3/package.nix
@@ -16,13 +16,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 071145b3b871d..2de7db683f34a 100644
--- a/pkgs/by-name/aw/aws-c-sdkutils/package.nix
+++ b/pkgs/by-name/aw/aws-c-sdkutils/package.nix
@@ -9,13 +9,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 f4f6a3a494420..ac95d55e9af33 100644
--- a/pkgs/by-name/aw/aws-checksums/package.nix
+++ b/pkgs/by-name/aw/aws-checksums/package.nix
@@ -9,13 +9,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 2b06ce0aec635..34f2434dbf9d0 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 97863d65dabba..3cf463a5fdf1a 100644
--- a/pkgs/by-name/aw/aws-crt-cpp/package.nix
+++ b/pkgs/by-name/aw/aws-crt-cpp/package.nix
@@ -19,7 +19,8 @@
stdenv.mkDerivation rec {
pname = "aws-crt-cpp";
- version = "0.26.12";
+ # nixpkgs-update: no auto update
+ version = "0.29.4";
outputs = [
"out"
@@ -30,7 +31,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/az/azuredatastudio/package.nix b/pkgs/by-name/az/azuredatastudio/package.nix
index 3c3583e7ad4eb..dcc16f4f55c37 100644
--- a/pkgs/by-name/az/azuredatastudio/package.nix
+++ b/pkgs/by-name/az/azuredatastudio/package.nix
@@ -22,7 +22,7 @@
libunwind,
libuuid,
libxkbcommon,
- mesa,
+ libgbm,
nspr,
nss,
openssl,
@@ -158,7 +158,7 @@ stdenv.mkDerivation rec {
gdk-pixbuf
glib
gtk3
- mesa
+ libgbm
nss
nspr
libdrm
diff --git a/pkgs/by-name/ba/bash-completion/package.nix b/pkgs/by-name/ba/bash-completion/package.nix
index 6329a1412fa5e..e69b8ede4004b 100644
--- a/pkgs/by-name/ba/bash-completion/package.nix
+++ b/pkgs/by-name/ba/bash-completion/package.nix
@@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
pname = "bash-completion";
- version = "2.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
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
# See discussion in https://github.com/NixOS/nixpkgs/issues/107768
src = fetchurl {
url = "https://github.com/scop/bash-completion/releases/download/${version}/bash-completion-${version}.tar.xz";
- sha256 = "sha256-XHSU+WgoCDLWrbWqGfdFpW8aed8xHlkzjF76b3KF4Wg=";
+ sha256 = "sha256-l2pi7mImlwKDzahey5x6Soj2JXTApvnoVhJpdt7PGgY=";
};
strictDeps = true;
diff --git a/pkgs/by-name/ba/bat/package.nix b/pkgs/by-name/ba/bat/package.nix
index 2084af6469fab..d40bc370aeee9 100644
--- a/pkgs/by-name/ba/bat/package.nix
+++ b/pkgs/by-name/ba/bat/package.nix
@@ -5,10 +5,9 @@
fetchFromGitHub,
pkg-config,
less,
- libiconv,
installShellFiles,
makeWrapper,
- apple-sdk_11,
+ zlib,
}:
rustPlatform.buildRustPackage rec {
@@ -29,9 +28,8 @@ rustPlatform.buildRustPackage rec {
makeWrapper
];
- buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
- libiconv
- apple-sdk_11
+ buildInputs = [
+ zlib
];
postInstall = ''
diff --git a/pkgs/by-name/bc/bcftools/package.nix b/pkgs/by-name/bc/bcftools/package.nix
index a2300f28073da..f9b5b22c9c09b 100644
--- a/pkgs/by-name/bc/bcftools/package.nix
+++ b/pkgs/by-name/bc/bcftools/package.nix
@@ -45,7 +45,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 98e64fe535f5e..d12fa91e31fe4 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 fe44dcbef0bb5..d0fe5ded789dc 100644
--- a/pkgs/by-name/bf/bfr/package.nix
+++ b/pkgs/by-name/bf/bfr/package.nix
@@ -16,7 +16,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 94328a663678f..98258c12a3c6f 100644
--- a/pkgs/by-name/bi/bitmeter/package.nix
+++ b/pkgs/by-name/bi/bitmeter/package.nix
@@ -28,7 +28,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/bloodhound/package.nix b/pkgs/by-name/bl/bloodhound/package.nix
index 9987f5f16608d..63656e6bbf408 100644
--- a/pkgs/by-name/bl/bloodhound/package.nix
+++ b/pkgs/by-name/bl/bloodhound/package.nix
@@ -25,7 +25,7 @@
libxcb,
libxkbcommon,
libxshmfence,
- mesa,
+ libgbm,
nspr,
nss,
pango,
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
libuuid
libxcb
libxkbcommon
- mesa
+ libgbm
nspr
nss
pango
diff --git a/pkgs/by-name/bl/bluemail/package.nix b/pkgs/by-name/bl/bluemail/package.nix
index 0511eba95e0bb..872e43f7725dd 100644
--- a/pkgs/by-name/bl/bluemail/package.nix
+++ b/pkgs/by-name/bl/bluemail/package.nix
@@ -11,7 +11,7 @@
nss,
libXdamage,
libdrm,
- mesa,
+ libgbm,
libxshmfence,
makeDesktopItem,
makeWrapper,
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
nss
libXdamage
libdrm
- mesa
+ libgbm
libxshmfence
udev
];
diff --git a/pkgs/by-name/bl/bluez/package.nix b/pkgs/by-name/bl/bluez/package.nix
index ccdac6ccc0412..2f7b200b4634b 100644
--- a/pkgs/by-name/bl/bluez/package.nix
+++ b/pkgs/by-name/bl/bluez/package.nix
@@ -23,36 +23,25 @@
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=";
- })
- ]
- ++ 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=";
- }
- );
+ patches = [
+ (fetchpatch {
+ name = "musl.patch";
+ url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=9d69dba21f1e46b34cdd8ae27fec11d0803907ee";
+ hash = "sha256-yMXPRPK8aT+luVoXNxx9zIa4c6E0BKYKS55DCfr8EQ0=";
+ })
+ ];
buildInputs = [
alsa-lib
@@ -181,6 +170,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/bl/blur-effect/package.nix b/pkgs/by-name/bl/blur-effect/package.nix
index 4ac0dc55e6dca..79093953921f7 100644
--- a/pkgs/by-name/bl/blur-effect/package.nix
+++ b/pkgs/by-name/bl/blur-effect/package.nix
@@ -6,7 +6,7 @@
cmake,
gdk-pixbuf,
libGL,
- mesa,
+ libgbm,
}:
stdenv.mkDerivation rec {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gdk-pixbuf
libGL
- mesa
+ libgbm
];
meta = with lib; {
diff --git a/pkgs/by-name/bo/bolt-launcher/package.nix b/pkgs/by-name/bo/bolt-launcher/package.nix
index 5b4ce314e5e1e..6b3a1d35b2b7c 100644
--- a/pkgs/by-name/bo/bolt-launcher/package.nix
+++ b/pkgs/by-name/bo/bolt-launcher/package.nix
@@ -10,7 +10,7 @@
libcef,
luajit,
xorg,
- mesa,
+ libgbm,
glib,
nss,
nspr,
@@ -56,7 +56,7 @@ let
xorg.libXext
xorg.libXfixes
xorg.libXrandr
- mesa
+ libgbm
gtk3
pango
cairo
@@ -106,7 +106,7 @@ let
];
buildInputs = [
- mesa
+ libgbm
xorg.libX11
xorg.libxcb
libarchive
@@ -198,7 +198,7 @@ buildFHSEnv {
ln -s ${bolt}/share/icons/hicolor/256x256/apps/*.png $out/share/icons/hicolor/256x256/apps/
'';
- runScript = "${bolt.pname}";
+ runScript = "${bolt.name}";
meta = {
homepage = "https://github.com/Adamcake/Bolt";
@@ -209,6 +209,6 @@ buildFHSEnv {
license = lib.licenses.agpl3Plus;
maintainers = with lib.maintainers; [ nezia ];
platforms = lib.platforms.linux;
- mainProgram = "${bolt.pname}";
+ mainProgram = "${bolt.name}";
};
}
diff --git a/pkgs/by-name/br/brave/make-brave.nix b/pkgs/by-name/br/brave/make-brave.nix
index 9a95a4422a685..9b098c5213dcf 100644
--- a/pkgs/by-name/br/brave/make-brave.nix
+++ b/pkgs/by-name/br/brave/make-brave.nix
@@ -37,7 +37,7 @@
libuuid,
libxkbcommon,
libxshmfence,
- mesa,
+ libgbm,
nspr,
nss,
pango,
@@ -126,7 +126,7 @@ let
libxshmfence
libXtst
libuuid
- mesa
+ libgbm
nspr
nss
pango
diff --git a/pkgs/by-name/br/brlcad/package.nix b/pkgs/by-name/br/brlcad/package.nix
index 031b15baf0bae..2f8fb6e3fd045 100644
--- a/pkgs/by-name/br/brlcad/package.nix
+++ b/pkgs/by-name/br/brlcad/package.nix
@@ -7,7 +7,7 @@
, libX11
, libXi
, freetype
-, mesa
+, libgbm
}:
stdenv.mkDerivation rec {
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
libX11
libXi
freetype
- mesa
+ libgbm
];
cmakeFlags = [
diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix
index eb4627dc504e3..23c4767bceec0 100644
--- a/pkgs/by-name/bu/budgie-desktop/package.nix
+++ b/pkgs/by-name/bu/budgie-desktop/package.nix
@@ -25,7 +25,7 @@
libuuid,
libwnck,
magpie,
- mesa,
+ libgbm,
meson,
mutter,
ninja,
@@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
libuuid
libwnck
magpie
- mesa
+ libgbm
polkit
sassc
upower
diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix
index 7cdc9fddb79b6..5e8ce706803a6 100644
--- a/pkgs/by-name/bu/burpsuite/package.nix
+++ b/pkgs/by-name/bu/burpsuite/package.nix
@@ -72,7 +72,7 @@ buildFHSEnv {
libdrm
udev
libxkbcommon
- mesa
+ libgbm
nspr
nss
pango
diff --git a/pkgs/by-name/ca/cairo/package.nix b/pkgs/by-name/ca/cairo/package.nix
index a76132ed8e3a5..d8a4365afe6f0 100644
--- a/pkgs/by-name/ca/cairo/package.nix
+++ b/pkgs/by-name/ca/cairo/package.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
+ fetchpatch,
gtk-doc,
meson,
ninja,
@@ -73,6 +74,16 @@ stdenv.mkDerivation (
]
);
+ patches = [
+ # Pull upstream fix to fix "out of memory" errors:
+ # https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/595
+ (fetchpatch {
+ name = "fix-oom.patch";
+ url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/b9eed915f9a67380e7ef9d8746656455c43f67e2.patch";
+ hash = "sha256-iWYxMVeNpseClSTf7BfU9GBe+tJWc+DUJWTWE5MnGh4=";
+ })
+ ];
+
propagatedBuildInputs =
[
fontconfig
diff --git a/pkgs/by-name/ca/canon-cups-ufr2/package.nix b/pkgs/by-name/ca/canon-cups-ufr2/package.nix
index dfc33e0ea7a8d..9e0b8576ae37a 100644
--- a/pkgs/by-name/ca/canon-cups-ufr2/package.nix
+++ b/pkgs/by-name/ca/canon-cups-ufr2/package.nix
@@ -74,20 +74,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/ca/cardboard/package.nix b/pkgs/by-name/ca/cardboard/package.nix
index 4a09103c91d0e..6b4e37ce6ad28 100644
--- a/pkgs/by-name/ca/cardboard/package.nix
+++ b/pkgs/by-name/ca/cardboard/package.nix
@@ -13,7 +13,7 @@
libpng,
libxcb,
libxkbcommon,
- mesa,
+ libgbm,
meson,
ninja,
pandoc,
@@ -99,7 +99,7 @@ stdenv.mkDerivation {
libpng
libxcb
libxkbcommon
- mesa
+ libgbm
pixman
wayland
wayland-protocols
diff --git a/pkgs/by-name/cb/cbmc/package.nix b/pkgs/by-name/cb/cbmc/package.nix
index fb360095c7bc9..0b72006475368 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 4abe9ee863aa7..0000000000000
--- 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 c2261d98c958a..bfb4f06285d77 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 0368a3c4a985f..be2e3898cf758 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 c7db796cfcfc3..0000000000000
--- 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 45f910b03e666..0000000000000
--- 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 c071e182d7f52..0000000000000
--- 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 319ba72cb54a9..689b37621bb0c 100644
--- a/pkgs/by-name/cd/cdrkit/package.nix
+++ b/pkgs/by-name/cd/cdrkit/package.nix
@@ -1,60 +1,62 @@
{
lib,
stdenv,
- fetchurl,
+ 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 ''
- substituteInPlace libusal/scsi-mac-iokit.c \
- --replace "IOKit/scsi-commands/SCSITaskLib.h" "IOKit/scsi/SCSITaskLib.h"
- substituteInPlace genisoimage/sha256.c \
- --replace "" ""
- substituteInPlace genisoimage/sha512.c \
- --replace "" ""
- substituteInPlace genisoimage/sha256.h \
- --replace "__THROW" ""
- substituteInPlace genisoimage/sha512.h \
- --replace "__THROW" ""
- '';
+ 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 \
+ --replace "" ""
+ substituteInPlace genisoimage/sha512.c \
+ --replace "" ""
+ substituteInPlace genisoimage/sha256.h \
+ --replace "__THROW" ""
+ substituteInPlace genisoimage/sha512.h \
+ --replace "__THROW" ""
+ '';
preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''
substituteInPlace include/xconfig.h.in \
@@ -94,4 +96,4 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.unix;
};
-}
+})
diff --git a/pkgs/by-name/ch/chez/package.nix b/pkgs/by-name/ch/chez/package.nix
index 7e76fb762934c..52ac003255edd 100644
--- a/pkgs/by-name/ch/chez/package.nix
+++ b/pkgs/by-name/ch/chez/package.nix
@@ -1,6 +1,7 @@
{
lib,
stdenv,
+ llvmPackages_17,
fetchurl,
coreutils,
cctools,
@@ -10,8 +11,17 @@
libX11,
libuuid,
testers,
-}:
+}@args:
+let
+ # x64 darwin fails with invalid memory reference with clang-18 & 19.
+ # https://github.com/cisco/ChezScheme/issues/896
+ stdenv =
+ if args.stdenv.hostPlatform.isDarwin && args.stdenv.hostPlatform.isx86_64 then
+ llvmPackages_17.stdenv
+ else
+ args.stdenv;
+in
stdenv.mkDerivation (finalAttrs: {
pname = "chez-scheme";
version = "10.1.0";
diff --git a/pkgs/by-name/ci/cinnamon-common/package.nix b/pkgs/by-name/ci/cinnamon-common/package.nix
index 8b4fd0a6bbd46..6bba5b87514d3 100644
--- a/pkgs/by-name/ci/cinnamon-common/package.nix
+++ b/pkgs/by-name/ci/cinnamon-common/package.nix
@@ -24,7 +24,7 @@
libstartup_notification,
libXtst,
libXdamage,
- mesa,
+ libgbm,
muffin,
networkmanager,
pkg-config,
@@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
libstartup_notification
libXtst
libXdamage
- mesa
+ libgbm
muffin
networkmanager
polkit
diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix
index 5156382741456..35166edf8de65 100644
--- a/pkgs/by-name/ci/cinny-unwrapped/package.nix
+++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix
@@ -10,6 +10,7 @@
pango,
stdenv,
olm,
+ nodejs_20,
}:
buildNpmPackage rec {
@@ -23,6 +24,10 @@ buildNpmPackage rec {
hash = "sha256-BoUQURCfEu5kocMm8T25cVl8hgZGxcxrMzQZOl2fAbY=";
};
+ # canvas, a transitive dependency of cinny, fails to build with Node 22
+ # https://github.com/Automattic/node-canvas/issues/2448
+ nodejs = nodejs_20;
+
npmDepsHash = "sha256-fDoia6evCmXZgeIKL0coRo3yunX1dfud31ROgmop2Sc=";
# Fix error: no member named 'aligned_alloc' in the global namespace
diff --git a/pkgs/by-name/cl/cl-launch/package.nix b/pkgs/by-name/cl/cl-launch/package.nix
index 3b1f8b6bad4b7..9bb52885449cc 100644
--- a/pkgs/by-name/cl/cl-launch/package.nix
+++ b/pkgs/by-name/cl/cl-launch/package.nix
@@ -13,10 +13,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/cl/clipqr/package.nix b/pkgs/by-name/cl/clipqr/package.nix
index 7e71cda67eb30..22c6bd779f8d8 100644
--- a/pkgs/by-name/cl/clipqr/package.nix
+++ b/pkgs/by-name/cl/clipqr/package.nix
@@ -12,7 +12,7 @@
libXrandr,
libXxf86vm,
makeDesktopItem,
- mesa,
+ libgbm,
pkg-config,
stdenv,
}:
@@ -44,7 +44,7 @@ buildGoModule rec {
libXinerama
libXrandr
libXxf86vm
- mesa
+ libgbm
];
nativeBuildInputs = [
diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix
index e053b88b4d66f..1c0bf7489aefe 100644
--- a/pkgs/by-name/co/cosmic-comp/package.nix
+++ b/pkgs/by-name/co/cosmic-comp/package.nix
@@ -9,7 +9,7 @@
libinput,
libglvnd,
libxkbcommon,
- mesa,
+ libgbm,
seatd,
udev,
xwayland,
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec {
libglvnd
libinput
libxkbcommon
- mesa
+ libgbm
pixman
seatd
udev
diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix
index 7de5099aaf23b..c7d072d3d824e 100644
--- a/pkgs/by-name/co/cosmic-edit/package.nix
+++ b/pkgs/by-name/co/cosmic-edit/package.nix
@@ -12,7 +12,7 @@
libinput,
fontconfig,
freetype,
- mesa,
+ libgbm,
wayland,
xorg,
vulkan-loader,
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec {
libglvnd
fontconfig
freetype
- mesa
+ libgbm
wayland
vulkan-loader
];
diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
index c8566601240e3..e487328a1f2f1 100644
--- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
+++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
@@ -6,7 +6,7 @@
libxkbcommon,
libinput,
libglvnd,
- mesa,
+ libgbm,
udev,
wayland,
}:
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
libxkbcommon
libinput
libglvnd
- mesa
+ libgbm
udev
wayland
];
diff --git a/pkgs/by-name/cs/csdr/package.nix b/pkgs/by-name/cs/csdr/package.nix
index 9170ea63cd0b1..76d137b49e1fe 100644
--- a/pkgs/by-name/cs/csdr/package.nix
+++ b/pkgs/by-name/cs/csdr/package.nix
@@ -19,6 +19,11 @@ stdenv.mkDerivation rec {
sha256 = "sha256-LdVzeTTIvDQIXRdcz/vpQu/fUgtE8nx1kIEfoiwxrUg=";
};
+ postPatch = ''
+ # function is not defined in any headers but used in libcsdr.c
+ echo "int errhead();" >> src/predefined.h
+ '';
+
nativeBuildInputs = [
cmake
pkg-config
diff --git a/pkgs/by-name/ct/ctpp2/package.nix b/pkgs/by-name/ct/ctpp2/package.nix
index d03830f8069da..8848ed9ea58b3 100644
--- a/pkgs/by-name/ct/ctpp2/package.nix
+++ b/pkgs/by-name/ct/ctpp2/package.nix
@@ -18,7 +18,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 6c54a577bc041..f6d977297f901 100644
--- a/pkgs/by-name/cu/cuneiform/package.nix
+++ b/pkgs/by-name/cu/cuneiform/package.nix
@@ -22,7 +22,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/cv/cvs/CVE-2012-0804.patch b/pkgs/by-name/cv/cvs/CVE-2012-0804.patch
deleted file mode 100644
index cd2b324729fbc..0000000000000
--- a/pkgs/by-name/cv/cvs/CVE-2012-0804.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/client.c b/src/client.c
-index 751406b..b45d89c 100644
---- a/src/client.c
-+++ b/src/client.c
-@@ -3558,9 +3558,9 @@ connect_to_pserver (cvsroot_t *root, struct buffer **to_server_p,
- * code.
- */
- read_line_via (from_server, to_server, &read_buf);
-- sscanf (read_buf, "%s %d", write_buf, &codenum);
-+ count = sscanf (read_buf, "%*s %d", &codenum);
-
-- if ((codenum / 100) != 2)
-+ if (count != 1 || (codenum / 100) != 2)
- error (1, 0, "proxy server %s:%d does not support http tunnelling",
- root->proxy_hostname, proxy_port_number);
- free (read_buf);
diff --git a/pkgs/by-name/cv/cvs/CVE-2017-12836.patch b/pkgs/by-name/cv/cvs/CVE-2017-12836.patch
deleted file mode 100644
index 950079423685c..0000000000000
--- a/pkgs/by-name/cv/cvs/CVE-2017-12836.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/rsh-client.c.orig 2005-10-02 17:17:21.000000000 +0200
-+++ b/src/rsh-client.c 2017-11-07 16:56:06.957370469 +0100
-@@ -53,7 +53,7 @@
- char *cvs_server = (root->cvs_server != NULL
- ? root->cvs_server : getenv ("CVS_SERVER"));
- int i = 0;
-- /* This needs to fit "rsh", "-b", "-l", "USER", "host",
-+ /* This needs to fit "rsh", "-b", "-l", "USER", "--", "host",
- "cmd (w/ args)", and NULL. We leave some room to grow. */
- char *rsh_argv[10];
-
-@@ -97,6 +97,9 @@
- rsh_argv[i++] = root->username;
- }
-
-+ /* Only non-option arguments from here. (CVE-2017-12836) */
-+ rsh_argv[i++] = "--";
-+
- rsh_argv[i++] = root->hostname;
- rsh_argv[i++] = cvs_server;
- rsh_argv[i++] = "server";
-@@ -171,6 +174,7 @@
- *p++ = root->username;
- }
-
-+ *p++ = "--";
- *p++ = root->hostname;
- *p++ = command;
- *p++ = NULL;
diff --git a/pkgs/by-name/cv/cvs/package.nix b/pkgs/by-name/cv/cvs/package.nix
index 7ec801503f767..b69e0c8bd242a 100644
--- a/pkgs/by-name/cv/cvs/package.nix
+++ b/pkgs/by-name/cv/cvs/package.nix
@@ -1,8 +1,13 @@
-{ lib, stdenv, fetchurl, fetchpatch, nano }:
+{ lib, stdenv, fetchurl, fetchpatch, texinfo, nano, autoreconfHook }:
-stdenv.mkDerivation rec {
- pname = "cvs";
+let
version = "1.12.13";
+ debianRevision = "real-30";
+in
+
+stdenv.mkDerivation {
+ pname = "cvs";
+ version = "${version}+${debianRevision}";
src = fetchurl {
url = "mirror://savannah/cvs/source/feature/${version}/cvs-${version}.tar.bz2";
@@ -11,39 +16,40 @@ stdenv.mkDerivation rec {
patches = [
./getcwd-chroot.patch
- ./CVE-2012-0804.patch
- ./CVE-2017-12836.patch
(fetchpatch {
url = "https://raw.githubusercontent.com/Homebrew/formula-patches/24118ec737c7/cvs/vasnprintf-high-sierra-fix.diff";
sha256 = "1ql6aaia7xkfq3vqhlw5bd2z2ywka82zk01njs1b2szn699liymg";
})
+ # Debian Patchset,
+ # contains patches for CVE-2017-12836 and CVE-2012-0804 among other things
+ (fetchurl {
+ url = "http://deb.debian.org/debian/pool/main/c/cvs/cvs_1.12.13+${debianRevision}.diff.gz";
+ sha256 = "085124619dfdcd3e53c726e049235791b67dcb9f71619f1e27c5f1cbdef0063e";
+ })
];
hardeningDisable = [ "fortify" "format" ];
- preConfigure = ''
- # Apply the Debian patches.
- for p in "debian/patches/"*; do
- echo "applying \`$p' ..."
- patch --verbose -p1 < "$p"
- done
- '';
+ nativeBuildInputs = [ autoreconfHook texinfo ];
configureFlags = [
"--with-editor=${nano}/bin/nano"
# Required for cross-compilation.
"cvs_cv_func_printf_ptr=yes"
+ ] ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [
+ # So that fputs_unlocked is defined
+ "CFLAGS=-D_GNU_SOURCE"
];
makeFlags = [
"AR=${stdenv.cc.targetPrefix}ar"
+ ] ++ lib.optionals (!stdenv.cc.bintools.isGNU) [
+ # Don't pass --as-needed to linkers that don't support it
+ # (introduced in debian patchset)
+ "cvs_LDFLAGS="
];
- env = lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.cc.isClang) {
- NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration";
- };
-
doCheck = false; # fails 1 of 1 tests
meta = with lib; {
diff --git a/pkgs/by-name/cw/cwiid/package.nix b/pkgs/by-name/cw/cwiid/package.nix
index 98e5fc9c1a845..c9b842e6a4932 100644
--- a/pkgs/by-name/cw/cwiid/package.nix
+++ b/pkgs/by-name/cw/cwiid/package.nix
@@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
flex
];
+ NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
NIX_LDFLAGS = "-lbluetooth";
postInstall = ''
diff --git a/pkgs/by-name/da/daemontools/package.nix b/pkgs/by-name/da/daemontools/package.nix
index 7832af18ade69..378910c80778e 100644
--- a/pkgs/by-name/da/daemontools/package.nix
+++ b/pkgs/by-name/da/daemontools/package.nix
@@ -34,12 +34,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 48b81897de077..34094c14ba6de 100644
--- a/pkgs/by-name/db/dbus_cplusplus/package.nix
+++ b/pkgs/by-name/db/dbus_cplusplus/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
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/de/delta/package.nix b/pkgs/by-name/de/delta/package.nix
index 5f74dde527de2..76b4df5c3a233 100644
--- a/pkgs/by-name/de/delta/package.nix
+++ b/pkgs/by-name/de/delta/package.nix
@@ -6,8 +6,8 @@
pkg-config,
oniguruma,
stdenv,
- apple-sdk_11,
git,
+ zlib,
}:
rustPlatform.buildRustPackage rec {
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
oniguruma
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
- apple-sdk_11
+ zlib
];
nativeCheckInputs = [ git ];
diff --git a/pkgs/by-name/de/desktop-file-utils/package.nix b/pkgs/by-name/de/desktop-file-utils/package.nix
index 3ad645e5068ed..387a43b5ae893 100644
--- a/pkgs/by-name/de/desktop-file-utils/package.nix
+++ b/pkgs/by-name/de/desktop-file-utils/package.nix
@@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "desktop-file-utils";
- version = "0.27";
+ version = "0.28";
src = fetchurl {
url = "https://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${version}.tar.xz";
- hash = "sha256-oIF985zjhbZiGIBAfFbx8pgWjAQMIDLO34jVt2r/6DY=";
+ hash = "sha256-RAHU4jHYQsLegkI5WnSjlcpGjNlvX2ENgi3zNZSJinA=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/de/dev86/package.nix b/pkgs/by-name/de/dev86/package.nix
index e3da58d11f749..bed0d6c264568 100644
--- a/pkgs/by-name/de/dev86/package.nix
+++ b/pkgs/by-name/de/dev86/package.nix
@@ -1,35 +1,31 @@
-{ lib
-, stdenv
-, fetchFromGitHub
+{
+ lib,
+ stdenv,
+ fetchFromGitea,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "dev86";
- version = "unstable-2022-07-19";
+ version = "1.0.1";
- src = fetchFromGitHub {
+ src = fetchFromGitea {
+ domain = "codeberg.org";
owner = "jbruchon";
repo = "dev86";
- rev = "f5cd3e5c17a0d3cd8298bac8e30bed6e59c4e57a";
- hash = "sha256-CWeboFkJkpKHZ/wkuvMj5a+5qB2uzAtoYy8OdyYErMg=";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-xeOtESc0X7RZWCIpNZSHE8au9+opXwnHsAcayYLSX7w=";
};
makeFlags = [ "PREFIX=${placeholder "out"}" ];
- # Parallel builds are not supported due to build process structure: tools are
- # built sequentially in submakefiles and are reusing the same targets as
- # dependencies. Building dependencies in parallel from different submakes is
- # not synchronized and fails:
- # make[3]: Entering directory '/build/dev86-0.16.21/libc'
- # Unable to execute as86.
- enableParallelBuilding = false;
-
meta = {
- homepage = "https://github.com/jbruchon/dev86";
- description =
- "C compiler, assembler and linker environment for the production of 8086 executables";
+ homepage = "https://codeberg.org/jbruchon/dev86";
+ description = "C compiler, assembler and linker environment for the production of 8086 executables";
license = lib.licenses.gpl2Plus;
- maintainers = with lib.maintainers; [ AndersonTorres sigmasquadron ];
+ maintainers = with lib.maintainers; [
+ AndersonTorres
+ sigmasquadron
+ ];
platforms = lib.platforms.linux;
};
})
diff --git a/pkgs/by-name/dj/djvulibre/package.nix b/pkgs/by-name/dj/djvulibre/package.nix
index 76b097316dac6..ba1b0361f53ff 100644
--- a/pkgs/by-name/dj/djvulibre/package.nix
+++ b/pkgs/by-name/dj/djvulibre/package.nix
@@ -20,8 +20,10 @@ stdenv.mkDerivation rec {
outputs = [
"bin"
- "dev"
"out"
+ "dev"
+ "lib"
+ "man"
];
strictDeps = true;
diff --git a/pkgs/by-name/dr/dri-pkgconfig-stub/package.nix b/pkgs/by-name/dr/dri-pkgconfig-stub/package.nix
new file mode 100644
index 0000000000000..9b5b5265882a4
--- /dev/null
+++ b/pkgs/by-name/dr/dri-pkgconfig-stub/package.nix
@@ -0,0 +1,20 @@
+{
+ lib,
+ writeTextFile,
+ mesa,
+}:
+writeTextFile {
+ name = "dri-pkgconfig-stub";
+
+ text = ''
+ dridriverdir=${mesa.driverLink}/lib/dri
+
+ Name: dri
+ Version: ${mesa.version}
+ Description: Nixpkgs graphics driver path stub
+ '';
+
+ destination = "/lib/pkgconfig/dri.pc";
+
+ meta.badPlatforms = lib.platforms.darwin;
+}
diff --git a/pkgs/by-name/dt/dtc/package.nix b/pkgs/by-name/dt/dtc/package.nix
index 9eaf13b6a7c6a..9cd30c0dbba63 100644
--- a/pkgs/by-name/dt/dtc/package.nix
+++ b/pkgs/by-name/dt/dtc/package.nix
@@ -30,6 +30,11 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://github.com/dgibson/dtc/commit/56a7d0cb3be5f2f7604bc42299e24d13a39c72d8.patch";
hash = "sha256-GmAyk/K2OolH/Z8SsgwCcq3/GOlFuSpnVPr7jsy8Cs0=";
})
+ # backport fix for SWIG 4.3
+ (fetchpatch2 {
+ url = "https://github.com/dgibson/dtc/commit/9a969f3b70b07bbf1c9df44a38d7f8d1d3a6e2a5.patch";
+ hash = "sha256-YrRzc3ATNmU6LYNHEQeU8wtjt1Ap7/gNFvtRR14PQEE=";
+ })
];
env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
diff --git a/pkgs/by-name/du/dump1090/package.nix b/pkgs/by-name/du/dump1090/package.nix
index ce4746f8ec75f..9d23fe65006de 100644
--- a/pkgs/by-name/du/dump1090/package.nix
+++ b/pkgs/by-name/du/dump1090/package.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
+ fetchpatch,
pkg-config,
hackrf,
libbladeRF,
@@ -23,6 +24,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-rc4mg+Px+0p2r38wxIah/rHqWjHSU0+KCPgqj/Gl3oo=";
};
+ patches = [
+ # GCC 14 fix, remove when included in release
+ (fetchpatch {
+ url = "https://github.com/flightaware/dump1090/commit/eb08fd7fce8d133b0e7a0d45d0cb9423b09ddc55.patch";
+ hash = "sha256-le9rDeU4+r2kROjCuqt0cSN4pPkwfiD4YTdM9qFeYyQ=";
+ })
+ ];
+
nativeBuildInputs = [ pkg-config ];
buildInputs = [
diff --git a/pkgs/by-name/dy/dyalog/package.nix b/pkgs/by-name/dy/dyalog/package.nix
index 633dfeb64f17f..1ec73cd145281 100644
--- a/pkgs/by-name/dy/dyalog/package.nix
+++ b/pkgs/by-name/dy/dyalog/package.nix
@@ -18,7 +18,7 @@
gtk3,
libdrm,
libGL,
- mesa,
+ libgbm,
nss,
htmlRendererSupport ? false,
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
gtk3
libdrm
libGL
- mesa
+ libgbm
nss
]
++ lib.optional sqaplSupport unixODBC;
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 0000000000000..e35b0a44d863e
--- /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 c00cecf8f2549..21d6749573754 100644
--- a/pkgs/by-name/el/electricsheep/package.nix
+++ b/pkgs/by-name/el/electricsheep/package.nix
@@ -12,7 +12,7 @@
pkg-config,
flam3,
libgtop,
- boost179,
+ boost,
tinyxml,
libglut,
libGLU,
@@ -31,6 +31,11 @@ stdenv.mkDerivation {
hash = "sha256-X3EZ1/VcLEU1GkZbskWSsqQWYTnsH3pbFDvDLpdLmcU=";
};
+ patches = [
+ #
+ ./boost-1.85.patch
+ ];
+
nativeBuildInputs = [
autoreconfHook
pkg-config
@@ -45,7 +50,7 @@ stdenv.mkDerivation {
xorg.libXrender
flam3
libgtop
- boost179
+ boost
tinyxml
libglut
libGLU
diff --git a/pkgs/by-name/el/electron-fiddle/package.nix b/pkgs/by-name/el/electron-fiddle/package.nix
index 7678e3b8cb074..33c495035f144 100644
--- a/pkgs/by-name/el/electron-fiddle/package.nix
+++ b/pkgs/by-name/el/electron-fiddle/package.nix
@@ -137,7 +137,7 @@ buildFHSEnv {
libdrm
libnotify
libxkbcommon
- mesa
+ libgbm
nspr
nss
pango
diff --git a/pkgs/by-name/el/elfutils/package.nix b/pkgs/by-name/el/elfutils/package.nix
index e29b8b5c1c02e..f07ab5b6aebcb 100644
--- a/pkgs/by-name/el/elfutils/package.nix
+++ b/pkgs/by-name/el/elfutils/package.nix
@@ -19,6 +19,7 @@
enableDebuginfod ? lib.meta.availableOn stdenv.hostPlatform libarchive,
sqlite,
curl,
+ json_c,
libmicrohttpd,
libarchive,
gitUpdater,
@@ -28,11 +29,11 @@
# TODO: Look at the hardcoded paths to kernel, modules etc.
stdenv.mkDerivation rec {
pname = "elfutils";
- version = "0.191";
+ version = "0.192";
src = fetchurl {
url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2";
- hash = "sha256-33bbcTZtHXCDZfx6bGDKSDmPFDZ+sriVTvyIlxR62HE=";
+ hash = "sha256-YWCZvq4kq6Efm2PYbKbMjVZtlouAI5EzTJHfVOq0FrQ=";
};
patches =
@@ -109,6 +110,7 @@ stdenv.mkDerivation rec {
++ lib.optionals enableDebuginfod [
sqlite
curl
+ json_c
libmicrohttpd
libarchive
];
diff --git a/pkgs/by-name/el/ell/package.nix b/pkgs/by-name/el/ell/package.nix
index 495c858c93a27..41e58b4cf308e 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/en/enpass/package.nix b/pkgs/by-name/en/enpass/package.nix
index 3d10bdf5bf62b..c3e6e021c3def 100644
--- a/pkgs/by-name/en/enpass/package.nix
+++ b/pkgs/by-name/en/enpass/package.nix
@@ -21,7 +21,7 @@
curl,
libuuid,
cups,
- mesa,
+ libgbm,
xz,
libxkbcommon,
}:
diff --git a/pkgs/by-name/en/envision/package.nix b/pkgs/by-name/en/envision/package.nix
index 72aa327ac0c0d..18dbd47926c6e 100644
--- a/pkgs/by-name/en/envision/package.nix
+++ b/pkgs/by-name/en/envision/package.nix
@@ -34,7 +34,7 @@ buildFHSEnv {
++ pkgs.monado.nativeBuildInputs
++ (with pkgs; [
# Additional dependencies required by Monado when built using Envision
- mesa
+ libgbm
shaderc
xorg.libX11
xorg.libxcb
diff --git a/pkgs/by-name/ep/epson-escpr2/package.nix b/pkgs/by-name/ep/epson-escpr2/package.nix
index d08cada43628c..91db9ed6f5bef 100644
--- a/pkgs/by-name/ep/epson-escpr2/package.nix
+++ b/pkgs/by-name/ep/epson-escpr2/package.nix
@@ -37,6 +37,15 @@ stdenv.mkDerivation rec {
cpio
];
+ patches = [
+ # Fixes "implicit declaration of function" errors
+ # source of patch: https://aur.archlinux.org/packages/epson-inkjet-printer-escpr2
+ (fetchurl {
+ url = "https://aur.archlinux.org/cgit/aur.git/plain/bug_x86_64.patch?h=epson-inkjet-printer-escpr2";
+ sha256 = "sha256-G6/3oj25FUT+xv9aJ7qP5PBZWLfy+V8MCHUYucDhtzM=";
+ })
+ ];
+
configureFlags = [
"--with-cupsfilterdir=${builtins.placeholder "out"}/lib/cups/filter"
"--with-cupsppddir=${builtins.placeholder "out"}/share/cups/model"
diff --git a/pkgs/by-name/eu/eudic/package.nix b/pkgs/by-name/eu/eudic/package.nix
index b0bd0e07eec31..6ec07789dcb4b 100644
--- a/pkgs/by-name/eu/eudic/package.nix
+++ b/pkgs/by-name/eu/eudic/package.nix
@@ -21,7 +21,7 @@
nss,
libgpg-error,
libjack2,
- mesa,
+ libgbm,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
nss
libgpg-error
libjack2
- mesa
+ libgbm
];
unpackPhase = ''
diff --git a/pkgs/by-name/ex/exodus/package.nix b/pkgs/by-name/ex/exodus/package.nix
index 8331773927b15..c3f467367b2d8 100644
--- a/pkgs/by-name/ex/exodus/package.nix
+++ b/pkgs/by-name/ex/exodus/package.nix
@@ -23,7 +23,7 @@
libpulseaudio,
at-spi2-core,
libxkbcommon,
- mesa,
+ libgbm,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
systemd
vivaldi-ffmpeg-codecs
libxkbcommon
- mesa
+ libgbm
];
in
''
diff --git a/pkgs/by-name/fb/fbida/package.nix b/pkgs/by-name/fb/fbida/package.nix
index e5a142d9130b2..a523b81fa0523 100644
--- a/pkgs/by-name/fb/fbida/package.nix
+++ b/pkgs/by-name/fb/fbida/package.nix
@@ -21,7 +21,7 @@
libepoxy,
pixman,
poppler,
- mesa,
+ libgbm,
lirc,
}:
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
pixman
poppler
lirc
- mesa
+ libgbm
];
makeFlags = [
diff --git a/pkgs/by-name/fc/fcitx5-mozc/package.nix b/pkgs/by-name/fc/fcitx5-mozc/package.nix
index 0e7d0c865e44c..f7a9ec71328c0 100644
--- a/pkgs/by-name/fc/fcitx5-mozc/package.nix
+++ b/pkgs/by-name/fc/fcitx5-mozc/package.nix
@@ -8,6 +8,7 @@
mozc,
nixosTests,
pkg-config,
+ protobuf_27,
python3,
stdenv,
unzip,
@@ -15,7 +16,7 @@
buildBazelPackage {
pname = "fcitx5-mozc";
- version = "2.30.5544.102";
+ version = "2.30.5544.102"; # make sure to update protobuf if needed
src = fetchFromGitHub {
owner = "fcitx";
@@ -38,6 +39,9 @@ buildBazelPackage {
];
postPatch = ''
+ # replace protobuf with our own
+ rm -r src/third_party/protobuf
+ cp -r ${protobuf_27.src} src/third_party/protobuf
sed -i -e 's|^\(LINUX_MOZC_SERVER_DIR = \).\+|\1"${mozc}/lib/mozc"|' src/config.bzl
'';
diff --git a/pkgs/by-name/fe/feishu/package.nix b/pkgs/by-name/fe/feishu/package.nix
index a72516e326411..b5d2d836d824c 100644
--- a/pkgs/by-name/fe/feishu/package.nix
+++ b/pkgs/by-name/fe/feishu/package.nix
@@ -46,7 +46,7 @@
libxkbfile,
libxshmfence,
makeShellWrapper,
- mesa,
+ libgbm,
nspr,
nss,
pango,
@@ -121,7 +121,7 @@ let
libxkbcommon
libxkbfile
libxshmfence
- mesa
+ libgbm
nspr
nss
pango
@@ -161,7 +161,7 @@ stdenv.mkDerivation {
libgcrypt
libpulseaudio
libxshmfence
- mesa
+ libgbm
nspr
nss
];
diff --git a/pkgs/by-name/fi/figma-linux/package.nix b/pkgs/by-name/fi/figma-linux/package.nix
index 5e9ced617e144..39c7b8ca891f7 100644
--- a/pkgs/by-name/fi/figma-linux/package.nix
+++ b/pkgs/by-name/fi/figma-linux/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
gtk3
libdrm
libxkbcommon
- mesa
+ libgbm
nspr
nss
pango
diff --git a/pkgs/by-name/fi/firefoxpwa/package.nix b/pkgs/by-name/fi/firefoxpwa/package.nix
index d669709c228d3..83a0fb0da4603 100644
--- a/pkgs/by-name/fi/firefoxpwa/package.nix
+++ b/pkgs/by-name/fi/firefoxpwa/package.nix
@@ -15,7 +15,7 @@
libnotify,
libpulseaudio,
libva,
- mesa,
+ libgbm,
nixosTests,
openssl,
pciutils,
@@ -76,7 +76,7 @@ rustPlatform.buildRustPackage rec {
libnotify
libpulseaudio
libva
- mesa
+ libgbm
pciutils
pipewire
udev
diff --git a/pkgs/by-name/fl/fluffychat/package.nix b/pkgs/by-name/fl/fluffychat/package.nix
index a76c248b651ff..373adc09c42a2 100644
--- a/pkgs/by-name/fl/fluffychat/package.nix
+++ b/pkgs/by-name/fl/fluffychat/package.nix
@@ -3,7 +3,7 @@
fetchzip,
fetchFromGitHub,
imagemagick,
- mesa,
+ libgbm,
libdrm,
flutter324,
pulseaudio,
@@ -15,7 +15,7 @@
let
libwebrtcRpath = lib.makeLibraryPath [
- mesa
+ libgbm
libdrm
];
pubspecLock = lib.importJSON ./pubspec.lock.json;
diff --git a/pkgs/by-name/fo/folks/package.nix b/pkgs/by-name/fo/folks/package.nix
index 941db4dfc8e97..64f81dea0a7ca 100644
--- a/pkgs/by-name/fo/folks/package.nix
+++ b/pkgs/by-name/fo/folks/package.nix
@@ -101,12 +101,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/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix
index 3d84de4ea5c7b..f7fa09d254db1 100644
--- a/pkgs/by-name/fo/folly/package.nix
+++ b/pkgs/by-name/fo/folly/package.nix
@@ -147,6 +147,19 @@ stdenv.mkDerivation (finalAttrs: {
"io_async_ssl_session_test.SSLSessionTest.BasicTest"
"io_async_ssl_session_test.SSLSessionTest.NullSessionResumptionTest"
"singleton_thread_local_test.SingletonThreadLocalDeathTest.Overload"
+
+ # very strict timing constraints, will fail under load
+ "io_async_hh_wheel_timer_test.HHWheelTimerTest.CancelTimeout"
+ "io_async_hh_wheel_timer_test.HHWheelTimerTest.DefaultTimeout"
+ "io_async_hh_wheel_timer_test.HHWheelTimerTest.DeleteWheelInTimeout"
+ "io_async_hh_wheel_timer_test.HHWheelTimerTest.DestroyTimeoutSet"
+ "io_async_hh_wheel_timer_test.HHWheelTimerTest.FireOnce"
+ "io_async_hh_wheel_timer_test.HHWheelTimerTest.GetTimeRemaining"
+ "io_async_hh_wheel_timer_test.HHWheelTimerTest.IntrusivePtr"
+ "io_async_hh_wheel_timer_test.HHWheelTimerTest.Level1"
+ "io_async_hh_wheel_timer_test.HHWheelTimerTest.NegativeTimeout"
+ "io_async_hh_wheel_timer_test.HHWheelTimerTest.ReschedTest"
+ "io_async_hh_wheel_timer_test.HHWheelTimerTest.SlowFast"
]
++ lib.optionals stdenv.hostPlatform.isLinux [
"concurrency_cache_locality_test.CacheLocality.BenchmarkSysfs"
diff --git a/pkgs/by-name/fo/forge/package.nix b/pkgs/by-name/fo/forge/package.nix
index da70604c2f759..ecb3780e20110 100644
--- a/pkgs/by-name/fo/forge/package.nix
+++ b/pkgs/by-name/fo/forge/package.nix
@@ -11,7 +11,7 @@
lib,
libGLU,
libGL,
- mesa,
+ libgbm,
opencl-clhpp,
pkg-config,
stdenv,
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
libGLU
opencl-clhpp
SDL2
- mesa
+ libgbm
];
meta = with lib; {
diff --git a/pkgs/by-name/gh/ghostscript/package.nix b/pkgs/by-name/gh/ghostscript/package.nix
index c9557858a161b..ccf1daa72ffb7 100644
--- a/pkgs/by-name/gh/ghostscript/package.nix
+++ b/pkgs/by-name/gh/ghostscript/package.nix
@@ -2,6 +2,7 @@
, stdenv
, lib
, fetchurl
+, fetchpatch2
, pkg-config
, zlib
, expat
@@ -72,6 +73,12 @@ stdenv.mkDerivation rec {
patches = [
./urw-font-files.patch
./doc-no-ref.diff
+
+ # Support SOURCE_DATE_EPOCH for reproducible builds
+ (fetchpatch2 {
+ url = "https://salsa.debian.org/debian/ghostscript/-/raw/01e895fea033cc35054d1b68010de9818fa4a8fc/debian/patches/2010_add_build_timestamp_setting.patch";
+ hash = "sha256-XTKkFKzMR2QpcS1YqoxzJnyuGk/l/Y2jdevsmbMtCXA=";
+ })
];
outputs = [ "out" "man" "doc" "fonts" ];
diff --git a/pkgs/by-name/gi/github-desktop/package.nix b/pkgs/by-name/gi/github-desktop/package.nix
index 22a01f07eb38a..72b5c9c26638b 100644
--- a/pkgs/by-name/gi/github-desktop/package.nix
+++ b/pkgs/by-name/gi/github-desktop/package.nix
@@ -14,7 +14,7 @@
libdrm,
alsa-lib,
cups,
- mesa,
+ libgbm,
systemd,
openssl,
libglvnd,
@@ -63,7 +63,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
libdrm
alsa-lib
cups
- mesa
+ libgbm
openssl
];
diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix
index c27d972335223..5e52145944e59 100644
--- a/pkgs/by-name/gi/gitkraken/package.nix
+++ b/pkgs/by-name/gi/gitkraken/package.nix
@@ -44,7 +44,7 @@
e2fsprogs,
krb5,
libdrm,
- mesa,
+ libgbm,
unzip,
copyDesktopItems,
libxshmfence,
@@ -145,7 +145,7 @@ let
e2fsprogs
krb5
libdrm
- mesa
+ libgbm
libxshmfence
libxkbcommon
libGL
diff --git a/pkgs/by-name/gl/glmark2/package.nix b/pkgs/by-name/gl/glmark2/package.nix
index 607a7e3a9a6db..1ba60f3588c45 100644
--- a/pkgs/by-name/gl/glmark2/package.nix
+++ b/pkgs/by-name/gl/glmark2/package.nix
@@ -15,7 +15,7 @@
udev,
wayland,
wayland-protocols,
- mesa,
+ libgbm,
}:
stdenv.mkDerivation rec {
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
udev
wayland
wayland-protocols
- mesa
+ libgbm
];
mesonFlags = [
diff --git a/pkgs/by-name/gl/globulation2/package.nix b/pkgs/by-name/gl/globulation2/package.nix
index 20621238c2796..229bafdc23a2e 100644
--- a/pkgs/by-name/gl/globulation2/package.nix
+++ b/pkgs/by-name/gl/globulation2/package.nix
@@ -83,11 +83,11 @@ stdenv.mkDerivation rec {
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/gm/gmt/package.nix b/pkgs/by-name/gm/gmt/package.nix
index 528d21598e21b..4fe72aebc230c 100644
--- a/pkgs/by-name/gm/gmt/package.nix
+++ b/pkgs/by-name/gm/gmt/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ cmake ];
env = {
- NIX_LDFLAGS = "-lxml2 -L${lib.getLib (libxml2.override { enableHttp = true; })}/lib";
+ NIX_LDFLAGS = "-lxml2 -L${lib.getLib libxml2}/lib";
NIX_CFLAGS_COMPILE =
lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration "
+ lib.optionalString (
diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix
index ad6e2b3db1e4a..e0db6fa1d6f1c 100644
--- a/pkgs/by-name/gn/gnome-shell/package.nix
+++ b/pkgs/by-name/gn/gnome-shell/package.nix
@@ -58,7 +58,7 @@
gnome-autoar,
gnome-tecla,
bash-completion,
- mesa,
+ libgbm,
libGL,
libXi,
libX11,
@@ -155,7 +155,7 @@ stdenv.mkDerivation (finalAttrs: {
ibus
gnome-desktop
gnome-settings-daemon
- mesa
+ libgbm
libGL # for egl, required by mutter-clutter
libXi # required by libmutter
libX11
diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index cfee3d658d87b..752a3f0e20178 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -39,7 +39,7 @@
libXScrnSaver,
libxshmfence,
libXtst,
- mesa,
+ libgbm,
nspr,
nss,
pango,
@@ -142,7 +142,7 @@ let
libXScrnSaver
libxshmfence
libXtst
- mesa
+ libgbm
nspr
nss
opusWithCustomModes
diff --git a/pkgs/by-name/gp/gpsd/package.nix b/pkgs/by-name/gp/gpsd/package.nix
index 182fba46f2f55..adcde9cc1d973 100644
--- a/pkgs/by-name/gp/gpsd/package.nix
+++ b/pkgs/by-name/gp/gpsd/package.nix
@@ -97,9 +97,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
@@ -110,6 +107,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 152585734f8cc..3ed9edbfae05f 100644
--- a/pkgs/by-name/gs/gsimplecal/package.nix
+++ b/pkgs/by-name/gs/gsimplecal/package.nix
@@ -20,7 +20,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 d111ded328661..8c45bf33b43b3 100644
--- a/pkgs/by-name/gs/gss/package.nix
+++ b/pkgs/by-name/gs/gss/package.nix
@@ -2,6 +2,8 @@
lib,
stdenv,
fetchurl,
+ autoreconfHook,
+ gtk-doc,
withShishi ? !stdenv.hostPlatform.isDarwin,
shishi,
}:
@@ -21,6 +23,11 @@ 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 3c2121a304a68..f25f70e331d8e 100644
--- a/pkgs/by-name/gt/gt5/package.nix
+++ b/pkgs/by-name/gt/gt5/package.nix
@@ -17,9 +17,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/gt/gtk-engine-murrine/missing-prototypes.diff b/pkgs/by-name/gt/gtk-engine-murrine/missing-prototypes.diff
new file mode 100644
index 0000000000000..4fb936bcc0b32
--- /dev/null
+++ b/pkgs/by-name/gt/gtk-engine-murrine/missing-prototypes.diff
@@ -0,0 +1,33 @@
+diff --git a/src/murrine_rc_style.h b/src/murrine_rc_style.h
+index 8e3d7a8..2823e7a 100644
+--- a/src/murrine_rc_style.h
++++ b/src/murrine_rc_style.h
+@@ -154,5 +154,6 @@ struct _MurrineRcStyleClass
+ };
+
+ GType murrine_rc_style_get_type (void);
++void murrine_rc_style_register_types (GTypeModule *module);
+
+ #endif /* MURRINE_RC_STYLE_H */
+diff --git a/src/murrine_style.h b/src/murrine_style.h
+index 33ae51c..1646e6d 100644
+--- a/src/murrine_style.h
++++ b/src/murrine_style.h
+@@ -102,5 +102,6 @@ struct _MurrineStyleClass
+ };
+
+ GType murrine_style_get_type (void);
++void murrine_style_register_types (GTypeModule *module);
+
+ #endif /* MURRINE_STYLE_H */
+diff --git a/src/support.h b/src/support.h
+index e141067..4bf824e 100644
+--- a/src/support.h
++++ b/src/support.h
+@@ -149,4 +149,6 @@ G_GNUC_INTERNAL void murrine_get_notebook_tab_position (GtkWidget *widget,
+ gboolean *start,
+ gboolean *end);
+
++gboolean murrine_widget_is_ltr (GtkWidget *widget);
++gboolean murrine_object_is_a (const GObject * object, const gchar * type_name);
+ #endif /* SUPPORT_H */
diff --git a/pkgs/by-name/gt/gtk-engine-murrine/package.nix b/pkgs/by-name/gt/gtk-engine-murrine/package.nix
index 9c83bc4f47c88..f9f720b2ed409 100644
--- a/pkgs/by-name/gt/gtk-engine-murrine/package.nix
+++ b/pkgs/by-name/gt/gtk-engine-murrine/package.nix
@@ -9,6 +9,11 @@ stdenv.mkDerivation rec {
sha256 = "129cs5bqw23i76h3nmc29c9mqkm9460iwc8vkl7hs4xr07h8mip9";
};
+ patches = [
+ # add prototypes to fix gcc-14 implicit-function-declaration errors
+ ./missing-prototypes.diff
+ ];
+
strictDeps = true;
nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ gtk2 ];
diff --git a/pkgs/by-name/hd/hdf4/darwin-aarch64.patch b/pkgs/by-name/hd/hdf4/darwin-aarch64.patch
deleted file mode 100644
index cff81e5811768..0000000000000
--- a/pkgs/by-name/hd/hdf4/darwin-aarch64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/hdf/src/hdfi.h 2021-06-16 16:31:31.000000000 +1200
-+++ b/hdf/src/hdfi.h 2021-06-16 16:42:26.000000000 +1200
-@@ -1343,7 +1343,7 @@
- #endif /* IA64 */
-
- /* Linux AArch64 */
--#if defined __aarch64__
-+#if defined __aarch64__ && !defined __APPLE__
-
- #ifdef GOT_MACHINE
- If you get an error on this line more than one machine type has been defined.
diff --git a/pkgs/by-name/hd/hdf4/package.nix b/pkgs/by-name/hd/hdf4/package.nix
index 36aeb22dd2f7d..a61bcc3a0ea77 100644
--- a/pkgs/by-name/hd/hdf4/package.nix
+++ b/pkgs/by-name/hd/hdf4/package.nix
@@ -20,38 +20,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "hdf";
- version = "4.2.15";
+ version = "4.2.16-2";
src = fetchurl {
url = "https://support.hdfgroup.org/ftp/HDF/releases/HDF${finalAttrs.version}/src/hdf-${finalAttrs.version}.tar.bz2";
- hash = "sha256-veA171oc1f29Cn8fpcF+mLvVmTABiaxNI08W6bt7yxI=";
+ hash = "sha256-xcMjS1ASJYrvLkQy9kmzHCGyYBWvuhhXrYNkDD8raSw=";
};
- patches = [
- # Note that the PPC, SPARC and s390 patches are only needed so the aarch64 patch applies cleanly
- (fetchpatch {
- url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-ppc.patch";
- hash = "sha256-AEsj88VzWtyZRk2nFWV/hLD/A2oPje38T/7jvfV1azU=";
- })
- (fetchpatch {
- url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-4.2.4-sparc.patch";
- hash = "sha256-EKuUQ1m+/HWTFYmkTormtQATDj0rHlQpI4CoK1m+5EY=";
- })
- (fetchpatch {
- url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-s390.patch";
- hash = "sha256-Ix6Ft+enNHADXFeRTDNijqU9XWmSEz/y8CnQoEleOCo=";
- })
- (fetchpatch {
- url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-arm.patch";
- hash = "sha256-gytMtvpvR1nzV1NncrYc0yz1ZlBku1AT6sPdubcK85Q=";
- })
- (fetchpatch {
- url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-aarch64.patch";
- hash = "sha256-eu+M3UbgI2plJNblAT8hO1xBXbfco6jX8iZMGjXbWoQ=";
- })
- ./darwin-aarch64.patch
- ];
-
nativeBuildInputs =
[
cmake
diff --git a/pkgs/by-name/ho/hol/package.nix b/pkgs/by-name/ho/hol/package.nix
index 8e482bfb3fb03..aa3b75810fec4 100644
--- a/pkgs/by-name/ho/hol/package.nix
+++ b/pkgs/by-name/ho/hol/package.nix
@@ -65,7 +65,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 2eefae34d4fcd..10b24a35a2e68 100644
--- a/pkgs/by-name/hw/hwdata/package.nix
+++ b/pkgs/by-name/hw/hwdata/package.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "hwdata";
- version = "0.388";
+ version = "0.390";
src = fetchFromGitHub {
owner = "vcrhonek";
repo = "hwdata";
rev = "v${version}";
- hash = "sha256-MTXRvqhzNI4afOWLWY6bvv84Q/MXVTsn0w9awRIDAEU=";
+ hash = "sha256-DexmtBKe1rrmvHMVk8P20hBLfdP1x6CWx/F1s4lDnK4=";
};
configureFlags = [ "--datadir=${placeholder "out"}/share" ];
diff --git a/pkgs/by-name/hy/hylafaxplus/config.site b/pkgs/by-name/hy/hylafaxplus/config.site
index 7c8014449216b..aa66fad916b7c 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 cab83cf408b06..c99f8977d8672 100644
--- a/pkgs/by-name/hy/hylafaxplus/package.nix
+++ b/pkgs/by-name/hy/hylafaxplus/package.nix
@@ -4,7 +4,7 @@
fakeroot,
fetchurl,
libfaketime,
- substituteAll,
+ replaceVars,
## runtime dependencies
coreutils,
file,
@@ -36,18 +36,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 [
@@ -64,9 +60,7 @@ let
];
};
- 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/hyper/package.nix b/pkgs/by-name/hy/hyper/package.nix
index 4f2fc478b1e63..057be9951efcb 100644
--- a/pkgs/by-name/hy/hyper/package.nix
+++ b/pkgs/by-name/hy/hyper/package.nix
@@ -36,7 +36,7 @@
libxshmfence,
libdrm,
libxkbcommon,
- mesa,
+ libgbm,
nixosTests,
}:
@@ -76,7 +76,7 @@ let
libxshmfence
libdrm
libxkbcommon
- mesa
+ libgbm
];
in
diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix
index a93704dc9a3e9..c6804fe854958 100644
--- a/pkgs/by-name/hy/hyprland/package.nix
+++ b/pkgs/by-name/hy/hyprland/package.nix
@@ -24,7 +24,7 @@
libinput,
libuuid,
libxkbcommon,
- mesa,
+ libgbm,
pango,
pciutils,
pkgconf,
@@ -152,7 +152,7 @@ customStdenv.mkDerivation (finalAttrs: {
libinput
libuuid
libxkbcommon
- mesa
+ libgbm
pango
pciutils
re2
diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix
index 40ed5f0bea22f..f48c8c85deaee 100644
--- a/pkgs/by-name/hy/hyprlock/package.nix
+++ b/pkgs/by-name/hy/hyprlock/package.nix
@@ -21,7 +21,7 @@
libwebp,
pango,
libdrm,
- mesa,
+ libgbm,
nix-update-script,
}:
@@ -55,7 +55,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: {
libjpeg
libwebp
libxkbcommon
- mesa
+ libgbm
pam
pango
sdbus-cpp_2
diff --git a/pkgs/by-name/hy/hyx/package.nix b/pkgs/by-name/hy/hyx/package.nix
index 0b8f48dc06433..d7f671047d9c7 100644
--- a/pkgs/by-name/hy/hyx/package.nix
+++ b/pkgs/by-name/hy/hyx/package.nix
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchurl,
- memstreamHook,
}:
stdenv.mkDerivation rec {
@@ -19,8 +18,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/im/immersed/linux.nix b/pkgs/by-name/im/immersed/linux.nix
index 0447090c8231e..13b8a1fc4152c 100644
--- a/pkgs/by-name/im/immersed/linux.nix
+++ b/pkgs/by-name/im/immersed/linux.nix
@@ -28,7 +28,7 @@ appimageTools.wrapAppImage rec {
libgpg-error
fontconfig
libGL
- mesa
+ libgbm
wayland
pipewire
fribidi
diff --git a/pkgs/by-name/io/io/package.nix b/pkgs/by-name/io/io/package.nix
index 11d07c6a13a17..0406269dbdae9 100644
--- a/pkgs/by-name/io/io/package.nix
+++ b/pkgs/by-name/io/io/package.nix
@@ -91,7 +91,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 1f33a1a545389..d1b963a26035d 100644
--- a/pkgs/by-name/ip/iproute2/package.nix
+++ b/pkgs/by-name/ip/iproute2/package.nix
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchurl,
- fetchpatch,
buildPackages,
bison,
flex,
@@ -18,11 +17,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 = [
@@ -31,21 +30,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 39f293b06116d..4cc0f3340ba85 100644
--- a/pkgs/by-name/iw/iwd/package.nix
+++ b/pkgs/by-name/iw/iwd/package.nix
@@ -15,12 +15,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 = [
diff --git a/pkgs/by-name/ja/jay/package.nix b/pkgs/by-name/ja/jay/package.nix
index 0efe97f5c6882..bba163a48873d 100644
--- a/pkgs/by-name/ja/jay/package.nix
+++ b/pkgs/by-name/ja/jay/package.nix
@@ -4,7 +4,7 @@
, libGL
, libinput
, libxkbcommon
-, mesa
+, libgbm
, pango
, udev
, shaderc
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
libGL
libxkbcommon
- mesa
+ libgbm
pango
udev
libinput
diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix
index 92551ba9df556..a8fc62c337804 100644
--- a/pkgs/by-name/je/jellyfin-web/package.nix
+++ b/pkgs/by-name/je/jellyfin-web/package.nix
@@ -3,6 +3,7 @@
stdenv,
fetchFromGitHub,
buildNpmPackage,
+ nodejs_20,
nix-update-script,
pkg-config,
xcbuild,
@@ -25,6 +26,8 @@ buildNpmPackage rec {
hash = "sha256-xmy2cr6MJSen6Pok3Wde4mBcu5pM4qtGEBfqMpGdAxY=";
};
+ nodejs = nodejs_20; # does not build with 22
+
postPatch = ''
substituteInPlace webpack.common.js \
--replace-fail "git describe --always --dirty" "echo ${src.rev}" \
diff --git a/pkgs/by-name/jo/jogl/package.nix b/pkgs/by-name/jo/jogl/package.nix
index 2c6a3e8b9a56d..ed4968e783537 100644
--- a/pkgs/by-name/jo/jogl/package.nix
+++ b/pkgs/by-name/jo/jogl/package.nix
@@ -10,7 +10,7 @@
xcbuild,
udev,
xorg,
- mesa,
+ libgbm,
darwin,
coreutils,
}:
@@ -88,7 +88,7 @@ stdenv.mkDerivation {
xorg.libXt
xorg.libXxf86vm
xorg.libXrender
- mesa
+ libgbm
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk_11_0.frameworks.AppKit
diff --git a/pkgs/by-name/js/json_c/package.nix b/pkgs/by-name/js/json_c/package.nix
index 099231be50177..b224da20070fd 100644
--- a/pkgs/by-name/js/json_c/package.nix
+++ b/pkgs/by-name/js/json_c/package.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "json-c";
- version = "0.17";
+ version = "0.18";
src = fetchFromGitHub {
owner = "json-c";
repo = "json-c";
- rev = "json-c-0.17-20230812";
- hash = "sha256-R5KIJ0xVgGqffjzJaZvvvhAneJ+ZBuanyF6KYTTxb58=";
+ rev = "json-c-0.18-20240915";
+ hash = "sha256-UyMXr8Vc6kDOx1/lD2YKPiHdaTotXAF9ak0yQuwrSUA=";
};
outputs = [
diff --git a/pkgs/by-name/ju/jumpnbump/package.nix b/pkgs/by-name/ju/jumpnbump/package.nix
index 9272fe41c5e8f..f16770f3f1c36 100644
--- a/pkgs/by-name/ju/jumpnbump/package.nix
+++ b/pkgs/by-name/ju/jumpnbump/package.nix
@@ -50,7 +50,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; [
diff --git a/pkgs/by-name/ju/justbuild/package.nix b/pkgs/by-name/ju/justbuild/package.nix
index 1882757865014..d1541a9615147 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/ke/keeweb/package.nix b/pkgs/by-name/ke/keeweb/package.nix
index 2a16f765c6efb..5cea9880f8345 100644
--- a/pkgs/by-name/ke/keeweb/package.nix
+++ b/pkgs/by-name/ke/keeweb/package.nix
@@ -13,7 +13,7 @@
nss,
udev,
gnome-keyring,
- mesa,
+ libgbm,
gtk3,
libusb1,
libsecret,
@@ -63,7 +63,7 @@ let
libXtst
libxshmfence
gnome-keyring
- mesa
+ libgbm
gtk3
libusb1
libsecret
diff --git a/pkgs/by-name/km/kmscon/package.nix b/pkgs/by-name/km/kmscon/package.nix
index 9ccbc3e60167d..c4b696cd255de 100644
--- a/pkgs/by-name/km/kmscon/package.nix
+++ b/pkgs/by-name/km/kmscon/package.nix
@@ -15,7 +15,7 @@
pkg-config,
docbook_xsl,
libxslt,
- mesa,
+ libgbm,
ninja,
buildPackages,
}:
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
pango
pixman
systemd
- mesa
+ libgbm
];
nativeBuildInputs = [
diff --git a/pkgs/by-name/km/kmscube/package.nix b/pkgs/by-name/km/kmscube/package.nix
index f9810eba24d06..a6c42798a00e8 100644
--- a/pkgs/by-name/km/kmscube/package.nix
+++ b/pkgs/by-name/km/kmscube/package.nix
@@ -7,7 +7,7 @@
libdrm,
libX11,
libGL,
- mesa,
+ libgbm,
pkg-config,
gst_all_1,
}:
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
libdrm
libX11
libGL
- mesa
+ libgbm
]
++ (with gst_all_1; [
gstreamer
diff --git a/pkgs/by-name/ko/kore/package.nix b/pkgs/by-name/ko/kore/package.nix
index b37378c3a758a..0ddc05e32e97a 100644
--- a/pkgs/by-name/ko/kore/package.nix
+++ b/pkgs/by-name/ko/kore/package.nix
@@ -4,12 +4,13 @@
fetchFromGitHub,
openssl,
curl,
- postgresql,
+ postgresql_16,
yajl,
}:
stdenv.mkDerivation rec {
pname = "kore";
+ # TODO: Check on next update whether postgresql 17 is supported.
version = "4.2.3";
src = fetchFromGitHub {
@@ -22,7 +23,7 @@ stdenv.mkDerivation rec {
buildInputs = [
openssl
curl
- postgresql
+ postgresql_16
yajl
];
diff --git a/pkgs/by-name/ko/koules/package.nix b/pkgs/by-name/ko/koules/package.nix
index e30bff957af18..350772dbf7c6c 100644
--- a/pkgs/by-name/ko/koules/package.nix
+++ b/pkgs/by-name/ko/koules/package.nix
@@ -46,13 +46,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/kr/krun/package.nix b/pkgs/by-name/kr/krun/package.nix
index 43b0fd0ce29e3..d7f6462e8810b 100644
--- a/pkgs/by-name/kr/krun/package.nix
+++ b/pkgs/by-name/kr/krun/package.nix
@@ -9,7 +9,6 @@
passt,
sommelier,
mesa,
- opengl-driver ? mesa.drivers,
withSommelier ? false,
}:
@@ -56,7 +55,7 @@ rustPlatform.buildRustPackage rec {
postFixup = ''
wrapProgram $out/bin/krun $wrapArgs \
- --set-default OPENGL_DRIVER ${opengl-driver}
+ --set-default OPENGL_DRIVER ${mesa.driverLink}
'';
meta = {
diff --git a/pkgs/by-name/lc/lcevcdec/package.nix b/pkgs/by-name/lc/lcevcdec/package.nix
index 20526efebc91e..240649377a437 100644
--- a/pkgs/by-name/lc/lcevcdec/package.nix
+++ b/pkgs/by-name/lc/lcevcdec/package.nix
@@ -2,6 +2,7 @@
cmake,
copyPkgconfigItems,
fetchFromGitHub,
+ fetchpatch,
fmt,
git,
gitUpdater,
@@ -33,6 +34,14 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-Nf0YntB1A3AH0MTXlfUHhxYbzZqeB0EH9Fe9Xrqdsts=";
};
+ patches = [
+ # fix for build with GCC 14
+ (fetchpatch {
+ url = "https://github.com/v-novaltd/LCEVCdec/commit/43ef5a17ec1ced77f834136945b3cbfe2e46b9b4.patch";
+ hash = "sha256-8OgPh6v+nmRIUB6flR93qOjvaL8fUJdqIe48ZA+8Pr0=";
+ })
+ ];
+
postPatch = ''
substituteInPlace cmake/tools/version_files.py \
--replace-fail "args.git_version" '"${finalAttrs.version}"' \
diff --git a/pkgs/by-name/ld/ld64/meson.build b/pkgs/by-name/ld/ld64/meson.build
index 84468e6f99381..c9068b75d026a 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 ce63bfad5e0dd..074e92daa725b 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/libaom/package.nix b/pkgs/by-name/li/libaom/package.nix
index 82650185cd818..1c1a321f2506c 100644
--- a/pkgs/by-name/li/libaom/package.nix
+++ b/pkgs/by-name/li/libaom/package.nix
@@ -23,11 +23,11 @@ let
in
stdenv.mkDerivation rec {
pname = "libaom";
- version = "3.10.0";
+ version = "3.11.0";
src = fetchzip {
url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz";
- hash = "sha256-7xtIT8zalh1XJfVKWeC/+jAkhOuFHw6Q0+c2YMtDark=";
+ hash = "sha256-SqXDeIApj7XEK2cChenN9pun5eNm4Q+Smpp76xHwMMU=";
stripRoot = false;
};
diff --git a/pkgs/by-name/li/libbladeRF/gcc-14-calloc-fixes.diff b/pkgs/by-name/li/libbladeRF/gcc-14-calloc-fixes.diff
new file mode 100644
index 0000000000000..ae11b26073b68
--- /dev/null
+++ b/pkgs/by-name/li/libbladeRF/gcc-14-calloc-fixes.diff
@@ -0,0 +1,26 @@
+diff --git a/host/utilities/bladeRF-fsk/c/src/fir_filter.c b/host/utilities/bladeRF-fsk/c/src/fir_filter.c
+index 59f34f0..7def697 100644
+--- a/host/utilities/bladeRF-fsk/c/src/fir_filter.c
++++ b/host/utilities/bladeRF-fsk/c/src/fir_filter.c
+@@ -213,18 +213,18 @@ int main(int argc, char *argv[])
+ return EXIT_FAILURE;
+ }
+
+- inbuf = calloc(2*sizeof(int16_t), chunk_size);
++ inbuf = calloc(chunk_size, 2*sizeof(int16_t));
+ if (!inbuf) {
+ perror("calloc");
+ goto out;
+ }
+- tempbuf = calloc(2*sizeof(int16_t), chunk_size);
++ tempbuf = calloc(chunk_size, 2*sizeof(int16_t));
+ if (!tempbuf) {
+ perror("calloc");
+ goto out;
+ }
+
+- outbuf = calloc(sizeof(struct complex_sample), chunk_size);
++ outbuf = calloc(chunk_size, sizeof(struct complex_sample));
+ if (!outbuf) {
+ perror("calloc");
+ goto out;
diff --git a/pkgs/by-name/li/libbladeRF/package.nix b/pkgs/by-name/li/libbladeRF/package.nix
index d615b116bb630..ccf75f7e7aab1 100644
--- a/pkgs/by-name/li/libbladeRF/package.nix
+++ b/pkgs/by-name/li/libbladeRF/package.nix
@@ -25,6 +25,11 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
+ patches = [
+ # https://github.com/Nuand/bladeRF/issues/994
+ ./gcc-14-calloc-fixes.diff
+ ];
+
nativeBuildInputs = [
cmake
pkg-config
diff --git a/pkgs/by-name/li/libcmis/package.nix b/pkgs/by-name/li/libcmis/package.nix
index f125d1f9bb00b..6eb64381b9790 100644
--- a/pkgs/by-name/li/libcmis/package.nix
+++ b/pkgs/by-name/li/libcmis/package.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
+ fetchpatch,
boost,
libxml2,
pkg-config,
@@ -22,6 +23,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-HXiyQKjOlQXWABY10XrOiYxPqfpmUJC3a6xD98LIHDw=";
};
+ patches = [
+ # Backport to fix build with boost 1.86
+ (fetchpatch {
+ url = "https://github.com/tdf/libcmis/commit/3659d32999ff7593662dcf5136bcb7ac15c13f61.patch";
+ hash = "sha256-EXmQcXCHaVnF/dwU3Z4WLtaiHjYHeeonlKdyK27UkiY=";
+ })
+ ];
+
nativeBuildInputs = [
autoreconfHook
pkg-config
diff --git a/pkgs/by-name/li/libetonyek/package.nix b/pkgs/by-name/li/libetonyek/package.nix
index dbe708ca7f91b..d366e19e304f8 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 abf3b7d16979e..d40ebb5567c7f 100644
--- a/pkgs/by-name/li/libieee1284/package.nix
+++ b/pkgs/by-name/li/libieee1284/package.nix
@@ -25,7 +25,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 1931916121c4a..e9860f5867f2c 100644
--- a/pkgs/by-name/li/libjxl/package.nix
+++ b/pkgs/by-name/li/libjxl/package.nix
@@ -30,7 +30,7 @@ in
stdenv.mkDerivation rec {
pname = "libjxl";
- version = "0.11.0";
+ version = "0.11.1";
outputs = [
"out"
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
owner = "libjxl";
repo = "libjxl";
rev = "v${version}";
- hash = "sha256-lBc0zP+f44YadwOU9+I+YYWzTrAg7FSfF3IQuh4LjM4=";
+ hash = "sha256-ORwhKOp5Nog366UkLbuWpjz/6sJhxUO6+SkoJGH+3fE=";
# There are various submodules in `third_party/`.
fetchSubmodules = true;
};
@@ -111,6 +111,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"
@@ -131,6 +134,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 cebc9e20f5218..68299e702347d 100644
--- a/pkgs/by-name/li/liblangtag/package.nix
+++ b/pkgs/by-name/li/liblangtag/package.nix
@@ -4,6 +4,7 @@
fetchurl,
fetchpatch,
autoreconfHook,
+ autoconf-archive,
gtk-doc,
gettext,
pkg-config,
@@ -16,39 +17,25 @@
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
@@ -68,6 +55,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [
autoreconfHook
+ autoconf-archive
gtk-doc
gettext
pkg-config
diff --git a/pkgs/by-name/li/liblogging/package.nix b/pkgs/by-name/li/liblogging/package.nix
index 40f9d0a76d7fe..8ca62ab2e5d24 100644
--- a/pkgs/by-name/li/liblogging/package.nix
+++ b/pkgs/by-name/li/liblogging/package.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
"--enable-man-pages"
];
+ env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int -Wno-error=implicit-function-declaration";
+
meta = with lib; {
homepage = "http://www.liblogging.org/";
description = "Lightweight signal-safe logging library";
diff --git a/pkgs/by-name/li/libmysofa/package.nix b/pkgs/by-name/li/libmysofa/package.nix
index 8b65025909421..67961dc1cf6c4 100644
--- a/pkgs/by-name/li/libmysofa/package.nix
+++ b/pkgs/by-name/li/libmysofa/package.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "libmysofa";
- version = "1.3.2";
+ version = "1.3.3";
src = fetchFromGitHub {
owner = "hoene";
repo = "libmysofa";
rev = "v${version}";
- hash = "sha256-eXMGwa6lOtKoUCcHR9BM2S3NWAZkGyZzF3FAjYaWTvg=";
+ hash = "sha256-jvib1hGPJEY2w/KjlD7iTtRy1s8LFG+Qhb2d6xdpUyc=";
};
outputs = [
diff --git a/pkgs/by-name/li/libmysqlconnectorcpp/package.nix b/pkgs/by-name/li/libmysqlconnectorcpp/package.nix
index 833fb849f9423..a6b34dcccd10a 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 82428ee03f822..2a845fa2a0098 100644
--- a/pkgs/by-name/li/libnats-c/package.nix
+++ b/pkgs/by-name/li/libnats-c/package.nix
@@ -11,13 +11,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/librist/darwin.patch b/pkgs/by-name/li/librist/darwin.patch
deleted file mode 100644
index 6a5cc8459a367..0000000000000
--- a/pkgs/by-name/li/librist/darwin.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/tools/srp_shared.c b/tools/srp_shared.c
-index f782126..23e82a5 100644
---- a/tools/srp_shared.c
-+++ b/tools/srp_shared.c
-@@ -173,7 +173,11 @@ void user_verifier_lookup(char * username,
- if (stat(srpfile, &buf) != 0)
- return;
-
-+#if defined(__APPLE__)
-+ *generation = ((uint64_t)buf.st_mtimespec.tv_sec << 32) | buf.st_mtimespec.tv_nsec;
-+#else
- *generation = ((uint64_t)buf.st_mtim.tv_sec << 32) | buf.st_mtim.tv_nsec;
-+#endif
- #endif
-
- if (!lookup_data || !hashversion)
diff --git a/pkgs/by-name/li/librist/musl.patch b/pkgs/by-name/li/librist/musl.patch
deleted file mode 100644
index 95f432549777c..0000000000000
--- a/pkgs/by-name/li/librist/musl.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/test/rist/unit/srp_examples.c b/test/rist/unit/srp_examples.c
-index 1c5193d..6f835b5 100644
---- a/test/rist/unit/srp_examples.c
-+++ b/test/rist/unit/srp_examples.c
-@@ -16,6 +16,11 @@
- #define DEBUG_USE_EXAMPLE_CONSTANTS 1
-
- #if HAVE_MBEDTLS
-+// musl's sched.h includes a prototype for calloc, so we need to make
-+// sure it's already been included before we redefine it to something
-+// that won't expand to a valid prototype.
-+#include
-+
- #define malloc(size) _test_malloc(size, __FILE__, __LINE__)
- #define calloc(num, size) _test_calloc(num, size, __FILE__, __LINE__)
- #define free(obj) _test_free(obj, __FILE__, __LINE__)
diff --git a/pkgs/by-name/li/librist/no-brew-darwin.diff b/pkgs/by-name/li/librist/no-brew-darwin.diff
new file mode 100644
index 0000000000000..dce4a5c4c6289
--- /dev/null
+++ b/pkgs/by-name/li/librist/no-brew-darwin.diff
@@ -0,0 +1,14 @@
+diff --git a/meson.build b/meson.build
+index 05d00b3..b923958 100755
+--- a/meson.build
++++ b/meson.build
+@@ -39,7 +39,8 @@ deps = []
+ platform_files = []
+ inc = []
+ inc += include_directories('.', 'src', 'include/librist', 'include', 'contrib')
+-if (host_machine.system() == 'darwin')
++if (host_machine.system() == 'darwin'
++ and find_program('brew', required : false).found())
+ r = run_command('brew', '--prefix', check: true)
+ brewoutput = r.stdout().strip()
+ inc += include_directories(brewoutput + '/include')
diff --git a/pkgs/by-name/li/librist/package.nix b/pkgs/by-name/li/librist/package.nix
index 9de790f636b4a..8e19eb0615552 100644
--- a/pkgs/by-name/li/librist/package.nix
+++ b/pkgs/by-name/li/librist/package.nix
@@ -12,21 +12,20 @@
stdenv.mkDerivation rec {
pname = "librist";
- version = "0.2.10";
+ version = "0.2.11";
src = fetchFromGitLab {
domain = "code.videolan.org";
owner = "rist";
repo = "librist";
rev = "v${version}";
- hash = "sha256-8N4wQXxjNZuNGx/c7WVAV5QS48Bff5G3t11UkihT+K0=";
+ hash = "sha256-xWqyQl3peB/ENReMcDHzIdKXXCYOJYbhhG8tcSh36dY=";
};
- patches = [
- # https://github.com/NixOS/nixpkgs/pull/257020
- ./darwin.patch
- # https://code.videolan.org/rist/librist/-/merge_requests/257
- ./musl.patch
+ # avoid rebuild on Linux for now
+ patches = lib.optionals stdenv.isDarwin [
+ # https://code.videolan.org/rist/librist/-/issues/192
+ ./no-brew-darwin.diff
];
nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libselinux/package.nix b/pkgs/by-name/li/libselinux/package.nix
index 57f875fcd8558..4d5cbbb11e32a 100644
--- a/pkgs/by-name/li/libselinux/package.nix
+++ b/pkgs/by-name/li/libselinux/package.nix
@@ -2,14 +2,15 @@
lib,
stdenv,
fetchurl,
+ fetchpatch,
buildPackages,
pcre2,
pkg-config,
libsepol,
- enablePython ? !stdenv.hostPlatform.isStatic,
+ enablePython ? false,
swig ? null,
python3 ? null,
- python3Packages,
+ python3Packages ? null,
fts,
}:
@@ -45,7 +46,7 @@ stdenv.mkDerivation (
# normalizing the patch.
(fetchurl {
url = "https://lore.kernel.org/selinux/20211113141616.361640-1-hi@alyssa.is/raw";
- sha256 = "16a2s2ji9049892i15yyqgp4r20hi1hij4c1s4s8law9jsx65b3n";
+ hash = "sha256-dqxiupaJK4o00YERGWGIEIhM7sPelxBFQomAFKXQQpk=";
postFetch = ''
mv "$out" $TMPDIR/patch
${buildPackages.patchutils_0_3_3}/bin/filterdiff \
@@ -55,7 +56,14 @@ stdenv.mkDerivation (
(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=";
+ hash = "sha256-RiEUibLVzfiRU6N/J187Cs1iPAih87gCZrlyRVI2abU=";
+ })
+
+ # libselinux: fix swig bindings for 4.3.0
+ (fetchpatch {
+ url = "https://github.com/SELinuxProject/selinux/commit/8e0e718bae53fff30831b92cd784151d475a20da.patch";
+ stripLen = 1;
+ hash = "sha256-8Nd6ketQ7/r5W0sRdheqyGWHJRZ1RfGC4ehTqnHau04=";
})
];
diff --git a/pkgs/by-name/li/libsystemtap/package.nix b/pkgs/by-name/li/libsystemtap/package.nix
index 9c798b956f7a7..5b6b66cc05122 100644
--- a/pkgs/by-name/li/libsystemtap/package.nix
+++ b/pkgs/by-name/li/libsystemtap/package.nix
@@ -9,12 +9,12 @@
stdenv.mkDerivation {
pname = "libsystemtap";
- version = "5.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 caf70fbe09671..32476de5d6e7e 100644
--- a/pkgs/by-name/li/libtirpc/package.nix
+++ b/pkgs/by-name/li/libtirpc/package.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "libtirpc";
- version = "1.3.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 7f8d15a798429..4deb7b7e261e0 100644
--- a/pkgs/by-name/li/libtpms/package.nix
+++ b/pkgs/by-name/li/libtpms/package.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "libtpms";
- version = "0.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 c38a649c8b8a7..944ea60409c75 100644
--- a/pkgs/by-name/li/libvisual/package.nix
+++ b/pkgs/by-name/li/libvisual/package.nix
@@ -1,52 +1,37 @@
{
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
+ autoconf-archive
pkg-config
];
buildInputs = [
@@ -56,7 +41,7 @@ stdenv.mkDerivation rec {
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) [
diff --git a/pkgs/by-name/li/libwacom/package.nix b/pkgs/by-name/li/libwacom/package.nix
index 50d2451e94299..a07feef39bb72 100644
--- a/pkgs/by-name/li/libwacom/package.nix
+++ b/pkgs/by-name/li/libwacom/package.nix
@@ -15,7 +15,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libwacom";
- version = "2.13.0";
+ version = "2.14.0";
outputs = [
"out"
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "linuxwacom";
repo = "libwacom";
rev = "libwacom-${finalAttrs.version}";
- hash = "sha256-OJQe0GdndgpvW4aJdgSKWw+u3ng1pn3FgdcA81jfmkQ=";
+ hash = "sha256-tJwLcHXXg4tFk7qKQyt+6dcDo8Qykqjn13MfXMoGvKc=";
};
postPatch = ''
diff --git a/pkgs/by-name/li/libwebsockets/package.nix b/pkgs/by-name/li/libwebsockets/package.nix
index 39b4335552f95..dfad04d7f4d18 100644
--- a/pkgs/by-name/li/libwebsockets/package.nix
+++ b/pkgs/by-name/li/libwebsockets/package.nix
@@ -6,7 +6,6 @@
openssl,
zlib,
libuv,
- removeReferencesTo,
# External poll is required for e.g. mosquitto, but discouraged by the maintainer.
withExternalPoll ? false,
}:
@@ -33,10 +32,7 @@ stdenv.mkDerivation rec {
libuv
];
- nativeBuildInputs = [
- cmake
- removeReferencesTo
- ];
+ nativeBuildInputs = [ cmake ];
cmakeFlags =
[
@@ -59,7 +55,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/li/libzip/package.nix b/pkgs/by-name/li/libzip/package.nix
index d3a6598aa4c34..8a4e56f86065f 100644
--- a/pkgs/by-name/li/libzip/package.nix
+++ b/pkgs/by-name/li/libzip/package.nix
@@ -19,11 +19,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libzip";
- version = "1.11.1";
+ version = "1.11.2";
src = fetchurl {
url = "https://libzip.org/download/libzip-${finalAttrs.version}.tar.gz";
- hash = "sha256-wOb6UqYroR79MCYikNxpcJR67zLgzClO5Q6QBc6sCSo=";
+ hash = "sha256-aypDg3AF4cI/3+5TK3j4BoY+QS0gibnEK0mrCMvNdmU=";
};
outputs = [
diff --git a/pkgs/by-name/li/linux-wallpaperengine/package.nix b/pkgs/by-name/li/linux-wallpaperengine/package.nix
index af38e7a01f8f5..cca2ff0de4547 100644
--- a/pkgs/by-name/li/linux-wallpaperengine/package.nix
+++ b/pkgs/by-name/li/linux-wallpaperengine/package.nix
@@ -41,7 +41,7 @@
libXcomposite,
libXdamage,
libXfixes,
- mesa,
+ libgbm,
gtk3,
pango,
cairo,
@@ -74,7 +74,7 @@ let
libXext
libXfixes
libXrandr
- mesa
+ libgbm
gtk3
pango
cairo
diff --git a/pkgs/by-name/lo/localproxy/package.nix b/pkgs/by-name/lo/localproxy/package.nix
index cd177a48e9516..bd76b84682365 100644
--- a/pkgs/by-name/lo/localproxy/package.nix
+++ b/pkgs/by-name/lo/localproxy/package.nix
@@ -7,11 +7,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: {
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
openssl
protobuf
catch2
- boost
+ boost'
icu
];
diff --git a/pkgs/by-name/lo/louvre/package.nix b/pkgs/by-name/lo/louvre/package.nix
index d859934514dfe..6face65269548 100644
--- a/pkgs/by-name/lo/louvre/package.nix
+++ b/pkgs/by-name/lo/louvre/package.nix
@@ -13,7 +13,7 @@
libX11,
libXcursor,
libxkbcommon,
- mesa,
+ libgbm,
pixman,
seatd,
srm-cuarzo,
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
libX11
libXcursor
libxkbcommon
- mesa
+ libgbm
pixman
seatd
srm-cuarzo
diff --git a/pkgs/by-name/lx/lxdvdrip/package.nix b/pkgs/by-name/lx/lxdvdrip/package.nix
index 696e65fcc33d3..6009139667649 100644
--- a/pkgs/by-name/lx/lxdvdrip/package.nix
+++ b/pkgs/by-name/lx/lxdvdrip/package.nix
@@ -17,9 +17,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/magpie/package.nix b/pkgs/by-name/ma/magpie/package.nix
index 9fcc3ff2bfe9b..b5893def79842 100644
--- a/pkgs/by-name/ma/magpie/package.nix
+++ b/pkgs/by-name/ma/magpie/package.nix
@@ -32,7 +32,7 @@
pipewire,
libgudev,
libwacom,
- mesa,
+ libgbm,
meson,
nix-update-script,
validatePkgConfig,
@@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
desktop-file-utils
gettext
libxcvt
- mesa # needed for gbm
+ libgbm
meson
ninja
xvfb-run
diff --git a/pkgs/by-name/ma/mailspring/linux.nix b/pkgs/by-name/ma/mailspring/linux.nix
index 7924a34ffbeae..372104e954a28 100644
--- a/pkgs/by-name/ma/mailspring/linux.nix
+++ b/pkgs/by-name/ma/mailspring/linux.nix
@@ -19,7 +19,7 @@
openssl,
udev,
xorg,
- mesa,
+ libgbm,
libdrm,
libappindicator,
}:
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
xorg.libXScrnSaver
xorg.libXtst
xorg.libxshmfence
- mesa
+ libgbm
libdrm
];
diff --git a/pkgs/by-name/ma/man-db/package.nix b/pkgs/by-name/ma/man-db/package.nix
index 117d8666a0434..29be3e9e87bf9 100644
--- a/pkgs/by-name/ma/man-db/package.nix
+++ b/pkgs/by-name/ma/man-db/package.nix
@@ -12,6 +12,7 @@
nixosTests,
pkg-config,
stdenv,
+ util-linuxMinimal,
zstd,
}:
@@ -74,6 +75,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"
diff --git a/pkgs/by-name/ma/mangayomi/package.nix b/pkgs/by-name/ma/mangayomi/package.nix
index fd0b8770e3787..d88a2169d943c 100644
--- a/pkgs/by-name/ma/mangayomi/package.nix
+++ b/pkgs/by-name/ma/mangayomi/package.nix
@@ -27,7 +27,7 @@
libpulseaudio,
libcaca,
libdrm,
- mesa,
+ libgbm,
libXScrnSaver,
nv-codec-headers-11,
libXpresent,
@@ -125,7 +125,7 @@ flutter324.buildFlutterApplication {
libpulseaudio
libcaca
libdrm
- mesa
+ libgbm
libXScrnSaver
libXpresent
nv-codec-headers-11
diff --git a/pkgs/by-name/ma/mapserver/package.nix b/pkgs/by-name/ma/mapserver/package.nix
index 43996b4c92d58..41218308567d4 100644
--- a/pkgs/by-name/ma/mapserver/package.nix
+++ b/pkgs/by-name/ma/mapserver/package.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
libjpeg
libpng
librsvg
- (libxml2.override { enableHttp = true; })
+ libxml2
postgresql
proj
protobufc
diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix
index 482861c75067e..c52bbe75e7fc1 100644
--- a/pkgs/by-name/ma/maturin/package.nix
+++ b/pkgs/by-name/ma/maturin/package.nix
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "maturin";
- version = "1.7.4";
+ version = "1.7.8";
src = fetchFromGitHub {
owner = "PyO3";
repo = "maturin";
rev = "v${version}";
- hash = "sha256-Zephf4mB3RI5YIAOIjfqIfgVANefkH63OQoPPMe417E=";
+ hash = "sha256-2uf49Rz6x0+Mb9EKjyAIlfdmfZ3qRVFLUgwW02SDE48=";
};
- cargoHash = "sha256-yLKt/Xml7ig6QG3T5Qn39tW7U5NIN1hSOaLiSRMiy5I=";
+ cargoHash = "sha256-SXomWGP7xCheIW2n1QNavq28EVWOpwh9AsCYPPUMm14=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Security
diff --git a/pkgs/by-name/md/mdbook/package.nix b/pkgs/by-name/md/mdbook/package.nix
index 4734394cd7e79..d6cec841b3a33 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/md/mdk-sdk/package.nix b/pkgs/by-name/md/mdk-sdk/package.nix
index 48a2de8ac6e1f..84ea4d8283cc5 100644
--- a/pkgs/by-name/md/mdk-sdk/package.nix
+++ b/pkgs/by-name/md/mdk-sdk/package.nix
@@ -8,10 +8,10 @@
libX11,
libcxx,
libdrm,
+ libgbm,
libglvnd,
libpulseaudio,
libxcb,
- mesa,
wayland,
xz,
zlib,
@@ -48,10 +48,10 @@ stdenv.mkDerivation rec {
libX11
libcxx
libdrm
+ libgbm
libglvnd
libpulseaudio
libxcb
- mesa
wayland
xz
zlib
diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index e55250c0f5660..deeacbac088d6 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -38,7 +38,7 @@
libXScrnSaver,
libxshmfence,
libXtst,
- mesa,
+ libgbm,
nspr,
nss,
pango,
@@ -142,7 +142,7 @@ let
libXScrnSaver
libxshmfence
libXtst
- mesa
+ libgbm
nspr
nss
opusWithCustomModes
diff --git a/pkgs/by-name/mi/microsoft-gsl/package.nix b/pkgs/by-name/mi/microsoft-gsl/package.nix
index 1805605685117..1ababa6047a5f 100644
--- a/pkgs/by-name/mi/microsoft-gsl/package.nix
+++ b/pkgs/by-name/mi/microsoft-gsl/package.nix
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
];
buildInputs = [ gtest ];
- # error: unsafe buffer access
- env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unsafe-buffer-usage";
+ # negate the `-Werror` flag as Microsoft doesn't build with clang
+ env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error";
patches = [
# nvcc doesn't recognize the "gsl" attribute namespace (microsoft/onnxruntime#13573)
diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix
index bbe9444f04895..f68fee14eda39 100644
--- a/pkgs/by-name/mi/miracle-wm/package.nix
+++ b/pkgs/by-name/mi/miracle-wm/package.nix
@@ -16,7 +16,7 @@
libnotify,
libuuid,
libxkbcommon,
- mesa,
+ libgbm,
mir,
nlohmann_json,
pcre2,
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
libnotify
libuuid
libxkbcommon
- mesa # gbm.h
+ libgbm
mir
nlohmann_json
pcre2
diff --git a/pkgs/by-name/mi/mission-center/package.nix b/pkgs/by-name/mi/mission-center/package.nix
index 9d6594b2c0f59..4949b4ea5e382 100644
--- a/pkgs/by-name/mi/mission-center/package.nix
+++ b/pkgs/by-name/mi/mission-center/package.nix
@@ -31,7 +31,7 @@
libGL,
libadwaita,
libdrm,
- mesa,
+ libgbm,
pango,
sqlite,
udev,
@@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
libGL
libadwaita
libdrm
- mesa
+ libgbm
pango
sqlite
udev
diff --git a/pkgs/by-name/mj/mjpegtools/package.nix b/pkgs/by-name/mj/mjpegtools/package.nix
index f29e3691ff3ef..741a06ee88d55 100644
--- a/pkgs/by-name/mj/mjpegtools/package.nix
+++ b/pkgs/by-name/mj/mjpegtools/package.nix
@@ -27,9 +27,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 0000000000000..1d1ff88afcae9
--- /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 58349a76b753f..0d46797fc0b14 100644
--- a/pkgs/by-name/mo/molden/package.nix
+++ b/pkgs/by-name/mo/molden/package.nix
@@ -37,7 +37,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/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix
index 3bcd699c4a939..61bbec71d6fdd 100644
--- a/pkgs/by-name/mo/mongodb-compass/package.nix
+++ b/pkgs/by-name/mo/mongodb-compass/package.nix
@@ -23,7 +23,7 @@
libuuid,
libxcb,
libxkbcommon,
- mesa,
+ libgbm,
nspr,
nss,
pango,
@@ -58,7 +58,7 @@ let
libuuid
libxcb
libxkbcommon
- mesa
+ libgbm
nspr
nss
pango
diff --git a/pkgs/by-name/mo/mozc/package.nix b/pkgs/by-name/mo/mozc/package.nix
index a1b0e804f4525..f32de2fd5f625 100644
--- a/pkgs/by-name/mo/mozc/package.nix
+++ b/pkgs/by-name/mo/mozc/package.nix
@@ -4,6 +4,7 @@
fetchFromGitHub,
qt6,
pkg-config,
+ protobuf_27,
bazel,
ibus,
unzip,
@@ -18,7 +19,7 @@ let
in
buildBazelPackage rec {
pname = "mozc";
- version = "2.30.5544.102";
+ version = "2.30.5544.102"; # make sure to update protobuf if needed
src = fetchFromGitHub {
owner = "google";
@@ -63,6 +64,9 @@ buildBazelPackage rec {
bazelTargets = [ "package" ];
postPatch = ''
+ # replace protobuf with our own
+ rm -r src/third_party/protobuf
+ cp -r ${protobuf_27.src} src/third_party/protobuf
substituteInPlace src/config.bzl \
--replace-fail "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open" \
--replace-fail "/usr" "$out"
diff --git a/pkgs/by-name/mp/mpir/package.nix b/pkgs/by-name/mp/mpir/package.nix
index 21f9ebd36a238..86fbbd5d8e91d 100644
--- a/pkgs/by-name/mp/mpir/package.nix
+++ b/pkgs/by-name/mp/mpir/package.nix
@@ -35,6 +35,12 @@ stdenv.mkDerivation rec {
url = "https://github.com/wbhart/mpir/commit/bbc43ca6ae0bec4f64e69c9cd4c967005d6470eb.patch";
hash = "sha256-vW+cDK5Hq2hKEyprOJaNbj0bT2FJmMcyZHPE8GUNUWc=";
})
+ # https://github.com/wbhart/mpir/pull/299
+ (fetchpatch {
+ name = "gcc-14-fixes.patch";
+ url = "https://github.com/wbhart/mpir/commit/4ff3b770cbf86e29b75d12c13e8b854c74bccc5a.patch";
+ hash = "sha256-dCB2+1IYTGzHUQkDUF4gqvR1xoMPEYVPLGE+EP2wLL4=";
+ })
];
configureFlags = [ "--enable-cxx" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-fat" ];
diff --git a/pkgs/by-name/mu/muffin/package.nix b/pkgs/by-name/mu/muffin/package.nix
index ae846fba95de4..44e2f83f78877 100644
--- a/pkgs/by-name/mu/muffin/package.nix
+++ b/pkgs/by-name/mu/muffin/package.nix
@@ -24,7 +24,7 @@
libXdamage,
libxkbcommon,
libXtst,
- mesa,
+ libgbm,
meson,
ninja,
pipewire,
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
desktop-file-utils
- mesa # needed for gbm
+ libgbm
meson
ninja
pkg-config
diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix
index 67fbc6d31e263..b76789d3ceae6 100644
--- a/pkgs/by-name/mu/mullvad-browser/package.nix
+++ b/pkgs/by-name/mu/mullvad-browser/package.nix
@@ -26,7 +26,7 @@
libXrender,
libXt,
libXtst,
- mesa,
+ libgbm,
pango,
pciutils,
zlib,
@@ -78,7 +78,7 @@ let
libXrender
libXt
libXtst
- mesa # for libgbm
+ libgbm
pango
pciutils
stdenv.cc.cc
diff --git a/pkgs/by-name/mu/mullvad-vpn/package.nix b/pkgs/by-name/mu/mullvad-vpn/package.nix
index 93a2a356fc36d..8da2789b3d355 100644
--- a/pkgs/by-name/mu/mullvad-vpn/package.nix
+++ b/pkgs/by-name/mu/mullvad-vpn/package.nix
@@ -17,7 +17,7 @@
nspr,
nss,
gtk3,
- mesa,
+ libgbm,
libGL,
wayland,
xorg,
@@ -48,7 +48,7 @@ let
gtk3
libappindicator
libnotify
- mesa
+ libgbm
xorg.libX11
xorg.libXScrnSaver
xorg.libXcomposite
diff --git a/pkgs/by-name/mu/multipath-tools/package.nix b/pkgs/by-name/mu/multipath-tools/package.nix
index 536e0777898da..ecf7d72693be8 100644
--- a/pkgs/by-name/mu/multipath-tools/package.nix
+++ b/pkgs/by-name/mu/multipath-tools/package.nix
@@ -62,6 +62,7 @@ stdenv.mkDerivation rec {
systemd
util-linuxMinimal # for libmount
];
+ strictDeps = true;
makeFlags = [
"LIB=lib"
@@ -78,7 +79,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/mu/multiviewer-for-f1/package.nix b/pkgs/by-name/mu/multiviewer-for-f1/package.nix
index a7e783972f39f..e77069a76c547 100644
--- a/pkgs/by-name/mu/multiviewer-for-f1/package.nix
+++ b/pkgs/by-name/mu/multiviewer-for-f1/package.nix
@@ -17,7 +17,7 @@
libdrm,
libudev0-shim,
libxkbcommon,
- mesa,
+ libgbm,
nspr,
nss,
pango,
@@ -53,7 +53,7 @@ stdenvNoCC.mkDerivation rec {
gtk3
libdrm
libxkbcommon
- mesa
+ libgbm
nspr
nss
pango
diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix
index 40b03c5a97e08..b0bc9b7bcf050 100644
--- a/pkgs/by-name/mu/mupdf/package.nix
+++ b/pkgs/by-name/mu/mupdf/package.nix
@@ -62,12 +62,12 @@ let
in
stdenv.mkDerivation rec {
- version = "1.24.9";
+ version = "1.24.11";
pname = "mupdf";
src = fetchurl {
url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz";
- hash = "sha256-C0RqoO7MEU6ZadzNcMl4k1j8y2WJqB1HDclBoIdNqYo=";
+ hash = "sha256-GRInuWd19nBe99lVEYdRGTK1GSc7NFNaMxSRz32YFj8=";
};
patches = [
diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix
index 31c1fb5ec6f0d..6ae9107252403 100644
--- a/pkgs/by-name/mu/mutter/package.nix
+++ b/pkgs/by-name/mu/mutter/package.nix
@@ -100,13 +100,13 @@ stdenv.mkDerivation (finalAttrs: {
propagatedBuildInputs = [
# required for pkg-config to detect mutter-mtk
graphene
+ mesa # actually uses eglmesaext
];
nativeBuildInputs = [
desktop-file-utils
gettext
libxcvt
- mesa # needed for gbm
meson
ninja
xvfb-run
diff --git a/pkgs/by-name/mu/mutter43/package.nix b/pkgs/by-name/mu/mutter43/package.nix
index bea00d83f794e..81c526b956c05 100644
--- a/pkgs/by-name/mu/mutter43/package.nix
+++ b/pkgs/by-name/mu/mutter43/package.nix
@@ -105,13 +105,13 @@ stdenv.mkDerivation (finalAttrs: {
libXtst
libcap_ng
graphene
+ mesa # actually uses eglmesaext
];
nativeBuildInputs = [
desktop-file-utils
gettext
libxcvt
- mesa # needed for gbm
meson
ninja
xvfb-run
diff --git a/pkgs/by-name/ne/neatvnc/package.nix b/pkgs/by-name/ne/neatvnc/package.nix
index 343f3a082af14..68f8e2f83d12b 100644
--- a/pkgs/by-name/ne/neatvnc/package.nix
+++ b/pkgs/by-name/ne/neatvnc/package.nix
@@ -8,7 +8,7 @@
, ffmpeg
, gnutls
, libjpeg_turbo
-, mesa
+, libgbm
, pixman
, zlib
}:
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
ffmpeg
gnutls
libjpeg_turbo
- mesa
+ libgbm
pixman
zlib
];
diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix
index 59b3e92fd660d..f1e4db150b0da 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,
@@ -165,7 +164,6 @@ stdenv.mkDerivation (
cmake
gettext
pkg-config
- removeReferencesTo
];
# extra programs test via `make functionaltest`
@@ -191,22 +189,8 @@ stdenv.mkDerivation (
sed -i src/nvim/po/CMakeLists.txt \
-e "s|\$
+Date: Thu, 5 Dec 2024 09:49:40 +0000
+Subject: [PATCH] configure fixes for gcc-14
+
+---
+ Configure | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/Configure b/Configure
+index fbc57a8..e8cea16 100755
+--- a/Configure
++++ b/Configure
+@@ -76,7 +76,7 @@ done
+ CFLAGS="$COPT $CEXTRA"
+
+ echo "Checking for libraries"
+-echo 'main(){}' > test.c
++echo 'int main(void){ return 0; }' > test.c
+ LFLAGS=""
+ for lib in -lcurses -lncurses; do
+ if $CC $CFLAGS $LEXTRA test.c $lib > /dev/null 2>&1; then
+@@ -91,8 +91,9 @@ done
+
+ echo "Checking for on_exit()"
+ cat << END > test.c
++#include
+ void handler(void) {}
+-main() { on_exit(handler, (void *)0); }
++int main(void) { on_exit(handler, (void *)0); return 0; }
+ END
+ if $CC $CFLAGS $LEXTRA test.c > /dev/null 2>&1; then
+ HAS_ON_EXIT=true
+@@ -103,7 +104,7 @@ fi
+ echo "Checking for sigprocmask()"
+ cat << END > test.c
+ #include
+-main() { sigset_t set; sigprocmask(SIG_BLOCK, &set, &set); }
++int main(void) { sigset_t set; sigprocmask(SIG_BLOCK, &set, &set); return 0; }
+ END
+ if $CC $CFLAGS $LEXTRA test.c > /dev/null 2>&1; then
+ HAS_SIGPROCMASK=true
+@@ -114,7 +115,7 @@ fi
+ echo "Checking for getopt.h"
+ cat << END > test.c
+ #include
+-main(){}
++int main(void){ return 0; }
+ END
+
+ if $CC $CFLAGS $LEXTRA test.c > /dev/null 2>&1; then
+@@ -126,7 +127,7 @@ fi
+ echo "Checking for memory.h"
+ cat << END > test.c
+ #include
+-main(){}
++int main(void){ return 0; }
+ END
+
+ if $CC $CFLAGS $LEXTRA test.c > /dev/null 2>&1; then
+--
+2.47.0
+
diff --git a/pkgs/by-name/ne/netris/package.nix b/pkgs/by-name/ne/netris/package.nix
index ab299e8dbedba..3ef68f36551bc 100644
--- a/pkgs/by-name/ne/netris/package.nix
+++ b/pkgs/by-name/ne/netris/package.nix
@@ -16,6 +16,11 @@ stdenv.mkDerivation {
sha256 = "0gmxbpn50pnffidwjchkzph9rh2jm4wfq7hj8msp5vhdq5h0z9hm";
};
+ patches = [
+ # https://github.com/naclander/netris/pull/1
+ ./configure-fixes-for-gcc-14.patch
+ ];
+
buildInputs = [
ncurses
];
@@ -23,6 +28,12 @@ stdenv.mkDerivation {
configureScript = "./Configure";
dontAddPrefix = true;
+ configureFlags = [
+ "--cc"
+ "${stdenv.cc.targetPrefix}cc"
+ "-O2"
+ ];
+
installPhase = ''
mkdir -p $out/bin
cp ./netris $out/bin
@@ -33,6 +44,6 @@ stdenv.mkDerivation {
mainProgram = "netris";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ patryk27 ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
index 49a050af41136..975ccc796d8a9 100644
--- a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
+++ b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
@@ -9,7 +9,7 @@
libxkbcommon,
alsa-lib,
at-spi2-core,
- mesa,
+ libgbm,
pango,
libdrm,
vivaldi-ffmpeg-codecs,
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
libxkbcommon
gtk3
vivaldi-ffmpeg-codecs
- mesa
+ libgbm
libGL
libglvnd
]
diff --git a/pkgs/by-name/nf/nfs-utils/package.nix b/pkgs/by-name/nf/nfs-utils/package.nix
index 81ce34dcba49f..969fb7a44c9b5 100644
--- a/pkgs/by-name/nf/nfs-utils/package.nix
+++ b/pkgs/by-name/nf/nfs-utils/package.nix
@@ -42,7 +42,8 @@ stdenv.mkDerivation rec {
'';
configureFlags =
- [ "--enable-gss"
+ [ "--with-start-statd=${placeholder "out"}/bin/start-statd"
+ "--enable-gss"
"--enable-svcgss"
"--with-statedir=/var/lib/nfs"
"--with-krb5=${lib.getLib libkrb5}"
@@ -79,8 +80,6 @@ stdenv.mkDerivation rec {
sed -i "s,/usr/sbin,$out/bin,g" utils/statd/statd.c
sed -i "s,^PATH=.*,PATH=$out/bin:${statdPath}," utils/statd/start-statd
- configureFlags="--with-start-statd=$out/bin/start-statd $configureFlags"
-
substituteInPlace systemd/nfs-utils.service \
--replace "/bin/true" "${coreutils}/bin/true"
diff --git a/pkgs/by-name/nh/nheko/package.nix b/pkgs/by-name/nh/nheko/package.nix
index d4c37141ef0ca..005c5937388b2 100644
--- a/pkgs/by-name/nh/nheko/package.nix
+++ b/pkgs/by-name/nh/nheko/package.nix
@@ -5,7 +5,7 @@
cmake,
asciidoc,
pkg-config,
- boost179,
+ boost,
cmark,
coeurl,
curl,
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
buildInputs =
[
- boost179
+ boost
cmark
coeurl
curl
diff --git a/pkgs/by-name/ni/ninjas2/package.nix b/pkgs/by-name/ni/ninjas2/package.nix
index e8eed77e4faa4..11cb31f589fa8 100644
--- a/pkgs/by-name/ni/ninjas2/package.nix
+++ b/pkgs/by-name/ni/ninjas2/package.nix
@@ -6,7 +6,6 @@
libGL,
pkg-config,
xorg,
- mesa,
libsndfile,
libsamplerate,
}:
@@ -32,7 +31,6 @@ stdenv.mkDerivation rec {
libjack2
xorg.libX11
libGL
- mesa
libsndfile
libsamplerate
];
diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix
index ed501fb5c6040..1658151fbe6b1 100644
--- a/pkgs/by-name/ni/niri/package.nix
+++ b/pkgs/by-name/ni/niri/package.nix
@@ -7,7 +7,7 @@
libglvnd,
libinput,
libxkbcommon,
- mesa,
+ libgbm,
nix-update-script,
pango,
pipewire,
@@ -60,7 +60,7 @@ rustPlatform.buildRustPackage rec {
libglvnd # For libEGL
libinput
libxkbcommon
- mesa # For libgbm
+ libgbm
pango
seatd
wayland # For libwayland-client
diff --git a/pkgs/by-name/ni/nix-ld/package.nix b/pkgs/by-name/ni/nix-ld/package.nix
index 8f2c147797263..3d47e68637d2a 100644
--- a/pkgs/by-name/ni/nix-ld/package.nix
+++ b/pkgs/by-name/ni/nix-ld/package.nix
@@ -17,6 +17,8 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-NRkLjdMtVfC6dD1gEbYZWFEtbmC2xfD6ft1IP7l76Vw=";
};
+ patches = [ ./rust-1.83.patch ];
+
cargoHash = "sha256-GOngDGRzWVuzGTX5xNb/nv5dJ6is6cH8K6kHTX3OoXE=";
hardeningDisable = [ "stackprotector" ];
diff --git a/pkgs/by-name/ni/nix-ld/rust-1.83.patch b/pkgs/by-name/ni/nix-ld/rust-1.83.patch
new file mode 100644
index 0000000000000..8ff1fb7d9ce7b
--- /dev/null
+++ b/pkgs/by-name/ni/nix-ld/rust-1.83.patch
@@ -0,0 +1,36 @@
+--- a/src/arch.rs
++++ b/src/arch.rs
+@@ -142,7 +142,7 @@ cfg_match! {
+
+ #[naked]
+ unsafe extern "C" fn entry_trampoline() -> ! {
+- core::arch::asm!(
++ core::arch::naked_asm!(
+ "lea r10, [rip + {context}]",
+ "mov r11, [r10 + {size} * 1]", // .env_entry
+ "test r11, r11",
+@@ -153,7 +153,6 @@ cfg_match! {
+ "jmp [rip + {context}]",
+ context = sym TRAMPOLINE_CONTEXT,
+ size = const core::mem::size_of::<*const u8>(),
+- options(noreturn),
+ )
+ }
+ }
+@@ -162,7 +161,7 @@ cfg_match! {
+
+ #[naked]
+ unsafe extern "C" fn entry_trampoline() -> ! {
+- core::arch::asm!(
++ core::arch::naked_asm!(
+ "adrp x8, {context}",
+ "ldr x9, [x8, {env_entry_off}]", // .env_entry
+ "cbz x9, 2f",
+@@ -174,7 +173,6 @@ cfg_match! {
+ context = sym TRAMPOLINE_CONTEXT,
+ env_entry_off = const TrampolineContext::ENV_ENTRY_OFFSET,
+ env_string_off = const TrampolineContext::ENV_STRING_OFFSET,
+- options(noreturn),
+ )
+ }
+ }
diff --git a/pkgs/by-name/nl/nlohmann_json/make-tests-build-clang-19.diff b/pkgs/by-name/nl/nlohmann_json/make-tests-build-clang-19.diff
new file mode 100644
index 0000000000000..ceb8692514695
--- /dev/null
+++ b/pkgs/by-name/nl/nlohmann_json/make-tests-build-clang-19.diff
@@ -0,0 +1,98 @@
+diff --git a/tests/src/unit-bson.cpp b/tests/src/unit-bson.cpp
+index 13216f2..fdfc350 100644
+--- a/tests/src/unit-bson.cpp
++++ b/tests/src/unit-bson.cpp
+@@ -621,7 +621,7 @@ TEST_CASE("BSON input/output_adapters")
+ {
+ SECTION("std::ostringstream")
+ {
+- std::basic_ostringstream ss;
++ std::basic_ostringstream ss;
+ json::to_bson(json_representation, ss);
+ json j3 = json::from_bson(ss.str());
+ CHECK(json_representation == j3);
+diff --git a/tests/src/unit-cbor.cpp b/tests/src/unit-cbor.cpp
+index be94d2f..2b396b7 100644
+--- a/tests/src/unit-cbor.cpp
++++ b/tests/src/unit-cbor.cpp
+@@ -1881,7 +1881,7 @@ TEST_CASE("single CBOR roundtrip")
+ {
+ SECTION("std::ostringstream")
+ {
+- std::basic_ostringstream ss;
++ std::basic_ostringstream ss;
+ json::to_cbor(j1, ss);
+ json j3 = json::from_cbor(ss.str());
+ CHECK(j1 == j3);
+diff --git a/tests/src/unit-deserialization.cpp b/tests/src/unit-deserialization.cpp
+index 3bc161f..e4918b0 100644
+--- a/tests/src/unit-deserialization.cpp
++++ b/tests/src/unit-deserialization.cpp
+@@ -1131,13 +1131,11 @@ TEST_CASE("deserialization")
+ }
+ }
+
++
+ TEST_CASE_TEMPLATE("deserialization of different character types (ASCII)", T,
+- char, unsigned char, signed char,
++ char,
+ wchar_t,
+- char16_t, char32_t,
+- std::uint8_t, std::int8_t,
+- std::int16_t, std::uint16_t,
+- std::int32_t, std::uint32_t)
++ char16_t, char32_t)
+ {
+ std::vector const v = {'t', 'r', 'u', 'e'};
+ CHECK(json::parse(v) == json(true));
+@@ -1163,7 +1161,7 @@ TEST_CASE_TEMPLATE("deserialization of different character types (UTF-8)", T,
+ }
+
+ TEST_CASE_TEMPLATE("deserialization of different character types (UTF-16)", T,
+- char16_t, std::uint16_t)
++ char16_t)
+ {
+ // a star emoji
+ std::vector const v = {static_cast('"'), static_cast(0x2b50), static_cast(0xfe0f), static_cast('"')};
+@@ -1176,7 +1174,7 @@ TEST_CASE_TEMPLATE("deserialization of different character types (UTF-16)", T,
+ }
+
+ TEST_CASE_TEMPLATE("deserialization of different character types (UTF-32)", T,
+- char32_t, std::uint32_t)
++ char32_t)
+ {
+ // a star emoji
+ std::vector const v = {static_cast('"'), static_cast(0x2b50), static_cast(0xfe0f), static_cast('"')};
+diff --git a/tests/src/unit-msgpack.cpp b/tests/src/unit-msgpack.cpp
+index 61162af..cfbb1fa 100644
+--- a/tests/src/unit-msgpack.cpp
++++ b/tests/src/unit-msgpack.cpp
+@@ -1604,7 +1604,7 @@ TEST_CASE("single MessagePack roundtrip")
+ {
+ SECTION("std::ostringstream")
+ {
+- std::basic_ostringstream ss;
++ std::basic_ostringstream ss;
+ json::to_msgpack(j1, ss);
+ json j3 = json::from_msgpack(ss.str());
+ CHECK(j1 == j3);
+diff --git a/tests/src/unit-regression2.cpp b/tests/src/unit-regression2.cpp
+index fab9aae..98947c5 100644
+--- a/tests/src/unit-regression2.cpp
++++ b/tests/src/unit-regression2.cpp
+@@ -674,6 +674,7 @@ TEST_CASE("regression tests 2")
+ CHECK(j.dump() == "{}");
+ }
+
++#if 0
+ #ifdef JSON_HAS_CPP_20
+ #if __has_include()
+ SECTION("issue #2546 - parsing containers of std::byte")
+@@ -684,6 +685,7 @@ TEST_CASE("regression tests 2")
+ CHECK(j.dump() == "\"Hello, world!\"");
+ }
+ #endif
++#endif
+ #endif
+
+ SECTION("issue #2574 - Deserialization to std::array, std::pair, and std::tuple with non-default constructable types fails")
diff --git a/pkgs/by-name/nl/nlohmann_json/package.nix b/pkgs/by-name/nl/nlohmann_json/package.nix
index a9bac354d3e1d..de18f352ab5f5 100644
--- a/pkgs/by-name/nl/nlohmann_json/package.nix
+++ b/pkgs/by-name/nl/nlohmann_json/package.nix
@@ -23,6 +23,12 @@ 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/nordpass/package.nix b/pkgs/by-name/no/nordpass/package.nix
index 3cc9f4ae920ab..fd372d7c6bd35 100644
--- a/pkgs/by-name/no/nordpass/package.nix
+++ b/pkgs/by-name/no/nordpass/package.nix
@@ -27,7 +27,7 @@
at-spi2-atk,
at-spi2-core,
libdrm,
- mesa,
+ libgbm,
libxkbcommon,
harfbuzz,
libsecret,
@@ -64,7 +64,7 @@ let
libpng
libsecret
libxkbcommon
- mesa
+ libgbm
nspr
nss_latest
pango
diff --git a/pkgs/by-name/no/notemap/package.nix b/pkgs/by-name/no/notemap/package.nix
index ebecc896295b9..db1a555e353f4 100644
--- a/pkgs/by-name/no/notemap/package.nix
+++ b/pkgs/by-name/no/notemap/package.nix
@@ -4,7 +4,6 @@
fetchzip,
pkg-config,
libressl,
- memstreamHook,
}:
stdenv.mkDerivation rec {
@@ -20,13 +19,9 @@ stdenv.mkDerivation rec {
pkg-config
];
- buildInputs =
- [
- libressl
- ]
- ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
- memstreamHook
- ];
+ buildInputs = [
+ libressl
+ ];
meta = {
description = "Mirror notes to IMAP";
diff --git a/pkgs/by-name/np/np2kai/package.nix b/pkgs/by-name/np/np2kai/package.nix
index 1be4dee6a086c..c1290bde9011a 100644
--- a/pkgs/by-name/np/np2kai/package.nix
+++ b/pkgs/by-name/np/np2kai/package.nix
@@ -148,7 +148,9 @@ 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
diff --git a/pkgs/by-name/nr/nrsc5/package.nix b/pkgs/by-name/nr/nrsc5/package.nix
index ddb35c80c66ea..d15f1ca7c4132 100644
--- a/pkgs/by-name/nr/nrsc5/package.nix
+++ b/pkgs/by-name/nr/nrsc5/package.nix
@@ -44,6 +44,10 @@ stdenv.mkDerivation {
sed -i '/GIT_REPOSITORY/d' CMakeLists.txt
sed -i '/GIT_TAG/d' CMakeLists.txt
sed -i "s:set (FAAD2_PREFIX .*):set (FAAD2_PREFIX \"$srcRoot/faad2-prefix\"):" CMakeLists.txt
+ # see https://github.com/dsvensson/faad2/pull/2
+ substituteInPlace $faadSrc/libfaad/pns.c \
+ --replace-fail 'r1_dep = __r1;' 'r1_dep = *__r1;' \
+ --replace-fail 'r2_dep = __r2;' 'r2_dep = *__r2;'
'';
nativeBuildInputs = [
diff --git a/pkgs/by-name/nt/ntp/package.nix b/pkgs/by-name/nt/ntp/package.nix
index a7123dff7a11c..2d97a87c33b70 100644
--- a/pkgs/by-name/nt/ntp/package.nix
+++ b/pkgs/by-name/nt/ntp/package.nix
@@ -2,6 +2,7 @@
stdenv,
lib,
fetchurl,
+ autoreconfHook,
openssl,
perl,
pps-tools,
@@ -17,6 +18,12 @@ stdenv.mkDerivation rec {
hash = "sha256-z4TF8/saKVKElCYk2CP/+mNBROCWz8T5lprJjvX0aOU=";
};
+ # fix for gcc-14 compile failure
+ postPatch = ''
+ substituteInPlace sntp/m4/openldap-thread-check.m4 \
+ --replace-fail "pthread_detach(NULL)" "pthread_detach(pthread_self())"
+ '';
+
configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/var"
@@ -26,6 +33,8 @@ stdenv.mkDerivation rec {
"--with-yielding-select=yes"
] ++ lib.optional stdenv.hostPlatform.isLinux "--enable-linuxcaps";
+ nativeBuildInputs = [ autoreconfHook ];
+
buildInputs =
[
openssl
diff --git a/pkgs/by-name/nu/nuweb/package.nix b/pkgs/by-name/nu/nuweb/package.nix
index b5c926b02b83b..9af6779710d24 100644
--- a/pkgs/by-name/nu/nuweb/package.nix
+++ b/pkgs/by-name/nu/nuweb/package.nix
@@ -18,7 +18,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 4d2ab61ecf855..e3fd3bc3bdee1 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/on/oneanime/package.nix b/pkgs/by-name/on/oneanime/package.nix
index 8408708815286..58d682d2bf870 100644
--- a/pkgs/by-name/on/oneanime/package.nix
+++ b/pkgs/by-name/on/oneanime/package.nix
@@ -10,7 +10,7 @@
libepoxy,
libpulseaudio,
libdrm,
- mesa,
+ libgbm,
buildGoModule,
stdenv,
mpv-unwrapped,
@@ -146,7 +146,7 @@ flutter327.buildFlutterApplication rec {
libepoxy
libpulseaudio
libdrm
- mesa
+ libgbm
mpv
];
diff --git a/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix
index 565661df3d545..a5aeebf9e1da2 100644
--- a/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix
+++ b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix
@@ -26,7 +26,7 @@
libudev0-shim,
libdrm,
makeWrapper,
- mesa,
+ libgbm,
noto-fonts-cjk-sans,
nspr,
nss,
@@ -99,7 +99,7 @@ let
libdrm
nspr
nss
- mesa # libgbm
+ libgbm
qt5.qtbase
qt5.qtdeclarative
qt5.qtsvg
diff --git a/pkgs/by-name/op/openh264/package.nix b/pkgs/by-name/op/openh264/package.nix
index c66ab4bffddda..9031086b8700d 100644
--- a/pkgs/by-name/op/openh264/package.nix
+++ b/pkgs/by-name/op/openh264/package.nix
@@ -1,7 +1,6 @@
{
lib,
fetchFromGitHub,
- fetchpatch2,
gtest,
meson,
nasm,
@@ -13,30 +12,24 @@
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/openjfx/package.nix b/pkgs/by-name/op/openjfx/package.nix
index e563214c9b9e5..02de38b115063 100644
--- a/pkgs/by-name/op/openjfx/package.nix
+++ b/pkgs/by-name/op/openjfx/package.nix
@@ -115,6 +115,8 @@ stdenv.mkDerivation {
__darwinAllowLocalNetworking = true;
+ # GCC 14 makes these errors by default
+ env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=int-conversion";
env.config = writeText "gradle.properties" ''
CONF = Release
JDK_HOME = ${jdk-bootstrap.home}
diff --git a/pkgs/by-name/op/openjpeg/exclude-tests b/pkgs/by-name/op/openjpeg/exclude-tests
new file mode 100644
index 0000000000000..3006eda409f48
--- /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 0bfa1067a7f77..15296d33b85d5 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 e8d0b405c065c..c353a4422d4cb 100644
--- a/pkgs/by-name/op/openldap/package.nix
+++ b/pkgs/by-name/op/openldap/package.nix
@@ -18,11 +18,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 ed3f74e7656a5..35d244cec9a0e 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/op/openvino/package.nix b/pkgs/by-name/op/openvino/package.nix
index 75783b27b9328..1b22d5d282674 100644
--- a/pkgs/by-name/op/openvino/package.nix
+++ b/pkgs/by-name/op/openvino/package.nix
@@ -1,5 +1,5 @@
{ lib
-, gcc12Stdenv
+, stdenv
, fetchFromGitHub
, fetchurl
, cudaSupport ? opencv.cudaSupport or false
@@ -27,7 +27,7 @@
, protobuf
, pugixml
, snappy
-, tbb_2021_5
+, tbb_2022_0
, cudaPackages
}:
@@ -36,8 +36,6 @@ let
cmakeBool
;
- stdenv = gcc12Stdenv;
-
# prevent scons from leaking in the default python version
scons' = scons.override { inherit python3Packages; };
@@ -153,7 +151,7 @@ stdenv.mkDerivation rec {
opencv.cxxdev
pugixml
snappy
- tbb_2021_5
+ tbb_2022_0
] ++ lib.optionals cudaSupport [
cudaPackages.cuda_cudart
];
diff --git a/pkgs/by-name/op/opera/package.nix b/pkgs/by-name/op/opera/package.nix
index 21c63c0a4346e..2e583bac7cd62 100644
--- a/pkgs/by-name/op/opera/package.nix
+++ b/pkgs/by-name/op/opera/package.nix
@@ -31,7 +31,7 @@
, libpulseaudio
, libuuid
, libxshmfence
-, mesa
+, libgbm
, nspr
, nss
, pango
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
libuuid
libxcb
libxshmfence
- mesa
+ libgbm
nspr
nss
pango
diff --git a/pkgs/by-name/os/ossia-score/package.nix b/pkgs/by-name/os/ossia-score/package.nix
index cc455d3adffc5..2b92f94c713df 100644
--- a/pkgs/by-name/os/ossia-score/package.nix
+++ b/pkgs/by-name/os/ossia-score/package.nix
@@ -9,7 +9,7 @@
avahi,
avahi-compat,
bluez,
- boost185,
+ boost,
fmt,
ffmpeg,
fftw,
@@ -44,13 +44,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;
};
@@ -65,7 +65,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 c7988b2e1f5c7..48aa86acd92e1 100644
--- a/pkgs/by-name/p1/p11-kit/package.nix
+++ b/pkgs/by-name/p1/p11-kit/package.nix
@@ -67,14 +67,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 3140a829d5220..589c52e36c82e 100644
--- a/pkgs/by-name/pa/pacparser/package.nix
+++ b/pkgs/by-name/pa/pacparser/package.nix
@@ -15,10 +15,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/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index 4005d852a8957..bb43fbf8cb249 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -4,6 +4,7 @@
fetchFromGitHub,
fetchpatch2,
buildNpmPackage,
+ nodejs_20,
nixosTests,
gettext,
python3,
@@ -98,6 +99,8 @@ let
pname = "paperless-ngx-frontend";
inherit version src;
+ nodejs = nodejs_20; # does not build with 22
+
postPatch = ''
cd src-ui
'';
diff --git a/pkgs/by-name/pa/patchPpdFilesHook/patch-ppd-hook.sh b/pkgs/by-name/pa/patchPpdFilesHook/patch-ppd-hook.sh
index 77322b245b277..8227146364157 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/pd/pdal/package.nix b/pkgs/by-name/pd/pdal/package.nix
index f40065a71c8d7..09cbf9d65ec25 100644
--- a/pkgs/by-name/pd/pdal/package.nix
+++ b/pkgs/by-name/pd/pdal/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
laszip
libgeotiff
libtiff
- (libxml2.override { enableHttp = true; })
+ libxml2
openscenegraph
postgresql
proj
diff --git a/pkgs/by-name/pg/pg-dump-anon/package.nix b/pkgs/by-name/pg/pg-dump-anon/package.nix
index a7771fcf523ec..3836d43f95ae3 100644
--- a/pkgs/by-name/pg/pg-dump-anon/package.nix
+++ b/pkgs/by-name/pg/pg-dump-anon/package.nix
@@ -3,7 +3,7 @@
fetchFromGitLab,
buildGoModule,
nixosTests,
- postgresql_17,
+ postgresql,
makeWrapper,
}:
@@ -26,7 +26,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/pi/pilipalax/package.nix b/pkgs/by-name/pi/pilipalax/package.nix
index f03726301f2a8..3b0b43d2ee758 100644
--- a/pkgs/by-name/pi/pilipalax/package.nix
+++ b/pkgs/by-name/pi/pilipalax/package.nix
@@ -26,7 +26,7 @@
libpulseaudio,
libcaca,
libdrm,
- mesa,
+ libgbm,
libXScrnSaver,
nv-codec-headers-11,
libXpresent,
@@ -91,7 +91,7 @@ flutter324.buildFlutterApplication rec {
libpulseaudio
libcaca
libdrm
- mesa
+ libgbm
libXScrnSaver
libXpresent
nv-codec-headers-11
diff --git a/pkgs/by-name/pi/pioneer/package.nix b/pkgs/by-name/pi/pioneer/package.nix
index 4b178e593516c..a5b85c54602e5 100644
--- a/pkgs/by-name/pi/pioneer/package.nix
+++ b/pkgs/by-name/pi/pioneer/package.nix
@@ -14,7 +14,7 @@
libsigcxx,
libvorbis,
lua5_2,
- mesa,
+ libgbm,
SDL2,
SDL2_image,
}:
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
libsigcxx
libvorbis
lua5_2
- mesa
+ libgbm
SDL2
SDL2_image
];
diff --git a/pkgs/by-name/pi/pixman/package.nix b/pkgs/by-name/pi/pixman/package.nix
index 0e78b595987ab..a78fafad92756 100644
--- a/pkgs/by-name/pi/pixman/package.nix
+++ b/pkgs/by-name/pi/pixman/package.nix
@@ -25,14 +25,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pixman";
- version = "0.43.4";
+ version = "0.44.2";
src = fetchurl {
urls = with finalAttrs; [
"mirror://xorg/individual/lib/${pname}-${version}.tar.gz"
"https://cairographics.org/releases/${pname}-${version}.tar.gz"
];
- hash = "sha256-oGJNuQGAx923n8epFRCT3DfGRtjDjT8jL3Z89kuFoiY=";
+ hash = "sha256-Y0kGHOGjOKtpUrkhlNGwN3RyJEII1H/yW++G/HGXNGY=";
};
# Raise test timeout, 120s can be slightly exceeded on slower hardware
@@ -56,12 +56,6 @@ stdenv.mkDerivation (finalAttrs: {
# architectures and requires used to disable them:
# https://gitlab.freedesktop.org/pixman/pixman/-/issues/88
mesonAutoFeatures = "auto";
- mesonFlags =
- [
- "-Diwmmxt=disabled"
- ]
- # Disable until https://gitlab.freedesktop.org/pixman/pixman/-/issues/46 is resolved
- ++ lib.optional (stdenv.hostPlatform.isAarch64 && !stdenv.cc.isGNU) "-Da64-neon=disabled";
preConfigure = ''
# https://gitlab.freedesktop.org/pixman/pixman/-/issues/62
diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix
index b089c211b7512..c98b169d0c13e 100644
--- a/pkgs/by-name/pl/plasticity/package.nix
+++ b/pkgs/by-name/pl/plasticity/package.nix
@@ -18,7 +18,7 @@
libnotify,
libsForQt5,
libxkbcommon,
- mesa,
+ libgbm,
nspr,
nss,
openssl,
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
wrapGAppsHook3
autoPatchelfHook
rpmextract
- mesa
+ libgbm
];
buildInputs = [
diff --git a/pkgs/by-name/pn/pngtoico/package.nix b/pkgs/by-name/pn/pngtoico/package.nix
index 7c73121f11fd0..fc429a35f6423 100644
--- a/pkgs/by-name/pn/pngtoico/package.nix
+++ b/pkgs/by-name/pn/pngtoico/package.nix
@@ -17,7 +17,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/po/polar-bookshelf/package.nix b/pkgs/by-name/po/polar-bookshelf/package.nix
index 5306343a48cb8..7a3f6babb2ab9 100644
--- a/pkgs/by-name/po/polar-bookshelf/package.nix
+++ b/pkgs/by-name/po/polar-bookshelf/package.nix
@@ -39,7 +39,7 @@
libnghttp2,
gsettings-desktop-schemas,
libdrm,
- mesa,
+ libgbm,
}:
stdenv.mkDerivation rec {
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libdrm
- mesa
+ libgbm
gsettings-desktop-schemas
glib
gtk3
diff --git a/pkgs/by-name/po/positron-bin/package.nix b/pkgs/by-name/po/positron-bin/package.nix
index f99fa66da7f30..2e8143793bfc3 100644
--- a/pkgs/by-name/po/positron-bin/package.nix
+++ b/pkgs/by-name/po/positron-bin/package.nix
@@ -11,7 +11,7 @@
libglvnd,
libxkbcommon,
makeShellWrapper,
- mesa,
+ libgbm,
musl,
nss,
patchelf,
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
gtk3
libglvnd
libxkbcommon
- mesa
+ libgbm
musl
nss
stdenv.cc.cc
diff --git a/pkgs/by-name/po/postman/linux.nix b/pkgs/by-name/po/postman/linux.nix
index c5fdabc1592cb..591794c90ccf3 100644
--- a/pkgs/by-name/po/postman/linux.nix
+++ b/pkgs/by-name/po/postman/linux.nix
@@ -37,7 +37,7 @@
libXScrnSaver,
libxkbcommon,
libdrm,
- mesa,
+ libgbm,
# It's unknown which version of openssl that postman expects but it seems that
# OpenSSL 3+ seems to work fine (cf.
# https://github.com/NixOS/nixpkgs/issues/254325). If postman breaks apparently
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
gtk3
freetype
fontconfig
- mesa
+ libgbm
nss
nspr
pango
diff --git a/pkgs/by-name/pr/premid/package.nix b/pkgs/by-name/pr/premid/package.nix
index 0d94f09defc28..557a3ab20161a 100644
--- a/pkgs/by-name/pr/premid/package.nix
+++ b/pkgs/by-name/pr/premid/package.nix
@@ -37,7 +37,7 @@
libXtst,
libxcb,
libxshmfence,
- mesa,
+ libgbm,
nspr,
nss,
pango,
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
libXtst
libxcb
libxshmfence
- mesa
+ libgbm
nss
];
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
systemd
libpulseaudio
libdrm
- mesa
+ libgbm
stdenv.cc.cc
alsa-lib
atk
diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix
index dc9b6ece9bf67..fa61f5c90dddf 100644
--- a/pkgs/by-name/pr/pretalx/package.nix
+++ b/pkgs/by-name/pr/pretalx/package.nix
@@ -94,6 +94,7 @@ python.pkgs.buildPythonApplication rec {
];
pythonRelaxDeps = [
+ "bleach"
"celery"
"css-inline"
"cssutils"
diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix
index f178d109c5591..e632201594388 100644
--- a/pkgs/by-name/pr/pretix/package.nix
+++ b/pkgs/by-name/pr/pretix/package.nix
@@ -14,16 +14,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: {
@@ -52,13 +42,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 {
@@ -66,7 +56,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 2fc108eb58b74..3e7b5eb314e7e 100644
--- a/pkgs/by-name/pr/pretix/plugins/pages.nix
+++ b/pkgs/by-name/pr/pretix/plugins/pages.nix
@@ -8,14 +8,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 e7aeb78b346f8..bada0bbc9bfdd 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 bc325d331fc83..a8d4a4a39a580 100644
--- a/pkgs/by-name/ps/ps2eps/package.nix
+++ b/pkgs/by-name/ps/ps2eps/package.nix
@@ -2,7 +2,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/publicsuffix-list/package.nix b/pkgs/by-name/pu/publicsuffix-list/package.nix
index 284cc64a1d561..f2737b1a28b94 100644
--- a/pkgs/by-name/pu/publicsuffix-list/package.nix
+++ b/pkgs/by-name/pu/publicsuffix-list/package.nix
@@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation {
pname = "publicsuffix-list";
- version = "0-unstable-2024-10-25";
+ version = "0-unstable-2024-12-06";
src = fetchFromGitHub {
owner = "publicsuffix";
repo = "list";
- rev = "435e07efb28973ea116592dc2291b1f8c27080aa";
- hash = "sha256-nLuZVgPHNnxOT3GcGz6TEbHkiNgVU5f2uWcgCfr7tZ8=";
+ rev = "d94154e5222aa000f70def82b9711df88b4612d9";
+ hash = "sha256-Cdrut2plOpItOdvgdYl7B7f9FqfVRzOmseUs9XAFnfM=";
};
dontBuild = true;
diff --git a/pkgs/by-name/pu/publii/package.nix b/pkgs/by-name/pu/publii/package.nix
index c3dd794635cba..e212534029dba 100644
--- a/pkgs/by-name/pu/publii/package.nix
+++ b/pkgs/by-name/pu/publii/package.nix
@@ -17,7 +17,7 @@
glibc,
gtk3,
libsecret,
- mesa,
+ libgbm,
musl,
nss,
pango,
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
glibc
gtk3
libsecret
- mesa
+ libgbm
musl
nss
pango
diff --git a/pkgs/by-name/pu/pugixml/package.nix b/pkgs/by-name/pu/pugixml/package.nix
index 6aa070fd41a3c..aa72dc996e3ee 100644
--- a/pkgs/by-name/pu/pugixml/package.nix
+++ b/pkgs/by-name/pu/pugixml/package.nix
@@ -35,7 +35,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/pulsar/package.nix b/pkgs/by-name/pu/pulsar/package.nix
index 32a968833f95c..865b2ccdab80c 100644
--- a/pkgs/by-name/pu/pulsar/package.nix
+++ b/pkgs/by-name/pu/pulsar/package.nix
@@ -15,7 +15,7 @@
gdk-pixbuf,
glib,
gtk3,
- mesa,
+ libgbm,
nss,
nspr,
xorg,
@@ -58,7 +58,7 @@ let
glib
gtk3
libsecret
- mesa
+ libgbm
nss
nspr
libdrm
diff --git a/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix b/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix
index 26c607b210229..ceec2b35af4c1 100644
--- a/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix
+++ b/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix
@@ -25,7 +25,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/qq/qq/package.nix b/pkgs/by-name/qq/qq/package.nix
index 34e18ed925152..b5cf57432e8be 100644
--- a/pkgs/by-name/qq/qq/package.nix
+++ b/pkgs/by-name/qq/qq/package.nix
@@ -13,7 +13,7 @@
libgcrypt,
libkrb5,
libnotify,
- mesa, # for libgbm
+ libgbm,
libpulseaudio,
libGL,
nss,
@@ -65,7 +65,7 @@ stdenv.mkDerivation {
libpulseaudio
libgcrypt
libkrb5
- mesa
+ libgbm
nss
vips
xorg.libXdamage
diff --git a/pkgs/by-name/qu/quantlib/package.nix b/pkgs/by-name/qu/quantlib/package.nix
index 62f54b6ecbcee..a499519e95959 100644
--- a/pkgs/by-name/qu/quantlib/package.nix
+++ b/pkgs/by-name/qu/quantlib/package.nix
@@ -3,7 +3,7 @@
stdenv,
fetchFromGitHub,
cmake,
- boost186, # (boost181) breaks on darwin
+ boost,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -23,7 +23,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 0000000000000..c057b3c1ec6a5
--- /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 09707dc75b9a2..887beaa630511 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 e8834ac131e4f..523b8e1de6a04 100644
--- a/pkgs/by-name/ra/rav1e/package.nix
+++ b/pkgs/by-name/ra/rav1e/package.nix
@@ -4,15 +4,10 @@
stdenv,
rustPlatform,
fetchCrate,
- pkg-config,
cargo-c,
- darwin,
- libgit2,
- libiconv,
nasm,
nix-update-script,
testers,
- zlib,
rav1e,
}:
@@ -27,28 +22,24 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-VyQ6n2kIJ7OjK6Xlf0T0GNsBvgESRETzKZDZzAn8ZuY=";
- depsBuildBuild = [ pkg-config ];
-
nativeBuildInputs = [
cargo-c
- libgit2
nasm
];
- buildInputs =
- [ zlib ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [
- libiconv
- darwin.apple_sdk.frameworks.Security
- ];
+ postPatch =
+ ''
+ # remove feature that requires libgit2 and is only used to print a version string
+ substituteInPlace Cargo.toml --replace-fail '"git_version",' ""
+ ''
+ + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
+ # Darwin uses `llvm-strip`, which results in link errors when using `-x` to strip the asm library
+ # and linking it with cctools ld64.
+ substituteInPlace build.rs --replace-fail '.arg("-x")' '.arg("-S")'
- # Darwin uses `llvm-strip`, which results in link errors when using `-x` to strip the asm library
- # and linking it with cctools ld64.
- postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
- substituteInPlace build.rs --replace-fail '.arg("-x")' '.arg("-S")'
- # Thin LTO doesn’t appear to work with Rust 1.79. rav1e fail to build when building fern.
- substituteInPlace Cargo.toml --replace-fail 'lto = "thin"' 'lto = "fat"'
- '';
+ # Thin LTO doesn’t appear to work with Rust 1.79. rav1e fail to build when building fern.
+ substituteInPlace Cargo.toml --replace-fail 'lto = "thin"' 'lto = "fat"'
+ '';
checkType = "debug";
diff --git a/pkgs/by-name/ra/raylib/package.nix b/pkgs/by-name/ra/raylib/package.nix
index 086d6ae60c82e..3a8757e5ce2af 100644
--- a/pkgs/by-name/ra/raylib/package.nix
+++ b/pkgs/by-name/ra/raylib/package.nix
@@ -3,7 +3,7 @@
, fetchFromGitHub
, cmake
, fetchpatch
-, mesa
+, libgbm
, libGLU
, glfw
, libX11
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
buildInputs = [ glfw ]
- ++ lib.optionals stdenv.hostPlatform.isLinux [ mesa libXi libXcursor libXrandr libXinerama ]
+ ++ lib.optionals stdenv.hostPlatform.isLinux [ libgbm libXi libXcursor libXrandr libXinerama ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ]
++ lib.optional alsaSupport alsa-lib
++ lib.optional pulseSupport libpulseaudio;
diff --git a/pkgs/by-name/re/re2c/package.nix b/pkgs/by-name/re/re2c/package.nix
index 47a54d0060723..2b4e3922a55de 100644
--- a/pkgs/by-name/re/re2c/package.nix
+++ b/pkgs/by-name/re/re2c/package.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "re2c";
- version = "3.1";
+ version = "4.0.1";
src = fetchFromGitHub {
owner = "skvadrik";
repo = "re2c";
rev = version;
- sha256 = "sha256-7zZdLby7HdNoURgdkg+xnlp6VDCACcyGCTtjM43OLd4=";
+ sha256 = "sha256-fw+Dnq5ir5EAz3/GguIVUxe2K5fjQ9eLhpnlCIcw8js=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/re/react-native-debugger/package.nix b/pkgs/by-name/re/react-native-debugger/package.nix
index 5540cf7cedba8..c1f87200b2924 100644
--- a/pkgs/by-name/re/react-native-debugger/package.nix
+++ b/pkgs/by-name/re/react-native-debugger/package.nix
@@ -24,7 +24,7 @@
makeDesktopItem,
libdrm,
libxkbcommon,
- mesa,
+ libgbm,
makeWrapper,
}:
@@ -50,7 +50,7 @@ let
at-spi2-core
libdrm
libxkbcommon
- mesa
+ libgbm
xorg.libX11
xorg.libXcursor
diff --git a/pkgs/by-name/re/retroarch-bare/package.nix b/pkgs/by-name/re/retroarch-bare/package.nix
index 584724f7490ec..67cc4e7fb5dfb 100644
--- a/pkgs/by-name/re/retroarch-bare/package.nix
+++ b/pkgs/by-name/re/retroarch-bare/package.nix
@@ -23,7 +23,7 @@
libXxf86vm,
makeBinaryWrapper,
mbedtls_2,
- mesa,
+ libgbm,
nixosTests,
nvidia_cg_toolkit,
pkg-config,
@@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
libpulseaudio
libv4l
libxkbcommon
- mesa
+ libgbm
udev
];
diff --git a/pkgs/by-name/ro/roam-research/linux.nix b/pkgs/by-name/ro/roam-research/linux.nix
index c37ae5f13984e..bbf5274010c87 100644
--- a/pkgs/by-name/ro/roam-research/linux.nix
+++ b/pkgs/by-name/ro/roam-research/linux.nix
@@ -28,7 +28,7 @@
libxcb,
libxkbcommon,
libxshmfence,
- mesa,
+ libgbm,
nspr,
nss,
pango,
@@ -59,7 +59,7 @@ let
libxcb
libxkbcommon
libxshmfence
- mesa
+ libgbm
nspr
nss
pango
diff --git a/pkgs/by-name/ro/rocketchat-desktop/package.nix b/pkgs/by-name/ro/rocketchat-desktop/package.nix
index 401b1c9f512fa..7e0a7c9dd557f 100644
--- a/pkgs/by-name/ro/rocketchat-desktop/package.nix
+++ b/pkgs/by-name/ro/rocketchat-desktop/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
at-spi2-core
libdbusmenu
libdrm
- mesa
+ libgbm
xorg.libxshmfence
libxkbcommon
];
diff --git a/pkgs/by-name/ro/rocksndiamonds/package.nix b/pkgs/by-name/ro/rocksndiamonds/package.nix
index e33bf73ce212a..66f937a2cb559 100644
--- a/pkgs/by-name/ro/rocksndiamonds/package.nix
+++ b/pkgs/by-name/ro/rocksndiamonds/package.nix
@@ -42,7 +42,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 0d719c3a5763b..5330b757686ee 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 d2b0752f9b223..d76142650bcc4 100644
--- a/pkgs/by-name/rt/rt/package.nix
+++ b/pkgs/by-name/rt/rt/package.nix
@@ -136,12 +136,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 2449165caeb0e..c9e2e78427f2c 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.4";
pyproject = true;
outputs = [
@@ -27,8 +27,8 @@ python3Packages.buildPythonPackage rec {
src = fetchFromGitHub {
owner = "astral-sh";
repo = "ruff";
- rev = "refs/tags/${version}";
- hash = "sha256-yenGZ7TuiHtY/3AIjMPlHVtQPP6PHMc1wdezfZdVtK0=";
+ tag = version;
+ hash = "sha256-c5d2XaoEjCHWMdjTLD6CnwP8rpSXTUrmKSs0QWQ6UG0=";
};
# 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-jbUjsIJRpkKYc+qHN8tkcZrcjPTFJfdCsatezzdX4Ss=";
};
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 d2d8de6b43060..656a02a4147e2 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/sc/scenefx/package.nix b/pkgs/by-name/sc/scenefx/package.nix
index d3704f1434ff2..fcc30de6e844c 100644
--- a/pkgs/by-name/sc/scenefx/package.nix
+++ b/pkgs/by-name/sc/scenefx/package.nix
@@ -13,7 +13,7 @@
pixman,
wayland-protocols,
libGL,
- mesa,
+ libgbm,
validatePkgConfig,
testers,
wayland-scanner,
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
libdrm
libGL
libxkbcommon
- mesa
+ libgbm
pixman
wayland
wayland-protocols
diff --git a/pkgs/by-name/se/serf/package.nix b/pkgs/by-name/se/serf/package.nix
index 2924049e075c6..1d194d2c43566 100644
--- a/pkgs/by-name/se/serf/package.nix
+++ b/pkgs/by-name/se/serf/package.nix
@@ -47,14 +47,14 @@ stdenv.mkDerivation rec {
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 ef64555a8e606..b5f8cc04bcea0 100644
--- a/pkgs/by-name/sh/shadps4/package.nix
+++ b/pkgs/by-name/sh/shadps4/package.nix
@@ -4,7 +4,7 @@
fetchFromGitHub,
nixosTests,
alsa-lib,
- boost184,
+ boost,
cmake,
cryptopp,
glslang,
@@ -17,7 +17,7 @@
libunwind,
libusb1,
magic-enum,
- mesa,
+ libgbm,
pkg-config,
pugixml,
qt6,
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
alsa-lib
- boost184
+ boost
cryptopp
glslang
ffmpeg
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
xorg.libX11
xorg.libXext
magic-enum
- mesa
+ libgbm
pugixml
qt6.qtbase
qt6.qtdeclarative
diff --git a/pkgs/by-name/sh/sherpa/package.nix b/pkgs/by-name/sh/sherpa/package.nix
index 16f64236b9418..883ae291fb14d 100644
--- a/pkgs/by-name/sh/sherpa/package.nix
+++ b/pkgs/by-name/sh/sherpa/package.nix
@@ -21,7 +21,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 = [
diff --git a/pkgs/by-name/si/sidequest/package.nix b/pkgs/by-name/si/sidequest/package.nix
index 07250ca00ca3e..fe78c9ff31888 100644
--- a/pkgs/by-name/si/sidequest/package.nix
+++ b/pkgs/by-name/si/sidequest/package.nix
@@ -14,7 +14,7 @@
gdk-pixbuf,
glib,
gtk3,
- mesa,
+ libgbm,
nss,
nspr,
libdrm,
@@ -72,7 +72,7 @@ let
gdk-pixbuf
glib
gtk3
- mesa
+ libgbm
nss
nspr
libdrm
diff --git a/pkgs/by-name/si/signal-desktop/generic.nix b/pkgs/by-name/si/signal-desktop/generic.nix
index e9826312bb47e..de6134797b93e 100644
--- a/pkgs/by-name/si/signal-desktop/generic.nix
+++ b/pkgs/by-name/si/signal-desktop/generic.nix
@@ -41,7 +41,7 @@
libuuid,
at-spi2-core,
libappindicator-gtk3,
- mesa,
+ libgbm,
# Runtime dependencies:
systemd,
libnotify,
@@ -164,7 +164,7 @@ stdenv.mkDerivation rec {
libpulseaudio
libnotify
libuuid
- mesa # for libgbm
+ libgbm
nspr
nss
pango
diff --git a/pkgs/by-name/si/silc_client/package.nix b/pkgs/by-name/si/silc_client/package.nix
index 80c263b51ae0f..dc8405ddc89b8 100644
--- a/pkgs/by-name/si/silc_client/package.nix
+++ b/pkgs/by-name/si/silc_client/package.nix
@@ -27,11 +27,13 @@ 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 = [
diff --git a/pkgs/by-name/sk/skia-aseprite/package.nix b/pkgs/by-name/sk/skia-aseprite/package.nix
index 3b34ad631862f..446556a126b8a 100644
--- a/pkgs/by-name/sk/skia-aseprite/package.nix
+++ b/pkgs/by-name/sk/skia-aseprite/package.nix
@@ -14,7 +14,7 @@
libpng,
libwebp,
libX11,
- mesa,
+ libgbm,
ninja,
python3,
zlib,
@@ -65,7 +65,7 @@ clangStdenv.mkDerivation (finalAttrs: {
libpng
libwebp
libX11
- mesa
+ libgbm
zlib
];
diff --git a/pkgs/by-name/sk/skypeforlinux/package.nix b/pkgs/by-name/sk/skypeforlinux/package.nix
index f9553fdc6f980..40d68b0bbe956 100644
--- a/pkgs/by-name/sk/skypeforlinux/package.nix
+++ b/pkgs/by-name/sk/skypeforlinux/package.nix
@@ -33,7 +33,7 @@
libuuid,
at-spi2-core,
libdrm,
- mesa,
+ libgbm,
libxkbcommon,
libxshmfence,
}:
@@ -79,7 +79,7 @@ let
libv4l
libdrm
- mesa
+ libgbm
libxkbcommon
libxshmfence
xorg.libxkbfile
diff --git a/pkgs/by-name/sl/slack/package.nix b/pkgs/by-name/sl/slack/package.nix
index 8f5a06fe59643..5b77c5b8d31b0 100644
--- a/pkgs/by-name/sl/slack/package.nix
+++ b/pkgs/by-name/sl/slack/package.nix
@@ -28,7 +28,7 @@
, libxcb
, libxkbcommon
, libxshmfence
-, mesa
+, libgbm
, nspr
, nss
, pango
@@ -117,7 +117,7 @@ let
libuuid
libxcb
libxkbcommon
- mesa
+ libgbm
nspr
nss
pango
diff --git a/pkgs/by-name/sl/slang/package.nix b/pkgs/by-name/sl/slang/package.nix
index f6a921a494bcd..425a5e9a4d8ec 100644
--- a/pkgs/by-name/sl/slang/package.nix
+++ b/pkgs/by-name/sl/slang/package.nix
@@ -29,10 +29,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/sn/snapmaker-luban/package.nix b/pkgs/by-name/sn/snapmaker-luban/package.nix
index b8ceaa04f0397..f4adab052c178 100644
--- a/pkgs/by-name/sn/snapmaker-luban/package.nix
+++ b/pkgs/by-name/sn/snapmaker-luban/package.nix
@@ -18,7 +18,7 @@
nspr,
gdk-pixbuf,
libdrm,
- mesa,
+ libgbm,
libX11,
libXScrnSaver,
libXcomposite,
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
libXtst
libxcb
libxshmfence
- mesa # Required for libgbm
+ libgbm
nspr
nss
];
diff --git a/pkgs/by-name/sn/sndpeek/package.nix b/pkgs/by-name/sn/sndpeek/package.nix
index 6cf92d9a656fb..e54024a8ec2e0 100644
--- a/pkgs/by-name/sn/sndpeek/package.nix
+++ b/pkgs/by-name/sn/sndpeek/package.nix
@@ -5,7 +5,7 @@
libsndfile,
libglut,
alsa-lib,
- mesa,
+ libgbm,
libGLU,
libX11,
libXmu,
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libglut
alsa-lib
- mesa
+ libgbm
libGLU
libsndfile
libX11
diff --git a/pkgs/by-name/sp/spaceFM/package.nix b/pkgs/by-name/sp/spaceFM/package.nix
index 8f74c5efa2f34..418f285bd6cfc 100644
--- a/pkgs/by-name/sp/spaceFM/package.nix
+++ b/pkgs/by-name/sp/spaceFM/package.nix
@@ -46,12 +46,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 66682fd3ed618..62606d12dc97e 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 6aa91db83549a..0c9777b1ca880 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/sp/spotify/linux.nix b/pkgs/by-name/sp/spotify/linux.nix
index 0e8a238591557..7fb0949c93d1a 100644
--- a/pkgs/by-name/sp/spotify/linux.nix
+++ b/pkgs/by-name/sp/spotify/linux.nix
@@ -33,7 +33,7 @@
at-spi2-core,
libpulseaudio,
libdrm,
- mesa,
+ libgbm,
libxkbcommon,
pname,
meta,
@@ -87,7 +87,7 @@ let
libpng
libpulseaudio
libxkbcommon
- mesa
+ libgbm
nss_latest
pango
stdenv.cc.cc
diff --git a/pkgs/by-name/sr/srm-cuarzo/package.nix b/pkgs/by-name/sr/srm-cuarzo/package.nix
index b607960518c17..5d2b6fe12a787 100644
--- a/pkgs/by-name/sr/srm-cuarzo/package.nix
+++ b/pkgs/by-name/sr/srm-cuarzo/package.nix
@@ -8,7 +8,7 @@
, libdrm
, libGL
, libinput
-, mesa
+, libgbm
, seatd
, udev
}:
@@ -35,7 +35,7 @@ stdenv.mkDerivation (self: {
libdrm
libGL
libinput
- mesa
+ libgbm
seatd
udev
];
diff --git a/pkgs/by-name/sr/srt/package.nix b/pkgs/by-name/sr/srt/package.nix
index 6b777eb2c28cf..6dfb61849ad61 100644
--- a/pkgs/by-name/sr/srt/package.nix
+++ b/pkgs/by-name/sr/srt/package.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "srt";
- version = "1.5.3";
+ version = "1.5.4";
src = fetchFromGitHub {
owner = "Haivision";
repo = "srt";
rev = "v${version}";
- sha256 = "sha256-HmfbBPyR+z5d9/XBvNhosk8pSSPToNtM+V0hEyb2G2w=";
+ sha256 = "sha256-NLy9GuP4OT/kKAIIDXSHtsmaBzXRuFohFM/aM+46cao=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/st/stardust-xr-server/package.nix b/pkgs/by-name/st/stardust-xr-server/package.nix
index f9567d8c54d7b..3a1ab7059fba6 100644
--- a/pkgs/by-name/st/stardust-xr-server/package.nix
+++ b/pkgs/by-name/st/stardust-xr-server/package.nix
@@ -8,7 +8,7 @@
fontconfig,
libGL,
libxkbcommon,
- mesa,
+ libgbm,
openxr-loader,
pkg-config,
xorg,
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec {
fontconfig
libGL
libxkbcommon
- mesa
+ libgbm
openxr-loader
xorg.libX11
xorg.libXfixes
diff --git a/pkgs/by-name/st/staruml/package.nix b/pkgs/by-name/st/staruml/package.nix
index 975168db56e9d..eeeb1cdf6c200 100644
--- a/pkgs/by-name/st/staruml/package.nix
+++ b/pkgs/by-name/st/staruml/package.nix
@@ -19,7 +19,7 @@
cairo,
expat,
libdrm,
- mesa,
+ libgbm,
alsa-lib,
at-spi2-core,
cups,
@@ -53,7 +53,7 @@ let
xorg.libXrandr
expat
libdrm
- mesa
+ libgbm
alsa-lib
at-spi2-core
cups
diff --git a/pkgs/by-name/st/steam/package.nix b/pkgs/by-name/st/steam/package.nix
index bc727e0ebfc53..6dbea9b09bcff 100644
--- a/pkgs/by-name/st/steam/package.nix
+++ b/pkgs/by-name/st/steam/package.nix
@@ -52,7 +52,7 @@ let
libGL
libdrm
- mesa # for libgbm
+ libgbm
udev
libudev0-shim
libva
diff --git a/pkgs/by-name/st/stm32cubemx/package.nix b/pkgs/by-name/st/stm32cubemx/package.nix
index 0505e5b92c87d..66b1f8a3f8c54 100644
--- a/pkgs/by-name/st/stm32cubemx/package.nix
+++ b/pkgs/by-name/st/stm32cubemx/package.nix
@@ -110,7 +110,7 @@ buildFHSEnv {
libGL
libudev0-shim
libxkbcommon
- mesa
+ libgbm
nspr
nss
pango
diff --git a/pkgs/by-name/st/stone-phaser/package.nix b/pkgs/by-name/st/stone-phaser/package.nix
index e1e68d999ac62..5f38e47644b41 100644
--- a/pkgs/by-name/st/stone-phaser/package.nix
+++ b/pkgs/by-name/st/stone-phaser/package.nix
@@ -7,7 +7,7 @@
libGL,
lv2,
libjack2,
- mesa,
+ libgbm,
pkg-config,
}:
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
libGL
lv2
libjack2
- mesa
+ libgbm
];
postPatch = ''
diff --git a/pkgs/by-name/st/stress-ng/package.nix b/pkgs/by-name/st/stress-ng/package.nix
index 48fc9952f16ef..fa9724ef7bc9f 100644
--- a/pkgs/by-name/st/stress-ng/package.nix
+++ b/pkgs/by-name/st/stress-ng/package.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub
, attr, judy, keyutils, libaio, libapparmor, libbsd, libcap, libgcrypt, lksctp-tools, zlib
-, libglvnd, mesa
+, libglvnd, libgbm
}:
stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
# All platforms inputs then Linux-only ones
buildInputs = [ judy libbsd libgcrypt zlib ]
++ lib.optionals stdenv.hostPlatform.isLinux [
- attr keyutils libaio libapparmor libcap lksctp-tools libglvnd mesa
+ attr keyutils libaio libapparmor libcap lksctp-tools libglvnd libgbm
];
makeFlags = [
diff --git a/pkgs/by-name/su/sunshine/boost-186.patch b/pkgs/by-name/su/sunshine/boost-186.patch
new file mode 100644
index 0000000000000..5ae10ef264525
--- /dev/null
+++ b/pkgs/by-name/su/sunshine/boost-186.patch
@@ -0,0 +1,191 @@
+port of https://github.com/LizardByte/Sunshine/commit/e90b71ce62b7744bb18ffc7823b1e895786ffb0a
+
+diff --git a/src/platform/common.h b/src/platform/common.h
+index 007f7ec..498becb 100644
+--- a/src/platform/common.h
++++ b/src/platform/common.h
+@@ -39,13 +39,13 @@ namespace boost {
+ namespace filesystem {
+ class path;
+ }
+- namespace process {
++ namespace process::inline v1 {
+ class child;
+ class group;
+ template
+ class basic_environment;
+ typedef basic_environment environment;
+- } // namespace process
++ } // namespace process::inline v1
+ } // namespace boost
+ namespace video {
+ struct config_t;
+@@ -585,8 +585,8 @@ namespace platf {
+ bool
+ needs_encoder_reenumeration();
+
+- boost::process::child
+- run_command(bool elevated, bool interactive, const std::string &cmd, boost::filesystem::path &working_dir, const boost::process::environment &env, FILE *file, std::error_code &ec, boost::process::group *group);
++ boost::process::v1::child
++ run_command(bool elevated, bool interactive, const std::string &cmd, boost::filesystem::path &working_dir, const boost::process::v1::environment &env, FILE *file, std::error_code &ec, boost::process::v1::group *group);
+
+ enum class thread_priority_e : int {
+ low,
+diff --git a/src/platform/linux/misc.cpp b/src/platform/linux/misc.cpp
+index 980c080..49a884c 100644
+--- a/src/platform/linux/misc.cpp
++++ b/src/platform/linux/misc.cpp
+@@ -15,7 +15,7 @@
+ // lib includes
+ #include
+ #include
+-#include
++#include
+ #include
+ #include
+ #include
+@@ -269,7 +269,7 @@ namespace platf {
+ auto working_dir = boost::filesystem::path(std::getenv("HOME"));
+ std::string cmd = R"(xdg-open ")" + url + R"(")";
+
+- boost::process::environment _env = boost::this_process::environment();
++ boost::process::v1::environment _env = boost::this_process::environment();
+ std::error_code ec;
+ auto child = run_command(false, false, cmd, working_dir, _env, nullptr, ec, nullptr);
+ if (ec) {
+diff --git a/src/platform/macos/misc.mm b/src/platform/macos/misc.mm
+index 20c2247..0415d13 100644
+--- a/src/platform/macos/misc.mm
++++ b/src/platform/macos/misc.mm
+@@ -23,7 +23,7 @@
+ #include "src/platform/common.h"
+
+ #include
+-#include
++#include
+
+ using namespace std::literals;
+ namespace fs = std::filesystem;
+@@ -197,7 +197,7 @@ namespace platf {
+ boost::filesystem::path working_dir;
+ std::string cmd = R"(open ")" + url + R"(")";
+
+- boost::process::environment _env = boost::this_process::environment();
++ boost::process::v1::environment _env = boost::this_process::environment();
+ std::error_code ec;
+ auto child = run_command(false, false, cmd, working_dir, _env, nullptr, ec, nullptr);
+ if (ec) {
+diff --git a/src/process.cpp b/src/process.cpp
+index 89dc4dc..83a73ff 100644
+--- a/src/process.cpp
++++ b/src/process.cpp
+@@ -40,7 +40,6 @@
+
+ namespace proc {
+ using namespace std::literals;
+- namespace bp = boost::process;
+ namespace pt = boost::property_tree;
+
+ proc_t proc;
+@@ -68,7 +67,7 @@ namespace proc {
+ * @param exit_timeout The timeout to wait for the process group to gracefully exit.
+ */
+ void
+- terminate_process_group(bp::child &proc, bp::group &group, std::chrono::seconds exit_timeout) {
++ terminate_process_group(boost::process::v1::child &proc, boost::process::v1::group &group, std::chrono::seconds exit_timeout) {
+ if (group.valid() && platf::process_group_running((std::uintptr_t) group.native_handle())) {
+ if (exit_timeout.count() > 0) {
+ // Request processes in the group to exit gracefully
+@@ -109,7 +108,7 @@ namespace proc {
+ }
+
+ boost::filesystem::path
+- find_working_directory(const std::string &cmd, bp::environment &env) {
++ find_working_directory(const std::string &cmd, boost::process::v1::environment &env) {
+ // Parse the raw command string into parts to get the actual command portion
+ #ifdef _WIN32
+ auto parts = boost::program_options::split_winmain(cmd);
+@@ -131,7 +130,7 @@ namespace proc {
+ // If the cmd path is not an absolute path, resolve it using our PATH variable
+ boost::filesystem::path cmd_path(parts.at(0));
+ if (!cmd_path.is_absolute()) {
+- cmd_path = boost::process::search_path(parts.at(0));
++ cmd_path = boost::process::v1::search_path(parts.at(0));
+ if (cmd_path.empty()) {
+ BOOST_LOG(error) << "Unable to find executable ["sv << parts.at(0) << "]. Is it in your PATH?"sv;
+ return boost::filesystem::path();
+@@ -311,8 +310,8 @@ namespace proc {
+ std::error_code ec;
+ placebo = false;
+ terminate_process_group(_process, _process_group, _app.exit_timeout);
+- _process = bp::child();
+- _process_group = bp::group();
++ _process = boost::process::v1::child();
++ _process_group = boost::process::v1::group();
+
+ for (; _app_prep_it != _app_prep_begin; --_app_prep_it) {
+ auto &cmd = *(_app_prep_it - 1);
+@@ -413,7 +412,7 @@ namespace proc {
+ }
+
+ std::string
+- parse_env_val(bp::native_environment &env, const std::string_view &val_raw) {
++ parse_env_val(boost::process::v1::native_environment &env, const std::string_view &val_raw) {
+ auto pos = std::begin(val_raw);
+ auto dollar = std::find(pos, std::end(val_raw), '$');
+
+diff --git a/src/process.h b/src/process.h
+index c875499..0344c1c 100644
+--- a/src/process.h
++++ b/src/process.h
+@@ -11,7 +11,7 @@
+ #include
+ #include
+
+-#include
++#include
+
+ #include "config.h"
+ #include "platform/common.h"
+@@ -68,7 +68,7 @@ namespace proc {
+ KITTY_DEFAULT_CONSTR_MOVE_THROW(proc_t)
+
+ proc_t(
+- boost::process::environment &&env,
++ boost::process::v1::environment &&env,
+ std::vector &&apps):
+ _app_id(0),
+ _env(std::move(env)),
+@@ -99,7 +99,7 @@ namespace proc {
+ private:
+ int _app_id;
+
+- boost::process::environment _env;
++ boost::process::v1::environment _env;
+ std::vector _apps;
+ ctx_t _app;
+ std::chrono::steady_clock::time_point _app_launch_time;
+@@ -107,8 +107,8 @@ namespace proc {
+ // If no command associated with _app_id, yet it's still running
+ bool placebo {};
+
+- boost::process::child _process;
+- boost::process::group _process_group;
++ boost::process::v1::child _process;
++ boost::process::v1::group _process_group;
+
+ file_t _pipe;
+ std::vector::const_iterator _app_prep_it;
+diff --git a/src/system_tray.cpp b/src/system_tray.cpp
+index c34c3d7..17e1c0f 100644
+--- a/src/system_tray.cpp
++++ b/src/system_tray.cpp
+@@ -33,7 +33,7 @@
+ // lib includes
+ #include "tray/tray.h"
+ #include
+- #include
++ #include
+
+ // local includes
+ #include "confighttp.h"
diff --git a/pkgs/by-name/su/sunshine/package.nix b/pkgs/by-name/su/sunshine/package.nix
index 71e52ec39f45a..0ee8b47422e8f 100644
--- a/pkgs/by-name/su/sunshine/package.nix
+++ b/pkgs/by-name/su/sunshine/package.nix
@@ -22,7 +22,7 @@
wayland-scanner,
libffi,
libcap,
- mesa,
+ libgbm,
curl,
pcre,
pcre2,
@@ -68,6 +68,10 @@ stdenv'.mkDerivation rec {
# fix(upnp): support newer miniupnpc library (#2782)
# Manually cherry-picked on to 0.23.1.
./0001-fix-upnp-support-newer-miniupnpc-library-2782.patch
+
+ # port of https://github.com/LizardByte/Sunshine/commit/e90b71ce62b7744bb18ffc7823b1e895786ffb0a
+ # remove on update
+ ./boost-186.patch
];
# build webui
@@ -135,7 +139,7 @@ stdenv'.mkDerivation rec {
libva
libvdpau
numactl
- mesa
+ libgbm
amf-headers
svt-av1
libappindicator
@@ -151,7 +155,7 @@ stdenv'.mkDerivation rec {
runtimeDependencies = [
avahi
- mesa
+ libgbm
xorg.libXrandr
libxcb
libglvnd
diff --git a/pkgs/by-name/su/superlu/package.nix b/pkgs/by-name/su/superlu/package.nix
index 9a75318fbb693..4487dedf7e08e 100644
--- a/pkgs/by-name/su/superlu/package.nix
+++ b/pkgs/by-name/su/superlu/package.nix
@@ -1,8 +1,10 @@
{
lib,
stdenv,
+ fetchFromGitHub,
fetchurl,
cmake,
+ ninja,
gfortran,
blas,
lapack,
@@ -10,45 +12,67 @@
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=";
};
+ 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"
+ cmakeFlags =
+ [
+ (lib.cmakeBool "BUILD_SHARED_LIBS" true)
+ (lib.cmakeBool "enable_fortran" true)
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ # prevent cmake from using Accelerate, which causes tests to segfault
+ # https://github.com/xiaoyeli/superlu/issues/155
+ "-DBLA_VENDOR=Generic"
];
- };
-
- patches = [
- ./add-superlu-lib-as-dependency-for-the-unit-tests.patch
- ];
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 20cd12dc2fd5c..e17bace101ad8 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
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- boost182
+ boost
fmt_11
mimalloc
# though only used in tests, cmake will complain its absence when configuring
diff --git a/pkgs/by-name/sv/svt-av1/package.nix b/pkgs/by-name/sv/svt-av1/package.nix
index 85f99a5368b0f..5f57b801bd7a9 100644
--- a/pkgs/by-name/sv/svt-av1/package.nix
+++ b/pkgs/by-name/sv/svt-av1/package.nix
@@ -12,13 +12,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 e82eda03070ef..42c59876ecb1b 100644
--- a/pkgs/by-name/sw/swaylock-effects/package.nix
+++ b/pkgs/by-name/sw/swaylock-effects/package.nix
@@ -27,7 +27,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 1ccaf4fb13fe3..22338889b02cf 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/sw/swtpm/package.nix b/pkgs/by-name/sw/swtpm/package.nix
index fb94c21b053a5..e2a4ac7b62962 100644
--- a/pkgs/by-name/sw/swtpm/package.nix
+++ b/pkgs/by-name/sw/swtpm/package.nix
@@ -26,13 +26,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "swtpm";
- version = "0.8.2";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "stefanberger";
repo = "swtpm";
rev = "v${finalAttrs.version}";
- hash = "sha256-48/BOzGPoKr/BGEXFo3FXWr6ZoPB+ixZIvv78g6L294=";
+ hash = "sha256-IeFrS67qStklaTgM0d3F8Xt8upm2kEawT0ZPFD7JKnk=";
};
patches = [
@@ -115,6 +115,10 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace tests/test_swtpm_setup_create_cert --replace \
'$CERTTOOL' \
'LC_ALL=C.UTF-8 $CERTTOOL'
+
+ substituteInPlace tests/test_tpm2_swtpm_cert --replace \
+ 'certtool' \
+ 'LC_ALL=C.UTF-8 certtool'
'';
doCheck = true;
diff --git a/pkgs/by-name/ta/tana/package.nix b/pkgs/by-name/ta/tana/package.nix
index 0d4ba69c1f352..fe1b46e66a03f 100644
--- a/pkgs/by-name/ta/tana/package.nix
+++ b/pkgs/by-name/ta/tana/package.nix
@@ -19,7 +19,7 @@
, libdrm
, libglvnd
, libxkbcommon
-, mesa
+, libgbm
, nspr
, nss
, pango
@@ -29,7 +29,7 @@
, dpkg
}:
let
- glLibs = [ libglvnd mesa ];
+ glLibs = [ libglvnd libgbm ];
libs = [
alsa-lib
atkmm
diff --git a/pkgs/by-name/tc/tcpkali/package.nix b/pkgs/by-name/tc/tcpkali/package.nix
index a8df1b1ddbbb4..3641c698ac481 100644
--- a/pkgs/by-name/tc/tcpkali/package.nix
+++ b/pkgs/by-name/tc/tcpkali/package.nix
@@ -20,7 +20,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 dbb549ec98bf5..9082b908317b9 100644
--- a/pkgs/by-name/te/telescope/package.nix
+++ b/pkgs/by-name/te/telescope/package.nix
@@ -10,7 +10,6 @@
ncurses,
autoreconfHook,
buildPackages,
- memstreamHook,
}:
stdenv.mkDerivation rec {
@@ -40,7 +39,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/te/termius/package.nix b/pkgs/by-name/te/termius/package.nix
index 659a1a831877f..ab296bf67968c 100644
--- a/pkgs/by-name/te/termius/package.nix
+++ b/pkgs/by-name/te/termius/package.nix
@@ -7,7 +7,7 @@
, stdenv
, lib
, libsecret
-, mesa
+, libgbm
, udev
, wrapGAppsHook3
, writeScript
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
buildInputs = [
alsa-lib
libsecret
- mesa
+ libgbm
];
unpackPhase = ''
diff --git a/pkgs/by-name/te/tetrd/package.nix b/pkgs/by-name/te/tetrd/package.nix
index 29bf0141b5bfd..d979ba73d92b8 100644
--- a/pkgs/by-name/te/tetrd/package.nix
+++ b/pkgs/by-name/te/tetrd/package.nix
@@ -18,7 +18,7 @@
libappindicator-gtk3,
libappindicator,
udev,
- mesa, # required for libgbm
+ libgbm,
}:
stdenv.mkDerivation rec {
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
libappindicator-gtk3
libappindicator
udev
- mesa
+ libgbm
];
installPhase = ''
diff --git a/pkgs/by-name/th/thedesk/package.nix b/pkgs/by-name/th/thedesk/package.nix
index 139bd4993ace4..7d91dd87ca17c 100644
--- a/pkgs/by-name/th/thedesk/package.nix
+++ b/pkgs/by-name/th/thedesk/package.nix
@@ -9,7 +9,7 @@
alsa-lib,
gtk3,
libxshmfence,
- mesa,
+ libgbm,
nss,
}:
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
alsa-lib
gtk3
libxshmfence
- mesa
+ libgbm
nss
];
diff --git a/pkgs/by-name/th/thin-provisioning-tools/Cargo.lock b/pkgs/by-name/th/thin-provisioning-tools/Cargo.lock
index 8f9a97c8733ee..a21223c91a816 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 = "anstream"
+version = "0.6.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
[[package]]
name = "anstyle"
-version = "1.0.6"
+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 = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
+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 = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "bindgen"
+version = "0.69.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+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,26 +145,52 @@ 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"
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 = "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.1"
+version = "4.5.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da"
+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 = "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 = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
+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"
@@ -185,14 +323,27 @@ dependencies = [
"regex",
]
+[[package]]
+name = "env_logger"
+version = "0.11.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "humantime",
+ "log",
+]
+
[[package]]
name = "errno"
-version = "0.3.8"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+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",
]
@@ -286,35 +449,76 @@ dependencies = [
"libc",
]
+[[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.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
[[package]]
name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+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 = "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 = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+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 = "pkg-config"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+
[[package]]
name = "portable-atomic"
-version = "1.6.0"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
+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 = "serde"
+version = "1.0.204"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.204"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.72",
+]
[[package]]
name = "shared_child"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef"
+checksum = "09fa9338aed9a1df411814a5b2252f7cd206c55ae9bf2fa763f8de84603aa60c"
dependencies = [
"libc",
- "winapi",
+ "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.0"
+version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
+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"
@@ -849,15 +1131,25 @@ dependencies = [
"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.52.3"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d380ba1dc7187569a8a9e91ed34b8ccfc33123bbacb8c0aed2d1ad7f3ef2dc5f"
+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 = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a4e9b6a7cac734a8b4138a4e1044eac3404d8326b6c0f939276560687a033fb"
+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 10850fdeeb681..0a1910c406665 100644
--- a/pkgs/by-name/th/thin-provisioning-tools/package.nix
+++ b/pkgs/by-name/th/thin-provisioning-tools/package.nix
@@ -1,21 +1,33 @@
{
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 b659a3b8eb0ac..bfa5fef27ec1a 100644
--- a/pkgs/by-name/th/thrift/package.nix
+++ b/pkgs/by-name/th/thrift/package.nix
@@ -28,23 +28,25 @@ stdenv.mkDerivation rec {
# pythonFull.buildEnv.override { extraLibs = [ thrift ]; }
pythonPath = [ ];
- nativeBuildInputs = [
- bison
- cmake
- flex
- pkg-config
- python3
- python3.pkgs.setuptools
- ];
-
- buildInputs =
+ nativeBuildInputs =
[
- boost
+ bison
+ cmake
+ flex
+ pkg-config
+ python3
+ python3.pkgs.setuptools
]
++ lib.optionals (!static) [
- (python3.withPackages (ps: [ ps.twisted ]))
+ python3.pkgs.twisted
];
+ buildInputs = [
+ boost
+ ];
+
+ strictDeps = true;
+
propagatedBuildInputs = [
libevent
openssl
diff --git a/pkgs/by-name/ti/ticktick/package.nix b/pkgs/by-name/ti/ticktick/package.nix
index 718954850104e..f0e4f357c749a 100644
--- a/pkgs/by-name/ti/ticktick/package.nix
+++ b/pkgs/by-name/ti/ticktick/package.nix
@@ -9,7 +9,7 @@
gcc-unwrapped,
nss,
libdrm,
- mesa,
+ libgbm,
alsa-lib,
xdg-utils,
systemd,
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
glibc
libdrm
gcc-unwrapped
- mesa
+ libgbm
alsa-lib
xdg-utils
];
diff --git a/pkgs/by-name/ti/tidal-hifi/package.nix b/pkgs/by-name/ti/tidal-hifi/package.nix
index fdbc237affb38..7165e3249c938 100644
--- a/pkgs/by-name/ti/tidal-hifi/package.nix
+++ b/pkgs/by-name/ti/tidal-hifi/package.nix
@@ -27,7 +27,7 @@
, libsecret
, libuuid
, libxkbcommon
-, mesa
+, libgbm
, nss
, pango
, systemd
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
gtk3
pango
systemd
- mesa # for libgbm
+ libgbm
nss
libuuid
libdrm
diff --git a/pkgs/by-name/ti/tintin/package.nix b/pkgs/by-name/ti/tintin/package.nix
index 2baa14b26a624..b03ec8caf6c47 100644
--- a/pkgs/by-name/ti/tintin/package.nix
+++ b/pkgs/by-name/ti/tintin/package.nix
@@ -4,8 +4,6 @@
lib,
zlib,
pcre,
- memorymappingHook,
- memstreamHook,
gnutls,
}:
@@ -20,16 +18,11 @@ 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 2a7d30f5d4ab6..28159f7f8fa91 100644
--- a/pkgs/by-name/ti/tinysparql/package.nix
+++ b/pkgs/by-name/ti/tinysparql/package.nix
@@ -1,7 +1,6 @@
{
stdenv,
lib,
- fetchpatch2,
fetchurl,
gettext,
meson,
@@ -38,7 +37,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "tinysparql";
- version = "3.8.0";
+ version = "3.8.1";
outputs = [
"out"
@@ -50,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
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;
@@ -124,14 +123,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 293280fa8e6ab..8515ee91a567c 100644
--- a/pkgs/by-name/tk/tkman/package.nix
+++ b/pkgs/by-name/tk/tkman/package.nix
@@ -27,7 +27,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/to/tonelib-metal/package.nix b/pkgs/by-name/to/tonelib-metal/package.nix
index 1286400c8bfe4..7f56789631500 100644
--- a/pkgs/by-name/to/tonelib-metal/package.nix
+++ b/pkgs/by-name/to/tonelib-metal/package.nix
@@ -7,7 +7,7 @@
alsa-lib,
freetype,
libglvnd,
- mesa,
+ libgbm,
curl,
libXcursor,
libXinerama,
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
alsa-lib
freetype
libglvnd
- mesa
+ libgbm
] ++ runtimeDependencies;
installPhase = ''
diff --git a/pkgs/by-name/to/tonelib-noisereducer/package.nix b/pkgs/by-name/to/tonelib-noisereducer/package.nix
index 24a12545767f2..548812bb7a62a 100644
--- a/pkgs/by-name/to/tonelib-noisereducer/package.nix
+++ b/pkgs/by-name/to/tonelib-noisereducer/package.nix
@@ -7,7 +7,7 @@
alsa-lib,
freetype,
libglvnd,
- mesa,
+ libgbm,
curl,
libXcursor,
libXinerama,
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
alsa-lib
freetype
libglvnd
- mesa
+ libgbm
] ++ runtimeDependencies;
installPhase = ''
diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix
index 8803c3a05704b..7f124fb9245da 100644
--- a/pkgs/by-name/to/tor-browser/package.nix
+++ b/pkgs/by-name/to/tor-browser/package.nix
@@ -26,7 +26,7 @@
libXrender,
libXt,
libXtst,
- mesa,
+ libgbm,
pango,
pciutils,
zlib,
@@ -90,7 +90,7 @@ lib.warnIf (useHardenedMalloc != null)
libXrender
libXt
libXtst
- mesa # for libgbm
+ libgbm
pango
pciutils
stdenv.cc.cc
diff --git a/pkgs/by-name/tp/tpm2-pkcs11/package.nix b/pkgs/by-name/tp/tpm2-pkcs11/package.nix
index 6d9782c76e5d8..3cf57622a92ea 100644
--- a/pkgs/by-name/tp/tpm2-pkcs11/package.nix
+++ b/pkgs/by-name/tp/tpm2-pkcs11/package.nix
@@ -2,7 +2,6 @@
stdenv,
lib,
fetchFromGitHub,
- substituteAll,
pkg-config,
autoreconfHook,
autoconf-archive,
diff --git a/pkgs/by-name/tr/tradingview/package.nix b/pkgs/by-name/tr/tradingview/package.nix
index b95cad50fec7c..36ae8ca5d7392 100644
--- a/pkgs/by-name/tr/tradingview/package.nix
+++ b/pkgs/by-name/tr/tradingview/package.nix
@@ -13,7 +13,7 @@
libdrm,
libsecret,
libxkbcommon,
- mesa,
+ libgbm,
pango,
sqlite,
systemd,
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
libdrm
libsecret
libxkbcommon
- mesa
+ libgbm
pango
sqlite
systemd
diff --git a/pkgs/by-name/tr/trigger/package.nix b/pkgs/by-name/tr/trigger/package.nix
index 683f3eaef8e08..1352e9df786d4 100644
--- a/pkgs/by-name/tr/trigger/package.nix
+++ b/pkgs/by-name/tr/trigger/package.nix
@@ -48,9 +48,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 40183616fd076..d708d70689e54 100644
--- a/pkgs/by-name/ts/tsduck/package.nix
+++ b/pkgs/by-name/ts/tsduck/package.nix
@@ -28,17 +28,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' \
@@ -47,11 +47,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 f07947677e3b7..2619380fdafbe 100644
--- a/pkgs/by-name/ts/tsocks/package.nix
+++ b/pkgs/by-name/ts/tsocks/package.nix
@@ -18,9 +18,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/ty/typora/package.nix b/pkgs/by-name/ty/typora/package.nix
index 3a26a8c82bc4f..c0d60b0061b15 100644
--- a/pkgs/by-name/ty/typora/package.nix
+++ b/pkgs/by-name/ty/typora/package.nix
@@ -13,7 +13,7 @@
pango,
cairo,
libxkbcommon,
- mesa,
+ libgbm,
expat,
alsa-lib,
buildFHSEnv,
@@ -64,7 +64,7 @@ let
libdrm
pango
cairo
- mesa
+ libgbm
libGL
expat
libxkbcommon
diff --git a/pkgs/by-name/um/umr/package.nix b/pkgs/by-name/um/umr/package.nix
index 416051d36c289..5f612bb93438c 100644
--- a/pkgs/by-name/um/umr/package.nix
+++ b/pkgs/by-name/um/umr/package.nix
@@ -8,7 +8,7 @@
pkg-config,
libdrm,
- mesa, # libgbm
+ libgbm,
libpciaccess,
llvmPackages,
nanomsg,
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libdrm
- mesa
+ libgbm
libpciaccess
llvmPackages.llvm
nanomsg
diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix
index 8fec1547052d0..f91012fbe9151 100644
--- a/pkgs/by-name/un/unbound/package.nix
+++ b/pkgs/by-name/un/unbound/package.nix
@@ -1,9 +1,10 @@
{ stdenv
, lib
-, fetchurl
+, fetchFromGitHub
, openssl
, nettle
, expat
+, flex
, libevent
, libsodium
, protobufc
@@ -52,11 +53,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "unbound";
- version = "1.21.1";
+ version = "1.22.0";
- src = fetchurl {
- url = "https://nlnetlabs.nl/downloads/unbound/unbound-${finalAttrs.version}.tar.gz";
- hash = "sha256-MDbSPCNiKzbTyH6UMRe97BrI+Bljbrl42AZBaw+p6kY=";
+ src = fetchFromGitHub {
+ owner = "NLnetLabs";
+ repo = "unbound";
+ rev = "refs/tags/release-${finalAttrs.version}";
+ hash = "sha256-CFsd8tdFL+JbxmDZoWdStvWcs9azSaLtMG8Ih5oXE/A=";
};
outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
@@ -64,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs =
lib.optionals withMakeWrapper [ makeWrapper ]
++ lib.optionals withDNSTAP [ protobufc ]
- ++ [ pkg-config ]
+ ++ [ pkg-config flex ]
++ lib.optionals withPythonModule [ swig ];
buildInputs = [ openssl nettle expat libevent ]
@@ -144,7 +147,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/up/upwork/package.nix b/pkgs/by-name/up/upwork/package.nix
index 722cdb0a6bf7b..345520b0684d5 100644
--- a/pkgs/by-name/up/upwork/package.nix
+++ b/pkgs/by-name/up/upwork/package.nix
@@ -35,7 +35,7 @@
libXrender,
libXScrnSaver,
libXtst,
- mesa,
+ libgbm,
nspr,
nss,
openssl,
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
libXrender
libXScrnSaver
libXtst
- mesa
+ libgbm
nspr
nss
pango
diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix
index b852ad0198109..e726ec46d343d 100644
--- a/pkgs/by-name/ut/util-linux/package.nix
+++ b/pkgs/by-name/ut/util-linux/package.nix
@@ -21,7 +21,6 @@
installShellFiles,
writeSupport ? stdenv.hostPlatform.isLinux,
shadowSupport ? stdenv.hostPlatform.isLinux,
- memstreamHook,
gitUpdater,
}:
@@ -126,8 +125,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 651d4c41cc0bb..0000000000000
--- 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 2652cbbc3e896..a841051076870 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.11";
src = fetchFromGitHub {
owner = "astral-sh";
repo = "uv";
- rev = "refs/tags/${version}";
- hash = "sha256-xy/fgy3+YvSdfq5ngPVbAmRpYyJH27Cft5QxBwFQumU=";
+ tag = version;
+ hash = "sha256-0HdMjul925TkJGYQHsmQBYQoEkDYyXFSTEgZ/jg5V0o=";
};
- 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-T1Yk8JNPdkxpLegeFuL2J7mbFOX4yyCPfvHyFfu6YsM=";
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,21 +49,21 @@ 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 { };
};
meta = {
description = "Extremely fast Python package installer and resolver, written in Rust";
homepage = "https://github.com/astral-sh/uv";
- changelog = "https://github.com/astral-sh/uv/blob/${src.rev}/CHANGELOG.md";
+ changelog = "https://github.com/astral-sh/uv/blob/${version}/CHANGELOG.md";
license = with lib.licenses; [
asl20
mit
diff --git a/pkgs/by-name/uw/uwimap/gcc-14-fix.diff b/pkgs/by-name/uw/uwimap/gcc-14-fix.diff
new file mode 100644
index 0000000000000..1cf39630f4b1f
--- /dev/null
+++ b/pkgs/by-name/uw/uwimap/gcc-14-fix.diff
@@ -0,0 +1,57 @@
+diff --git a/src/mtest/mtest.c b/src/mtest/mtest.c
+index 69af568..8278c60 100644
+--- a/src/mtest/mtest.c
++++ b/src/mtest/mtest.c
+@@ -39,6 +39,8 @@
+ #include "c-client.h"
+ #include "imap4r1.h"
+
++char *gets(char *s);
++
+ /* Excellent reasons to hate ifdefs, and why my real code never uses them */
+
+ #ifndef unix
+diff --git a/src/osdep/unix/flocklnx.c b/src/osdep/unix/flocklnx.c
+index ca0112a..f4366ee 100644
+--- a/src/osdep/unix/flocklnx.c
++++ b/src/osdep/unix/flocklnx.c
+@@ -32,6 +32,7 @@
+ #ifndef NFS_SUPER_MAGIC
+ #define NFS_SUPER_MAGIC 0x6969
+ #endif
++#include "flocklnx.h"
+
+ int safe_flock (int fd,int op)
+ {
+diff --git a/src/osdep/unix/flocklnx.h b/src/osdep/unix/flocklnx.h
+new file mode 100644
+index 0000000..03a71f7
+--- /dev/null
++++ b/src/osdep/unix/flocklnx.h
+@@ -0,0 +1,2 @@
++
++int safe_flock (int fd,int op);
+diff --git a/src/osdep/unix/os_lnx.h b/src/osdep/unix/os_lnx.h
+index b5f39ff..963765c 100644
+--- a/src/osdep/unix/os_lnx.h
++++ b/src/osdep/unix/os_lnx.h
+@@ -60,6 +60,7 @@
+ #define flock safe_flock
+
+
++#include "flocklnx.h"
+ #include "env_unix.h"
+ #include "fs.h"
+ #include "ftl.h"
+diff --git a/src/osdep/unix/os_slx.h b/src/osdep/unix/os_slx.h
+index b5f39ff..963765c 100644
+--- a/src/osdep/unix/os_slx.h
++++ b/src/osdep/unix/os_slx.h
+@@ -60,6 +60,7 @@
+ #define flock safe_flock
+
+
++#include "flocklnx.h"
+ #include "env_unix.h"
+ #include "fs.h"
+ #include "ftl.h"
diff --git a/pkgs/by-name/uw/uwimap/package.nix b/pkgs/by-name/uw/uwimap/package.nix
index 86a6e1b0cee78..7c2095f259599 100644
--- a/pkgs/by-name/uw/uwimap/package.nix
+++ b/pkgs/by-name/uw/uwimap/package.nix
@@ -38,13 +38,27 @@ stdenv.mkDerivation rec {
# Required to build with newer versions of clang. Fixes call to undeclared functions errors
# and incompatible function pointer conversions.
./clang-fix.patch
+ ./gcc-14-fix.diff
];
- postPatch = ''
- sed -i src/osdep/unix/Makefile -e 's,/usr/local/ssl,${openssl.dev},'
- sed -i src/osdep/unix/Makefile -e 's,^SSLCERTS=.*,SSLCERTS=/etc/ssl/certs,'
- sed -i src/osdep/unix/Makefile -e 's,^SSLLIB=.*,SSLLIB=${lib.getLib openssl}/lib,'
- '';
+ postPatch =
+ ''
+ sed -i src/osdep/unix/Makefile -e 's,/usr/local/ssl,${openssl.dev},'
+ sed -i src/osdep/unix/Makefile -e 's,^SSLCERTS=.*,SSLCERTS=/etc/ssl/certs,'
+ sed -i src/osdep/unix/Makefile -e 's,^SSLLIB=.*,SSLLIB=${lib.getLib openssl}/lib,'
+ ''
+ # utime takes a struct utimbuf rather than an array of time_t[2]
+ # convert time_t tp[2] to a struct utimbuf where
+ # tp[0] -> tp.actime and tp[1] -> tp.modtime, where actime and modtime are
+ # type time_t.
+ + ''
+ sed -i \
+ -e 's/time_t tp\[2]/struct utimbuf tp/' \
+ -e 's/\]*\),tp)/\1,\&tp)/' \
+ src/osdep/unix/{mbx.c,mh.c,mmdf.c,mtx.c,mx.c,tenex.c,unix.c}
+ '';
preConfigure = ''
makeFlagsArray+=("ARRC=${stdenv.cc.targetPrefix}ar rc")
diff --git a/pkgs/by-name/ve/vectorscan/package.nix b/pkgs/by-name/ve/vectorscan/package.nix
index 8525a66e4092b..860ea03f7a2de 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/vi/viber/package.nix b/pkgs/by-name/vi/viber/package.nix
index 30ba2c31de98d..dc12285fcf3ae 100644
--- a/pkgs/by-name/vi/viber/package.nix
+++ b/pkgs/by-name/vi/viber/package.nix
@@ -28,7 +28,7 @@
libxml2,
libxslt,
libwebp,
- mesa,
+ libgbm,
nspr,
nss,
openssl,
@@ -84,7 +84,7 @@ stdenv.mkDerivation {
libxml2
libxslt
libwebp
- mesa
+ libgbm
nspr
nss
openssl
diff --git a/pkgs/by-name/vi/virglrenderer/package.nix b/pkgs/by-name/vi/virglrenderer/package.nix
index 88cf039ef6c84..79516f5ed487b 100644
--- a/pkgs/by-name/vi/virglrenderer/package.nix
+++ b/pkgs/by-name/vi/virglrenderer/package.nix
@@ -10,7 +10,7 @@
libepoxy,
libX11,
libdrm,
- mesa,
+ libgbm,
vaapiSupport ? true,
libva,
gitUpdater,
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
libepoxy
libX11
libdrm
- mesa
+ libgbm
] ++ lib.optionals vaapiSupport [ libva ];
nativeBuildInputs = [
diff --git a/pkgs/by-name/vk/vk-bootstrap/package.nix b/pkgs/by-name/vk/vk-bootstrap/package.nix
index dad17ce802c83..15ba18a3f10c0 100644
--- a/pkgs/by-name/vk/vk-bootstrap/package.nix
+++ b/pkgs/by-name/vk/vk-bootstrap/package.nix
@@ -26,8 +26,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/vk/vkmark/package.nix b/pkgs/by-name/vk/vkmark/package.nix
index f3733e2033b95..fde8e189455d6 100644
--- a/pkgs/by-name/vk/vkmark/package.nix
+++ b/pkgs/by-name/vk/vkmark/package.nix
@@ -7,7 +7,7 @@
ninja,
vulkan-headers,
vulkan-loader,
- mesa,
+ libgbm,
wayland-protocols,
wayland,
glm,
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
buildInputs = [
vulkan-headers
vulkan-loader
- mesa
+ libgbm
glm
assimp
libxcb
diff --git a/pkgs/by-name/vl/vlc/package.nix b/pkgs/by-name/vl/vlc/package.nix
index ee03c8bfc4d92..5b038614ac9c8 100644
--- a/pkgs/by-name/vl/vlc/package.nix
+++ b/pkgs/by-name/vl/vlc/package.nix
@@ -192,6 +192,7 @@ stdenv.mkDerivation (finalAttrs: {
systemd
taglib
xcbutilkeysyms
+ wayland-scanner # only required for configure script
zlib
]
++ optionals (!stdenv.hostPlatform.isAarch && !onlyLibVLC) [ live555 ]
@@ -219,6 +220,7 @@ stdenv.mkDerivation (finalAttrs: {
]
)
++ optionals (waylandSupport && withQt5) [ libsForQt5.qtwayland ];
+ strictDeps = true;
env =
{
diff --git a/pkgs/by-name/w3/w3m/package.nix b/pkgs/by-name/w3/w3m/package.nix
index fab906a9f194a..7363dfe3ed3b2 100644
--- a/pkgs/by-name/w3/w3m/package.nix
+++ b/pkgs/by-name/w3/w3m/package.nix
@@ -70,7 +70,7 @@ 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/wa/waf/package.nix b/pkgs/by-name/wa/waf/package.nix
index bb3c4df40ef19..77423091ed7a2 100644
--- a/pkgs/by-name/wa/waf/package.nix
+++ b/pkgs/by-name/wa/waf/package.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "waf";
- version = "2.1.3";
+ version = "2.1.4";
src = fetchFromGitLab {
owner = "ita1024";
repo = "waf";
rev = "waf-${finalAttrs.version}";
- hash = "sha256-7ujlE0brLFmET7tAy0/RTdDORUyr6keZ3OjvxBOC/BI=";
+ hash = "sha256-Dt8eo/rY6JRu6teTQM0y7bjMzQjOv3WSL6bcF9g0B8o=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/wa/waffle/package.nix b/pkgs/by-name/wa/waffle/package.nix
index 4433e4c057c0d..544e9f90e9764 100644
--- a/pkgs/by-name/wa/waffle/package.nix
+++ b/pkgs/by-name/wa/waffle/package.nix
@@ -19,7 +19,7 @@
wayland-protocols,
wayland-scanner,
useGbm ? true,
- mesa,
+ libgbm,
udev,
}:
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
- owner = "mesa";
+ owner = "libgbm";
repo = "waffle";
rev = "v${version}";
sha256 = "sha256-Y7GRYLqSO572qA1eZ3jS8QlZ1X9xKpDtScaySTuPK/U=";
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
]
++ lib.optionals useGbm [
udev
- mesa
+ libgbm
];
depsBuildBuild = [ pkg-config ];
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
mainProgram = "wflinfo";
homepage = "https://www.waffle-gl.org/";
license = licenses.bsd2;
- inherit (mesa.meta) platforms;
+ inherit (libgbm.meta) platforms;
maintainers = with maintainers; [ Flakebi ];
};
}
diff --git a/pkgs/by-name/wa/wangle/package.nix b/pkgs/by-name/wa/wangle/package.nix
index 356f479eab139..1a0da53573ffd 100644
--- a/pkgs/by-name/wa/wangle/package.nix
+++ b/pkgs/by-name/wa/wangle/package.nix
@@ -100,10 +100,11 @@ stdenv.mkDerivation (finalAttrs: {
ctest -j $NIX_BUILD_CORES --output-on-failure ${
# Deterministic glibc abort 🫠
+ # SSLContextManagerTest uses 15+ GB of RAM
lib.optionalString stdenv.hostPlatform.isLinux (
lib.escapeShellArgs [
"--exclude-regex"
- "^(BootstrapTest|BroadcastPoolTest)$"
+ "^(BootstrapTest|BroadcastPoolTest|SSLContextManagerTest)$"
]
)
}
diff --git a/pkgs/by-name/wa/wavebox/package.nix b/pkgs/by-name/wa/wavebox/package.nix
index b8a5deb3e93a9..939acef922910 100644
--- a/pkgs/by-name/wa/wavebox/package.nix
+++ b/pkgs/by-name/wa/wavebox/package.nix
@@ -41,7 +41,7 @@
libkrb5,
libdrm,
libglvnd,
- mesa,
+ libgbm,
libxkbcommon,
pipewire,
wayland,
@@ -140,7 +140,7 @@ let
libkrb5
libdrm
libglvnd
- mesa
+ libgbm
coreutils
libxkbcommon
pipewire
diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix
index 8537dc221c095..8d70107b3a775 100644
--- a/pkgs/by-name/wa/waveterm/package.nix
+++ b/pkgs/by-name/wa/waveterm/package.nix
@@ -18,7 +18,7 @@
libXext,
libXfixes,
libXrandr,
- mesa,
+ libgbm,
expat,
libxcb,
alsa-lib,
@@ -123,7 +123,7 @@ let
libXext
libXfixes
libXrandr
- mesa
+ libgbm
expat
libxcb
alsa-lib
diff --git a/pkgs/by-name/wa/waybox/package.nix b/pkgs/by-name/wa/waybox/package.nix
index 4908afd37caa1..0bae81241e337 100644
--- a/pkgs/by-name/wa/waybox/package.nix
+++ b/pkgs/by-name/wa/waybox/package.nix
@@ -8,7 +8,7 @@
libxml2,
libevdev,
libinput,
- mesa,
+ libgbm,
meson,
ninja,
pixman,
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
libxml2
libevdev
libinput
- mesa # for libEGL
+ libgbm
pixman
udev
wayland
diff --git a/pkgs/by-name/wa/waypipe/package.nix b/pkgs/by-name/wa/waypipe/package.nix
index 53c1ceabb2e01..05985b54e053c 100644
--- a/pkgs/by-name/wa/waypipe/package.nix
+++ b/pkgs/by-name/wa/waypipe/package.nix
@@ -6,7 +6,7 @@
ninja,
pkg-config,
scdoc,
- mesa,
+ libgbm,
lz4,
zstd,
ffmpeg,
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
# Optional dependencies:
- mesa
+ libgbm
lz4
zstd
ffmpeg
diff --git a/pkgs/by-name/wa/wayvnc/package.nix b/pkgs/by-name/wa/wayvnc/package.nix
index 0da4469f0ed9f..1de0a39a0c0b4 100644
--- a/pkgs/by-name/wa/wayvnc/package.nix
+++ b/pkgs/by-name/wa/wayvnc/package.nix
@@ -9,7 +9,7 @@
, aml
, jansson
, libxkbcommon
-, mesa
+, libgbm
, neatvnc
, pam
, pixman
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
aml
jansson
libxkbcommon
- mesa
+ libgbm
neatvnc
pam
pixman
diff --git a/pkgs/by-name/we/webex/package.nix b/pkgs/by-name/we/webex/package.nix
index 0b878d9004f9b..0604bf8f47557 100644
--- a/pkgs/by-name/we/webex/package.nix
+++ b/pkgs/by-name/we/webex/package.nix
@@ -28,7 +28,7 @@
libxkbcommon,
libxcrypt-legacy,
lshw,
- mesa,
+ libgbm,
nspr,
nss,
pango,
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
gtk3
harfbuzz
lshw
- mesa
+ libgbm
nspr
nss
pango
diff --git a/pkgs/by-name/we/wechat-uos/package.nix b/pkgs/by-name/we/wechat-uos/package.nix
index c505dac72b282..0791fd971288a 100644
--- a/pkgs/by-name/we/wechat-uos/package.nix
+++ b/pkgs/by-name/we/wechat-uos/package.nix
@@ -16,7 +16,7 @@
xcbutilimage,
xcbutilkeysyms,
xcbutilrenderutil,
- mesa,
+ libgbm,
alsa-lib,
wayland,
atk,
@@ -122,7 +122,7 @@ let
libxml2
pango
libdrm
- mesa
+ libgbm
vulkan-loader
systemd
wayland
diff --git a/pkgs/by-name/we/weston/package.nix b/pkgs/by-name/we/weston/package.nix
index 38ffb0112b982..8c31cb0b22a06 100644
--- a/pkgs/by-name/we/weston/package.nix
+++ b/pkgs/by-name/we/weston/package.nix
@@ -15,7 +15,7 @@
libevdev,
libinput,
libxkbcommon,
- mesa,
+ libgbm,
seatd,
wayland,
wayland-protocols,
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
libevdev
libinput
libxkbcommon
- mesa
+ libgbm
seatd
wayland
wayland-protocols
diff --git a/pkgs/by-name/wf/wf-recorder/package.nix b/pkgs/by-name/wf/wf-recorder/package.nix
index 5f25b7112d98d..4389f5caa4634 100644
--- a/pkgs/by-name/wf/wf-recorder/package.nix
+++ b/pkgs/by-name/wf/wf-recorder/package.nix
@@ -13,7 +13,7 @@
x264,
libpulseaudio,
pipewire,
- mesa, # for libgbm
+ libgbm,
fetchpatch,
}:
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
x264
libpulseaudio
pipewire
- mesa
+ libgbm
];
meta = with lib; {
diff --git a/pkgs/by-name/wi/wifish/package.nix b/pkgs/by-name/wi/wifish/package.nix
index 33a3e994954e0..cc2b979c342a4 100644
--- a/pkgs/by-name/wi/wifish/package.nix
+++ b/pkgs/by-name/wi/wifish/package.nix
@@ -22,7 +22,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/wi/wio/package.nix b/pkgs/by-name/wi/wio/package.nix
index 7cc758e21ebb1..ff6800243c407 100644
--- a/pkgs/by-name/wi/wio/package.nix
+++ b/pkgs/by-name/wi/wio/package.nix
@@ -7,7 +7,7 @@
cairo,
libxkbcommon,
makeWrapper,
- mesa,
+ libgbm,
meson,
ninja,
pkg-config,
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
cairo
libxkbcommon
- mesa
+ libgbm
udev
wayland
wayland-protocols
diff --git a/pkgs/by-name/wi/wire-desktop/package.nix b/pkgs/by-name/wi/wire-desktop/package.nix
index def5016749470..c1464cfd65c45 100644
--- a/pkgs/by-name/wi/wire-desktop/package.nix
+++ b/pkgs/by-name/wi/wire-desktop/package.nix
@@ -12,7 +12,7 @@
xar,
libdbusmenu,
alsa-lib,
- mesa,
+ libgbm,
nss,
nspr,
systemd,
@@ -115,7 +115,7 @@ let
buildInputs = [
alsa-lib
- mesa
+ libgbm
nss
nspr
systemd
diff --git a/pkgs/by-name/wl/wlvncc/package.nix b/pkgs/by-name/wl/wlvncc/package.nix
index 58feac19a8f50..1717989b7deb7 100644
--- a/pkgs/by-name/wl/wlvncc/package.nix
+++ b/pkgs/by-name/wl/wlvncc/package.nix
@@ -13,7 +13,7 @@
libpng,
libxkbcommon,
lzo,
- mesa,
+ libgbm,
meson,
ninja,
openssl,
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
libpng
libxkbcommon
lzo
- mesa
+ libgbm
openssl
pixman
wayland
diff --git a/pkgs/by-name/x2/x2goserver/package.nix b/pkgs/by-name/x2/x2goserver/package.nix
index bac2b554aee35..f253d3649382b 100644
--- a/pkgs/by-name/x2/x2goserver/package.nix
+++ b/pkgs/by-name/x2/x2goserver/package.nix
@@ -143,7 +143,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/xa/xarcan/package.nix b/pkgs/by-name/xa/xarcan/package.nix
index 5a57e1efb1276..f75a86e6707f9 100644
--- a/pkgs/by-name/xa/xarcan/package.nix
+++ b/pkgs/by-name/xa/xarcan/package.nix
@@ -20,7 +20,7 @@
libxcb,
libxkbfile,
libxshmfence,
- mesa,
+ libgbm,
meson,
nettle,
ninja,
@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalPackages: {
libxcb
libxkbfile
libxshmfence
- mesa
+ libgbm
nettle
openssl
pixman
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
index d01567042041f..b498daaabc892 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
@@ -3,7 +3,7 @@
rustPlatform,
fetchFromGitHub,
gst_all_1,
- mesa,
+ libgbm,
pkg-config,
libglvnd,
libxkbcommon,
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
libglvnd
libxkbcommon
- mesa
+ libgbm
pipewire
wayland
];
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix
index cb6f6ec5add32..0151ea6ed1cb5 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix
@@ -12,7 +12,7 @@
grim,
inih,
libdrm,
- mesa,
+ libgbm,
pipewire,
scdoc,
slurp,
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
buildInputs = [
inih
libdrm
- mesa
+ libgbm
pipewire
systemd
wayland
diff --git a/pkgs/by-name/xe/xemu/package.nix b/pkgs/by-name/xe/xemu/package.nix
index 13b481f8a6762..6ac359aa818db 100644
--- a/pkgs/by-name/xe/xemu/package.nix
+++ b/pkgs/by-name/xe/xemu/package.nix
@@ -12,7 +12,7 @@
libpcap,
libsamplerate,
libslirp,
- mesa,
+ libgbm,
meson,
ninja,
openssl,
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
libpcap
libsamplerate
libslirp
- mesa
+ libgbm
openssl
vte
];
diff --git a/pkgs/by-name/xf/xfitter/package.nix b/pkgs/by-name/xf/xfitter/package.nix
index 7a5b9f902d314..3ed41c91d8a76 100644
--- a/pkgs/by-name/xf/xfitter/package.nix
+++ b/pkgs/by-name/xf/xfitter/package.nix
@@ -19,8 +19,6 @@
qcdnum,
root,
zlib,
- memorymappingHook,
- memstreamHook,
}:
stdenv.mkDerivation rec {
@@ -61,10 +59,6 @@ stdenv.mkDerivation rec {
apfelgrid
applgrid
]
- ++ lib.optionals (stdenv.system == "x86_64-darwin") [
- memorymappingHook
- memstreamHook
- ]
++ lib.optional (stdenv.hostPlatform.libc == "glibc") libtirpc;
env.NIX_CFLAGS_COMPILE = lib.optionalString (
diff --git a/pkgs/by-name/xl/xlockmore/package.nix b/pkgs/by-name/xl/xlockmore/package.nix
index 491d03d6ad3b8..c1eaa8a515c88 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 55fcb1d6af845..b98d12137850b 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 befc92f7522ca..a96de8723816e 100644
--- a/pkgs/by-name/xs/xsimd/package.nix
+++ b/pkgs/by-name/xs/xsimd/package.nix
@@ -29,6 +29,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 0000000000000..7623f6e81e4a0
--- /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/ya/yandex-browser/package.nix b/pkgs/by-name/ya/yandex-browser/package.nix
index 21469edcbca91..cf537fefc008d 100644
--- a/pkgs/by-name/ya/yandex-browser/package.nix
+++ b/pkgs/by-name/ya/yandex-browser/package.nix
@@ -40,7 +40,7 @@
, libpulseaudio
, libuuid
, libxshmfence
-, mesa
+, libgbm
, nspr
, pango
, systemd
@@ -125,7 +125,7 @@ in stdenv.mkDerivation rec {
libuuid
libxcb
libxshmfence
- mesa
+ libgbm
nspr
nss
pango
diff --git a/pkgs/by-name/za/zaz/package.nix b/pkgs/by-name/za/zaz/package.nix
index 455b10a997499..166048c8689db 100644
--- a/pkgs/by-name/za/zaz/package.nix
+++ b/pkgs/by-name/za/zaz/package.nix
@@ -5,7 +5,7 @@
pkg-config,
SDL,
SDL_image,
- mesa,
+ libgbm,
libtheora,
libvorbis,
libogg,
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
(lib.getDev SDL)
SDL_image
- mesa
+ libgbm
libtheora
libvorbis.dev
libogg
diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 7f04320f1f273..315842a3a3c6b 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -34,7 +34,7 @@
apple-sdk_15,
darwinMinVersionHook,
makeWrapper,
- nodejs_22,
+ nodejs,
libGL,
libX11,
libXext,
@@ -209,7 +209,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/ze/zepp-simulator/package.nix b/pkgs/by-name/ze/zepp-simulator/package.nix
index ee8dc262c87b5..f8d4503660f9d 100644
--- a/pkgs/by-name/ze/zepp-simulator/package.nix
+++ b/pkgs/by-name/ze/zepp-simulator/package.nix
@@ -35,7 +35,7 @@
dtc,
capstone_4,
libjpeg8,
- mesa,
+ libgbm,
curlWithGnuTls,
}:
@@ -102,7 +102,7 @@ stdenv.mkDerivation {
libjpeg8
dtc
capstone_4
- mesa
+ libgbm
curlWithGnuTls
];
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 0000000000000..58d070a3c2b96
--- /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 2ee3fff0db543..0000000000000
--- 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 55bda33a25730..0000000000000
--- 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 003f8dfb4df5d..764219b4c8804 100644
--- a/pkgs/by-name/zi/zip/package.nix
+++ b/pkgs/by-name/zi/zip/package.nix
@@ -5,6 +5,7 @@
enableNLS ? false,
libnatspec ? null,
libiconv,
+ fetchpatch,
}:
assert enableNLS -> libnatspec != null;
@@ -20,12 +21,12 @@ stdenv.mkDerivation rec {
];
sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h";
};
- prePatch = ''
+
+ postPatch = ''
substituteInPlace unix/Makefile --replace 'CC = cc' ""
+ substituteInPlace unix/configure --replace-fail "O3" "O2"
'';
- hardeningDisable = [ "format" ];
-
makefile = "unix/Makefile";
buildFlags = if stdenv.hostPlatform.isCygwin then [ "cygwin" ] else [ "generic" ];
installFlags = [
@@ -34,17 +35,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 =
diff --git a/pkgs/by-name/zo/zod/package.nix b/pkgs/by-name/zo/zod/package.nix
index c3a296662be6f..3d5306c1e2f5d 100644
--- a/pkgs/by-name/zo/zod/package.nix
+++ b/pkgs/by-name/zo/zod/package.nix
@@ -14,7 +14,7 @@
makeWrapper,
coreutils,
scalingFactor ? 2, # this is to resize the fixed-size zod_launcher window
- substituteAll,
+ replaceVars,
}:
let
pname = "zod-engine";
@@ -94,9 +94,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/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index 344f3819b5b0f..183c139d12a51 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -22,7 +22,7 @@
gtk3,
gdk-pixbuf,
glib,
- mesa,
+ libgbm,
nspr,
nss,
pango,
@@ -89,7 +89,7 @@ let
gtk3
gdk-pixbuf
glib
- mesa
+ libgbm
nspr
nss
pango
diff --git a/pkgs/by-name/zo/zotero-beta/package.nix b/pkgs/by-name/zo/zotero-beta/package.nix
index f96296b4fc66a..9b4f1eca9b576 100644
--- a/pkgs/by-name/zo/zotero-beta/package.nix
+++ b/pkgs/by-name/zo/zotero-beta/package.nix
@@ -13,7 +13,7 @@
gtk3,
libGL,
xorg,
- mesa,
+ libgbm,
pango,
pciutils,
}:
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
xorg.libXrandr
xorg.libXtst
xorg.libxcb
- mesa
+ libgbm
pango
pciutils
]
diff --git a/pkgs/by-name/zo/zotero/linux.nix b/pkgs/by-name/zo/zotero/linux.nix
index 5a3d3570fc3f2..11da052579004 100644
--- a/pkgs/by-name/zo/zotero/linux.nix
+++ b/pkgs/by-name/zo/zotero/linux.nix
@@ -17,7 +17,7 @@
libGL,
libva,
xorg,
- mesa,
+ libgbm,
pango,
pciutils,
}:
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
xorg.libXrandr
xorg.libXtst
xorg.libxcb
- mesa
+ libgbm
pango
pciutils
]
diff --git a/pkgs/by-name/zs/zsh-powerlevel10k/package.nix b/pkgs/by-name/zs/zsh-powerlevel10k/package.nix
index 574e1f966b276..9474577c628a0 100644
--- a/pkgs/by-name/zs/zsh-powerlevel10k/package.nix
+++ b/pkgs/by-name/zs/zsh-powerlevel10k/package.nix
@@ -3,6 +3,7 @@
stdenv,
fetchFromGitHub,
replaceVars,
+ fetchpatch,
gitstatus,
bash,
}:
@@ -19,6 +20,16 @@ let
rev = "refs/tags/v${version}";
hash = "sha256-mVfB3HWjvk4X8bmLEC/U8SKBRytTh/gjjuReqzN5qTk=";
};
+
+ patches = (oldAtttrs.patches or [ ]) ++ [
+ # remove when bumped to 1.5.5
+ (fetchpatch {
+ url = "https://github.com/romkatv/gitstatus/commit/62177e89b2b04baf242cd1526cc2661041dda0fb.patch";
+ sha256 = "sha256-DSRYRV89MLR/Eh4MFsXpDKH1xJiAWyJgSqmfjDTXhtU=";
+ name = "drop-Werror.patch";
+ })
+ ];
+
});
in
stdenv.mkDerivation rec {
diff --git a/pkgs/by-name/zv/zvbi/package.nix b/pkgs/by-name/zv/zvbi/package.nix
index 55982a1c81b95..d645c12600173 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.43";
src = fetchFromGitHub {
owner = "zapping-vbi";
repo = "zvbi";
- rev = "refs/tags/v${finalAttrs.version}";
- hash = "sha256-IeSGscgz51IndX6Xbu8Kw8GcJ9MLXXFhV+4LvnVkrLE=";
+ rev = "v${finalAttrs.version}";
+ hash = "sha256-Pj37lJSa1spjC/xrf+yu/ecFCuajb8ingszp6ib2WC8=";
};
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/zw/zwave-js-server/package.nix b/pkgs/by-name/zw/zwave-js-server/package.nix
index 711ce58bb3eac..4786d1486e364 100644
--- a/pkgs/by-name/zw/zwave-js-server/package.nix
+++ b/pkgs/by-name/zw/zwave-js-server/package.nix
@@ -6,16 +6,16 @@
buildNpmPackage rec {
pname = "zwave-js-server";
- version = "1.38.0";
+ version = "1.40.2";
src = fetchFromGitHub {
owner = "zwave-js";
repo = pname;
rev = version;
- hash = "sha256-rAm/IPTnMUkwU/7Jzr0OEUDoKiUWxxEKZ21FxQW8sY8=";
+ hash = "sha256-+S6sMJKmvi5P7eDEWtimArY1W/5IABl/cZkTqhDORgc=";
};
- npmDepsHash = "sha256-7dlXppXCmryxq90QI0Lq3CE6BUHSogTHmHBMCbkZWT0=";
+ npmDepsHash = "sha256-HfxYR62r0D0LTmj4Lb+dCvD4tdpE8b7nmk5wki7vEM8=";
# For some reason the zwave-js dependency is in devDependencies
npmFlags = [ "--include=dev" ];
diff --git a/pkgs/by-name/zx/zxing-cpp/package.nix b/pkgs/by-name/zx/zxing-cpp/package.nix
index cc1a3caa939bc..e1fc987ec466d 100644
--- a/pkgs/by-name/zx/zxing-cpp/package.nix
+++ b/pkgs/by-name/zx/zxing-cpp/package.nix
@@ -19,6 +19,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/deepin/core/deepin-kwin/default.nix b/pkgs/desktops/deepin/core/deepin-kwin/default.nix
index 5db2a43a55968..49e1ec49d7697 100644
--- a/pkgs/desktops/deepin/core/deepin-kwin/default.nix
+++ b/pkgs/desktops/deepin/core/deepin-kwin/default.nix
@@ -11,7 +11,7 @@
gsettings-qt,
libepoxy,
libinput,
- mesa,
+ libgbm,
lcms2,
xorg,
}:
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
gsettings-qt
libinput
- mesa
+ libgbm
lcms2
xorg.libxcb
diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix
index 8b9d3ccdc692f..bdff377686d98 100644
--- a/pkgs/desktops/enlightenment/efl/default.nix
+++ b/pkgs/desktops/enlightenment/efl/default.nix
@@ -40,7 +40,7 @@
libxkbcommon,
luajit,
lz4,
- mesa,
+ libgbm,
mint-x-icons,
openjpeg,
openssl,
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
libsndfile
libtiff
lz4
- mesa
+ libgbm
openssl
systemd
udev
diff --git a/pkgs/desktops/gnustep/make/default.nix b/pkgs/desktops/gnustep/make/default.nix
index 06aa0a59bd39a..d29cc55c56a5a 100644
--- a/pkgs/desktops/gnustep/make/default.nix
+++ b/pkgs/desktops/gnustep/make/default.nix
@@ -18,12 +18,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/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch
index dc1d1e2083c00..7f2a4daab5656 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch
+++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch
@@ -108,7 +108,7 @@ index fc498985e..b5d204d0d 100755
if [ $ERRORS -ne 0 ]; then
- FAILURES_FILES="${FAILURES_FILES} ${_TESTNAME}\n"
- ((FAILURES+=$ERRORS))
-+ if [[ $ERROR_EXCEPTIONS == *" $_TESTNAME "* ]]; then
++ if [[ " $ERROR_EXCEPTIONS " == *" $_TESTNAME "* ]]; then
+ EXCEPTED_FAILURES_FILES="${EXCEPTED_FAILURES_FILES} ${_TESTNAME}\n"
+ ((EXCEPTED_FAILURES+=$ERRORS))
+ else
@@ -117,7 +117,7 @@ index fc498985e..b5d204d0d 100755
+ fi
elif [ $WARNINGS -ne 0 ]; then
- if [[ $EXCEPTIONS == *$_TESTNAME* ]]; then
-+ if [[ $EXCEPTIONS == *" $_TESTNAME "* ]]; then
++ if [[ " $EXCEPTIONS " == *" $_TESTNAME "* ]]; then
EXCEPTED_FILES="${EXCEPTED_FILES} ${_TESTNAME}\n"
((EXCEPTED+=$WARNINGS))
else
@@ -125,7 +125,7 @@ index fc498985e..b5d204d0d 100755
((FATAL_WARNINGS+=$WARNINGS))
fi
- elif [[ $EXCEPTIONS == *$_TESTNAME* ]]; then
-+ elif [[ $ERROR_EXCEPTIONS == *" $_TESTNAME "* || $EXCEPTIONS == *" $_TESTNAME "* ]]; then
++ elif [[ " $ERROR_EXCEPTIONS " == *" $_TESTNAME "* || " $EXCEPTIONS " == *" $_TESTNAME "* ]]; then
WOOT_FILES="${WOOT_FILES} ${_TESTNAME}\n"
fi
done
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
index f4d7451835f03..1dc0bac2b3dd3 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
@@ -15,7 +15,6 @@
, libgee
, libhandy
, gnome-settings-daemon
-, mesa
, mutter
, elementary-icon-theme
, wingpanel-with-indicators
@@ -67,7 +66,6 @@ stdenv.mkDerivation rec {
libgee
libhandy
lightdm
- mesa # for libEGL
mutter
];
diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix
index 3864fa39ed494..6233e3f167900 100644
--- a/pkgs/desktops/pantheon/desktop/gala/default.nix
+++ b/pkgs/desktops/pantheon/desktop/gala/default.nix
@@ -17,7 +17,6 @@
, bamf
, libcanberra-gtk3
, gnome-desktop
-, mesa
, mutter
, gnome-settings-daemon
, wrapGAppsHook3
@@ -77,7 +76,6 @@ stdenv.mkDerivation rec {
gtk3
libcanberra-gtk3
libgee
- mesa # for libEGL
mutter
systemd
];
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
index e6fb2a57e7d28..27e4667c2b2f6 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
@@ -14,7 +14,6 @@
, granite
, gettext
, mutter
-, mesa
, json-glib
, elementary-gtk-theme
, elementary-icon-theme
@@ -59,7 +58,6 @@ stdenv.mkDerivation rec {
json-glib
libgee
mutter
- mesa # for libEGL
];
preFixup = ''
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index 93a02955b5f16..db92d57340491 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -66,7 +66,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
@@ -76,7 +76,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/desktops/plasma-5/kpipewire.nix b/pkgs/desktops/plasma-5/kpipewire.nix
index c24dd55e3ff9b..0b961199d0365 100644
--- a/pkgs/desktops/plasma-5/kpipewire.nix
+++ b/pkgs/desktops/plasma-5/kpipewire.nix
@@ -7,7 +7,7 @@
plasma-wayland-protocols,
libepoxy,
ffmpeg,
- mesa,
+ libgbm,
pipewire,
wayland,
}:
@@ -21,7 +21,7 @@ mkDerivation {
kcoreaddons
plasma-wayland-protocols
ffmpeg
- mesa
+ libgbm
pipewire
wayland
];
diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix
index d271ec0e0b2ee..a96dd3dcf8a1a 100644
--- a/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/pkgs/desktops/plasma-5/kwin/default.nix
@@ -13,7 +13,7 @@
libdrm,
libinput,
libxkbcommon,
- mesa,
+ libgbm,
pipewire,
udev,
wayland,
@@ -77,7 +77,7 @@ mkDerivation {
libdrm
libinput
libxkbcommon
- mesa
+ libgbm
pipewire
udev
wayland
diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
index 4c218b24592d6..3e520dd2ef04c 100644
--- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
+++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
@@ -6,7 +6,7 @@
wayland-scanner,
cups,
libepoxy,
- mesa,
+ libgbm,
pcre,
pipewire,
wayland,
@@ -36,7 +36,7 @@ mkDerivation {
buildInputs = [
cups
libepoxy
- mesa
+ libgbm
pcre
pipewire
wayland
diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix
index d014a6cfd1fdf..15734ad67078d 100644
--- a/pkgs/development/compilers/binaryen/default.nix
+++ b/pkgs/development/compilers/binaryen/default.nix
@@ -20,13 +20,13 @@ let
in
stdenv.mkDerivation rec {
pname = "binaryen";
- version = "119";
+ version = "120_b";
src = fetchFromGitHub {
owner = "WebAssembly";
repo = "binaryen";
rev = "version_${version}";
- hash = "sha256-JYXtN3CW4qm/nnjGRvv3GxQ0x9O9wHtNYQLqHIYTTOA=";
+ hash = "sha256-gdqjsAQp4NTHROAf6i44GjkbtNyLPQZ153k3veK7eYs=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix
index 4d1871fb52f5b..8ef82e0e7d5ef 100644
--- a/pkgs/development/compilers/chicken/5/chicken.nix
+++ b/pkgs/development/compilers/chicken/5/chicken.nix
@@ -41,9 +41,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}"
diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix
index 0e683d8cf8f5a..5af2874d33940 100644
--- a/pkgs/development/compilers/chicken/5/overrides.nix
+++ b/pkgs/development/compilers/chicken/5/overrides.nix
@@ -148,11 +148,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:
(
diff --git a/pkgs/development/compilers/dotnet/completions/dotnet.bash b/pkgs/development/compilers/dotnet/completions/dotnet.bash
index 56c599e4358d5..3cc4f77f7d8eb 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 a020d6a2ce31e..bd8d9069941f3 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 89151d0e19c49..dcd8073b4f391 100644
--- a/pkgs/development/compilers/flutter/flutter.nix
+++ b/pkgs/development/compilers/flutter/flutter.nix
@@ -61,11 +61,12 @@ let
name = "flutter-${version}-unwrapped";
inherit src patches version;
- buildInputs = [ git ];
nativeBuildInputs = [
makeWrapper
jq
+ git
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ];
+ strictDeps = true;
preConfigure = ''
if [ "$(< bin/internal/engine.version)" != '${engineVersion}' ]; then
@@ -76,6 +77,7 @@ let
postPatch = ''
patchShebangs --build ./bin/
+ patchShebangs packages/flutter_tools/bin
'';
buildPhase = ''
diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix
index 1b3754dad6bd7..ce6041c974094 100644
--- a/pkgs/development/compilers/gcc/common/builder.nix
+++ b/pkgs/development/compilers/gcc/common/builder.nix
@@ -193,7 +193,7 @@ 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 ca64ac375ca35..a8594171d9098 100644
--- a/pkgs/development/compilers/gcc/common/pre-configure.nix
+++ b/pkgs/development/compilers/gcc/common/pre-configure.nix
@@ -40,44 +40,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 5e35a660785cb..91d27aba7e2b7 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 27d455aa58b67..c08706e8097f6 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 0000000000000..ee27f402956e6
--- /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 0000000000000..ea6dfe9c9b47e
--- /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 0000000000000..83aecff1a0df9
--- /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 657a0f8769782..16e9d6ad19593 100644
--- a/pkgs/development/compilers/gcc/patches/default.nix
+++ b/pkgs/development/compilers/gcc/patches/default.nix
@@ -38,6 +38,16 @@ 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
@@ -82,6 +92,8 @@ in
)
++ [ ./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
## 2. Patches relevant to gcc>=12 on specific platforms ####################################
@@ -152,60 +164,62 @@ in
.${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=";
- })
- ];
- "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=";
- })
- ];
- "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=";
- })
- ];
- "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=";
- })
- ];
- "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=";
- })
+++ 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"
];
- }
- .${majorVersion} or [ ]
- )
+ 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.
++ optionals (stdenv.hostPlatform.isDarwin) (
diff --git a/pkgs/development/compilers/gcc/versions.nix b/pkgs/development/compilers/gcc/versions.nix
index bbd32c21e9608..d34b45bcf764b 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";
@@ -14,7 +14,7 @@ let
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/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix
index 4d056b1504493..388b10a02d02c 100644
--- a/pkgs/development/compilers/go/1.23.nix
+++ b/pkgs/development/compilers/go/1.23.nix
@@ -50,11 +50,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "go";
- version = "1.23.3";
+ version = "1.23.4";
src = fetchurl {
url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
- hash = "sha256-jWp3MySHVXxq+iQhExtQ+D20rjxXnDvHLmcO4faWhZk=";
+ hash = "sha256-rTRaxCHpCBQpOpaZzKGd1SOCUcP2h5gLvK4oSVsmNTE=";
};
strictDeps = true;
@@ -192,7 +192,7 @@ stdenv.mkDerivation (finalAttrs: {
};
meta = with lib; {
- changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor finalAttrs.version}";
+ changelog = "https://go.dev/doc/devel/release#go${finalAttrs.version}";
description = "Go Programming language";
homepage = "https://go.dev/";
license = licenses.bsd3;
diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix
index 19d24f47da47c..bcd97a5becb80 100644
--- a/pkgs/development/compilers/halide/default.nix
+++ b/pkgs/development/compilers/halide/default.nix
@@ -8,7 +8,7 @@
libffi,
libpng,
libjpeg,
- mesa,
+ libgbm,
libGL,
eigen,
openblas,
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
openblas
]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
- mesa
+ libgbm
libGL
];
diff --git a/pkgs/development/compilers/jetbrains-jdk/17.nix b/pkgs/development/compilers/jetbrains-jdk/17.nix
index bb9cd0a389420..8b0a0104b2f57 100644
--- a/pkgs/development/compilers/jetbrains-jdk/17.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/17.nix
@@ -24,7 +24,7 @@
nss,
nspr,
libdrm,
- mesa,
+ libgbm,
wayland,
udev,
}:
@@ -130,7 +130,7 @@ openjdk17.overrideAttrs (oldAttrs: rec {
nss
nspr
libdrm
- mesa
+ libgbm
wayland
udev
]
diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index 35f0a2722d2ae..05878b5797034 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -23,7 +23,7 @@
nss,
nspr,
libdrm,
- mesa,
+ libgbm,
wayland,
udev,
}:
@@ -130,7 +130,7 @@ jdk.overrideAttrs (oldAttrs: rec {
nss
nspr
libdrm
- mesa
+ libgbm
wayland
udev
]
diff --git a/pkgs/development/compilers/jetbrains-jdk/jcef.nix b/pkgs/development/compilers/jetbrains-jdk/jcef.nix
index 6baef76f924a8..7a7b98e510dde 100644
--- a/pkgs/development/compilers/jetbrains-jdk/jcef.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/jcef.nix
@@ -32,7 +32,7 @@
libXext,
libXfixes,
libXrandr,
- mesa,
+ libgbm,
gtk3,
pango,
cairo,
@@ -67,7 +67,7 @@ let
libXext
libXfixes
libXrandr
- mesa
+ libgbm
gtk3
pango
cairo
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 20d35c9f3ea91..0000000000000
--- 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 29942f8ed03d6..0000000000000
--- 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 80c2eb3623832..0000000000000
--- 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 0000000000000..b265e7922c0d2
--- /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 8c3b30ffd4f59..1552eb3993dcf 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 0000000000000..9a7a18a4c5ad2
--- /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 656c823eb33f8..50c8a3c96834a 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}" { inherit (monorepoSrc) passthru; } (''
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 b53f76e96c11f..102a43161e3d8 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 1c37f27da8d8d..01969b4c5bd53 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 0470100bc7de8..a1a7ff535433b 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/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 139f4fbb35351..606cb70dc3cce 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -29,7 +29,7 @@ let
"16.0.6".officialRelease.sha256 = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs=";
"17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag=";
"18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
- "19.1.4".officialRelease.sha256 = "sha256-qi1a/AWxF5j+4O38VQ2R/tvnToVAlMjgv9SP0PNWs3g=";
+ "19.1.5".officialRelease.sha256 = "sha256-QxQL4QwUH6e5HWpBvI8yIbZYBNwqqRsZqPH0w/JSiHQ=";
"20.0.0-git".gitRelease = {
rev = "eb5cda480d2ad81230b2aa3e134e2b603ff90a1c";
rev-version = "20.0.0-unstable-2024-11-26";
diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix
index ee3b6b5991a15..43ce3e68612de 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 9d1281352ee1f..8232079a2adcd 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/binary.nix b/pkgs/development/compilers/rust/binary.nix
index 2e6aa5ca329f0..05cd7c213d915 100644
--- a/pkgs/development/compilers/rust/binary.nix
+++ b/pkgs/development/compilers/rust/binary.nix
@@ -158,13 +158,19 @@ rec {
patchShebangs .
'';
- installPhase = ''
- patchShebangs ./install.sh
- ./install.sh --prefix=$out \
- --components=cargo
-
- wrapProgram "$out/bin/cargo" \
- --suffix PATH : "${rustc}/bin"
- '';
+ installPhase =
+ ''
+ patchShebangs ./install.sh
+ ./install.sh --prefix=$out \
+ --components=cargo
+ ''
+ + lib.optionalString stdenv.hostPlatform.isDarwin ''
+ install_name_tool -change "/usr/lib/libcurl.4.dylib" \
+ "${curl.out}/lib/libcurl.4.dylib" "$out/bin/cargo"
+ ''
+ + ''
+ wrapProgram "$out/bin/cargo" \
+ --suffix PATH : "${rustc}/bin"
+ '';
};
}
diff --git a/pkgs/development/compilers/rust/cargo-auditable.nix b/pkgs/development/compilers/rust/cargo-auditable.nix
index e058270319334..bbe89acbe41a7 100644
--- a/pkgs/development/compilers/rust/cargo-auditable.nix
+++ b/pkgs/development/compilers/rust/cargo-auditable.nix
@@ -2,7 +2,6 @@
lib,
buildPackages,
fetchFromGitHub,
- fetchpatch,
makeRustPlatform,
installShellFiles,
stdenv,
@@ -11,24 +10,21 @@
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/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 2641755a86d46..af287fcc9079d 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -291,6 +291,12 @@ stdenv.mkDerivation (finalAttrs: {
# Useful debugging parameter
# export VERBOSE=1
''
+ + lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.targetPlatform.isDarwin) ''
+ # Replace hardcoded path to strip with llvm-strip
+ # https://github.com/NixOS/nixpkgs/issues/299606
+ substituteInPlace compiler/rustc_codegen_ssa/src/back/link.rs \
+ --replace-fail "/usr/bin/strip" "${lib.getExe' llvmShared "llvm-strip"}"
+ ''
+ lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
# See https://github.com/jemalloc/jemalloc/issues/1997
# Using a value of 48 should work on both emulated and native x86_64-darwin.
diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix
index 05ead37f67d3e..a0652b127c37f 100644
--- a/pkgs/development/compilers/rust/rustfmt.nix
+++ b/pkgs/development/compilers/rust/rustfmt.nix
@@ -1,13 +1,15 @@
{
lib,
stdenv,
+ cargo,
+ makeWrapper,
rustPlatform,
rustc,
Security,
asNightly ? false,
}:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
pname = "rustfmt" + lib.optionalString asNightly "-nightly";
inherit (rustc) version src;
@@ -18,6 +20,10 @@ rustPlatform.buildRustPackage rec {
# changes hash of vendor directory otherwise
dontUpdateAutotoolsGnuConfigScripts = true;
+ nativeBuildInputs = [
+ makeWrapper
+ ];
+
buildInputs = [
rustc.llvm
] ++ lib.optional stdenv.hostPlatform.isDarwin Security;
@@ -41,6 +47,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 9bdf63cdaf447..d950d033f6812 100644
--- a/pkgs/development/compilers/scala-runners/default.nix
+++ b/pkgs/development/compilers/scala-runners/default.nix
@@ -19,7 +19,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/cuda/overrides.nix b/pkgs/development/cuda-modules/cuda/overrides.nix
index 3970830e75674..1302fb4f305be 100644
--- a/pkgs/development/cuda-modules/cuda/overrides.nix
+++ b/pkgs/development/cuda-modules/cuda/overrides.nix
@@ -247,7 +247,7 @@ filterAndCreateOverrides {
libcurand,
libGLU,
libglvnd,
- mesa,
+ libgbm,
}:
prevAttrs: {
buildInputs = prevAttrs.buildInputs ++ [
@@ -256,7 +256,7 @@ filterAndCreateOverrides {
libcurand
libGLU
libglvnd
- mesa
+ libgbm
];
};
@@ -320,7 +320,7 @@ filterAndCreateOverrides {
"nsight-systems/*/*/libexec"
"nsight-systems/*/*/libQt*"
"nsight-systems/*/*/libstdc*"
- "nsight-systems/*/*/Mesa"
+ "nsight-systems/*/*/libgbm"
"nsight-systems/*/*/Plugins"
"nsight-systems/*/*/python/bin/python"
];
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 7799d72873a05..7586f9f4b4141 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 8cf41506627d6..17dbb7db48954 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -240,6 +240,34 @@ self: super: {
];
}) super.statistics;
+ # Work around -Werror failures until a more permanent solution is released
+ # https://github.com/haskell-cryptography/HsOpenSSL/issues/88
+ # https://github.com/haskell-cryptography/HsOpenSSL/issues/93
+ # https://github.com/haskell-cryptography/HsOpenSSL/issues/95
+ HsOpenSSL = appendConfigureFlags [
+ "--ghc-option=-optc=-Wno-error=incompatible-pointer-types"
+ ] super.HsOpenSSL;
+ # Work around compilation failures with gcc >= 14
+ # https://github.com/audreyt/hssyck/issues/5
+ HsSyck = appendConfigureFlags [
+ "--ghc-option=-optc=-Wno-error=implicit-function-declaration"
+ ] super.HsSyck;
+ # https://github.com/rethab/bindings-dsl/issues/46
+ bindings-libcddb = appendConfigureFlags [
+ "--ghc-option=-optc=-Wno-error=incompatible-pointer-types"
+ ] super.bindings-libcddb;
+ # https://github.com/ocramz/hdf5-lite/issues/3
+ hdf5-lite = appendConfigureFlags [
+ "--ghc-option=-optc=-Wno-error=implicit-function-declaration"
+ ] super.hdf5-lite;
+ # https://github.com/awkward-squad/termbox/issues/5
+ termbox-bindings-c = appendConfigureFlags [
+ "--ghc-option=-optc=-Wno-error=implicit-function-declaration"
+ ] super.termbox-bindings-c;
+ libxml-sax = appendConfigureFlags [
+ "--ghc-option=-optc=-Wno-error=implicit-function-declaration"
+ ] super.libxml-sax;
+
# There are numerical tests on random data, that may fail occasionally
lapack = dontCheck super.lapack;
@@ -2617,9 +2645,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 e5e1bd62c3dff..2658a1c190afe 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 f9e811106f20d..2a92ef16dc6fb 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 7617bae86ecee..8b24fbe3ebd79 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 170408d0bb9f5..4454c45a090c9 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/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
index ad542da643255..73b813c6b003a 100644
--- a/pkgs/development/interpreters/guile/2.0.nix
+++ b/pkgs/development/interpreters/guile/2.0.nix
@@ -11,15 +11,22 @@
libffi,
libtool,
libunistring,
+ libiconvReal,
makeWrapper,
pkg-config,
pkgsBuildBuild,
readline,
-}:
+}@args:
let
# Do either a coverage analysis build or a standard build.
builder = if coverageAnalysis != null then coverageAnalysis else stdenv.mkDerivation;
+ # workaround for libiconv bug in macOS 14/15
+ libunistring =
+ if stdenv.hostPlatform.isDarwin then
+ args.libunistring.override { libiconv = libiconvReal; }
+ else
+ args.libunistring;
in
builder rec {
pname = "guile";
diff --git a/pkgs/development/interpreters/guile/2.2.nix b/pkgs/development/interpreters/guile/2.2.nix
index deb74210bdb7c..1e027408ef677 100644
--- a/pkgs/development/interpreters/guile/2.2.nix
+++ b/pkgs/development/interpreters/guile/2.2.nix
@@ -11,15 +11,22 @@
libffi,
libtool,
libunistring,
+ libiconvReal,
makeWrapper,
pkg-config,
pkgsBuildBuild,
readline,
-}:
+}@args:
let
# Do either a coverage analysis build or a standard build.
builder = if coverageAnalysis != null then coverageAnalysis else stdenv.mkDerivation;
+ # workaround for libiconv bug in macOS 14/15
+ libunistring =
+ if stdenv.hostPlatform.isDarwin then
+ args.libunistring.override { libiconv = libiconvReal; }
+ else
+ args.libunistring;
in
builder rec {
pname = "guile";
diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix
index 473c05ea8383c..a1227d1774c94 100644
--- a/pkgs/development/interpreters/guile/3.0.nix
+++ b/pkgs/development/interpreters/guile/3.0.nix
@@ -11,17 +11,24 @@
libffi,
libtool,
libunistring,
+ libiconvReal,
libxcrypt,
makeWrapper,
pkg-config,
pkgsBuildBuild,
readline,
writeScript,
-}:
+}@args:
let
# Do either a coverage analysis build or a standard build.
builder = if coverageAnalysis != null then coverageAnalysis else stdenv.mkDerivation;
+ # workaround for libiconv bug in macOS 14/15
+ libunistring =
+ if stdenv.hostPlatform.isDarwin then
+ args.libunistring.override { libiconv = libiconvReal; }
+ else
+ args.libunistring;
in
builder rec {
pname = "guile";
diff --git a/pkgs/development/interpreters/python/cpython/3.12/CVE-2024-12254.patch b/pkgs/development/interpreters/python/cpython/3.12/CVE-2024-12254.patch
new file mode 100644
index 0000000000000..1a19a41d8d4ab
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/3.12/CVE-2024-12254.patch
@@ -0,0 +1,45 @@
+From e991ac8f2037d78140e417cc9a9486223eb3e786 Mon Sep 17 00:00:00 2001
+From: "J. Nick Koston"
+Date: Thu, 5 Dec 2024 22:33:03 -0600
+Subject: [PATCH] gh-127655: Ensure `_SelectorSocketTransport.writelines`
+ pauses the protocol if needed (#127656)
+
+Ensure `_SelectorSocketTransport.writelines` pauses the protocol if it reaches the high water mark as needed.
+
+Co-authored-by: Kumar Aditya
+
+diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py
+index f94bf10b4225e7..f1ab9b12d69a5d 100644
+--- a/Lib/asyncio/selector_events.py
++++ b/Lib/asyncio/selector_events.py
+@@ -1175,6 +1175,7 @@ def writelines(self, list_of_data):
+ # If the entire buffer couldn't be written, register a write handler
+ if self._buffer:
+ self._loop._add_writer(self._sock_fd, self._write_ready)
++ self._maybe_pause_protocol()
+
+ def can_write_eof(self):
+ return True
+diff --git a/Lib/test/test_asyncio/test_selector_events.py b/Lib/test/test_asyncio/test_selector_events.py
+index aaeda33dd0c677..efca30f37414f9 100644
+--- a/Lib/test/test_asyncio/test_selector_events.py
++++ b/Lib/test/test_asyncio/test_selector_events.py
+@@ -805,6 +805,18 @@ def test_writelines_send_partial(self):
+ self.assertTrue(self.sock.send.called)
+ self.assertTrue(self.loop.writers)
+
++ def test_writelines_pauses_protocol(self):
++ data = memoryview(b'data')
++ self.sock.send.return_value = 2
++ self.sock.send.fileno.return_value = 7
++
++ transport = self.socket_transport()
++ transport._high_water = 1
++ transport.writelines([data])
++ self.assertTrue(self.protocol.pause_writing.called)
++ self.assertTrue(self.sock.send.called)
++ self.assertTrue(self.loop.writers)
++
+ @unittest.skipUnless(selector_events._HAS_SENDMSG, 'no sendmsg')
+ def test_write_sendmsg_full(self):
+ data = memoryview(b'data')
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index cde97c4049d94..4027cc03da1bd 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
@@ -298,6 +294,8 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
] ++ optionals (pythonOlder "3.12") [
# https://github.com/python/cpython/issues/90656
./loongarch-support.patch
+ ] ++ optionals (pythonAtLeast "3.12") [
+ ./3.12/CVE-2024-12254.patch
] ++ optionals (pythonAtLeast "3.11" && pythonOlder "3.13") [
# backport fix for https://github.com/python/cpython/issues/95855
./platform-triplet-detection.patch
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 5b09e4bf97b3b..3ca7ce093f228 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=";
};
};
@@ -70,10 +70,10 @@ in {
sourceVersion = {
major = "3";
minor = "11";
- patch = "10";
+ patch = "11";
suffix = "";
};
- hash = "sha256-B6Q1bpEpAOYaFcsJSaBsSgUBLiE+zWtOhND2equ+43I=";
+ hash = "sha256-Kpkgx6DNI23jNkTtmAoTy7whBYv9xSj+u2CBV17XO+M=";
inherit passthruFun;
};
diff --git a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh
index fd61fd14043d2..b542398a92b0a 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 dfa237c96174e..d1ae10648a17b 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
@@ -98,7 +98,7 @@ in
cyclic-dependencies = 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 36ce389de50f8..77a6f33d49dd4 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 7834d4292939e..359c71402e70b 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -435,8 +435,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/interpreters/spidermonkey/128.nix b/pkgs/development/interpreters/spidermonkey/128.nix
index 7a46aafdcd961..bbf122857d13a 100644
--- a/pkgs/development/interpreters/spidermonkey/128.nix
+++ b/pkgs/development/interpreters/spidermonkey/128.nix
@@ -1,4 +1,4 @@
import ./common.nix {
- version = "128.1.0";
- hash = "sha512-gFWn+DrPDKthJLpYCa/xwILoGg0w/zGOxxn4/T9K+apg4glMGr1smBGT11EHWpVpNwF24g5Q88GVn+J6FVETiA==";
+ version = "128.5.0";
+ hash = "sha512-/yDxj5LF6c0dnq98OM7GG8qy3KjdKBdRm3ErwfdgtcbikCEqzzKJFSdk5RMOAWJpULfs2TJ7LFh7JKJGWRr9Zw==";
}
diff --git a/pkgs/development/interpreters/tcl/tcl-package-hook.sh b/pkgs/development/interpreters/tcl/tcl-package-hook.sh
index 8548ac66402f0..b1c89f8dacf2e 100644
--- a/pkgs/development/interpreters/tcl/tcl-package-hook.sh
+++ b/pkgs/development/interpreters/tcl/tcl-package-hook.sh
@@ -23,7 +23,7 @@ _addToTclLibPath() {
if [[ -z "${TCLLIBPATH-}" ]]; then
export TCLLIBPATH="$tclPkg"
else
- if [[ "$TCLLIBPATH" != *"$tclPkg "* && "$TCLLIBPATH" != *"$tclPkg" ]]; then
+ if [[ "$TCLLIBPATH " != *"$tclPkg "* ]]; then
export TCLLIBPATH="${TCLLIBPATH} $tclPkg"
fi
fi
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 9e319154717bf..926841fe1dd09 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -5,6 +5,7 @@
fetchFromGitHub,
nix-update-script,
pkg-config,
+ mesa,
libGLSupported ? lib.elem stdenv.hostPlatform.system mesa.meta.platforms,
openglSupport ? libGLSupported,
libGL,
@@ -27,7 +28,7 @@
wayland-scanner,
drmSupport ? false,
libdrm,
- mesa,
+ libgbm,
libxkbcommon,
dbusSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
dbus,
@@ -146,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optionals drmSupport [
libdrm
- mesa
+ libgbm
];
buildInputs =
diff --git a/pkgs/development/libraries/abseil-cpp/202301.nix b/pkgs/development/libraries/abseil-cpp/202301.nix
index 0280a183e8693..897bd3854ac20 100644
--- a/pkgs/development/libraries/abseil-cpp/202301.nix
+++ b/pkgs/development/libraries/abseil-cpp/202301.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, cmake
, gtest
, static ? stdenv.hostPlatform.isStatic
@@ -18,7 +19,15 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-7C/QIXYRyUyNVVE0tqmv8b5g/uWc58iBI5jzdtddQ+U=";
};
- patches = lib.optionals stdenv.hostPlatform.isDarwin [
+ patches = [
+ # Fixes: clang++: error: unsupported option '-msse4.1' for target 'aarch64-apple-darwin'
+ # https://github.com/abseil/abseil-cpp/pull/1707
+ (fetchpatch {
+ name = "fix-compile-breakage-on-darwin";
+ url = "https://github.com/abseil/abseil-cpp/commit/6dee153242d7becebe026a9bed52f4114441719d.patch";
+ hash = "sha256-r6QnHPnwPwOE/hv4kLNA3FqNq2vU/QGmwAc5q0/q1cs=";
+ })
+ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
# Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages
# that require a different SDK other than the default one.
./cmake-core-foundation.patch
diff --git a/pkgs/development/libraries/abseil-cpp/202401.nix b/pkgs/development/libraries/abseil-cpp/202401.nix
index ad5417d6eb623..7a9d1eb836e3c 100644
--- a/pkgs/development/libraries/abseil-cpp/202401.nix
+++ b/pkgs/development/libraries/abseil-cpp/202401.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, cmake
, gtest
, static ? stdenv.hostPlatform.isStatic
@@ -18,6 +19,16 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-eA2/dZpNOlex1O5PNa3XSZhpMB3AmaIoHzVDI9TD/cg=";
};
+ patches = [
+ # Fixes: clang++: error: unsupported option '-msse4.1' for target 'aarch64-apple-darwin'
+ # https://github.com/abseil/abseil-cpp/pull/1707
+ (fetchpatch {
+ name = "fix-compile-breakage-on-darwin";
+ url = "https://github.com/abseil/abseil-cpp/commit/6dee153242d7becebe026a9bed52f4114441719d.patch";
+ hash = "sha256-r6QnHPnwPwOE/hv4kLNA3FqNq2vU/QGmwAc5q0/q1cs=";
+ })
+ ];
+
cmakeFlags = [
"-DABSL_BUILD_TEST_HELPERS=ON"
"-DABSL_USE_EXTERNAL_GOOGLETEST=ON"
diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix
index 2cc9ff68f7df9..997a4d1b0e914 100644
--- a/pkgs/development/libraries/aspell/default.nix
+++ b/pkgs/development/libraries/aspell/default.nix
@@ -1,6 +1,7 @@
{
lib,
stdenv,
+ fetchpatch,
fetchurl,
fetchzip,
perl,
@@ -35,7 +36,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 a407faec05efe..8f485a04fb2b3 100644
--- a/pkgs/development/libraries/aws-c-cal/default.nix
+++ b/pkgs/development/libraries/aws-c-cal/default.nix
@@ -11,13 +11,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 f97c2def0aabf..ef2a51754de24 100644
--- a/pkgs/development/libraries/aws-c-io/default.nix
+++ b/pkgs/development/libraries/aws-c-io/default.nix
@@ -12,13 +12,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 6e549526a14ce..15e0e1127c9cc 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 79cf7fa099f1c..0000000000000
--- a/pkgs/development/libraries/boost/1.84.nix
+++ /dev/null
@@ -1,19 +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 45eefa25413c7..0000000000000
--- a/pkgs/development/libraries/boost/1.85.nix
+++ /dev/null
@@ -1,19 +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 59123eb779c4c..ba64bdee09dec 100644
--- a/pkgs/development/libraries/boost/default.nix
+++ b/pkgs/development/libraries/boost/default.nix
@@ -27,7 +27,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 d7182414f7338..91009c02167eb 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -89,6 +89,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
]
@@ -201,7 +211,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/";
@@ -213,6 +233,8 @@ 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 c9b8058542001..1da943ee81953 100644
--- a/pkgs/development/libraries/catch2/3.nix
+++ b/pkgs/development/libraries/catch2/3.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
[
"-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
diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix
index be83ec2d8ac92..469a33c8d713e 100644
--- a/pkgs/development/libraries/cogl/default.nix
+++ b/pkgs/development/libraries/cogl/default.nix
@@ -17,7 +17,7 @@
mesa,
automake,
autoconf,
- gstreamerSupport ? true,
+ gstreamerSupport ? false,
gst_all_1,
harfbuzz,
OpenGL,
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
]
++ lib.optionals stdenv.hostPlatform.isLinux [
wayland
- mesa
+ mesa # actually uses eglmesaext
libGL
xorg.libXrandr
xorg.libXfixes
diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix
index 99eedc81ebba3..c5dde2033dc38 100644
--- a/pkgs/development/libraries/enchant/2.x.nix
+++ b/pkgs/development/libraries/enchant/2.x.nix
@@ -9,12 +9,14 @@
hunspell,
hspell,
nuspell,
+ libvoikko,
unittest-cpp,
withHspell ? true,
withAspell ? true,
withHunspell ? true,
withNuspell ? true,
+ withVoikko ? true,
withAppleSpell ? stdenv.hostPlatform.isDarwin,
Cocoa,
@@ -53,6 +55,9 @@ stdenv.mkDerivation rec {
++ lib.optionals withNuspell [
nuspell
]
+ ++ lib.optionals withVoikko [
+ libvoikko
+ ]
++ lib.optionals withAppleSpell [
Cocoa
];
@@ -80,6 +85,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 33cebfb2a9a35..a7f4dd70e6597 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 e2dcaadf52060..e4d6aaf99037b 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/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index dd589ddd7eaa3..d88527b138c2a 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -189,7 +189,7 @@ stdenv.mkDerivation (finalAttrs: {
json_c
lerc
xz
- (libxml2.override { enableHttp = true; })
+ libxml2
lz4
openjpeg
openssl
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index c923994f6a189..d0f937ea038fc 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "gettext";
- version = "0.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
@@ -34,8 +34,6 @@ stdenv.mkDerivation rec {
"info"
];
- hardeningDisable = [ "format" ];
-
LDFLAGS = lib.optionalString stdenv.hostPlatform.isSunOS "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec";
configureFlags =
@@ -52,6 +50,21 @@ stdenv.mkDerivation rec {
postPatch =
''
+ # 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
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index fd9050525f96b..18fdb6859e272 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -269,6 +269,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 =
''
@@ -283,12 +288,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/glibc/nix-locale-archive.patch b/pkgs/development/libraries/glibc/nix-locale-archive.patch
index 2fedf2a7a7dbd..9519b5f5fdf53 100644
--- a/pkgs/development/libraries/glibc/nix-locale-archive.patch
+++ b/pkgs/development/libraries/glibc/nix-locale-archive.patch
@@ -17,9 +17,9 @@ index 512769eaec..171dbb4ad9 100644
+ if (path && fd < 0)
+ fd = __open_nocancel (path, O_RDONLY|O_LARGEFILE|O_CLOEXEC);
+ if (fd < 0)
-+ fd = __open_nocancel (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC);
-+ if (fd < 0)
+ fd = __open_nocancel ("/usr/lib/locale/locale-archive", O_RDONLY|O_LARGEFILE|O_CLOEXEC);
++ if (fd < 0)
++ fd = __open_nocancel (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC);
+ return fd;
+}
+
@@ -64,9 +64,9 @@ index ca0a95be99..e484783402 100644
+ if (path && fd < 0)
+ fd = open64 (path, O_RDONLY);
+ if (fd < 0)
-+ fd = open64 (ARCHIVE_NAME, O_RDONLY);
-+ if (fd < 0)
+ fd = open64 ("/usr/lib/locale/locale-archive", O_RDONLY);
++ if (fd < 0)
++ fd = open64 (ARCHIVE_NAME, O_RDONLY);
+ return fd;
+}
+
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 45df332bc0caf..8e58fa128aeec 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.1";
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-6gXQJY5xBh1hcWWE7DTO9ZMwqRNAVx7cRreDdJc7qF8=";
};
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 774188aee89cd..0000000000000
--- 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 b51cb4a319091..1f57c38eb89a0 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/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index ee467e8ad18af..74fe412380b28 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -24,7 +24,7 @@
# nixpkgs-update: no auto update
stdenv.mkDerivation rec {
pname = "grpc";
- version = "1.67.0"; # N.B: if you change this, please update:
+ version = "1.68.1"; # N.B: if you change this, please update:
# pythonPackages.grpcio
# pythonPackages.grpcio-channelz
# pythonPackages.grpcio-health-checking
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
- hash = "sha256-NjoSm3ZiHqe0QeVRFWO2FheoOzKjSX2oyiCM3qNUxhM=";
+ hash = "sha256-Rp+vg90biF6XXa4rVaLPWMjmWYut9XmBPgxQDTnltzk=";
fetchSubmodules = true;
};
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 7d8df7c8a42dd..e1df48dd95bb8 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -114,13 +114,13 @@
stdenv.mkDerivation rec {
pname = "gst-plugins-bad";
- version = "1.24.7";
+ version = "1.24.10";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
- hash = "sha256-ddUT/AumNfsfOXhtiQtz+6xfS8iP858qn/YvS49CjyI=";
+ hash = "sha256-FwfjEDlQybrtNkqK8roEldaxE/zTbhBi3aX1grj4kE0=";
};
patches = [
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 459c14beb0051..11bf17aea7a60 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -49,7 +49,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gst-plugins-base";
- version = "1.24.7";
+ version = "1.24.10";
outputs = [ "out" "dev" ];
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
inherit (finalAttrs) pname version;
in fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
- hash = "sha256-FSjRdGo5Mpn1rBfr8ToypmAgLx4p0KhSoiUPagWaL9o=";
+ hash = "sha256-69V7G+kkxuJPMn3VW6udj7quvl4dyPynhBgqsrEtI+s=";
};
strictDeps = true;
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 26a708546bb07..7cedd95ad451d 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -37,7 +37,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gstreamer";
- version = "1.24.7";
+ version = "1.24.10";
outputs = [
"bin"
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
inherit (finalAttrs) pname version;
in fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
- hash = "sha256-wOdbEkxSu3oMPc23NLKtJg6nKGqHRc8upinUyEnmqVg=";
+ hash = "sha256-n8RbGjMuj4EvCelcKBzXWWn20WgtBiqBXbDnvAR1GP0=";
};
depsBuildBuild = [
diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix
index 99991bbaca6fc..a48ae45e77f47 100644
--- a/pkgs/development/libraries/gstreamer/devtools/default.nix
+++ b/pkgs/development/libraries/gstreamer/devtools/default.nix
@@ -17,11 +17,11 @@
stdenv.mkDerivation rec {
pname = "gst-devtools";
- version = "1.24.7";
+ version = "1.24.10";
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
- hash = "sha256-56p6I/pYfVjcWnu1Hvta159vKkxZh1ZMZvYztbvTixc=";
+ hash = "sha256-KYNTcUiwqNUrrSo/TJ3MqAj9WqEvzO4lrMSkJ38HgOw=";
};
outputs = [
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index 786f449054bc7..d0591ba26dd48 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -18,7 +18,7 @@
stdenv.mkDerivation rec {
pname = "gst-editing-services";
- version = "1.24.7";
+ version = "1.24.10";
outputs = [
"out"
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
- hash = "sha256-sjzDEqI/q3F+S2A/ByvkIJhPucndIHfiBraqmxHfKdg=";
+ hash = "sha256-bwCxG05eNMKjLWTfUh3Kd1GdYm/MXjhjwCGL0SNn4XQ=";
};
nativeBuildInputs = [
@@ -61,10 +61,6 @@ stdenv.mkDerivation rec {
postPatch = ''
patchShebangs \
scripts/extract-release-date-from-doap-file.py
-
- # Hack for https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3800
- substituteInPlace ges/ges-frame-composition-meta.c \
- --replace-fail "GstFrameCompositionApi" "GESFrameCompositionApi"
'';
meta = with lib; {
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 4bb334e2e7a58..f9da5f6ba128a 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -58,13 +58,13 @@ assert raspiCameraSupport -> (stdenv.hostPlatform.isLinux && stdenv.hostPlatform
stdenv.mkDerivation rec {
pname = "gst-plugins-good";
- version = "1.24.7";
+ version = "1.24.10";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
- hash = "sha256-dZrLEebeg3P/jLteerjrmjhjG+gc8kIgJnsAHrVVk8E=";
+ hash = "sha256-/OdI+mbXqO4fsmFInlnQHj+nh2I9bVw1BoQW/nzQrLM=";
};
patches = [
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index 06cd16b05c275..1b96686774054 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "gst-libav";
- version = "1.24.7";
+ version = "1.24.10";
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
- hash = "sha256-w+QXm6GDwtMQHt+H/3DdB+cox2al/uNObs3tdspYAt8=";
+ hash = "sha256-TPLi2CBOVLqK+VGai5t/+m6VGnCHr6Df6DwSXUm7tfs=";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/rs/Cargo.lock b/pkgs/development/libraries/gstreamer/rs/Cargo.lock
deleted file mode 100644
index 7c91f3ef8aeec..0000000000000
--- a/pkgs/development/libraries/gstreamer/rs/Cargo.lock
+++ /dev/null
@@ -1,7401 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "addr2line"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "aes"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561"
-dependencies = [
- "aes-soft",
- "aesni",
- "cipher",
-]
-
-[[package]]
-name = "aes-ctr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7729c3cde54d67063be556aeac75a81330d802f0259500ca40cb52967f975763"
-dependencies = [
- "aes-soft",
- "aesni",
- "cipher",
- "ctr",
-]
-
-[[package]]
-name = "aes-soft"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072"
-dependencies = [
- "cipher",
- "opaque-debug",
-]
-
-[[package]]
-name = "aesni"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce"
-dependencies = [
- "cipher",
- "opaque-debug",
-]
-
-[[package]]
-name = "ahash"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
-dependencies = [
- "cfg-if",
- "getrandom",
- "once_cell",
- "version_check",
- "zerocopy 0.7.34",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "aligned-vec"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1"
-
-[[package]]
-name = "allocator-api2"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
-
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "anstream"
-version = "0.6.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "is_terminal_polyfill",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
-dependencies = [
- "anstyle",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
-
-[[package]]
-name = "arbitrary"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
-
-[[package]]
-name = "arg_enum_proc_macro"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "arrayvec"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
-
-[[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.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5"
-dependencies = [
- "flate2",
- "futures-core",
- "memchr",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "async-recursion"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "async-stream"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
-dependencies = [
- "async-stream-impl",
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-stream-impl"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "async-task"
-version = "4.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
-
-[[package]]
-name = "async-trait"
-version = "0.1.80"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "async-tungstenite"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb786dab48e539c5f17b23bac20d812ac027c01732ed7c7b58850c69a684e46c"
-dependencies = [
- "futures-io",
- "futures-util",
- "log",
- "native-tls",
- "pin-project-lite",
- "tokio",
- "tokio-native-tls",
- "tungstenite 0.23.0",
-]
-
-[[package]]
-name = "atomic-waker"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
-
-[[package]]
-name = "atomic_refcell"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c"
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
-
-[[package]]
-name = "av1-grain"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf"
-dependencies = [
- "anyhow",
- "arrayvec",
- "log",
- "nom",
- "num-rational",
- "v_frame",
-]
-
-[[package]]
-name = "aws-config"
-version = "1.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "297b64446175a73987cedc3c438d79b2a654d0fff96f65ff530fbe039347644c"
-dependencies = [
- "aws-credential-types",
- "aws-runtime",
- "aws-sdk-sso",
- "aws-sdk-ssooidc",
- "aws-sdk-sts",
- "aws-smithy-async",
- "aws-smithy-http",
- "aws-smithy-json",
- "aws-smithy-runtime",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "aws-types",
- "bytes",
- "fastrand",
- "hex",
- "http 0.2.12",
- "hyper 0.14.29",
- "ring",
- "time",
- "tokio",
- "tracing",
- "url",
- "zeroize",
-]
-
-[[package]]
-name = "aws-credential-types"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa8587ae17c8e967e4b05a62d495be2fb7701bec52a97f7acfe8a29f938384c8"
-dependencies = [
- "aws-smithy-async",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "zeroize",
-]
-
-[[package]]
-name = "aws-runtime"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b13dc54b4b49f8288532334bba8f87386a40571c47c37b1304979b556dc613c8"
-dependencies = [
- "aws-credential-types",
- "aws-sigv4",
- "aws-smithy-async",
- "aws-smithy-eventstream",
- "aws-smithy-http",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "aws-types",
- "bytes",
- "fastrand",
- "http 0.2.12",
- "http-body 0.4.6",
- "percent-encoding",
- "pin-project-lite",
- "tracing",
- "uuid",
-]
-
-[[package]]
-name = "aws-sdk-kinesisvideo"
-version = "1.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3d7de7e417e5007e6f12e435557b46aaaa1df3fdb51a036bbab99e666376e4"
-dependencies = [
- "aws-credential-types",
- "aws-runtime",
- "aws-smithy-async",
- "aws-smithy-http",
- "aws-smithy-json",
- "aws-smithy-runtime",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "aws-types",
- "bytes",
- "http 0.2.12",
- "once_cell",
- "regex-lite",
- "tracing",
-]
-
-[[package]]
-name = "aws-sdk-kinesisvideosignaling"
-version = "1.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "551e1b19fd1e74614788f842209704f6a588c076e4fd1fbf7ac37a387247fb7f"
-dependencies = [
- "aws-credential-types",
- "aws-runtime",
- "aws-smithy-async",
- "aws-smithy-http",
- "aws-smithy-json",
- "aws-smithy-runtime",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "aws-types",
- "bytes",
- "http 0.2.12",
- "once_cell",
- "regex-lite",
- "tracing",
-]
-
-[[package]]
-name = "aws-sdk-s3"
-version = "1.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc075ffee2a40cb1590bed35d7ec953589a564e768fa91947c565425cd569269"
-dependencies = [
- "ahash",
- "aws-credential-types",
- "aws-runtime",
- "aws-sigv4",
- "aws-smithy-async",
- "aws-smithy-checksums",
- "aws-smithy-eventstream",
- "aws-smithy-http",
- "aws-smithy-json",
- "aws-smithy-runtime",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "aws-smithy-xml",
- "aws-types",
- "bytes",
- "fastrand",
- "hex",
- "hmac 0.12.1",
- "http 0.2.12",
- "http-body 0.4.6",
- "lru",
- "once_cell",
- "percent-encoding",
- "regex-lite",
- "sha2",
- "tracing",
- "url",
-]
-
-[[package]]
-name = "aws-sdk-sso"
-version = "1.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "019a07902c43b03167ea5df0182f0cb63fae89f9a9682c44d18cf2e4a042cb34"
-dependencies = [
- "aws-credential-types",
- "aws-runtime",
- "aws-smithy-async",
- "aws-smithy-http",
- "aws-smithy-json",
- "aws-smithy-runtime",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "aws-types",
- "bytes",
- "http 0.2.12",
- "once_cell",
- "regex-lite",
- "tracing",
-]
-
-[[package]]
-name = "aws-sdk-ssooidc"
-version = "1.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04c46ee08a48a7f4eaa4ad201dcc1dd537b49c50859d14d4510e00ad9d3f9af2"
-dependencies = [
- "aws-credential-types",
- "aws-runtime",
- "aws-smithy-async",
- "aws-smithy-http",
- "aws-smithy-json",
- "aws-smithy-runtime",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "aws-types",
- "bytes",
- "http 0.2.12",
- "once_cell",
- "regex-lite",
- "tracing",
-]
-
-[[package]]
-name = "aws-sdk-sts"
-version = "1.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f752ac730125ca6017f72f9db5ec1772c9ecc664f87aa7507a7d81b023c23713"
-dependencies = [
- "aws-credential-types",
- "aws-runtime",
- "aws-smithy-async",
- "aws-smithy-http",
- "aws-smithy-json",
- "aws-smithy-query",
- "aws-smithy-runtime",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "aws-smithy-xml",
- "aws-types",
- "http 0.2.12",
- "once_cell",
- "regex-lite",
- "tracing",
-]
-
-[[package]]
-name = "aws-sdk-transcribestreaming"
-version = "1.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b18fdcacc5e1b61dfc34df6df1dee21e0da0e7564558ace1d0e1905e68e21b0c"
-dependencies = [
- "aws-credential-types",
- "aws-runtime",
- "aws-sigv4",
- "aws-smithy-async",
- "aws-smithy-eventstream",
- "aws-smithy-http",
- "aws-smithy-json",
- "aws-smithy-runtime",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "aws-types",
- "bytes",
- "http 0.2.12",
- "hyper 0.14.29",
- "once_cell",
- "regex-lite",
- "tracing",
-]
-
-[[package]]
-name = "aws-sdk-translate"
-version = "1.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9929a0172d8358a66308f2bc48cc77a8f87940649b77132f367cafa0a1414be"
-dependencies = [
- "aws-credential-types",
- "aws-runtime",
- "aws-smithy-async",
- "aws-smithy-http",
- "aws-smithy-json",
- "aws-smithy-runtime",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "aws-types",
- "bytes",
- "fastrand",
- "http 0.2.12",
- "once_cell",
- "regex-lite",
- "tracing",
-]
-
-[[package]]
-name = "aws-sigv4"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11d6f29688a4be9895c0ba8bef861ad0c0dac5c15e9618b9b7a6c233990fc263"
-dependencies = [
- "aws-credential-types",
- "aws-smithy-eventstream",
- "aws-smithy-http",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "bytes",
- "crypto-bigint 0.5.5",
- "form_urlencoded",
- "hex",
- "hmac 0.12.1",
- "http 0.2.12",
- "http 1.1.0",
- "once_cell",
- "p256",
- "percent-encoding",
- "ring",
- "sha2",
- "subtle",
- "time",
- "tracing",
- "zeroize",
-]
-
-[[package]]
-name = "aws-smithy-async"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62220bc6e97f946ddd51b5f1361f78996e704677afc518a4ff66b7a72ea1378c"
-dependencies = [
- "futures-util",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "aws-smithy-checksums"
-version = "0.60.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83fa43bc04a6b2441968faeab56e68da3812f978a670a5db32accbdcafddd12f"
-dependencies = [
- "aws-smithy-http",
- "aws-smithy-types",
- "bytes",
- "crc32c",
- "crc32fast",
- "hex",
- "http 0.2.12",
- "http-body 0.4.6",
- "md-5",
- "pin-project-lite",
- "sha1",
- "sha2",
- "tracing",
-]
-
-[[package]]
-name = "aws-smithy-eventstream"
-version = "0.60.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6363078f927f612b970edf9d1903ef5cef9a64d1e8423525ebb1f0a1633c858"
-dependencies = [
- "aws-smithy-types",
- "bytes",
- "crc32fast",
-]
-
-[[package]]
-name = "aws-smithy-http"
-version = "0.60.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f10fa66956f01540051b0aa7ad54574640f748f9839e843442d99b970d3aff9"
-dependencies = [
- "aws-smithy-eventstream",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "bytes",
- "bytes-utils",
- "futures-core",
- "http 0.2.12",
- "http-body 0.4.6",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "pin-utils",
- "tracing",
-]
-
-[[package]]
-name = "aws-smithy-json"
-version = "0.60.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4683df9469ef09468dad3473d129960119a0d3593617542b7d52086c8486f2d6"
-dependencies = [
- "aws-smithy-types",
-]
-
-[[package]]
-name = "aws-smithy-query"
-version = "0.60.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2fbd61ceb3fe8a1cb7352e42689cec5335833cd9f94103a61e98f9bb61c64bb"
-dependencies = [
- "aws-smithy-types",
- "urlencoding",
-]
-
-[[package]]
-name = "aws-smithy-runtime"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c53572b4cd934ee5e8461ad53caa36e9d246aaef42166e3ac539e206a925d330"
-dependencies = [
- "aws-smithy-async",
- "aws-smithy-http",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "bytes",
- "fastrand",
- "h2 0.3.26",
- "http 0.2.12",
- "http-body 0.4.6",
- "http-body 1.0.0",
- "hyper 0.14.29",
- "hyper-rustls 0.24.2",
- "once_cell",
- "pin-project-lite",
- "pin-utils",
- "rustls 0.21.12",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "aws-smithy-runtime-api"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccb2b3a7030dc9a3c9a08ce0b25decea5130e9db19619d4dffbbff34f75fe850"
-dependencies = [
- "aws-smithy-async",
- "aws-smithy-types",
- "bytes",
- "http 0.2.12",
- "http 1.1.0",
- "pin-project-lite",
- "tokio",
- "tracing",
- "zeroize",
-]
-
-[[package]]
-name = "aws-smithy-types"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abe14dceea1e70101d38fbf2a99e6a34159477c0fb95e68e05c66bd7ae4c3729"
-dependencies = [
- "base64-simd",
- "bytes",
- "bytes-utils",
- "futures-core",
- "http 0.2.12",
- "http 1.1.0",
- "http-body 0.4.6",
- "http-body 1.0.0",
- "http-body-util",
- "itoa",
- "num-integer",
- "pin-project-lite",
- "pin-utils",
- "ryu",
- "serde",
- "time",
- "tokio",
- "tokio-util",
-]
-
-[[package]]
-name = "aws-smithy-xml"
-version = "0.60.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "872c68cf019c0e4afc5de7753c4f7288ce4b71663212771bf5e4542eb9346ca9"
-dependencies = [
- "xmlparser",
-]
-
-[[package]]
-name = "aws-types"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dbf2f3da841a8930f159163175cf6a3d16ddde517c1b0fba7aa776822800f40"
-dependencies = [
- "aws-credential-types",
- "aws-smithy-async",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "http 0.2.12",
- "rustc_version",
- "tracing",
-]
-
-[[package]]
-name = "backtrace"
-version = "0.3.73"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
-[[package]]
-name = "base16ct"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
-
-[[package]]
-name = "base32"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1ce0365f4d5fb6646220bb52fe547afd51796d90f914d4063cb0b032ebee088"
-
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
-[[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 = "base64-serde"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba368df5de76a5bea49aaf0cf1b39ccfbbef176924d1ba5db3e4135216cbe3c7"
-dependencies = [
- "base64 0.21.7",
- "serde",
-]
-
-[[package]]
-name = "base64-simd"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195"
-dependencies = [
- "outref",
- "vsimd",
-]
-
-[[package]]
-name = "base64ct"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
-
-[[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
-
-[[package]]
-name = "bitstream-io"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e"
-
-[[package]]
-name = "block-buffer"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
-dependencies = [
- "generic-array",
-]
-
-[[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 = "bstr"
-version = "1.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "build_const"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4ae4235e6dac0694637c763029ecea1a2ec9e4e06ec2729bd21ba4d9c863eb7"
-
-[[package]]
-name = "built"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6a6c0b39c38fd754ac338b00a88066436389c0f029da5d37d1e01091d9b7c17"
-
-[[package]]
-name = "bumpalo"
-version = "3.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
-
-[[package]]
-name = "byte-slice-cast"
-version = "1.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"
-
-[[package]]
-name = "bytemuck"
-version = "1.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "bytes"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
-
-[[package]]
-name = "bytes-utils"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35"
-dependencies = [
- "bytes",
- "either",
-]
-
-[[package]]
-name = "cairo-rs"
-version = "0.19.8"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
-dependencies = [
- "bitflags 2.5.0",
- "cairo-sys-rs",
- "glib",
- "libc",
- "thiserror",
-]
-
-[[package]]
-name = "cairo-sys-rs"
-version = "0.19.8"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
-dependencies = [
- "glib-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "cc"
-version = "1.0.99"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
-dependencies = [
- "jobserver",
- "libc",
- "once_cell",
-]
-
-[[package]]
-name = "cdg"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d254b2c9fc971518da5d652aee7edc6b9bb96fa32de28f166895faf69d9926e6"
-
-[[package]]
-name = "cdg_renderer"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3753104c2ef8672021f3355a59ab5944d7aa5472f970b5d97e93bd741d79af96"
-dependencies = [
- "cdg",
- "image",
-]
-
-[[package]]
-name = "cea708-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82b825228dce83e7156c7cd189bcfe5ef8014320deca7dd619787fe594946426"
-dependencies = [
- "env_logger 0.10.2",
- "log",
- "muldiv",
- "once_cell",
- "thiserror",
-]
-
-[[package]]
-name = "cfg-expr"
-version = "0.15.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
-dependencies = [
- "smallvec",
- "target-lexicon",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chrono"
-version = "0.4.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "js-sys",
- "num-traits",
- "serde",
- "wasm-bindgen",
- "windows-targets 0.52.5",
-]
-
-[[package]]
-name = "cipher"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "clap"
-version = "4.4.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
-dependencies = [
- "clap_builder",
- "clap_derive",
-]
-
-[[package]]
-name = "clap_builder"
-version = "4.4.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
-dependencies = [
- "anstream",
- "anstyle",
- "clap_lex",
- "strsim 0.10.0",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
-dependencies = [
- "heck 0.4.1",
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
-
-[[package]]
-name = "claxon"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688"
-
-[[package]]
-name = "color-name"
-version = "1.1.0"
-source = "git+https://github.com/lilyinstarlight/color-name#cac0ed5b7d2e0682c08c9bfd13089d5494e81b9a"
-
-[[package]]
-name = "color-thief"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6460d760cf38ce67c9e0318f896538820acc54f2d0a3bfc5b2c557211066c98"
-dependencies = [
- "rgb",
-]
-
-[[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.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
-
-[[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 = "const-oid"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
-
-[[package]]
-name = "cookie"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
-dependencies = [
- "percent-encoding",
- "time",
- "version_check",
-]
-
-[[package]]
-name = "cookie-factory"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2"
-dependencies = [
- "futures",
-]
-
-[[package]]
-name = "cookie_store"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4934e6b7e8419148b6ef56950d277af8561060b56afd59e2aadf98b59fce6baa"
-dependencies = [
- "cookie",
- "idna 0.5.0",
- "log",
- "publicsuffix",
- "serde",
- "serde_derive",
- "serde_json",
- "time",
- "url",
-]
-
-[[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.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crc"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb"
-dependencies = [
- "build_const",
-]
-
-[[package]]
-name = "crc32c"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a47af21622d091a8f0fb295b88bc886ac74efcc613efc19f5d0b21de5c89e47"
-dependencies = [
- "rustc_version",
-]
-
-[[package]]
-name = "crc32fast"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[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 = "crypto-bigint"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
-dependencies = [
- "generic-array",
- "rand_core",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "crypto-bigint"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
-dependencies = [
- "rand_core",
- "subtle",
-]
-
-[[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 = "crypto-mac"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e"
-dependencies = [
- "generic-array",
- "subtle",
-]
-
-[[package]]
-name = "csound"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d49045d7365f5c2cadb1f20932189a0da101ac86c8dbe891975814b2348d57d"
-dependencies = [
- "bitflags 1.3.2",
- "csound-sys",
- "libc",
- "va_list",
-]
-
-[[package]]
-name = "csound-sys"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b11869eaed111b64d29e66cc5c7de9f172d5b623b716eb74c5dd841dbcfe39"
-dependencies = [
- "libc",
- "va_list",
-]
-
-[[package]]
-name = "ctr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f"
-dependencies = [
- "cipher",
-]
-
-[[package]]
-name = "darling"
-version = "0.20.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.20.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim 0.11.1",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.20.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
-dependencies = [
- "darling_core",
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "dash-mpd"
-version = "0.16.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f8a6df34a2957e8a164afa9265bcb1ea9a07a0df69c5dcda4909e4f650c0850"
-dependencies = [
- "base64 0.22.1",
- "base64-serde",
- "bytes",
- "chrono",
- "fs-err",
- "iso8601",
- "lazy_static",
- "num-traits",
- "quick-xml",
- "regex",
- "serde",
- "serde_path_to_error",
- "serde_with",
- "thiserror",
- "tracing",
- "url",
- "xattr",
-]
-
-[[package]]
-name = "dasp_frame"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2a3937f5fe2135702897535c8d4a5553f8b116f76c1529088797f2eee7c5cd6"
-dependencies = [
- "dasp_sample",
-]
-
-[[package]]
-name = "dasp_sample"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
-
-[[package]]
-name = "data-encoding"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
-
-[[package]]
-name = "dav1d"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96be853ae81fdc81d4fbd921866ba6272147c34f75a8ee5d25781ea0f1bcadc8"
-dependencies = [
- "bitflags 2.5.0",
- "dav1d-sys",
-]
-
-[[package]]
-name = "dav1d-sys"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a49fd89ad2b234b606f942e8759390fd7176e9b2b50438f516dd232dcc6e58f"
-dependencies = [
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "der"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
-dependencies = [
- "const-oid",
- "zeroize",
-]
-
-[[package]]
-name = "deranged"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
-dependencies = [
- "powerfmt",
- "serde",
-]
-
-[[package]]
-name = "diff"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
-
-[[package]]
-name = "digest"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer 0.10.4",
- "crypto-common",
- "subtle",
-]
-
-[[package]]
-name = "dssim-core"
-version = "3.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c074fca6cdf5e3faaaf03f71e29cd5d92ea533b1432cf78910dafffc2ce872b"
-dependencies = [
- "imgref",
- "itertools 0.12.1",
- "rayon",
- "rgb",
-]
-
-[[package]]
-name = "ebur128"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12aebdd6b6b47b5880c049efb0e77f8762178a0745ef778878908f5981c05f52"
-dependencies = [
- "bitflags 1.3.2",
- "dasp_frame",
- "dasp_sample",
- "smallvec",
-]
-
-[[package]]
-name = "ecdsa"
-version = "0.14.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
-dependencies = [
- "der",
- "elliptic-curve",
- "rfc6979",
- "signature",
-]
-
-[[package]]
-name = "ed25519"
-version = "1.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
-dependencies = [
- "signature",
-]
-
-[[package]]
-name = "either"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
-
-[[package]]
-name = "elliptic-curve"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
-dependencies = [
- "base16ct",
- "crypto-bigint 0.4.9",
- "der",
- "digest 0.10.7",
- "ff",
- "generic-array",
- "group",
- "pkcs8",
- "rand_core",
- "sec1",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
-dependencies = [
- "atty",
- "humantime",
- "log",
- "termcolor",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
-dependencies = [
- "humantime",
- "is-terminal",
- "log",
- "regex",
- "termcolor",
-]
-
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[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 = "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 = "fallible-iterator"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
-
-[[package]]
-name = "fastrand"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
-
-[[package]]
-name = "fdeflate"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
-dependencies = [
- "simd-adler32",
-]
-
-[[package]]
-name = "ff"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
-dependencies = [
- "rand_core",
- "subtle",
-]
-
-[[package]]
-name = "ffv1"
-version = "0.0.0"
-source = "git+https://github.com/rust-av/ffv1.git?rev=2afb025a327173ce891954c052e804d0f880368a#2afb025a327173ce891954c052e804d0f880368a"
-dependencies = [
- "crc",
- "num-traits",
- "thiserror",
-]
-
-[[package]]
-name = "field-offset"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
-dependencies = [
- "memoffset 0.9.1",
- "rustc_version",
-]
-
-[[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.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
-dependencies = [
- "crc32fast",
- "miniz_oxide",
-]
-
-[[package]]
-name = "flavors"
-version = "0.2.0"
-source = "git+https://github.com/rust-av/flavors#833508af656d298c269f2397c8541a084264d992"
-dependencies = [
- "nom",
-]
-
-[[package]]
-name = "flume"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
-dependencies = [
- "futures-core",
- "futures-sink",
- "nanorand",
- "spin",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
-[[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",
-]
-
-[[package]]
-name = "fst"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a"
-
-[[package]]
-name = "futures"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
-
-[[package]]
-name = "futures-task"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
-
-[[package]]
-name = "futures-util"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "gdk-pixbuf"
-version = "0.19.8"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
-dependencies = [
- "gdk-pixbuf-sys",
- "gio",
- "glib",
- "libc",
-]
-
-[[package]]
-name = "gdk-pixbuf-sys"
-version = "0.19.8"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
-dependencies = [
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gdk4"
-version = "0.8.2"
-source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#cf84b5cd36fc1aa31175bc24ff45e8ceb0710dec"
-dependencies = [
- "cairo-rs",
- "gdk-pixbuf",
- "gdk4-sys",
- "gio",
- "glib",
- "libc",
- "pango",
-]
-
-[[package]]
-name = "gdk4-sys"
-version = "0.8.2"
-source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#cf84b5cd36fc1aa31175bc24ff45e8ceb0710dec"
-dependencies = [
- "cairo-sys-rs",
- "gdk-pixbuf-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "pango-sys",
- "pkg-config",
- "system-deps",
-]
-
-[[package]]
-name = "gdk4-wayland"
-version = "0.8.2"
-source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#cf84b5cd36fc1aa31175bc24ff45e8ceb0710dec"
-dependencies = [
- "gdk4",
- "gdk4-wayland-sys",
- "gio",
- "glib",
- "libc",
-]
-
-[[package]]
-name = "gdk4-wayland-sys"
-version = "0.8.2"
-source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#cf84b5cd36fc1aa31175bc24ff45e8ceb0710dec"
-dependencies = [
- "glib-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gdk4-win32"
-version = "0.8.2"
-source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#cf84b5cd36fc1aa31175bc24ff45e8ceb0710dec"
-dependencies = [
- "gdk4",
- "gdk4-win32-sys",
- "gio",
- "glib",
- "khronos-egl",
- "libc",
-]
-
-[[package]]
-name = "gdk4-win32-sys"
-version = "0.8.2"
-source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#cf84b5cd36fc1aa31175bc24ff45e8ceb0710dec"
-dependencies = [
- "gdk4-sys",
- "glib-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gdk4-x11"
-version = "0.8.2"
-source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#cf84b5cd36fc1aa31175bc24ff45e8ceb0710dec"
-dependencies = [
- "gdk4",
- "gdk4-x11-sys",
- "gio",
- "glib",
- "libc",
-]
-
-[[package]]
-name = "gdk4-x11-sys"
-version = "0.8.2"
-source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#cf84b5cd36fc1aa31175bc24ff45e8ceb0710dec"
-dependencies = [
- "gdk4-sys",
- "glib-sys",
- "libc",
- "system-deps",
-]
-
-[[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 = "getopts"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
-dependencies = [
- "unicode-width",
-]
-
-[[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.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2"
-dependencies = [
- "color_quant",
- "weezl",
-]
-
-[[package]]
-name = "gimli"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
-
-[[package]]
-name = "gio"
-version = "0.19.8"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-util",
- "gio-sys",
- "glib",
- "libc",
- "pin-project-lite",
- "smallvec",
- "thiserror",
-]
-
-[[package]]
-name = "gio-sys"
-version = "0.19.8"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "glib"
-version = "0.19.8"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
-dependencies = [
- "bitflags 2.5.0",
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-task",
- "futures-util",
- "gio-sys",
- "glib-macros",
- "glib-sys",
- "gobject-sys",
- "libc",
- "memchr",
- "smallvec",
- "thiserror",
-]
-
-[[package]]
-name = "glib-macros"
-version = "0.19.8"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
-dependencies = [
- "heck 0.5.0",
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "glib-sys"
-version = "0.19.8"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
-dependencies = [
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "glob"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
-
-[[package]]
-name = "gobject-sys"
-version = "0.19.8"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
-dependencies = [
- "glib-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "graphene-rs"
-version = "0.19.8"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
-dependencies = [
- "glib",
- "graphene-sys",
- "libc",
-]
-
-[[package]]
-name = "graphene-sys"
-version = "0.19.8"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
-dependencies = [
- "glib-sys",
- "libc",
- "pkg-config",
- "system-deps",
-]
-
-[[package]]
-name = "group"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
-dependencies = [
- "ff",
- "rand_core",
- "subtle",
-]
-
-[[package]]
-name = "gsk4"
-version = "0.8.2"
-source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#cf84b5cd36fc1aa31175bc24ff45e8ceb0710dec"
-dependencies = [
- "cairo-rs",
- "gdk4",
- "glib",
- "graphene-rs",
- "gsk4-sys",
- "libc",
- "pango",
-]
-
-[[package]]
-name = "gsk4-sys"
-version = "0.8.2"
-source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#cf84b5cd36fc1aa31175bc24ff45e8ceb0710dec"
-dependencies = [
- "cairo-sys-rs",
- "gdk4-sys",
- "glib-sys",
- "gobject-sys",
- "graphene-sys",
- "libc",
- "pango-sys",
- "system-deps",
-]
-
-[[package]]
-name = "gst-plugin-audiofx"
-version = "0.12.8"
-dependencies = [
- "anyhow",
- "atomic_refcell",
- "byte-slice-cast",
- "ebur128",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-app",
- "gstreamer-audio",
- "gstreamer-base",
- "gstreamer-check",
- "hrtf",
- "nnnoiseless",
- "num-traits",
- "once_cell",
- "rayon",
- "smallvec",
-]
-
-[[package]]
-name = "gst-plugin-aws"
-version = "0.12.8"
-dependencies = [
- "async-stream",
- "aws-config",
- "aws-credential-types",
- "aws-sdk-s3",
- "aws-sdk-transcribestreaming",
- "aws-sdk-translate",
- "aws-types",
- "base32",
- "bytes",
- "chrono",
- "env_logger 0.10.2",
- "futures",
- "gio",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-audio",
- "gstreamer-base",
- "gstreamer-check",
- "once_cell",
- "percent-encoding",
- "rand",
- "serde",
- "serde_derive",
- "serde_json",
- "test-with",
- "tokio",
- "url",
-]
-
-[[package]]
-name = "gst-plugin-cdg"
-version = "0.12.8"
-dependencies = [
- "cdg",
- "cdg_renderer",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-app",
- "gstreamer-base",
- "gstreamer-video",
- "image",
- "once_cell",
-]
-
-[[package]]
-name = "gst-plugin-claxon"
-version = "0.12.8"
-dependencies = [
- "atomic_refcell",
- "byte-slice-cast",
- "claxon",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-audio",
- "gstreamer-check",
- "once_cell",
-]
-
-[[package]]
-name = "gst-plugin-closedcaption"
-version = "0.12.8"
-dependencies = [
- "anyhow",
- "atomic_refcell",
- "byteorder",
- "cairo-rs",
- "cc",
- "cea708-types",
- "chrono",
- "either",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-base",
- "gstreamer-check",
- "gstreamer-video",
- "nom",
- "once_cell",
- "pango",
- "pangocairo",
- "pretty_assertions",
- "rand",
- "serde",
- "serde_json",
- "uuid",
-]
-
-[[package]]
-name = "gst-plugin-csound"
-version = "0.12.8"
-dependencies = [
- "byte-slice-cast",
- "csound",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-audio",
- "gstreamer-base",
- "gstreamer-check",
- "once_cell",
-]
-
-[[package]]
-name = "gst-plugin-dav1d"
-version = "0.12.8"
-dependencies = [
- "dav1d",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-base",
- "gstreamer-video",
- "num_cpus",
- "once_cell",
-]
-
-[[package]]
-name = "gst-plugin-fallbackswitch"
-version = "0.12.8"
-dependencies = [
- "gio",
- "gst-plugin-gtk4",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-app",
- "gstreamer-audio",
- "gstreamer-base",
- "gstreamer-check",
- "gstreamer-video",
- "gtk4",
- "once_cell",
- "parking_lot",
-]
-
-[[package]]
-name = "gst-plugin-ffv1"
-version = "0.12.8"
-dependencies = [
- "byte-slice-cast",
- "ffv1",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-check",
- "gstreamer-video",
- "once_cell",
-]
-
-[[package]]
-name = "gst-plugin-file"
-version = "0.12.8"
-dependencies = [
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-base",
- "once_cell",
- "url",
-]
-
-[[package]]
-name = "gst-plugin-flavors"
-version = "0.12.8"
-dependencies = [
- "byteorder",
- "flavors",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-audio",
- "gstreamer-base",
- "nom",
- "num-rational",
- "once_cell",
- "smallvec",
-]
-
-[[package]]
-name = "gst-plugin-fmp4"
-version = "0.12.8"
-dependencies = [
- "anyhow",
- "bitstream-io",
- "chrono",
- "dash-mpd",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-app",
- "gstreamer-audio",
- "gstreamer-base",
- "gstreamer-check",
- "gstreamer-pbutils",
- "gstreamer-video",
- "m3u8-rs",
- "once_cell",
- "quick-xml",
- "serde",
-]
-
-[[package]]
-name = "gst-plugin-gif"
-version = "0.12.8"
-dependencies = [
- "atomic_refcell",
- "gif",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-check",
- "gstreamer-video",
- "once_cell",
-]
-
-[[package]]
-name = "gst-plugin-gtk4"
-version = "0.12.8"
-dependencies = [
- "async-channel",
- "gdk4-wayland",
- "gdk4-win32",
- "gdk4-x11",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-allocators",
- "gstreamer-base",
- "gstreamer-gl",
- "gstreamer-gl-egl",
- "gstreamer-gl-wayland",
- "gstreamer-gl-x11",
- "gstreamer-video",
- "gtk4",
- "once_cell",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "gst-plugin-hlssink3"
-version = "0.12.8"
-dependencies = [
- "anyhow",
- "chrono",
- "gio",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-app",
- "gstreamer-audio",
- "gstreamer-check",
- "gstreamer-pbutils",
- "gstreamer-video",
- "m3u8-rs",
- "once_cell",
- "sprintf",
-]
-
-[[package]]
-name = "gst-plugin-hsv"
-version = "0.12.8"
-dependencies = [
- "byte-slice-cast",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-audio",
- "gstreamer-base",
- "gstreamer-check",
- "gstreamer-video",
- "num-traits",
- "once_cell",
-]
-
-[[package]]
-name = "gst-plugin-inter"
-version = "0.12.8"
-dependencies = [
- "anyhow",
- "futures",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-app",
- "gstreamer-check",
- "gstreamer-utils",
- "once_cell",
- "pretty_assertions",
- "serial_test",
- "tokio",
- "tokio-stream",
-]
-
-[[package]]
-name = "gst-plugin-json"
-version = "0.12.8"
-dependencies = [
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-check",
- "once_cell",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "gst-plugin-lewton"
-version = "0.12.8"
-dependencies = [
- "atomic_refcell",
- "byte-slice-cast",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-audio",
- "gstreamer-check",
- "lewton",
- "once_cell",
-]
-
-[[package]]
-name = "gst-plugin-livesync"
-version = "0.12.8"
-dependencies = [
- "gio",
- "gst-plugin-gtk4",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-audio",
- "gstreamer-check",
- "gtk4",
- "num-rational",
- "once_cell",
- "parking_lot",
-]
-
-[[package]]
-name = "gst-plugin-mp4"
-version = "0.12.8"
-dependencies = [
- "anyhow",
- "bitstream-io",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-audio",
- "gstreamer-base",
- "gstreamer-pbutils",
- "gstreamer-video",
- "once_cell",
- "tempfile",
- "url",
-]
-
-[[package]]
-name = "gst-plugin-ndi"
-version = "0.12.8"
-dependencies = [
- "anyhow",
- "atomic_refcell",
- "byte-slice-cast",
- "byteorder",
- "data-encoding",
- "glib",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-audio",
- "gstreamer-base",
- "gstreamer-video",
- "libloading",
- "once_cell",
- "quick-xml",
- "smallvec",
- "thiserror",
-]
-
-[[package]]
-name = "gst-plugin-onvif"
-version = "0.12.8"
-dependencies = [
- "cairo-rs",
- "chrono",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-base",
- "gstreamer-rtp",
- "gstreamer-video",
- "once_cell",
- "pango",
- "pangocairo",
- "xmlparser",
- "xmltree",
-]
-
-[[package]]
-name = "gst-plugin-png"
-version = "0.12.8"
-dependencies = [
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-check",
- "gstreamer-video",
- "once_cell",
- "parking_lot",
- "png",
-]
-
-[[package]]
-name = "gst-plugin-raptorq"
-version = "0.12.8"
-dependencies = [
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-base",
- "gstreamer-check",
- "gstreamer-rtp",
- "once_cell",
- "rand",
- "raptorq",
-]
-
-[[package]]
-name = "gst-plugin-rav1e"
-version = "0.12.8"
-dependencies = [
- "atomic_refcell",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-check",
- "gstreamer-video",
- "once_cell",
- "rav1e",
-]
-
-[[package]]
-name = "gst-plugin-regex"
-version = "0.12.8"
-dependencies = [
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-check",
- "once_cell",
- "regex",
-]
-
-[[package]]
-name = "gst-plugin-reqwest"
-version = "0.12.8"
-dependencies = [
- "bytes",
- "futures",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-base",
- "headers 0.4.0",
- "http-body-util",
- "hyper 1.3.1",
- "mime",
- "once_cell",
- "pin-project-lite",
- "reqwest 0.12.5",
- "tokio",
- "url",
-]
-
-[[package]]
-name = "gst-plugin-rtp"
-version = "0.12.8"
-dependencies = [
- "bitstream-io",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-check",
- "gstreamer-rtp",
- "once_cell",
- "smallvec",
- "time",
-]
-
-[[package]]
-name = "gst-plugin-rtsp"
-version = "0.12.8"
-dependencies = [
- "anyhow",
- "atomic_refcell",
- "data-encoding",
- "futures",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-app",
- "gstreamer-net",
- "gstreamer-pbutils",
- "lru",
- "once_cell",
- "rtsp-types",
- "sdp-types",
- "socket2 0.5.7",
- "thiserror",
- "tokio",
- "tokio-stream",
- "url",
-]
-
-[[package]]
-name = "gst-plugin-sodium"
-version = "0.12.8"
-dependencies = [
- "clap",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-app",
- "gstreamer-base",
- "gstreamer-check",
- "hex",
- "once_cell",
- "pretty_assertions",
- "rand",
- "serde",
- "serde_json",
- "smallvec",
- "sodiumoxide",
-]
-
-[[package]]
-name = "gst-plugin-spotify"
-version = "0.12.8"
-dependencies = [
- "anyhow",
- "futures",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-base",
- "librespot",
- "once_cell",
- "tokio",
- "url",
-]
-
-[[package]]
-name = "gst-plugin-textahead"
-version = "0.12.8"
-dependencies = [
- "gst-plugin-version-helper",
- "gstreamer",
- "once_cell",
-]
-
-[[package]]
-name = "gst-plugin-textwrap"
-version = "0.12.8"
-dependencies = [
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-check",
- "hyphenation",
- "once_cell",
- "textwrap",
-]
-
-[[package]]
-name = "gst-plugin-threadshare"
-version = "0.12.8"
-dependencies = [
- "async-task",
- "cc",
- "cfg-if",
- "clap",
- "concurrent-queue",
- "flume",
- "futures",
- "gio",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-app",
- "gstreamer-audio",
- "gstreamer-check",
- "gstreamer-net",
- "gstreamer-rtp",
- "once_cell",
- "pin-project-lite",
- "pkg-config",
- "polling",
- "rand",
- "rustix",
- "slab",
- "socket2 0.5.7",
- "waker-fn",
- "winapi",
-]
-
-[[package]]
-name = "gst-plugin-togglerecord"
-version = "0.12.8"
-dependencies = [
- "either",
- "gio",
- "gst-plugin-gtk4",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-audio",
- "gstreamer-check",
- "gstreamer-video",
- "gtk4",
- "once_cell",
- "parking_lot",
-]
-
-[[package]]
-name = "gst-plugin-tracers"
-version = "0.12.8"
-dependencies = [
- "anyhow",
- "gst-plugin-version-helper",
- "gstreamer",
- "once_cell",
- "regex",
- "signal-hook",
-]
-
-[[package]]
-name = "gst-plugin-tutorial"
-version = "0.12.8"
-dependencies = [
- "byte-slice-cast",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-audio",
- "gstreamer-base",
- "gstreamer-video",
- "num-traits",
- "once_cell",
-]
-
-[[package]]
-name = "gst-plugin-uriplaylistbin"
-version = "0.12.8"
-dependencies = [
- "anyhow",
- "clap",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-app",
- "more-asserts",
- "once_cell",
- "thiserror",
- "url",
-]
-
-[[package]]
-name = "gst-plugin-version-helper"
-version = "0.8.2"
-dependencies = [
- "chrono",
- "toml_edit 0.22.14",
-]
-
-[[package]]
-name = "gst-plugin-videofx"
-version = "0.12.8"
-dependencies = [
- "atomic_refcell",
- "cairo-rs",
- "color-name",
- "color-thief",
- "dssim-core",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-base",
- "gstreamer-check",
- "gstreamer-video",
- "image",
- "image_hasher",
- "once_cell",
- "rgb",
-]
-
-[[package]]
-name = "gst-plugin-webp"
-version = "0.12.8"
-dependencies = [
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-check",
- "gstreamer-video",
- "libwebp-sys2",
- "once_cell",
- "pretty_assertions",
-]
-
-[[package]]
-name = "gst-plugin-webrtc"
-version = "0.12.8"
-dependencies = [
- "anyhow",
- "async-recursion",
- "async-tungstenite",
- "aws-config",
- "aws-credential-types",
- "aws-sdk-kinesisvideo",
- "aws-sdk-kinesisvideosignaling",
- "aws-sigv4",
- "aws-smithy-http",
- "aws-smithy-types",
- "aws-types",
- "chrono",
- "clap",
- "crossbeam-channel",
- "data-encoding",
- "fastrand",
- "futures",
- "gst-plugin-version-helper",
- "gst-plugin-webrtc-signalling-protocol",
- "gstreamer",
- "gstreamer-app",
- "gstreamer-audio",
- "gstreamer-base",
- "gstreamer-rtp",
- "gstreamer-sdp",
- "gstreamer-utils",
- "gstreamer-video",
- "gstreamer-webrtc",
- "http 1.1.0",
- "human_bytes",
- "livekit-api",
- "livekit-protocol",
- "once_cell",
- "parse_link_header",
- "rand",
- "regex",
- "reqwest 0.11.27",
- "serde",
- "serde_json",
- "thiserror",
- "tokio",
- "tokio-native-tls",
- "tokio-stream",
- "tracing",
- "tracing-log",
- "tracing-subscriber",
- "url",
- "url-escape",
- "uuid",
- "warp",
-]
-
-[[package]]
-name = "gst-plugin-webrtc-signalling"
-version = "0.12.8"
-dependencies = [
- "anyhow",
- "async-tungstenite",
- "clap",
- "futures",
- "gst-plugin-webrtc-signalling-protocol",
- "pin-project-lite",
- "serde",
- "serde_json",
- "test-log",
- "thiserror",
- "tokio",
- "tokio-native-tls",
- "tracing",
- "tracing-log",
- "tracing-subscriber",
- "uuid",
-]
-
-[[package]]
-name = "gst-plugin-webrtc-signalling-protocol"
-version = "0.12.8"
-dependencies = [
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "gst-plugin-webrtchttp"
-version = "0.12.8"
-dependencies = [
- "async-recursion",
- "bytes",
- "futures",
- "gst-plugin-version-helper",
- "gstreamer",
- "gstreamer-sdp",
- "gstreamer-webrtc",
- "once_cell",
- "parse_link_header",
- "reqwest 0.12.5",
- "tokio",
-]
-
-[[package]]
-name = "gstreamer"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "cfg-if",
- "futures-channel",
- "futures-core",
- "futures-util",
- "glib",
- "gstreamer-sys",
- "itertools 0.13.0",
- "libc",
- "muldiv",
- "num-integer",
- "num-rational",
- "once_cell",
- "option-operations",
- "paste",
- "pin-project-lite",
- "serde",
- "serde_bytes",
- "smallvec",
- "thiserror",
-]
-
-[[package]]
-name = "gstreamer-allocators"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "glib",
- "gstreamer",
- "gstreamer-allocators-sys",
- "libc",
- "once_cell",
-]
-
-[[package]]
-name = "gstreamer-allocators-sys"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "gstreamer-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-app"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "futures-core",
- "futures-sink",
- "glib",
- "gstreamer",
- "gstreamer-app-sys",
- "gstreamer-base",
- "libc",
-]
-
-[[package]]
-name = "gstreamer-app-sys"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "glib-sys",
- "gstreamer-base-sys",
- "gstreamer-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-audio"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "cfg-if",
- "glib",
- "gstreamer",
- "gstreamer-audio-sys",
- "gstreamer-base",
- "libc",
- "once_cell",
- "serde",
- "smallvec",
-]
-
-[[package]]
-name = "gstreamer-audio-sys"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "gstreamer-base-sys",
- "gstreamer-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-base"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "atomic_refcell",
- "cfg-if",
- "glib",
- "gstreamer",
- "gstreamer-base-sys",
- "libc",
-]
-
-[[package]]
-name = "gstreamer-base-sys"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "gstreamer-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-check"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "glib",
- "gstreamer",
- "gstreamer-check-sys",
-]
-
-[[package]]
-name = "gstreamer-check-sys"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "gstreamer-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-gl"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "glib",
- "gstreamer",
- "gstreamer-base",
- "gstreamer-gl-sys",
- "gstreamer-video",
- "libc",
- "once_cell",
-]
-
-[[package]]
-name = "gstreamer-gl-egl"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "glib",
- "gstreamer",
- "gstreamer-gl",
- "gstreamer-gl-egl-sys",
- "libc",
-]
-
-[[package]]
-name = "gstreamer-gl-egl-sys"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "glib-sys",
- "gstreamer-gl-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-gl-sys"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "gstreamer-base-sys",
- "gstreamer-sys",
- "gstreamer-video-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-gl-wayland"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "glib",
- "gstreamer",
- "gstreamer-gl",
- "gstreamer-gl-wayland-sys",
- "libc",
-]
-
-[[package]]
-name = "gstreamer-gl-wayland-sys"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "glib-sys",
- "gstreamer-gl-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-gl-x11"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "glib",
- "gstreamer",
- "gstreamer-gl",
- "gstreamer-gl-x11-sys",
- "libc",
-]
-
-[[package]]
-name = "gstreamer-gl-x11-sys"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "glib-sys",
- "gstreamer-gl-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-net"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "gio",
- "glib",
- "gstreamer",
- "gstreamer-net-sys",
-]
-
-[[package]]
-name = "gstreamer-net-sys"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "gio-sys",
- "glib-sys",
- "gstreamer-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-pbutils"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "glib",
- "gstreamer",
- "gstreamer-audio",
- "gstreamer-pbutils-sys",
- "gstreamer-video",
- "libc",
- "thiserror",
-]
-
-[[package]]
-name = "gstreamer-pbutils-sys"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "gstreamer-audio-sys",
- "gstreamer-sys",
- "gstreamer-video-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-rtp"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "glib",
- "gstreamer",
- "gstreamer-rtp-sys",
- "libc",
-]
-
-[[package]]
-name = "gstreamer-rtp-sys"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "glib-sys",
- "gstreamer-base-sys",
- "gstreamer-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-sdp"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "glib",
- "gstreamer",
- "gstreamer-sdp-sys",
-]
-
-[[package]]
-name = "gstreamer-sdp-sys"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "glib-sys",
- "gstreamer-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-sys"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-utils"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "gstreamer",
- "gstreamer-app",
- "gstreamer-video",
- "once_cell",
- "thiserror",
-]
-
-[[package]]
-name = "gstreamer-video"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "cfg-if",
- "futures-channel",
- "glib",
- "gstreamer",
- "gstreamer-base",
- "gstreamer-video-sys",
- "libc",
- "once_cell",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "gstreamer-video-sys"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "gstreamer-base-sys",
- "gstreamer-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-webrtc"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "glib",
- "gstreamer",
- "gstreamer-sdp",
- "gstreamer-webrtc-sys",
- "libc",
-]
-
-[[package]]
-name = "gstreamer-webrtc-sys"
-version = "0.22.7"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
-dependencies = [
- "glib-sys",
- "gstreamer-sdp-sys",
- "gstreamer-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gtk4"
-version = "0.8.2"
-source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#cf84b5cd36fc1aa31175bc24ff45e8ceb0710dec"
-dependencies = [
- "cairo-rs",
- "field-offset",
- "futures-channel",
- "gdk-pixbuf",
- "gdk4",
- "gio",
- "glib",
- "graphene-rs",
- "gsk4",
- "gtk4-macros",
- "gtk4-sys",
- "libc",
- "pango",
-]
-
-[[package]]
-name = "gtk4-macros"
-version = "0.8.2"
-source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#cf84b5cd36fc1aa31175bc24ff45e8ceb0710dec"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "gtk4-sys"
-version = "0.8.2"
-source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#cf84b5cd36fc1aa31175bc24ff45e8ceb0710dec"
-dependencies = [
- "cairo-sys-rs",
- "gdk-pixbuf-sys",
- "gdk4-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "graphene-sys",
- "gsk4-sys",
- "libc",
- "pango-sys",
- "system-deps",
-]
-
-[[package]]
-name = "h2"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http 0.2.12",
- "indexmap 2.2.6",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "h2"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
-dependencies = [
- "atomic-waker",
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "http 1.1.0",
- "indexmap 2.2.6",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-dependencies = [
- "ahash",
- "allocator-api2",
-]
-
-[[package]]
-name = "headers"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270"
-dependencies = [
- "base64 0.21.7",
- "bytes",
- "headers-core 0.2.0",
- "http 0.2.12",
- "httpdate",
- "mime",
- "sha1",
-]
-
-[[package]]
-name = "headers"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9"
-dependencies = [
- "base64 0.21.7",
- "bytes",
- "headers-core 0.3.0",
- "http 1.1.0",
- "httpdate",
- "mime",
- "sha1",
-]
-
-[[package]]
-name = "headers-core"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429"
-dependencies = [
- "http 0.2.12",
-]
-
-[[package]]
-name = "headers-core"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4"
-dependencies = [
- "http 1.1.0",
-]
-
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
-[[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.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[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 = "hmac"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
-dependencies = [
- "crypto-mac",
- "digest 0.9.0",
-]
-
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest 0.10.7",
-]
-
-[[package]]
-name = "hostname"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
-dependencies = [
- "libc",
- "match_cfg",
- "winapi",
-]
-
-[[package]]
-name = "hrtf"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f4de47a84fd55fa33aa5ef337016814fdc869fdad23e7898b5322fa290248e6"
-dependencies = [
- "byteorder",
- "rubato",
- "rustfft",
-]
-
-[[package]]
-name = "http"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[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 = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
-dependencies = [
- "bytes",
- "http 0.2.12",
- "pin-project-lite",
-]
-
-[[package]]
-name = "http-body"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
-dependencies = [
- "bytes",
- "http 1.1.0",
-]
-
-[[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 1.1.0",
- "http-body 1.0.0",
- "pin-project-lite",
-]
-
-[[package]]
-name = "httparse"
-version = "1.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
-
-[[package]]
-name = "httpdate"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
-
-[[package]]
-name = "human_bytes"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91f255a4535024abf7640cb288260811fc14794f62b063652ed349f9a6c2348e"
-
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
-[[package]]
-name = "hyper"
-version = "0.14.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2 0.3.26",
- "http 0.2.12",
- "http-body 0.4.6",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "socket2 0.5.7",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
-[[package]]
-name = "hyper"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "h2 0.4.5",
- "http 1.1.0",
- "http-body 1.0.0",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "smallvec",
- "tokio",
- "want",
-]
-
-[[package]]
-name = "hyper-proxy"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc"
-dependencies = [
- "bytes",
- "futures",
- "headers 0.3.9",
- "http 0.2.12",
- "hyper 0.14.29",
- "tokio",
- "tower-service",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
-dependencies = [
- "futures-util",
- "http 0.2.12",
- "hyper 0.14.29",
- "log",
- "rustls 0.21.12",
- "rustls-native-certs",
- "tokio",
- "tokio-rustls 0.24.1",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.27.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
-dependencies = [
- "futures-util",
- "http 1.1.0",
- "hyper 1.3.1",
- "hyper-util",
- "rustls 0.23.10",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls 0.26.0",
- "tower-service",
-]
-
-[[package]]
-name = "hyper-tls"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
-dependencies = [
- "bytes",
- "hyper 0.14.29",
- "native-tls",
- "tokio",
- "tokio-native-tls",
-]
-
-[[package]]
-name = "hyper-tls"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
-dependencies = [
- "bytes",
- "http-body-util",
- "hyper 1.3.1",
- "hyper-util",
- "native-tls",
- "tokio",
- "tokio-native-tls",
- "tower-service",
-]
-
-[[package]]
-name = "hyper-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "http 1.1.0",
- "http-body 1.0.0",
- "hyper 1.3.1",
- "pin-project-lite",
- "socket2 0.5.7",
- "tokio",
- "tower",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "hyphenation"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcf4dd4c44ae85155502a52c48739c8a48185d1449fff1963cffee63c28a50f0"
-dependencies = [
- "bincode",
- "fst",
- "hyphenation_commons",
- "pocket-resources",
- "serde",
-]
-
-[[package]]
-name = "hyphenation_commons"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5febe7a2ade5c7d98eb8b75f946c046b335324b06a14ea0998271504134c05bf"
-dependencies = [
- "fst",
- "serde",
-]
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "windows-core",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
-[[package]]
-name = "idna"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[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 = "if-addrs"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbc0fa01ffc752e9dbc72818cdb072cd028b86be5e09dd04c5a643704fe101a9"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "image"
-version = "0.24.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
-dependencies = [
- "bytemuck",
- "byteorder",
- "color_quant",
- "num-traits",
-]
-
-[[package]]
-name = "image_hasher"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f9e64a8c472ea9f81ac448e3b488fd82dcdfce6434cf880882bf36bfb5c268a"
-dependencies = [
- "base64 0.21.7",
- "image",
- "rustdct",
- "serde",
- "transpose",
-]
-
-[[package]]
-name = "imgref"
-version = "1.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126"
-
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
- "serde",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
-dependencies = [
- "equivalent",
- "hashbrown 0.14.5",
- "serde",
-]
-
-[[package]]
-name = "interpolate_name"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "ipnet"
-version = "2.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
-
-[[package]]
-name = "is-terminal"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
-dependencies = [
- "hermit-abi 0.3.9",
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "is_terminal_polyfill"
-version = "1.70.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
-
-[[package]]
-name = "iso8601"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "924e5d73ea28f59011fec52a0d12185d496a9b075d360657aed2a5707f701153"
-dependencies = [
- "nom",
-]
-
-[[package]]
-name = "itertools"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itertools"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-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 = "jobserver"
-version = "0.1.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "js-sys"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "jsonwebtoken"
-version = "9.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c7ea04a7c5c055c175f189b6dc6ba036fd62306b58c66c9f6389036c503a3f4"
-dependencies = [
- "base64 0.21.7",
- "js-sys",
- "ring",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "khronos-egl"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "lewton"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030"
-dependencies = [
- "byteorder",
- "ogg",
- "tinyvec",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.155"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
-
-[[package]]
-name = "libfuzzer-sys"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7"
-dependencies = [
- "arbitrary",
- "cc",
- "once_cell",
-]
-
-[[package]]
-name = "libloading"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
-dependencies = [
- "cfg-if",
- "windows-targets 0.52.5",
-]
-
-[[package]]
-name = "libm"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
-
-[[package]]
-name = "libmdns"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b04ae6b56b3b19ade26f0e7e7c1360a1713514f326c5ed0797cf2c109c9e010"
-dependencies = [
- "byteorder",
- "futures-util",
- "hostname",
- "if-addrs",
- "log",
- "multimap 0.8.3",
- "nix",
- "rand",
- "socket2 0.4.10",
- "thiserror",
- "tokio",
- "winapi",
-]
-
-[[package]]
-name = "librespot"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea4c9952ef48968f8184a4a87f8576982426ebe623342d5a28f7d9c4978e4a44"
-dependencies = [
- "base64 0.13.1",
- "env_logger 0.9.3",
- "futures-util",
- "getopts",
- "hex",
- "hyper 0.14.29",
- "librespot-audio",
- "librespot-connect",
- "librespot-core",
- "librespot-discovery",
- "librespot-metadata",
- "librespot-playback",
- "librespot-protocol",
- "log",
- "rpassword",
- "sha-1",
- "thiserror",
- "tokio",
- "url",
-]
-
-[[package]]
-name = "librespot-audio"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c176a31355e1ea8e0b9c4ced19df4947bfe4770661c25c142b6fba2365940d9d"
-dependencies = [
- "aes-ctr",
- "byteorder",
- "bytes",
- "futures-util",
- "librespot-core",
- "log",
- "tempfile",
- "tokio",
-]
-
-[[package]]
-name = "librespot-connect"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ffafb6a443e9445ccb3d5d591573b5b1da3c89a9b8846c63ba2c3710210d3ec"
-dependencies = [
- "form_urlencoded",
- "futures-util",
- "librespot-core",
- "librespot-discovery",
- "librespot-playback",
- "librespot-protocol",
- "log",
- "protobuf",
- "rand",
- "serde",
- "serde_json",
- "tokio",
- "tokio-stream",
-]
-
-[[package]]
-name = "librespot-core"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046349f25888e644bf02d9c5de0164b2a493d29aa4ce18e1ad0b756da9b55d6d"
-dependencies = [
- "aes",
- "base64 0.13.1",
- "byteorder",
- "bytes",
- "form_urlencoded",
- "futures-core",
- "futures-util",
- "hmac 0.11.0",
- "http 0.2.12",
- "httparse",
- "hyper 0.14.29",
- "hyper-proxy",
- "librespot-protocol",
- "log",
- "num-bigint",
- "num-integer",
- "num-traits",
- "once_cell",
- "pbkdf2",
- "priority-queue",
- "protobuf",
- "rand",
- "serde",
- "serde_json",
- "sha-1",
- "shannon",
- "thiserror",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "url",
- "uuid",
- "vergen",
-]
-
-[[package]]
-name = "librespot-discovery"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aa877d18f6150364012cb4be5682d62d7c712c88bae2d0d01720fd7c15e2f06"
-dependencies = [
- "aes-ctr",
- "base64 0.13.1",
- "form_urlencoded",
- "futures-core",
- "hmac 0.11.0",
- "hyper 0.14.29",
- "libmdns",
- "librespot-core",
- "log",
- "rand",
- "serde_json",
- "sha-1",
- "thiserror",
- "tokio",
-]
-
-[[package]]
-name = "librespot-metadata"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b80361fcbcb5092056fd47c08c34d5d51b08385d8efb6941c0d3e46d032c21c"
-dependencies = [
- "async-trait",
- "byteorder",
- "librespot-core",
- "librespot-protocol",
- "log",
- "protobuf",
-]
-
-[[package]]
-name = "librespot-playback"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5190a0b9bcc7f70ee4196a6b4a1c731d405ca130d4a6fcd4c561cfdde8b7cfb7"
-dependencies = [
- "byteorder",
- "futures-executor",
- "futures-util",
- "lewton",
- "librespot-audio",
- "librespot-core",
- "librespot-metadata",
- "log",
- "ogg",
- "parking_lot",
- "rand",
- "rand_distr",
- "shell-words",
- "thiserror",
- "tokio",
- "zerocopy 0.6.6",
-]
-
-[[package]]
-name = "librespot-protocol"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d6d3ac6196ac0ea67bbe039f56d6730a5d8b31502ef9bce0f504ed729dcb39f"
-dependencies = [
- "glob",
- "protobuf",
- "protobuf-codegen-pure",
-]
-
-[[package]]
-name = "libsodium-sys"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b779387cd56adfbc02ea4a668e704f729be8d6a6abd2c27ca5ee537849a92fd"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "walkdir",
-]
-
-[[package]]
-name = "libwebp-sys2"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e2ae528b6c8f543825990b24c00cfd8fe64dde126c8288f4972b18e3d558072"
-dependencies = [
- "cc",
- "cfg-if",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
-
-[[package]]
-name = "livekit-api"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e20c3fc3de5944ce6b5c8da4084cf828bbae7216671e32e83b767ce61feeb7e0"
-dependencies = [
- "futures-util",
- "jsonwebtoken",
- "livekit-protocol",
- "log",
- "parking_lot",
- "prost",
- "reqwest 0.11.27",
- "scopeguard",
- "serde",
- "sha2",
- "thiserror",
- "tokio",
- "tokio-tungstenite 0.20.1",
- "url",
-]
-
-[[package]]
-name = "livekit-protocol"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a1bd23257110be29d024d8d816adff70df18ea1d22ceb1aab6f3ad4aab0d523"
-dependencies = [
- "futures-util",
- "parking_lot",
- "pbjson",
- "pbjson-types",
- "prost",
- "prost-types",
- "serde",
- "thiserror",
- "tokio",
-]
-
-[[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.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
-
-[[package]]
-name = "lru"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc"
-dependencies = [
- "hashbrown 0.14.5",
-]
-
-[[package]]
-name = "m3u8-rs"
-version = "5.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c1d7ba86f7ea62f17f4310c55e93244619ddc7dadfc7e565de1967e4e41e6e7"
-dependencies = [
- "chrono",
- "nom",
-]
-
-[[package]]
-name = "match_cfg"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
-
-[[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 = "maybe-rayon"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519"
-dependencies = [
- "cfg-if",
- "rayon",
-]
-
-[[package]]
-name = "md-5"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
-dependencies = [
- "cfg-if",
- "digest 0.10.7",
-]
-
-[[package]]
-name = "memchr"
-version = "2.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
-
-[[package]]
-name = "memoffset"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "memoffset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-dependencies = [
- "autocfg",
-]
-
-[[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.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
-dependencies = [
- "mime",
- "unicase",
-]
-
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
- "simd-adler32",
-]
-
-[[package]]
-name = "mio"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
-dependencies = [
- "libc",
- "wasi",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "more-asserts"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fafa6961cabd9c63bcd77a45d7e3b7f3b552b70417831fb0f56db717e72407e"
-
-[[package]]
-name = "muldiv"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0"
-
-[[package]]
-name = "multer"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2"
-dependencies = [
- "bytes",
- "encoding_rs",
- "futures-util",
- "http 0.2.12",
- "httparse",
- "log",
- "memchr",
- "mime",
- "spin",
- "version_check",
-]
-
-[[package]]
-name = "multimap"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "multimap"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"
-
-[[package]]
-name = "nanorand"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "nasm-rs"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe4d98d0065f4b1daf164b3eafb11974c94662e5e2396cf03f32d0bb5c17da51"
-dependencies = [
- "rayon",
-]
-
-[[package]]
-name = "native-tls"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
-dependencies = [
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
-[[package]]
-name = "new_debug_unreachable"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
-
-[[package]]
-name = "nix"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c"
-dependencies = [
- "bitflags 1.3.2",
- "cc",
- "cfg-if",
- "libc",
- "memoffset 0.6.5",
-]
-
-[[package]]
-name = "nnnoiseless"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d377ce2fb579ed5c14cfa0d39e70849030fdf673d6d1a764cadb2dfbb02a50"
-dependencies = [
- "once_cell",
- "rustfft",
-]
-
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
-[[package]]
-name = "noop_proc_macro"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8"
-
-[[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 = "num-bigint"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7"
-dependencies = [
- "num-integer",
- "num-traits",
- "rand",
-]
-
-[[package]]
-name = "num-complex"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-conv"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-
-[[package]]
-name = "num-derive"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
-dependencies = [
- "num-bigint",
- "num-integer",
- "num-traits",
- "serde",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
- "libm",
-]
-
-[[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 = "object"
-version = "0.36.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "ogg"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-
-[[package]]
-name = "opaque-debug"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
-
-[[package]]
-name = "openssl"
-version = "0.10.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
-dependencies = [
- "bitflags 2.5.0",
- "cfg-if",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.102"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "option-operations"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c26d27bb1aeab65138e4bf7666045169d1717febcc9ff870166be8348b223d0"
-dependencies = [
- "paste",
-]
-
-[[package]]
-name = "outref"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a"
-
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
-[[package]]
-name = "p256"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594"
-dependencies = [
- "ecdsa",
- "elliptic-curve",
- "sha2",
-]
-
-[[package]]
-name = "pango"
-version = "0.19.8"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
-dependencies = [
- "gio",
- "glib",
- "libc",
- "pango-sys",
-]
-
-[[package]]
-name = "pango-sys"
-version = "0.19.8"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "pangocairo"
-version = "0.19.8"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
-dependencies = [
- "cairo-rs",
- "glib",
- "libc",
- "pango",
- "pangocairo-sys",
-]
-
-[[package]]
-name = "pangocairo-sys"
-version = "0.19.8"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
-dependencies = [
- "cairo-sys-rs",
- "glib-sys",
- "libc",
- "pango-sys",
- "system-deps",
-]
-
-[[package]]
-name = "parking"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
-
-[[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 = [
- "backtrace",
- "cfg-if",
- "libc",
- "petgraph",
- "redox_syscall",
- "smallvec",
- "thread-id",
- "windows-targets 0.52.5",
-]
-
-[[package]]
-name = "parse_link_header"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3687fe9debbbf2a019f381a8bc6b42049b22647449b39af54b3013985c0cf6de"
-dependencies = [
- "http 0.2.12",
- "lazy_static",
- "regex",
- "url",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
-[[package]]
-name = "pbjson"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1030c719b0ec2a2d25a5df729d6cff1acf3cc230bf766f4f97833591f7577b90"
-dependencies = [
- "base64 0.21.7",
- "serde",
-]
-
-[[package]]
-name = "pbjson-build"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2580e33f2292d34be285c5bc3dba5259542b083cfad6037b6d70345f24dcb735"
-dependencies = [
- "heck 0.4.1",
- "itertools 0.11.0",
- "prost",
- "prost-types",
-]
-
-[[package]]
-name = "pbjson-types"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18f596653ba4ac51bdecbb4ef6773bc7f56042dc13927910de1684ad3d32aa12"
-dependencies = [
- "bytes",
- "chrono",
- "pbjson",
- "pbjson-build",
- "prost",
- "prost-build",
- "serde",
-]
-
-[[package]]
-name = "pbkdf2"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa"
-dependencies = [
- "crypto-mac",
- "hmac 0.11.0",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-
-[[package]]
-name = "petgraph"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
-dependencies = [
- "fixedbitset",
- "indexmap 2.2.6",
-]
-
-[[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.66",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "pkcs8"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
-dependencies = [
- "der",
- "spki",
-]
-
-[[package]]
-name = "pkg-config"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
-
-[[package]]
-name = "png"
-version = "0.17.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
-dependencies = [
- "bitflags 1.3.2",
- "crc32fast",
- "fdeflate",
- "flate2",
- "miniz_oxide",
-]
-
-[[package]]
-name = "pocket-resources"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c135f38778ad324d9e9ee68690bac2c1a51f340fdf96ca13e2ab3914eb2e51d8"
-
-[[package]]
-name = "polling"
-version = "3.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b"
-dependencies = [
- "cfg-if",
- "concurrent-queue",
- "hermit-abi 0.4.0",
- "pin-project-lite",
- "rustix",
- "tracing",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "powerfmt"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
-[[package]]
-name = "pretty_assertions"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
-dependencies = [
- "diff",
- "yansi",
-]
-
-[[package]]
-name = "prettyplease"
-version = "0.2.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
-dependencies = [
- "proc-macro2",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "primal-check"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc0d895b311e3af9902528fbb8f928688abbd95872819320517cc24ca6b2bd08"
-dependencies = [
- "num-integer",
-]
-
-[[package]]
-name = "priority-queue"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0bda9164fe05bc9225752d54aae413343c36f684380005398a6a8fde95fe785"
-dependencies = [
- "autocfg",
- "indexmap 1.9.3",
-]
-
-[[package]]
-name = "proc-macro-crate"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
-dependencies = [
- "toml_edit 0.21.1",
-]
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.85"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "profiling"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58"
-dependencies = [
- "profiling-procmacros",
-]
-
-[[package]]
-name = "profiling-procmacros"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd"
-dependencies = [
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "prost"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29"
-dependencies = [
- "bytes",
- "prost-derive",
-]
-
-[[package]]
-name = "prost-build"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
-dependencies = [
- "bytes",
- "heck 0.5.0",
- "itertools 0.12.1",
- "log",
- "multimap 0.10.0",
- "once_cell",
- "petgraph",
- "prettyplease",
- "prost",
- "prost-types",
- "regex",
- "syn 2.0.66",
- "tempfile",
-]
-
-[[package]]
-name = "prost-derive"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
-dependencies = [
- "anyhow",
- "itertools 0.12.1",
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "prost-types"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0"
-dependencies = [
- "prost",
-]
-
-[[package]]
-name = "protobuf"
-version = "2.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
-
-[[package]]
-name = "protobuf-codegen"
-version = "2.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "033460afb75cf755fcfc16dfaed20b86468082a2ea24e05ac35ab4a099a017d6"
-dependencies = [
- "protobuf",
-]
-
-[[package]]
-name = "protobuf-codegen-pure"
-version = "2.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a29399fc94bcd3eeaa951c715f7bea69409b2445356b00519740bcd6ddd865"
-dependencies = [
- "protobuf",
- "protobuf-codegen",
-]
-
-[[package]]
-name = "psl-types"
-version = "2.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac"
-
-[[package]]
-name = "publicsuffix"
-version = "2.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457"
-dependencies = [
- "idna 0.3.0",
- "psl-types",
-]
-
-[[package]]
-name = "quick-xml"
-version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
-dependencies = [
- "memchr",
- "serde",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
-dependencies = [
- "proc-macro2",
-]
-
-[[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 = "rand_distr"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31"
-dependencies = [
- "num-traits",
- "rand",
-]
-
-[[package]]
-name = "raptorq"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cc8cd0bcb2d520fff368264b5a6295e064c60955349517d09b14473afae4856"
-
-[[package]]
-name = "rav1e"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9"
-dependencies = [
- "arbitrary",
- "arg_enum_proc_macro",
- "arrayvec",
- "av1-grain",
- "bitstream-io",
- "built",
- "cc",
- "cfg-if",
- "interpolate_name",
- "itertools 0.12.1",
- "libc",
- "libfuzzer-sys",
- "log",
- "maybe-rayon",
- "nasm-rs",
- "new_debug_unreachable",
- "noop_proc_macro",
- "num-derive",
- "num-traits",
- "once_cell",
- "paste",
- "profiling",
- "rand",
- "rand_chacha",
- "simd_helpers",
- "system-deps",
- "thiserror",
- "v_frame",
-]
-
-[[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 = "realfft"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953d9f7e5cdd80963547b456251296efc2626ed4e3cbf36c869d9564e0220571"
-dependencies = [
- "rustfft",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
-dependencies = [
- "bitflags 2.5.0",
-]
-
-[[package]]
-name = "regex"
-version = "1.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
-]
-
-[[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.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax 0.8.4",
-]
-
-[[package]]
-name = "regex-lite"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a"
-
-[[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.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
-
-[[package]]
-name = "reqwest"
-version = "0.11.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
-dependencies = [
- "base64 0.21.7",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2 0.3.26",
- "http 0.2.12",
- "http-body 0.4.6",
- "hyper 0.14.29",
- "hyper-tls 0.5.0",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "native-tls",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls-pemfile 1.0.4",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper 0.1.2",
- "system-configuration",
- "tokio",
- "tokio-native-tls",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "winreg 0.50.0",
-]
-
-[[package]]
-name = "reqwest"
-version = "0.12.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
-dependencies = [
- "async-compression",
- "base64 0.22.1",
- "bytes",
- "cookie",
- "cookie_store",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2 0.4.5",
- "http 1.1.0",
- "http-body 1.0.0",
- "http-body-util",
- "hyper 1.3.1",
- "hyper-rustls 0.27.2",
- "hyper-tls 0.6.0",
- "hyper-util",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "native-tls",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls-pemfile 2.1.2",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper 1.0.1",
- "system-configuration",
- "tokio",
- "tokio-native-tls",
- "tokio-util",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "winreg 0.52.0",
-]
-
-[[package]]
-name = "rfc6979"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
-dependencies = [
- "crypto-bigint 0.4.9",
- "hmac 0.12.1",
- "zeroize",
-]
-
-[[package]]
-name = "rgb"
-version = "0.8.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8"
-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 = "rpassword"
-version = "6.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bf099a1888612545b683d2661a1940089f6c2e5a8e38979b2159da876bfd956"
-dependencies = [
- "libc",
- "serde",
- "serde_json",
- "winapi",
-]
-
-[[package]]
-name = "rtsp-types"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9eda23daacde59c9e182db0a25e03f51f0108707169c09b4e5d931885470c5c"
-dependencies = [
- "cookie-factory",
- "nom",
- "tinyvec",
- "url",
-]
-
-[[package]]
-name = "rubato"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6dd52e80cfc21894deadf554a5673002938ae4625f7a283e536f9cf7c17b0d5"
-dependencies = [
- "num-complex",
- "num-integer",
- "num-traits",
- "realfft",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
-
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver",
-]
-
-[[package]]
-name = "rustdct"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b61555105d6a9bf98797c063c362a1d24ed8ab0431655e38f1cf51e52089551"
-dependencies = [
- "rustfft",
-]
-
-[[package]]
-name = "rustfft"
-version = "6.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43806561bc506d0c5d160643ad742e3161049ac01027b5e6d7524091fd401d86"
-dependencies = [
- "num-complex",
- "num-integer",
- "num-traits",
- "primal-check",
- "strength_reduce",
- "transpose",
- "version_check",
-]
-
-[[package]]
-name = "rustix"
-version = "0.38.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
-dependencies = [
- "bitflags 2.5.0",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "rustls"
-version = "0.21.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
-dependencies = [
- "log",
- "ring",
- "rustls-webpki 0.101.7",
- "sct",
-]
-
-[[package]]
-name = "rustls"
-version = "0.23.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402"
-dependencies = [
- "once_cell",
- "rustls-pki-types",
- "rustls-webpki 0.102.4",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rustls-native-certs"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
-dependencies = [
- "openssl-probe",
- "rustls-pemfile 1.0.4",
- "schannel",
- "security-framework",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
-dependencies = [
- "base64 0.21.7",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
-dependencies = [
- "base64 0.22.1",
- "rustls-pki-types",
-]
-
-[[package]]
-name = "rustls-pki-types"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
-
-[[package]]
-name = "rustls-webpki"
-version = "0.101.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "rustls-webpki"
-version = "0.102.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e"
-dependencies = [
- "ring",
- "rustls-pki-types",
- "untrusted",
-]
-
-[[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 = "scc"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76ad2bbb0ae5100a07b7a6f2ed7ab5fd0045551a4c507989b7a620046ea3efdc"
-dependencies = [
- "sdd",
-]
-
-[[package]]
-name = "schannel"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "sct"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "sdd"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b84345e4c9bd703274a082fb80caaa99b7612be48dfaa1dd9266577ec412309d"
-
-[[package]]
-name = "sdp-types"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bc1e17b07a224c21a31b5f7ed74cbbb189d26a0b8cdbfc8b57fa5940c89f086"
-dependencies = [
- "bstr",
- "fallible-iterator",
-]
-
-[[package]]
-name = "sec1"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
-dependencies = [
- "base16ct",
- "der",
- "generic-array",
- "pkcs8",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "security-framework"
-version = "2.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
-dependencies = [
- "bitflags 2.5.0",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[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.203"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_bytes"
-version = "0.11.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.203"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.117"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_path_to_error"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6"
-dependencies = [
- "itoa",
- "serde",
-]
-
-[[package]]
-name = "serde_spanned"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
-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 = "serde_with"
-version = "3.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20"
-dependencies = [
- "base64 0.22.1",
- "chrono",
- "hex",
- "indexmap 1.9.3",
- "indexmap 2.2.6",
- "serde",
- "serde_derive",
- "serde_json",
- "serde_with_macros",
- "time",
-]
-
-[[package]]
-name = "serde_with_macros"
-version = "3.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "serial_test"
-version = "3.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d"
-dependencies = [
- "futures",
- "log",
- "once_cell",
- "parking_lot",
- "scc",
- "serial_test_derive",
-]
-
-[[package]]
-name = "serial_test_derive"
-version = "3.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "sha-1"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug",
-]
-
-[[package]]
-name = "sha1"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest 0.10.7",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest 0.10.7",
-]
-
-[[package]]
-name = "shannon"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ea5b41c9427b56caa7b808cb548a04fb50bb5b9e98590b53f28064ff4174561"
-dependencies = [
- "byteorder",
-]
-
-[[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-words"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
-
-[[package]]
-name = "signal-hook"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
-[[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 = "signature"
-version = "1.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
-dependencies = [
- "digest 0.10.7",
- "rand_core",
-]
-
-[[package]]
-name = "simd-adler32"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
-
-[[package]]
-name = "simd_helpers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6"
-dependencies = [
- "quote",
-]
-
-[[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.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[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 = "sodiumoxide"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e26be3acb6c2d9a7aac28482586a7856436af4cfe7100031d219de2d2ecb0028"
-dependencies = [
- "ed25519",
- "libc",
- "libsodium-sys",
- "serde",
-]
-
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-dependencies = [
- "lock_api",
-]
-
-[[package]]
-name = "spki"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
-dependencies = [
- "base64ct",
- "der",
-]
-
-[[package]]
-name = "sprintf"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c0cdea5a20a06e7c57f627094e7b1618e5665592cd88f2d45fa4014e348db58"
-
-[[package]]
-name = "strength_reduce"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82"
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "strsim"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-
-[[package]]
-name = "subtle"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.66"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "sync_wrapper"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-
-[[package]]
-name = "sync_wrapper"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
-
-[[package]]
-name = "system-configuration"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "system-configuration-sys",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "system-deps"
-version = "6.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
-dependencies = [
- "cfg-expr",
- "heck 0.5.0",
- "pkg-config",
- "toml",
- "version-compare",
-]
-
-[[package]]
-name = "target-lexicon"
-version = "0.12.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
-
-[[package]]
-name = "tempfile"
-version = "3.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
-dependencies = [
- "cfg-if",
- "fastrand",
- "rustix",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "test-log"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6159ab4116165c99fc88cce31f99fa2c9dbe08d3691cb38da02fc3b45f357d2b"
-dependencies = [
- "test-log-macros",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "test-log-macros"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ba277e77219e9eea169e8508942db1bf5d8a41ff2db9b20aab5a5aadc9fa25d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "test-with"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3a0c1b477619de2a1bf72990195561a06f7b68bbf272cea676236ad7cfb9e8"
-dependencies = [
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "regex",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
-dependencies = [
- "hyphenation",
- "smawk",
- "unicode-linebreak",
- "unicode-width",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.61"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.61"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "thread-id"
-version = "4.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0ec81c46e9eb50deaa257be2f148adf052d1fb7701cfd55ccfab2525280b70b"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[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 = "time"
-version = "0.3.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
-dependencies = [
- "deranged",
- "itoa",
- "num-conv",
- "powerfmt",
- "serde",
- "time-core",
- "time-macros",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
-
-[[package]]
-name = "time-macros"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
-dependencies = [
- "num-conv",
- "time-core",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
-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 = "tokio"
-version = "1.38.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
-dependencies = [
- "backtrace",
- "bytes",
- "libc",
- "mio",
- "num_cpus",
- "parking_lot",
- "pin-project-lite",
- "signal-hook-registry",
- "socket2 0.5.7",
- "tokio-macros",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
-dependencies = [
- "rustls 0.21.12",
- "tokio",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
-dependencies = [
- "rustls 0.23.10",
- "rustls-pki-types",
- "tokio",
-]
-
-[[package]]
-name = "tokio-stream"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
-dependencies = [
- "futures-core",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tokio-tungstenite"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c"
-dependencies = [
- "futures-util",
- "log",
- "native-tls",
- "tokio",
- "tokio-native-tls",
- "tungstenite 0.20.1",
-]
-
-[[package]]
-name = "tokio-tungstenite"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38"
-dependencies = [
- "futures-util",
- "log",
- "tokio",
- "tungstenite 0.21.0",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "toml"
-version = "0.8.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit 0.22.14",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
-dependencies = [
- "indexmap 2.2.6",
- "toml_datetime",
- "winnow 0.5.40",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
-dependencies = [
- "indexmap 2.2.6",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow 0.6.13",
-]
-
-[[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",
-]
-
-[[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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
-
-[[package]]
-name = "tracing"
-version = "0.1.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
-dependencies = [
- "log",
- "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 2.0.66",
-]
-
-[[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-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-subscriber"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
-dependencies = [
- "matchers",
- "nu-ansi-term",
- "once_cell",
- "regex",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "tracing",
- "tracing-core",
- "tracing-log",
-]
-
-[[package]]
-name = "transpose"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad61aed86bc3faea4300c7aee358b4c6d0c8d6ccc36524c96e4c92ccf26e77e"
-dependencies = [
- "num-integer",
- "strength_reduce",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
-
-[[package]]
-name = "tungstenite"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9"
-dependencies = [
- "byteorder",
- "bytes",
- "data-encoding",
- "http 0.2.12",
- "httparse",
- "log",
- "native-tls",
- "rand",
- "sha1",
- "thiserror",
- "url",
- "utf-8",
-]
-
-[[package]]
-name = "tungstenite"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1"
-dependencies = [
- "byteorder",
- "bytes",
- "data-encoding",
- "http 1.1.0",
- "httparse",
- "log",
- "rand",
- "sha1",
- "thiserror",
- "url",
- "utf-8",
-]
-
-[[package]]
-name = "tungstenite"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8"
-dependencies = [
- "byteorder",
- "bytes",
- "data-encoding",
- "http 1.1.0",
- "httparse",
- "log",
- "native-tls",
- "rand",
- "sha1",
- "thiserror",
- "url",
- "utf-8",
-]
-
-[[package]]
-name = "typenum"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-
-[[package]]
-name = "unicase"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
-dependencies = [
- "version_check",
-]
-
-[[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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[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.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-width"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
-
-[[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 0.5.0",
- "percent-encoding",
-]
-
-[[package]]
-name = "url-escape"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44e0ce4d1246d075ca5abec4b41d33e87a6054d08e2366b63205665e950db218"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "urlencoding"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
-
-[[package]]
-name = "utf-8"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
-
-[[package]]
-name = "utf8parse"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
-
-[[package]]
-name = "uuid"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "v_frame"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b"
-dependencies = [
- "aligned-vec",
- "num-traits",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "va_list"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350bd5ef744f978a387cd08ce514be4e3766746496f355d59d68af36f52d36da"
-
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "vergen"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7141e445af09c8919f1d5f8a20dae0b20c3b57a45dee0d5823c6ed5d237f15a"
-dependencies = [
- "bitflags 1.3.2",
- "chrono",
- "rustc_version",
-]
-
-[[package]]
-name = "version-compare"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "vsimd"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64"
-
-[[package]]
-name = "waker-fn"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
-
-[[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 = "warp"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "headers 0.3.9",
- "http 0.2.12",
- "hyper 0.14.29",
- "log",
- "mime",
- "mime_guess",
- "multer",
- "percent-encoding",
- "pin-project",
- "scoped-tls",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "tokio",
- "tokio-tungstenite 0.21.0",
- "tokio-util",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn 2.0.66",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
-
-[[package]]
-name = "web-sys"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "weezl"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
-
-[[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.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
-dependencies = [
- "windows-sys 0.52.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-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets 0.52.5",
-]
-
-[[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.5",
-]
-
-[[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.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_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",
-]
-
-[[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.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
-
-[[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.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
-
-[[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.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
-
-[[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.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
-
-[[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.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
-
-[[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.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
-
-[[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.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
-
-[[package]]
-name = "winnow"
-version = "0.5.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "winnow"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "winreg"
-version = "0.50.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
-[[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 = "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 = "xml-rs"
-version = "0.8.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193"
-
-[[package]]
-name = "xmlparser"
-version = "0.13.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
-
-[[package]]
-name = "xmltree"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7d8a75eaf6557bb84a65ace8609883db44a29951042ada9b393151532e41fcb"
-dependencies = [
- "xml-rs",
-]
-
-[[package]]
-name = "yansi"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
-
-[[package]]
-name = "zerocopy"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6"
-dependencies = [
- "byteorder",
- "zerocopy-derive 0.6.6",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.7.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
-dependencies = [
- "zerocopy-derive 0.7.34",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "zeroize"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix
index 2721cf46dddf6..51fc2b168d935 100644
--- a/pkgs/development/libraries/gstreamer/rs/default.nix
+++ b/pkgs/development/libraries/gstreamer/rs/default.nix
@@ -100,19 +100,7 @@ let
# video
cdg = [ ];
closedcaption = [ pango ];
- dav1d = [
- # Only dav1d < 1.3 is supported for now.
- # https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1393
- (dav1d.overrideAttrs rec {
- version = "1.2.1";
- src = fetchFromGitHub {
- owner = "videolan";
- repo = "dav1d";
- rev = version;
- hash = "sha256-RrEim3HXXjx2RUU7K3wPH3QbhNTRN9ZX/oAcyE9aV8I=";
- };
- })
- ];
+ dav1d = [ dav1d ];
ffv1 = [ ];
gif = [ ];
gtk4 = [ gtk4 ];
@@ -170,7 +158,7 @@ assert lib.assertMsg (invalidPlugins == [ ])
stdenv.mkDerivation (finalAttrs: {
pname = "gst-plugins-rs";
- version = "0.12.8";
+ version = "0.13.3";
outputs = [
"out"
@@ -182,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "gstreamer";
repo = "gst-plugins-rs";
rev = finalAttrs.version;
- hash = "sha256-AGXKI/0Y2BdaSnpQAt3T/rkYlM8UpQpKm4kMAGd6Dyk=";
+ hash = "sha256-G6JdZXBNiZfbu6EBTOsJ4Id+BvPhIToZmHHi7zuapnE=";
# TODO: temporary workaround for case-insensitivity problems with color-name crate - https://github.com/annymosse/color-name/pull/2
postFetch = ''
sedSearch="$(cat <<\EOF | sed -ze 's/\n/\\n/g'
@@ -204,17 +192,13 @@ stdenv.mkDerivation (finalAttrs: {
'';
};
- cargoDeps = rustPlatform.importCargoLock {
- lockFile = ./Cargo.lock;
- outputHashes = {
- "cairo-rs-0.19.8" = "sha256-AdIUcxxuZVAWQ+KOBTrtsvTu4KtFiXkQPYWT9Avt7Z0=";
- "color-name-1.1.0" = "sha256-RfMStbe2wX5qjPARHIFHlSDKjzx8DwJ+RjzyltM5K7A=";
- "ffv1-0.0.0" = "sha256-af2VD00tMf/hkfvrtGrHTjVJqbl+VVpLaR0Ry+2niJE=";
- "flavors-0.2.0" = "sha256-zBa0X75lXnASDBam9Kk6w7K7xuH9fP6rmjWZBUB5hxk=";
- "gdk4-0.8.2" = "sha256-DZjHlhzrELZ8M5YUM5kSeOphjF7863DmywFgGbZL4Jo=";
- "gstreamer-0.22.7" = "sha256-vTEDqmyqhj9e7r7N0QfG4uTNBizrU0gTUfLOJ8kU1JE=";
+ cargoDeps =
+ with finalAttrs;
+ rustPlatform.fetchCargoVendor {
+ inherit src;
+ name = "${pname}-${version}";
+ hash = "sha256-NFB9kNmCF3SnOgpSd7SSihma+Ooqwxtrym9Il4A+uQY=";
};
- };
strictDeps = true;
@@ -272,12 +256,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/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
index 58c9486d98554..b3fc60c35259c 100644
--- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
+++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
@@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "gst-rtsp-server";
- version = "1.24.7";
+ version = "1.24.10";
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
- hash = "sha256-2ceOXNC+rTC/XnSvgOQefVAGGUYX/b9EuIvibla76Pk=";
+ hash = "sha256-2yHf3Xvy5xhWTVVzeK2lNYtBHv4qPonp8Ph6dFN+Ktw=";
};
outputs = [
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index b94f6daa917cd..374500f9a7082 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -25,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "gst-plugins-ugly";
- version = "1.24.7";
+ version = "1.24.10";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
- hash = "sha256-PclU/FP+GIg2cDIqHCFePGUpA24KabMPZHgc1AwmhZM=";
+ hash = "sha256-nfb9haclYkHvuyX4SzN1deOzRSZvXas4STceRpR3nxg=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index 2b9c02bbebd2a..3f93a52671b8b 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -25,11 +25,11 @@
stdenv.mkDerivation rec {
pname = "gstreamer-vaapi";
- version = "1.24.7";
+ version = "1.24.10";
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
- hash = "sha256-OqXtnX9LWny2DYsDcNmD1ZOV3lRu52cEQBGA/Q/V7oY=";
+ hash = "sha256-IVk9veXGvNz+mRld7748P02gHLhfjsEKrpQ4h9Odikw=";
};
outputs = [
diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix
index 8a79a06560fc1..5ceaa28640861 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 9f454b72cca11..65033624639f7 100644
--- a/pkgs/development/libraries/gupnp/1.6.nix
+++ b/pkgs/development/libraries/gupnp/1.6.nix
@@ -56,12 +56,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 d724e06433a4b..e05d85a4a015c 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -36,11 +36,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 20250668eba61..c1113514a7cf6 100644
--- a/pkgs/development/libraries/irrlicht/default.nix
+++ b/pkgs/development/libraries/irrlicht/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
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 \
diff --git a/pkgs/development/libraries/itk/generic.nix b/pkgs/development/libraries/itk/generic.nix
index b569c84e4ed61..7cb053603089b 100644
--- a/pkgs/development/libraries/itk/generic.nix
+++ b/pkgs/development/libraries/itk/generic.nix
@@ -65,19 +65,6 @@ let
rev = "583288b1898dedcfb5e4d602e31020b452971383";
hash = "sha256-1ItsLCRwRzGDSRe4xUDg09Hksu1nKichbWuM0YSVkbM=";
};
-
- # 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 {
@@ -146,7 +133,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 a2021628c9b94..59b9c75804f26 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -74,7 +74,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 e576dbb4ec73b..abf330fd9662e 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 3639166560416..cd273aa1cb14f 100644
--- a/pkgs/development/libraries/kompute/default.nix
+++ b/pkgs/development/libraries/kompute/default.nix
@@ -7,44 +7,43 @@
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
diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix
index 9595efc1c1b98..7c44d88334d6c 100644
--- a/pkgs/development/libraries/libcef/default.nix
+++ b/pkgs/development/libraries/libcef/default.nix
@@ -17,7 +17,7 @@
, libXext
, libXfixes
, libXrandr
-, mesa
+, libgbm
, gtk3
, pango
, cairo
@@ -50,7 +50,7 @@ let
libXext
libXfixes
libXrandr
- mesa
+ libgbm
gtk3
pango
cairo
diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix
index f64c2c658b152..e36402b68b5ae 100644
--- a/pkgs/development/libraries/libdevil/default.nix
+++ b/pkgs/development/libraries/libdevil/default.nix
@@ -16,7 +16,7 @@
runtimeShell,
withXorg ? true,
testers,
- mesa,
+ libgbm,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
mainProgram = "ilur";
license = licenses.lgpl2;
pkgConfigModules = [ "IL" ];
- inherit (mesa.meta) platforms;
+ inherit (libgbm.meta) platforms;
maintainers = [ ];
};
})
diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix
index 507d0d9f5f555..e3a0d34d67035 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -2,6 +2,7 @@
fetchurl,
stdenv,
lib,
+ updateAutotoolsGnuConfigScriptsHook,
enableStatic ? stdenv.hostPlatform.isStatic,
enableShared ? !stdenv.hostPlatform.isStatic,
enableDarwinABICompat ? false,
@@ -9,94 +10,95 @@
# assert !stdenv.hostPlatform.isLinux || stdenv.hostPlatform != stdenv.buildPlatform; # TODO: improve on cross
-stdenv.mkDerivation (
- rec {
- pname = "libiconv";
- version = "1.17";
-
- src = fetchurl {
- url = "mirror://gnu/libiconv/${pname}-${version}.tar.gz";
- sha256 = "sha256-j3QhO1YjjIWlClMp934GGYdx5w3Zpzl3n0wC9l2XExM=";
- };
-
- enableParallelBuilding = true;
-
- setupHooks = [
- ../../../build-support/setup-hooks/role.bash
- ./setup-hook.sh
- ];
-
- postPatch =
- lib.optionalString
- (
- (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isMinGW) || stdenv.cc.nativeLibc
- )
- ''
- sed '/^_GL_WARN_ON_USE (gets/d' -i srclib/stdio.in.h
- ''
- + lib.optionalString (!enableShared) ''
- sed -i -e '/preload/d' Makefile.in
+stdenv.mkDerivation rec {
+ pname = "libiconv";
+ version = "1.17";
+
+ src = fetchurl {
+ url = "mirror://gnu/libiconv/${pname}-${version}.tar.gz";
+ sha256 = "sha256-j3QhO1YjjIWlClMp934GGYdx5w3Zpzl3n0wC9l2XExM=";
+ };
+
+ 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
+ ];
+
+ postPatch =
+ lib.optionalString
+ (
+ (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isMinGW) || stdenv.cc.nativeLibc
+ )
''
- # The system libiconv is based on libiconv 1.11 with some ABI differences. The following changes
- # build a compatible libiconv on Darwin, allowing it to be sustituted in place of the system one
- # using `install_name_tool`. This removes the need to for a separate, Darwin-specific libiconv
- # derivation and allows Darwin to benefit from upstream updates and fixes.
- + lib.optionalString enableDarwinABICompat ''
- for iconv_h_in in iconv.h.in iconv.h.build.in; do
- substituteInPlace "include/$iconv_h_in" \
- --replace-fail "#define iconv libiconv" "" \
- --replace-fail "#define iconv_close libiconv_close" "" \
- --replace-fail "#define iconv_open libiconv_open" "" \
- --replace-fail "#define iconv_open_into libiconv_open_into" "" \
- --replace-fail "#define iconvctl libiconvctl" "" \
- --replace-fail "#define iconvlist libiconvlist" ""
- done
- '';
-
- # This is hacky, but `libiconv.dylib` needs to reexport `libcharset.dylib` to match the behavior
- # of the system libiconv on Darwin. Trying to do this by modifying the `Makefile` results in an
- # error linking `iconv` because `libcharset.dylib` is not at its final path yet. Avoid the error
- # by building without the reexport then clean and rebuild `libiconv.dylib` with the reexport.
- #
- # For an explanation why `libcharset.dylib` is reexported, see:
- # https://github.com/apple-oss-distributions/libiconv/blob/a167071feb7a83a01b27ec8d238590c14eb6faff/xcodeconfig/libiconv.xcconfig
- postBuild = lib.optionalString enableDarwinABICompat ''
- make clean -C lib
- NIX_CFLAGS_COMPILE+=" -Wl,-reexport-lcharset -L. " make -C lib -j$NIX_BUILD_CORES SHELL=$SHELL
+ sed '/^_GL_WARN_ON_USE (gets/d' -i srclib/stdio.in.h
+ ''
+ + lib.optionalString (!enableShared) ''
+ sed -i -e '/preload/d' Makefile.in
+ ''
+ # The system libiconv is based on libiconv 1.11 with some ABI differences. The following changes
+ # build a compatible libiconv on Darwin, allowing it to be sustituted in place of the system one
+ # using `install_name_tool`. This removes the need to for a separate, Darwin-specific libiconv
+ # derivation and allows Darwin to benefit from upstream updates and fixes.
+ + lib.optionalString enableDarwinABICompat ''
+ for iconv_h_in in iconv.h.in iconv.h.build.in; do
+ substituteInPlace "include/$iconv_h_in" \
+ --replace-fail "#define iconv libiconv" "" \
+ --replace-fail "#define iconv_close libiconv_close" "" \
+ --replace-fail "#define iconv_open libiconv_open" "" \
+ --replace-fail "#define iconv_open_into libiconv_open_into" "" \
+ --replace-fail "#define iconvctl libiconvctl" "" \
+ --replace-fail "#define iconvlist libiconvlist" ""
+ done
'';
- configureFlags = [
- (lib.enableFeature enableStatic "static")
- (lib.enableFeature enableShared "shared")
- ] ++ lib.optional stdenv.hostPlatform.isFreeBSD "--with-pic";
-
- passthru = { inherit setupHooks; };
-
- meta = {
- description = "Iconv(3) implementation";
-
- longDescription = ''
- Some programs, like mailers and web browsers, must be able to convert
- between a given text encoding and the user's encoding. Other programs
- internally store strings in Unicode, to facilitate internal processing,
- and need to convert between internal string representation (Unicode)
- and external string representation (a traditional encoding) when they
- are doing I/O. GNU libiconv is a conversion library for both kinds of
- applications.
- '';
-
- homepage = "https://www.gnu.org/software/libiconv/";
- license = lib.licenses.lgpl2Plus;
-
- maintainers = [ ];
- mainProgram = "iconv";
-
- # 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" ];
- }
-)
+ # This is hacky, but `libiconv.dylib` needs to reexport `libcharset.dylib` to match the behavior
+ # of the system libiconv on Darwin. Trying to do this by modifying the `Makefile` results in an
+ # error linking `iconv` because `libcharset.dylib` is not at its final path yet. Avoid the error
+ # by building without the reexport then clean and rebuild `libiconv.dylib` with the reexport.
+ #
+ # For an explanation why `libcharset.dylib` is reexported, see:
+ # https://github.com/apple-oss-distributions/libiconv/blob/a167071feb7a83a01b27ec8d238590c14eb6faff/xcodeconfig/libiconv.xcconfig
+ postBuild = lib.optionalString enableDarwinABICompat ''
+ make clean -C lib
+ NIX_CFLAGS_COMPILE+=" -Wl,-reexport-lcharset -L. " make -C lib -j$NIX_BUILD_CORES SHELL=$SHELL
+ '';
+
+ configureFlags = [
+ (lib.enableFeature enableStatic "static")
+ (lib.enableFeature enableShared "shared")
+ ] ++ lib.optional stdenv.hostPlatform.isFreeBSD "--with-pic";
+
+ passthru = { inherit setupHooks; };
+
+ meta = {
+ description = "Iconv(3) implementation";
+
+ longDescription = ''
+ Some programs, like mailers and web browsers, must be able to convert
+ between a given text encoding and the user's encoding. Other programs
+ internally store strings in Unicode, to facilitate internal processing,
+ and need to convert between internal string representation (Unicode)
+ and external string representation (a traditional encoding) when they
+ are doing I/O. GNU libiconv is a conversion library for both kinds of
+ applications.
+ '';
+
+ homepage = "https://www.gnu.org/software/libiconv/";
+ license = lib.licenses.lgpl2Plus;
+
+ maintainers = [ ];
+ mainProgram = "iconv";
+
+ # This library is not needed on GNU platforms.
+ hydraPlatforms = with lib.platforms; cygwin ++ darwin ++ freebsd;
+ };
+}
diff --git a/pkgs/development/libraries/libmicrohttpd/generic.nix b/pkgs/development/libraries/libmicrohttpd/generic.nix
index 7b2743ea1ac2f..4ceb9afe9265f 100644
--- a/pkgs/development/libraries/libmicrohttpd/generic.nix
+++ b/pkgs/development/libraries/libmicrohttpd/generic.nix
@@ -33,7 +33,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/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix
index 9792447bcc888..46fe96aa0777a 100644
--- a/pkgs/development/libraries/libpng/12.nix
+++ b/pkgs/development/libraries/libpng/12.nix
@@ -13,6 +13,10 @@ stdenv.mkDerivation (finalAttrs: {
sha256 = "1izw9ybm27llk8531w6h4jp4rk2rxy2s9vil16nwik5dp0amyqxl";
};
+ postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+ substituteInPlace pngconf.h --replace-fail '' ''
+ '';
+
outputs = [ "out" "dev" "man" ];
propagatedBuildInputs = [ zlib ];
diff --git a/pkgs/development/libraries/libpulsar/default.nix b/pkgs/development/libraries/libpulsar/default.nix
index 3aec246ce3280..f4db985b3c703 100644
--- a/pkgs/development/libraries/libpulsar/default.nix
+++ b/pkgs/development/libraries/libpulsar/default.nix
@@ -2,7 +2,7 @@
lib,
asioSupport ? true,
asio,
- boost180,
+ boost,
log4cxxSupport ? false,
log4cxx,
snappySupport ? false,
@@ -43,7 +43,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/librasterlite2/default.nix b/pkgs/development/libraries/librasterlite2/default.nix
index f5a2ed24d2bc3..91086083f9518 100644
--- a/pkgs/development/libraries/librasterlite2/default.nix
+++ b/pkgs/development/libraries/librasterlite2/default.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
libspatialite
libtiff
libwebp
- (libxml2.override { enableHttp = true; })
+ libxml2
lz4
minizip
openjpeg
diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix
index 55c9e865ac655..f33adb0dafd39 100644
--- a/pkgs/development/libraries/librealsense/default.nix
+++ b/pkgs/development/libraries/librealsense/default.nix
@@ -8,7 +8,7 @@
, ninja
, pkg-config
, gcc
-, mesa
+, libgbm
, gtk3
, glfw
, libGLU
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
nlohmann_json
] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ]
++ lib.optionals enablePython (with pythonPackages; [ python pybind11 ])
- ++ lib.optionals enableGUI [ mesa gtk3 glfw libGLU curl ];
+ ++ lib.optionals enableGUI [ libgbm gtk3 glfw libGLU curl ];
patches = [
./py_pybind11_no_external_download.patch
diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix
index b9ace3b528abf..e180e59648e00 100644
--- a/pkgs/development/libraries/libsoup/3.x.nix
+++ b/pkgs/development/libraries/libsoup/3.x.nix
@@ -24,7 +24,7 @@
stdenv.mkDerivation rec {
pname = "libsoup";
- version = "3.6.0";
+ version = "3.6.1";
outputs = [
"out"
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
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 fcbfb22197def..79c7f75ef0317 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -2,6 +2,7 @@
stdenv,
lib,
fetchurl,
+ fetchpatch,
glib,
libxml2,
meson,
@@ -35,6 +36,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/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index cdd93f551920d..3e7ee28dde4c5 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -14,11 +14,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libunistring";
- version = "1.2";
+ version = "1.3";
src = fetchurl {
url = "mirror://gnu/libunistring/libunistring-${finalAttrs.version}.tar.gz";
- hash = "sha256-/W1WYvpwZIfEg0mnWLV7wUnOlOxsMGJOyf3Ec86rvI4=";
+ hash = "sha256-jqjM+GwJ3YAcjKwZh46ATlT3B89piENxEw0gveaDhrc=";
};
outputs = [
diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index fe0a33bb48b83..a639f037641e0 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -24,14 +24,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 = [
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index b696dbffcefc9..d95edee18c96b 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -31,7 +31,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libxml2";
- version = "2.13.4";
+ version = "2.13.5";
outputs =
[
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor finalAttrs.version}/libxml2-${finalAttrs.version}.tar.xz";
- hash = "sha256-ZdBC4cgBAkPmF++wKv2iC4XCFgrNv7y1smuAzsZRVlA=";
+ hash = "sha256-dPwWMhejlkJX0745r5Q+CIYSY8QjH571tJa29tTHsrY=";
};
strictDeps = true;
diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix
index f096a4a3067dc..8662434554ea9 100644
--- a/pkgs/development/libraries/mapnik/default.nix
+++ b/pkgs/development/libraries/mapnik/default.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
python3
sqlite
zlib
- (libxml2.override { enableHttp = true; })
+ libxml2
postgresql
protozero
sparsehash
diff --git a/pkgs/development/libraries/mbedtls/2.nix b/pkgs/development/libraries/mbedtls/2.nix
index 1d02915527133..8c20144c0f632 100644
--- a/pkgs/development/libraries/mbedtls/2.nix
+++ b/pkgs/development/libraries/mbedtls/2.nix
@@ -1,6 +1,15 @@
-{ callPackage }:
+{ callPackage, fetchpatch }:
callPackage ./generic.nix {
version = "2.28.9";
hash = "sha256-/Bm05CvS9t7WSh4qoMconCaD7frlmA/H9YDyJOuGuFE=";
+ patches = [
+ # https://github.com/Mbed-TLS/mbedtls/pull/9529
+ # switch args to calloc in test macro to fix build with gcc-14
+ (fetchpatch {
+ name = "gcc-14-fixes.patch";
+ url = "https://github.com/Mbed-TLS/mbedtls/commit/990a88cd53d40ff42481a2c200b05f656507f326.patch";
+ hash = "sha256-Ki8xjm4tbzLZGNUr4hRbf+dlp05ejvl44ddroWJZY4w=";
+ })
+ ];
}
diff --git a/pkgs/development/libraries/mbedtls/3.nix b/pkgs/development/libraries/mbedtls/3.nix
index 9655393615b9f..0722638c274b7 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 d2a0206dde2db..0b5082fe96f8c 100644
--- a/pkgs/development/libraries/mbedtls/generic.nix
+++ b/pkgs/development/libraries/mbedtls/generic.nix
@@ -53,12 +53,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 11c4f4d9fa830..0000000000000
--- a/pkgs/development/libraries/memstream/default.nix
+++ /dev/null
@@ -1,52 +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 09aabe7488411..0000000000000
--- 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 8bc0715eb2c29..1cf2792341ba5 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.3.2";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "mesa";
repo = "mesa";
rev = "mesa-${version}";
- hash = "sha256-yoX2DvinzqrG+rekiqO/iG6F6Zn63WC+ZaathimxO1g=";
+ hash = "sha256-6EcSOE73wEz+aS4C+GUVfcbJtGB0MvIL4a6zA1ohVGA=";
};
meta = {
diff --git a/pkgs/development/libraries/mesa/darwin-build-fix.patch b/pkgs/development/libraries/mesa/darwin-build-fix.patch
deleted file mode 100644
index f253169b1594c..0000000000000
--- a/pkgs/development/libraries/mesa/darwin-build-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/glx/glxext.c b/src/glx/glxext.c
-index eee9f040151..289691db26b 100644
---- a/src/glx/glxext.c
-+++ b/src/glx/glxext.c
-@@ -800,7 +800,7 @@ AllocAndFetchScreenConfigs(Display * dpy, struct glx_display * priv, Bool zink,
-
- #if defined(GLX_USE_APPLE)
- if (psc == NULL && priv->driswDisplay) {
-- psc = priv->driswDisplay->createScreen(i, priv);
-+ psc = priv->driswDisplay->createScreen(i, priv, driver_name_is_inferred);
- }
- #endif
-
diff --git a/pkgs/development/libraries/mesa/darwin.nix b/pkgs/development/libraries/mesa/darwin.nix
index b59fbba15b213..55392071010a9 100644
--- a/pkgs/development/libraries/mesa/darwin.nix
+++ b/pkgs/development/libraries/mesa/darwin.nix
@@ -3,6 +3,7 @@
lib,
stdenv,
fetchFromGitLab,
+ fetchpatch,
bison,
flex,
libxml2,
@@ -26,8 +27,16 @@ stdenv.mkDerivation {
meta
;
+ # Darwin build fixes. FIXME: remove in 25.1.
patches = [
- ./darwin-build-fix.patch
+ (fetchpatch {
+ url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/e89eba0796b3469f1d2cdbb600309f6231a8169d.patch";
+ hash = "sha256-0EP0JsYy+UTQ+eGd3sMfoLf1R+2e8n1flmQAHq3rCR4=";
+ })
+ (fetchpatch {
+ url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/568a4ca899762fe96fc9b34d2288d07e6656af87.patch";
+ hash = "sha256-uLxa5vA3/cYAIJT9h7eBQ1EBu4MnMg9R5uGAHzTb5Fc=";
+ })
];
outputs = [
@@ -67,6 +76,11 @@ stdenv.mkDerivation {
(lib.mesonEnable "llvm" true)
];
- # Don't need this on Darwin.
- passthru.llvmpipeHook = null;
+ passthru = {
+ # needed to pass evaluation of bad platforms
+ driverLink = throw "driverLink not supported on darwin";
+ # Don't need this on Darwin.
+ llvmpipeHook = null;
+ };
+
}
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index fb5f6b1d817cd..5e2651b764b30 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -6,7 +6,6 @@
, expat
, fetchCrate
, fetchFromGitLab
-, fetchpatch
, file
, flex
, glslang
@@ -15,7 +14,6 @@
, jdupes
, libdrm
, libglvnd
-, libomxil-bellagio
, libunwind
, libva-minimal
, libvdpau
@@ -181,17 +179,15 @@ in stdenv.mkDerivation {
(lib.mesonOption "platforms" (lib.concatStringsSep "," eglPlatforms))
(lib.mesonOption "gallium-drivers" (lib.concatStringsSep "," galliumDrivers))
(lib.mesonOption "vulkan-drivers" (lib.concatStringsSep "," vulkanDrivers))
- (lib.mesonOption "vulkan-layers" (builtins.concatStringsSep "," vulkanLayers))
+ (lib.mesonOption "vulkan-layers" (lib.concatStringsSep "," vulkanLayers))
- # Make sure we know where to find all the drivers
+ # Make sure we know where to put all the drivers
(lib.mesonOption "dri-drivers-path" "${placeholder "drivers"}/lib/dri")
(lib.mesonOption "vdpau-libs-path" "${placeholder "drivers"}/lib/vdpau")
- (lib.mesonOption "omx-libs-path" "${placeholder "drivers"}/lib/bellagio")
(lib.mesonOption "va-libs-path" "${placeholder "drivers"}/lib/dri")
(lib.mesonOption "d3d-drivers-path" "${placeholder "drivers"}/lib/d3d")
# Set search paths for non-Mesa drivers (e.g. Nvidia)
- (lib.mesonOption "dri-search-path" "${libglvnd.driverLink}/lib/dri")
(lib.mesonOption "gbm-backends-path" "${libglvnd.driverLink}/lib/gbm:${placeholder "out"}/lib/gbm")
# Enable glvnd for dynamic libGL dispatch
@@ -201,6 +197,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)
@@ -231,7 +232,6 @@ in stdenv.mkDerivation {
expat
spirv-tools
libglvnd
- libomxil-bellagio
libunwind
libva-minimal
libvdpau
@@ -303,10 +303,13 @@ in stdenv.mkDerivation {
postInstall = ''
# Move driver-related bits to $drivers
+ moveToOutput "lib/gbm" $drivers
moveToOutput "lib/lib*_mesa*" $drivers
+ moveToOutput "lib/libgallium*" $drivers
+ moveToOutput "lib/libglapi*" $drivers
moveToOutput "lib/libpowervr_rogue*" $drivers
- moveToOutput "lib/libxatracker*" $drivers
moveToOutput "lib/libvulkan_*" $drivers
+ moveToOutput "lib/libxatracker*" $drivers
# Update search path used by glvnd (it's pointing to $out but drivers are in $drivers)
for js in $drivers/share/glvnd/egl_vendor.d/*.json; do
@@ -373,7 +376,7 @@ in stdenv.mkDerivation {
done
# add RPATH here so Zink can find libvulkan.so
- patchelf --add-rpath ${vulkan-loader}/lib $out/lib/libgallium*.so
+ patchelf --add-rpath ${vulkan-loader}/lib $drivers/lib/libgallium*.so
'';
env.NIX_CFLAGS_COMPILE = toString ([
diff --git a/pkgs/development/libraries/mesa/gbm.nix b/pkgs/development/libraries/mesa/gbm.nix
new file mode 100644
index 0000000000000..61a502adffda8
--- /dev/null
+++ b/pkgs/development/libraries/mesa/gbm.nix
@@ -0,0 +1,55 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitLab,
+ libglvnd,
+ bison,
+ flex,
+ meson,
+ pkg-config,
+ ninja,
+ python3Packages,
+ libdrm,
+}:
+
+let
+ common = import ./common.nix { inherit lib fetchFromGitLab; };
+in
+stdenv.mkDerivation {
+ pname = "mesa-libgbm";
+ inherit (common) version src meta;
+
+ mesonAutoFeatures = "disabled";
+
+ mesonFlags = [
+ "--sysconfdir=/etc"
+
+ (lib.mesonEnable "gbm" true)
+ (lib.mesonOption "gbm-backends-path" "${libglvnd.driverLink}/lib/gbm")
+
+ (lib.mesonEnable "egl" false)
+ (lib.mesonEnable "glx" false)
+ (lib.mesonEnable "zlib" false)
+
+ (lib.mesonOption "platforms" "")
+ (lib.mesonOption "gallium-drivers" "")
+ (lib.mesonOption "vulkan-drivers" "")
+ (lib.mesonOption "vulkan-layers" "")
+ ];
+
+ strictDeps = true;
+
+ propagatedBuildInputs = [ libdrm ];
+
+ nativeBuildInputs = [
+ bison
+ flex
+ meson
+ pkg-config
+ ninja
+ python3Packages.packaging
+ python3Packages.python
+ python3Packages.mako
+ python3Packages.pyyaml
+ ];
+}
diff --git a/pkgs/development/libraries/mesa/opencl.patch b/pkgs/development/libraries/mesa/opencl.patch
index cd27f0a2e86f4..8444237d3d541 100644
--- a/pkgs/development/libraries/mesa/opencl.patch
+++ b/pkgs/development/libraries/mesa/opencl.patch
@@ -1,48 +1,36 @@
diff --git a/meson.build b/meson.build
-index fbb0b29322d..b4825056449 100644
+index c150bff74ff..37fa7f0531b 100644
--- a/meson.build
+++ b/meson.build
-@@ -1805,7 +1805,7 @@ endif
+@@ -1850,7 +1850,7 @@ endif
dep_clang = null_dep
- if with_clc
+ if with_clc or with_gallium_clover
- llvm_libdir = dep_llvm.get_variable(cmake : 'LLVM_LIBRARY_DIR', configtool: 'libdir')
+ llvm_libdir = get_option('clang-libdir')
dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false)
diff --git a/meson_options.txt b/meson_options.txt
-index e885ba61a8a..591ed957c85 100644
+index 82324617884..4bde97a8568 100644
--- a/meson_options.txt
+++ b/meson_options.txt
-@@ -23,6 +23,12 @@ option(
- description : 'the window system EGL assumes for EGL_DEFAULT_DISPLAY',
+@@ -738,3 +738,10 @@ option(
+ 'none', 'dri2'
+ ],
)
-
++
+option(
+ 'clang-libdir',
+ type : 'string',
+ value : '',
+ description : 'Locations to search for clang libraries.'
+)
- option(
- 'android-stub',
- type : 'boolean',
diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build
-index 7c14135898e..74dc6850603 100644
+index ab2c83556a8..a59e88e122f 100644
--- a/src/gallium/targets/opencl/meson.build
+++ b/src/gallium/targets/opencl/meson.build
-@@ -39,7 +39,8 @@ if dep_llvm.version().version_compare('>=10.0.0')
- polly_isl_dep = cpp.find_library('PollyISL', dirs : llvm_libdir, required : false)
- endif
-
--dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false)
-+clang_libdir = get_option('clang-libdir')
-+dep_clang = cpp.find_library('clang-cpp', dirs : clang_libdir, required : false)
-
- # meson will return clang-cpp from system dirs if it's not found in llvm_libdir
- linker_rpath_arg = '-Wl,--rpath=@0@'.format(llvm_libdir)
-@@ -123,7 +124,7 @@ if with_opencl_icd
+@@ -56,7 +56,7 @@ if with_opencl_icd
configuration : _config,
input : 'mesa.icd.in',
output : 'mesa.icd',
@@ -52,10 +40,10 @@ index 7c14135898e..74dc6850603 100644
install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'),
)
diff --git a/src/gallium/targets/rusticl/meson.build b/src/gallium/targets/rusticl/meson.build
-index b2963fe6dfa..99d6d801b94 100644
+index 35833dc7423..41a95927cab 100644
--- a/src/gallium/targets/rusticl/meson.build
+++ b/src/gallium/targets/rusticl/meson.build
-@@ -76,7 +76,7 @@ configure_file(
+@@ -63,7 +63,7 @@ configure_file(
configuration : _config,
input : 'rusticl.icd.in',
output : 'rusticl.icd',
diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix
index a40b0942737e8..31743ae5f9d15 100644
--- a/pkgs/development/libraries/nss/generic.nix
+++ b/pkgs/development/libraries/nss/generic.nix
@@ -5,6 +5,7 @@
fetchFromGitHub,
nspr,
perl,
+ installShellFiles,
zlib,
sqlite,
ninja,
@@ -41,6 +42,7 @@ stdenv.mkDerivation rec {
perl
ninja
(buildPackages.python3.withPackages (ps: with ps; [ gyp ]))
+ installShellFiles
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
cctools
@@ -79,6 +81,7 @@ stdenv.mkDerivation rec {
"out"
"dev"
"tools"
+ "man"
];
buildPhase =
@@ -166,6 +169,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/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix
index a1bfe9dced1d3..66d1dd309a68d 100644
--- a/pkgs/development/libraries/onnxruntime/default.nix
+++ b/pkgs/development/libraries/onnxruntime/default.nix
@@ -2,6 +2,7 @@
, stdenv
, lib
, fetchFromGitHub
+, fetchpatch2
, Foundation
, abseil-cpp_202401
, cmake
@@ -116,6 +117,12 @@ effectiveStdenv.mkDerivation rec {
# TODO: Check if it can be dropped after 1.19.0
# https://github.com/microsoft/onnxruntime/commit/b522df0ae477e59f60acbe6c92c8a64eda96cace
./update-re2.patch
+ # fix `error: template-id not allowed for constructor in C++20`
+ (fetchpatch2 {
+ name = "suppress-gcc-warning-in-TreeEnsembleAggregator.patch";
+ url = "https://github.com/microsoft/onnxruntime/commit/10883d7997ed4b53f989a49bd4387c5769fbd12f.patch?full_index=1";
+ hash = "sha256-NgvuCHE7axaUtZIjtQvDpagr+QtHdyL7xXkPQwZbhvY=";
+ })
] ++ lib.optionals cudaSupport [
# We apply the referenced 1064.patch ourselves to our nix dependency.
# FIND_PACKAGE_ARGS for CUDA was added in https://github.com/microsoft/onnxruntime/commit/87744e5 so it might be possible to delete this patch after upgrading to 1.17.0
diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix
index 8a523f78a3956..2e04bf90440cc 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/pkgs/development/libraries/phonon/default.nix
@@ -69,9 +69,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 c7bdcdff2454d..44cf13bddebea 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -58,9 +58,16 @@
libselinux,
}:
+let
+ webrtc-audio-processings = lib.filter (lib.meta.availableOn stdenv.hostPlatform) [
+ webrtc-audio-processing_1
+ webrtc-audio-processing
+ ];
+in
+
stdenv.mkDerivation (finalAttrs: {
pname = "pipewire";
- version = "1.2.6";
+ version = "1.2.7";
outputs = [
"out"
@@ -76,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "pipewire";
repo = "pipewire";
rev = finalAttrs.version;
- sha256 = "sha256-AmrbA1YQBeETLC9u9rQ2f85rG9TASvcbCZ/Xlz7ICdY=";
+ sha256 = "sha256-TV+2nz44a742bUfGnWt7zJAnO15eED5kAwyAgE5CQZ0=";
};
patches = [
@@ -133,12 +140,7 @@ stdenv.mkDerivation (finalAttrs: {
udev
]
)
- ++ (
- if lib.meta.availableOn stdenv.hostPlatform webrtc-audio-processing_1 then
- [ webrtc-audio-processing_1 ]
- else
- [ webrtc-audio-processing ]
- )
+ ++ lib.take 1 webrtc-audio-processings
++ lib.optional (lib.meta.availableOn stdenv.hostPlatform ldacbt) ldacbt
++ lib.optional zeroconfSupport avahi
++ lib.optional raopSupport openssl
@@ -164,6 +166,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.mesonEnable "installed_tests" true)
(lib.mesonOption "installed_test_prefix" (placeholder "installedTests"))
(lib.mesonOption "libjack-path" "${placeholder "jack"}/lib")
+ (lib.mesonEnable "echo-cancel-webrtc" (webrtc-audio-processings != [ ]))
(lib.mesonEnable "libcamera" true)
(lib.mesonEnable "libffado" ffadoSupport)
(lib.mesonEnable "roc" rocSupport)
diff --git a/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/pkgs/development/libraries/plasma-wayland-protocols/default.nix
index f29f2c2ddc56e..b4ed7cac7bec8 100644
--- a/pkgs/development/libraries/plasma-wayland-protocols/default.nix
+++ b/pkgs/development/libraries/plasma-wayland-protocols/default.nix
@@ -8,11 +8,11 @@
mkDerivation rec {
pname = "plasma-wayland-protocols";
- version = "1.14.0";
+ version = "1.15.0";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz";
- hash = "sha256-GkOF7Px591ifBzgcqxHD/1H24vpLc7eGANatCWOUv4E=";
+ hash = "sha256-5a7f58CyRDqmeIK0eS0IgUVw4A3YL3GaNckioJk/Yh4=";
};
nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index a0153c459fa4f..74984f5d3bd25 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -10,6 +10,7 @@
curl,
fontconfig,
freetype,
+ glib,
lcms,
libiconv,
libintl,
@@ -79,15 +80,27 @@ stdenv.mkDerivation (finalAttrs: rec {
url = "https://gitlab.freedesktop.org/poppler/poppler/-/commit/0554731052d1a97745cb179ab0d45620589dd9c4.patch";
hash = "sha256-I78wJ4l1DSh+x/e00ZL8uvrGdBH+ufp+EDm0A1XWyCU=";
})
- ];
- nativeBuildInputs = [
- cmake
- ninja
- pkg-config
- python3
+ (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 =
+ [
+ cmake
+ ninja
+ pkg-config
+ python3
+ ]
+ ++ lib.optionals (!minimal) [
+ glib # for glib-mkenums
+ ];
+
buildInputs =
[
boost
@@ -182,7 +195,7 @@ stdenv.mkDerivation (finalAttrs: rec {
};
};
- meta = with lib; {
+ meta = {
homepage = "https://poppler.freedesktop.org/";
changelog = "https://gitlab.freedesktop.org/poppler/poppler/-/blob/poppler-${version}/NEWS";
description = "PDF rendering library";
@@ -190,8 +203,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/protobuf/29.nix b/pkgs/development/libraries/protobuf/29.nix
index 07c5b6b1d3074..f4965979638e7 100644
--- a/pkgs/development/libraries/protobuf/29.nix
+++ b/pkgs/development/libraries/protobuf/29.nix
@@ -2,8 +2,8 @@
callPackage ./generic.nix (
{
- version = "29.0";
- hash = "sha256-7t5aL8K8hRhE3V8YUQXQmihWMy+KGeS+msRakmonLUM=";
+ version = "29.1";
+ hash = "sha256-8vLDwMZUu7y0gK9wRJ9pAT6wI0n46I5bJo2G05uctS4=";
}
// args
)
diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix
index 447202dff539e..f8cfa4daff036 100644
--- a/pkgs/development/libraries/protobuf/generic.nix
+++ b/pkgs/development/libraries/protobuf/generic.nix
@@ -13,6 +13,7 @@
zlib,
version,
hash,
+ versionCheckHook,
# downstream dependencies
python3,
@@ -31,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "protocolbuffers";
repo = "protobuf";
- rev = "refs/tags/v${version}";
+ tag = "v${version}";
inherit hash;
};
@@ -84,15 +85,18 @@ stdenv.mkDerivation (finalAttrs: {
];
doCheck =
- # FIXME: investigate. 24.x and 23.x have different errors.
- # At least some of it is not reproduced on some other machine; example:
- # https://hydra.nixos.org/build/235677717/nixlog/4/tail
- !(stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "23")
# Tests fail to build on 32-bit platforms; fixed in 22.x
# https://github.com/protocolbuffers/protobuf/issues/10418
# Also AnyTest.TestPackFromSerializationExceedsSizeLimit fails on 32-bit platforms
# https://github.com/protocolbuffers/protobuf/issues/8460
- && !stdenv.hostPlatform.is32bit;
+ !stdenv.hostPlatform.is32bit;
+
+ nativeInstallCheckInputs = [
+ versionCheckHook
+ ];
+ versionCheckProgram = [ "${placeholder "out"}/bin/protoc" ];
+ versionCheckProgramArg = [ "--version" ];
+ doInstallCheck = true;
passthru = {
tests = {
diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 60cccd443308e..022e2d970a867 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -72,14 +72,6 @@ let
hash = "sha256-UEvIXzn387f9BAeBdhheStD/4M7en+rmqX8C6gstl6k=";
})
];
- qtmultimedia = lib.optionals stdenv.hostPlatform.isDarwin [
- # build patch for qtmultimedia with xcode 15
- (fetchpatch {
- url = "https://raw.githubusercontent.com/Homebrew/formula-patches/3f509180/qt5/qt5-qtmultimedia-xcode15.patch";
- stripLen = 1;
- hash = "sha256-HrEqfmm8WbapWgLM0L4AKW8168pwT2zYI8HOJruEPSs=";
- })
- ];
qtpim = [
## Upstream patches after the Qt6 transition that apply without problems & fix bugs
@@ -194,6 +186,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
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 7949a05a61b88..b3284a654a8a0 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 b94e400bdf7b5..401316c380160 100644
--- a/pkgs/development/libraries/qt-5/5.15/srcs.nix
+++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix
@@ -5,7 +5,7 @@
}:
let
- version = "5.15.15";
+ version = "5.15.16";
mk = name: args: {
inherit version;
@@ -67,24 +67,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 1b189d24d9eef..1a9b940328682 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 77c435f2e36a2..b8446fdd9556a 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -18,7 +18,6 @@
which,
# darwin support
apple-sdk_13,
- darwinMinVersionHook,
xcbuild,
dbus,
@@ -34,7 +33,6 @@
libXext,
libXi,
libXrender,
- libinput,
libjpeg,
libpng,
libxcb,
@@ -61,6 +59,8 @@
gtk3,
withQttranslation ? true,
qttranslations ? null,
+ withLibinput ? false,
+ libinput,
# options
libGLSupported ? !stdenv.hostPlatform.isDarwin,
@@ -87,13 +87,12 @@ let
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
@@ -114,6 +113,7 @@ stdenv.mkDerivation (
zlib
# Text rendering
+ freetype
harfbuzz
icu
@@ -130,7 +130,6 @@ stdenv.mkDerivation (
# Text rendering
fontconfig
- freetype
libdrm
@@ -156,22 +155,27 @@ stdenv.mkDerivation (
python3
at-spi2-core
]
- ++ lib.optionals (!stdenv.hostPlatform.isDarwin) ([ libinput ] ++ lib.optional withGtk3 gtk3)
+ ++ lib.optionals (!stdenv.hostPlatform.isDarwin) (
+ lib.optional withLibinput libinput ++ lib.optional withGtk3 gtk3
+ )
++ lib.optional stdenv.hostPlatform.isDarwin darwinVersionInputs
++ lib.optional developerBuild gdb
++ lib.optional (cups != null) cups
++ lib.optional (mysqlSupport) libmysqlclient
++ lib.optional (postgresql != null) postgresql;
- nativeBuildInputs = [
- bison
- flex
- gperf
- lndir
- perl
- pkg-config
- which
- ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
+ 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) {
@@ -184,6 +188,8 @@ stdenv.mkDerivation (
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 ''
@@ -255,7 +261,7 @@ stdenv.mkDerivation (
--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 ''
@@ -334,10 +340,6 @@ stdenv.mkDerivation (
]
++ 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"''
@@ -452,6 +454,7 @@ stdenv.mkDerivation (
"-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"
@@ -462,8 +465,6 @@ stdenv.mkDerivation (
if stdenv.hostPlatform.isDarwin then
[
"-no-fontconfig"
- "-qt-freetype"
- "-qt-libpng"
"-no-framework"
"-no-rpath"
]
@@ -487,16 +488,12 @@ stdenv.mkDerivation (
"-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"
]
diff --git a/pkgs/development/libraries/qt-5/modules/qtlocation.nix b/pkgs/development/libraries/qt-5/modules/qtlocation.nix
index 39263dd63df9b..7ad792140fcf1 100644
--- a/pkgs/development/libraries/qt-5/modules/qtlocation.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtlocation.nix
@@ -17,6 +17,13 @@ qtModule {
"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 48b343435d387..d772e15600619 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -240,6 +240,10 @@ qtModule (
]
++ 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"
]
);
}
diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix
index bfa2de2e529ab..a8bf9eb6a3d15 100644
--- a/pkgs/development/libraries/qt-6/default.nix
+++ b/pkgs/development/libraries/qt-6/default.nix
@@ -61,34 +61,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 (
@@ -148,7 +124,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 { };
@@ -157,7 +133,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
@@ -181,12 +157,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 8ae22eecfa05d..183e6e5b2028e 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 48beac0b04fa6..44e48db7dad80 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 c7c097cce3596..35e78451f1862 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 83%
rename from pkgs/development/libraries/qt-6/modules/qtbase.nix
rename to pkgs/development/libraries/qt-6/modules/qtbase/default.nix
index 90a09ad165f12..e183b35393d75 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
@@ -2,7 +2,6 @@
stdenv,
lib,
src,
- patches ? [ ],
version,
bison,
flex,
@@ -45,7 +44,6 @@
libXext,
libXi,
libXrender,
- libinput,
libjpeg,
libpng,
libxcb,
@@ -77,8 +75,9 @@
libmysqlclient,
postgresql,
withGtk3 ? false,
- dconf,
gtk3,
+ withLibinput ? false,
+ libinput,
# options
libGLSupported ? stdenv.hostPlatform.isLinux,
libGL,
@@ -173,11 +172,9 @@ stdenv.mkDerivation rec {
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
@@ -206,7 +203,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?
@@ -229,8 +251,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"
@@ -288,7 +310,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 b950b7d4ac79f..447d012577837 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 0000000000000..bde2c940d682c
--- /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 0000000000000..f0822bac3ced8
--- /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 94ae308c1cfcb..d1d91c39f4d75 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 f2f9425841a8e..3cb9a9ce85e6b 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 de4c12ef04482..e99dd5a903637 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 890c68a97f77f..bb6257ca31d7d 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 56d19e0bb817f..f439bf5d50e6e 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 4247ae42fc6ab..0000000000000
--- a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix
+++ /dev/null
@@ -1,58 +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 0000000000000..66bda00fe566f
--- /dev/null
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
@@ -0,0 +1,40 @@
+{
+ 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 9afcc8240ab31..2c10263bdc841 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 d857d7ac1bbac..7efd9c9cdb70f 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 e9e638e976454..eece32a5ccd1e 100644
--- a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix
@@ -6,13 +6,13 @@
qtModule rec {
pname = "qtmqtt";
- version = "6.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 89%
rename from pkgs/development/libraries/qt-6/modules/qtmultimedia.nix
rename to pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix
index 2a76d72166786..706da7b0b20f8 100644
--- a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix
@@ -60,11 +60,11 @@ qtModule {
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 5540ed8d77da4..c67fde93498bd 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 05f009bacdad8..06cead730f771 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 681e36e0c5135..56482b30652d9 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 40b95dfb95882..3118d7ec7758b 100644
--- a/pkgs/development/libraries/qt-6/modules/qtquick3d.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtquick3d.nix
@@ -3,6 +3,7 @@
qtbase,
qtdeclarative,
openssl,
+ fetchpatch,
}:
qtModule {
@@ -12,4 +13,12 @@ qtModule {
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 ffdf7ec695f68..da5c50482588d 100644
--- a/pkgs/development/libraries/qt-6/modules/qttools.nix
+++ b/pkgs/development/libraries/qt-6/modules/qttools/default.nix
@@ -21,7 +21,7 @@ qtModule {
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 6e7b8488fa543..ec306ecc480ac 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 5bcfd9b66c9cc..d9da2026079c8 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix
@@ -7,6 +7,7 @@
wayland-scanner,
pkg-config,
libdrm,
+ fetchpatch2,
}:
qtModule {
@@ -17,18 +18,25 @@ qtModule {
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.nix
deleted file mode 100644
index c97dd0377981f..0000000000000
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix
+++ /dev/null
@@ -1,271 +0,0 @@
-{ qtModule
-, qtdeclarative
-, qtwebchannel
-, qtpositioning
-, qtwebsockets
-, buildPackages
-, bison
-, coreutils
-, flex
-, git
-, gperf
-, ninja
-, pkg-config
-, python3
-, which
-, nodejs
-, xorg
-, libXcursor
-, libXScrnSaver
-, libXrandr
-, libXtst
-, libxshmfence
-, libXi
-, cups
-, fontconfig
-, freetype
-, harfbuzz
-, icu
-, dbus
-, libdrm
-, zlib
-, minizip
-, libjpeg
-, libpng
-, libtiff
-, libwebp
-, libopus
-, jsoncpp
-, protobuf
-, libvpx
-, srtp
-, snappy
-, nss
-, libevent
-, openssl
-, alsa-lib
-, pulseaudio
-, libcap
-, pciutils
-, systemd
-, pipewire
-, gn
-, ffmpeg
-, lib
-, stdenv
-, glib
-, libxml2
-, libxslt
-, lcms2
-, libkrb5
-, mesa
-, enableProprietaryCodecs ? true
- # darwin
-, autoSignDarwinBinariesHook
-, bootstrap_cmds
-, cctools
-, xcbuild
-}:
-
-qtModule {
- pname = "qtwebengine";
- nativeBuildInputs = [
- bison
- coreutils
- flex
- git
- gperf
- ninja
- pkg-config
- (python3.withPackages (ps: with ps; [ html5lib ]))
- which
- gn
- nodejs
- ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
- autoSignDarwinBinariesHook
- ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
- bootstrap_cmds
- cctools
- xcbuild
- ];
- doCheck = true;
- outputs = [ "out" "dev" ];
-
- dontUseGnConfigure = true;
-
- # ninja builds some components with -Wno-format,
- # which cannot be set at the same time as -Wformat-security
- hardeningDisable = [ "format" ];
-
- patches = [
- # Don't assume /usr/share/X11, and also respect the XKB_CONFIG_ROOT
- # environment variable, since NixOS relies on it working.
- # See https://github.com/NixOS/nixpkgs/issues/226484 for more context.
- ../patches/qtwebengine-xkb-includes.patch
-
- ../patches/qtwebengine-link-pulseaudio.patch
-
- # Override locales install path so they go to QtWebEngine's $out
- ../patches/qtwebengine-locales-path.patch
- ];
-
- postPatch = ''
- # Patch Chromium build tools
- (
- cd src/3rdparty/chromium;
-
- # Manually fix unsupported shebangs
- substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \
- --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" || true
- substituteInPlace third_party/webgpu-cts/src/tools/run_deno \
- --replace "/usr/bin/env -S deno" "/usr/bin/deno" || true
- patchShebangs .
- )
-
- substituteInPlace cmake/Functions.cmake \
- --replace "/bin/bash" "${buildPackages.bash}/bin/bash"
-
- # Patch library paths in sources
- substituteInPlace src/core/web_engine_library_info.cpp \
- --replace "QLibraryInfo::path(QLibraryInfo::DataPath)" "\"$out\"" \
- --replace "QLibraryInfo::path(QLibraryInfo::TranslationsPath)" "\"$out/translations\"" \
- --replace "QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)" "\"$out/libexec\""
- ''
- + lib.optionalString stdenv.hostPlatform.isLinux ''
- sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
- src/3rdparty/chromium/device/udev_linux/udev?_loader.cc
-
- sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
- src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
- ''
- + lib.optionalString stdenv.hostPlatform.isDarwin ''
- substituteInPlace configure.cmake src/gn/CMakeLists.txt \
- --replace "AppleClang" "Clang"
- substituteInPlace cmake/Functions.cmake \
- --replace "/usr/bin/xcrun" "${xcbuild}/bin/xcrun"
- '';
-
- cmakeFlags = [
- "-DQT_FEATURE_qtpdf_build=ON"
- "-DQT_FEATURE_qtpdf_widgets_build=ON"
- "-DQT_FEATURE_qtpdf_quick_build=ON"
- "-DQT_FEATURE_pdf_v8=ON"
- "-DQT_FEATURE_pdf_xfa=ON"
- "-DQT_FEATURE_pdf_xfa_bmp=ON"
- "-DQT_FEATURE_pdf_xfa_gif=ON"
- "-DQT_FEATURE_pdf_xfa_png=ON"
- "-DQT_FEATURE_pdf_xfa_tiff=ON"
- "-DQT_FEATURE_webengine_system_libevent=ON"
- "-DQT_FEATURE_webengine_system_ffmpeg=ON"
- # android only. https://bugreports.qt.io/browse/QTBUG-100293
- # "-DQT_FEATURE_webengine_native_spellchecker=ON"
- "-DQT_FEATURE_webengine_sanitizer=ON"
- "-DQT_FEATURE_webengine_kerberos=ON"
- ] ++ lib.optionals stdenv.hostPlatform.isLinux [
- "-DQT_FEATURE_webengine_system_libxml=ON"
- "-DQT_FEATURE_webengine_webrtc_pipewire=ON"
-
- # Appears not to work on some platforms
- # https://github.com/Homebrew/homebrew-core/issues/104008
- "-DQT_FEATURE_webengine_system_icu=ON"
- ] ++ lib.optionals enableProprietaryCodecs [
- "-DQT_FEATURE_webengine_proprietary_codecs=ON"
- ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
- "-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0" # Per Qt 6’s deployment target (why doesn’t the hook work?)
- ];
-
- propagatedBuildInputs = [
- qtdeclarative
- qtwebchannel
- qtwebsockets
- qtpositioning
-
- # Image formats
- libjpeg
- libpng
- libtiff
- libwebp
-
- # Video formats
- srtp
- libvpx
-
- # Audio formats
- libopus
-
- # Text rendering
- harfbuzz
-
- openssl
- glib
- libxslt
- lcms2
-
- libevent
- ffmpeg
- ] ++ lib.optionals stdenv.hostPlatform.isLinux [
- dbus
- zlib
- minizip
- snappy
- nss
- protobuf
- jsoncpp
-
- icu
- libxml2
-
- # Audio formats
- alsa-lib
- pulseaudio
-
- # Text rendering
- fontconfig
- freetype
-
- libcap
- pciutils
-
- # X11 libs
- xorg.xrandr
- libXScrnSaver
- libXcursor
- libXrandr
- xorg.libpciaccess
- libXtst
- xorg.libXcomposite
- xorg.libXdamage
- libdrm
- xorg.libxkbfile
- libxshmfence
- libXi
- xorg.libXext
-
- # Pipewire
- pipewire
-
- libkrb5
- mesa
- ];
-
- buildInputs = [
- cups
- ];
-
- requiredSystemFeatures = [ "big-parallel" ];
-
- preConfigure = ''
- export NINJAFLAGS="-j$NIX_BUILD_CORES"
- '';
-
- # Debug info is too big to link with LTO.
- separateDebugInfo = false;
-
- meta = with lib; {
- description = "Web engine based on the Chromium web browser";
- platforms = [ "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "armv7a-linux" "armv7l-linux" "x86_64-linux" ];
- # This build takes a long time; particularly on slow architectures
- # 1 hour on 32x3.6GHz -> maybe 12 hours on 4x2.4GHz
- timeout = 24 * 3600;
- };
-}
diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
new file mode 100644
index 0000000000000..149e02e99c68a
--- /dev/null
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
@@ -0,0 +1,292 @@
+{
+ qtModule,
+ qtdeclarative,
+ qtwebchannel,
+ qtpositioning,
+ qtwebsockets,
+ buildPackages,
+ bison,
+ coreutils,
+ flex,
+ git,
+ gperf,
+ ninja,
+ pkg-config,
+ python3,
+ which,
+ nodejs,
+ xorg,
+ libXcursor,
+ libXScrnSaver,
+ libXrandr,
+ libXtst,
+ libxshmfence,
+ libXi,
+ cups,
+ fontconfig,
+ freetype,
+ harfbuzz,
+ icu,
+ dbus,
+ libdrm,
+ zlib,
+ minizip,
+ libjpeg,
+ libpng,
+ libtiff,
+ libwebp,
+ libopus,
+ jsoncpp,
+ protobuf,
+ libvpx,
+ srtp,
+ snappy,
+ nss,
+ libevent,
+ openssl,
+ alsa-lib,
+ pulseaudio,
+ libcap,
+ pciutils,
+ systemd,
+ pipewire,
+ gn,
+ ffmpeg,
+ lib,
+ stdenv,
+ glib,
+ libxml2,
+ libxslt,
+ lcms2,
+ libkrb5,
+ libgbm,
+ enableProprietaryCodecs ? true,
+ # darwin
+ autoSignDarwinBinariesHook,
+ bootstrap_cmds,
+ cctools,
+ xcbuild,
+}:
+
+qtModule {
+ pname = "qtwebengine";
+ nativeBuildInputs =
+ [
+ bison
+ coreutils
+ flex
+ git
+ gperf
+ ninja
+ pkg-config
+ (python3.withPackages (ps: with ps; [ html5lib ]))
+ which
+ gn
+ nodejs
+ ]
+ ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+ autoSignDarwinBinariesHook
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ bootstrap_cmds
+ cctools
+ xcbuild
+ ];
+ doCheck = true;
+ outputs = [
+ "out"
+ "dev"
+ ];
+
+ dontUseGnConfigure = true;
+
+ # ninja builds some components with -Wno-format,
+ # which cannot be set at the same time as -Wformat-security
+ hardeningDisable = [ "format" ];
+
+ patches = [
+ # Don't assume /usr/share/X11, and also respect the XKB_CONFIG_ROOT
+ # environment variable, since NixOS relies on it working.
+ # See https://github.com/NixOS/nixpkgs/issues/226484 for more context.
+ ./xkb-includes.patch
+
+ ./link-pulseaudio.patch
+
+ # Override locales install path so they go to QtWebEngine's $out
+ ./locales-path.patch
+ ];
+
+ postPatch =
+ ''
+ # Patch Chromium build tools
+ (
+ cd src/3rdparty/chromium;
+
+ # Manually fix unsupported shebangs
+ substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \
+ --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" || true
+ substituteInPlace third_party/webgpu-cts/src/tools/run_deno \
+ --replace "/usr/bin/env -S deno" "/usr/bin/deno" || true
+ patchShebangs .
+ )
+
+ substituteInPlace cmake/Functions.cmake \
+ --replace "/bin/bash" "${buildPackages.bash}/bin/bash"
+
+ # Patch library paths in sources
+ substituteInPlace src/core/web_engine_library_info.cpp \
+ --replace "QLibraryInfo::path(QLibraryInfo::DataPath)" "\"$out\"" \
+ --replace "QLibraryInfo::path(QLibraryInfo::TranslationsPath)" "\"$out/translations\"" \
+ --replace "QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)" "\"$out/libexec\""
+ ''
+ + lib.optionalString stdenv.hostPlatform.isLinux ''
+ sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
+ src/3rdparty/chromium/device/udev_linux/udev?_loader.cc
+
+ sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
+ src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
+ ''
+ + lib.optionalString stdenv.hostPlatform.isDarwin ''
+ substituteInPlace configure.cmake src/gn/CMakeLists.txt \
+ --replace "AppleClang" "Clang"
+ substituteInPlace cmake/Functions.cmake \
+ --replace "/usr/bin/xcrun" "${xcbuild}/bin/xcrun"
+ '';
+
+ cmakeFlags =
+ [
+ "-DQT_FEATURE_qtpdf_build=ON"
+ "-DQT_FEATURE_qtpdf_widgets_build=ON"
+ "-DQT_FEATURE_qtpdf_quick_build=ON"
+ "-DQT_FEATURE_pdf_v8=ON"
+ "-DQT_FEATURE_pdf_xfa=ON"
+ "-DQT_FEATURE_pdf_xfa_bmp=ON"
+ "-DQT_FEATURE_pdf_xfa_gif=ON"
+ "-DQT_FEATURE_pdf_xfa_png=ON"
+ "-DQT_FEATURE_pdf_xfa_tiff=ON"
+ "-DQT_FEATURE_webengine_system_libevent=ON"
+ "-DQT_FEATURE_webengine_system_ffmpeg=ON"
+ # android only. https://bugreports.qt.io/browse/QTBUG-100293
+ # "-DQT_FEATURE_webengine_native_spellchecker=ON"
+ "-DQT_FEATURE_webengine_sanitizer=ON"
+ "-DQT_FEATURE_webengine_kerberos=ON"
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isLinux [
+ "-DQT_FEATURE_webengine_system_libxml=ON"
+ "-DQT_FEATURE_webengine_webrtc_pipewire=ON"
+
+ # Appears not to work on some platforms
+ # https://github.com/Homebrew/homebrew-core/issues/104008
+ "-DQT_FEATURE_webengine_system_icu=ON"
+ ]
+ ++ lib.optionals enableProprietaryCodecs [
+ "-DQT_FEATURE_webengine_proprietary_codecs=ON"
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ "-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0" # Per Qt 6’s deployment target (why doesn’t the hook work?)
+ ];
+
+ propagatedBuildInputs =
+ [
+ qtdeclarative
+ qtwebchannel
+ qtwebsockets
+ qtpositioning
+
+ # Image formats
+ libjpeg
+ libpng
+ libtiff
+ libwebp
+
+ # Video formats
+ srtp
+ libvpx
+
+ # Audio formats
+ libopus
+
+ # Text rendering
+ harfbuzz
+
+ openssl
+ glib
+ libxslt
+ lcms2
+
+ libevent
+ ffmpeg
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isLinux [
+ dbus
+ zlib
+ minizip
+ snappy
+ nss
+ protobuf
+ jsoncpp
+
+ icu
+ libxml2
+
+ # Audio formats
+ alsa-lib
+ pulseaudio
+
+ # Text rendering
+ fontconfig
+ freetype
+
+ libcap
+ pciutils
+
+ # X11 libs
+ xorg.xrandr
+ libXScrnSaver
+ libXcursor
+ libXrandr
+ xorg.libpciaccess
+ libXtst
+ xorg.libXcomposite
+ xorg.libXdamage
+ libdrm
+ xorg.libxkbfile
+ libxshmfence
+ libXi
+ xorg.libXext
+
+ # Pipewire
+ pipewire
+
+ libkrb5
+ libgbm
+ ];
+
+ buildInputs = [
+ cups
+ ];
+
+ requiredSystemFeatures = [ "big-parallel" ];
+
+ preConfigure = ''
+ export NINJAFLAGS="-j$NIX_BUILD_CORES"
+ '';
+
+ # Debug info is too big to link with LTO.
+ separateDebugInfo = false;
+
+ meta = with lib; {
+ description = "Web engine based on the Chromium web browser";
+ platforms = [
+ "x86_64-darwin"
+ "aarch64-darwin"
+ "aarch64-linux"
+ "armv7a-linux"
+ "armv7l-linux"
+ "x86_64-linux"
+ ];
+ # This build takes a long time; particularly on slow architectures
+ # 1 hour on 32x3.6GHz -> maybe 12 hours on 4x2.4GHz
+ timeout = 24 * 3600;
+ };
+}
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 a48bb2c37eee5..7ee990f45ce73 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 fecdb93cd5476..e2bf74980878c 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 df1b67654b615..0000000000000
--- 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 597dd7e6550d0..0000000000000
--- 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 1bf3d1a649c82..cc37e20647de8 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/qwlroots/default.nix b/pkgs/development/libraries/qwlroots/default.nix
index 6dfed9551920d..3eb27e2dda497 100644
--- a/pkgs/development/libraries/qwlroots/default.nix
+++ b/pkgs/development/libraries/qwlroots/default.nix
@@ -11,7 +11,7 @@
wayland-protocols,
wlr-protocols,
pixman,
- mesa,
+ libgbm,
vulkan-loader,
libinput,
xorg,
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
wayland-protocols
wlr-protocols
pixman
- mesa
+ libgbm
vulkan-loader
libinput
xorg.libXdmcp
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index df28ee6cb39b1..4502b3d9f8134 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 863a1f668c32c..8381ec78a210d 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/tbb/2021_5.nix b/pkgs/development/libraries/tbb/2022_0.nix
similarity index 79%
rename from pkgs/development/libraries/tbb/2021_5.nix
rename to pkgs/development/libraries/tbb/2022_0.nix
index b17ce8a760fcd..86165afb23248 100644
--- a/pkgs/development/libraries/tbb/2021_5.nix
+++ b/pkgs/development/libraries/tbb/2022_0.nix
@@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
pname = "tbb";
- version = "2021.5.0";
+ version = "2022.0.0";
outputs = [
"out"
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "oneapi-src";
repo = "oneTBB";
- rev = "v${version}";
- hash = "sha256-TJ/oSSMvgtKuz7PVyIoFEbBW6EZz7t2wr/kP093HF/w=";
+ tag = "v${version}";
+ hash = "sha256-XOlC1+rf65oEGKDba9N561NuFo1YJhn3Q1CTGtvkn7A=";
};
nativeBuildInputs = [
@@ -27,30 +27,19 @@ stdenv.mkDerivation rec {
];
patches = [
- # port of https://github.com/oneapi-src/oneTBB/pull/1031
- ./gcc13-fixes-2021.5.0.patch
-
+ # Fix musl build from https://github.com/oneapi-src/oneTBB/pull/899
(fetchpatch {
- # Fix "field used uninitialized" on modern gcc versions (https://github.com/oneapi-src/oneTBB/pull/958)
- url = "https://github.com/oneapi-src/oneTBB/commit/3003ec07740703e6aed12b028af20f4b0f16adae.patch";
- hash = "sha256-l4+9IxIEdRX/q8JyDY9CPKWzSLatpIVSiNjmIM7ilj0=";
+ url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/899.patch";
+ hash = "sha256-kU6RRX+sde0NrQMKlNtW3jXav6J4QiVIUmD50asmBPU=";
})
];
- # Disable failing test on musl
- # test/conformance/conformance_resumable_tasks.cpp:37:24: error: ‘suspend’ is not a member of ‘tbb::v1::task’; did you mean ‘tbb::detail::r1::suspend’?
- postPatch = lib.optionalString stdenv.hostPlatform.isMusl ''
- substituteInPlace test/CMakeLists.txt \
- --replace-fail 'conformance_resumable_tasks' ""
- '';
-
# Fix build with modern gcc
# In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]',
NIX_CFLAGS_COMPILE =
lib.optionals stdenv.cc.isGNU [
"-Wno-error=array-bounds"
"-Wno-error=stringop-overflow"
- "-Wno-address"
]
++
# error: variable 'val' set but not used
@@ -65,6 +54,13 @@ stdenv.mkDerivation rec {
stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17"
) "--undefined-version";
+ # Disable failing test on musl
+ # test/conformance/conformance_resumable_tasks.cpp:37:24: error: ‘suspend’ is not a member of ‘tbb::v1::task’; did you mean ‘tbb::detail::r1::suspend’?
+ postPatch = lib.optionalString stdenv.hostPlatform.isMusl ''
+ substituteInPlace test/CMakeLists.txt \
+ --replace-fail 'tbb_add_test(SUBDIR conformance NAME conformance_resumable_tasks DEPENDENCIES TBB::tbb)' ""
+ '';
+
meta = with lib; {
description = "Intel Thread Building Blocks C++ Library";
homepage = "http://threadingbuildingblocks.org/";
diff --git a/pkgs/development/libraries/tbb/gcc13-fixes-2021.5.0.patch b/pkgs/development/libraries/tbb/gcc13-fixes-2021.5.0.patch
deleted file mode 100644
index 28b5a0e695f70..0000000000000
--- a/pkgs/development/libraries/tbb/gcc13-fixes-2021.5.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/test/common/utils_assert.h b/test/common/utils_assert.h
-index 33bc8ab4..a3d21baf 100644
---- a/test/common/utils_assert.h
-+++ b/test/common/utils_assert.h
-@@ -20,6 +20,8 @@
- #include "config.h"
- #include "utils_report.h"
-
-+#include
-+
- #define REPORT_FATAL_ERROR REPORT
-
- namespace utils {
diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix
index 5604a3b19a74e..85bc5a64f0d81 100644
--- a/pkgs/development/libraries/tpm2-tss/default.nix
+++ b/pkgs/development/libraries/tpm2-tss/default.nix
@@ -18,6 +18,7 @@
procps,
which,
libuuid,
+ libtpms,
}:
let
# Avoid a circular dependency on Linux systems (systemd depends on tpm2-tss,
@@ -61,6 +62,7 @@ stdenv.mkDerivation rec {
libgcrypt
uthash
libuuid
+ libtpms
]
# cmocka is checked in the configure script
# when unit and/or integration testing is enabled
@@ -99,15 +101,30 @@ stdenv.mkDerivation rec {
./no-shadow.patch
];
- postPatch = ''
- patchShebangs script
- substituteInPlace src/tss2-tcti/tctildr-dl.c \
- --replace '@PREFIX@' $out/lib/
- substituteInPlace ./test/unit/tctildr-dl.c \
- --replace '@PREFIX@' $out/lib/
- substituteInPlace ./bootstrap \
- --replace 'git describe --tags --always --dirty' 'echo "${version}"'
- '';
+ postPatch =
+ ''
+ patchShebangs script
+ substituteInPlace src/tss2-tcti/tctildr-dl.c \
+ --replace-fail '@PREFIX@' $out/lib/
+ substituteInPlace ./test/unit/tctildr-dl.c \
+ --replace-fail '@PREFIX@' $out/lib/
+ substituteInPlace ./bootstrap \
+ --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 008e99032dbab..e8a7b27a4fe06 100644
--- a/pkgs/development/libraries/vtk/generic.nix
+++ b/pkgs/development/libraries/vtk/generic.nix
@@ -119,8 +119,13 @@ 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 3fafb7e14f4cc..b2cafcea35b73 100644
--- a/pkgs/development/libraries/wasilibc/default.nix
+++ b/pkgs/development/libraries/wasilibc/default.nix
@@ -9,7 +9,7 @@
let
pname = "wasilibc";
- version = "21";
+ version = "22-unstable-2024-10-16";
in
stdenv.mkDerivation {
inherit pname version;
@@ -17,8 +17,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 82f41bdf30ca3..57138294db31c 100644
--- a/pkgs/development/libraries/wayland/protocols.nix
+++ b/pkgs/development/libraries/wayland/protocols.nix
@@ -38,8 +38,12 @@ stdenv.mkDerivation (finalAttrs: {
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 03a4529b22bad..536c3da317bbb 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -48,7 +48,7 @@
apple_sdk,
libGL,
libGLU,
- mesa,
+ libgbm,
libintl,
lcms2,
libmanette,
@@ -111,14 +111,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
@@ -155,7 +147,7 @@ clangStdenv.mkDerivation (finalAttrs: {
hyphen
libGL
libGLU
- mesa # for libEGL headers
+ libgbm
libgcrypt
libgpg-error
libidn
diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index bbb6808d25388..a219181feaed4 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -13,7 +13,7 @@
libxkbcommon,
pixman,
libcap,
- mesa,
+ libgbm,
xorg,
libpng,
ffmpeg,
@@ -81,7 +81,7 @@ let
libinput
libpng
libxkbcommon
- mesa
+ libgbm
pixman
seatd
vulkan-loader
diff --git a/pkgs/development/libraries/wxsqliteplus/default.nix b/pkgs/development/libraries/wxsqliteplus/default.nix
index 0120571bb09b7..4b02de59fadbe 100644
--- a/pkgs/development/libraries/wxsqliteplus/default.nix
+++ b/pkgs/development/libraries/wxsqliteplus/default.nix
@@ -39,9 +39,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_${
+ 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
'';
diff --git a/pkgs/development/python-modules/a2wsgi/default.nix b/pkgs/development/python-modules/a2wsgi/default.nix
index e9a90937760df..08460911bbecd 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,18 +20,19 @@ buildPythonPackage rec {
hash = "sha256-zkYv9+HarAvFcYPG+ADwmnHCp6mN3VzeyhSePqvzM44=";
};
- nativeBuildInputs = [ pdm-backend ];
+ build-system = [ pdm-backend ];
+
+ dependencies = [
+ starlette
+ baize
+ ];
nativeCheckInputs = [
- asgiref
+ baize
httpx
pytest-asyncio
pytestCheckHook
- ];
-
- dependencies = [
starlette
- baize
];
meta = {
diff --git a/pkgs/development/python-modules/aioelectricitymaps/default.nix b/pkgs/development/python-modules/aioelectricitymaps/default.nix
index b02c3eed7f0fd..4d75deb113154 100644
--- a/pkgs/development/python-modules/aioelectricitymaps/default.nix
+++ b/pkgs/development/python-modules/aioelectricitymaps/default.nix
@@ -51,6 +51,9 @@ buildPythonPackage rec {
pythonImportsCheck = [ "aioelectricitymaps" ];
+ # https://github.com/jpbede/aioelectricitymaps/pull/415
+ pytestFlagsArray = [ "--snapshot-update" ];
+
meta = with lib; {
description = "Module for interacting with Electricity maps";
homepage = "https://github.com/jpbede/aioelectricitymaps";
diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix
index c7de615170bb7..4e15614ea3789 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 51b923c86df68..c8e1d431eeef1 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 73ab81fa78a81..0000000000000
--- 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 86cb1b427734e..3d681d212dfc5 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,
+ aiosignal,
+ async-timeout,
attrs,
+ frozenlist,
multidict,
- async-timeout,
+ propcache,
yarl,
- frozenlist,
- aiosignal,
+
+ # 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
+ aiosignal
+ async-timeout
attrs
+ frozenlist
multidict
- async-timeout
+ propcache
yarl
- frozenlist
- aiosignal
+ ] ++ 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 49b3e9154ded3..5fad9427371d4 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/aiomealie/default.nix b/pkgs/development/python-modules/aiomealie/default.nix
index ee4ad62a1baff..a795c97e66c42 100644
--- a/pkgs/development/python-modules/aiomealie/default.nix
+++ b/pkgs/development/python-modules/aiomealie/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "aiomealie";
- version = "0.9.3";
+ version = "0.9.4";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "joostlek";
repo = "python-mealie";
rev = "refs/tags/v${version}";
- hash = "sha256-FJhmipWE3DE4PRWkEq8/j9iz9HQ7G7J5I9hwjU6e3FA=";
+ hash = "sha256-Sl2n78R/twx4+liob4k0B1pskonYD7B00lo9hz45qIs=";
};
build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix
index 5b102d463171d..880f7505c28bf 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/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix
index 34f6b0d456772..18402b6043887 100644
--- a/pkgs/development/python-modules/aioshelly/default.nix
+++ b/pkgs/development/python-modules/aioshelly/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "aioshelly";
- version = "12.0.1";
+ version = "12.1.0";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = "aioshelly";
rev = "refs/tags/${version}";
- hash = "sha256-DO3y3tn+hsrTQfiBj3DtQG19SvIbXN7MuVPKlyZ4vP0=";
+ hash = "sha256-QcVyWabELa1bB2MOwQNPItXLgeOXlFpRh69dS+m1FLI=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/aiostreammagic/default.nix b/pkgs/development/python-modules/aiostreammagic/default.nix
index ce01f37d6c599..3e5ebb220eac8 100644
--- a/pkgs/development/python-modules/aiostreammagic/default.nix
+++ b/pkgs/development/python-modules/aiostreammagic/default.nix
@@ -1,18 +1,18 @@
{
lib,
+ aiohttp,
buildPythonPackage,
fetchFromGitHub,
mashumaro,
orjson,
poetry-core,
pythonOlder,
- websockets,
yarl,
}:
buildPythonPackage rec {
pname = "aiostreammagic";
- version = "2.8.5";
+ version = "2.10.0";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -21,17 +21,15 @@ buildPythonPackage rec {
owner = "noahhusby";
repo = "aiostreammagic";
rev = "refs/tags/${version}";
- hash = "sha256-1/9cpdKRr7O4Ji34OSkbBudSedTAt50oGZBc88XNI18=";
+ hash = "sha256-CFd8/nyE3hLbmzO/MJEnllIe2MvfD/jkGIpNdYxI8N0=";
};
- pythonRelaxDeps = [ "websockets" ];
-
build-system = [ poetry-core ];
dependencies = [
+ aiohttp
mashumaro
orjson
- websockets
yarl
];
diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix
index 08cbff77d200a..f2f3ec34aebfd 100644
--- a/pkgs/development/python-modules/aioswitcher/default.nix
+++ b/pkgs/development/python-modules/aioswitcher/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "aioswitcher";
- version = "4.4.1";
+ version = "5.0.0";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "TomerFi";
repo = "aioswitcher";
rev = "refs/tags/${version}";
- hash = "sha256-O1wKw6jv2aRPLZ2hSYv3MwneeNcjO+2/RKzQ7xXWHtY=";
+ hash = "sha256-cKHH1yXVm/kZigO1Ub0XZEv+yq4lROc4SGFLqFuwQto=";
};
__darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix
index 1d325c1eb8033..e8e4bf09195c7 100644
--- a/pkgs/development/python-modules/aiounifi/default.nix
+++ b/pkgs/development/python-modules/aiounifi/default.nix
@@ -7,6 +7,7 @@
orjson,
pytest-aiohttp,
pytest-asyncio,
+ pytest-cov-stub,
pytestCheckHook,
pythonOlder,
segno,
@@ -16,7 +17,7 @@
buildPythonPackage rec {
pname = "aiounifi";
- version = "80";
+ version = "81";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -25,15 +26,13 @@ buildPythonPackage rec {
owner = "Kane610";
repo = "aiounifi";
rev = "refs/tags/v${version}";
- hash = "sha256-320ptaKT+6mKUj9y+MvGovp4/XVbYIlDTb9lLXY7c1w=";
+ hash = "sha256-QuECmv/xWTNsC42JmPlYwN710Pu6L9jNbtOPJsUdM9k=";
};
postPatch = ''
substituteInPlace pyproject.toml \
- --replace-fail "setuptools==" "setuptools>=" \
+ --replace-fail "setuptools==75.6.0" "setuptools" \
--replace-fail "wheel==" "wheel>="
-
- sed -i '/--cov=/d' pyproject.toml
'';
build-system = [ setuptools ];
@@ -48,6 +47,7 @@ buildPythonPackage rec {
aioresponses
pytest-aiohttp
pytest-asyncio
+ pytest-cov-stub
pytestCheckHook
trustme
];
diff --git a/pkgs/development/python-modules/amberelectric/default.nix b/pkgs/development/python-modules/amberelectric/default.nix
index 5253eef6c2145..b8214fa5372b0 100644
--- a/pkgs/development/python-modules/amberelectric/default.nix
+++ b/pkgs/development/python-modules/amberelectric/default.nix
@@ -1,31 +1,37 @@
{
lib,
+ aenum,
buildPythonPackage,
- fetchPypi,
+ fetchFromGitHub,
+ poetry-core,
+ pydantic,
pytest-mock,
pytestCheckHook,
python-dateutil,
pythonOlder,
- setuptools,
urllib3,
}:
buildPythonPackage rec {
pname = "amberelectric";
- version = "1.1.1";
+ version = "2.0.12";
pyproject = true;
disabled = pythonOlder "3.7";
- src = fetchPypi {
- inherit pname version;
- hash = "sha256-gxpFKIrGHpwjPdF0nnyruwCYf3bhrubdtXNx2+wEiZU=";
+ src = fetchFromGitHub {
+ owner = "madpilot";
+ repo = "amberelectric.py";
+ tag = "v${version}";
+ hash = "sha256-HTelfgOucyQINz34hT3kGxhJf68pxKbiO3L54nt5New=";
};
- nativeBuildInputs = [ setuptools ];
+ build-system = [ poetry-core ];
- propagatedBuildInputs = [
+ dependencies = [
+ aenum
urllib3
+ pydantic
python-dateutil
];
diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix
index d8a96b231c03c..bac7379338c91 100644
--- a/pkgs/development/python-modules/argcomplete/default.nix
+++ b/pkgs/development/python-modules/argcomplete/default.nix
@@ -21,6 +21,13 @@ buildPythonPackage rec {
hash = "sha256-um8iFzEHExTRV1BAl86/XKLc7vmf2Ws1dB83agfvoec=";
};
+ patches = [
+ # fixes issues with python3Packages.traitlets tests
+ # https://git.launchpad.net/ubuntu/+source/python-argcomplete/tree/debian/patches/python-3.13-compat.patch?h=ubuntu/plucky
+ # https://github.com/kislyuk/argcomplete/pull/513
+ ./python-3.13-compat.patch
+ ];
+
build-system = [
setuptools
setuptools-scm
diff --git a/pkgs/development/python-modules/argcomplete/python-3.13-compat.patch b/pkgs/development/python-modules/argcomplete/python-3.13-compat.patch
new file mode 100644
index 0000000000000..8a1aa83541356
--- /dev/null
+++ b/pkgs/development/python-modules/argcomplete/python-3.13-compat.patch
@@ -0,0 +1,49 @@
+From 7438d1fa962eb736af9754669f200f29c5b6025d Mon Sep 17 00:00:00 2001
+From: liushuyu
+Date: Mon, 18 Nov 2024 16:12:54 -0700
+Subject: [PATCH] Preliminary Python 3.13 compatibility
+
+---
+ argcomplete/packages/_argparse.py | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/argcomplete/packages/_argparse.py b/argcomplete/packages/_argparse.py
+index d10cf01..10ed00c 100644
+--- a/argcomplete/packages/_argparse.py
++++ b/argcomplete/packages/_argparse.py
+@@ -5,6 +5,7 @@
+
+ # This file contains argparse introspection utilities used in the course of argcomplete execution.
+
++import sys
+ from argparse import (
+ ONE_OR_MORE,
+ OPTIONAL,
+@@ -15,6 +16,7 @@
+ Action,
+ ArgumentError,
+ ArgumentParser,
++ Namespace,
+ _get_action_name,
+ _SubParsersAction,
+ )
+@@ -75,6 +77,19 @@ class IntrospectiveArgumentParser(ArgumentParser):
+ except for the lines that contain the string "Added by argcomplete".
+ '''
+
++ def _parse_known_args2(self, args, namespace, intermixed):
++ if args is None:
++ # args default to the system args
++ args = sys.argv[1:]
++ else:
++ # make sure that args are mutable
++ args = list(args)
++
++ # default Namespace built from parser defaults
++ if namespace is None:
++ namespace = Namespace()
++ return self._parse_known_args(args, namespace)
++
+ def _parse_known_args(self, arg_strings, namespace):
+ _num_consumed_args.clear() # Added by argcomplete
+ self._argcomplete_namespace = namespace
diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix
index 59caf790cad37..fb8dcd8a59987 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 b3591e0610e91..d76bb41da69f2 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 5bf0ab7dfe04e..a39b8a395b706 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 e65d0d2222854..fce3ab8e11e9a 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-iers-data/default.nix b/pkgs/development/python-modules/astropy-iers-data/default.nix
index 62c728f2f9317..633ebaec21ca3 100644
--- a/pkgs/development/python-modules/astropy-iers-data/default.nix
+++ b/pkgs/development/python-modules/astropy-iers-data/default.nix
@@ -5,12 +5,11 @@
pythonOlder,
setuptools,
setuptools-scm,
- wheel,
}:
buildPythonPackage rec {
pname = "astropy-iers-data";
- version = "0.2024.9.23.0.31.43";
+ version = "0.2024.12.9.0.36.21";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -19,13 +18,12 @@ buildPythonPackage rec {
owner = "astropy";
repo = "astropy-iers-data";
rev = "refs/tags/v${version}";
- hash = "sha256-PGr8meqVs9l15+k5DHmcPcGK96ydN0nRUOBVfvCtRUg=";
+ hash = "sha256-SN4qDBY3hi0Gj+AH3SSDi5+hKrHMNgPR/Y6HR2Vid0A=";
};
- nativeBuildInputs = [
+ build-system = [
setuptools
setuptools-scm
- wheel
];
pythonImportsCheck = [ "astropy_iers_data" ];
diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
index 8315d44542803..4f5586f9aa21b 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -5,45 +5,70 @@
pythonOlder,
# build time
- astropy-extension-helpers,
cython,
+ extension-helpers,
setuptools,
setuptools-scm,
+ # dependencies
+ astropy-iers-data,
+ numpy,
+ packaging,
+ pyerfa,
+ pyyaml,
+
+ # optional-depedencies
+ scipy,
+ matplotlib,
+ ipython,
+ ipywidgets,
+ ipykernel,
+ pandas,
+ certifi,
+ dask,
+ h5py,
+ pyarrow,
+ beautifulsoup4,
+ html5lib,
+ sortedcontainers,
+ pytz,
+ jplephem,
+ mpmath,
+ asdf,
+ asdf-astropy,
+ bottleneck,
+ fsspec,
+ s3fs,
+
# testing
pytestCheckHook,
stdenv,
pytest-xdist,
+ pytest-astropy-header,
pytest-astropy,
+ threadpoolctl,
- # runtime
- astropy-iers-data,
- numpy,
- packaging,
- pyerfa,
- pyyaml,
}:
buildPythonPackage rec {
pname = "astropy";
- version = "6.1.4";
+ version = "7.0.0";
pyproject = true;
disabled = pythonOlder "3.10";
src = fetchPypi {
inherit pname version;
- hash = "sha256-NhVY4rCTqZvr5p8f1H+shqGSYHpMFu05ugqACyq2DDQ=";
+ hash = "sha256-6S18n+6G6z34cU5d1Bu/nxY9ND4aGD2Vv2vQnkMTyUA=";
};
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace-fail "numpy>=2.0.0" "numpy"
- '';
+ env = lib.optionalAttrs stdenv.cc.isClang {
+ NIX_CFLAGS_COMPILE = "-Wno-error=unused-command-line-argument";
+ };
build-system = [
- astropy-extension-helpers
cython
+ extension-helpers
setuptools
setuptools-scm
];
@@ -56,11 +81,56 @@ buildPythonPackage rec {
pyyaml
];
+ optional-dependencies = lib.fix (self: {
+ recommended = [
+ scipy
+ matplotlib
+ ];
+ ipython = [
+ ipython
+ ];
+ jupyter = [
+ ipywidgets
+ ipykernel
+ # ipydatagrid
+ pandas
+ ] ++ self.ipython;
+ all =
+ [
+ certifi
+ dask
+ h5py
+ pyarrow
+ beautifulsoup4
+ html5lib
+ sortedcontainers
+ pytz
+ jplephem
+ mpmath
+ asdf
+ asdf-astropy
+ bottleneck
+ fsspec
+ s3fs
+ ]
+ ++ self.recommended
+ ++ self.ipython
+ ++ self.jupyter
+ ++ dask.optional-dependencies.array
+ ++ fsspec.optional-dependencies.http;
+ });
+
nativeCheckInputs = [
pytestCheckHook
pytest-xdist
+ pytest-astropy-header
pytest-astropy
- ];
+ threadpoolctl
+ ] ++ optional-dependencies.recommended;
+
+ pythonImportsCheck = [ "astropy" ];
+
+ __darwinAllowLocalNetworking = true;
# Not running it inside the build directory. See:
# https://github.com/astropy/astropy/issues/15316#issuecomment-1722190547
@@ -69,8 +139,12 @@ buildPythonPackage rec {
export HOME="$(mktemp -d)"
export OMP_NUM_THREADS=$(( $NIX_BUILD_CORES / 4 ))
'';
- pythonImportsCheck = [ "astropy" ];
+
disabledTests = [
+ # tests for all availability of all optional deps
+ "test_basic_testing_completeness"
+ "test_all_included"
+
# May fail due to parallelism, see:
# https://github.com/astropy/astropy/issues/15441
"TestUnifiedOutputRegistry"
diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/pkgs/development/python-modules/asyncpg/default.nix
index b855d952ed2d3..bc993bda0d595 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 0000000000000..b25454bf0671c
--- /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/default.nix b/pkgs/development/python-modules/av/default.nix
index 249c5af0bec29..6c5c201ba5afc 100644
--- a/pkgs/development/python-modules/av/default.nix
+++ b/pkgs/development/python-modules/av/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "av";
- version = "13.0.0";
+ version = "13.1.0";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "PyAV-Org";
repo = "PyAV";
rev = "refs/tags/v${version}";
- hash = "sha256-blvtHSUqSl9xAM4t+dFJWmXiOjtnAUC9nicMaUY1zuU=";
+ hash = "sha256-x2a9SC4uRplC6p0cD7fZcepFpRidbr6JJEEOaGSWl60=";
};
build-system = [
diff --git a/pkgs/development/python-modules/av/update-test-samples.bash b/pkgs/development/python-modules/av/update-test-samples.bash
index 5b0b1966d43b2..0ec4bdc2479ff 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
-
- samples=$(
- rg \
- --only-matching \
- --no-filename \
- "\\b${function}\\([\"']([^\"']+)[\"']\\)" \
- --replace '$1' \
- "${pyav_source}"
- )
- unique_samples=$(sort -u <<< "${samples}")
-
- while IFS= read -r sample; do
+ 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}")
+
+ 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 d0fec79bc5a60..b3ac8bc5e5649 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 = [
- starlette
- ];
+ pythonImportsCheck = [ "baize" ];
nativeCheckInputs = [
- pytestCheckHook
- pytest-httpx
- anyio
+ httpx
pytest-asyncio
- pytest-tornasync
- pytest-trio
- pytest-twisted
- twisted
+ pytestCheckHook
+ starlette
];
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 fab9db7660d9d..0221c57f1971d 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/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix
index cbfea2399312c..4a03117433168 100644
--- a/pkgs/development/python-modules/bellows/default.nix
+++ b/pkgs/development/python-modules/bellows/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "bellows";
- version = "0.42.0";
+ version = "0.42.5";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "bellows";
rev = "refs/tags/${version}";
- hash = "sha256-knWCCshsFvnMXknzpzYLCqb/ADB1Vl4RH5PBbxD5WgE=";
+ hash = "sha256-RdNJmIhJR4Ubb4hppFkde8EeYHtFSoJp3CJPGj0463U=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix
index 5adbde446d959..290aa1913b817 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 c32e23e56a921..d338057e70a67 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 a752b34d1153c..e21b073faed9b 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 f72a50eb26d3a..51163f0689be5 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/calmjs/default.nix b/pkgs/development/python-modules/calmjs/default.nix
index ee3affa9c1bdb..68761f6bbc95d 100644
--- a/pkgs/development/python-modules/calmjs/default.nix
+++ b/pkgs/development/python-modules/calmjs/default.nix
@@ -25,6 +25,11 @@ buildPythonPackage rec {
checkInputs = [ pytestCheckHook ];
+ disabledTests = [
+ # spacing changes in argparse output
+ "test_integration_choices_in_list"
+ ];
+
# ModuleNotFoundError: No module named 'calmjs.types'
# Not yet clear how to run these tests correctly
# https://github.com/calmjs/calmjs/issues/63
diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix
index 79059c7d53f5f..104adf7299689 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 b3bd55484b0fb..8772932278e87 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 9833bed552d46..2a115f7590c8f 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 8e3f512990810..1061502b7bac4 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 6e976eccb8cea..5c71ebee3d787 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 c0910bdf40f8f..c870636194d26 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 01156dd0b7991..a8e3f476350c2 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 c639113e48a26..21afcffb4c0fd 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 75b2677e380e7..0000000000000
--- 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 cd0e1c143a7f6..6597dd4749d08 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 c2e85c1f238da..e6ac6d5b5220a 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 182c5c3706241..c3852dc4ad070 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 8dfb12cf5f846..f352096610cf2 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 2d7b83782730a..6ac907f78ab52 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
- # UnicodeEncodeError on Python 2
- doCheck = isPy3k;
+ ${python.interpreter} commonmark/tests/run_spec_tests.py
+ ${python.interpreter} commonmark/tests/unit_tests.py
- nativeCheckInputs = [ glibcLocales ];
- propagatedBuildInputs = [ future ];
+ export PATH=$out/bin:$PATH
+ cmark commonmark/tests/test.md
+ cmark commonmark/tests/test.md -a
+ cmark commonmark/tests/test.md -aj
+
+ runHook postCheck
+ '';
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 76cd8caa1a9ad..5cf9169bb1a32 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 b56c8acb22583..595bd8ef14d09 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 d620f6fb4e22a..f70b8a73a65e2 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 63f6bf2850e72..791d90f8c9adf 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 4f296b0362650..0e404d57a6650 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 cbd1794e69948..12e4e4e8ae40e 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",
@@ -522,21 +539,150 @@ dependencies = [
"cc",
]
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "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 = "0.5.0"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "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,15 +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"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
dependencies = [
"proc-macro2",
"quote",
@@ -1314,27 +1502,30 @@ dependencies = [
]
[[package]]
-name = "syn"
-version = "2.0.60"
+name = "sync_wrapper"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
+checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
+ "futures-core",
]
[[package]]
-name = "sync_wrapper"
-version = "0.1.2"
+name = "synstructure"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+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"
@@ -1347,11 +1538,41 @@ dependencies = [
"utf-8",
]
+[[package]]
+name = "thiserror"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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.6.0"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.23"
+version = "1.0.13"
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,189 +1838,232 @@ 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-sys"
-version = "0.52.0"
+name = "windows-result"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets",
]
[[package]]
-name = "windows-targets"
-version = "0.48.5"
+name = "windows-strings"
+version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
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",
+ "windows-result",
+ "windows-targets",
]
[[package]]
-name = "windows-targets"
-version = "0.52.5"
+name = "windows-sys"
+version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
- "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-targets",
]
[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
+name = "windows-sys"
+version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.5"
+name = "windows-targets"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+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_msvc"
-version = "0.48.5"
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.52.5"
+version = "0.52.6"
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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
-
-[[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"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
[[package]]
name = "windows_i686_msvc"
-version = "0.52.5"
+version = "0.52.6"
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"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.5"
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
+name = "windows_x86_64_msvc"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.5"
+name = "winnow"
+version = "0.6.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
+dependencies = [
+ "memchr",
+]
[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
+name = "write16"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.5"
+name = "writeable"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
[[package]]
-name = "winnow"
-version = "0.5.40"
+name = "yoke"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
dependencies = [
- "memchr",
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
]
[[package]]
-name = "winreg"
-version = "0.52.0"
+name = "yoke-derive"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
+checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
+ "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 = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f4b6c273f496d8fd4eaf18853e6b448760225dc030ff2c485a786859aea6393"
+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 2.0.60",
+ "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 a108599eb6ba2..0f6ed18338a61 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 434af5cb974aa..dbdc54f01b5df 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;
-
- src = fetchPypi {
- inherit pname version;
- hash = "sha256-VipYbbICFrp9K+gmPeuesHnlYEj5uJBtEdX0WqgcUkc=";
+ version = "1.6-unstable-2024-04-11";
+ pyproject = true;
+
+ 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 fa02399bbb6fd..78496380abc1f 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 f97007d13e52f..405a6ea5b3c01 100644
--- a/pkgs/development/python-modules/datalad/default.nix
+++ b/pkgs/development/python-modules/datalad/default.nix
@@ -230,6 +230,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 b6664daa25768..756cd75ed6ad3 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/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix
index 931521c973462..77e9e938c8c4d 100644
--- a/pkgs/development/python-modules/deebot-client/default.nix
+++ b/pkgs/development/python-modules/deebot-client/default.nix
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "deebot-client";
- version = "8.4.1";
+ version = "9.4.0";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "DeebotUniverse";
repo = "client.py";
rev = "refs/tags/${version}";
- hash = "sha256-lOKih1TzZRP4HIGzjmCkALtaz5s/lR2SjjqCnBK0G6Y=";
+ hash = "sha256-hJGE9D0rsYKrd4XZIrOOnwaQlq75Qy4S8681wjr4VDs=";
};
pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix
index e32aab6be8a27..b8c57b379c001 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 edc12e795973b..b46237b1419e2 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 108ec71a29784..43a5c07798013 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/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix
index fa2a2565e9164..a41087b49d6eb 100644
--- a/pkgs/development/python-modules/dnspython/default.nix
+++ b/pkgs/development/python-modules/dnspython/default.nix
@@ -1,4 +1,5 @@
{
+ stdenv,
lib,
aioquic,
buildPythonPackage,
@@ -55,6 +56,11 @@ buildPythonPackage rec {
checkInputs = [ cacert ] ++ optional-dependencies.DNSSEC;
+ # don't run live tests
+ env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+ NO_INTERNET = 1;
+ };
+
disabledTests = [
# dns.exception.SyntaxError: protocol not found
"test_misc_good_WKS_text"
diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix
index 0145773a6e0fe..33eb372a79777 100644
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@@ -4,7 +4,6 @@
buildPythonPackage,
fastimport,
fetchFromGitHub,
- fetchpatch2,
gevent,
geventhttpclient,
git,
@@ -12,7 +11,7 @@
gnupg,
gpgme,
paramiko,
- unittestCheckHook,
+ pytestCheckHook,
pythonOlder,
setuptools,
setuptools-rust,
@@ -20,17 +19,17 @@
}:
buildPythonPackage rec {
- version = "0.22.5";
pname = "dulwich";
- format = "setuptools";
+ version = "0.22.6";
+ pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "jelmer";
repo = "dulwich";
- rev = "refs/tags/dulwich-${version}";
- hash = "sha256-/YqC7y8PU+H2qjPqqzdw6iSSSElK709izLTcs9qbt1I=";
+ tag = "v${version}";
+ hash = "sha256-sE5du5Nv2AOyiBpQ2hDJss1dVSVBzWypnGWk3/hI8UI=";
};
build-system = [
@@ -57,16 +56,20 @@ buildPythonPackage rec {
geventhttpclient
git
glibcLocales
- unittestCheckHook
+ pytestCheckHook
] ++ lib.flatten (lib.attrValues optional-dependencies);
- preCheck = ''
- # requires swift config file
- rm tests/contrib/test_swift_smoke.py
+ pytestFlagsArray = [ "tests" ];
+
+ disabledTests = [
+ # AssertionError: 'C:\\\\foo.bar\\\\baz' != 'C:\\foo.bar\\baz'
+ "test_file_win"
+ ];
- # ImportError: attempted relative import beyond top-level package
- rm tests/test_greenthreads.py
- '';
+ disabledTestPaths = [
+ # requires swift config file
+ "tests/contrib/test_swift_smoke.py"
+ ];
doCheck = !stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/development/python-modules/einops/default.nix b/pkgs/development/python-modules/einops/default.nix
index 4a6dfc6ab777e..0b1fd24a3ac36 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 2e333376bb934..97ef9334cf7ce 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 0904882f0d3e3..a8897a0beed9b 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/elmax-api/default.nix b/pkgs/development/python-modules/elmax-api/default.nix
index 260ee49538cc7..a8ad21f81a7ee 100644
--- a/pkgs/development/python-modules/elmax-api/default.nix
+++ b/pkgs/development/python-modules/elmax-api/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "elmax-api";
- version = "0.0.6.2";
+ version = "0.0.6.3";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "albertogeniola";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-71ewBzAMWncvgXII2VAcbSDwudxqA+MBCl+TCCwTxa4=";
+ hash = "sha256-jnm1AFnPxZIgD815ZFxV/i9ar4cZfsYJ0+xDpM3hKmg=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix
index 88bb8a599aba9..e3f3bb02ade29 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 0000000000000..e0b5b1895fc90
--- /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 eb4cc8a9c1f49..9b6b4e054e6de 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 cb2ff6942eb24..27492073c580f 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 e9ed6eb2e2eae..20ab79f892a0b 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,60 @@ 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
+ email-validator
+ uvicorn
+ ]
+ ++ fastapi-cli.optional-dependencies.standard
+ ++ uvicorn.optional-dependencies.standard;
+ };
+
+ nativeCheckInputs =
[
- httpx
- jinja2
- python-multipart
- itsdangerous
- pyyaml
- ujson
- orjson
- email-validator
- uvicorn
- ]
- ++ lib.optionals (lib.versionAtLeast pydantic.version "2") [
- pydantic-settings
- pydantic-extra-types
+ anyio
+ dirty-equals
+ flask
+ inline-snapshot
+ passlib
+ pyjwt
+ pytestCheckHook
+ pytest-asyncio
+ trio
+ sqlalchemy
]
- ++ uvicorn.optional-dependencies.standard;
-
- nativeCheckInputs = [
- dirty-equals
- flask
- inline-snapshot
- passlib
- pyjwt
- pytestCheckHook
- pytest-asyncio
- trio
- sqlalchemy
- ] ++ optional-dependencies.all;
+ ++ 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 5beafcea7a1c7..79185e3a3c2f3 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 039c2e863ac75..9522b0c4c27e3 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/fjaraskupan/default.nix b/pkgs/development/python-modules/fjaraskupan/default.nix
index c9b1c76df061e..37220b695fb7f 100644
--- a/pkgs/development/python-modules/fjaraskupan/default.nix
+++ b/pkgs/development/python-modules/fjaraskupan/default.nix
@@ -19,11 +19,11 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "elupus";
repo = "fjaraskupan";
- rev = "refs/tags/${version}";
+ tag = version;
hash = "sha256-IKi2kaypwHdK9w+FZlWrreUXBgBgg4y3D8bSJhKHSYo=";
};
- nativeBuildInputs = [ setuptools ];
+ build-system = [ setuptools ];
dependencies = [ bleak ];
diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix
index 4a9de0f4dd6d1..8fe842c2b6a00 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 850dba14f28e1..ac0653a56c9be 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 60ab74a5546ef..4cb3cfbf6c58f 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 c6669b0cfa2cc..2754edce52b59 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 = "pypa";
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
- ];
-
- nativeBuildInputs = [ flit-core ];
+ build-system = [ 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 439592e3a63b6..0000000000000
--- 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/freebox-api/default.nix b/pkgs/development/python-modules/freebox-api/default.nix
index ec5df36417374..9aeb01139bedb 100644
--- a/pkgs/development/python-modules/freebox-api/default.nix
+++ b/pkgs/development/python-modules/freebox-api/default.nix
@@ -11,25 +11,25 @@
buildPythonPackage rec {
pname = "freebox-api";
- version = "1.1.0";
- format = "pyproject";
+ version = "1.2.1";
+ pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "hacf-fr";
- repo = pname;
- rev = "refs/tags/v${version}";
- hash = "sha256-3i9I2RRRxLgyfzegnqjO4g+ad1v4phx6xa8HpWP1cck=";
+ repo = "freebox-api";
+ tag = "v${version}";
+ hash = "sha256-a4d7fjSPBcVlCkY8y7dTLPW949YUg9wD62kQxJRxp0I=";
};
- nativeBuildInputs = [
+ build-system = [
poetry-core
];
pythonRelaxDeps = [ "urllib3" ];
- propagatedBuildInputs = [
+ dependencies = [
aiohttp
urllib3
];
diff --git a/pkgs/development/python-modules/freud/default.nix b/pkgs/development/python-modules/freud/default.nix
index 9fa555e281700..386eb8f9b012e 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
@@ -80,8 +73,12 @@ buildPythonPackage rec {
matplotlib
sympy
];
- disabledTests = lib.optionals stdenv.hostPlatform.isAarch64 [
+ disabledTests = [
# https://github.com/glotzerlab/freud/issues/961
+ #
+ # For x86_64-linux, see:
+ #
+ # https://github.com/glotzerlab/freud/issues/961#issuecomment-2553344968
"test_docstring"
];
# On top of cd $out due to https://github.com/NixOS/nixpkgs/issues/255262 ,
diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix
index 9d1fded19c1b6..e36d8412ee204 100644
--- a/pkgs/development/python-modules/fs/default.nix
+++ b/pkgs/development/python-modules/fs/default.nix
@@ -4,7 +4,6 @@
appdirs,
buildPythonPackage,
fetchPypi,
- glibcLocales,
mock,
psutil,
pyftpdlib,
@@ -30,13 +29,10 @@ buildPythonPackage rec {
build-system = [ setuptools ];
- buildInputs = [ glibcLocales ];
-
dependencies = [
six
appdirs
pytz
- setuptools
];
nativeCheckInputs = [
@@ -52,23 +48,28 @@ buildPythonPackage rec {
HOME=$(mktemp -d)
'';
- # strong cycle with parameterized
- doCheck = false;
-
- pytestFlagsArray = [ "--ignore=tests/test_opener.py" ];
+ disabledTestPaths = [
+ # Circular dependency with parameterized
+ "tests/test_move.py"
+ "tests/test_mirror.py"
+ "tests/test_copy.py"
+ ];
disabledTests =
- [ "user_data_repr" ]
+ [
+ "user_data_repr"
+ # https://github.com/PyFilesystem/pyfilesystem2/issues/568
+ "test_remove"
+ # Tests require network access
+ "TestFTPFS"
+ ]
++ lib.optionals (stdenv.hostPlatform.isDarwin) [
# remove if https://github.com/PyFilesystem/pyfilesystem2/issues/430#issue-707878112 resolved
"test_ftpfs"
- ]
- ++ lib.optionals (pythonAtLeast "3.9") [
- # update friend version of this commit: https://github.com/PyFilesystem/pyfilesystem2/commit/3e02968ce7da7099dd19167815c5628293e00040
- # merged into master, able to be removed after >2.4.1
- "test_copy_sendfile"
];
+ pythonImportsCheck = [ "fs" ];
+
__darwinAllowLocalNetworking = true;
meta = with lib; {
diff --git a/pkgs/development/python-modules/future/default.nix b/pkgs/development/python-modules/future/default.nix
index 47ed954e1b1a1..730274bc19d3b 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/fyta-cli/default.nix b/pkgs/development/python-modules/fyta-cli/default.nix
index ad3a255e58c0f..f9a6755423324 100644
--- a/pkgs/development/python-modules/fyta-cli/default.nix
+++ b/pkgs/development/python-modules/fyta-cli/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "fyta-cli";
- version = "0.6.10";
+ version = "0.7.0";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "dontinelli";
repo = "fyta_cli";
rev = "refs/tags/v${version}";
- hash = "sha256-sPbN6gMPtNzYTYQ5F8w59m5DKobx/TV6v5v8Q9u1rXQ=";
+ hash = "sha256-OgpQh7WyZynFd308TjIGkQNoy8TFu9gynbDiLueqB/0=";
};
build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/gardena-bluetooth/default.nix b/pkgs/development/python-modules/gardena-bluetooth/default.nix
index b80c83d774c7e..20da572ce8b06 100644
--- a/pkgs/development/python-modules/gardena-bluetooth/default.nix
+++ b/pkgs/development/python-modules/gardena-bluetooth/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "gardena-bluetooth";
- version = "1.4.4";
+ version = "1.5.0";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -22,8 +22,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "elupus";
repo = "gardena-bluetooth";
- rev = "refs/tags/${version}";
- hash = "sha256-BV4chGkVp9H7gJQGKQZ0e4IiizMjCbDAU5MMf7hS9mE=";
+ tag = version;
+ hash = "sha256-U/Spy9Jc86BJ4AokqdWFRlZ4nOHIFTQ8aphK/xhofWg=";
};
build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/geojson/default.nix b/pkgs/development/python-modules/geojson/default.nix
index a8c1ea9990776..eb070e8234a95 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/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix
index 35dd5b86b9fbc..b7b77f32137f9 100644
--- a/pkgs/development/python-modules/google-auth/default.nix
+++ b/pkgs/development/python-modules/google-auth/default.nix
@@ -27,7 +27,7 @@
buildPythonPackage rec {
pname = "google-auth";
- version = "2.35.0";
+ version = "2.36.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_auth";
inherit version;
- hash = "sha256-9MZO1OAejotkbvNMAY+L8zON8MjjfYs7ukDn9XSjJ4o=";
+ hash = "sha256-VF6WGPLfC8u33LxFpUZIWxISYkcWl1oepa6BSc52mrE=";
};
nativeBuildInputs = [ setuptools ];
@@ -85,6 +85,11 @@ buildPythonPackage rec {
"google.oauth2"
];
+ pytestFlagsArray = [
+ # cryptography 44 compat issue
+ "--deselect=tests/transport/test__mtls_helper.py::TestDecryptPrivateKey::test_success"
+ ];
+
disabledTestPaths = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
# Disable tests using pyOpenSSL as it does not build on M1 Macs
"tests/transport/test__mtls_helper.py"
diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix
index c03a2d944d562..003049ab525a2 100644
--- a/pkgs/development/python-modules/google-nest-sdm/default.nix
+++ b/pkgs/development/python-modules/google-nest-sdm/default.nix
@@ -55,6 +55,8 @@ buildPythonPackage rec {
disabledTests = [
"test_clip_preview_transcode"
"test_event_manager_event_expiration_with_transcode"
+ # AssertionError: assert '12345' == 12345
+ "test_info_traits_type_error"
];
meta = with lib; {
diff --git a/pkgs/development/python-modules/gpgme/default.nix b/pkgs/development/python-modules/gpgme/default.nix
new file mode 100644
index 0000000000000..18604bf1d5351
--- /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 0000000000000..d314ad329d19c
--- /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 a9fe91656bec2..05b8098aa6398 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 d652f9002c6c3..2521c23eb0cc0 100644
--- a/pkgs/development/python-modules/graph-tool/default.nix
+++ b/pkgs/development/python-modules/graph-tool/default.nix
@@ -4,7 +4,7 @@
fetchurl,
stdenv,
- boost185,
+ boost,
cairomm,
cgal,
expat,
@@ -25,8 +25,7 @@
}:
let
- # graph-tool doesn't build against boost181 on Darwin
- boost = boost185.override {
+ boost' = boost.override {
enablePython = true;
inherit python;
};
@@ -50,7 +49,7 @@ buildPythonPackage rec {
configureFlags = [
"--with-python-module-path=$(out)/${python.sitePackages}"
- "--with-boost-libdir=${boost}/lib"
+ "--with-boost-libdir=${boost'}/lib"
"--with-cgal=${cgal}"
];
@@ -60,7 +59,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 57043658c744c..1b8fa37aa5e7f 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/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix
index c1e6a20f17bfa..8a1517b6b9795 100644
--- a/pkgs/development/python-modules/grpcio-channelz/default.nix
+++ b/pkgs/development/python-modules/grpcio-channelz/default.nix
@@ -12,13 +12,13 @@
# nixpkgs-update: no auto update
buildPythonPackage rec {
pname = "grpcio-channelz";
- version = "1.67.0";
+ version = "1.68.1";
pyproject = true;
src = fetchPypi {
pname = "grpcio_channelz";
inherit version;
- hash = "sha256-F2Jfq6lOYn4RsjP9Ay21G67F6HkGeY3SIEk26Z0BWnE=";
+ hash = "sha256-6+mxJ3RTBtsXB7y46w3Fa5R8O2FnKbWde0UeJjnsttI=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix
index ff73160db9a85..75249187dab7e 100644
--- a/pkgs/development/python-modules/grpcio-health-checking/default.nix
+++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix
@@ -11,13 +11,13 @@
# nixpkgs-update: no auto update
buildPythonPackage rec {
pname = "grpcio-health-checking";
- version = "1.67.0";
+ version = "1.68.1";
format = "setuptools";
src = fetchPypi {
pname = "grpcio_health_checking";
inherit version;
- hash = "sha256-PepxXVboJQ/wW6Se9RF/g2skD/N5vkY2DCbO/ZydsRo=";
+ hash = "sha256-6pNs+gxkokr9gAWHPqYbGsyDqUHAC1amM5ybIlyAoag=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix
index b00a0bb51b739..eb6ba8dcbd475 100644
--- a/pkgs/development/python-modules/grpcio-reflection/default.nix
+++ b/pkgs/development/python-modules/grpcio-reflection/default.nix
@@ -12,13 +12,13 @@
# nixpkgs-update: no auto update
buildPythonPackage rec {
pname = "grpcio-reflection";
- version = "1.67.0";
+ version = "1.68.1";
pyproject = true;
src = fetchPypi {
pname = "grpcio_reflection";
inherit version;
- hash = "sha256-xHFDc4sYl7bOSvXg4zjIXJruX9y7M1XTaKjcrkbYkzw=";
+ hash = "sha256-z/yzPEy93ncaBv1Vym/hScb4nsMwyaQBBzC7KZhZeYI=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix
index 27de864281cb3..2dec36e979fa7 100644
--- a/pkgs/development/python-modules/grpcio-status/default.nix
+++ b/pkgs/development/python-modules/grpcio-status/default.nix
@@ -13,7 +13,7 @@
# nixpkgs-update: no auto update
buildPythonPackage rec {
pname = "grpcio-status";
- version = "1.67.0";
+ version = "1.68.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "grpcio_status";
inherit version;
- hash = "sha256-w+Wob6AH6eJjzV+YioqQdITaTKq1godOoqSmCSc0BGs=";
+ hash = "sha256-4TeNA2yBoWENe0x6FGzWY90T/MkVz019BTkp26W7tuE=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix
index 1a174b5ba5872..cf121cce3e6c6 100644
--- a/pkgs/development/python-modules/grpcio-testing/default.nix
+++ b/pkgs/development/python-modules/grpcio-testing/default.nix
@@ -13,7 +13,7 @@
# nixpkgs-update: no auto update
buildPythonPackage rec {
pname = "grpcio-testing";
- version = "1.67.0";
+ version = "1.68.1";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "grpcio_testing";
inherit version;
- hash = "sha256-YVRnu0aObDSfYCIKlrvMKin70hmwDdip96I+Qyi7+Dw=";
+ hash = "sha256-tK6vhvVlqPiCMxfwUVLABuVZDnfPafmCDtmzdb/WHrM=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix
index 51b1012a972e7..29e206098294f 100644
--- a/pkgs/development/python-modules/grpcio-tools/default.nix
+++ b/pkgs/development/python-modules/grpcio-tools/default.nix
@@ -12,13 +12,13 @@
# nixpkgs-update: no auto update
buildPythonPackage rec {
pname = "grpcio-tools";
- version = "1.67.0";
+ version = "1.68.1";
pyproject = true;
src = fetchPypi {
pname = "grpcio_tools";
inherit version;
- hash = "sha256-GBs9TmG4MULBguw2bzB5sAI1CXQ5huVMlGXKOMrCVfg=";
+ hash = "sha256-JBOhetFsnIIbNuSmf8ZMN7nkY2qxw6B3eAGIATeHObo=";
};
outputs = [
diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix
index c8c98cd8a0315..002d5dde36d64 100644
--- a/pkgs/development/python-modules/grpcio/default.nix
+++ b/pkgs/development/python-modules/grpcio/default.nix
@@ -18,14 +18,14 @@
# nixpkgs-update: no auto update
buildPythonPackage rec {
pname = "grpcio";
- version = "1.67.0";
+ version = "1.68.1";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
- hash = "sha256-4JCyVT4Noch1RJyOdQc91EFd1xyb3mpAYkD99MDuRnw=";
+ hash = "sha256-RKhQLdXeZTrmpz4t5QpAHYQYTwMx0Kw9rrBE5m1cUFQ=";
};
outputs = [
diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix
index 88d51e88c33e4..daaca34ca082c 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/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix
index 5c0b7f3146e7d..8b744206d1481 100644
--- a/pkgs/development/python-modules/gst-python/default.nix
+++ b/pkgs/development/python-modules/gst-python/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "gst-python";
- version = "1.24.7";
+ version = "1.24.10";
format = "other";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/gst-python/${pname}-${version}.tar.xz";
- hash = "sha256-bD7gKyDICobiQkWwYQLa4A4BdobydAdib0TcA6w8pTo=";
+ hash = "sha256-E1vPi28UaLwx5WYECf6O04EJ8B3sRHQ1FKovprOGMwk";
};
# Python 2.x is not supported.
diff --git a/pkgs/development/python-modules/gstools/default.nix b/pkgs/development/python-modules/gstools/default.nix
index e110489539863..136c79b2d67e3 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/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix
index 63a93a7ed5b70..11fb16c44a6fb 100644
--- a/pkgs/development/python-modules/hahomematic/default.nix
+++ b/pkgs/development/python-modules/hahomematic/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "hahomematic";
- version = "2024.12.0";
+ version = "2024.12.5";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = "hahomematic";
rev = "refs/tags/${version}";
- hash = "sha256-RLgJiapsRM8dMA4+T2S6DkSFjo+YBmVVpo1mOVKJ7EI=";
+ hash = "sha256-jC9IXkl80pspqc9m0U6mspp5QSGG6u9Y6ANMK8WAG5s=";
};
__darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix
index 30b18f8303663..5fe012e549664 100644
--- a/pkgs/development/python-modules/hassil/default.nix
+++ b/pkgs/development/python-modules/hassil/default.nix
@@ -17,7 +17,7 @@
let
pname = "hassil";
- version = "1.7.4";
+ version = "2.0.5";
in
buildPythonPackage {
inherit pname version;
@@ -28,8 +28,8 @@ buildPythonPackage {
src = fetchFromGitHub {
owner = "home-assistant";
repo = "hassil";
- rev = "refs/tags/${version}";
- hash = "sha256-FRP5iVE2KBiHVriWhnYxWFff0y4q2/gC9iO8ZzN3AbI=";
+ tag = "v${version}";
+ hash = "sha256-e6Y0GGURGKzbX1dniBbYEJB9K3/R84n3UmnMO0HPPPo=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix
index 069cd5374b4c3..19daf7262e188 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/hdate/default.nix b/pkgs/development/python-modules/hdate/default.nix
index 9fe99f93b30e5..ae3cd23b34265 100644
--- a/pkgs/development/python-modules/hdate/default.nix
+++ b/pkgs/development/python-modules/hdate/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "hdate";
- version = "0.10.11";
+ version = "0.11.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "py-libhdate";
repo = "py-libhdate";
rev = "refs/tags/v${version}";
- hash = "sha256-HmdXTvtNiIE2XPFhqs7WpcceEQU7F7RsLFp6/+63yDw=";
+ hash = "sha256-Il20aKOPQi4J4hWQEMEQOnLdBSHCOu214YE6pxeYbfI=";
};
pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/httpie/default.nix b/pkgs/development/python-modules/httpie/default.nix
index c5d776302319f..3f6acefbe5b79 100644
--- a/pkgs/development/python-modules/httpie/default.nix
+++ b/pkgs/development/python-modules/httpie/default.nix
@@ -94,6 +94,8 @@ buildPythonPackage rec {
disabledTests =
[
+ # argparse output changed
+ "test_naked_invocation"
# Test is flaky
"test_stdin_read_warning"
# httpbin compatibility issues
diff --git a/pkgs/development/python-modules/httptools/default.nix b/pkgs/development/python-modules/httptools/default.nix
index c6d2c176a5f6d..65537e346929f 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/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix
index f4572167049ff..8ce19e3c1e0ac 100644
--- a/pkgs/development/python-modules/httpx/default.nix
+++ b/pkgs/development/python-modules/httpx/default.nix
@@ -100,6 +100,8 @@ buildPythonPackage rec {
# httpcore.ConnectError: [Errno -2] Name or service not known
"test_async_proxy_close"
"test_sync_proxy_close"
+ # ResourceWarning: Async generator 'httpx._content.ByteStream.__aiter__' was garbage collected before it had been exhausted. Surround its use in 'async with aclosing(...):' to ensure that it gets cleaned up as soon as you're done using it.
+ "test_write_timeout" # trio variant
];
disabledTestPaths = [ "tests/test_main.py" ];
diff --git a/pkgs/development/python-modules/hug/default.nix b/pkgs/development/python-modules/hug/default.nix
deleted file mode 100644
index 2bd9cc3a20db3..0000000000000
--- 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/immutables/default.nix b/pkgs/development/python-modules/immutables/default.nix
index 8ea8d2a890201..e2be3e56c7446 100644
--- a/pkgs/development/python-modules/immutables/default.nix
+++ b/pkgs/development/python-modules/immutables/default.nix
@@ -2,28 +2,31 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+ setuptools,
pytestCheckHook,
pythonOlder,
}:
buildPythonPackage rec {
pname = "immutables";
- version = "0.20";
- format = "setuptools";
+ version = "0.21";
+ pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "MagicStack";
- repo = pname;
+ repo = "immutables";
rev = "refs/tags/v${version}";
- hash = "sha256-fEECtP6WQVzwSzBYX+CbhQtzkB/1WC3OYKXk2XY//xA=";
+ hash = "sha256-wZuCZEVXzycqA/h27RIe59e2QQALem8mfb3EdjwQr9w=";
};
postPatch = ''
rm tests/conftest.py
'';
+ build-system = [ setuptools ];
+
nativeCheckInputs = [ pytestCheckHook ];
disabledTests = [
diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix
index b9f05dda461c7..529f03a806ead 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 c3c65ae3184fa..ae013099ba753 100644
--- a/pkgs/development/python-modules/inkex/default.nix
+++ b/pkgs/development/python-modules/inkex/default.nix
@@ -17,6 +17,7 @@
gobject-introspection,
pytestCheckHook,
gtk3,
+ fetchpatch2,
}:
buildPythonPackage {
@@ -27,8 +28,20 @@ buildPythonPackage {
inherit (inkscape) src;
+ patches = [
+ (fetchpatch2 {
+ name = "add-numpy-2-support.patch";
+ url = "https://gitlab.com/inkscape/extensions/-/commit/13ebc1e957573fea2c3360f676b0f1680fad395d.patch";
+ hash = "sha256-0n8L8dUaYYPBsmHlAxd60c5zqfK6NmXJfWZVBXPbiek=";
+ stripLen = 1;
+ extraPrefix = "share/extensions/";
+ })
+ ];
+
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 84123590fe1b2..9d140f2bebfa2 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/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix
index 45cd52fdbac30..7a14e5f144d34 100644
--- a/pkgs/development/python-modules/ipython/default.nix
+++ b/pkgs/development/python-modules/ipython/default.nix
@@ -3,6 +3,7 @@
stdenv,
buildPythonPackage,
fetchPypi,
+ pythonAtLeast,
pythonOlder,
# Build dependencies
@@ -42,13 +43,13 @@
buildPythonPackage rec {
pname = "ipython";
- version = "8.29.0";
+ version = "8.30.0";
pyproject = true;
disabled = pythonOlder "3.10";
src = fetchPypi {
inherit pname version;
- hash = "sha256-QLYOFbIlkUUO73PkCgJ893vWUudXUj7rxb18fEmCkOs=";
+ hash = "sha256-ywpAWjBtKZWly7mQGJTSQHhKnzQTlMa6P0/oxuuJ/24=";
};
build-system = [ setuptools ];
@@ -102,6 +103,11 @@ buildPythonPackage rec {
# UnboundLocalError: local variable 'child' referenced before assignment
"test_system_interrupt"
]
+ ++ lib.optionals (pythonAtLeast "3.13") [
+ # AttributeError: 'Pdb' object has no attribute 'curframe'. Did you mean: 'botframe'?
+ "test_run_debug_twice"
+ "test_run_debug_twice_with_breakpoint"
+ ]
++ lib.optionals (stdenv.hostPlatform.isDarwin) [
# FileNotFoundError: [Errno 2] No such file or directory: 'pbpaste'
"test_clipboard_get"
diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix
index b88dc9311e91b..8e31fe41c7805 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=";
- })
- ];
-
- nativeBuildInputs = [ setuptools ];
+ build-system = [ 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/kivy/default.nix b/pkgs/development/python-modules/kivy/default.nix
index 26a1bba38bcef..273de9cca3dad 100644
--- a/pkgs/development/python-modules/kivy/default.nix
+++ b/pkgs/development/python-modules/kivy/default.nix
@@ -7,7 +7,6 @@
cython_0,
docutils,
kivy-garden,
- mesa,
mtdev,
SDL2,
SDL2_image,
@@ -50,7 +49,6 @@ buildPythonPackage rec {
SDL2_mixer
]
++ lib.optionals stdenv.hostPlatform.isLinux [
- mesa
mtdev
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/development/python-modules/mashumaro/default.nix b/pkgs/development/python-modules/mashumaro/default.nix
index 2b28c29da244a..67cf71886726e 100644
--- a/pkgs/development/python-modules/mashumaro/default.nix
+++ b/pkgs/development/python-modules/mashumaro/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "mashumaro";
- version = "3.14";
+ version = "3.15";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "Fatal1ty";
repo = "mashumaro";
rev = "refs/tags/v${version}";
- hash = "sha256-0THj22KdMvD5O3dNwXKxs2wRIJziPmojLo4BPa3fZ3Y=";
+ hash = "sha256-Zv2FijxYOLGflJ3bc3udkM3SXgHHzHIeCGHlfybyLGE=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index f07acb53dc695..437bd302e3e2b 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/millheater/default.nix b/pkgs/development/python-modules/millheater/default.nix
index 2df73f98ce004..b36bffd9eedd3 100644
--- a/pkgs/development/python-modules/millheater/default.nix
+++ b/pkgs/development/python-modules/millheater/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "millheater";
- version = "012.2";
+ version = "0.12.2";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "Danielhiversen";
repo = "pymill";
- tag = version;
+ tag = "012.2"; # https://github.com/Danielhiversen/pymill/issues/87
hash = "sha256-tR6MZIgCazGcXRIaSXyDYIEp+kD6xyrpOXORbi8LV7E=";
};
diff --git a/pkgs/development/python-modules/ml-dtypes/default.nix b/pkgs/development/python-modules/ml-dtypes/default.nix
index b23ca450327cd..1b8b581267c38 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 e9eed7317097b..ef838c9196e7b 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 e4cee7571da9e..60eddaf3ba6ae 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 1af1b9814a160..30f821da7385f 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 46ccd9bfa8f3a..ff4aa63698db4 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/music-assistant-client/default.nix b/pkgs/development/python-modules/music-assistant-client/default.nix
new file mode 100644
index 0000000000000..e7fbccced4485
--- /dev/null
+++ b/pkgs/development/python-modules/music-assistant-client/default.nix
@@ -0,0 +1,49 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+
+ # build-system
+ setuptools,
+
+ # dependencies
+ aiohttp,
+ music-assistant-models,
+ orjson,
+
+}:
+
+buildPythonPackage rec {
+ pname = "music-assistant-client";
+ version = "1.0.8";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "music-assistant";
+ repo = "client";
+ rev = version;
+ hash = "sha256-QE2PQeXCAq7+iMomCZK+UmrPUApJxwKi/pzCaLJVS/4=";
+ };
+
+ build-system = [ setuptools ];
+
+ dependencies = [
+ aiohttp
+ music-assistant-models
+ orjson
+ ];
+
+ doCheck = false; # no tests
+
+ pythonImportsCheck = [
+ "music_assistant_client"
+ ];
+
+ meta = {
+ description = "Python client to interact with the Music Assistant Server API";
+ homepage = "https://github.com/music-assistant/client";
+ changelog = "https://github.com/music-assistant/client/blob/${src.rev}/CHANGELOG.md";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ ];
+ };
+}
diff --git a/pkgs/development/python-modules/music-assistant-models/default.nix b/pkgs/development/python-modules/music-assistant-models/default.nix
new file mode 100644
index 0000000000000..58e4348622b05
--- /dev/null
+++ b/pkgs/development/python-modules/music-assistant-models/default.nix
@@ -0,0 +1,58 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+
+ # build-system
+ setuptools,
+
+ # dependencies
+ mashumaro,
+ orjson,
+
+ # tests
+ pytestCheckHook,
+ pytest-cov-stub,
+}:
+
+buildPythonPackage rec {
+ pname = "music-assistant-models";
+ version = "1.1.3";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "music-assistant";
+ repo = "models";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-FbnwUfAwCwwBKqEUtb2ZBxHehFwJdr9YkuWKox018BY=";
+ };
+
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace-fail "0.0.0" "${version}"
+ '';
+
+ build-system = [ setuptools ];
+
+ dependencies = [
+ mashumaro
+ orjson
+ ];
+
+ nativeCheckInputs = [
+ pytest-cov-stub
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "music_assistant_models"
+ ];
+
+ meta = {
+ description = "Models used by Music Assistant (shared by client and server";
+ homepage = "https://github.com/music-assistant/models";
+ changelog = "https://github.com/music-assistant/models/blob/${src.rev}/CHANGELOG.md";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ ];
+ };
+}
diff --git a/pkgs/development/python-modules/mxnet/default.nix b/pkgs/development/python-modules/mxnet/default.nix
index 3b9f692d72054..75f9ff5391467 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 e43f0e1bd1a29..022f29733f83c 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 870b0dba10883..d13414c125673 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 e6eb3344e8d9a..7c31e3e4acc70 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 4c6d46e6d4706..46ffe613f695c 100644
--- a/pkgs/development/python-modules/nbmake/default.nix
+++ b/pkgs/development/python-modules/nbmake/default.nix
@@ -50,12 +50,20 @@ buildPythonPackage rec {
pythonImportsCheck = [ "nbmake" ];
+ # tests are prone to race conditions under high parallelism
+ # https://github.com/treebeardtech/nbmake/issues/129
+ pytestFlagsArray = [ "--maxprocesses=4" ];
+
nativeCheckInputs = [
pytest-xdist
pytestCheckHook
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 056949ef2f971..7f49fed39528a 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/nice-go/default.nix b/pkgs/development/python-modules/nice-go/default.nix
index 6e80edf9ba4d0..9d70d035bc651 100644
--- a/pkgs/development/python-modules/nice-go/default.nix
+++ b/pkgs/development/python-modules/nice-go/default.nix
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "nice-go";
- version = "0.3.10";
+ version = "1.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "IceBotYT";
repo = "nice-go";
- rev = "refs/tags/${version}";
- hash = "sha256-LPH6U0D/JSi8zASlirfkNgfWOh/ArPHoccniNjy2hJc=";
+ tag = version;
+ hash = "sha256-u4AhFYhRYwcAGUrXhUgP+SgR0aoric864qSyWhc7Gmo=";
};
build-system = [ poetry-core ];
@@ -50,7 +50,7 @@ buildPythonPackage rec {
];
meta = {
- changelog = "https://github.com/IceBotYT/nice-go/blob/${src.rev}/CHANGELOG.md";
+ changelog = "https://github.com/IceBotYT/nice-go/blob/${src.tag}/CHANGELOG.md";
description = "Control various Nice access control products";
homepage = "https://github.com/IceBotYT/nice-go";
license = lib.licenses.mit;
diff --git a/pkgs/development/python-modules/nitime/default.nix b/pkgs/development/python-modules/nitime/default.nix
index 35b8eb4c46fc0..d6295005e6935 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 24376e28863f3..7624e396b9deb 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 = [ "rich" ];
+ pythonRelaxDeps = [
+ "numpy"
+ "rich"
+ ];
- propagatedBuildInputs = [
+ dependencies = [
filterpy
importlib-metadata
numpy
diff --git a/pkgs/development/python-modules/nox/default.nix b/pkgs/development/python-modules/nox/default.nix
index 760687f0bc84d..b9bdd21ad3826 100644
--- a/pkgs/development/python-modules/nox/default.nix
+++ b/pkgs/development/python-modules/nox/default.nix
@@ -29,6 +29,11 @@ buildPythonPackage rec {
hash = "sha256-GdNz34A8IKwPG/270sY5t3SoggGCZMWfDq/Wyhk0ez8=";
};
+ patches = [
+ # Backport of https://github.com/wntrblm/nox/pull/903, which can be removed on next release
+ ./fix-broken-mock-on-cpython-3.12.8.patch
+ ];
+
build-system = [ hatchling ];
dependencies =
diff --git a/pkgs/development/python-modules/nox/fix-broken-mock-on-cpython-3.12.8.patch b/pkgs/development/python-modules/nox/fix-broken-mock-on-cpython-3.12.8.patch
new file mode 100644
index 0000000000000..f634c3534b93a
--- /dev/null
+++ b/pkgs/development/python-modules/nox/fix-broken-mock-on-cpython-3.12.8.patch
@@ -0,0 +1,35 @@
+diff --git a/nox/command.py b/nox/command.py
+index 671875c..4984168 100644
+--- a/nox/command.py
++++ b/nox/command.py
+@@ -30,6 +30,8 @@ TYPE_CHECKING = False
+ if TYPE_CHECKING:
+ from typing import IO
+
++_PLATFORM = sys.platform
++
+ ExternalType = Literal["error", True, False]
+
+
+@@ -63,7 +65,7 @@ def _clean_env(env: Mapping[str, str | None] | None = None) -> dict[str, str] |
+ clean_env = {k: v for k, v in env.items() if v is not None}
+
+ # Ensure systemroot is passed down, otherwise Windows will explode.
+- if sys.platform == "win32":
++ if _PLATFORM.startswith("win"):
+ clean_env.setdefault("SYSTEMROOT", os.environ.get("SYSTEMROOT", ""))
+
+ return clean_env
+diff --git a/tests/test_command.py b/tests/test_command.py
+index ae398e9..904cf34 100644
+--- a/tests/test_command.py
++++ b/tests/test_command.py
+@@ -157,7 +157,7 @@ def test_run_env_remove(monkeypatch):
+ )
+
+
+-@mock.patch("sys.platform", "win32")
++@mock.patch("nox.command._PLATFORM", "win32")
+ def test_run_env_systemroot():
+ systemroot = os.environ.setdefault("SYSTEMROOT", "sigil")
+
diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index 18bd264c5d76f..b9a3e734a5808 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 403d5ea16051a..e7d2a690f1409 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 3681e0d9c73a5..bda5304a69c04 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 795f24e5eefa9..fad35559c9eda 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 5acc21db4538d..eb672a053f257 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.2.0";
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-FA3YD/iYGlg6YJgL4aZVBo+K3r96RaBqaFjIc/zc1KA=";
};
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 fbbc8a6a1ad92..ea504ea4f6210 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 bdd104518852b..de84c59b59b86 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/openstackdocstheme/default.nix b/pkgs/development/python-modules/openstackdocstheme/default.nix
index 7391fb37ba7a8..c0e75fcab9b93 100644
--- a/pkgs/development/python-modules/openstackdocstheme/default.nix
+++ b/pkgs/development/python-modules/openstackdocstheme/default.nix
@@ -14,8 +14,7 @@ buildPythonPackage rec {
version = "3.4.0";
pyproject = true;
- # breaks on import due to distutils import through pbr.packaging
- disabled = pythonAtLeast "3.12";
+ disabled = pythonAtLeast "3.13";
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix
index 98ce76ed1480d..5476d86dab190 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 4ddebe8901df2..e93e3680351bf 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 ec6bf13686dab..a20a723b92c64 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 8af2b491701d1..62663c9cd9da7 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 d5acbee88521b..5db6c74916f1b 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/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix
index bd45d03af8928..d500a215be114 100644
--- a/pkgs/development/python-modules/pbr/default.nix
+++ b/pkgs/development/python-modules/pbr/default.nix
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
callPackage,
+ distutils,
fetchPypi,
setuptools,
six,
@@ -20,6 +21,7 @@ buildPythonPackage rec {
build-system = [ setuptools ];
dependencies = [
+ distutils # for distutils.command in pbr/packaging.py
setuptools # for pkg_resources
six
];
diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix
index cd49841eecad5..0a22016c926ff 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 f81ba4f5ec4d4..bfe057b3796f8 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 da280313c9e9c..6c1cea184fd7a 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/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix
index caa81ce9720b2..e82da56c95b45 100644
--- a/pkgs/development/python-modules/pillow-heif/default.nix
+++ b/pkgs/development/python-modules/pillow-heif/default.nix
@@ -40,6 +40,8 @@ buildPythonPackage rec {
postPatch = ''
sed -i '/addopts/d' pyproject.toml
+ substituteInPlace setup.py \
+ --replace-warn ', "-Werror"' ""
'';
nativeBuildInputs = [
@@ -60,9 +62,6 @@ buildPythonPackage rec {
];
env = {
- # clang-16: error: argument unused during compilation: '-fno-strict-overflow'
- NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";
-
RELEASE_FULL_FLAG = 1;
};
diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix
index 1339b39505a9b..e480d1657875e 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 9b7f52670ae46..734c57e69560f 100644
--- a/pkgs/development/python-modules/pkginfo/default.nix
+++ b/pkgs/development/python-modules/pkginfo/default.nix
@@ -2,8 +2,8 @@
lib,
buildPythonPackage,
fetchPypi,
- pytestCheckHook,
setuptools,
+ pytestCheckHook,
}:
buildPythonPackage rec {
@@ -21,6 +21,7 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
disabledTests = [
+ # wheel metadata version mismatch 2.1 vs 2.3
"test_installed_ctor_w_dist_info"
];
diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index ab177fa01b326..9823c41c4fec9 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 9d361a3ff11c0..196b93dc224a3 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 7dc515ef6fee8..143b27953077e 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 8e0cc3cc7a515..66de9b48e848a 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.1";
pyproject = true;
src = fetchPypi {
inherit pname version;
- hash = "sha256-ZLrbxJGApeQB83P5znqx0Ytj991KnNxDySufC0gc73s=";
+ hash = "sha256-aDvgLKIab/6A223QLAtbKJIyLFnKV/1shy1lLLgFScs=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix
index ee3f390b79af3..ee79e250e1d72 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 7cba53cb3ec09..33cc96524f567 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 aaab94547a02c..5b8501a29cdb7 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 a94abf72712a2..e9c48fe6c51d9 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 ba171e372c8b5..46a1151edd045 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/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix
index 43432a2d1428d..649b751bea4a4 100644
--- a/pkgs/development/python-modules/pyatv/default.nix
+++ b/pkgs/development/python-modules/pyatv/default.nix
@@ -8,7 +8,6 @@
deepdiff,
fetchFromGitHub,
ifaddr,
- mediafile,
miniaudio,
protobuf,
pydantic,
@@ -19,7 +18,6 @@
pytest-timeout,
pytestCheckHook,
pythonAtLeast,
- pythonOlder,
requests,
setuptools,
srptools,
@@ -34,8 +32,6 @@ buildPythonPackage rec {
version = "0.16.0";
pyproject = true;
- disabled = pythonOlder "3.8";
-
src = fetchFromGitHub {
owner = "postlund";
repo = "pyatv";
@@ -55,7 +51,6 @@ buildPythonPackage rec {
"chacha20poly1305-reuseable"
"cryptography"
"ifaddr"
- "mediafile"
"miniaudio"
"protobuf"
"requests"
@@ -71,7 +66,6 @@ buildPythonPackage rec {
chacha20poly1305-reuseable
cryptography
ifaddr
- mediafile
miniaudio
protobuf
pydantic
diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix
index 140a13f6678dc..b94d55236f824 100644
--- a/pkgs/development/python-modules/pydaikin/default.nix
+++ b/pkgs/development/python-modules/pydaikin/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "pydaikin";
- version = "2.13.7";
+ version = "2.13.8";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "fredrike";
repo = "pydaikin";
rev = "refs/tags/v${version}";
- hash = "sha256-pLr878LbflRlHzDjarwDLQFHbRZjRvlAZEqP1tfVBNA=";
+ hash = "sha256-folK2uZN2HtSXpRuhuHV42r1KrNWZX0ai/XO2OE8UFs=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pydantic-core/default.nix b/pkgs/development/python-modules/pydantic-core/default.nix
index 716d9584b0d6d..9e71bbec8a875 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 9e008f9565e1d..bb5ba289d5f56 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/pydeako/default.nix b/pkgs/development/python-modules/pydeako/default.nix
index 6fabf92f5f84b..c386ed1a567ee 100644
--- a/pkgs/development/python-modules/pydeako/default.nix
+++ b/pkgs/development/python-modules/pydeako/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pydeako";
- version = "0.5.4";
+ version = "0.6.0";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "DeakoLights";
repo = "pydeako";
rev = "refs/tags/${version}";
- hash = "sha256-Z0H5VhWfjmvvCGTX//hds9dwk2wJSPXckNac1PkQZNA=";
+ hash = "sha256-GEYuVKE3DOXJzCqTW2Ngoi6l0e4JvE9lUnZtjrNXTVk=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pydevd/default.nix b/pkgs/development/python-modules/pydevd/default.nix
index 207e5e5c9edfd..20264af548657 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 3cad1aafe06c3..594ee6bd5c835 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 68e5f7d97496e..e5bd3e20e5be3 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 aaf9e961cb23b..4550ca77e02bc 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/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix
index f9310c711e5f3..a9f0ad9ae17ab 100644
--- a/pkgs/development/python-modules/pygit2/default.nix
+++ b/pkgs/development/python-modules/pygit2/default.nix
@@ -6,6 +6,7 @@
cached-property,
cffi,
fetchPypi,
+ fetchpatch,
isPyPy,
libgit2,
pycparser,
@@ -26,6 +27,14 @@ buildPythonPackage rec {
hash = "sha256-eymmeWuqFfyJ1EOsjVF3VBHZseWwbcQNRYxWyFdrSKI=";
};
+ patches = [
+ # fix for GCC 14
+ (fetchpatch {
+ url = "https://github.com/libgit2/pygit2/commit/eba710e45bb40e18641c6531394bb46631e7f295.patch";
+ hash = "sha256-GFFzGVd/9+AcwicwOtBghhonijMp08svXTUZ/4/LmtI=";
+ })
+ ];
+
preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
export DYLD_LIBRARY_PATH="${libgit2}/lib"
'';
diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix
index daffbcb6d70c0..7488891a717eb 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 f169201b2cc54..db1452a614513 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 2b133f061bf32..6074b06b0bdcf 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 a8589e0af77c8..80bcf8c6117b5 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 5e224805d14dd..f5e1da3ce897b 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 4d9ecb6152c2d..ecb51cbebdda7 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/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix
index 89e70f178464a..49bcad73183de 100644
--- a/pkgs/development/python-modules/pyoverkiz/default.nix
+++ b/pkgs/development/python-modules/pyoverkiz/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "pyoverkiz";
- version = "1.15.2";
+ version = "1.15.3";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "iMicknl";
repo = "python-overkiz-api";
tag = "v${version}";
- hash = "sha256-6KDtNXFlzWY27JeV9uwSu9pzjiZAmwLyYmg0KR8QudQ=";
+ hash = "sha256-B+dajZ7tjG96X5o/bTOMENyWj6tnZXiWRFCIdSdshy0=";
};
build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix
index d30f96b67d66b..c930fefd524ff 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 9b8374a0f0516..792c8bcd28e2d 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 7854f24654320..2bc97d102b7fa 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/pysuez/default.nix b/pkgs/development/python-modules/pysuez/default.nix
index 8c04887f758c7..845f9cda0fd28 100644
--- a/pkgs/development/python-modules/pysuez/default.nix
+++ b/pkgs/development/python-modules/pysuez/default.nix
@@ -2,15 +2,15 @@
lib,
buildPythonPackage,
fetchFromGitHub,
- setuptools,
+ hatchling,
+ aiohttp,
regex,
- requests,
pythonOlder,
}:
buildPythonPackage rec {
pname = "pysuez";
- version = "0.2.2";
+ version = "1.3.5";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,15 +18,15 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "jb101010-2";
repo = "pySuez";
- rev = "refs/tags/${version}";
- hash = "sha256-+pLknJDF0SsC6OsmP64D/yZeu0sGNtKo8EBGlDewBug=";
+ tag = version;
+ hash = "sha256-BG5nX2S+WV0Bdwm/cvm+mGO1RUd+F312tZ4jws6A/d8=";
};
- build-system = [ setuptools ];
+ build-system = [ hatchling ];
dependencies = [
+ aiohttp
regex
- requests
];
# Module has no tests
diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix
index 585092787483d..35f14ad921c9f 100644
--- a/pkgs/development/python-modules/pytest-benchmark/default.nix
+++ b/pkgs/development/python-modules/pytest-benchmark/default.nix
@@ -3,98 +3,86 @@
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" ];
+ __darwinAllowLocalNetworking = true;
+
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 64aae4d60ad20..911d834c26bb8 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-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix
index 969b33dafcdb0..e413501affd86 100644
--- a/pkgs/development/python-modules/pytest-services/default.nix
+++ b/pkgs/development/python-modules/pytest-services/default.nix
@@ -63,7 +63,7 @@ buildPythonPackage rec {
# Tests require binaries and additional parts
"test_memcached"
"test_mysql"
- "test_xvfb "
+ "test_xvfb"
];
meta = with lib; {
diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index 555c840311442..972d0bdf23c71 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-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix
index 42e9abe85c3b1..8c0e521ed18d0 100644
--- a/pkgs/development/python-modules/python-bsblan/default.nix
+++ b/pkgs/development/python-modules/python-bsblan/default.nix
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "python-bsblan";
- version = "0.6.4";
+ version = "1.2.1";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "liudger";
repo = "python-bsblan";
rev = "refs/tags/v${version}";
- hash = "sha256-mOVX65YRDUac0GoB9+tHIYtvNDGyxT0BSsj8I3OzuBI=";
+ hash = "sha256-b+/Cy8F2xUsYOr8PGQxkdXD07pAECNmbeWbuysSAT2I=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix
index d39f44084d508..96f48d0ebd018 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-homewizard-energy/default.nix b/pkgs/development/python-modules/python-homewizard-energy/default.nix
index d19187bdc57df..55fa46bdee8bf 100644
--- a/pkgs/development/python-modules/python-homewizard-energy/default.nix
+++ b/pkgs/development/python-modules/python-homewizard-energy/default.nix
@@ -9,6 +9,7 @@
multidict,
poetry-core,
pytest-asyncio,
+ pytest-cov-stub,
pytestCheckHook,
pythonOlder,
syrupy,
@@ -16,7 +17,7 @@
buildPythonPackage rec {
pname = "python-homewizard-energy";
- version = "6.3.0";
+ version = "7.0.0";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -24,8 +25,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "DCSBL";
repo = "python-homewizard-energy";
- rev = "refs/tags/v${version}";
- hash = "sha256-etbYZKTNdlQCDc7LXir4D7LtRzYx9jhXZc1bJvsEb8E=";
+ tag = "v${version}";
+ hash = "sha256-HYfp4CSytRl46BWp5hdQFVf9avUwRcy0lqmqRK3lhdo=";
};
postPatch = ''
@@ -47,6 +48,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
aresponses
pytest-asyncio
+ pytest-cov-stub
pytestCheckHook
syrupy
];
diff --git a/pkgs/development/python-modules/python-json-logger/default.nix b/pkgs/development/python-modules/python-json-logger/default.nix
index c56428e33c4a0..ba9de7ec3d1ea 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-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix
index 796b3e601f383..3dd1046f4cae7 100644
--- a/pkgs/development/python-modules/python-kasa/default.nix
+++ b/pkgs/development/python-modules/python-kasa/default.nix
@@ -1,20 +1,20 @@
{
lib,
aiohttp,
- async-timeout,
asyncclick,
buildPythonPackage,
cryptography,
fetchFromGitHub,
hatchling,
kasa-crypt,
+ mashumaro,
orjson,
ptpython,
- pydantic,
pytest-asyncio,
pytest-freezer,
pytest-mock,
pytest-socket,
+ pytest-xdist,
pytestCheckHook,
pythonOlder,
rich,
@@ -23,7 +23,7 @@
buildPythonPackage rec {
pname = "python-kasa";
- version = "0.7.7";
+ version = "0.8.1";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -31,18 +31,17 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "python-kasa";
repo = "python-kasa";
- rev = "refs/tags/${version}";
- hash = "sha256-405FrKG1jZNrxTmz/K8vqwPhiOqrxURWVCpyFQRJeXc=";
+ tag = version;
+ hash = "sha256-4P66mFaDg7A9FHqWRUN5NV7nQhMTu3gU+gR2tHWHalU=";
};
build-system = [ hatchling ];
dependencies = [
aiohttp
- async-timeout
asyncclick
cryptography
- pydantic
+ mashumaro
];
nativeCheckInputs = [
@@ -50,6 +49,7 @@ buildPythonPackage rec {
pytest-freezer
pytest-mock
pytest-socket
+ pytest-xdist
pytestCheckHook
voluptuous
];
@@ -69,7 +69,7 @@ buildPythonPackage rec {
disabledTestPaths = [
# Skip the examples tests
- "kasa/tests/test_readme_examples.py"
+ "tests/test_readme_examples.py"
];
pythonImportsCheck = [ "kasa" ];
diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix
index 54fa536f792e4..3e64e48a59264 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 12b1e19f2c5b4..a35996b7dc6f7 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.19";
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-6RV1BKf7/OihbUiH+nqrnAWW/eWppUb+Nn44Y+QQLX4=";
};
- 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/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix
index f1776e25bd764..e59c4d98c69dd 100644
--- a/pkgs/development/python-modules/python-roborock/default.nix
+++ b/pkgs/development/python-modules/python-roborock/default.nix
@@ -15,11 +15,12 @@
pytest-asyncio,
pytestCheckHook,
pythonOlder,
+ vacuum-map-parser-roborock,
}:
buildPythonPackage rec {
pname = "python-roborock";
- version = "2.7.2";
+ version = "2.8.3";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -27,8 +28,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "humbertogontijo";
repo = "python-roborock";
- rev = "refs/tags/v${version}";
- hash = "sha256-sPG3AqVrv+BiB+copgaghWDT/Rb/WU0R+Y8Z2J6l+7E=";
+ tag = "v${version}";
+ hash = "sha256-auKqv9fD8ensL3k5RbaCNzwrCO7Sd210CFUJROSdEjc=";
};
postPatch = ''
@@ -48,6 +49,7 @@ buildPythonPackage rec {
dacite
paho-mqtt
pycryptodome
+ vacuum-map-parser-roborock
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ pycryptodomex ];
nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/python-tado/default.nix b/pkgs/development/python-modules/python-tado/default.nix
index 6fb45f4f72828..f9f4eb6e66841 100644
--- a/pkgs/development/python-modules/python-tado/default.nix
+++ b/pkgs/development/python-modules/python-tado/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "python-tado";
- version = "0.17.6";
+ version = "0.17.7";
pyproject = true;
disabled = pythonOlder "3.5";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "wmalgadey";
repo = "PyTado";
rev = "refs/tags/${version}";
- hash = "sha256-KcYxUKQuO7TLS4YPg2mrBjP+DMnvZeJokGzwmeM/CvE=";
+ hash = "sha256-WpGznYNVpis1pM9PRXHnQVev3JW6baUT5J9iPxwd0Uk=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pytrafikverket/default.nix b/pkgs/development/python-modules/pytrafikverket/default.nix
index 0af8bb7f59a40..f5c4ecd54e8a1 100644
--- a/pkgs/development/python-modules/pytrafikverket/default.nix
+++ b/pkgs/development/python-modules/pytrafikverket/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "pytrafikverket";
- version = "1.0.0";
+ version = "1.1.1";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-qvJbAE5C19RSg5p823sCJ/dWIHBSD4kJrw/p8PF2HkI=";
+ hash = "sha256-yfo36fAVC2LaresQ1QcXq2EGhGtkVzNbWvD6lynhusQ=";
};
build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/pyvirtualdisplay/default.nix b/pkgs/development/python-modules/pyvirtualdisplay/default.nix
index 9905ee45e367f..ac2a3bf68f695 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 e3350c4e624d2..ba81da659d5ac 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/pyzipper/default.nix b/pkgs/development/python-modules/pyzipper/default.nix
index 8112958b10c35..e292972d26d4a 100644
--- a/pkgs/development/python-modules/pyzipper/default.nix
+++ b/pkgs/development/python-modules/pyzipper/default.nix
@@ -32,6 +32,8 @@ buildPythonPackage rec {
pythonImportsCheck = [ "pyzipper" ];
+ doCheck = pythonOlder "3.13"; # depends on removed nntplib battery
+
disabledTests = [
# Tests are parsing CLI output
"test_args_from_interpreter_flags"
diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix
index 991274fd267ad..c1c1b8f8e303c 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 17c7a65ec387e..1d589c1774001 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 8c3f93fe617b2..93f23b1433b0b 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 ec98f19c271f5..fd66dd16cb904 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 8ad583fcf7b1d..bada45ae9097c 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/tools/reno/default.nix b/pkgs/development/python-modules/reno/default.nix
similarity index 65%
rename from pkgs/development/tools/reno/default.nix
rename to pkgs/development/python-modules/reno/default.nix
index 04990e6d71e93..556374be32516 100644
--- a/pkgs/development/tools/reno/default.nix
+++ b/pkgs/development/python-modules/reno/default.nix
@@ -1,42 +1,48 @@
{
+ buildPythonApplication,
+ dulwich,
+ docutils,
lib,
- fetchPypi,
+ fetchFromGitHub,
git,
- gnupg1,
- python3Packages,
+ gnupg,
+ pbr,
+ pyyaml,
+ setuptools,
+ sphinx,
+ stestr,
+ testtools,
+ testscenarios,
}:
-python3Packages.buildPythonApplication rec {
+buildPythonApplication rec {
pname = "reno";
version = "4.1.0";
pyproject = true;
- # Must be built from python sdist because of versioning quirks
- src = fetchPypi {
- inherit pname version;
- hash = "sha256-+ZLx/b0WIV7J3kevCBMdU6KDDJ54Q561Y86Nan9iU3A=";
+ src = fetchFromGitHub {
+ owner = "openstack";
+ repo = "reno";
+ rev = "refs/tags/${version}";
+ hash = "sha256-le9JtE0XODlYhTFsrjxFXG/Weshr+FyN4M4S3BMBLUE=";
};
- # remove b/c doesn't list all dependencies, and requires a few packages not in nixpkgs
- postPatch = ''
- rm test-requirements.txt
- '';
+ env.PBR_VERSION = version;
- build-system = with python3Packages; [
+ build-system = [
setuptools
];
- dependencies = with python3Packages; [
+ dependencies = [
dulwich
pbr
pyyaml
- setuptools # required for finding pkg_resources at runtime
+ setuptools
];
- nativeCheckInputs = with python3Packages; [
+ nativeCheckInputs = [
# Python packages
docutils
- fixtures
sphinx
stestr
testtools
@@ -44,12 +50,12 @@ python3Packages.buildPythonApplication rec {
# Required programs to run all tests
git
- gnupg1
+ gnupg
];
checkPhase = ''
runHook preCheck
- export HOME=$TMPDIR
+ export HOME=$(mktemp -d)
stestr run -e <(echo "
# Expects to be run from a git repository
reno.tests.test_cache.TestCache.test_build_cache_db
@@ -79,11 +85,6 @@ python3Packages.buildPythonApplication rec {
mainProgram = "reno";
homepage = "https://docs.openstack.org/reno/latest";
license = licenses.asl20;
- maintainers =
- teams.openstack.members
- ++ (with maintainers; [
- drewrisinger
- guillaumekoenig
- ]);
+ maintainers = teams.openstack.members;
};
}
diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix
index 928bee69e3f6d..fb547247ba8a5 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 34913e526d78a..7ba12b6311d95 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 3b67477598679..de6c7a29141fb 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 e07ec9b47ec13..b2fc07bbcebd2 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 77eb9ea5195a8..5ab37196fcd62 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 93738259f2f87..0a65e71c39e0b 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 146f67f53448f..bec7644f688a6 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 e5b2db20a1c07..31a9010c3b296 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 74987d59dcc49..bfb17ca01015d 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 c39ae6917bcd4..961220f9260f6 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 0959a8e3e0c95..914b6deccb6ca 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/six/default.nix b/pkgs/development/python-modules/six/default.nix
index 89e77586339b7..4eeb2129738e6 100644
--- a/pkgs/development/python-modules/six/default.nix
+++ b/pkgs/development/python-modules/six/default.nix
@@ -1,22 +1,26 @@
{
lib,
buildPythonPackage,
- fetchPypi,
+ fetchFromGitHub,
isPyPy,
pytestCheckHook,
+ setuptools,
}:
buildPythonPackage rec {
pname = "six";
- version = "1.16.0";
+ version = "1.17.0";
+ pyproject = true;
- format = "setuptools";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926";
+ src = fetchFromGitHub {
+ owner = "benjaminp";
+ repo = "six";
+ rev = "refs/tags/${version}";
+ hash = "sha256-tz99C+dz5xJhunoC45bl0NdSdV9NXWya9ti48Z/KaHY=";
};
+ build-system = [ setuptools ];
+
nativeCheckInputs = [ pytestCheckHook ];
pytestFlagsArray =
diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index df9004d483ff6..9f6dd8f79a595 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 a5bd5406b0cc0..51f67fb4a0ad0 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 ec8f69958be3e..e0cd899e38772 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 06ce40e7e3366..0aec8225933f3 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 c1b0fa8be4bd3..ce0f83687b43f 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 f08c9613fc343..07cb6fe42278e 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 e95952f940103..409435d4a533f 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 c0ae6a2870677..ad321b632cd97 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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-
-[[package]]
-name = "parking_lot"
-version = "0.12.3"
+version = "1.20.2"
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 9ce945ebf7c33..7999fe4a66ed7 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 730bbfc4f4d7f..5702722a4c9c6 100644
--- a/pkgs/development/python-modules/tinycss2/default.nix
+++ b/pkgs/development/python-modules/tinycss2/default.nix
@@ -3,40 +3,36 @@
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
+ flit-core,
webencodings,
+ pytest-cov-stub,
pytestCheckHook,
- flit-core,
}:
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" ""
- '';
-
- nativeBuildInputs = [ flit-core ];
+ build-system = [ flit-core ];
- propagatedBuildInputs = [ webencodings ];
+ dependencies = [ 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 4d4e0a71c74d6..6312d9a4f9587 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 2a5c06f5ab38e..47122a67d7efa 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 92a9c1f00a714..4ee037d37f84b 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-asyncio/default.nix b/pkgs/development/python-modules/trio-asyncio/default.nix
index 821cd770caaff..980ba19ace82a 100644
--- a/pkgs/development/python-modules/trio-asyncio/default.nix
+++ b/pkgs/development/python-modules/trio-asyncio/default.nix
@@ -49,6 +49,13 @@ buildPythonPackage rec {
"ignore::DeprecationWarning"
];
+ disabledTests = [
+ # TypeError: RaisesGroup.__init__() got an unexpected keyword argument 'strict'
+ # https://github.com/python-trio/trio-asyncio/issues/154
+ "test_run_trio_task_errors"
+ "test_cancel_loop_with_tasks"
+ ];
+
nativeCheckInputs = [
pytest-trio
pytestCheckHook
diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix
index a29bcd8424019..f9cc2f20e19cf 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 297a666dc5b35..dc7ff78166819 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 6a6b752ab8a25..ad39d4e897ab7 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,102 @@ 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"
+ ];
+ "src/twisted/internet/test/test_unix.py" = [
+ # flaky?
+ "UNIXTestsBuilder.test_sendFileDescriptorTriggersPauseProducing"
+ ];
+ }
+ // 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,25 +192,25 @@ buildPythonPackage rec {
nativeCheckInputs =
[
- cython-test-exception-raiser
git
glibcLocales
- hypothesis
- pyhamcrest
]
+ ++ optional-dependencies.test
++ optional-dependencies.conch
++ optional-dependencies.http2
++ optional-dependencies.serial
- # not supported on aarch64-darwin: https://github.com/pyca/pyopenssl/issues/873
- ++ lib.optionals (
- !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)
- ) optional-dependencies.tls;
+ ++ 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 +218,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/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix
index 9278ad563162a..c20c2b2a624a4 100644
--- a/pkgs/development/python-modules/uiprotect/default.nix
+++ b/pkgs/development/python-modules/uiprotect/default.nix
@@ -39,7 +39,7 @@
buildPythonPackage rec {
pname = "uiprotect";
- version = "6.4.0";
+ version = "6.6.5";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -48,7 +48,7 @@ buildPythonPackage rec {
owner = "uilibs";
repo = "uiprotect";
rev = "refs/tags/v${version}";
- hash = "sha256-+BHxcwQhx4lOqS0ATk1PjLbyTu7xQakM3HMrydXeGUc=";
+ hash = "sha256-ZohQTXOLc2E0vfD21IUh6ECTfbAd2SZOg/73lk/UMO0=";
};
build-system = [ poetry-core ];
@@ -97,6 +97,11 @@ buildPythonPackage rec {
"test_bootstrap"
];
+ disabledTestPaths = [
+ # hangs the test suite
+ "tests/test_api_ws.py"
+ ];
+
pythonImportsCheck = [ "uiprotect" ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/unicode-rbnf/default.nix b/pkgs/development/python-modules/unicode-rbnf/default.nix
index 7bc806314a725..ce34f9e327917 100644
--- a/pkgs/development/python-modules/unicode-rbnf/default.nix
+++ b/pkgs/development/python-modules/unicode-rbnf/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "unicode-rbnf";
- version = "1.2.0";
+ version = "2.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "rhasspy";
repo = "unicode-rbnf";
rev = "refs/tags/v${version}";
- hash = "sha256-dAoDO707qmdDzCbi7EWNaM9txdBV46NlLkOs7xyycz0=";
+ hash = "sha256-1kq8qTzFYYRRjlxBdvIiBuXbprA0bF4zMFOVbpgCR3c=";
};
nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/unify/default.nix b/pkgs/development/python-modules/unify/default.nix
index 9f6f7d929c6e4..061129e807252 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 0000000000000..529b3b782bc97
--- /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 ab72df02971f6..aded817044b37 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 b5d7cee2f7c5e..62fc83d21fb15 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 8ef7730047d5a..881be880d9d9f 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 2794a7a1699bf..a5f6812a9455f 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 dd74e0212bc52..eb3b16c0a3ea5 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/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix
index 933823a748c5c..79e9b73780bb2 100644
--- a/pkgs/development/python-modules/waitress/default.nix
+++ b/pkgs/development/python-modules/waitress/default.nix
@@ -2,25 +2,40 @@
lib,
buildPythonPackage,
fetchPypi,
+ setuptools,
+ pytestCheckHook,
+ pytest-cov-stub,
}:
buildPythonPackage rec {
pname = "waitress";
- version = "3.0.0";
- format = "setuptools";
+ version = "3.0.2";
+ pyproject = true;
src = fetchPypi {
inherit pname version;
- hash = "sha256-AF2kebBBNM3Z3WAtHufEnXneBTdhDWU2dMxsveIiuKE=";
+ hash = "sha256-aCqq8q8MRK2kq/tw3tNjk/DjB/SrlFaiFc4AILrvwx8=";
};
- doCheck = false;
+ build-system = [ setuptools ];
+
+ pythonImportsCheck = [ "waitress" ];
+
+ nativeCheckInputs = [
+ pytestCheckHook
+ pytest-cov-stub
+ ];
+
+ disabledTests = [
+ # access to socket
+ "test_service_port"
+ ];
meta = with lib; {
homepage = "https://github.com/Pylons/waitress";
description = "Waitress WSGI server";
mainProgram = "waitress-serve";
- license = licenses.zpl20;
+ license = licenses.zpl21;
maintainers = with maintainers; [ domenkozar ];
};
}
diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix
index f9c205f3c7254..fa744d03ede9e 100644
--- a/pkgs/development/python-modules/watchdog/default.nix
+++ b/pkgs/development/python-modules/watchdog/default.nix
@@ -10,32 +10,35 @@
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;
+ nativeCheckInputs =
+ [
+ flaky
+ pytest-cov-stub
+ pytest-timeout
+ pytestCheckHook
+ ]
+ ++ 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 0000000000000..f4ab61997cf79
--- /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 3b09081249b0a..705be5e6c0474 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/webrtc-models/default.nix b/pkgs/development/python-modules/webrtc-models/default.nix
index 5b2524dc0bc53..1dcb4066deb5e 100644
--- a/pkgs/development/python-modules/webrtc-models/default.nix
+++ b/pkgs/development/python-modules/webrtc-models/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "webrtc-models";
- version = "0.2.0";
+ version = "0.3.0";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = "python-webrtc-models";
rev = "refs/tags/${version}";
- hash = "sha256-6fVcp9kWr5nV4wOKov3ObqyPJo+u3jN443qv++sJ0TQ=";
+ hash = "sha256-WZPI7vYlfsihskRtrh4XJGx0JSDwn7JIJ8CL3jlryrA=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix
index feafb29bcbd3c..aef1412124fd1 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/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix
index 4c7a5b3dc2887..34dc951531702 100644
--- a/pkgs/development/python-modules/wheel/default.nix
+++ b/pkgs/development/python-modules/wheel/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "wheel";
- version = "0.44.0";
- format = "pyproject";
+ version = "0.45.1";
+ pyproject = true;
src = fetchFromGitHub {
owner = "pypa";
repo = "wheel";
rev = "refs/tags/${version}";
- hash = "sha256-IFJ411H5nItR8gA5R0AYXFs3n6e1SLo2VoMOqgvDnnk=";
+ hash = "sha256-tgueGEWByS5owdA5rhXGn3qh1Vtf0HGYC6+BHfrnGAs=";
postFetch = ''
cd $out
mv tests/testdata/unicode.dist/unicodedist/åäö_日本語.py \
diff --git a/pkgs/development/python-modules/wrapt/default.nix b/pkgs/development/python-modules/wrapt/default.nix
index b4c636923b963..59af6a58b8ab3 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/wxpython/4.2.nix b/pkgs/development/python-modules/wxpython/4.2.nix
index 09cf9684c4d55..8fd324dff01fb 100644
--- a/pkgs/development/python-modules/wxpython/4.2.nix
+++ b/pkgs/development/python-modules/wxpython/4.2.nix
@@ -27,7 +27,7 @@
libXtst,
libXxf86vm,
libglvnd,
- mesa,
+ libgbm,
pango,
SDL,
webkitgtk_4_0,
@@ -93,7 +93,7 @@ buildPythonPackage rec {
libXtst
libXxf86vm
libglvnd
- mesa
+ libgbm
webkitgtk_4_0
xorgproto
];
diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix
index 96540a3484b6a..382bad08e98f3 100644
--- a/pkgs/development/python-modules/xarray/default.nix
+++ b/pkgs/development/python-modules/xarray/default.nix
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+ fetchpatch,
numpy,
packaging,
pandas,
@@ -24,6 +25,14 @@ buildPythonPackage rec {
rev = "refs/tags/v${version}";
hash = "sha256-s5MvHp2OkomD3xNYzj9oKlVLMgHZDQRBJM6vgOAv1jQ=";
};
+ patches = [
+ # Fixes https://github.com/pydata/xarray/issues/9873
+ (fetchpatch {
+ name = "xarray-PR9879-fix-tests.patch";
+ url = "https://github.com/pydata/xarray/commit/50f3a04855d7cf79ddf132ed07d74fb534e57f3a.patch";
+ hash = "sha256-PKYzzBOG1Dccpt9D7rcQV1Hxgw11mDOAx3iUfD0rrUc=";
+ })
+ ];
build-system = [
setuptools
diff --git a/pkgs/development/python-modules/xmlsec/default.nix b/pkgs/development/python-modules/xmlsec/default.nix
index 229fa81713716..3d6d6bc50acd1 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 356e3f792639f..2bbc77852c8e1 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 cf9e8da676ec0..ba9faf0217b2a 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/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix
index e9910213140e9..41319b09a3483 100644
--- a/pkgs/development/python-modules/zeroconf/default.nix
+++ b/pkgs/development/python-modules/zeroconf/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "zeroconf";
- version = "0.136.0";
+ version = "0.136.2";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "jstasiak";
repo = "python-zeroconf";
rev = "refs/tags/${version}";
- hash = "sha256-q1Dk2lUiChjDFJeRCUqkPAIO1I+PsnvuLSx6UgXHPU4=";
+ hash = "sha256-gSoxrG+5LCI0DCEGqrQvzFfnKhlJV5kyqLH6IrN7Zjs=";
};
build-system = [
diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix
index 8946613f81b9d..0faa301aaf5c4 100644
--- a/pkgs/development/python-modules/zha-quirks/default.nix
+++ b/pkgs/development/python-modules/zha-quirks/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "zha-quirks";
- version = "0.0.124";
+ version = "0.0.125";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "zha-device-handlers";
rev = "refs/tags/${version}";
- hash = "sha256-dRO5fbvFMy3g/3wxGvVHJ5lPwyWOpnZ/0Qz5wM6Rii8=";
+ hash = "sha256-Tqt+ydp7Vr3pWBQ0T5B0CV+bfX+0yRXynEhD01afY/w=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix
index bcece29424119..4ac2dac1f2305 100644
--- a/pkgs/development/python-modules/zha/default.nix
+++ b/pkgs/development/python-modules/zha/default.nix
@@ -27,7 +27,7 @@
buildPythonPackage rec {
pname = "zha";
- version = "0.0.39";
+ version = "0.0.42";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "zha";
rev = "refs/tags/${version}";
- hash = "sha256-75R2Ah5L5wjIwGrUeifujiuAo4GhpXbu8EbqAPImjQU=";
+ hash = "sha256-iju/WjndlwEZjforoVyoIb6oTJNlvkEnsoQH2d6tFlQ=";
};
postPatch = ''
@@ -105,11 +105,6 @@ buildPythonPackage rec {
disabledTestPaths = [ "tests/test_cluster_handlers.py" ];
- pytestFlagsArray = [
- "-v"
- "--timeout=5"
- ];
-
meta = with lib; {
description = "Zigbee Home Automation";
homepage = "https://github.com/zigpy/zha";
diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix
index 62055ba30e503..018074851fc42 100644
--- a/pkgs/development/python-modules/zigpy/default.nix
+++ b/pkgs/development/python-modules/zigpy/default.nix
@@ -27,7 +27,7 @@
buildPythonPackage rec {
pname = "zigpy";
- version = "0.72.0";
+ version = "0.73.1";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "zigpy";
rev = "refs/tags/${version}";
- hash = "sha256-q8YyAFBhY60ZK8tHSJnTU6gbDP3ifT1MAAbpYf3EIJA=";
+ hash = "sha256-Fb5rZhxd93QY0TYJTTLXEaqlxk3JdlIOun5FB7wJbSE=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix
index d2caa2c2f383d..b49774b14de1b 100644
--- a/pkgs/development/python-modules/zwave-js-server-python/default.nix
+++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "zwave-js-server-python";
- version = "0.58.1";
+ version = "0.59.1";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = "zwave-js-server-python";
rev = "refs/tags/${version}";
- hash = "sha256-hszt14ymZQsUg0zfJ7+cY08DlXNaWzxKwV/i4i29DtI=";
+ hash = "sha256-7TbGRPGIpS8T0bmEIiRHChvdiKqTKccnkl0YVoQHfdE=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix
index f60c7f3762958..479bc6eec29d0 100644
--- a/pkgs/development/ruby-modules/bundled-common/default.nix
+++ b/pkgs/development/ruby-modules/bundled-common/default.nix
@@ -14,6 +14,7 @@
{
name ? null,
pname ? null,
+ version ? null,
mainGemName ? null,
gemdir ? null,
gemfile ? null,
@@ -78,15 +79,15 @@ let
gems = lib.flip lib.mapAttrs configuredGemset (name: attrs: buildGem name attrs);
- name' =
- if name != null then
- name
+ version' =
+ if version != null then
+ version
+ else if pname != null then
+ gems.${pname}.suffix
else
- let
- gem = gems.${pname};
- suffix = gem.suffix;
- in
- "${pname}-${suffix}";
+ null;
+
+ name' = if name != null then name else "${pname}-${version'}";
pname' = if pname != null then pname else name;
@@ -137,9 +138,15 @@ let
envPaths = lib.attrValues gems ++ lib.optional (!hasBundler) bundler;
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 b6c4dd2f8452f..6826682bf4939 100644
--- a/pkgs/development/ruby-modules/bundler-app/default.nix
+++ b/pkgs/development/ruby-modules/bundler-app/default.nix
@@ -49,7 +49,6 @@ let
cmdArgs =
removeAttrs args [
- "pname"
"postBuild"
"gemConfig"
"passthru"
@@ -58,6 +57,7 @@ let
]
// {
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 e72b6dd98f659..79898dcfcf646 100644
--- a/pkgs/development/tools/analysis/rr/zen_workaround.nix
+++ b/pkgs/development/tools/analysis/rr/zen_workaround.nix
@@ -23,7 +23,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 e81a6c8356f9a..1d0f338228e93 100644
--- a/pkgs/development/tools/analysis/sparse/default.nix
+++ b/pkgs/development/tools/analysis/sparse/default.nix
@@ -26,9 +26,12 @@ 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
diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index fe44e8b1922fd..f2e6f7f67409a 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 455f18ba0a3dd..e3a0f9609c0e2 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/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix
index b053700719c96..1c0781841462a 100644
--- a/pkgs/development/tools/electron/binary/generic.nix
+++ b/pkgs/development/tools/electron/binary/generic.nix
@@ -10,7 +10,7 @@
unzip,
at-spi2-atk,
libdrm,
- mesa,
+ libgbm,
libxkbcommon,
libxshmfence,
libGL,
@@ -120,7 +120,7 @@ let
]
++ lib.optionals (lib.versionAtLeast version "9.0.0") [
libdrm
- mesa
+ libgbm
]
++ lib.optionals (lib.versionOlder version "10.0.0") [ libXScrnSaver ]
++ lib.optionals (lib.versionAtLeast version "11.0.0") [ libxkbcommon ]
diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix
index 07367857eccd1..daae413dc0889 100644
--- a/pkgs/development/tools/electron/common.nix
+++ b/pkgs/development/tools/electron/common.nix
@@ -9,7 +9,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 5a2956984eae8..59ff96a3f42f1 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 e9d864f993c3b..86e84e42cb907 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -15,6 +15,7 @@ in
lib,
noSysDirs,
perl,
+ runCommand,
zlib,
CoreServices,
@@ -279,11 +280,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 983c4f0c3db36..0985fff642cde 100644
--- a/pkgs/development/tools/misc/binutils/libbfd.nix
+++ b/pkgs/development/tools/misc/binutils/libbfd.nix
@@ -17,7 +17,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 52f0f801cf671..e118e56d59aee 100644
--- a/pkgs/development/tools/misc/binutils/libopcodes.nix
+++ b/pkgs/development/tools/misc/binutils/libopcodes.nix
@@ -17,7 +17,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 fc758e4ab021a..ca59f795c0b72 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 c0caa152c91ed..9ad44968d38e2 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
'';
@@ -96,12 +96,12 @@ stdenv.mkDerivation (finalAttrs: {
--suffix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" \
--suffix LUA_CPATH ";" "$(echo "$out"/lib/lua/*/)?.so" \
--suffix LUA_CPATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" \
- --suffix PATH : ${lib.makeBinPath finalAttrs.propagatedBuildInputs}
+ --suffix PATH : ${lib.makeBinPath finalAttrs.propagatedNativeBuildInputs}
}
done
'';
- propagatedBuildInputs = [
+ propagatedNativeBuildInputs = [
zip
unzip
cmake
diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix
index 21bfcb3506ecc..caafc15fbe8a4 100644
--- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix
+++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix
@@ -17,7 +17,7 @@ luarocks_bootstrap.overrideAttrs (old: {
hash = "sha256-hsjv+jlLsoIDM4gB/0mFeoVu1YZ1I9ELDALLTEnlCF0=";
};
- propagatedBuildInputs = old.propagatedBuildInputs ++ [
+ propagatedNativeBuildInputs = old.propagatedNativeBuildInputs ++ [
file
nurl
];
diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix
index b2e70731acc4f..e94452eb97aeb 100644
--- a/pkgs/development/tools/nwjs/default.nix
+++ b/pkgs/development/tools/nwjs/default.nix
@@ -24,7 +24,7 @@
, libxcb
, libxkbcommon
, makeWrapper
-, mesa
+, libgbm
, nspr
, nss
, pango
@@ -59,7 +59,7 @@ let
libGL
libnotify
libxkbcommon
- mesa
+ libgbm
nspr
nss
pango
diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix
index 2219da6fd06ee..2e206d850c6b7 100644
--- a/pkgs/development/tools/ocaml/merlin/4.x.nix
+++ b/pkgs/development/tools/ocaml/merlin/4.x.nix
@@ -1,6 +1,6 @@
{
lib,
- substituteAll,
+ replaceVars,
fetchurl,
ocaml,
dune_3,
@@ -61,9 +61,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 f85dd23313927..aa876a4d29ddf 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 1c7fb3888868e..c412e01f17350 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 0329b6e5e4f32..435292c24e302 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 e3a6f4b9e12a3..00d30c080ed45 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 ff2f413a99531..7230d1854286f 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 a7c098c78b98c..3d58abd6884ac 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 57b620e57e058..15521af83a8ba 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 2a025287f9539..f762eee5eb347 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 dcfb7983536de..426ad295313cb 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 6b62fc988b0fe..6bb6b7a531609 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 0d0dbc08924ee..3ebbfca362e83 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 bbda8ba6b40d7..b6fbb0de84bdd 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 597e6e0c027d4..3bcd64dcbe5af 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 dc80021f2a218..08a9a4166c1a9 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 723155cf451a3..32f2c01ba4937 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 7c9b7ffbb69a8..fd8859be185c4 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 d886cfd7e92c5..a00bbfddb9d5e 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 9ace481a79224..dda51e46775b8 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 0c49037052cbf..7d3ebefad07e0 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 86172703b3437..ee7bb27bb365e 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 02d5ca9f0cdec..d48735c541cf2 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 df4b224a63147..aac43a34076e8 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 5b4701aa39868..13af8c7b5d11e 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 c983defb998c5..aa124ec03c2f2 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 149336a19090f..975daf866b420 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 299aa72dadf5f..ee7922207b950 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 81b8070b53d08..8daf67a2c621e 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 901d037b9feb7..f6d02a241070e 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 db619e4556932..62357a454806a 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 f9ea1c01fafaa..9ec40c9df6b44 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 a682053ee93e8..eece08fd37885 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 c72db6775674f..19c28b7eff356 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 32997568a47c8..0a61c5a22ebcd 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 444e95e3bdaba..fda7ed856d187 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 bd97462e4bd7e..524720491330f 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 7db26325a7fda..5ce9ec929f5e9 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 e0c25f2310426..8fc8bbf4d539f 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 a48c279f15333..6ce9ddf849fc9 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 955cec56124f3..12b7cc6d332d3 100644
--- a/pkgs/development/tools/profiling/systemtap/default.nix
+++ b/pkgs/development/tools/profiling/systemtap/default.nix
@@ -18,8 +18,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;
@@ -27,7 +27,7 @@ let
stapBuild = stdenv.mkDerivation {
pname = "systemtap";
inherit version;
- src = fetchgit { inherit url rev sha256; };
+ src = fetchgit { inherit url rev hash; };
nativeBuildInputs = [
pkg-config
cpio
@@ -40,7 +40,6 @@ let
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/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix
index 5a4d94f5022c2..98beee9b2b77f 100644
--- a/pkgs/development/tools/unityhub/default.nix
+++ b/pkgs/development/tools/unityhub/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
alsa-lib
nss
libdrm
- mesa
+ libgbm
nspr
atk
dbus
diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix
index 867067329d9a6..56ee14cb903e8 100644
--- a/pkgs/development/web/cypress/default.nix
+++ b/pkgs/development/web/cypress/default.nix
@@ -6,7 +6,7 @@
, lib
, buildPackages
, makeShellWrapper
-, mesa
+, libgbm
, nss
, stdenv
, udev
@@ -72,7 +72,7 @@ in stdenv.mkDerivation rec {
gtk2
alsa-lib
gtk3
- mesa # for libgbm
+ libgbm
]) ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
Cocoa
CoreServices
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index ab63e1e14a7a6..2c4f996aa2a64 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";
-
- sharedLibDeps = { inherit openssl zlib libuv; } // (lib.optionalAttrs useSharedHttpParser { inherit http-parser; });
+ useSharedSQLite = lib.versionAtLeast version "22.5";
+
+ 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 f470f32aac7e4..a67a1538f83e4 100644
--- a/pkgs/development/web/nodejs/v18.nix
+++ b/pkgs/development/web/nodejs/v18.nix
@@ -1,9 +1,6 @@
{
callPackage,
lib,
- overrideCC,
- pkgs,
- buildPackages,
openssl,
python311,
fetchpatch2,
@@ -11,25 +8,8 @@
}:
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;
};
@@ -63,5 +43,37 @@ 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=";
+ })
+ # 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=";
+ })
] ++ gypPatches;
}
diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
index 6fa35c0ac4475..b0afedff7f987 100644
--- a/pkgs/development/web/nodejs/v20.nix
+++ b/pkgs/development/web/nodejs/v20.nix
@@ -27,5 +27,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 6a71b0056bf76..2da784c93f183 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 7e5a915ed3574..43cbaa2b8e712 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/development/web/playwright/webkit.nix b/pkgs/development/web/playwright/webkit.nix
index 5c8062bb6f703..8c89a34918f0d 100644
--- a/pkgs/development/web/playwright/webkit.nix
+++ b/pkgs/development/web/playwright/webkit.nix
@@ -37,7 +37,7 @@
libxkbcommon,
libxml2,
libxslt,
- mesa,
+ libgbm,
sqlite,
systemdLibs,
wayland-scanner,
@@ -113,7 +113,7 @@ stdenv.mkDerivation {
libvpx'
libxml2
libxslt
- mesa
+ libgbm
sqlite
systemdLibs
wayland-scanner
diff --git a/pkgs/games/doom-ports/zandronum/alpha/default.nix b/pkgs/games/doom-ports/zandronum/alpha/default.nix
index 9f2bde55e8361..0cacb54b2f2df 100644
--- a/pkgs/games/doom-ports/zandronum/alpha/default.nix
+++ b/pkgs/games/doom-ports/zandronum/alpha/default.nix
@@ -80,7 +80,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) ''
diff --git a/pkgs/games/doom-ports/zandronum/default.nix b/pkgs/games/doom-ports/zandronum/default.nix
index 5a36f375ac79c..9a39719d42db1 100644
--- a/pkgs/games/doom-ports/zandronum/default.nix
+++ b/pkgs/games/doom-ports/zandronum/default.nix
@@ -80,7 +80,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) ''
diff --git a/pkgs/kde/frameworks/extra-cmake-modules/default.nix b/pkgs/kde/frameworks/extra-cmake-modules/default.nix
index 08b18f38672cd..d0b5c09a101df 100644
--- a/pkgs/kde/frameworks/extra-cmake-modules/default.nix
+++ b/pkgs/kde/frameworks/extra-cmake-modules/default.nix
@@ -1,6 +1,5 @@
{
mkKdeDerivation,
- fetchpatch,
python3,
}:
mkKdeDerivation {
@@ -8,16 +7,6 @@ mkKdeDerivation {
outputs = [ "out" ];
- patches = [
- # Cherry-pick fix for not finding libmount include path correctly
- # Upstream PR: https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/486
- # FIXME: remove in next update
- (fetchpatch {
- url = "https://invent.kde.org/frameworks/extra-cmake-modules/-/commit/1cc17521fefd7adb0631d24a03497bcf63b9512d.patch";
- hash = "sha256-4NbhsVf14YuFHumbnXRgMcS3i/LZUDdrCWHrjHSjuo0=";
- })
- ];
-
# Packages that have an Android APK (e.g. KWeather) require Python3 at build time.
# See: https://invent.kde.org/frameworks/extra-cmake-modules/-/blob/v6.1.0/modules/ECMAddAndroidApk.cmake?ref_type=tags#L57
propagatedNativeBuildInputs = [
diff --git a/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh b/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh
index c635816777f52..85ba59faf8dfd 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 bfb3ba1fc850f..79ae5c8b30a96 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/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json
index a609999b74023..232d8569e4ce2 100644
--- a/pkgs/kde/generated/sources/frameworks.json
+++ b/pkgs/kde/generated/sources/frameworks.json
@@ -1,362 +1,362 @@
{
"attica": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/attica-6.8.0.tar.xz",
- "hash": "sha256-RDAKLQ7UZdmtsAI/rG1ns7Kb7CmaVP6j/zR32RGNH90="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/attica-6.9.0.tar.xz",
+ "hash": "sha256-hjWSyjfU+XvffjTfuPnxIIly+effo/omDqRy4SzRfBY="
},
"baloo": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/baloo-6.8.0.tar.xz",
- "hash": "sha256-WaWWl+fSvsUNqoPeUmh3W953z5g1EnfQ9KxVEiNLrv0="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/baloo-6.9.0.tar.xz",
+ "hash": "sha256-0fTnWdFAdONlllIiB2yHU58h4k2Oh2i+fJ+WA4hTYNA="
},
"bluez-qt": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/bluez-qt-6.8.0.tar.xz",
- "hash": "sha256-NxqJ98WpyI397rLcxtGtl7OXoj7BC9b86uCoNeB0DXY="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/bluez-qt-6.9.0.tar.xz",
+ "hash": "sha256-EG3relMbKrgQb0/B6mYdhFfLj/eTxDai67nxgnwCF8g="
},
"breeze-icons": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/breeze-icons-6.8.0.tar.xz",
- "hash": "sha256-de4R/EQcJ1BOGZ42VpMpbtzUZfiQ22qryw3soKziLTo="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/breeze-icons-6.9.0.tar.xz",
+ "hash": "sha256-YY9jO6+wpaq6qT6qZzPf69bnkwPvHQqT3PJJGBiWvtk="
},
"extra-cmake-modules": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/extra-cmake-modules-6.8.0.tar.xz",
- "hash": "sha256-/4oL9yKFvsF2jjrNj3xmWibVWhUn6W1z41eJ3J8ONHI="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/extra-cmake-modules-6.9.0.tar.xz",
+ "hash": "sha256-zsBrJeFm7bcaGpc2QcT1/DyHEt3j+z5jnbWGUVzBZC4="
},
"frameworkintegration": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/frameworkintegration-6.8.0.tar.xz",
- "hash": "sha256-FBvFnf2yRskFAaSIy/ATufC7wcJ6ePLyV0QzlXbtrzc="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/frameworkintegration-6.9.0.tar.xz",
+ "hash": "sha256-ua+z2U3KGp5ATLGcmbrK5+TaaH4PFUueOWny+cOOnbg="
},
"kapidox": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kapidox-6.8.0.tar.xz",
- "hash": "sha256-RL24w9VRMOLkqPtndDKmVt3A8lTcu4MixQqcpKbTUlo="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kapidox-6.9.0.tar.xz",
+ "hash": "sha256-eCHAYSZflabbcOrpjunlYCxeYBvWbD189s0PRYqQgzE="
},
"karchive": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/karchive-6.8.0.tar.xz",
- "hash": "sha256-6QPrVLh1JYcn/VJLJInSpQGZc+J99nszu1b7qR5O7DQ="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/karchive-6.9.0.tar.xz",
+ "hash": "sha256-JGrY3StfuD3xywX/H9OTT4pSvpTRJDUPnmt8NCDpxHQ="
},
"kauth": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kauth-6.8.0.tar.xz",
- "hash": "sha256-u/g6OYcPdWqu+5r7005iHV/FMoDF63Dbm9Nn/FH4x0k="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kauth-6.9.0.tar.xz",
+ "hash": "sha256-hM8VcpvSSKqdeMG/7PaBYXgtUhrBSptqW9rMKcvj3sY="
},
"kbookmarks": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kbookmarks-6.8.0.tar.xz",
- "hash": "sha256-DL0hXdG/L3wwU1bRNiw+sFhbDenhlb4SURD0sJ/KUBU="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kbookmarks-6.9.0.tar.xz",
+ "hash": "sha256-kyI0vtv1pYh/I8YQAQyMcLNrXc5PTExddvR6ks6OV3o="
},
"kcalendarcore": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kcalendarcore-6.8.0.tar.xz",
- "hash": "sha256-zF/DwwSxF0cHRGiYKelLr4XGzk3CRZO5lY8d6JnIdBI="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kcalendarcore-6.9.0.tar.xz",
+ "hash": "sha256-hhcn+VNo6XOcETX4nRegtJnaa3Dhbx7146VlIuWmQQw="
},
"kcmutils": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kcmutils-6.8.0.tar.xz",
- "hash": "sha256-+BBsg++FofybQYW4EmAEjr2KZM3wXI0Ccv+D1mZcscA="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kcmutils-6.9.0.tar.xz",
+ "hash": "sha256-eb8qGKtOqOF1KxT1lkzkSQe1HhxfyNy2IMZv1f2zaic="
},
"kcodecs": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kcodecs-6.8.0.tar.xz",
- "hash": "sha256-lslTXG95VxzXFwNg3Atkoz1SnVnL2UV5NL/Az2z0sn8="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kcodecs-6.9.0.tar.xz",
+ "hash": "sha256-yIpN70Vkp0a7imp8EnCUrpt+R+GlrST4f/tmQ9QrDLE="
},
"kcolorscheme": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kcolorscheme-6.8.0.tar.xz",
- "hash": "sha256-L9oHaFRpGdQn40qQSb9cXo/mGh1rfnbfSbtC4iwSNN0="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kcolorscheme-6.9.0.tar.xz",
+ "hash": "sha256-cb6q4IspS16/JcUXSh1Vys3OXomR6RZ9FDpEi5V0KBo="
},
"kcompletion": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kcompletion-6.8.0.tar.xz",
- "hash": "sha256-ipFfQqSeAhyHKbQlp5kGgzSQybqhskrwHNT8gltYxGE="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kcompletion-6.9.0.tar.xz",
+ "hash": "sha256-3M5BU/oTose4b1+yZBN3/tpYfkr0eKOTf7m8cnXbiRw="
},
"kconfig": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kconfig-6.8.0.tar.xz",
- "hash": "sha256-P488LvOEpSga5aORij48wr4BaOsUvs/aphcQZV2LFqw="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kconfig-6.9.0.tar.xz",
+ "hash": "sha256-uLnfsLxbwPnEUWTgLJiN2KsQo0rqDICxlF/QsyZ6xvk="
},
"kconfigwidgets": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kconfigwidgets-6.8.0.tar.xz",
- "hash": "sha256-ncOoLx+zJ1Dm7PeKhjpDImow4vyt11Ue7HiGkW4ctPE="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kconfigwidgets-6.9.0.tar.xz",
+ "hash": "sha256-yVaMvdkWmklqJikzg8xPfHnpSHH3apFG+xZ8PHWbBMo="
},
"kcontacts": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kcontacts-6.8.0.tar.xz",
- "hash": "sha256-RjgiYW8R2iNo+v7Y9x4cmK1HEDyJ2/qMiP5lpBrhUFE="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kcontacts-6.9.0.tar.xz",
+ "hash": "sha256-xklGI72GbW9vmkL9DH/yvE2Yyo2Ut+aPhSmvCfMh/Jw="
},
"kcoreaddons": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kcoreaddons-6.8.0.tar.xz",
- "hash": "sha256-KJd/R4vl19X1ZQh2v3uAZnTtb8YJ1wPuoymoGfpK2Zw="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kcoreaddons-6.9.0.tar.xz",
+ "hash": "sha256-nOee7v9iwN9Gvh2xdjA0Tpvuf2NlVEHmJpI9PU+Yb70="
},
"kcrash": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kcrash-6.8.0.tar.xz",
- "hash": "sha256-pwKUTIfJY07v1SKT9iU1UxRHPmxMJLRy7nhUy4xolX8="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kcrash-6.9.0.tar.xz",
+ "hash": "sha256-qXNOSK1CW7QmKU8t5rre87SF/1ubsnO6Uf4srHqnpFY="
},
"kdav": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kdav-6.8.0.tar.xz",
- "hash": "sha256-2JXjttT/mRbRhexQ+UsIpwY2IC4oc5/MdHcuLs2SGCw="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kdav-6.9.0.tar.xz",
+ "hash": "sha256-WsWBjom8noEZ8QpGvDyOVIeNtOmhLDoHSB3ryNU2y9M="
},
"kdbusaddons": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kdbusaddons-6.8.0.tar.xz",
- "hash": "sha256-bHYKDcNyrwovgltlV1v6vRlQx2wON/h94h1HzsjVi8c="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kdbusaddons-6.9.0.tar.xz",
+ "hash": "sha256-MKCxj3AoMO4+mulPDZU7C/g189nINssiNm3kgGWjp0w="
},
"kdeclarative": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kdeclarative-6.8.0.tar.xz",
- "hash": "sha256-rUYQhce/wqxo8dwlLGZpWSYe+y/6gOeSPna3gccjNqE="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kdeclarative-6.9.0.tar.xz",
+ "hash": "sha256-GiZt0qKRL/5jLkVdgjp2ydv7RJd8B4OLxE5FflvsmOs="
},
"kded": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kded-6.8.0.tar.xz",
- "hash": "sha256-UpJj+xqXqlWCji4MeBEYcAphId9Jrb7R7lboecjsUSE="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kded-6.9.0.tar.xz",
+ "hash": "sha256-OddDQ9uQG4QZJEc470xtnosaMzEnjVX1eBGwFq2wKp8="
},
"kdesu": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kdesu-6.8.0.tar.xz",
- "hash": "sha256-DooAfEE/rKT6fiQ4KgGbrs/mtmB2ALpkEcdh57yVOY8="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kdesu-6.9.0.tar.xz",
+ "hash": "sha256-GoSkYTce0JhOerIlyXToDl8a+3DfzldYKptnzbQO0bo="
},
"kdnssd": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kdnssd-6.8.0.tar.xz",
- "hash": "sha256-SdmskRrGQSFwszDIMUIERhCukPVxxgMYsi4ZfiiYlz4="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kdnssd-6.9.0.tar.xz",
+ "hash": "sha256-UnxWWfRAl/vrU8K/M20qA1+/KFNfdJFmLGdYJZ4edlo="
},
"kdoctools": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kdoctools-6.8.0.tar.xz",
- "hash": "sha256-YGhj6G1qqRars+N2C3P+nbGDLB5BcnNJ0CzcjDq5a6c="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kdoctools-6.9.0.tar.xz",
+ "hash": "sha256-bMQ/fbbfcDzeHG+7JN68+xHD348Xa+EBV34hWC0CCco="
},
"kfilemetadata": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kfilemetadata-6.8.0.tar.xz",
- "hash": "sha256-UEZrNpm74wF+2ww8sJRjpX4t07ZtYPX2ENnuOiHjSJQ="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kfilemetadata-6.9.0.tar.xz",
+ "hash": "sha256-0XtpLqesDZuuyx3OOqEKVi2zqa5+ktwrncYETfoR3As="
},
"kglobalaccel": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kglobalaccel-6.8.0.tar.xz",
- "hash": "sha256-yqbYWwiGfLg38Ip4l5iERyTVOSMgGTeCqD4UE19ml4M="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kglobalaccel-6.9.0.tar.xz",
+ "hash": "sha256-BhpQb1zO/mLF2Spu0Qm08B4UpMi9XUK2IsjIRH914f0="
},
"kguiaddons": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kguiaddons-6.8.0.tar.xz",
- "hash": "sha256-ac5pgDyNab280b7OvXW9SWqdHp6m5y1cb0pc/adqI4Y="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kguiaddons-6.9.0.tar.xz",
+ "hash": "sha256-98MgvqX7D8wkfgThCS4ZIGoSmIUxEqh8ZQctM63IRoo="
},
"kholidays": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kholidays-6.8.0.tar.xz",
- "hash": "sha256-FiuK3kLegEFTgPZHaihfv6tbsnDzWw19E7qhw0pfsWQ="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kholidays-6.9.0.tar.xz",
+ "hash": "sha256-tAnsy6v9ayl3GVPGoDduT34WwNUzbV/oO29reh94bgA="
},
"ki18n": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/ki18n-6.8.0.tar.xz",
- "hash": "sha256-cdc6BY5SZ4l60/2CAnTkyO13Djwu7uyryAub6NTyho4="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/ki18n-6.9.0.tar.xz",
+ "hash": "sha256-c2rhDjqMXc7RVdM0f529kcNPSF10lYFfhfTWJGgaGGA="
},
"kiconthemes": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kiconthemes-6.8.0.tar.xz",
- "hash": "sha256-zF4RarvYEADSHYdfeeWGrwULMaF5M70gZLIQBDcUzao="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kiconthemes-6.9.0.tar.xz",
+ "hash": "sha256-4k1LT4vQnW7dYeffsgMwFzUkUuroecEmAgCoHUi8mW4="
},
"kidletime": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kidletime-6.8.0.tar.xz",
- "hash": "sha256-UQFgWPrzklFep/WC0lxmar3fOO9mq/GHUCz0bF4R5BA="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kidletime-6.9.0.tar.xz",
+ "hash": "sha256-4WZe8xRmDYST8zAGnEd9HIz7CXe+S584DY5yayaU0kI="
},
"kimageformats": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kimageformats-6.8.0.tar.xz",
- "hash": "sha256-2fJiZBzEfl8t0b3VbukuN5q0yzTUYN/IhP2ZElDXtBc="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kimageformats-6.9.0.tar.xz",
+ "hash": "sha256-gxfc5mp3NkjFwA8KZ2FWxO5OcdfJhUCQDDG3twpQ9t8="
},
"kio": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kio-6.8.0.tar.xz",
- "hash": "sha256-y4rCWlMk6LYXgX/u/N93Oesg3DXc9ERLiGwdy7maVr4="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kio-6.9.0.tar.xz",
+ "hash": "sha256-U2CWKwubwG0B+GiIyJbKWRzNLQvKebf1zENnpuMbNos="
},
"kirigami": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kirigami-6.8.0.tar.xz",
- "hash": "sha256-DguQrJa6SWMOLAHYl3vYxRyasYCDE/yI9g3heXAHQqI="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kirigami-6.9.0.tar.xz",
+ "hash": "sha256-o0Kci89A4lLRGwpMNaQ8BDOpg16hszNYBwc3m3tcgsA="
},
"kitemmodels": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kitemmodels-6.8.0.tar.xz",
- "hash": "sha256-THraGyliGAOxZMMd42WNW9odXUzxAelzYoucL+GYI2U="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kitemmodels-6.9.0.tar.xz",
+ "hash": "sha256-q02vwMqCGfpHiUOfWsoIpyusYNoLKQJnEGNq9+iLcyQ="
},
"kitemviews": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kitemviews-6.8.0.tar.xz",
- "hash": "sha256-62gx/b/tozKFAP8PP1ewkBwEz75zpac4N64LEbIpJa8="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kitemviews-6.9.0.tar.xz",
+ "hash": "sha256-h0sH1CmdgSqI8ei1+ONWzpjCuCPlJ686cpCcosUOPPM="
},
"kjobwidgets": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kjobwidgets-6.8.0.tar.xz",
- "hash": "sha256-hvIwHdm+heYt7ml4df9acxhj2wgyM7SwxgSdq2SphQE="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kjobwidgets-6.9.0.tar.xz",
+ "hash": "sha256-gYZ5eKOt1cJTnmrEz9FxGuRM61D0ZU9ZjF3QqwVVNxY="
},
"knewstuff": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/knewstuff-6.8.0.tar.xz",
- "hash": "sha256-NhUFCfm3+h68k1FfxHRgGWKvHkcSy9RfsTYQrhvtRMo="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/knewstuff-6.9.0.tar.xz",
+ "hash": "sha256-rjc4UV0X7LVqK02xeioxfxs2dlGPw11GFjG8tvpGxOo="
},
"knotifications": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/knotifications-6.8.0.tar.xz",
- "hash": "sha256-GznXfAJeBv0hxxYAD1EkaBCixettoqP3+zzl3oLM+K8="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/knotifications-6.9.0.tar.xz",
+ "hash": "sha256-Mz/hvRekqRjOptUf0FNci4jh+y5PgspzDQ+LSPDwQi8="
},
"knotifyconfig": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/knotifyconfig-6.8.0.tar.xz",
- "hash": "sha256-yaMdb0VmsBzd12DehPXSlihxzQOHmTgXBC/CkWmTiL8="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/knotifyconfig-6.9.0.tar.xz",
+ "hash": "sha256-GbAwR35gn/V20tgIhnM68gm10NI4TdHRGHfLncOApIk="
},
"kpackage": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kpackage-6.8.0.tar.xz",
- "hash": "sha256-0y5vYUjZzZPzIaZSz6TTP98jSa8QGWQSROKE4dLA0rY="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kpackage-6.9.0.tar.xz",
+ "hash": "sha256-YqdriWN4tLejklKPv7n/hCf5n3J/8n4qXgb+XL71Z6k="
},
"kparts": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kparts-6.8.0.tar.xz",
- "hash": "sha256-CiHSq/TEQGAV99Wr6+/sBJNXWEfqTsNOoj1T21JVsyc="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kparts-6.9.0.tar.xz",
+ "hash": "sha256-r8nE6JezcaUViTQu0Fc4ib9Pq3m4G5ppUKRc2frt14g="
},
"kpeople": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kpeople-6.8.0.tar.xz",
- "hash": "sha256-2QmzyTlktqnS/Cn2P+AEBhrc5O8CXcbc/e0Up6a7lTA="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kpeople-6.9.0.tar.xz",
+ "hash": "sha256-J+5bX4ZdMJN0pT1Aht7hTPTgL5ndmub65xp+PgKtdCI="
},
"kplotting": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kplotting-6.8.0.tar.xz",
- "hash": "sha256-c2yV93YcoGJYXtK1tyZWubtqXnBlSMvZ8H2k9iyPuos="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kplotting-6.9.0.tar.xz",
+ "hash": "sha256-XhiD0QfeFszXonMjxVdbsewv7CLETJwxmbPeiF9cGPQ="
},
"kpty": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kpty-6.8.0.tar.xz",
- "hash": "sha256-+8fzkKC4OXpRY/FrFAwGYsmU9hSgX35aUWFJPDy8PjY="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kpty-6.9.0.tar.xz",
+ "hash": "sha256-U1GwFYWt/plUJW2Td/5dluDJQ6qu63g1eiOPmEMEoj0="
},
"kquickcharts": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kquickcharts-6.8.0.tar.xz",
- "hash": "sha256-NugREaf67SCDYnRvhmRu0QTj4xShgukofPLSFPJhAjk="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kquickcharts-6.9.0.tar.xz",
+ "hash": "sha256-3xfDNq64heDVM5Fr9SEZEOTwhE+LzItFQj3ZoKAoOe8="
},
"krunner": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/krunner-6.8.0.tar.xz",
- "hash": "sha256-RigsSTTfvC0l33Cwu/ZRgsMNjDnCGjp0n+VmHjs0w/s="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/krunner-6.9.0.tar.xz",
+ "hash": "sha256-60pe5zC41TZB2LCL3rjUuwZbGbbeP6KuklBDaCLwDYw="
},
"kservice": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kservice-6.8.0.tar.xz",
- "hash": "sha256-Iwls8j7j8mJgnAk/NskME5NQ6rHRMhMuC/wCrYuBgSg="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kservice-6.9.0.tar.xz",
+ "hash": "sha256-9P9XT0IrJ1dfBMdJFpQWLGHH20rZI1ZUCPojuafpZ18="
},
"kstatusnotifieritem": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kstatusnotifieritem-6.8.0.tar.xz",
- "hash": "sha256-bk/4G4DXhC0qEOe3WOSXs3JPxU6jptpvCb7oBjZDmDI="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kstatusnotifieritem-6.9.0.tar.xz",
+ "hash": "sha256-cwiiYVpgakTT6mU5JeNM+AOp9PTOo2NCclAk/O5jwIM="
},
"ksvg": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/ksvg-6.8.0.tar.xz",
- "hash": "sha256-/mWwhS10rHO6S1l/41LpG/dM9h//+ARqG9URyKhQhOM="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/ksvg-6.9.0.tar.xz",
+ "hash": "sha256-zNc24DKkCJ4dGy+Cm1VAf/0zOhg/jMoa1BGE5ouevNY="
},
"ktexteditor": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/ktexteditor-6.8.0.tar.xz",
- "hash": "sha256-alirdMTv3fMWEXToYNIRQmRUEi6ESyX8Je9igqHnonA="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/ktexteditor-6.9.0.tar.xz",
+ "hash": "sha256-GxZg3GoH8h2Z/lSVlR8l8en2HbY/j1C8L2EEgrwVs8o="
},
"ktexttemplate": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/ktexttemplate-6.8.0.tar.xz",
- "hash": "sha256-OoPa+0B1rwuwFVVqZCBQlPzKK6xbn7De5hTq/yUqBBI="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/ktexttemplate-6.9.0.tar.xz",
+ "hash": "sha256-TF9sce4YlShal+EymmDGoNxfispIdZcPS990QvIRyKk="
},
"ktextwidgets": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/ktextwidgets-6.8.0.tar.xz",
- "hash": "sha256-XR0uMhM8v3frYNJE3PT9EMKFVeONpTdsAjtGK5tosrg="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/ktextwidgets-6.9.0.tar.xz",
+ "hash": "sha256-2pZsbgHPsxJewxpNIUk3KhnRSBRBhp7On87ztwuzUU0="
},
"kunitconversion": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kunitconversion-6.8.0.tar.xz",
- "hash": "sha256-5iBUeIHmNcyKqXcabsqal6bLQJJawHXTPvd0T6zB2VQ="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kunitconversion-6.9.0.tar.xz",
+ "hash": "sha256-6lesb6DMwi28vPhwV8q8gTp/eyWlz6Q0mCnQDhNL/Rw="
},
"kuserfeedback": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kuserfeedback-6.8.0.tar.xz",
- "hash": "sha256-fp3FceNeJjT9Q9QqRobJIQl4KPulVD1KegHvf5udrbU="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kuserfeedback-6.9.0.tar.xz",
+ "hash": "sha256-0SvsDAOW9YlCOneoqOPI5/3I6cuI7G6zWtl4oxJ65eg="
},
"kwallet": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kwallet-6.8.0.tar.xz",
- "hash": "sha256-4LUxHYjZLKW95MJK6HXcOk/GfpMZ0N4qSeJdBEYehig="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kwallet-6.9.0.tar.xz",
+ "hash": "sha256-UjEeZWRFv24Wyu1RRomLLSMwncw1v9HOTJHAu9BAU3w="
},
"kwidgetsaddons": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kwidgetsaddons-6.8.0.tar.xz",
- "hash": "sha256-z4Zm7A8Kcg/qtkHqPhla8UBqQAgNEY0c9P+vEjxvqwg="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kwidgetsaddons-6.9.0.tar.xz",
+ "hash": "sha256-vafVzvMQrTuOCqmszzGcM0nit8vq1nO9JaOa9ZN4ekg="
},
"kwindowsystem": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kwindowsystem-6.8.0.tar.xz",
- "hash": "sha256-e0xSDnnC6xD5ih17TXVjPukNGHOvut+fYHUeZ7wOJDY="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kwindowsystem-6.9.0.tar.xz",
+ "hash": "sha256-mw+W+wBz97qJeIzVoQ+6b5YM6obrorAzNvpuMJ5eh1s="
},
"kxmlgui": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/kxmlgui-6.8.0.tar.xz",
- "hash": "sha256-mX8xCkbsLBUwEPxZZ3UzkKmbxQYh0Z+SZIgWQXLFH8w="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/kxmlgui-6.9.0.tar.xz",
+ "hash": "sha256-OSAlkseP5yKQPClciRoLWN0EEZM0YUEgAPVifLv6fYg="
},
"modemmanager-qt": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/modemmanager-qt-6.8.0.tar.xz",
- "hash": "sha256-CiLuylr897QgWbvfUGkk8lutFN9zfIhPqP0+J146Fxs="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/modemmanager-qt-6.9.0.tar.xz",
+ "hash": "sha256-39BgDZyT/tIp7Z4ATMoAGAz/8O0Qwb/U6yTYicLx0FY="
},
"networkmanager-qt": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/networkmanager-qt-6.8.0.tar.xz",
- "hash": "sha256-FYeSUe8aXohGW3j49Z4r49HylpTFyRUfoNVC6niUl2c="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/networkmanager-qt-6.9.0.tar.xz",
+ "hash": "sha256-l9i1P2+HDnfpWvl2ka8eRjZzunsFRh6RwmqYAfOktFs="
},
"prison": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/prison-6.8.0.tar.xz",
- "hash": "sha256-uue1p2xG4ri3yBwaqvIHIdBQz99IKR0rzGb1dZCy3rM="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/prison-6.9.0.tar.xz",
+ "hash": "sha256-6EE1RzdWp7bN/LwCa0ZBEtwCwVhVDsMUmzCOBlp5hEM="
},
"purpose": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/purpose-6.8.0.tar.xz",
- "hash": "sha256-fugYJlElHIKAp99iiNP2JXadzYtKbU/ufv5WmVQ18Go="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/purpose-6.9.0.tar.xz",
+ "hash": "sha256-FwmjHURue+QyF5t/zS7ibo47n94KOas1V4NWQ4c65Vg="
},
"qqc2-desktop-style": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/qqc2-desktop-style-6.8.0.tar.xz",
- "hash": "sha256-6WkvANebljvcrnFsqrlkwlNHUMhdf+AvznqQgAPrTaM="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/qqc2-desktop-style-6.9.0.tar.xz",
+ "hash": "sha256-PpwGmOezkrERDAFtYyvOIbMvgeZa39ooW20B1tbrRGk="
},
"solid": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/solid-6.8.0.tar.xz",
- "hash": "sha256-rOUUX1nbVIvPQjy2tw/YcP77o38HpkkWQ5SoArPKeUE="
+ "version": "6.9.1",
+ "url": "mirror://kde/stable/frameworks/6.9/solid-6.9.1.tar.xz",
+ "hash": "sha256-JU1WLaZhGhXx9hfnr7eNRwJFW4nKld4dup9rmSgyA2c="
},
"sonnet": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/sonnet-6.8.0.tar.xz",
- "hash": "sha256-xCG0YCFPOiWEKryyYFJRudqJtimtk2Fg051KpQJAVjY="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/sonnet-6.9.0.tar.xz",
+ "hash": "sha256-FY84r0WWduz39du+OQFOv5v64pVXyhScHW/1V1ptYA0="
},
"syndication": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/syndication-6.8.0.tar.xz",
- "hash": "sha256-v84kBvpM+D8ikRwc19uvwleLYV+EM2i1UGm4/2MOK6k="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/syndication-6.9.0.tar.xz",
+ "hash": "sha256-ZCZCxMB/2gvGMUywhgI3CxbCkPNEY9L0TUTw5aa/scI="
},
"syntax-highlighting": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/syntax-highlighting-6.8.0.tar.xz",
- "hash": "sha256-7Tx9PZLBVNmvOaGro5FmsH5kEcGMMQARYgjzpEI7Elc="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/syntax-highlighting-6.9.0.tar.xz",
+ "hash": "sha256-1v0HAg7leRdRehwDvfNuZhsIPIRVxInPlK13qQ7CnHA="
},
"threadweaver": {
- "version": "6.8.0",
- "url": "mirror://kde/stable/frameworks/6.8/threadweaver-6.8.0.tar.xz",
- "hash": "sha256-iGTdMLelX3UcG6gavaeJo5NJZL4YuhyOaU4rxIdov94="
+ "version": "6.9.0",
+ "url": "mirror://kde/stable/frameworks/6.9/threadweaver-6.9.0.tar.xz",
+ "hash": "sha256-0kkYHSGqia1vUQjbOxiMJclBXJg0EQ+NFfa6st85wZA="
}
}
\ No newline at end of file
diff --git a/pkgs/kde/plasma/kpipewire/default.nix b/pkgs/kde/plasma/kpipewire/default.nix
index eb604d1a61c44..e717b24d5394f 100644
--- a/pkgs/kde/plasma/kpipewire/default.nix
+++ b/pkgs/kde/plasma/kpipewire/default.nix
@@ -4,7 +4,7 @@
pkg-config,
pipewire,
ffmpeg,
- mesa,
+ libgbm,
libva,
}:
mkKdeDerivation {
@@ -15,7 +15,7 @@ mkKdeDerivation {
qtquick3d
pipewire
ffmpeg
- mesa
+ libgbm
libva
];
}
diff --git a/pkgs/kde/plasma/kwin/default.nix b/pkgs/kde/plasma/kwin/default.nix
index 306498d07e058..0d78ac721cf2e 100644
--- a/pkgs/kde/plasma/kwin/default.nix
+++ b/pkgs/kde/plasma/kwin/default.nix
@@ -12,7 +12,7 @@
libcanberra,
libdisplay-info,
libei,
- mesa,
+ libgbm,
lcms2,
pipewire,
krunner,
@@ -54,7 +54,7 @@ mkKdeDerivation {
krunner
- mesa # libgbm
+ libgbm
lcms2
libcanberra
libdisplay-info
diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix
index 65b9c3e2678ad..436319b6b6e97 100644
--- a/pkgs/misc/drivers/utsushi/default.nix
+++ b/pkgs/misc/drivers/utsushi/default.nix
@@ -53,7 +53,7 @@ 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 27cd34d9e935f..0e058a7900308 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 c3547aae44ed5..8f283c6bec540 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 388de3730380e..0000000000000
--- 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 21426257fe35b..7d3077b10e4e5 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 69b7d270f17b4..66fa5116bf0dd 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 8c4ce874c64c5..0000000000000
--- 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 6463517166784..f994ab88d0290 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 8e5f344f64900..0000000000000
--- 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 3382128b0e91e..1edde5a1d8c65 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 719f602ec60d0..00270488507a8 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 9487eb189c85d..edc71e50e8682 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 170f9ac242436..638742f978c2a 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 a4751bf0757a8..584d2a312a605 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 d54ac1fbd295e..0000000000000
--- 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 243f66f56d6bb..4ad2619face85 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,
@@ -111,8 +110,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 8bfdeb6bfa27a..285ee3b616e3e 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 cacd64bb7b554..b4f4f9556a1a1 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 b4bbf77a21d9b..b29e711251d67 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 7838aa2b7fe96..0000000000000
--- 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 d9b115db5742f..58defd296f18a 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 731c60420a127..9d657d702b7de 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 8f1f213ae5c44..86eaba2136e53 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 672a15a40b8e3..ad3f05939d5ba 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 b5163b6b4d956..ab9f28605b5af 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 33612f0cd1f9d..d3582b5013f38 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 98c83c1b6306b..9d8cd9be2e530 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 1d6647869cc6e..f12b3fe41b924 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 b7239730e2830..f4d1b83f8c298 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 08e5b68cad8f3..0000000000000
--- 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 6f89b31236b4a..c77ea6ef4ffe5 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 e97ca8081b754..95867cad11862 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 55d24e5e27e6b..0000000000000
--- 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 f08b9efce1a29..35737d5f748be 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/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix
index 76b2617f0eeb8..f1ee1ce9e6ab0 100644
--- a/pkgs/os-specific/linux/anbox/default.nix
+++ b/pkgs/os-specific/linux/anbox/default.nix
@@ -20,7 +20,7 @@
libGL,
libglvnd,
lxc,
- mesa,
+ libgbm,
properties-cpp,
protobuf,
protobufc,
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
libdwarf
libGL
lxc
- mesa
+ libgbm
properties-cpp
protobuf
python3
diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index c607950c41ebe..c34d964eeb470 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -46,16 +46,30 @@ stdenv.mkDerivation rec {
hash = "sha256-xELFL60Ryv1VE7tOhGyFHxAchIT4karFRe0ZDo/U0Q8=";
};
- prePatch = ''
- substituteInPlace ./support/tools/ffado-diag.in \
- --replace /lib/modules/ "/run/booted-system/kernel-modules/lib/modules/"
- '';
+ prePatch =
+ ''
+ substituteInPlace ./support/tools/ffado-diag.in \
+ --replace /lib/modules/ "/run/booted-system/kernel-modules/lib/modules/"
+
+ # prevent build tools from leaking into closure
+ substituteInPlace support/tools/SConscript --replace-fail \
+ 'support/tools/ffado-diag --static' \
+ "echo '"'See `nix-store --query --tree ${placeholder "out"}`.'"'"
+ ''
+ + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+ # skip the CC sanity check, since that requires invoking cross-compiled binaries during build
+ substituteInPlace SConstruct \
+ --replace-fail 'conf.CompilerCheck()' 'True' \
+ --replace-fail "pkg-config" "$PKG_CONFIG"
+ substituteInPlace admin/pkgconfig.py \
+ --replace-fail "pkg-config" "$PKG_CONFIG"
+ '';
nativeBuildInputs =
[
(scons.override {
# SConstruct script depends on distutils removed in Python 3.12
- python3Packages = python311.pkgs;
+ python3Packages = python311.pythonOnBuildForHost.pkgs;
})
pkg-config
which
@@ -68,6 +82,8 @@ stdenv.mkDerivation rec {
prefixKey = "PREFIX=";
sconsFlags = [
+ "CUSTOM_ENV=True" # tell SConstruct to use nixpkgs' CC/CXX/CFLAGS
+ "DETECT_USERSPACE_ENV=False"
"DEBUG=False"
"ENABLE_ALL=True"
"BUILD_TESTS=True"
@@ -99,11 +115,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
dontWrapQtApps = true;
-
- postInstall = ''
- # prevent build tools from leaking into closure
- echo 'See `nix-store --query --tree ${placeholder "out"}`.' > $out/lib/libffado/static_info.txt
- '';
+ strictDeps = true;
preFixup = lib.optionalString withMixer ''
wrapQtApp "$bin/bin/ffado-mixer"
diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix
index 6848b7dfee79f..b0737e3e8d6a7 100644
--- a/pkgs/os-specific/linux/iptables/default.nix
+++ b/pkgs/os-specific/linux/iptables/default.nix
@@ -17,12 +17,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 = [
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index 7538bec37f078..6f3b95dc64183 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -143,13 +143,13 @@ in
linuxHeaders =
let
- version = "6.10";
+ 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/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix
index 560980f6002f2..aa02aeb104577 100644
--- a/pkgs/os-specific/linux/lvm2/2_03.nix
+++ b/pkgs/os-specific/linux/lvm2/2_03.nix
@@ -1,4 +1,4 @@
import ./common.nix {
- version = "2.03.27";
- hash = "sha256-MTNBWQW5tG0VLQZIZdUvMu7k/L6w6KaeNRDK6q4MVqk=";
+ version = "2.03.28";
+ hash = "sha256-uCK6/2ti3zY4LHF866mKJojrsxvyt2jz/6K21eJVckI=";
}
diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix
index b690a19de29fe..830464053a050 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/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index db6d89f80bb3b..3e45be1123fc2 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -113,7 +113,7 @@ let
zlib
stdenv.cc.cc
wayland
- mesa
+ libgbm
libGL
openssl
dbus # for nvidia-powerd
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 9279b53b6da49..11305c4178064 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "2024.11.3";
+ version = "2024.12.5";
components = {
"3_day_blinds" =
ps: with ps; [
@@ -11,6 +11,32 @@
ps: with ps; [
jaraco-abode
];
+ "acaia" =
+ ps: with ps; [
+ aioacaia
+ aioesphomeapi
+ aioruuvigateway
+ aioshelly
+ bleak
+ bleak-esphome
+ bleak-retry-connector
+ bluetooth-adapters
+ bluetooth-auto-recovery
+ bluetooth-data-tools
+ dbus-fast
+ esphome-dashboard-api
+ ha-ffmpeg
+ habluetooth
+ hassil
+ home-assistant-intents
+ ifaddr
+ mutagen
+ pymicro-vad
+ pyserial
+ pyspeex-noise
+ pyudev
+ zeroconf
+ ];
"accuweather" =
ps: with ps; [
accuweather
@@ -885,7 +911,7 @@
];
"compensation" =
ps: with ps; [
- numpy_1
+ numpy
];
"concord232" =
ps: with ps; [
@@ -1015,7 +1041,7 @@
home-assistant-intents
ifaddr
mutagen
- numpy_1
+ numpy
pillow
psutil-home-assistant
pymicro-vad
@@ -2617,7 +2643,7 @@
];
"iqvia" =
ps: with ps; [
- numpy_1
+ numpy
pyiqvia
];
"irish_rail_transport" =
@@ -2886,12 +2912,13 @@
home-assistant-intents
ifaddr
mutagen
+ pylamarzocco
pymicro-vad
pyserial
pyspeex-noise
pyudev
zeroconf
- ]; # missing inputs: lmcloud
+ ];
"lametric" =
ps: with ps; [
demetriek
@@ -3584,6 +3611,10 @@
ps: with ps; [
mullvad-api
];
+ "music_assistant" =
+ ps: with ps; [
+ music-assistant-client
+ ];
"mutesync" =
ps: with ps; [
mutesync
@@ -3631,6 +3662,9 @@
ps: with ps; [
aionanoleaf
];
+ "nasweb" =
+ ps: with ps; [
+ ]; # missing inputs: webio-api
"neato" =
ps: with ps; [
pybotvac
@@ -3755,6 +3789,10 @@
ps: with ps; [
pynobo
];
+ "nordpool" =
+ ps: with ps; [
+ pynordpool
+ ];
"norway_air" =
ps: with ps; [
pymetno
@@ -4973,6 +5011,10 @@
ps: with ps; [
pyskyqhub
];
+ "sky_remote" =
+ ps: with ps; [
+ skyboxremote
+ ];
"skybeacon" =
ps:
with ps;
@@ -5244,7 +5286,7 @@
"stream" =
ps: with ps; [
av
- numpy_1
+ numpy
pyturbojpeg
];
"streamlabswater" =
@@ -5435,8 +5477,7 @@
];
"tedee" =
ps: with ps; [
- pytedee-async
- ];
+ ]; # missing inputs: aiotedee
"telegram" =
ps:
with ps;
@@ -5470,7 +5511,7 @@
];
"tensorflow" =
ps: with ps; [
- numpy_1
+ numpy
pillow
pycocotools
tensorflow
@@ -5745,7 +5786,7 @@
]; # missing inputs: TravisPy
"trend" =
ps: with ps; [
- numpy_1
+ numpy
];
"triggercmd" =
ps: with ps; [
@@ -5867,7 +5908,7 @@
];
"utility_meter" =
ps: with ps; [
- croniter
+ cronsim
];
"uvc" =
ps: with ps; [
@@ -6379,6 +6420,7 @@
# components listed in tests/components for which all dependencies are packaged
supportedComponentsWithTests = [
"abode"
+ "acaia"
"accuweather"
"acmeda"
"adax"
@@ -6774,6 +6816,7 @@
"kostal_plenticore"
"kraken"
"kulersky"
+ "lamarzocco"
"lametric"
"landisgyr_heat_meter"
"lastfm"
@@ -6866,6 +6909,7 @@
"mqtt_room"
"mqtt_statestream"
"mullvad"
+ "music_assistant"
"mutesync"
"my"
"myq"
@@ -6895,6 +6939,7 @@
"nmap_tracker"
"no_ip"
"nobo_hub"
+ "nordpool"
"notify"
"notify_events"
"notion"
@@ -7058,6 +7103,7 @@
"simplisafe"
"simulated"
"siren"
+ "sky_remote"
"skybell"
"slack"
"sleepiq"
@@ -7132,7 +7178,6 @@
"tautulli"
"tcp"
"technove"
- "tedee"
"telegram"
"telegram_bot"
"tellduslive"
diff --git a/pkgs/servers/home-assistant/custom-components/dwd/package.nix b/pkgs/servers/home-assistant/custom-components/dwd/package.nix
index 5d8cba11f2d78..9968ba73fc357 100644
--- a/pkgs/servers/home-assistant/custom-components/dwd/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/dwd/package.nix
@@ -8,13 +8,13 @@
buildHomeAssistantComponent rec {
owner = "hg1337";
domain = "dwd";
- version = "2024.9.0";
+ version = "2024.11.0";
src = fetchFromGitHub {
owner = "hg1337";
repo = "homeassistant-dwd";
rev = version;
- hash = "sha256-9zS6ufy7tYt1KwFeqdg0Az8xz3x5UzU9ZO9aOyWjdQE=";
+ hash = "sha256-v5xSIUW8EMTdLY66yZ31cR/1DWVvn85CfIl/Y4xpXiw=";
};
dependencies = [ defusedxml ];
diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
index 6c99b07f4c3ac..29fd801e38aae 100644
--- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
@@ -9,13 +9,13 @@
buildHomeAssistantComponent rec {
owner = "danielperna84";
domain = "homematicip_local";
- version = "1.73.0";
+ version = "1.75.0";
src = fetchFromGitHub {
owner = "danielperna84";
repo = "custom_homematic";
rev = "refs/tags/${version}";
- hash = "sha256-1ssmaX6G03i9KYgjCRMZqOG2apEZ0069fQnmVy2BVhA=";
+ hash = "sha256-H5Gf09C9/s2JYVTjgiYNe28mV18mqTiJ0ZDR6rnuojo=";
};
postPatch = ''
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 2f317538db2ea..c49ceef951eb2 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -163,15 +163,6 @@ let
doCheck = false; # no tests
});
- plugwise = super.plugwise.overridePythonAttrs (oldAttrs: rec {
- version = "1.4.4";
- src = fetchFromGitHub {
- inherit (oldAttrs.src) owner repo;
- rev = "refs/tags/v${version}";
- hash = "sha256-dlDytOSp/7npanxXH5uaDv29AP21UciEzIzDlMf6jf8=";
- };
- });
-
# Pinned due to API changes in 0.1.0
poolsense = super.poolsense.overridePythonAttrs (oldAttrs: rec {
version = "0.0.8";
@@ -237,6 +228,21 @@ let
};
});
+ pylamarzocco = super.pylamarzocco.overridePythonAttrs (oldAttrs: rec {
+ version = "1.2.12";
+ src = fetchFromGitHub {
+ owner = "zweckj";
+ repo = "pylamarzocco";
+ tag = "v${version}";
+ hash = "sha256-h3Oh1y1tirOWh3I8piybLZfTKwyGk0zJJ6XmHvmbUW0=";
+ };
+ dependencies = with self; [
+ bleak
+ httpx
+ websockets
+ ];
+ });
+
pymodbus = super.pymodbus.overridePythonAttrs (oldAttrs: rec {
version = "3.6.9";
src = fetchFromGitHub {
@@ -445,7 +451,7 @@ let
extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run update-component-packages.py after updating
- hassVersion = "2024.11.3";
+ hassVersion = "2024.12.5";
in
python.pkgs.buildPythonApplication rec {
@@ -466,13 +472,13 @@ python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = "refs/tags/${version}";
- hash = "sha256-9b4HPSCPYUUwKxn0JBw5uN6nI97jvgqBHFRUNhDue/k=";
+ hash = "sha256-LJgwtVQvO1iUPYfzAsE6l9u4+EIzAnc3IJ5FZb3xniM=";
};
# Secondary source is pypi sdist for translations
sdist = fetchPypi {
inherit pname version;
- hash = "sha256-W7Z6C3kMyEIkY/3zQHm1OMMN7Tuj3ThsubLo6KjVotw=";
+ hash = "sha256-PfedigJWHLv2BqHOgVedDyJxxxSmdHe2CvPNYCWi6aA=";
};
build-system = with python.pkgs; [
@@ -516,6 +522,8 @@ python.pkgs.buildPythonApplication rec {
src = ./patches/ffmpeg-path.patch;
ffmpeg = "${lib.getExe ffmpeg-headless}";
})
+
+ ./patches/watchdog5-compat.patch
];
postPatch = ''
@@ -558,6 +566,7 @@ python.pkgs.buildPythonApplication rec {
python-slugify
pyyaml
requests
+ securetar
sqlalchemy
typing-extensions
ulid-transform
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 11f376e412582..ab8fbd714311f 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -8,7 +8,7 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
- version = "20241106.2";
+ version = "20241127.8";
format = "wheel";
src = fetchPypi {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
- hash = "sha256-9Il9/lHKIaymw7H8fL1gpp80+VzSqVJ1IyHGEa3OoO8=";
+ hash = "sha256-6VQ5IgAsPMzHlBe20EinjByGC2AzUY5mYFVHBvIdR0E=";
};
# there is nothing to strip in this package
diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix
index b33c9e227fe02..1acce31705b27 100644
--- a/pkgs/servers/home-assistant/intents.nix
+++ b/pkgs/servers/home-assistant/intents.nix
@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "home-assistant-intents";
- version = "2024.11.6";
+ version = "2024.12.9";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
repo = "intents-package";
rev = "refs/tags/${version}";
fetchSubmodules = true;
- hash = "sha256-C2q0mUdA6VGKPHtG2g9Zi0nPvwWP1LAdepJCRkF4ky8=";
+ hash = "sha256-tjJLm3SCSKy2PWahzpEOHz1PgD1VNuxxpszhBWPrcOw=";
};
build-system = [
diff --git a/pkgs/servers/home-assistant/patches/watchdog5-compat.patch b/pkgs/servers/home-assistant/patches/watchdog5-compat.patch
new file mode 100644
index 0000000000000..d4e27769579bc
--- /dev/null
+++ b/pkgs/servers/home-assistant/patches/watchdog5-compat.patch
@@ -0,0 +1,13 @@
+diff --git a/homeassistant/components/folder_watcher/__init__.py b/homeassistant/components/folder_watcher/__init__.py
+index 3aeaa6f7ef2..f5c2db513b7 100644
+--- a/homeassistant/components/folder_watcher/__init__.py
++++ b/homeassistant/components/folder_watcher/__init__.py
+@@ -68,7 +68,7 @@ class EventHandler(PatternMatchingEventHandler):
+
+ def __init__(self, patterns: list[str], hass: HomeAssistant, entry_id: str) -> None:
+ """Initialise the EventHandler."""
+- super().__init__(patterns)
++ super().__init__(patterns=patterns)
+ self.hass = hass
+ self.entry_id = entry_id
+
diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
index fefbf501f1d22..167b0e023c045 100644
--- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
+++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "pytest-homeassistant-custom-component";
- version = "0.13.180";
+ version = "0.13.191";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "MatthewFlamm";
repo = "pytest-homeassistant-custom-component";
rev = "refs/tags/${version}";
- hash = "sha256-OLCGoZ5C39D4yYJagowO914qJlQcJVScm/a1ZbR2alM=";
+ hash = "sha256-Fm7Sg5u5rkCQFGHnOWimRM4X0EB4xGwY59gdgA1ZFBA=";
};
build-system = [ setuptools ];
diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix
index 3af62cab6a470..9808895b74fa8 100644
--- a/pkgs/servers/home-assistant/stubs.nix
+++ b/pkgs/servers/home-assistant/stubs.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "homeassistant-stubs";
- version = "2024.11.3";
+ version = "2024.12.5";
pyproject = true;
disabled = python.version != home-assistant.python.version;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "KapJI";
repo = "homeassistant-stubs";
rev = "refs/tags/${version}";
- hash = "sha256-wctoMEduYZxGiSNgZWq4OPgBaiykwTY7FP8PhRsMh0I=";
+ hash = "sha256-ixDHGcs2Cvf6tIxYnn4j9Qs8MkmB1PGgIKnEN676Qs0=";
};
build-system = [
diff --git a/pkgs/servers/home-assistant/update-component-packages.py b/pkgs/servers/home-assistant/update-component-packages.py
index 5d8dbacd91bc2..68301faf35ecc 100755
--- a/pkgs/servers/home-assistant/update-component-packages.py
+++ b/pkgs/servers/home-assistant/update-component-packages.py
@@ -1,5 +1,5 @@
#! /usr/bin/env nix-shell
-#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ packaging rich ])" -p pyright ruff isort
+#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ packaging rich ])" -p pyright ruff isort nixfmt-rfc-style
#
# This script downloads Home Assistant's source tarball.
# Inside the homeassistant/components directory, each integration has an associated manifest.json,
@@ -42,7 +42,7 @@
"fiblary3": "fiblary3-fork", # https://github.com/home-assistant/core/issues/66466
"HAP-python": "hap-python",
"ha-av": "av",
- "numpy": "numpy_1",
+ "numpy": "numpy",
"ollama-hass": "ollama",
"paho-mqtt": "paho-mqtt_1",
"pysuezV2": "pysuez",
@@ -279,7 +279,8 @@ def main() -> None:
else:
build_inputs[component] = (attr_paths, extra_attrs, missing_reqs)
- with open(os.path.dirname(sys.argv[0]) + "/component-packages.nix", "w") as f:
+ outpath = os.path.dirname(sys.argv[0]) + "/component-packages.nix"
+ with open(outpath, "w") as f:
f.write("# Generated by update-component-packages.py\n")
f.write("# Do not edit!\n\n")
f.write("{\n")
@@ -307,6 +308,8 @@ def main() -> None:
f.write(" ];\n")
f.write("}\n")
+ run_sync(["nixfmt", outpath])
+
supported_components = reduce(lambda n, c: n + (build_inputs[c][2] == []),
components.keys(), 0)
total_components = len(components)
diff --git a/pkgs/servers/mir/common.nix b/pkgs/servers/mir/common.nix
index 4041ae7cf087e..e41798d6aa08d 100644
--- a/pkgs/servers/mir/common.nix
+++ b/pkgs/servers/mir/common.nix
@@ -25,7 +25,7 @@
libxmlxx,
yaml-cpp,
lttng-ust,
- mesa,
+ libgbm,
nettle,
udev,
wayland,
@@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
libxmlxx
yaml-cpp
lttng-ust
- mesa
+ libgbm
nettle
udev
wayland
diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix
index 1d0bda2861697..88da6993a6d46 100644
--- a/pkgs/servers/nosql/mongodb/mongodb.nix
+++ b/pkgs/servers/nosql/mongodb/mongodb.nix
@@ -153,14 +153,14 @@ stdenv.mkDerivation rec {
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/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix
index 9adbf38811ef9..96f7141f953be 100644
--- a/pkgs/servers/osrm-backend/default.nix
+++ b/pkgs/servers/osrm-backend/default.nix
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "osrm-backend";
- version = "5.27.1";
+ version = "5.27.1-unstable-2024-11-03";
src = fetchFromGitHub {
owner = "Project-OSRM";
repo = "osrm-backend";
- rev = "v${version}";
- sha256 = "sha256-3oA/U5O4GLfwMF7x99JQuFK7ewDrLJLh6BBLYfnyNaM=";
+ rev = "3614af7f6429ee35c3f2e836513b784a74664ab6";
+ hash = "sha256-iix++G49cC13wZGZIpXu1SWGtVAcqpuX3GhsIaETzUU=";
};
nativeBuildInputs = [
@@ -43,37 +43,8 @@ stdenv.mkDerivation rec {
expat
];
- patches = [
- # gcc-13 build fix:
- # https://github.com/Project-OSRM/osrm-backend/pull/6632
- (fetchpatch {
- name = "gcc-13.patch";
- url = "https://github.com/Project-OSRM/osrm-backend/commit/af59a9cfaee4d601b5c88391624a05f2a38da17b.patch";
- hash = "sha256-dB9JP/DrJXpFGLD/paein2z64UtHIYZ17ycb91XWpEI=";
- })
- ];
-
- env.NIX_CFLAGS_COMPILE = toString (
- [
- # Needed with GCC 12
- "-Wno-error=stringop-overflow"
- "-Wno-error=uninitialized"
- # Needed for GCC 13
- "-Wno-error=array-bounds"
- ]
- ++
- # error: aligned deallocation function of type 'void (void *, std::align_val_t) noexcept' is only available on macOS 10.13 or newer
- (lib.optionals
- (
- stdenv.hostPlatform.isDarwin
- && stdenv.hostPlatform.isx86_64
- && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13"
- )
- [
- "-faligned-allocation"
- ]
- )
- );
+ # Needed with GCC 12
+ env.NIX_CFLAGS_COMPILE = "-Wno-error=uninitialized";
postInstall = ''
mkdir -p $out/share/osrm-backend
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 9f6e2a4314fe7..b3426a24a25b8 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -47,7 +47,7 @@ let
libxml2,
linux-pam,
numactl,
- fmt_8,
+ fmt_11,
withStorageMroonga ? true,
kytea,
libsodium,
@@ -65,7 +65,7 @@ let
mytopEnv = buildPackages.perl.withPackages (
p: with p; [
- DBDmysql
+ DBDMariaDB
DBI
TermReadKey
]
@@ -231,7 +231,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"
@@ -286,7 +286,7 @@ let
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 dedefb65da869..4ab28170e2310 100644
--- a/pkgs/servers/sql/mysql/8.0.x.nix
+++ b/pkgs/servers/sql/mysql/8.0.x.nix
@@ -42,6 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
bison
cmake
pkg-config
+ protobuf
] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ];
patches = [
@@ -82,6 +83,8 @@ stdenv.mkDerivation (finalAttrs: {
DarwinTools
];
+ strictDeps = true;
+
outputs = [
"out"
"static"
diff --git a/pkgs/servers/sql/postgresql/13.nix b/pkgs/servers/sql/postgresql/13.nix
index 56db6b0908045..72a8dd8bb3920 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 02292b9a18fbd..e5011f5314caf 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 85a128fbfb131..bf17a088f2bd6 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 d8322f42d3870..fd1957b89386c 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 07335b44570b4..34d2ddeccb277 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 b93695b932d55..3e6c625c60fec 100644
--- a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix
+++ b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix
@@ -3,7 +3,7 @@
lib,
fetchFromGitHub,
postgresql,
- boost182,
+ boost,
postgresqlTestExtension,
buildPostgresqlExtension,
}:
@@ -39,7 +39,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 673ddf4b9eac2..1611fe05600e5 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 7f69714dbd8c4..10cf487ad4a31 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -1,67 +1,107 @@
let
generic =
- # dependencies
+ # utils
{
stdenv,
- lib,
- fetchurl,
fetchpatch,
- makeWrapper,
+ fetchurl,
+ lib,
+ substituteAll,
+ writeShellScriptBin,
+
+ # source specification
+ hash,
+ muslPatches ? { },
+ version,
+
+ # runtime dependencies
+ darwin,
glibc,
- zlib,
- readline,
- openssl,
- icu,
- lz4,
- zstd,
- systemdLibs,
libuuid,
- pkg-config,
libxml2,
+ lz4,
+ openssl,
+ readline,
tzdata,
- libkrb5,
- substituteAll,
- darwin,
- linux-pam,
+ zlib,
+ zstd,
+
+ # build dependencies
bison,
- flex,
- perl,
- docbook_xml_dtd_45,
docbook-xsl-nons,
+ docbook_xml_dtd_45,
+ flex,
libxslt,
-
+ makeWrapper,
+ pkg-config,
removeReferencesTo,
- writeShellScriptBin,
- systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs,
- gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic,
-
- # for postgresql.pkgs
- self,
- newScope,
+ # passthru
buildEnv,
- stdenvNoCC,
+ newScope,
+ nixosTests,
postgresqlTestHook,
+ self,
+ stdenvNoCC,
+ testers,
- # source specification
- version,
- hash,
- muslPatches ? { },
+ # bonjour
+ bonjourSupport ? false,
- # for tests
- testers,
- nixosTests,
+ # 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,
+ 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;
@@ -112,14 +152,10 @@ let
"doc"
"man"
];
- disallowedRequisites =
- [
- stdenv'.cc
- ]
- ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs))
- ++ lib.optionals jitSupport [
- llvmPackages.llvm.out
- ];
+ disallowedRequisites = [
+ stdenv'.cc
+ llvmPackages.llvm.out
+ ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs));
};
outputChecks.lib = {
disallowedReferences = [
@@ -128,35 +164,39 @@ let
"doc"
"man"
];
- disallowedRequisites =
- [
- stdenv'.cc
- ]
- ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs))
- ++ lib.optionals jitSupport [
- llvmPackages.llvm.out
- ];
+ disallowedRequisites = [
+ stdenv'.cc
+ llvmPackages.llvm.out
+ ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs));
};
+ strictDeps = true;
+
buildInputs =
[
zlib
readline
openssl
- (libxml2.override { enableHttp = true; })
- icu
+ libxml2
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
@@ -190,10 +230,13 @@ let
+ (if stdenv'.cc.isClang then " -flto" else " -fmerge-constants -Wl,--gc-sections");
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"
@@ -205,13 +248,17 @@ 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") [
+ ++ 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") [ "--without-perl" ];
+ ++ 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 =
[
@@ -276,7 +323,8 @@ 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
@@ -287,6 +335,8 @@ 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"
@@ -297,6 +347,13 @@ 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 ''
@@ -304,9 +361,14 @@ 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
diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh
index 833acf43a5b0a..1ed163690f89e 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 3cb95ad14bc2f..dbf5fef775767 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;
@@ -1578,11 +1578,11 @@ self: with self; {
# THIS IS A GENERATED FILE. DO NOT EDIT!
libXt = callPackage ({ stdenv, pkg-config, fetchurl, libICE, xorgproto, libSM, libX11, testers }: stdenv.mkDerivation (finalAttrs: {
pname = "libXt";
- version = "1.3.0";
+ version = "1.3.1";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/lib/libXt-1.3.0.tar.xz";
- sha256 = "14dz66rp66ar2a5q0fbsnlcqkbd34801pzdxj3f0hzc2vcy0p0jj";
+ url = "mirror://xorg/individual/lib/libXt-1.3.1.tar.xz";
+ sha256 = "120jjd6l7fjdxy5myrc1dmc0cwpqa18a97hrbg0d9x146frp99z0";
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
@@ -2098,11 +2098,11 @@ self: with self; {
# THIS IS A GENERATED FILE. DO NOT EDIT!
utilmacros = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: {
pname = "util-macros";
- version = "1.20.1";
+ version = "1.20.2";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/util/util-macros-1.20.1.tar.xz";
- sha256 = "1xffkcqv96vpk5pckisanrvg4w7i9ciqhs6yv7sc12p7vii8yc0b";
+ url = "mirror://xorg/individual/util/util-macros-1.20.2.tar.xz";
+ sha256 = "13ifr0dabci130xk04kp9bq16g9kbyzf8x1mgdyjsrsglbmnkhls";
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
@@ -2776,7 +2776,7 @@ self: with self; {
})) {};
# THIS IS A GENERATED FILE. DO NOT EDIT!
- xf86videoamdgpu = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: {
+ xf86videoamdgpu = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libgbm, libGL, libdrm, udev, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: {
pname = "xf86-video-amdgpu";
version = "23.0.0";
builder = ./builder.sh;
@@ -2787,7 +2787,7 @@ self: with self; {
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ xorgproto mesa libGL libdrm udev xorgserver ];
+ buildInputs = [ xorgproto libgbm libGL libdrm udev xorgserver ];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ ];
@@ -2856,7 +2856,7 @@ self: with self; {
})) {};
# THIS IS A GENERATED FILE. DO NOT EDIT!
- xf86videoati = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: {
+ xf86videoati = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libgbm, libGL, libdrm, udev, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: {
pname = "xf86-video-ati";
version = "22.0.0";
builder = ./builder.sh;
@@ -2867,7 +2867,7 @@ self: with self; {
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ xorgproto mesa libGL libdrm udev libpciaccess xorgserver ];
+ buildInputs = [ xorgproto libgbm libGL libdrm udev libpciaccess xorgserver ];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index ee5e5282ea7ec..dde0a9c92dbcb 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
@@ -200,7 +200,7 @@ mirror://xorg/individual/lib/libXres-1.2.2.tar.xz
mirror://xorg/individual/lib/libXScrnSaver-1.2.4.tar.xz
mirror://xorg/individual/lib/libxshmfence-1.3.2.tar.xz
mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libXt-1.3.0.tar.xz
+mirror://xorg/individual/lib/libXt-1.3.1.tar.xz
mirror://xorg/individual/lib/libXtst-1.2.5.tar.xz
mirror://xorg/individual/lib/libXv-1.0.12.tar.xz
mirror://xorg/individual/lib/libXvMC-1.0.14.tar.xz
@@ -216,6 +216,6 @@ mirror://xorg/individual/util/gccmakedep-1.0.4.tar.xz
mirror://xorg/individual/util/imake-1.0.10.tar.xz
mirror://xorg/individual/util/lndir-1.0.5.tar.xz
mirror://xorg/individual/util/makedepend-1.0.9.tar.xz
-mirror://xorg/individual/util/util-macros-1.20.1.tar.xz
+mirror://xorg/individual/util/util-macros-1.20.2.tar.xz
mirror://xorg/individual/util/xorg-cf-files-1.0.8.tar.xz
mirror://xorg/individual/xserver/xorg-server-21.1.14.tar.xz
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index c5815d483bde1..46bb76fc9d6ed 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -130,7 +130,10 @@ rec {
"--disable-shared"
];
cmakeFlags = (args.cmakeFlags or []) ++ [ "-DBUILD_SHARED_LIBS:BOOL=OFF" ];
- mesonFlags = (args.mesonFlags or []) ++ [ "-Ddefault_library=static" ];
+ mesonFlags = (args.mesonFlags or []) ++ [
+ "-Ddefault_library=static"
+ "-Ddefault_both_libraries=static"
+ ];
});
});
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index e6bad23bfacd5..6cc22dd8bb0df 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 243b8e2633d7c..482c11ce0cb2c 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 c4e4bd9309365..087787055c1e1 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -37,6 +37,7 @@ let
splitString
subtractLists
unique
+ zipAttrsWith
;
inherit (import ../../build-support/lib/cmake.nix { inherit lib stdenv; }) makeCMakeFlags;
@@ -134,6 +135,8 @@ let
"__darwinAllowLocalNetworking"
"__impureHostDeps" "__propagatedImpureHostDeps"
"sandboxProfile" "propagatedSandboxProfile"
+ "disallowedReferences" "disallowedRequisites"
+ "allowedReferences" "allowedRequisites"
];
# Turn a derivation into its outPath without a string context attached.
@@ -143,6 +146,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,41 +494,15 @@ 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;
- };
+ }) // (if !__structuredAttrs then makeOutputChecks attrs else {
+ outputChecks = builtins.listToAttrs (map (name: {
+ inherit name;
+ value = zipAttrsWith (_: builtins.concatLists) [
+ (makeOutputChecks attrs)
+ (makeOutputChecks attrs.outputChecks.${name} or {})
+ ];
+ }) outputs);
+ });
in
derivationArg;
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 72fdbef981da8..541689287970b 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,17 @@ 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.
+ # To avoid leaking an unescaped rs character when dumping the environment with nix, we use printf
+ # in a subshell.
+ local IFS="$(printf '\036')" ;;
*)
- echo -n "${nameref// /"${sep}"}" ;;
+ local IFS=" " ;;
+
esac
+ local ifs_separated="${nameref[*]}"
+ echo -n "${ifs_separated//"$IFS"/"$sep"}"
fi
}
@@ -674,7 +685,7 @@ findInputs() {
# shellcheck disable=SC1087
local varSlice="$var[*]"
# ${..-} to hack around old bash empty array problem
- case "${!varSlice-}" in
+ case " ${!varSlice-} " in
*" $pkg "*) return 0 ;;
esac
unset -v varSlice
@@ -1211,7 +1222,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 40b4b1db194d0..bae24800471bb 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -443,6 +443,9 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
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
@@ -596,7 +599,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
binutils
coreutils
gnugrep
- gettext
perl
patchelf
linuxHeaders
diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix
index 11a0d39023559..8d1bdbf3fed1b 100644
--- a/pkgs/test/cc-wrapper/default.nix
+++ b/pkgs/test/cc-wrapper/default.nix
@@ -17,9 +17,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 76dc81de49c81..115836ba22ed1 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 d8f11f98e9b8b..cd333ccf04beb 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 b64837ac2b295..d9b86e6081d4f 100644
--- a/pkgs/tools/cd-dvd/cdrtools/default.nix
+++ b/pkgs/tools/cd-dvd/cdrtools/default.nix
@@ -31,6 +31,11 @@ stdenv.mkDerivation rec {
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 0cbcc4ab832eb..dcc80c0acca7a 100644
--- a/pkgs/tools/filesystems/encfs/default.nix
+++ b/pkgs/tools/filesystems/encfs/default.nix
@@ -33,7 +33,6 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- gettext
fuse
openssl
tinyxml2
@@ -42,7 +41,9 @@ stdenv.mkDerivation rec {
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 19c595215d65b..0000000000000
--- 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 6213406244270..40becb915e1fa 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -16,14 +16,14 @@
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 = [
@@ -32,12 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
"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 495a3dad8330d..1eca97e7d7c74 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 9e9dae6880f1c..85917ccf2d86c 100644
--- a/pkgs/tools/misc/timidity/default.nix
+++ b/pkgs/tools/misc/timidity/default.nix
@@ -4,7 +4,6 @@
fetchurl,
nixosTests,
pkg-config,
- memstreamHook,
CoreAudio,
libobjc,
libjack2,
@@ -33,10 +32,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
diff --git a/pkgs/tools/misc/torrenttools/default.nix b/pkgs/tools/misc/torrenttools/default.nix
index 543e151c8ec8e..27e7eae1bd45f 100644
--- a/pkgs/tools/misc/torrenttools/default.nix
+++ b/pkgs/tools/misc/torrenttools/default.nix
@@ -55,6 +55,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 0000000000000..5bdc666d4bd2e
--- /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 91622b64ebd10..9732b8a98c049 100644
--- a/pkgs/tools/package-management/nix/common.nix
+++ b/pkgs/tools/package-management/nix/common.nix
@@ -27,7 +27,6 @@ in
, coreutils
, curl
, darwin
-, darwinMinVersionHook
, docbook_xsl_ns
, docbook5
, editline
@@ -147,15 +146,6 @@ self = stdenv.mkDerivation {
aws-sdk-cpp
] ++ lib.optional (atLeast224 && 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 fb3380601ff6b..3f266c11bdfbc 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -2,24 +2,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,
@@ -27,121 +21,104 @@
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
+ cmake
pkg-config
- pandoc
- ];
+ autoconf
+ python3
+ gettext
+ ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bubblewrap ];
buildInputs =
[
- cpio
+ bzip2
zlib
zstd
- bzip2
file
libarchive
- libgcrypt
- nspr
- nss
- db
xz
- python
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
] ++ 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 0000000000000..e406c8c23f416
--- /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 73c1ade5bd637..f38764b79163c 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/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix
index 0d4c4387cc4fe..fd4e1abd7e41e 100644
--- a/pkgs/tools/security/keybase/gui.nix
+++ b/pkgs/tools/security/keybase/gui.nix
@@ -8,7 +8,7 @@
cups,
udev,
libdrm,
- mesa,
+ libgbm,
dbus,
expat,
fontconfig,
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
xorg.libXtst
xorg.libxcb
libdrm
- mesa.out
+ libgbm
];
runtimeDependencies = [
diff --git a/pkgs/tools/system/testdisk/default.nix b/pkgs/tools/system/testdisk/default.nix
index 748231da47b61..810d6a8cf7f2e 100644
--- a/pkgs/tools/system/testdisk/default.nix
+++ b/pkgs/tools/system/testdisk/default.nix
@@ -33,6 +33,10 @@ assert enableQt -> qwt != null;
sha256 = "1zlh44w67py416hkvw6nrfmjickc2d43v51vcli5p374d5sw84ql";
};
+ patches = [
+ ./gcc-14-fixes.diff
+ ];
+
postPatch = ''
substituteInPlace linux/qphotorec.desktop \
--replace "/usr" "$out"
diff --git a/pkgs/tools/system/testdisk/gcc-14-fixes.diff b/pkgs/tools/system/testdisk/gcc-14-fixes.diff
new file mode 100644
index 0000000000000..df4fc9140eadc
--- /dev/null
+++ b/pkgs/tools/system/testdisk/gcc-14-fixes.diff
@@ -0,0 +1,15 @@
+diff --git a/src/ntfs_io.c b/src/ntfs_io.c
+index 7f57edd..4b718bb 100644
+--- a/src/ntfs_io.c
++++ b/src/ntfs_io.c
+@@ -154,8 +154,8 @@ static int ntfs_device_testdisk_io_stat(struct ntfs_device *dev, struct stat *bu
+ return -1;
+ }
+
+-static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, int request,
+- void *argp)
++static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev,
++ unsigned long request, void *argp)
+ {
+ log_warning( "ntfs_device_testdisk_io_ioctl() unimplemented\n");
+ #ifdef ENOTSUP
diff --git a/pkgs/tools/typesetting/tex/nix/run-latex.sh b/pkgs/tools/typesetting/tex/nix/run-latex.sh
index 3f8a16580ea58..9c18076872843 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 2f5dea5481fb7..a39bec7ae876c 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 ba070c77b424e..2b5d5afbf31f3 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
@@ -391,6 +397,7 @@ mapAliases {
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
fluxus = throw "fluxus has been removed because it hasn't been updated in 9 years and depended on insecure Racket 7.9"; # Added 2024-12-06
+ 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
@@ -810,6 +817,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
@@ -1258,6 +1269,7 @@ mapAliases {
taplo-cli = taplo; # Added 2022-07-30
taplo-lsp = taplo; # Added 2022-07-30
taro = taproot-assets; # Added 2023-07-04
+ tbb_2021_5 = throw "tbb_2021_5 has been removed from nixpkgs, as it broke with GCC 14";
tcl-fcgi = tclPackages.tcl-fcgi; # Added 2024-10-02
tclcurl = tclPackages.tclcurl; # Added 2024-10-02
tcllib = tclPackages.tcllib; # Added 2024-10-02
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b8347e961548..b826bf356e79c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1510,10 +1510,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;
@@ -1587,9 +1583,7 @@ with pkgs;
};
termite-unwrapped = callPackage ../applications/terminal-emulators/termite { };
- wezterm = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/wezterm {
- inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreGraphics Foundation UserNotifications System;
- };
+ wezterm = callPackage ../applications/terminal-emulators/wezterm { };
twine = with python3Packages; toPythonApplication twine;
@@ -3803,7 +3797,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; };
@@ -4177,9 +4171,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; };
@@ -4682,7 +4676,6 @@ with pkgs;
};
osl = libsForQt5.callPackage ../development/compilers/osl {
- boost = boost179;
libclang = llvmPackages_15.libclang;
clang = clang_15;
llvm = llvm_15;
@@ -5063,7 +5056,6 @@ with pkgs;
rosenpass-tools = callPackage ../tools/networking/rosenpass/tools.nix { };
rpm = callPackage ../tools/package-management/rpm {
- python = python3;
lua = lua5_4;
};
@@ -5984,7 +5976,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;
@@ -6578,18 +6570,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 { });
@@ -6757,11 +6738,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 { };
@@ -6769,8 +6750,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;
@@ -6952,8 +6933,8 @@ with pkgs;
swi-prolog-gui = swi-prolog.override { withGui = true; };
tbb_2020_3 = callPackage ../development/libraries/tbb/2020_3.nix { };
- tbb_2021_5 = callPackage ../development/libraries/tbb/2021_5.nix { } ;
tbb_2021_11 = callPackage ../development/libraries/tbb { };
+ tbb_2022_0 = callPackage ../development/libraries/tbb/2022_0.nix { };
# many packages still fail with latest version
tbb = tbb_2020_3;
@@ -7441,9 +7422,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;
@@ -8411,9 +8392,7 @@ with pkgs;
inherit (regclient) regbot regctl regsync;
- reno = callPackage ../development/tools/reno {
- python3Packages = python311Packages;
- };
+ reno = with python311Packages; toPythonApplication reno;
replace-secret = callPackage ../build-support/replace-secret/replace-secret.nix { };
@@ -8741,12 +8720,10 @@ with pkgs;
boost181
boost182
boost183
- boost184
- boost185
boost186
;
- boost = boost181;
+ boost = boost186;
inherit (callPackages ../development/libraries/botan { })
botan2
@@ -9001,7 +8978,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;
@@ -9442,10 +9419,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 { };
@@ -10123,18 +10097,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 { };
@@ -10197,6 +10159,8 @@ with pkgs;
mesa_i686 = pkgsi686Linux.mesa; # make it build on Hydra
+ libgbm = callPackage ../development/libraries/mesa/gbm.nix {};
+
## End libGL/libGLU/Mesa stuff
midivisualizer = darwin.apple_sdk_11_0.callPackage ../applications/audio/midivisualizer {
@@ -10501,7 +10465,7 @@ with pkgs;
prospector = callPackage ../development/tools/prospector { };
- protobuf = protobuf_28;
+ protobuf = protobuf_29;
inherit
({
@@ -10864,7 +10828,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 { };
@@ -10907,6 +10871,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 {
@@ -11117,10 +11082,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"; };
@@ -11752,8 +11713,6 @@ with pkgs;
opensmtpd-filter-rspamd = callPackage ../servers/mail/opensmtpd/filter-rspamd.nix { };
osrm-backend = callPackage ../servers/osrm-backend {
tbb = tbb_2021_11;
- # https://github.com/Project-OSRM/osrm-backend/issues/6503
- boost = boost179;
};
postfix = callPackage ../servers/mail/postfix { };
@@ -11916,8 +11875,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;
@@ -15753,7 +15712,7 @@ with pkgs;
};
torrenttools = callPackage ../tools/misc/torrenttools {
- fmt = fmt_8;
+ fmt = fmt_9;
};
tony = libsForQt5.callPackage ../applications/audio/tony { };
@@ -18047,7 +18006,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
@@ -18742,10 +18701,6 @@ with pkgs;
sieveshell = with python3.pkgs; toPythonApplication managesieve;
- sunshine = callPackage ../by-name/su/sunshine/package.nix {
- boost = boost185;
- };
-
jami = qt6Packages.callPackage ../applications/networking/instant-messengers/jami {
# TODO: remove once `udev` is `systemdMinimal` everywhere.
udev = systemdMinimal;
diff --git a/pkgs/top-level/darwin-aliases.nix b/pkgs/top-level/darwin-aliases.nix
index 20e1d681a29bf..5a6ac1b1eed61 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 a84ec52e2bc08..a54e5eaf4f461 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -66,32 +66,17 @@ 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 [
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e3e73cc3abc3a..10a30c672c2c5 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7196,17 +7196,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 = {
@@ -8830,9 +8842,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";
@@ -24451,7 +24463,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
@@ -28507,7 +28519,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 ];
@@ -28841,7 +28853,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 b8f5c046997c5..83264b2be12a7 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
@@ -273,6 +274,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
hydra-check = throw "The Python package hydra-check was removed in favor of the top-level rust based pkgs.hydra-check"; # added 2022-04-29
ihatemoney = throw "ihatemoney was removed because it is no longer maintained downstream"; # added 2023-04-08
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 554088daf4bef..1a026f7d4d414 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -287,8 +287,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 { };
@@ -1004,6 +1002,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 {
@@ -1428,6 +1428,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 { };
@@ -1474,8 +1476,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 { };
@@ -5493,10 +5493,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 { };
@@ -6051,8 +6050,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 { };
@@ -6980,7 +6977,6 @@ self: super: with self; {
kitchen = callPackage ../development/python-modules/kitchen { };
kivy = callPackage ../development/python-modules/kivy {
- inherit (pkgs) mesa;
inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate ApplicationServices AVFoundation;
};
@@ -7394,6 +7390,7 @@ self: super: with self; {
p.override {
enablePython = true;
python3 = python;
+ python3Packages = pythonPackages;
})
(p: p.py)
];
@@ -8545,6 +8542,10 @@ self: super: with self; {
muscima = callPackage ../development/python-modules/muscima { };
+ music-assistant-client = callPackage ../development/python-modules/music-assistant-client { };
+
+ music-assistant-models = callPackage ../development/python-modules/music-assistant-models { };
+
musicbrainzngs = callPackage ../development/python-modules/musicbrainzngs { };
music-tag = callPackage ../development/python-modules/music-tag { };
@@ -9376,7 +9377,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 { };
@@ -13915,6 +13916,8 @@ self: super: with self; {
rencode = callPackage ../development/python-modules/rencode { };
+ reno = callPackage ../development/python-modules/reno { };
+
renson-endura-delta = callPackage ../development/python-modules/renson-endura-delta { };
reorder-python-imports = callPackage ../development/python-modules/reorder-python-imports { };
@@ -14222,7 +14225,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 { };
@@ -16382,9 +16385,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 { };
@@ -17591,9 +17592,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 { };
@@ -18085,7 +18084,6 @@ self: super: with self; {
wxGTK = pkgs.wxGTK32.override {
withWebKit = true;
};
- inherit (pkgs) mesa;
};
wyoming = callPackage ../development/python-modules/wyoming { };