From bd6a973e1664ffc4ffd9f2c1509e29212fa5ffea Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Tue, 12 Nov 2024 13:14:07 +0100 Subject: [PATCH 001/105] =?UTF-8?q?tree-sitter:=200.24.3=20=E2=86=92=200.2?= =?UTF-8?q?4.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Diff: https://github.com/tree-sitter/tree-sitter/compare/v0.24.3...v0.24.4 (cherry picked from commit bf92ca56f46baec4f269552d6b0491fa3fb20576) --- pkgs/development/tools/parsing/tree-sitter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 87915de31ec40..5ac947c072f81 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 ]; From b50e39dcbd30bb963d0b011b59215380c164577d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 21 Nov 2024 21:39:59 +0100 Subject: [PATCH 002/105] cacert: 3.104 -> 3.107 https://groups.google.com/a/mozilla.org/g/dev-tech-crypto/c/WH8hT2HA7RM (cherry picked from commit 34887f20f659bf5cd3ab182179a739ba32ba048a) --- pkgs/data/misc/cacert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index d98a50f34fe40..2ae890496affc 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -20,7 +20,7 @@ let blocklist = writeText "cacert-blocklist.txt" (lib.concatStringsSep "\n" blacklist); extraCertificatesBundle = writeText "cacert-extra-certificates-bundle.crt" (lib.concatStringsSep "\n\n" extraCertificateStrings); - srcVersion = "3.104"; + srcVersion = "3.107"; version = if nssOverride != null then nssOverride.version else srcVersion; meta = with lib; { homepage = "https://curl.haxx.se/docs/caextract.html"; @@ -37,7 +37,7 @@ let owner = "nss-dev"; repo = "nss"; rev = "NSS_${lib.replaceStrings ["."] ["_"] version}_RTM"; - hash = "sha256-TEGEKocapU5OTqx69n8nrn/X3SZr49d1alHM73UnDJw="; + hash = "sha256-c6ks/pBvZHipNkmBy784s96zMYP+D9q3VlVrPVSohLw="; }; dontBuild = true; From d52793dc5ca69d0c59baa75d44274ad12083f1c8 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 22 Nov 2024 18:45:24 +0100 Subject: [PATCH 003/105] postgresql_13: 13.17 -> 13.18 Release notes: https://www.postgresql.org/about/news/postgresql-172-166-1510-1415-1318-and-1222-released-2965/ (cherry picked from commit 41dcc3c9746d282181c08b7531ff486b5fbe13f2) --- pkgs/servers/sql/postgresql/13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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"; From 2663c4c59cda2f6e389a2c116c4d3e07f2c355be Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 22 Nov 2024 18:45:41 +0100 Subject: [PATCH 004/105] postgresql_14: 14.14 -> 14.15 Release notes: https://www.postgresql.org/about/news/postgresql-172-166-1510-1415-1318-and-1222-released-2965/ (cherry picked from commit 3aa011583b3e362b63f468da2f54953fa289f8c7) --- pkgs/servers/sql/postgresql/14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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"; From 4cc8cd6873267dda6cb04eddbe507f09f08245e5 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 22 Nov 2024 18:45:58 +0100 Subject: [PATCH 005/105] postgresql_15: 15.9 -> 15.10 Release notes: https://www.postgresql.org/about/news/postgresql-172-166-1510-1415-1318-and-1222-released-2965/ (cherry picked from commit 256921e7d3f563376e3eaf44328a65a67181e988) --- pkgs/servers/sql/postgresql/15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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"; From 231d647aef287628930015bd567a8e788ad7be64 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 22 Nov 2024 18:46:26 +0100 Subject: [PATCH 006/105] postgresql_16: 16.5 -> 16.6 Release notes: https://www.postgresql.org/about/news/postgresql-172-166-1510-1415-1318-and-1222-released-2965/ (cherry picked from commit f4ef8018ac170ca6dad34b354bfcd5ab91037a7d) --- pkgs/servers/sql/postgresql/16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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"; From 40a3563c11ae02aae6ac6d20b847baaf90daa974 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 22 Nov 2024 18:46:40 +0100 Subject: [PATCH 007/105] postgresql_17: 17.1 -> 17.2 Release notes: https://www.postgresql.org/about/news/postgresql-172-166-1510-1415-1318-and-1222-released-2965/ (cherry picked from commit 6aa3d742421e9ea74a91965e14a4eb760e789e58) --- pkgs/servers/sql/postgresql/17.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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"; From 9e3f6fcf1601ca04740c04df164be928b2893e3b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 28 Oct 2024 19:37:54 +0100 Subject: [PATCH 008/105] gpgme: add python3.13 support (cherry picked from commit ddc3140a998c002f9d20e12ccca1c65127d4626b) --- pkgs/development/libraries/gpgme/default.nix | 2 ++ .../libraries/gpgme/python313-support.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/gpgme/python313-support.patch diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 45df332bc0caf..d9b2f9cdb1821 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -43,6 +43,8 @@ stdenv.mkDerivation rec { patches = [ # Support Python 3.10-3.12, remove distutils, https://dev.gnupg.org/D545 ./python-310-312-remove-distutils.patch + # Support Python 3.13 + ./python313-support.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) diff --git a/pkgs/development/libraries/gpgme/python313-support.patch b/pkgs/development/libraries/gpgme/python313-support.patch new file mode 100644 index 0000000000000..0ddfca9a0ded8 --- /dev/null +++ b/pkgs/development/libraries/gpgme/python313-support.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index ae4c7da0..9a0401aa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -591,7 +591,7 @@ if test "$found_py" = "1"; then + # Reset everything, so that we can look for another Python. + m4_foreach([mym4pythonver], + [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[3.9],[3.10], +- [3.11],[3.12],[all]], ++ [3.11],[3.12],[3.13],[all]], + [unset PYTHON + unset PYTHON_VERSION + unset PYTHON_CPPFLAGS From ec76ef739aa64e3e4aa05fdebcef03191c85363f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 8 Nov 2024 12:16:16 -0800 Subject: [PATCH 009/105] gpgme: 1.23.2 -> 1.24.0 Changelog: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;f=NEWS;hb=gpgme-1.24.0 (cherry picked from commit b3797b6d48b59ca5d8e1c991278d33ad48bde9bd) --- pkgs/development/libraries/gpgme/default.nix | 6 +- .../python-310-312-remove-distutils.patch | 647 ------------------ .../libraries/gpgme/python313-support.patch | 16 +- 3 files changed, 10 insertions(+), 659 deletions(-) delete mode 100644 pkgs/development/libraries/gpgme/python-310-312-remove-distutils.patch diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index d9b2f9cdb1821..ee2003a393bc0 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "gpgme"; - version = "1.23.2"; + version = "1.24.0"; pyproject = true; outputs = [ @@ -37,12 +37,10 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnupg/gpgme/gpgme-${version}.tar.bz2"; - hash = "sha256-lJnosfM8zLaBVSehvBYEnTWmGYpsX64BhfK9VhvOUiQ="; + hash = "sha256-YeOmrYkyP+z6/xdrwXKPuMMxLy+qg0JNnVB3uiD199o="; }; patches = [ - # Support Python 3.10-3.12, remove distutils, https://dev.gnupg.org/D545 - ./python-310-312-remove-distutils.patch # Support Python 3.13 ./python313-support.patch # Fix a test after disallowing compressed signatures in gpg (PR #180336) 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/gpgme/python313-support.patch b/pkgs/development/libraries/gpgme/python313-support.patch index 0ddfca9a0ded8..d314ad329d19c 100644 --- a/pkgs/development/libraries/gpgme/python313-support.patch +++ b/pkgs/development/libraries/gpgme/python313-support.patch @@ -1,13 +1,13 @@ diff --git a/configure.ac b/configure.ac -index ae4c7da0..9a0401aa 100644 +index 7eef3523..b8e7d274 100644 --- a/configure.ac +++ b/configure.ac -@@ -591,7 +591,7 @@ if test "$found_py" = "1"; then - # Reset everything, so that we can look for another Python. +@@ -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.4],[3.5],[3.6],[3.7],[3.8],[3.9],[3.10], -- [3.11],[3.12],[all]], -+ [3.11],[3.12],[3.13],[all]], +- [[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 + unset PYTHON_VERSION + unset PYTHON_CPPFLAGS From d7a76bb8ed6f939b15ca087219dc877f9772122f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 8 Nov 2024 15:06:50 -0800 Subject: [PATCH 010/105] python312Packages.gpgme: build out of tree (cherry picked from commit 29c88a0ce64fed33d93d02605c8420ff42d570ee) --- pkgs/development/libraries/gpgme/default.nix | 37 +++----------- .../python-modules/gpgme/default.nix | 51 +++++++++++++++++++ .../gpgme/python313-support.patch | 0 pkgs/top-level/python-packages.nix | 7 ++- 4 files changed, 60 insertions(+), 35 deletions(-) create mode 100644 pkgs/development/python-modules/gpgme/default.nix rename pkgs/development/{libraries => python-modules}/gpgme/python313-support.patch (100%) diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index ee2003a393bc0..58dccbfa23754 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, @@ -41,8 +38,6 @@ stdenv.mkDerivation rec { }; patches = [ - # Support Python 3.13 - ./python313-support.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/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/libraries/gpgme/python313-support.patch b/pkgs/development/python-modules/gpgme/python313-support.patch similarity index 100% rename from pkgs/development/libraries/gpgme/python313-support.patch rename to pkgs/development/python-modules/gpgme/python313-support.patch diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 07b7f355e09b5..3bdbc175b99f8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5411,10 +5411,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 { }; From 09ed03b34c495ab17508231e9d0209009b2521f9 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Sat, 23 Nov 2024 11:53:25 +0100 Subject: [PATCH 011/105] libsForQt5.qt5.qtwebengine: fix build with clang (cherry picked from commit 24c494a78ea30f797515929871418ad96ab02be8) --- pkgs/development/libraries/qt-5/5.15/default.nix | 9 +++++++++ pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index b94be6d893d20..7c84a97c4d7c4 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -176,6 +176,15 @@ let # See: https://bugreports.qt.io/browse/QTBUG-124375 # Backport of: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=a766045f65f934df3b5f1aa63bc86fbb3e003a09 ./qtwebengine-ninja-1.12.patch + # 5.15.17: Fixes 'converts to incompatible function type [-Werror,-Wcast-function-type-strict]' + # in chromium harfbuzz dependency. This may be removed again if harfbuzz is updated + # to include the upstream fixes: https://github.com/harfbuzz/harfbuzz/commit/d88269c827895b38f99f7cf741fa60210d4d5169 + # See https://trac.macports.org/ticket/70850 + (fetchpatch { + url = "https://github.com/macports/macports-ports/raw/dd7bc40d8de48c762bf9757ce0a0672840c5d8c2/aqua/qt5/files/patch-qtwebengine_hb-ft.cc_error.diff"; + sha256 = "sha256-8/CYjGM5n2eJ6sG+ODTa8fPaxZSDVyKuInpc3IlZuyc="; + extraPrefix = ""; + }) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-mac-dont-set-dsymutil-path.patch diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 38ad37fc0364e..b5768a3da351a 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -173,6 +173,10 @@ qtModule ({ "-march=westmere" ] ++ lib.optionals stdenv.cc.isClang [ "-Wno-elaborated-enum-base" + # 5.15.17: need to silence these two warnings + # https://trac.macports.org/ticket/70850 + "-Wno-enum-constexpr-conversion" + "-Wno-unused-but-set-variable" ]); } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { NIX_CFLAGS_LINK = "-Wl,--no-warn-search-mismatch"; From 3198e0356ba1778e2f971affd12d0721673977f9 Mon Sep 17 00:00:00 2001 From: Arne Keller <2012gdwu+github@posteo.de> Date: Tue, 19 Nov 2024 16:46:20 +0100 Subject: [PATCH 012/105] python312Packages.eventlet: disable flaky test Fixes https://github.com/NixOS/nixpkgs/issues/356996 (cherry picked from commit 94a4343fe4dfb353b17f36992233d55049d65e9a) --- pkgs/development/python-modules/eventlet/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 88bb8a599aba9..6c8c263c8f38e 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -63,6 +63,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" ]; From e7e3dd276d7ba2669627afc54cbc74d2facde888 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 25 Nov 2024 17:12:00 +0000 Subject: [PATCH 013/105] =?UTF-8?q?nixos/lib/test-driver:=20fix=20linting?= =?UTF-8?q?=20after=20compatibility=20clean=E2=80=90up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The previous commit removed the handling of `dict` arguments, but didn’t adjust the type, leading to the following type-checking error: test_driver/driver.py:216: error: Argument 1 to "NixStartScript" has incompatible type "str | dict[Any, Any]"; expected "str" [arg-type] It also left an unused import that Ruff is unhappy about: build/lib/test_driver/driver.py:11:22: F401 [*] `colorama.Fore` imported but unused … build/lib/test_driver/driver.py:11:28: F401 [*] `colorama.Style` imported but unused Fixes: 71306e6b36657f3987214611ec863a891334bf5a (cherry picked from commit d490680530a81f77bdd248cbc99aa4878d6d97c7) --- nixos/lib/test-driver/test_driver/driver.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/lib/test-driver/test_driver/driver.py b/nixos/lib/test-driver/test_driver/driver.py index 50d299788edaa..5813966d84d64 100644 --- a/nixos/lib/test-driver/test_driver/driver.py +++ b/nixos/lib/test-driver/test_driver/driver.py @@ -7,8 +7,6 @@ from pathlib import Path from typing import Any, Callable, ContextManager, Dict, Iterator, List, Optional, Union -from colorama import Fore, Style - from test_driver.logger import AbstractLogger from test_driver.machine import Machine, NixStartScript, retry from test_driver.polling_condition import PollingCondition @@ -205,7 +203,7 @@ def terminate_test(self) -> None: def create_machine( self, - start_command: str | dict, + start_command: str, *, name: Optional[str] = None, keep_vm_state: bool = False, From 57b438148e54a2a3a9371ce7d8c2422ce48b4a91 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 26 Nov 2024 16:21:54 +0300 Subject: [PATCH 014/105] pipewire: 1.2.6 -> 1.2.7 Diff: https://gitlab.freedesktop.org/pipewire/pipewire/-/compare/1.2.6...1.2.7 Changelog: https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/1.2.7 (cherry picked from commit c68990eda0c64ee19a7927bf5c3a9e33562d9f0b) --- pkgs/development/libraries/pipewire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index f8735c294a071..8ddb73bb956ca 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation(finalAttrs: { pname = "pipewire"; - version = "1.2.6"; + version = "1.2.7"; outputs = [ "out" @@ -75,7 +75,7 @@ stdenv.mkDerivation(finalAttrs: { owner = "pipewire"; repo = "pipewire"; rev = finalAttrs.version; - sha256 = "sha256-AmrbA1YQBeETLC9u9rQ2f85rG9TASvcbCZ/Xlz7ICdY="; + sha256 = "sha256-TV+2nz44a742bUfGnWt7zJAnO15eED5kAwyAgE5CQZ0="; }; patches = [ From 2ab373b90e391b9f442c3baf6cb760b0fd84b1eb Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 13 Nov 2024 14:23:06 -0300 Subject: [PATCH 015/105] python3Packages.python-mapnik: mark broken (cherry picked from commit 5647888ffb2277294992e073c857120c0eb964fb) --- pkgs/development/python-modules/python-mapnik/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index c06251663e0ba..72f26cde2d953 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -132,5 +132,6 @@ buildPythonPackage rec { maintainers = [ ]; homepage = "https://mapnik.org"; license = licenses.lgpl21Plus; + broken = true; # At 2024-11-13, test_raster_warping fails. }; } From 5522e9e425b31c9a021f23ab9a8f8a4b60059ba0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 27 Nov 2024 04:43:05 +0100 Subject: [PATCH 016/105] openldap: 2.6.8 -> 2.6.9 (cherry picked from commit 12c819e43f6a6136f5625b76735fe095c66dd982) --- pkgs/by-name/op/openldap/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openldap/package.nix b/pkgs/by-name/op/openldap/package.nix index 453cb1dfebde7..5a941240559a3 100644 --- a/pkgs/by-name/op/openldap/package.nix +++ b/pkgs/by-name/op/openldap/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "openldap"; - version = "2.6.8"; + version = "2.6.9"; src = fetchurl { url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${pname}-${version}.tgz"; - hash = "sha256-SJaTI+lOO+OwPGoTKULcun741UXyrTVAFwkBn2lsPE4="; + hash = "sha256-LLfcc+nINA3/DZk1f7qleKvzDMZhnwUhlyxVVoHmsv8="; }; # TODO: separate "out" and "bin" From f3dce37fde2e3a29af76cff52b3a093640194364 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 14 Nov 2024 10:40:37 +0300 Subject: [PATCH 017/105] mesa: 24.2.6 -> 24.2.7 Diff: https://gitlab.freedesktop.org/mesa/mesa/-/compare/mesa-24.2.6...mesa-24.2.7 Changelog: https://docs.mesa3d.org/relnotes/24.2.7.html (cherry picked from commit 459a925026a28f5a762d648108c4d21068d080e3) --- pkgs/development/libraries/mesa/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix index 6c349d679871b..4aecdcc2c4501 100644 --- a/pkgs/development/libraries/mesa/common.nix +++ b/pkgs/development/libraries/mesa/common.nix @@ -5,14 +5,14 @@ # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa rec { pname = "mesa"; - version = "24.2.6"; + version = "24.2.7"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "mesa"; rev = "mesa-${version}"; - hash = "sha256-yoX2DvinzqrG+rekiqO/iG6F6Zn63WC+ZaathimxO1g="; + hash = "sha256-AM9npUnf/Cl/kPahqeK4Vt6piHv8gKOqrTkE36RIMlg="; }; meta = { From ea830bd322656a89b5cf3f014d3a1a2da86c4f2b Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 28 Nov 2024 10:17:52 +0300 Subject: [PATCH 018/105] mesa: 24.2.7 -> 24.2.8 Diff: https://gitlab.freedesktop.org/mesa/mesa/-/compare/mesa-24.2.7...mesa-24.2.8 Changelog: https://docs.mesa3d.org/relnotes/24.2.8.html (cherry picked from commit 59f9910870fe0a5ff71dbd68825902a25b0e8085) --- pkgs/development/libraries/mesa/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix index 4aecdcc2c4501..80f9c133a63df 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.7"; + version = "24.2.8"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "mesa"; rev = "mesa-${version}"; - hash = "sha256-AM9npUnf/Cl/kPahqeK4Vt6piHv8gKOqrTkE36RIMlg="; + hash = "sha256-70X0Ba7t8l9Vs/w/3dd4UpTR7woIvd7NRwO/ph2rKu8="; }; meta = { From a94100100f0cad5d7f4722e709c467f7869cc5e6 Mon Sep 17 00:00:00 2001 From: Athene Noctua Date: Sat, 30 Nov 2024 07:49:01 +0100 Subject: [PATCH 019/105] libcamera: re-sign IPA modules after fixup (#353336) (cherry picked from commit b9274aa7a594d22b665c350b84a5ad0978caf36c) --- pkgs/by-name/li/libcamera/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/li/libcamera/package.nix b/pkgs/by-name/li/libcamera/package.nix index f576c74cc824c..cd056cbf3074a 100644 --- a/pkgs/by-name/li/libcamera/package.nix +++ b/pkgs/by-name/li/libcamera/package.nix @@ -51,6 +51,10 @@ stdenv.mkDerivation rec { install -D ${./ipa-priv-key.pem} src/ipa-priv-key.pem ''; + postFixup = '' + ../src/ipa/ipa-sign-install.sh src/ipa-priv-key.pem $out/lib/libcamera/ipa_*.so + ''; + strictDeps = true; buildInputs = [ From adaeb12c43fa2fea16222d4cc88a088b8d5b130c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 22 Nov 2024 06:14:57 +0000 Subject: [PATCH 020/105] tinysparql: 3.8.0 -> 3.8.1 Changes: https://gitlab.gnome.org/GNOME/tinysparql/-/blob/3.8.1/NEWS (cherry picked from commit ecf9fa6bc5d8a6d32f557485ecd4e26a6429eae6) --- pkgs/by-name/ti/tinysparql/package.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ti/tinysparql/package.nix b/pkgs/by-name/ti/tinysparql/package.nix index 240dbf789f57e..b9b284dc27a91 100644 --- a/pkgs/by-name/ti/tinysparql/package.nix +++ b/pkgs/by-name/ti/tinysparql/package.nix @@ -1,6 +1,5 @@ { stdenv , lib -, fetchpatch2 , fetchurl , gettext , meson @@ -35,13 +34,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tinysparql"; - version = "3.8.0"; + version = "3.8.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = with finalAttrs; "mirror://gnome/sources/tinysparql/${lib.versions.majorMinor version}/tinysparql-${version}.tar.xz"; - hash = "sha256-wPzad1IPUxVIsjlRN9zRk+6c3l4iLTydJz8DDRdipQQ="; + hash = "sha256-U+BK3R7LTQjKoTF/R3/fDnFI6qxUYoMfI3SIAJL/spU="; }; strictDeps = true; @@ -107,14 +106,6 @@ stdenv.mkDerivation (finalAttrs: { "-Dsystemd_user_services=false" ]; - patches = [ - # https://gitlab.gnome.org/GNOME/tinysparql/-/merge_requests/730 - (fetchpatch2 { - url = "https://gitlab.gnome.org/GNOME/tinysparql/commit/12ed969913cb579f638fa0aa0853aeb6c6c6f536.patch"; - hash = "sha256-jyx9hdWUUxfCSTGn7lZL4RUiQAF4pkf4gfCP8g9Ep3U="; - }) - ]; - doCheck = true; postPatch = '' From 002e694b6bc5fdec82382c1936eaca04d07286b6 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 25 Nov 2024 07:33:35 +0000 Subject: [PATCH 021/105] libsoup_3: 3.6.0 -> 3.6.1 Changes: https://gitlab.gnome.org/GNOME/libsoup/-/blob/3.6.1/NEWS (cherry picked from commit 3656f34ea1b2893d4a14cd94247ea43f7549b5c1) --- pkgs/development/libraries/libsoup/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix index 2aff5ca603773..79d4fee1ef017 100644 --- a/pkgs/development/libraries/libsoup/3.x.nix +++ b/pkgs/development/libraries/libsoup/3.x.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "libsoup"; - version = "3.6.0"; + version = "3.6.1"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-YpWfeR6OhEL4wTztrIxJGdePkSDVu1MBvmel5TMYtKM="; + sha256 = "sha256-zrHxqivdc7LNgVnTmYyWxV7wl+8V5LTzYCkgn6GK+Dg="; }; depsBuildBuild = [ From d9ef82ea7a2dcab301244bacddd99577e8cb9b9f Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sat, 16 Nov 2024 20:36:15 +0900 Subject: [PATCH 022/105] ruby_3_3: 3.3.5 -> 3.3.6 (cherry picked from commit 83e1ebb0c67cb310adeeabf6c4ab6218dbad403d) --- pkgs/development/interpreters/ruby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 4dece3870ae6a..319b2a7b78f91 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -313,8 +313,8 @@ in { }; ruby_3_3 = generic { - version = rubyVersion "3" "3" "5" ""; - hash = "sha256-N4GjUEIiwvJstLnrnBoS2/SUTTZs4kqf+M+Z7LznUZY="; + version = rubyVersion "3" "3" "6" ""; + hash = "sha256-jcSP/68nD4bxAZBT8o5R5NpMzjKjZ2CgYDqa7mfX/Y0="; cargoHash = "sha256-GeelTMRFIyvz1QS2L+Q3KAnyQy7jc0ejhx3TdEFVEbk="; }; From a4e40261c4acbb333afd18440def558f22def762 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sat, 23 Nov 2024 21:10:57 +0800 Subject: [PATCH 023/105] python3Packages.tornado: distinguish tags from branches with refs/tags/ (cherry picked from commit 2af36816bf951248f2a8b4b5dea56311f6b8802e) --- pkgs/development/python-modules/tornado/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix index 2a5c06f5ab38e..14330d5cb7102 100644 --- a/pkgs/development/python-modules/tornado/default.nix +++ b/pkgs/development/python-modules/tornado/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tornadoweb"; repo = "tornado"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-vWiTLKL5gzrf3J6T3u8I1HHg5Ww0sf5ybSbZX6G3UXM="; }; From 14c251f8c4cdad7840ba350712899bc4ac675669 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sat, 23 Nov 2024 21:08:31 +0800 Subject: [PATCH 024/105] python3Packages.tornado: 6.4.1 -> 6.4.2 Address CVE-2024-52804. (cherry picked from commit 1f77429008960ee776456d0e50a6b45bedb5692b) --- pkgs/development/python-modules/tornado/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix index 14330d5cb7102..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 = "refs/tags/v${version}"; - hash = "sha256-vWiTLKL5gzrf3J6T3u8I1HHg5Ww0sf5ybSbZX6G3UXM="; + hash = "sha256-qgJh8pnC1ALF8KxhAYkZFAc0DE6jHVB8R/ERJFL4OFc="; }; build-system = [ setuptools ]; From 20485453f60f63a37f45179ba3e699c45114baad Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 1 Dec 2024 22:08:25 +0100 Subject: [PATCH 025/105] libsoup: apply patches for CVE-2024-52532, CVE-2024-52531 and CVE-2024-52530 (cherry picked from commit fc064c62cab15594b99cb395edb87928b1b4fbd8) --- .../development/libraries/libsoup/default.nix | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index a88cd93553269..2e9d52bc54c1f 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , glib , libxml2 , meson @@ -29,6 +30,34 @@ stdenv.mkDerivation rec { sha256 = "sha256-5Ld8Qc/EyMWgNfzcMgx7xs+3XvfFoDQVPfFBP6HZLxM="; }; + patches = [ + (fetchpatch { + name = "CVE-2024-52530.patch"; + url = "https://gitlab.gnome.org/GNOME/libsoup/-/commit/04df03bc092ac20607f3e150936624d4f536e68b.patch"; + hash = "sha256-WRLiW2B/xxr3hW0nmeRNrXtZL44S0nTptPRdTqBV8Iw="; + }) + (fetchpatch { + name = "CVE-2024-52531_1.patch"; + url = "https://git.launchpad.net/ubuntu/+source/libsoup2.4/patch/?id=4ce2f2dc8ba0c458edce0f039a087fb3ac57787e"; + hash = "sha256-wg1qz8xHcnTiinBTF0ECMkrsD8W6M4IbiKGgbJ1gp9o="; + }) + (fetchpatch { + name = "CVE-2024-52531_2.patch"; + url = "https://git.launchpad.net/ubuntu/+source/libsoup2.4/patch/?id=5866d63aed3500700c5f1d2868ff689bb2ba8b82"; + hash = "sha256-e/VXtKX+agCw+ESGbgQ83NaVNbB3jLTxL7+VgNGbZ7U="; + }) + (fetchpatch { + name = "CVE-2024-52532_1.patch"; + url = "https://git.launchpad.net/ubuntu/+source/libsoup2.4/patch/?id=98e096a0d2142e3c63de2cca7d4023f9c52ed2c6"; + hash = "sha256-h7k+HpcKlsVYlAONxTOiupMhsMkf2v246ouxLejurcY="; + }) + (fetchpatch { + name = "CVE-2024-52532_2.patch"; + url = "https://git.launchpad.net/ubuntu/+source/libsoup2.4/patch/?id=030e72420e8271299c324273f393d92f6d4bb53e"; + hash = "sha256-0BEJpEKgjmKACf53lHMglxhmevKsSXR4ejEoTtr4wII="; + }) + ]; + depsBuildBuild = [ pkg-config ]; From b876879463ae7f0cf386161011213f40b9368a4d Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Wed, 4 Dec 2024 07:27:17 -0500 Subject: [PATCH 026/105] emacs: fix native compilaton on Darwin (cherry picked from commit b904748936817440244a757aadb91a06200b2320) --- pkgs/applications/editors/emacs/make-emacs.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index 7bae78f35e70e..012b9ed50440c 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -11,6 +11,7 @@ , Xaw3d , acl , alsa-lib +, apple-sdk , autoreconfHook , cairo , dbus @@ -163,6 +164,9 @@ mkDerivation (finalAttrs: { "${lib.getBin stdenv.cc.cc}/bin" "${lib.getBin stdenv.cc.bintools}/bin" "${lib.getBin stdenv.cc.bintools.bintools}/bin" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # The linker needs to know where to find libSystem on Darwin. + "${apple-sdk.sdkroot}/usr/lib" ]))); }) ]; From 0da141bf2ed366c0a2aea98cf26932e0fad089f2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Dec 2024 13:21:00 +0100 Subject: [PATCH 027/105] python312: 3.12.7 -> 3.12.8 https://docs.python.org/release/3.12.8/whatsnew/changelog.html (cherry picked from commit 97365475dfce3753756119906c07bdbae55cbd79) --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 04b6a60ce5e45..55fbc9cbab56c 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="; }; }; From 63db7f1d6fa875593e569a79da2aab936613e069 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 4 Dec 2024 19:28:26 +0100 Subject: [PATCH 028/105] python3Packages.django_4: 4.2.16-> 4.2.17 Fixes CVE-2024-53907 and CVE-2024-53908. Changes: https://docs.djangoproject.com/en/dev/releases/4.2.17/ (cherry picked from commit c6d9cd94c6334b672a28ddb7e7062ec7a04fc1a3) --- pkgs/development/python-modules/django/4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 3e79caf801342..dbb579300ab69 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 = From fb23700129a781fb18938c5ec573bf47cc1470d9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 15 Aug 2024 10:14:31 +0200 Subject: [PATCH 029/105] pipewire: disable webrtc-audio-processing if unavailable webrtc-audio-processing only supports specific architectures, so for unsupported architectures, we have to disable it for pipewire to build. Co-authored-by: Sefa Eyeoglu (cherry picked from commit 437364b43456d53e0903d4cdd2afbf1e6bc09196) --- pkgs/development/libraries/pipewire/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 8ddb73bb956ca..c97cdea14143a 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -57,6 +57,14 @@ , 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.7"; @@ -122,7 +130,7 @@ stdenv.mkDerivation(finalAttrs: { readline sbc ] ++ (if enableSystemd then [ systemd ] else [ elogind 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 @@ -140,6 +148,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) From 852ef09f993c53374990efe71f81b91edf6b521b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 5 Dec 2024 01:01:52 +0100 Subject: [PATCH 030/105] python312Packages.wheel: 0.44.0 -> 0.45.1 (cherry picked from commit 570e12a5d59aaa388ded70bc4ae4875bcca9933d) --- pkgs/development/python-modules/wheel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 \ From 45a66c7526a423e8c4ab386f4c993d0225621340 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Nov 2024 17:18:11 +0100 Subject: [PATCH 031/105] spidermonkey_128: 128.1.0 -> 128.5.0 (cherry picked from commit 54be89e224f2e308fc4643a9be7c5c15336cc375) --- pkgs/development/interpreters/spidermonkey/128.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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=="; } From fc2e1229c12a53919091a5a80da428017ac88d50 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Wed, 4 Dec 2024 18:33:36 -0800 Subject: [PATCH 032/105] Reapply: rav1e: remove build-time dependency on libgit2 * rav1e: remove build-time dependency on libgit2 * rav1e: use new Darwin SDK pattern * rav1e: removed unused cargo patch --------- Co-authored-by: Theodore Ni <3806110+tjni@users.noreply.github.com> (cherry picked from commit b80ae990684936b8c84825e27929cb5b11483dec) --- pkgs/by-name/ra/rav1e/package.nix | 33 +++++++++++-------------------- 1 file changed, 12 insertions(+), 21 deletions(-) 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"; From 814423f98191d7361847186ff131f2f6a1e917a2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 6 Dec 2024 01:56:44 +0100 Subject: [PATCH 033/105] python311: 3.11.10 -> 3.11.11 https://docs.python.org/release/3.11.11/whatsnew/changelog.html (cherry picked from commit cffb889dc8e9163d77a6b9b38399397349056589) --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index abed1fe0a685d..074cc4c46f213 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -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; }; From 41c6bcf3dcdf76aaa93529296b372bcf83ed0a71 Mon Sep 17 00:00:00 2001 From: "nix-backports[bot]" <190413589+nix-backports[bot]@users.noreply.github.com> Date: Sat, 7 Dec 2024 18:16:35 -0500 Subject: [PATCH 034/105] [Backport staging-24.11] maturin: 1.7.4 -> 1.7.5 (#362203) maturin: 1.7.4 -> 1.7.5 (#359505) (cherry picked from commit 477a7db1cc3f5e447777a643feb522f9f0bdb535) Co-authored-by: Sergei Trofimovich --- pkgs/by-name/ma/maturin/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index 482861c75067e..14bf7f343b711 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.5"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-Zephf4mB3RI5YIAOIjfqIfgVANefkH63OQoPPMe417E="; + hash = "sha256-rggMNvvWj6yAczWt0ztNoXvxafERV5jzbXKlVXt+GbU="; }; - cargoHash = "sha256-yLKt/Xml7ig6QG3T5Qn39tW7U5NIN1hSOaLiSRMiy5I="; + cargoHash = "sha256-kLTLUkOYQPdFOXyjBoPMT/2IMC2oILK+i/jY0iDjS2o="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security From 4bfc77141292e728b208a9d27589455f7ed65f32 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 8 Dec 2024 14:26:57 +0800 Subject: [PATCH 035/105] libselinux: nixfmt --- pkgs/by-name/li/libselinux/package.nix | 188 +++++++++++++++---------- 1 file changed, 110 insertions(+), 78 deletions(-) diff --git a/pkgs/by-name/li/libselinux/package.nix b/pkgs/by-name/li/libselinux/package.nix index e77c15e7c7ecd..57f875fcd8558 100644 --- a/pkgs/by-name/li/libselinux/package.nix +++ b/pkgs/by-name/li/libselinux/package.nix @@ -1,94 +1,126 @@ -{ lib, stdenv, fetchurl, buildPackages, pcre2, pkg-config, libsepol -, enablePython ? !stdenv.hostPlatform.isStatic -, swig ? null, python3 ? null, python3Packages -, fts +{ + lib, + stdenv, + fetchurl, + buildPackages, + pcre2, + pkg-config, + libsepol, + enablePython ? !stdenv.hostPlatform.isStatic, + swig ? null, + python3 ? null, + python3Packages, + fts, }: assert enablePython -> swig != null && python3 != null; -stdenv.mkDerivation (rec { - pname = "libselinux"; - version = "3.7"; - inherit (libsepol) se_url; +stdenv.mkDerivation ( + rec { + pname = "libselinux"; + version = "3.7"; + inherit (libsepol) se_url; - outputs = [ "bin" "out" "dev" "man" ] ++ lib.optional enablePython "py"; + outputs = [ + "bin" + "out" + "dev" + "man" + ] ++ lib.optional enablePython "py"; - src = fetchurl { - url = "${se_url}/${version}/libselinux-${version}.tar.gz"; - hash = "sha256-6gP0LROk+VdXmX26jPCyYyH6xdLxZEGLTMhWqS0rF70="; - }; + src = fetchurl { + url = "${se_url}/${version}/libselinux-${version}.tar.gz"; + hash = "sha256-6gP0LROk+VdXmX26jPCyYyH6xdLxZEGLTMhWqS0rF70="; + }; - patches = [ - # Make it possible to disable shared builds (for pkgsStatic). - # - # We can't use fetchpatch because it processes includes/excludes - # /after/ stripping the prefix, which wouldn't work here because - # there would be no way to distinguish between - # e.g. libselinux/src/Makefile and libsepol/src/Makefile. - # - # This is a static email, so we shouldn't have to worry about - # normalizing the patch. - (fetchurl { - url = "https://lore.kernel.org/selinux/20211113141616.361640-1-hi@alyssa.is/raw"; - sha256 = "16a2s2ji9049892i15yyqgp4r20hi1hij4c1s4s8law9jsx65b3n"; - postFetch = '' - mv "$out" $TMPDIR/patch - ${buildPackages.patchutils_0_3_3}/bin/filterdiff \ - -i 'a/libselinux/*' --strip 1 <$TMPDIR/patch >"$out" - ''; - }) + patches = [ + # Make it possible to disable shared builds (for pkgsStatic). + # + # We can't use fetchpatch because it processes includes/excludes + # /after/ stripping the prefix, which wouldn't work here because + # there would be no way to distinguish between + # e.g. libselinux/src/Makefile and libsepol/src/Makefile. + # + # This is a static email, so we shouldn't have to worry about + # normalizing the patch. + (fetchurl { + url = "https://lore.kernel.org/selinux/20211113141616.361640-1-hi@alyssa.is/raw"; + sha256 = "16a2s2ji9049892i15yyqgp4r20hi1hij4c1s4s8law9jsx65b3n"; + postFetch = '' + mv "$out" $TMPDIR/patch + ${buildPackages.patchutils_0_3_3}/bin/filterdiff \ + -i 'a/libselinux/*' --strip 1 <$TMPDIR/patch >"$out" + ''; + }) - (fetchurl { - url = "https://git.yoctoproject.org/meta-selinux/plain/recipes-security/selinux/libselinux/0003-libselinux-restore-drop-the-obsolete-LSF-transitiona.patch?id=62b9c816a5000dc01b28e78213bde26b58cbca9d"; - sha256 = "sha256-RiEUibLVzfiRU6N/J187Cs1iPAih87gCZrlyRVI2abU="; - }) - ]; + (fetchurl { + url = "https://git.yoctoproject.org/meta-selinux/plain/recipes-security/selinux/libselinux/0003-libselinux-restore-drop-the-obsolete-LSF-transitiona.patch?id=62b9c816a5000dc01b28e78213bde26b58cbca9d"; + sha256 = "sha256-RiEUibLVzfiRU6N/J187Cs1iPAih87gCZrlyRVI2abU="; + }) + ]; - nativeBuildInputs = [ pkg-config python3 ] ++ lib.optionals enablePython [ - python3Packages.pip - python3Packages.setuptools - python3Packages.wheel - swig - ]; - buildInputs = [ libsepol pcre2 fts ] ++ lib.optionals enablePython [ python3 ]; + nativeBuildInputs = + [ + pkg-config + python3 + ] + ++ lib.optionals enablePython [ + python3Packages.pip + python3Packages.setuptools + python3Packages.wheel + swig + ]; + buildInputs = [ + libsepol + pcre2 + fts + ] ++ lib.optionals enablePython [ python3 ]; - # drop fortify here since package uses it by default, leading to compile error: - # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] - hardeningDisable = [ "fortify" ]; + # drop fortify here since package uses it by default, leading to compile error: + # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] + hardeningDisable = [ "fortify" ]; - env.NIX_CFLAGS_COMPILE = "-Wno-error -D_FILE_OFFSET_BITS=64"; + env.NIX_CFLAGS_COMPILE = "-Wno-error -D_FILE_OFFSET_BITS=64"; - makeFlags = [ - "PREFIX=$(out)" - "INCDIR=$(dev)/include/selinux" - "INCLUDEDIR=$(dev)/include" - "MAN3DIR=$(man)/share/man/man3" - "MAN5DIR=$(man)/share/man/man5" - "MAN8DIR=$(man)/share/man/man8" - "SBINDIR=$(bin)/sbin" - "SHLIBDIR=$(out)/lib" + makeFlags = + [ + "PREFIX=$(out)" + "INCDIR=$(dev)/include/selinux" + "INCLUDEDIR=$(dev)/include" + "MAN3DIR=$(man)/share/man/man3" + "MAN5DIR=$(man)/share/man/man5" + "MAN8DIR=$(man)/share/man/man8" + "SBINDIR=$(bin)/sbin" + "SHLIBDIR=$(out)/lib" - "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a" - "ARCH=${stdenv.hostPlatform.linuxArch}" - ] ++ lib.optionals (fts != null) [ - "FTS_LDLIBS=-lfts" - ] ++ lib.optionals stdenv.hostPlatform.isStatic [ - "DISABLE_SHARED=y" - ] ++ lib.optionals enablePython [ - "PYTHON=${python3.pythonOnBuildForHost.interpreter}" - "PYTHONLIBDIR=$(py)/${python3.sitePackages}" - "PYTHON_SETUP_ARGS=--no-build-isolation" - ]; + "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a" + "ARCH=${stdenv.hostPlatform.linuxArch}" + ] + ++ lib.optionals (fts != null) [ + "FTS_LDLIBS=-lfts" + ] + ++ lib.optionals stdenv.hostPlatform.isStatic [ + "DISABLE_SHARED=y" + ] + ++ lib.optionals enablePython [ + "PYTHON=${python3.pythonOnBuildForHost.interpreter}" + "PYTHONLIBDIR=$(py)/${python3.sitePackages}" + "PYTHON_SETUP_ARGS=--no-build-isolation" + ]; - preInstall = lib.optionalString enablePython '' - mkdir -p $py/${python3.sitePackages}/selinux - ''; + preInstall = lib.optionalString enablePython '' + mkdir -p $py/${python3.sitePackages}/selinux + ''; - installTargets = [ "install" ] ++ lib.optional enablePython "install-pywrap"; + installTargets = [ "install" ] ++ lib.optional enablePython "install-pywrap"; - meta = removeAttrs libsepol.meta ["outputsToInstall"] // { - description = "SELinux core library"; - }; -} // lib.optionalAttrs (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") { - NIX_LDFLAGS = "--undefined-version"; -}) + meta = removeAttrs libsepol.meta [ "outputsToInstall" ] // { + description = "SELinux core library"; + }; + } + // + lib.optionalAttrs (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") + { + NIX_LDFLAGS = "--undefined-version"; + } +) From 54667557c0a89e0f0eb5efcd701fb9ef96d74b5a Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 27 Nov 2024 18:14:48 +0800 Subject: [PATCH 036/105] python311Packages.libselinux: fix build --- pkgs/by-name/li/libselinux/package.nix | 8 ++++---- pkgs/top-level/python-packages.nix | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/libselinux/package.nix b/pkgs/by-name/li/libselinux/package.nix index 57f875fcd8558..eab59a777709b 100644 --- a/pkgs/by-name/li/libselinux/package.nix +++ b/pkgs/by-name/li/libselinux/package.nix @@ -6,10 +6,10 @@ pcre2, pkg-config, libsepol, - enablePython ? !stdenv.hostPlatform.isStatic, + enablePython ? false, swig ? null, python3 ? null, - python3Packages, + python3Packages ? null, fts, }: @@ -45,7 +45,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 +55,7 @@ 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="; }) ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1539ef42426e7..56571a4863c3d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7310,6 +7310,7 @@ self: super: with self; { p.override { enablePython = true; python3 = python; + python3Packages = pythonPackages; }) (p: p.py) ]; From ab3a99dc28da0d9cf7c5e4574a380a28517f4b12 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 15 Nov 2024 06:30:50 +0000 Subject: [PATCH 037/105] libxml2: 2.13.4 -> 2.13.5 Changes: https://discourse.gnome.org/t/libxml2-2-13-5-released/25040 (cherry picked from commit bde88ba1b721c906df9a621942d2ec90f04ba999) --- pkgs/development/libraries/libxml2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 6924c71fab662..9ae31c2ade829 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxml2"; - version = "2.13.4"; + version = "2.13.5"; outputs = [ "bin" "dev" "out" "devdoc" ] ++ lib.optional pythonSupport "py" @@ -33,7 +33,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; From 20d1b43b7040ec73b27dee2cd17dd05966cfc33b Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 20:27:21 +0900 Subject: [PATCH 038/105] python312Packages.waitress: 3.0.0 -> 3.0.1 Diff: https://github.com/Pylons/waitress/compare/v3.0.0...v3.0.1 (cherry picked from commit 52fa1933c05e373a38b2f3271c3d4890a9138e14) --- pkgs/development/python-modules/waitress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix index 933823a748c5c..85b4a1a3d6b8b 100644 --- a/pkgs/development/python-modules/waitress/default.nix +++ b/pkgs/development/python-modules/waitress/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "waitress"; - version = "3.0.0"; + version = "3.0.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-AF2kebBBNM3Z3WAtHufEnXneBTdhDWU2dMxsveIiuKE="; + hash = "sha256-7wwfAg2fEqUVxOxlwHkgpwJhOvytHb/cO87CVrbAcrM="; }; doCheck = false; From f6027743dbc62a1408e4de5ba77002787e4ff6e6 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 23:45:47 +0900 Subject: [PATCH 039/105] python312Packages.waitress: refactor (cherry picked from commit 6f1355e00be64f6d829dcf7c1caaab6c3c7f80ff) --- .../python-modules/waitress/default.nix | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix index 85b4a1a3d6b8b..9eada569d7e8d 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.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-7wwfAg2fEqUVxOxlwHkgpwJhOvytHb/cO87CVrbAcrM="; }; - 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 ]; }; } From 08f2a9009e63d35830951d59b8009d81e07885c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 8 Dec 2024 11:06:45 +0100 Subject: [PATCH 040/105] python312Packages.waitress: 3.0.1 -> 3.0.2 https://github.com/Pylons/waitress/releases/tag/v3.0.2 (cherry picked from commit f9fe2e76f40b90587d1bbe990f0755809e742d2a) --- pkgs/development/python-modules/waitress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix index 9eada569d7e8d..79e9b73780bb2 100644 --- a/pkgs/development/python-modules/waitress/default.nix +++ b/pkgs/development/python-modules/waitress/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "waitress"; - version = "3.0.1"; + version = "3.0.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-7wwfAg2fEqUVxOxlwHkgpwJhOvytHb/cO87CVrbAcrM="; + hash = "sha256-aCqq8q8MRK2kq/tw3tNjk/DjB/SrlFaiFc4AILrvwx8="; }; build-system = [ setuptools ]; From b353d98f9d8f6b83148303d106b82c2d7763a254 Mon Sep 17 00:00:00 2001 From: Mathias Zhang Date: Thu, 28 Nov 2024 16:27:04 +0800 Subject: [PATCH 041/105] libjxl: 0.11.0 -> 0.11.1 (cherry picked from commit 095b2f82190eb1dd02bc4dbc34f9b9ba301df806) --- pkgs/by-name/li/libjxl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libjxl/package.nix b/pkgs/by-name/li/libjxl/package.nix index 2bd30ddda8e26..21cab31dbcb64 100644 --- a/pkgs/by-name/li/libjxl/package.nix +++ b/pkgs/by-name/li/libjxl/package.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { pname = "libjxl"; - version = "0.11.0"; + version = "0.11.1"; outputs = [ "out" "dev" ]; @@ -35,7 +35,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; }; From 0c381f5f060ebca2a02b30c6e3383b82e0d66b48 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 6 Dec 2024 19:10:36 +0100 Subject: [PATCH 042/105] python312: fix memory exhaustion vulnerability in asyncio.protocols https://mail.python.org/archives/list/security-announce@python.org/thread/H4O3UBAOAQQXGT4RE3E4XQYR5XLROORB/ Fixes:CVE-2024-12254 (cherry picked from commit 861d0835305e5c15194c4c999c7365b443989b8a) --- .../python/cpython/3.12/CVE-2024-12254.patch | 45 +++++++++++++++++++ .../interpreters/python/cpython/default.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/interpreters/python/cpython/3.12/CVE-2024-12254.patch 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 20c7c0c145ef5..9ad20b41f731f 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -298,6 +298,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 From bb2a6df9771a4d46de694698efaf5e8b5915afca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 8 Dec 2024 12:36:19 -0800 Subject: [PATCH 043/105] python312Packages.python-multipart: fix CVE-2024-53981 --- .../python-multipart/default.nix | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/development/python-modules/python-multipart/default.nix b/pkgs/development/python-modules/python-multipart/default.nix index 12b1e19f2c5b4..7ce47e885dac3 100644 --- a/pkgs/development/python-modules/python-multipart/default.nix +++ b/pkgs/development/python-modules/python-multipart/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + fetchpatch2, fetchPypi, hatchling, pytestCheckHook, @@ -27,6 +28,27 @@ buildPythonPackage rec { hash = "sha256-BF4fmNcZwc4IXtf34e+djMyMAroCtVZtX3UhQQztWMs="; }; + patches = [ + (fetchpatch2 { + name = "CVE-2024-53981-part1.patch"; + url = "https://github.com/Kludex/python-multipart/commit/9205a0ec8c646b9f705430a6bfb52bd957b76c19.patch?full_index=1"; + # undo the move of multipart/ to python_multipart/ + stripLen = 2; + extraPrefix = "multipart/"; + includes = [ "multipart/multipart.py" ]; + hash = "sha256-n/b4lvHuK8pUsuanD8htnjOiUYgDhX1N7yHlqatCuAg="; + }) + (fetchpatch2 { + name = "CVE-2024-53981-part2.patch"; + url = "https://github.com/Kludex/python-multipart/commit/c4fe4d3cebc08c660e57dd709af1ffa7059b3177.patch?full_index=1"; + # undo the move of multipart/ to python_multipart/ + stripLen = 2; + extraPrefix = "multipart/"; + includes = [ "multipart/multipart.py" ]; + hash = "sha256-k/9DwHWtv/srktCwaDUGoepIdgCk872OsZdcUKZ5bjg="; + }) + ]; + nativeBuildInputs = [ hatchling ]; propagatedBuildInputs = [ six ]; From 22ef47326340de73296b9c0d5db9a51249acd73d Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sun, 17 Nov 2024 11:42:45 +0100 Subject: [PATCH 044/105] waf: 2.1.3 -> 2.1.4 https://gitlab.com/ita1024/waf/blob/waf-2.1.4/ChangeLog (cherry picked from commit f87a1736cc5b7d4ffe31295e749f17a97b039fd3) --- pkgs/by-name/wa/waf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/waf/package.nix b/pkgs/by-name/wa/waf/package.nix index 75fb3d74c2a71..d2ec32ee4d434 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 = [ From 07deae7f19a3f237c1543a7bd9a4da14288416bf Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 2 Dec 2024 13:34:55 +0300 Subject: [PATCH 045/105] qt6: 6.8.0 -> 6.8.1, reorganize everything - move patches to their corresponding modules - inline patches list for qtbase into the expression itself - don't treat patches as series, as they are not - clean up outdated headers from all the patches - drop doc tools patch, replace it with setting newly added cmake var in a hook - add a new patch to disable SBOM generation that's very broken with split installs (cherry picked from commit 2873053688b964478727782f2fbc34365bfe93f8) --- pkgs/development/libraries/qt-6/default.nix | 34 +- pkgs/development/libraries/qt-6/fetch.sh | 2 +- .../libraries/qt-6/hooks/qtbase-setup-hook.sh | 20 +- .../allow-translations-outside-prefix.patch} | 2 - .../{qtbase.nix => qtbase/default.nix} | 35 +- .../derive-plugin-load-path-from-PATH.patch} | 11 - .../qtbase/find-qmlimportscanner.patch | 13 + .../qt-6/modules/qtbase/no-sbom.patch | 11 + .../qtbase/qmake-always-use-libname.patch} | 4 - .../qtbase/qmake-fix-includedir.patch} | 11 - .../qmlimportscanner-import-path.patch} | 11 - .../qtbase/skip-missing-qml-directory.patch} | 15 - .../qtbase/use-cmake-from-path.patch} | 14 - .../libraries/qt-6/modules/qtdeclarative.nix | 51 --- .../qt-6/modules/qtdeclarative/default.nix | 33 ++ .../qtdeclarative/disable-disk-cache.patch} | 17 +- .../use-versioned-import-path.patch} | 11 - .../libraries/qt-6/modules/qtmqtt.nix | 4 +- .../default.nix} | 6 +- .../fix-qtgui-include-incorrect-case.patch | 2 - .../windows-no-uppercase-libs.patch} | 2 - .../windows-resolve-function-name.patch} | 2 - .../{qttools.nix => qttools/default.nix} | 2 +- .../qttools/paths.patch} | 2 - .../libraries/qt-6/modules/qtwayland.nix | 10 + .../default.nix} | 6 +- .../qtwebengine/link-pulseaudio.patch} | 2 - .../qtwebengine/locales-path.patch} | 12 - .../qtwebengine/xkb-includes.patch} | 0 .../0005-qtbase-find-tools-in-PATH.patch | 42 --- ...mportscanner-in-macdeployqt-via-envi.patch | 32 -- pkgs/development/libraries/qt-6/srcs.nix | 312 +++++++++--------- 32 files changed, 282 insertions(+), 449 deletions(-) rename pkgs/development/libraries/qt-6/{patches/0007-qtbase-allow-translations-outside-prefix.patch => modules/qtbase/allow-translations-outside-prefix.patch} (83%) rename pkgs/development/libraries/qt-6/modules/{qtbase.nix => qtbase/default.nix} (83%) rename pkgs/development/libraries/qt-6/{patches/0010-qtbase-derive-plugin-load-path-from-PATH.patch => modules/qtbase/derive-plugin-load-path-from-PATH.patch} (66%) create mode 100644 pkgs/development/libraries/qt-6/modules/qtbase/find-qmlimportscanner.patch create mode 100644 pkgs/development/libraries/qt-6/modules/qtbase/no-sbom.patch rename pkgs/development/libraries/qt-6/{patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch => modules/qtbase/qmake-always-use-libname.patch} (87%) rename pkgs/development/libraries/qt-6/{patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch => modules/qtbase/qmake-fix-includedir.patch} (57%) rename pkgs/development/libraries/qt-6/{patches/0006-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch => modules/qtbase/qmlimportscanner-import-path.patch} (64%) rename pkgs/development/libraries/qt-6/{patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-.patch => modules/qtbase/skip-missing-qml-directory.patch} (53%) rename pkgs/development/libraries/qt-6/{patches/0004-qtbase-qt-cmake-always-use-cmake-from-path.patch => modules/qtbase/use-cmake-from-path.patch} (65%) delete mode 100644 pkgs/development/libraries/qt-6/modules/qtdeclarative.nix create mode 100644 pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix rename pkgs/development/libraries/qt-6/{patches/0001-qtdeclarative-disable-qml-disk-cache.patch => modules/qtdeclarative/disable-disk-cache.patch} (50%) rename pkgs/development/libraries/qt-6/{patches/0002-qtdeclarative-also-use-versioned-qml-paths.patch => modules/qtdeclarative/use-versioned-import-path.patch} (52%) rename pkgs/development/libraries/qt-6/modules/{qtmultimedia.nix => qtmultimedia/default.nix} (88%) rename pkgs/development/libraries/qt-6/{patches => modules/qtmultimedia}/fix-qtgui-include-incorrect-case.patch (70%) rename pkgs/development/libraries/qt-6/{patches/qtmultimedia-windows-no-uppercase-libs.patch => modules/qtmultimedia/windows-no-uppercase-libs.patch} (63%) rename pkgs/development/libraries/qt-6/{patches/qtmultimedia-windows-resolve-function-name.patch => modules/qtmultimedia/windows-resolve-function-name.patch} (85%) rename pkgs/development/libraries/qt-6/modules/{qttools.nix => qttools/default.nix} (95%) rename pkgs/development/libraries/qt-6/{patches/qttools-paths.patch => modules/qttools/paths.patch} (88%) rename pkgs/development/libraries/qt-6/modules/{qtwebengine.nix => qtwebengine/default.nix} (97%) rename pkgs/development/libraries/qt-6/{patches/qtwebengine-link-pulseaudio.patch => modules/qtwebengine/link-pulseaudio.patch} (80%) rename pkgs/development/libraries/qt-6/{patches/qtwebengine-locales-path.patch => modules/qtwebengine/locales-path.patch} (73%) rename pkgs/development/libraries/qt-6/{patches/qtwebengine-xkb-includes.patch => modules/qtwebengine/xkb-includes.patch} (100%) delete mode 100644 pkgs/development/libraries/qt-6/patches/0005-qtbase-find-tools-in-PATH.patch delete mode 100644 pkgs/development/libraries/qt-6/patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 96a498c5f195f..a664247dfbcd4 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -56,34 +56,10 @@ let inherit darwinVersionInputs; }; - qtbase = callPackage ./modules/qtbase.nix { + qtbase = callPackage ./modules/qtbase { withGtk3 = !stdenv.hostPlatform.isMinGW; inherit darwinVersionInputs; inherit (srcs.qtbase) src version; - patches = [ - ./patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch - ./patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch - ./patches/0004-qtbase-qt-cmake-always-use-cmake-from-path.patch - ./patches/0005-qtbase-find-tools-in-PATH.patch - ./patches/0006-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch - ./patches/0007-qtbase-allow-translations-outside-prefix.patch - ./patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch - ./patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-.patch - ./patches/0010-qtbase-derive-plugin-load-path-from-PATH.patch - # Backport patch for https://bugs.kde.org/show_bug.cgi?id=493116 - # FIXME: remove for 6.8.1 - (fetchpatch2 { - url = "https://github.com/qt/qtbase/commit/2ea3abed0125d81ca4f3bacb9650db7314657332.patch"; - hash = "sha256-mdTdwhJtebuLUQRo+y1XUrrzgqG9G7GvPQwvrXLycJI="; - }) - - # Backport patch to fix plugin loading through symlinks - # FIXME: remove for 6.8.1 - (fetchpatch2 { - url = "https://github.com/qt/qtbase/commit/e25150ca29437ab315e3686aa801b8636e201e2a.patch"; - hash = "sha256-8WOjjffI48Vlx7gQIiOzfUtPloLys5lf06RQi1lsTys="; - }) - ]; }; env = callPackage ./qt-env.nix { }; full = callPackage @@ -135,7 +111,7 @@ let qtcharts = callPackage ./modules/qtcharts.nix { }; qtconnectivity = callPackage ./modules/qtconnectivity.nix { }; qtdatavis3d = callPackage ./modules/qtdatavis3d.nix { }; - qtdeclarative = callPackage ./modules/qtdeclarative.nix { }; + qtdeclarative = callPackage ./modules/qtdeclarative { }; qtdoc = callPackage ./modules/qtdoc.nix { }; qtgraphs = callPackage ./modules/qtgraphs.nix { }; qtgrpc = callPackage ./modules/qtgrpc.nix { }; @@ -144,7 +120,7 @@ let qtlanguageserver = callPackage ./modules/qtlanguageserver.nix { }; qtlocation = callPackage ./modules/qtlocation.nix { }; qtlottie = callPackage ./modules/qtlottie.nix { }; - qtmultimedia = callPackage ./modules/qtmultimedia.nix { + qtmultimedia = callPackage ./modules/qtmultimedia { inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi; }; qtmqtt = callPackage ./modules/qtmqtt.nix { }; @@ -162,12 +138,12 @@ let qtremoteobjects = callPackage ./modules/qtremoteobjects.nix { }; qtsvg = callPackage ./modules/qtsvg.nix { }; qtscxml = callPackage ./modules/qtscxml.nix { }; - qttools = callPackage ./modules/qttools.nix { }; + qttools = callPackage ./modules/qttools { }; qttranslations = callPackage ./modules/qttranslations.nix { }; qtvirtualkeyboard = callPackage ./modules/qtvirtualkeyboard.nix { }; qtwayland = callPackage ./modules/qtwayland.nix { }; qtwebchannel = callPackage ./modules/qtwebchannel.nix { }; - qtwebengine = callPackage ./modules/qtwebengine.nix { + qtwebengine = callPackage ./modules/qtwebengine { inherit (darwin) autoSignDarwinBinariesHook bootstrap_cmds; }; qtwebsockets = callPackage ./modules/qtwebsockets.nix { }; diff --git a/pkgs/development/libraries/qt-6/fetch.sh b/pkgs/development/libraries/qt-6/fetch.sh index 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 9df79ccc89be8..7fec290b7db20 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , src -, patches ? [ ] , version , bison , flex @@ -76,7 +75,6 @@ , libmysqlclient , postgresql , withGtk3 ? false -, dconf , gtk3 # options , libGLSupported ? stdenv.hostPlatform.isLinux @@ -182,7 +180,32 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - inherit patches; + patches = [ + # look for Qt plugins in directories on PATH + ./derive-plugin-load-path-from-PATH.patch + + # allow translations to be found outside of install prefix, as is the case in our split builds + ./allow-translations-outside-prefix.patch + + # always link to libraries by name in qmake-generated build scripts + ./qmake-always-use-libname.patch + # always explicitly list includedir in qmake-generated pkg-config files + ./qmake-fix-includedir.patch + + # don't generate SBOM files by default, they don't work with our split installs anyway + ./no-sbom.patch + + # use cmake from PATH in qt-cmake wrapper, to avoid qtbase runtime-depending on cmake + ./use-cmake-from-path.patch + + # macdeployqt fixes + # get qmlimportscanner location from environment variable + ./find-qmlimportscanner.patch + # pass QML2_IMPORT_PATH from environment to qmlimportscanner + ./qmlimportscanner-import-path.patch + # don't pass qtbase's QML directory to qmlimportscanner if it's empty + ./skip-missing-qml-directory.patch + ]; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # TODO: Verify that this catches all the occurrences? @@ -205,8 +228,8 @@ stdenv.mkDerivation rec { --replace-fail 'CONFIG += ' 'CONFIG += no_default_rpath ' ''; - fix_qt_builtin_paths = ../hooks/fix-qt-builtin-paths.sh; - fix_qt_module_paths = ../hooks/fix-qt-module-paths.sh; + fix_qt_builtin_paths = ../../hooks/fix-qt-builtin-paths.sh; + fix_qt_module_paths = ../../hooks/fix-qt-module-paths.sh; preHook = '' . "$fix_qt_builtin_paths" . "$fix_qt_module_paths" @@ -253,7 +276,7 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; - setupHook = ../hooks/qtbase-setup-hook.sh; + setupHook = ../../hooks/qtbase-setup-hook.sh; meta = with lib; { homepage = "https://www.qt.io/"; diff --git a/pkgs/development/libraries/qt-6/patches/0010-qtbase-derive-plugin-load-path-from-PATH.patch b/pkgs/development/libraries/qt-6/modules/qtbase/derive-plugin-load-path-from-PATH.patch similarity index 66% rename from pkgs/development/libraries/qt-6/patches/0010-qtbase-derive-plugin-load-path-from-PATH.patch rename to pkgs/development/libraries/qt-6/modules/qtbase/derive-plugin-load-path-from-PATH.patch index 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 42f5bfd76b88b..0000000000000 --- a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ qtModule -, qtbase -, qtlanguageserver -, qtshadertools -, openssl -, stdenv -, lib -, pkgsBuildBuild -, fetchpatch2 -}: - -qtModule { - pname = "qtdeclarative"; - - propagatedBuildInputs = [ qtbase qtlanguageserver qtshadertools openssl ]; - strictDeps = true; - - patches = [ - # prevent headaches from stale qmlcache data - ../patches/0001-qtdeclarative-disable-qml-disk-cache.patch - # add version specific QML import path - ../patches/0002-qtdeclarative-also-use-versioned-qml-paths.patch - - # Backport patches for https://bugs.kde.org/show_bug.cgi?id=493116 - # FIXME: remove for 6.8.1 - (fetchpatch2 { - url = "https://github.com/qt/qtdeclarative/commit/3330731d0cb221477ab3d856db032126403ae6a0.patch"; - hash = "sha256-XXXGJ7nVDpEG/6nr16L89J87tvutyc+YnQPQx9cRU+w="; - }) - (fetchpatch2 { - url = "https://github.com/qt/qtdeclarative/commit/2aefbca84d2f3dca2c2697f13710b6907c0c7e59.patch"; - hash = "sha256-a/BX0gpW6juJbjDRo8OleMahOC6WWqreURmYZNiGm5c="; - }) - # Backport patch to fix Kirigami applications crashing - # FIXME: remove for 6.8.1 - (fetchpatch2 { - url = "https://github.com/qt/qtdeclarative/commit/0ae3697cf40bcd3ae1de20621abad17cf6c5f52d.patch"; - hash = "sha256-YuTHqHCWOsqUOATfaAZRxPSwMsFNylxoqnqCeW5kPjs="; - }) - ]; - - cmakeFlags = [ - "-DQt6ShaderToolsTools_DIR=${pkgsBuildBuild.qt6.qtshadertools}/lib/cmake/Qt6ShaderTools" - # for some reason doesn't get found automatically on Darwin - "-DPython_EXECUTABLE=${lib.getExe pkgsBuildBuild.python3}" - ] - # Conditional is required to prevent infinite recursion during a cross build - ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - "-DQt6QmlTools_DIR=${pkgsBuildBuild.qt6.qtdeclarative}/lib/cmake/Qt6QmlTools" - ]; -} diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix new file mode 100644 index 0000000000000..196f3d782fcd2 --- /dev/null +++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix @@ -0,0 +1,33 @@ +{ qtModule +, qtbase +, qtlanguageserver +, qtshadertools +, openssl +, stdenv +, lib +, pkgsBuildBuild +}: + +qtModule { + pname = "qtdeclarative"; + + propagatedBuildInputs = [ qtbase qtlanguageserver qtshadertools openssl ]; + strictDeps = true; + + patches = [ + # prevent headaches from stale qmlcache data + ./disable-disk-cache.patch + # add version specific QML import path + ./use-versioned-import-path.patch + ]; + + cmakeFlags = [ + "-DQt6ShaderToolsTools_DIR=${pkgsBuildBuild.qt6.qtshadertools}/lib/cmake/Qt6ShaderTools" + # for some reason doesn't get found automatically on Darwin + "-DPython_EXECUTABLE=${lib.getExe pkgsBuildBuild.python3}" + ] + # Conditional is required to prevent infinite recursion during a cross build + ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "-DQt6QmlTools_DIR=${pkgsBuildBuild.qt6.qtdeclarative}/lib/cmake/Qt6QmlTools" + ]; +} diff --git a/pkgs/development/libraries/qt-6/patches/0001-qtdeclarative-disable-qml-disk-cache.patch b/pkgs/development/libraries/qt-6/modules/qtdeclarative/disable-disk-cache.patch similarity index 50% rename from pkgs/development/libraries/qt-6/patches/0001-qtdeclarative-disable-qml-disk-cache.patch rename to pkgs/development/libraries/qt-6/modules/qtdeclarative/disable-disk-cache.patch index 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 80eef148701ac..36fe1962983d0 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix @@ -5,13 +5,13 @@ qtModule rec { pname = "qtmqtt"; - version = "6.8.0"; + version = "6.8.1"; src = fetchFromGitHub { owner = "qt"; repo = "qtmqtt"; rev = "v${version}"; - hash = "sha256-WvqBEq7Zv1CONMMuDHdj8/nJHoY4y7ysrqliTZHi7x8="; + hash = "sha256-PmIs+06DjPTbVTNfnl4N/F6sL7qa/X58AvbyCxltAMw="; }; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix similarity index 88% rename from pkgs/development/libraries/qt-6/modules/qtmultimedia.nix rename to pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix index ae02112475f03..49cd63224819f 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix @@ -36,10 +36,10 @@ qtModule { ++ lib.optionals stdenv.hostPlatform.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ]; patches = [ - ../patches/fix-qtgui-include-incorrect-case.patch + ./fix-qtgui-include-incorrect-case.patch ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ - ../patches/qtmultimedia-windows-no-uppercase-libs.patch - ../patches/qtmultimedia-windows-resolve-function-name.patch + ./windows-no-uppercase-libs.patch + ./windows-resolve-function-name.patch ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch b/pkgs/development/libraries/qt-6/modules/qtmultimedia/fix-qtgui-include-incorrect-case.patch similarity index 70% rename from pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch rename to pkgs/development/libraries/qt-6/modules/qtmultimedia/fix-qtgui-include-incorrect-case.patch index 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/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 f13500d65464f..ba7c421211fd7 100644 --- a/pkgs/development/libraries/qt-6/modules/qttools.nix +++ b/pkgs/development/libraries/qt-6/modules/qttools/default.nix @@ -18,7 +18,7 @@ qtModule { propagatedBuildInputs = [ qtbase qtdeclarative ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cups ]; patches = [ - ../patches/qttools-paths.patch + ./paths.patch ]; env.NIX_CFLAGS_COMPILE = toString [ "-DNIX_OUTPUT_OUT=\"${placeholder "out"}\"" diff --git a/pkgs/development/libraries/qt-6/patches/qttools-paths.patch b/pkgs/development/libraries/qt-6/modules/qttools/paths.patch similarity index 88% rename from pkgs/development/libraries/qt-6/patches/qttools-paths.patch rename to pkgs/development/libraries/qt-6/modules/qttools/paths.patch index 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 d3d55685f5fb0..aab08733bbf1a 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -6,6 +6,7 @@ , wayland-scanner , pkg-config , libdrm +, fetchpatch2 }: qtModule { @@ -18,6 +19,15 @@ qtModule { buildInputs = [ wayland libdrm ]; nativeBuildInputs = [ pkg-config ]; + patches = [ + # backport fix for crashes when hotplugging a graphics tablet, as recommended by upstream + # FIXME: remove in 6.8.2 + (fetchpatch2 { + url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/24002ac6cbd01dbde4944b63c1f7c87ed2bd72b5.patch"; + hash = "sha256-Lz4Gv6FLhFGv7dVpqqcss6/w5jsGA8SKaNeWMHT0A/A="; + }) + ]; + # Replace vendored wayland.xml with our matching version # FIXME: remove when upstream updates past 1.23 postPatch = '' diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix similarity index 97% rename from pkgs/development/libraries/qt-6/modules/qtwebengine.nix rename to pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix index c97dd0377981f..8fe5a0b32ec6d 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix @@ -101,12 +101,12 @@ qtModule { # Don't assume /usr/share/X11, and also respect the XKB_CONFIG_ROOT # environment variable, since NixOS relies on it working. # See https://github.com/NixOS/nixpkgs/issues/226484 for more context. - ../patches/qtwebengine-xkb-includes.patch + ./xkb-includes.patch - ../patches/qtwebengine-link-pulseaudio.patch + ./link-pulseaudio.patch # Override locales install path so they go to QtWebEngine's $out - ../patches/qtwebengine-locales-path.patch + ./locales-path.patch ]; postPatch = '' diff --git a/pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch b/pkgs/development/libraries/qt-6/modules/qtwebengine/link-pulseaudio.patch similarity index 80% rename from pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch rename to pkgs/development/libraries/qt-6/modules/qtwebengine/link-pulseaudio.patch index 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"; }; }; } From 9d709b63e1e2873de7a153dffa71f1fdf328fcb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 6 Dec 2024 16:35:55 +0100 Subject: [PATCH 046/105] reno: move to python3Packages, fetch from source, misc cleanup (cherry picked from commit b8836cf44a9fe485619f67b5cfe541c5ff2d6290) Fixup formatting conflict caused by the recent treewide formatting. --- .../reno/default.nix | 51 ++++++++++--------- pkgs/top-level/all-packages.nix | 4 +- pkgs/top-level/python-packages.nix | 2 + 3 files changed, 29 insertions(+), 28 deletions(-) rename pkgs/development/{tools => python-modules}/reno/default.nix (65%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7c8e8cc58fa1..a9ee8976850c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8571,9 +8571,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 { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3c173f7745f23..dc694326869bc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13738,6 +13738,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 { }; From 959ba1e98668aea27854996789f557093a4400e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 6 Dec 2024 16:36:37 +0100 Subject: [PATCH 047/105] python312Packages.pbr: fix python 3.12 compatibility for packaging module (cherry picked from commit d73c12eb29238e1959c210de9fd7dc302ae20319) --- pkgs/development/python-modules/pbr/default.nix | 2 ++ 1 file changed, 2 insertions(+) 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 ]; From 6bb937045e1c0ccd6a47ec00f69f944de60b302a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 6 Dec 2024 16:36:52 +0100 Subject: [PATCH 048/105] python312Packages.openstackdocstheme: allow for python 3.12 (cherry picked from commit 55a30bdb016497a7ced7a4cdc7affe1539f9459a) --- pkgs/development/python-modules/openstackdocstheme/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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; From 29d4e684bb96d15e0c2caf357121b5192cfc4d95 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 11 Dec 2024 09:02:08 +0100 Subject: [PATCH 049/105] curl: 8.11.0 -> 8.11.1 Signed-off-by: Sefa Eyeoglu (cherry picked from commit f7b4d46f4829290b1407c5f5055047c7f3d94047) --- .../curlMinimal/fix-netrc-regression-2.patch | 31 --- .../cu/curlMinimal/fix-netrc-regression.patch | 217 ------------------ pkgs/by-name/cu/curlMinimal/package.nix | 16 +- 3 files changed, 2 insertions(+), 262 deletions(-) delete mode 100644 pkgs/by-name/cu/curlMinimal/fix-netrc-regression-2.patch delete mode 100644 pkgs/by-name/cu/curlMinimal/fix-netrc-regression.patch diff --git a/pkgs/by-name/cu/curlMinimal/fix-netrc-regression-2.patch b/pkgs/by-name/cu/curlMinimal/fix-netrc-regression-2.patch deleted file mode 100644 index 8cf36fea64b64..0000000000000 --- a/pkgs/by-name/cu/curlMinimal/fix-netrc-regression-2.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0cdde0fdfbeb8c35420f6d03fa4b77ed73497694 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -Date: Thu, 7 Nov 2024 17:03:54 +0100 -Subject: [PATCH] netrc: support large file, longer lines, longer tokens - -Regression from 3b43a05e000aa8f6 (shipped in 8.11.0) - -Reported-by: Moritz -Fixes #15513 -Closes #15514 ---- - lib/netrc.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/netrc.c b/lib/netrc.c -index c23f927cef32d35059360f04be3c7833589f5df5..034c0307a43e3b86c9c004387cedf273588370e1 100644 ---- a/lib/netrc.c -+++ b/lib/netrc.c -@@ -58,9 +58,9 @@ enum found_state { - #define NETRC_FAILED -1 - #define NETRC_SUCCESS 0 - --#define MAX_NETRC_LINE 4096 --#define MAX_NETRC_FILE (64*1024) --#define MAX_NETRC_TOKEN 128 -+#define MAX_NETRC_LINE 16384 -+#define MAX_NETRC_FILE (128*1024) -+#define MAX_NETRC_TOKEN 4096 - - static CURLcode file2memory(const char *filename, struct dynbuf *filebuf) - { diff --git a/pkgs/by-name/cu/curlMinimal/fix-netrc-regression.patch b/pkgs/by-name/cu/curlMinimal/fix-netrc-regression.patch deleted file mode 100644 index d614be60b9e48..0000000000000 --- a/pkgs/by-name/cu/curlMinimal/fix-netrc-regression.patch +++ /dev/null @@ -1,217 +0,0 @@ -From f5c616930b5cf148b1b2632da4f5963ff48bdf88 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -Date: Thu, 7 Nov 2024 08:52:38 +0100 -Subject: [PATCH] duphandle: also init netrc - -The netrc init was only done in the Curl_open, meaning that a duplicated -handle would not get inited properly. - -Added test 2309 to verify. It does netrc auth with a duplicated handle. - -Regression from 3b43a05e000aa8f65bda513f733a - -Reported-by: tranzystorekk on github -Fixes #15496 -Closes #15503 ---- - lib/easy.c | 1 + - tests/data/Makefile.am | 2 +- - tests/data/test2309 | 66 ++++++++++++++++++++++++++++++++++++++ - tests/libtest/Makefile.inc | 5 ++- - tests/libtest/lib2309.c | 66 ++++++++++++++++++++++++++++++++++++++ - 5 files changed, 138 insertions(+), 2 deletions(-) - create mode 100644 tests/data/test2309 - create mode 100644 tests/libtest/lib2309.c - -diff --git a/lib/easy.c b/lib/easy.c -index d16fa8c07afec00ab6186880eff05c925da00380..ac8fab34220d9b4f1f8f9cb7bc504a5024a46cca 100644 ---- a/lib/easy.c -+++ b/lib/easy.c -@@ -940,6 +940,7 @@ CURL *curl_easy_duphandle(CURL *d) - goto fail; - - Curl_dyn_init(&outcurl->state.headerb, CURL_MAX_HTTP_HEADER); -+ Curl_netrc_init(&outcurl->state.netrc); - - /* the connection pool is setup on demand */ - outcurl->state.lastconnect_id = -1; -diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am -index 02bf2ae25bfd49dce27d4cd2320a2794ba5b4212..ea5221c00fd4193e1713b1313da338f1ea6aee4f 100644 ---- a/tests/data/Makefile.am -+++ b/tests/data/Makefile.am -@@ -255,7 +255,7 @@ test2100 \ - test2200 test2201 test2202 test2203 test2204 test2205 \ - \ - test2300 test2301 test2302 test2303 test2304 test2305 test2306 test2307 \ --test2308 \ -+test2308 test2309 \ - \ - test2400 test2401 test2402 test2403 test2404 test2405 test2406 \ - \ -diff --git a/tests/data/test2309 b/tests/data/test2309 -new file mode 100644 -index 0000000000000000000000000000000000000000..4ba78ee91e179c932f8bfa776d32f311512ef8e6 ---- /dev/null -+++ b/tests/data/test2309 -@@ -0,0 +1,66 @@ -+ -+ -+ -+netrc -+HTTP -+ -+ -+# -+# Server-side -+ -+ -+HTTP/1.1 200 OK -+Date: Tue, 09 Nov 2010 14:49:00 GMT -+Server: test-server/fake -+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT -+ETag: "21025-dc7-39462498" -+Accept-Ranges: bytes -+Content-Length: 6 -+Connection: close -+Content-Type: text/html -+Funny-head: yesyes -+ -+-foo- -+ -+ -+ -+# -+# Client-side -+ -+ -+http -+ -+ -+proxy -+ -+ -+# Reproducing issue 15496 -+ -+HTTP with .netrc using duped easy handle -+ -+ -+lib%TESTNUMBER -+ -+ -+http://github.com %LOGDIR/netrc%TESTNUMBER http://%HOSTIP:%HTTPPORT/ -+ -+ -+ -+machine github.com -+ -+login daniel -+password $y$j9T$WUVjiVvDbRAWafDLs6cab1$01NX.oaZKf5lw8MR2Nk9Yaxv4CqbE0IaDF.GpGxPul1 -+ -+ -+ -+ -+ -+GET http://github.com/ HTTP/1.1 -+Host: github.com -+Authorization: Basic %b64[daniel:$y$j9T$WUVjiVvDbRAWafDLs6cab1$01NX.oaZKf5lw8MR2Nk9Yaxv4CqbE0IaDF.GpGxPul1]b64% -+Accept: */* -+Proxy-Connection: Keep-Alive -+ -+ -+ -+ -diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc -index 339a00fc4ed41e1491ea945ff9ebeb7caf058c69..8f58fd64229d5cbcebdb4949111b3c3184d82eb3 100644 ---- a/tests/libtest/Makefile.inc -+++ b/tests/libtest/Makefile.inc -@@ -77,7 +77,7 @@ LIBTESTPROGS = libauthretry libntlmconnect libprereq \ - lib1945 lib1946 lib1947 lib1948 lib1955 lib1956 lib1957 lib1958 lib1959 \ - lib1960 lib1964 \ - lib1970 lib1971 lib1972 lib1973 lib1974 lib1975 \ -- lib2301 lib2302 lib2304 lib2305 lib2306 lib2308 \ -+ lib2301 lib2302 lib2304 lib2305 lib2306 lib2308 lib2309 \ - lib2402 lib2404 lib2405 \ - lib2502 \ - lib3010 lib3025 lib3026 lib3027 \ -@@ -683,6 +683,9 @@ lib2306_LDADD = $(TESTUTIL_LIBS) - lib2308_SOURCES = lib2308.c $(SUPPORTFILES) - lib2308_LDADD = $(TESTUTIL_LIBS) - -+lib2309_SOURCES = lib2309.c $(SUPPORTFILES) -+lib2309_LDADD = $(TESTUTIL_LIBS) -+ - lib2402_SOURCES = lib2402.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) - lib2402_LDADD = $(TESTUTIL_LIBS) - -diff --git a/tests/libtest/lib2309.c b/tests/libtest/lib2309.c -new file mode 100644 -index 0000000000000000000000000000000000000000..11f1c1fbd886846d5901b03ba9cd0314672fec99 ---- /dev/null -+++ b/tests/libtest/lib2309.c -@@ -0,0 +1,66 @@ -+/*************************************************************************** -+ * _ _ ____ _ -+ * Project ___| | | | _ \| | -+ * / __| | | | |_) | | -+ * | (__| |_| | _ <| |___ -+ * \___|\___/|_| \_\_____| -+ * -+ * Copyright (C) Daniel Stenberg, , et al. -+ * -+ * This software is licensed as described in the file COPYING, which -+ * you should have received as part of this distribution. The terms -+ * are also available at https://curl.se/docs/copyright.html. -+ * -+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell -+ * copies of the Software, and permit persons to whom the Software is -+ * furnished to do so, under the terms of the COPYING file. -+ * -+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -+ * KIND, either express or implied. -+ * -+ * SPDX-License-Identifier: curl -+ * -+ ***************************************************************************/ -+ -+#include "test.h" -+#include "testtrace.h" -+ -+#include -+ -+static size_t cb_ignore(char *buffer, size_t size, size_t nmemb, void *userp) -+{ -+ (void)buffer; -+ (void)size; -+ (void)nmemb; -+ (void)userp; -+ return CURL_WRITEFUNC_ERROR; -+} -+ -+CURLcode test(char *URL) -+{ -+ CURL *curl; -+ CURL *curldupe; -+ CURLcode res = CURLE_OK; -+ -+ global_init(CURL_GLOBAL_ALL); -+ curl = curl_easy_init(); -+ if(curl) { -+ curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, cb_ignore); -+ curl_easy_setopt(curl, CURLOPT_URL, URL); -+ curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L); -+ curl_easy_setopt(curl, CURLOPT_PROXY, libtest_arg3); -+ curl_easy_setopt(curl, CURLOPT_NETRC, (long)CURL_NETRC_REQUIRED); -+ curl_easy_setopt(curl, CURLOPT_NETRC_FILE, libtest_arg2); -+ -+ curldupe = curl_easy_duphandle(curl); -+ if(curldupe) { -+ res = curl_easy_perform(curldupe); -+ printf("Returned %d, should be %d.\n", res, CURLE_WRITE_ERROR); -+ fflush(stdout); -+ curl_easy_cleanup(curldupe); -+ } -+ curl_easy_cleanup(curl); -+ } -+ curl_global_cleanup(); -+ return CURLE_OK; -+} diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix index 43962736bb852..2716d08839a41 100644 --- a/pkgs/by-name/cu/curlMinimal/package.nix +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -49,28 +49,16 @@ assert !((lib.count (x: x) [ gnutlsSupport opensslSupport wolfsslSupport rustlsS stdenv.mkDerivation (finalAttrs: { pname = "curl"; - version = "8.11.0"; + version = "8.11.1"; src = fetchurl { urls = [ "https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.xz" "https://github.com/curl/curl/releases/download/curl-${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}/curl-${finalAttrs.version}.tar.xz" ]; - hash = "sha256-21nPDWccpuf1wsXsF3CEozp54EyX5xzxg6XN6iNQVOs="; + hash = "sha256-x8p9tIsJCXQ+rvNCUNoCwZvGHU8dzt1mA/EJQJU2q1Y="; }; - patches = [ - # https://github.com/NixOS/nixpkgs/issues/356114 - # https://github.com/curl/curl/issues/15496 - # https://github.com/curl/curl/commit/f5c616930b5cf148b1b2632da4f5963ff48bdf88 - # TODO: Remove this patch when 8.11.1/8.12.0 releases - ./fix-netrc-regression.patch - - # https://github.com/curl/curl/issues/15513 - # https://github.com/curl/curl/commit/0cdde0fdfbeb8c35420f6d03fa4b77ed73497694 - ./fix-netrc-regression-2.patch - ]; - # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion # necessary for FreeBSD code path in configure postPatch = '' From 5eb162a23a6b65d05ddbd50d98daa608f2a73294 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 2 Dec 2024 06:47:17 +0000 Subject: [PATCH 050/105] libopenmpt: 0.7.11 -> 0.7.12 Changes: https://lib.openmpt.org/libopenmpt/2024/12/01/releases-0.7.12-0.6.21-0.5.35-0.4.47/ (cherry picked from commit d7a7b89edaeae85d932dc4d35710de4a7c185ef1) --- pkgs/development/libraries/audio/libopenmpt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/libopenmpt/default.nix b/pkgs/development/libraries/audio/libopenmpt/default.nix index 327ce1100c883..30a454a25bea7 100644 --- a/pkgs/development/libraries/audio/libopenmpt/default.nix +++ b/pkgs/development/libraries/audio/libopenmpt/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libopenmpt"; - version = "0.7.11"; + version = "0.7.12"; outputs = [ "out" "dev" "bin" ]; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - hash = "sha256-U6eYuMbi4faV6K0F6ToMG1MZnlqpmBg3xBaWs3BSB2c="; + hash = "sha256-eas842cmAeUltcyUTwJsgMAwMvN9OcqoTIyj/ddeDJg="; }; enableParallelBuilding = true; From 467e65b530fc3d25c58b6a372f78f4a9cb3f3056 Mon Sep 17 00:00:00 2001 From: Josh Hoffer Date: Wed, 4 Dec 2024 11:59:44 -0800 Subject: [PATCH 051/105] systemd: 256.8 -> 256.9 (cherry picked from commit f1518d36753d1497df2f8b4e82b46b8e6bafe8ed) --- pkgs/os-specific/linux/systemd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 425775e9dd163..ecd7533de7b81 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -185,7 +185,7 @@ assert withBootloader -> withEfi; let wantCurl = withRemote || withImportd; wantGcrypt = withResolved || withImportd; - version = "256.8"; + version = "256.9"; # Use the command below to update `releaseTimestamp` on every (major) version # change. More details in the commentary at mesonFlags. @@ -203,7 +203,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "systemd"; repo = "systemd"; rev = "v${version}"; - hash = "sha256-L/MCsCCMVvK7LgxlaLFpnmsJuTu33cPaiMxIpHU7Tzg="; + hash = "sha256-Pp75XXF1R0XEzowRIw4BA/SSCQq8K4YVoPlmXrkU9nQ="; }; # On major changes, or when otherwise required, you *must* : From 6878b633218926b8a3a28d2c1380f6d962253835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 9 Dec 2024 11:04:20 +0100 Subject: [PATCH 052/105] nixos/tests/jenkins: increase disk size to 2 GiB Or else Jenkins stops the built-in node due to lack of disk space (when using the default 1 GiB). (cherry picked from commit 5843a13d3897708caa0bce8b9a0e59529b442f02) --- nixos/tests/jenkins.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix index d7394c866c143..35762652778b0 100644 --- a/nixos/tests/jenkins.nix +++ b/nixos/tests/jenkins.nix @@ -60,6 +60,11 @@ import ./make-test-python.nix ({ pkgs, ...} : { users.users.jenkins.extraGroups = [ "users" ]; systemd.services.jenkins.serviceConfig.TimeoutStartSec = "6min"; + + # Increase disk space to prevent this issue: + # + # WARNING h.n.DiskSpaceMonitorDescriptor#markNodeOfflineOrOnline: Making Built-In Node offline temporarily due to the lack of disk space + virtualisation.diskSize = 2 * 1024; }; slave = From 1d81853f797f2e3c376a8f2e04b3a987e480fe87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 9 Dec 2024 11:38:08 +0100 Subject: [PATCH 053/105] jenkins-job-builder: add passthru.tests (cherry picked from commit fb3449bd17db599056af6cf975edebd8730f3a49) --- .../development/python-modules/jenkins-job-builder/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index 479abaffd66f8..3f9d0187105d0 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -14,6 +14,7 @@ fetchpatch, testtools, pytest-mock, + nixosTests, }: buildPythonPackage rec { @@ -54,6 +55,8 @@ buildPythonPackage rec { pytest-mock ]; + passthru.tests = { inherit (nixosTests) jenkins; }; + meta = { description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git"; mainProgram = "jenkins-jobs"; From 757d04180672f830f53218f79f8c13ba202dc93e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 4 Nov 2024 06:47:34 +0000 Subject: [PATCH 054/105] mpg123: 1.32.8 -> 1.32.9 Changes: https://www.mpg123.de/#2024-11-02 (cherry picked from commit 87ba2ce02b0182c9571e448badef96301512a170) --- pkgs/applications/audio/mpg123/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 995b53055586473dbc75e3832de933cac3ecd070 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Sat, 14 Dec 2024 08:54:55 +0000 Subject: [PATCH 055/105] gst_all_1.*: 1.24.7 -> 1.24.10 https://discourse.gstreamer.org/t/gstreamer-1-24-10-stable-bug-fix-release/3683 (cherry picked from commit 5af5812fd49d93e1bca04333dd1afb250a321eb6) --- pkgs/development/libraries/gstreamer/bad/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/base/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/core/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/devtools/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/ges/default.nix | 8 ++------ pkgs/development/libraries/gstreamer/good/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/libav/default.nix | 4 ++-- .../libraries/gstreamer/rtsp-server/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/ugly/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/vaapi/default.nix | 4 ++-- pkgs/development/python-modules/gst-python/default.nix | 4 ++-- 11 files changed, 22 insertions(+), 26 deletions(-) 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/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/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. From 9bbbbd1a5fe23134bda03321826604595cc362ba Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Sat, 14 Dec 2024 10:03:04 +0000 Subject: [PATCH 056/105] gst_all_1.gst-plugins-rs: 0.12.8 -> 0.13.3 https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/compare/0.12.8...0.13.3 (cherry picked from commit 38f521dc42da45a1131493834b3f9bd6cf11ef7f) --- .../libraries/gstreamer/rs/Cargo.lock | 7401 ----------------- .../libraries/gstreamer/rs/default.nix | 34 +- 2 files changed, 9 insertions(+), 7426 deletions(-) delete mode 100644 pkgs/development/libraries/gstreamer/rs/Cargo.lock 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..88213cdfbf6ca 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; From 3a830d4e258a8116b75238c42dbf6b3eaff83ac8 Mon Sep 17 00:00:00 2001 From: Adam Dinwoodie Date: Fri, 20 Dec 2024 10:55:08 +0000 Subject: [PATCH 057/105] nixos/nix-remote-build: correct comment This module potentially generates `/etc/nix/machines`. Correct an existing comment to refer to that path rather than `/etc/machines`. (cherry picked from commit 3275a6b3613c387d99cf2978a4a68a8af69bed11) --- nixos/modules/config/nix-remote-build.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/nix-remote-build.nix b/nixos/modules/config/nix-remote-build.nix index 11fcec30ff640..4786fef31d065 100644 --- a/nixos/modules/config/nix-remote-build.nix +++ b/nixos/modules/config/nix-remote-build.nix @@ -225,7 +225,7 @@ in }; }; - # distributedBuilds does *not* inhibit /etc/machines generation; caller may + # distributedBuilds does *not* inhibit /etc/nix/machines generation; caller may # override that nix option. config = mkIf cfg.enable { assertions = From 335924becacb21375fed8c1cdb12b75dc3d7440e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 27 Nov 2024 06:19:15 +0000 Subject: [PATCH 058/105] git: 2.47.0 -> 2.47.1 Changes: https://lore.kernel.org/git/xmqq5xob6coo.fsf@gitster.g/ (cherry picked from commit 63c55901de1dea4194f4b53d0ccc3fa7b3c03ad3) --- pkgs/applications/version-management/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 57779cb487d08..4ec161a897589 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -30,7 +30,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.47.0"; + version = "2.47.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - hash = "sha256-HOEU2ohwQnG0PgJ8UeBNk5n4yI6e91Qtrnrrrn2HvE4="; + hash = "sha256-89j5uyOuOSN06RzZ05WXDavFucXucvOYhGE82Epu0xA="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; From 548fa05b7a0fe52057e6660919e16d161108005f Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Sat, 21 Dec 2024 15:11:28 -0800 Subject: [PATCH 059/105] systemd: 256.9 -> 256.10 --- pkgs/os-specific/linux/systemd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index ecd7533de7b81..e89b725965ca8 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -185,7 +185,7 @@ assert withBootloader -> withEfi; let wantCurl = withRemote || withImportd; wantGcrypt = withResolved || withImportd; - version = "256.9"; + version = "256.10"; # Use the command below to update `releaseTimestamp` on every (major) version # change. More details in the commentary at mesonFlags. @@ -203,7 +203,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "systemd"; repo = "systemd"; rev = "v${version}"; - hash = "sha256-Pp75XXF1R0XEzowRIw4BA/SSCQq8K4YVoPlmXrkU9nQ="; + hash = "sha256-RkdY/KnbQcqSx+Ey7YjAbTwCnHZspBqt6rbclgxW0lE="; }; # On major changes, or when otherwise required, you *must* : From ecb8d4a745ace091a019b745a46cd375da5e3d34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Dec 2024 00:46:35 +0000 Subject: [PATCH 060/105] socat: 1.8.0.1 -> 1.8.0.2 (cherry picked from commit 15fd33d586aab6f35bf2168b13aa2e2abb394398) --- pkgs/by-name/so/socat/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/so/socat/package.nix b/pkgs/by-name/so/socat/package.nix index 1410945e6f633..2efbe1244772d 100644 --- a/pkgs/by-name/so/socat/package.nix +++ b/pkgs/by-name/so/socat/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "socat"; - version = "1.8.0.1"; + version = "1.8.0.2"; src = fetchurl { url = "http://www.dest-unreach.org/socat/download/${pname}-${version}.tar.bz2"; - hash = "sha256-aig1Zdt8+GKSxvcFBMWKuwPimIit7tWmxfNFfoA8G4E="; + hash = "sha256-rcB6nCcjUnz2Vo0vuWVZeUz5wlSkvC7dNvfzeJ6fdiU="; }; postPatch = '' From 0cf9503a803b9cbb2a25f8c60e9c90a4e1d6cef4 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 13 Dec 2024 20:08:56 +0100 Subject: [PATCH 061/105] avahi: apply patch for CVE-2024-52616 Fixes CVE-2024-52616 / https://github.com/avahi/avahi/security/advisories/GHSA-r9j3-vjjh-p8vm (cherry picked from commit a7e9d5524b2e5ecca81c41752907096b0f5c14fd) --- pkgs/development/libraries/avahi/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 645eb7b4ed99d..b5190172eafc4 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -11,6 +11,7 @@ expat, gettext, glib, + autoreconfHook, libiconv, libevent, nixosTests, @@ -131,6 +132,12 @@ stdenv.mkDerivation rec { "fuzz/fuzz-packet.c" ]; }) + # https://github.com/avahi/avahi/pull/659 merged Nov 19 + (fetchpatch { + name = "CVE-2024-52616.patch"; + url = "https://github.com/avahi/avahi/commit/f8710bdc8b29ee1176fe3bfaeabebbda1b7a79f7.patch"; + hash = "sha256-BUQOQ4evKLBzV5UV8xW8XL38qk1rg6MJ/vcT5NBckfA="; + }) ]; depsBuildBuild = [ @@ -141,6 +148,7 @@ stdenv.mkDerivation rec { pkg-config gettext glib + autoreconfHook ]; buildInputs = From 9cc64928747ff6cddd0a435631fde312bef6705e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 22 Dec 2024 18:09:58 +0100 Subject: [PATCH 062/105] python312Packages.jinja2: 3.1.4 -> 3.1.5 https://github.com/pallets/jinja/releases/tag/3.1.5 https://github.com/pallets/jinja/security/advisories/GHSA-q2x7-8rv6-6q7h https://github.com/pallets/jinja/security/advisories/GHSA-gmj6-6f8f-6699 Fixes: CVE-2024-56326, CVE-2024-56201 (cherry picked from commit 143eb2efc7b644bc8db4280da0d6582a6f1cd58f) --- .../python-modules/jinja2/default.nix | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index 995f436a8242a..d9c5c674eb9e7 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -21,19 +21,29 @@ buildPythonPackage rec { pname = "jinja2"; - version = "3.1.4"; + version = "3.1.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Sjruesu+cwOu3o6WSNE7i/iKQpKCqmEiqZPwrIAMs2k="; + hash = "sha256-j+//jcMDTie7gNZ8Zx64qbxCTA70wIJu2/8wTM7/Q7s="; }; - nativeBuildInputs = [ flit-core ]; + postPatch = '' + # Do not test with trio, it increases jinja2's dependency closure by a lot + # and everyone consuming these dependencies cannot rely on sphinxHook, + # because sphinx itself depends on jinja2. + substituteInPlace tests/test_async{,_filters}.py \ + --replace-fail "import trio" "" \ + --replace-fail ", trio.run" "" \ + --replace-fail ", \"trio\"" "" + ''; - propagatedBuildInputs = [ markupsafe ]; + build-system = [ flit-core ]; + + dependencies = [ markupsafe ]; optional-dependencies = { i18n = [ babel ]; @@ -45,14 +55,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.i18n; - disabledTests = lib.optionals (pythonAtLeast "3.13") [ - # https://github.com/pallets/jinja/issues/1900 - "test_custom_async_iteratable_filter" - "test_first" - "test_loop_errors" - "test_package_zip_list" - ]; - passthru.doc = stdenv.mkDerivation { # Forge look and feel of multi-output derivation as best as we can. # From 2ac88195ca4cf665c0d080c2c0c72ad1521aead5 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 28 Dec 2024 17:18:12 -0600 Subject: [PATCH 063/105] tree-sitter: 0.24.4 -> 0.24.6 (cherry picked from commit dca72f67e6376efb67c6262a9bf15c8f110b5093) --- pkgs/development/tools/parsing/tree-sitter/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 5ac947c072f81..5416fee54bc7a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -27,13 +27,13 @@ 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.4"; - hash = "sha256-DIlPEz8oTzLm5BZHPjIQCHDHUXdUhL+LRrkld11HzXw="; + version = "0.24.6"; + hash = "sha256-L7F2/S22knqEdB2hxfqLe5Tcgk0WQqBdFQ7BvHFl4EI="; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; inherit hash; fetchSubmodules = true; }; @@ -111,7 +111,7 @@ rustPlatform.buildRustPackage { pname = "tree-sitter"; inherit src version; - cargoHash = "sha256-32CcOb5op+7QOgLSw+8rvMW3GjJ0jaQsryX5DiW+bIk="; + cargoHash = "sha256-mk3aw1aFu7N+b4AQL5kiaHuIAuJv24KonFeGKid427Q="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security CoreServices ]; From 7dc58bfe8624bf37c971f624c45e5a8943bbdafa Mon Sep 17 00:00:00 2001 From: Peter Kling <1018801+pitkling@users.noreply.github.com> Date: Sat, 21 Dec 2024 21:22:52 +0100 Subject: [PATCH 064/105] qt6: don't treat absolute paths without known suffix as library upstream issue: https://codereview.qt-project.org/c/qt/qtbase/+/613683 (cherry picked from commit 55b3d70162ee0644a8ea635984cf2801ddcd9ca6) --- .../libraries/qt-6/modules/qtbase/default.nix | 5 +++++ ...reat-abspaths-without-suffix-as-libraries.patch | 14 ++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/qt-6/modules/qtbase/dont-treat-abspaths-without-suffix-as-libraries.patch diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix index 3463ff0555ef0..f3fa1b53f8890 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix @@ -229,6 +229,11 @@ stdenv.mkDerivation rec { ./qmlimportscanner-import-path.patch # don't pass qtbase's QML directory to qmlimportscanner if it's empty ./skip-missing-qml-directory.patch + + # Qt treats linker flags without known suffix as libraries since 6.7.2 (see qt/qtbase commit ea0f00d). + # Don't do this for absolute paths (like `/nix/store/…/QtMultimedia.framework/Versions/A/QtMultimedia`). + # Upcoming upstream fix: https://codereview.qt-project.org/c/qt/qtbase/+/613683. + ./dont-treat-abspaths-without-suffix-as-libraries.patch ]; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/dont-treat-abspaths-without-suffix-as-libraries.patch b/pkgs/development/libraries/qt-6/modules/qtbase/dont-treat-abspaths-without-suffix-as-libraries.patch new file mode 100644 index 0000000000000..b9ee097808787 --- /dev/null +++ b/pkgs/development/libraries/qt-6/modules/qtbase/dont-treat-abspaths-without-suffix-as-libraries.patch @@ -0,0 +1,14 @@ +diff --git a/cmake/QtGenerateLibHelpers.cmake b/cmake/QtGenerateLibHelpers.cmake +index 96675267d2..c9d4a69497 100644 +--- a/cmake/QtGenerateLibHelpers.cmake ++++ b/cmake/QtGenerateLibHelpers.cmake +@@ -10,7 +10,7 @@ function(qt_get_library_name_without_prefix_and_suffix out_var file_path) + if(NOT file_path MATCHES "^-") # not a linker flag + get_filename_component(basename "${file_path}" NAME_WE) + get_filename_component(ext "${file_path}" EXT) +- if(NOT ext) # seems like a library name without prefix and suffix ++ if(NOT ext AND NOT IS_ABSOLUTE "${file_path}") + # seems like a library name without prefix and suffix + set(${out_var} "${file_path}" PARENT_SCOPE) + return() + endif() From c16ee71e7ca1b9df94d09162f2b2c8eaea58b0ba Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Thu, 5 Dec 2024 16:21:18 +0000 Subject: [PATCH 065/105] python312Packages.argcomplete: add patch to fix downstream issues https://git.launchpad.net/ubuntu/+source/python-argcomplete/tree/debian/patches/python-3.13-compat.patch?h=ubuntu/plucky https://bugs.launchpad.net/ubuntu/+source/python-argcomplete/+bug/2088928 fixes checkPhase of python3Packages.traitlets (cherry picked from commit acb21107e5eb2d80d84414b74f790eb661bea15a) --- .../python-modules/argcomplete/default.nix | 7 +++ .../argcomplete/python-3.13-compat.patch | 49 +++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/argcomplete/python-3.13-compat.patch 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 From 8d22c736a9831e2f20337059f8660ee4370f37b9 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 1 Jan 2025 17:47:45 +0300 Subject: [PATCH 066/105] qt6.qtbase: refresh patch --- .../dont-treat-abspaths-without-suffix-as-libraries.patch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/dont-treat-abspaths-without-suffix-as-libraries.patch b/pkgs/development/libraries/qt-6/modules/qtbase/dont-treat-abspaths-without-suffix-as-libraries.patch index b9ee097808787..b8927159e70db 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase/dont-treat-abspaths-without-suffix-as-libraries.patch +++ b/pkgs/development/libraries/qt-6/modules/qtbase/dont-treat-abspaths-without-suffix-as-libraries.patch @@ -1,5 +1,5 @@ diff --git a/cmake/QtGenerateLibHelpers.cmake b/cmake/QtGenerateLibHelpers.cmake -index 96675267d2..c9d4a69497 100644 +index c9d4a69497..dc1a290cfc 100644 --- a/cmake/QtGenerateLibHelpers.cmake +++ b/cmake/QtGenerateLibHelpers.cmake @@ -10,7 +10,7 @@ function(qt_get_library_name_without_prefix_and_suffix out_var file_path) @@ -7,8 +7,7 @@ index 96675267d2..c9d4a69497 100644 get_filename_component(basename "${file_path}" NAME_WE) get_filename_component(ext "${file_path}" EXT) - if(NOT ext) # seems like a library name without prefix and suffix -+ if(NOT ext AND NOT IS_ABSOLUTE "${file_path}") - # seems like a library name without prefix and suffix ++ if(NOT ext AND NOT IS_ABSOLUTE "${file_path}") # seems like a library name without prefix and suffix set(${out_var} "${file_path}" PARENT_SCOPE) return() endif() From 2a539200bd24b932066eda6c08d64c82754e9349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 2 Jan 2025 08:07:03 +0100 Subject: [PATCH 067/105] python312Packages.dulwich: fixup build The changes were picked nixpkgs master (part of that commit): bc886bdb46ff238445cbb552550780bdd7894d0c The test was probably broken by python3 update. --- .../python-modules/dulwich/default.nix | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 0145773a6e0fe..52b48c315b055 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, @@ -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; From 548259e8103f114e5ffb13f6e78cb6562982ef2a Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 24 Dec 2024 14:28:22 +0100 Subject: [PATCH 068/105] python312.opentelemetry-instrumentation: fix build (cherry picked from commit b83d61858ab1d9696c342392f0f1d216865a1299) https://hydra.nixos.org/build/283657441/nixlog/1/tail --- .../opentelemetry-instrumentation/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index 73845247a0c29..29246bb6f35a6 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -43,6 +43,14 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.instrumentation" ]; + disabledTests = [ + # bootstrap: error: argument -a/--action: invalid choice: 'pipenv' (choose from install, requirements) + # RuntimeError: Patch is already started + "test_run_cmd_install" + "test_run_cmd_print" + "test_run_unknown_cmd" + ]; + passthru.updateScript = opentelemetry-api.updateScript; meta = with lib; { From fa0d5a32dcff0a4be785f55dbdbe528234be384e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 8 Dec 2024 19:05:47 +0100 Subject: [PATCH 069/105] buildMozillaMach: patch compat with python 3.12.8/3.13.1 https://bugzilla.mozilla.org/show_bug.cgi?id=1935621 (cherry picked from commit 59e4669515ada2d564f4fb870196b5b77e1c1a34) --- .../networking/browsers/firefox/common.nix | 6 + .../mozbz-1935621-attachment-9442305.patch | 119 ++++++++++++++++++ 2 files changed, 125 insertions(+) create mode 100644 pkgs/applications/networking/browsers/firefox/mozbz-1935621-attachment-9442305.patch diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index dc52606f24b79..64c7316f6d855 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -254,6 +254,12 @@ buildStdenv.mkDerivation { hash = "sha256-2IpdSyye3VT4VB95WurnyRFtdN1lfVtYpgEiUVhfNjw="; }) ] + ++ [ + # 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))) + From 7cc9725b0b21b1495353b25750f20e362f3b4050 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 9 Nov 2024 12:00:00 +0000 Subject: [PATCH 070/105] nodejs: fix build on 32 bit platforms this test is failing on both armv7 and i686 and is related to year 2038 issue so it probably affects all 32 bit platforms (cherry picked from commit 815ec0c6f29c01c209e731f599734dff28ca33e5) --- pkgs/development/web/nodejs/nodejs.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 8881d608c95b1..ab63e1e14a7a6 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -321,6 +321,9 @@ let "test-watch-mode-files_watcher" ] ++ lib.optionals (!lib.versionAtLeast version "22") [ "test-tls-multi-key" + ] ++ lib.optionals stdenv.hostPlatform.is32bit [ + # utime (actually utimensat) fails with EINVAL on 2038 timestamp + "test-fs-utimes-y2K38" ] ++ lib.optionals stdenv.buildPlatform.isDarwin [ # Disable tests that don’t work under macOS sandbox. "test-macos-app-sandbox" From 564103c78faf97de89ad65daa6a133082e29c2f5 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Tue, 29 Oct 2024 15:30:11 +0100 Subject: [PATCH 071/105] nodejs_22: 22.10.0 -> 22.11.0 (cherry picked from commit 1e99bcac6f2b2bb2caee862c34976474280ea924) --- pkgs/development/web/nodejs/v22.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 6a71b0056bf76..03d23ba9983a1 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 From 9056aaa27ac05aece0d0c8b529fa8cc933576c66 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Fri, 24 May 2024 01:41:01 -0400 Subject: [PATCH 072/105] nodejs_{18,20}: fix build with clang 18 on Darwin (cherry picked from commit 94d28175ff761adc44d6f680b0070d36ba89b628) --- pkgs/development/web/nodejs/v18.nix | 7 +++++++ pkgs/development/web/nodejs/v20.nix | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index f470f32aac7e4..568359796f2a3 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -63,5 +63,12 @@ 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="; + }) ] ++ gypPatches; } diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index 6fa35c0ac4475..4d86a2df9fe9f 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -27,5 +27,13 @@ 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="; + }) ] ++ gypPatches; } From 81987d9ff405b694b5378c9ebb053d125832e8c8 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 16 Nov 2024 16:16:24 +0000 Subject: [PATCH 073/105] nodejs_{18,20}: apply V8 patches for LLVM 19 (cherry picked from commit 5cb1de1b5da8c47ca67ee3f0bebff4276f22e39a) --- pkgs/development/web/nodejs/v18.nix | 15 +++++++++++++++ pkgs/development/web/nodejs/v20.nix | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index 568359796f2a3..ae1f670f8c257 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -70,5 +70,20 @@ buildNodejs { stripLen = 1; hash = "sha256-WVxsoEcJu0WBTyelNrVQFTZxJhnekQb1GrueeRBRdnY="; }) + # Backport V8 fixes for LLVM 19. + (fetchpatch2 { + url = "https://chromium.googlesource.com/v8/v8/+/182d9c05e78b1ddb1cb8242cd3628a7855a0336f%5E%21/?format=TEXT"; + decode = "base64 -d"; + extraPrefix = "deps/v8/"; + stripLen = 1; + hash = "sha256-bDTwFbATPn5W4VifWz/SqaiigXYDWHq785C64VezuUE="; + }) + (fetchpatch2 { + url = "https://chromium.googlesource.com/v8/v8/+/1a3ecc2483b2dba6ab9f7e9f8f4b60dbfef504b7%5E%21/?format=TEXT"; + decode = "base64 -d"; + extraPrefix = "deps/v8/"; + stripLen = 1; + hash = "sha256-6y3aEqxNC4iTQEv1oewodJrhOHxjp5xZMq1P1QL94Rg="; + }) ] ++ gypPatches; } diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index 4d86a2df9fe9f..18a9635cb870b 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -35,5 +35,20 @@ buildNodejs { stripLen = 1; hash = "sha256-WVxsoEcJu0WBTyelNrVQFTZxJhnekQb1GrueeRBRdnY="; }) + # Backport V8 fixes for LLVM 19. + (fetchpatch2 { + url = "https://chromium.googlesource.com/v8/v8/+/182d9c05e78b1ddb1cb8242cd3628a7855a0336f%5E%21/?format=TEXT"; + decode = "base64 -d"; + extraPrefix = "deps/v8/"; + stripLen = 1; + hash = "sha256-bDTwFbATPn5W4VifWz/SqaiigXYDWHq785C64VezuUE="; + }) + (fetchpatch2 { + url = "https://chromium.googlesource.com/v8/v8/+/1a3ecc2483b2dba6ab9f7e9f8f4b60dbfef504b7%5E%21/?format=TEXT"; + decode = "base64 -d"; + extraPrefix = "deps/v8/"; + stripLen = 1; + hash = "sha256-6y3aEqxNC4iTQEv1oewodJrhOHxjp5xZMq1P1QL94Rg="; + }) ] ++ gypPatches; } From 858190e02c09aeb0088957008ba51a347a72b6df Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 16 Nov 2024 16:36:42 +0000 Subject: [PATCH 074/105] Revert "nodejs_18: fix build with clang 16 mk2" libc++ 19 no longer supports Clang < 17. This reverts commit b034e4cbf12f7c0d749674c102e31e6a47fa2d7f. (cherry picked from commit 42ef3589e685ba2ba10a67928341e5a40e225038) --- pkgs/development/web/nodejs/v18.nix | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index ae1f670f8c257..56e54d6fba9ed 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; }; From 0dbdc3b6afc0d6976451af3d8868c413015b0bba Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Fri, 22 Nov 2024 19:31:46 +0100 Subject: [PATCH 075/105] nodejs_{20,22,23}: fix flaky test (cherry picked from commit f634fa26cc24f7a32913f5c6d8afedcfd80116eb) --- pkgs/development/web/nodejs/nodejs.nix | 1 + pkgs/development/web/nodejs/v20.nix | 5 +++++ pkgs/development/web/nodejs/v22.nix | 6 ++++++ pkgs/development/web/nodejs/v23.nix | 5 +++++ 4 files changed, 17 insertions(+) diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index ab63e1e14a7a6..b2c007e339e7e 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -291,6 +291,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/v20.nix b/pkgs/development/web/nodejs/v20.nix index 18a9635cb870b..5ff889928b9da 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -50,5 +50,10 @@ buildNodejs { 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 03d23ba9983a1..5fe7a73e7aaba 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -18,5 +18,11 @@ buildNodejs { ./node-npm-build-npm-package-logic.patch ./use-correct-env-in-tests.patch ./bin-sh-node-run-v22.patch + + # 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..e496741d4b769 100644 --- a/pkgs/development/web/nodejs/v23.nix +++ b/pkgs/development/web/nodejs/v23.nix @@ -63,5 +63,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="; + }) ]; } From 7d52295f4e70d3055222ccc506f7e37db6a9f3c3 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Wed, 27 Nov 2024 09:26:25 +0100 Subject: [PATCH 076/105] nodejs_{20,22}: fix test-os failure Same as #356257 (cherry picked from commit cb05815e588481a472b44141ef53d3deae25c6e1) --- pkgs/development/web/nodejs/v20.nix | 10 ++++++++++ pkgs/development/web/nodejs/v22.nix | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index 5ff889928b9da..b0afedff7f987 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -35,6 +35,16 @@ buildNodejs { 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"; diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 5fe7a73e7aaba..8f57d42057c7b 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -19,6 +19,16 @@ buildNodejs { ./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="; + }) # fixes test failure, remove when included in release (fetchpatch2 { url = "https://github.com/nodejs/node/commit/b6fe731c55eb4cb9d14042a23e5002ed39b7c8b7.patch?full_index=1"; From 20b148aae78d1f9cabe843665fb9ba7f1cbae021 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Sat, 14 Dec 2024 14:15:32 +0100 Subject: [PATCH 077/105] nodejs_18: fix test-os failure (cherry picked from commit bc353483c70ddb56bd06f4616f4bc41f59fbefe0) --- pkgs/development/web/nodejs/v18.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index 56e54d6fba9ed..a67a1538f83e4 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -65,5 +65,15 @@ buildNodejs { 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; } From 598874d4e2db5965fbeac1316f35f6fccc853b7a Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Wed, 25 Dec 2024 22:06:28 +0100 Subject: [PATCH 078/105] nodejs_22: 22.11.0 -> 22.12.0 (#361565) (cherry picked from commit e4f44407a7a9a5561cd6b589a6d27e7a8f91a720) --- pkgs/development/web/nodejs/v22.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 8f57d42057c7b..2e4645af5590a 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.11.0"; - sha256 = "bbf0297761d53aefda9d7855c57c7d2c272b83a7b5bad4fea9cb29006d8e1d35"; + version = "22.12.0"; + sha256 = "fe1bc4be004dc12721ea2cb671b08a21de01c6976960ef8a1248798589679e16"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch @@ -21,10 +21,6 @@ buildNodejs { # 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="; From 0f893f1d886ddddebeee4f47b2e6b887f6a3911c Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Wed, 25 Dec 2024 22:07:09 +0100 Subject: [PATCH 079/105] nodejs_23: 23.2.0 -> 23.5.0 (#357699) (cherry picked from commit 2b8df7696923fa204511df546be1256a8b9cfa1f) --- pkgs/development/web/nodejs/v23.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/development/web/nodejs/v23.nix b/pkgs/development/web/nodejs/v23.nix index e496741d4b769..712c4d41d3a74 100644 --- a/pkgs/development/web/nodejs/v23.nix +++ b/pkgs/development/web/nodejs/v23.nix @@ -14,8 +14,8 @@ let in buildNodejs { inherit enableNpm; - version = "23.2.0"; - sha256 = "3cf7a8a36682775693691f1de901bb5973ad3c0ae2aa87b1add9de515e7b2fc7"; + version = "23.5.0"; + sha256 = "32e77b36c0774c68baab41bc7c2acc58663ca0a2b7c4d3e9bec6f761c15fdac0"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch @@ -53,20 +53,10 @@ buildNodejs { hash = "sha256-gmIyiSyNzC3pClL1SM2YicckWM+/2tsbV1xv2S3d5G0="; revert = true; }) - # 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="; - }) - # fixes test failure, remove when included in release - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/b6fe731c55eb4cb9d14042a23e5002ed39b7c8b7.patch?full_index=1"; - hash = "sha256-KoKsQBFKUji0GeEPTR8ixBflCiHBhPqd2cPVPuKyua8="; + url = "https://github.com/nodejs/node/commit/49acdc8748fe9fe83bc1b444e24c456dff00ecc5.patch?full_index=1"; + hash = "sha256-iK7bj4KswTeQ9I3jJ22ZPTsvCU8xeGGXEOo43dxg3Mk="; }) ]; } From f1f3028fd230b3a410c4f25d7a014c0a4f29c85c Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Sun, 5 Jan 2025 18:31:42 +0100 Subject: [PATCH 080/105] nodejs_22: fix build with libuv 1.48.0 --- pkgs/development/web/nodejs/v22.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 2e4645af5590a..09713913621f5 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -19,6 +19,34 @@ 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 { From f63fa108f90b3cf3816f3c3683bcd35003a72b02 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 10 Dec 2024 16:17:48 +0800 Subject: [PATCH 081/105] deepin.dtk6core: 6.0.19 -> 6.0.24 (cherry picked from commit 0852cf61fbab34cb0211e11dd2de5b4479d27304) --- pkgs/desktops/deepin/library/dtk6core/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/deepin/library/dtk6core/default.nix b/pkgs/desktops/deepin/library/dtk6core/default.nix index a665236714270..97ac2fb5843f7 100644 --- a/pkgs/desktops/deepin/library/dtk6core/default.nix +++ b/pkgs/desktops/deepin/library/dtk6core/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, cmake, pkg-config, doxygen, @@ -15,23 +14,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6core"; - version = "6.0.19"; + version = "6.0.24"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6core"; rev = finalAttrs.version; - hash = "sha256-3MwvTnjtVVcMjQa1f4UdagEtWhJj8aDgfUlmnGo/R7s="; + hash = "sha256-51TvPQy0b/8kkBs0e3q1B53mEAKHpAYPBla4h1k616c="; }; patches = [ ./fix-pkgconfig-path.patch ./fix-pri-path.patch - (fetchpatch { - name = "fix-build-on-qt-6.8.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6core/-/raw/d2e991f96b2940e8533b7e944bab5a7dd6aa0fb7/qt-6.8.patch"; - hash = "sha256-HZxUrtUmVwnNUwcBoU7ewb+McsRkALQglPBbJU8HTkk="; - }) ]; postPatch = '' From 7d1a426532fd425e0d7dc7d17cb0d3f9d6e7cb92 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 10 Dec 2024 16:18:54 +0800 Subject: [PATCH 082/105] deepin.dde-application-manager: 1.2.15 -> 1.2.19 (cherry picked from commit c172f4770b2d960657216ce9dc9c5db200ecea96) --- pkgs/desktops/deepin/core/dde-application-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/core/dde-application-manager/default.nix b/pkgs/desktops/deepin/core/dde-application-manager/default.nix index d265cfdc6c060..cf1ae2d6dec36 100644 --- a/pkgs/desktops/deepin/core/dde-application-manager/default.nix +++ b/pkgs/desktops/deepin/core/dde-application-manager/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "dde-application-manager"; - version = "1.2.15"; + version = "1.2.19"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-9WKKM3SAMgW+UL0DnzDFqA+HHi7euF/yyTyKSbrIgV4="; + hash = "sha256-KUwX7oilV562WDxkBhTQhwz2lgcQIYwkmRRglWj0zh8="; }; nativeBuildInputs = [ From f11d11c1848704221da76ad14d9e9e0265213f8c Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 10 Dec 2024 16:22:36 +0800 Subject: [PATCH 083/105] deepin.dtk6gui: 6.0.19 -> 6.0.24 (cherry picked from commit 149b50f9a31fe40b98946298548c476e76048d1b) --- pkgs/desktops/deepin/library/dtk6gui/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/deepin/library/dtk6gui/default.nix b/pkgs/desktops/deepin/library/dtk6gui/default.nix index 99888c90e066f..4204ad9f23560 100644 --- a/pkgs/desktops/deepin/library/dtk6gui/default.nix +++ b/pkgs/desktops/deepin/library/dtk6gui/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, cmake, pkg-config, doxygen, @@ -13,23 +12,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6gui"; - version = "6.0.19"; + version = "6.0.24"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6gui"; rev = finalAttrs.version; - hash = "sha256-nqwkBMcCQiW4iqYhceTaSNNxoR5tvCNfjKUVVHkzN3A="; + hash = "sha256-Ybi68lTSUJpAipx92JF7wj6y+GTYDodJKRCVFhfnBvQ="; }; patches = [ ./fix-pkgconfig-path.patch ./fix-pri-path.patch - (fetchpatch { - name = "fix-build-on-qt-6.8.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6gui/-/raw/b6b8521fd69c28dbca5f6e8d1d8258c904b6caf1/qt-6.8.patch"; - hash = "sha256-Fu5vwvKJGMW94JYoIPvDCeXs8WrAskQlVRX/3FYQFGY="; - }) ]; postPatch = '' @@ -47,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ qt6Packages.qtbase + qt6Packages.qtwayland librsvg ]; From a11e629e34e4f2ef609863497f475aa37b2e6b41 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 10 Dec 2024 16:35:48 +0800 Subject: [PATCH 084/105] deepin.dtk6widget: 6.0.19 -> 6.0.24 (cherry picked from commit de5566c9722ddccf10d00f181991ac917ef40fc2) --- pkgs/desktops/deepin/library/dtk6widget/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/deepin/library/dtk6widget/default.nix b/pkgs/desktops/deepin/library/dtk6widget/default.nix index 2813dbb949fdf..b1400c9cf9c83 100644 --- a/pkgs/desktops/deepin/library/dtk6widget/default.nix +++ b/pkgs/desktops/deepin/library/dtk6widget/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, cmake, pkg-config, doxygen, @@ -14,23 +13,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6widget"; - version = "6.0.19"; + version = "6.0.24"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6widget"; rev = finalAttrs.version; - hash = "sha256-VlFzecX76RMNSBpnMc9HwMPZ5z3zzzkcVcNlGKSShyA="; + hash = "sha256-aDuLybIEzF8ATzH6vkN2SS/yn1eAc2WooNZxeQyH2QM="; }; patches = [ ./fix-pkgconfig-path.patch ./fix-pri-path.patch - (fetchpatch { - name = "fix-build-on-qt-6.8.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6widget/-/raw/c4ac094715daa4ec319dc4d55bbca9d818845f82/qt-6.8.patch"; - hash = "sha256-XEgtAV0mF1+C26wCaukjuv4WNbP4ISGgXt/eav7h9ko="; - }) ]; postPatch = '' From d2dd37546abe2afbae530bc923efe1ff68cc8916 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 10 Dec 2024 16:36:12 +0800 Subject: [PATCH 085/105] deepin.dtk6declarative: 6.0.19 -> 6.0.24 (cherry picked from commit 55c4bd3d385de90eef95342d84732c09a3a1a138) --- .../library/dtk6declarative/default.nix | 5 +- .../dtk6declarative/fix-build-on-qt-6.8.patch | 135 ------------------ 2 files changed, 2 insertions(+), 138 deletions(-) delete mode 100644 pkgs/desktops/deepin/library/dtk6declarative/fix-build-on-qt-6.8.patch diff --git a/pkgs/desktops/deepin/library/dtk6declarative/default.nix b/pkgs/desktops/deepin/library/dtk6declarative/default.nix index 1011faf0f1995..9092cafdac513 100644 --- a/pkgs/desktops/deepin/library/dtk6declarative/default.nix +++ b/pkgs/desktops/deepin/library/dtk6declarative/default.nix @@ -11,19 +11,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6declarative"; - version = "6.0.19"; + version = "6.0.24"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6declarative"; rev = finalAttrs.version; - hash = "sha256-BxWPLJeuQDbNg4UoyHD/VAMV2QFWDjWZiFx5JOEmLxg="; + hash = "sha256-i6gkVWs6CQC6i6H6lfrWNYT76fFBc8ECZ1ePvXQ7j8E="; }; patches = [ ./fix-pkgconfig-path.patch ./fix-pri-path.patch - ./fix-build-on-qt-6.8.patch ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/library/dtk6declarative/fix-build-on-qt-6.8.patch b/pkgs/desktops/deepin/library/dtk6declarative/fix-build-on-qt-6.8.patch deleted file mode 100644 index ab09398c0123d..0000000000000 --- a/pkgs/desktops/deepin/library/dtk6declarative/fix-build-on-qt-6.8.patch +++ /dev/null @@ -1,135 +0,0 @@ -diff --git a/qt6/src/CMakeLists.txt b/qt6/src/CMakeLists.txt -index 4314b72..a7ecaf1 100644 ---- a/qt6/src/CMakeLists.txt -+++ b/qt6/src/CMakeLists.txt -@@ -25,6 +25,7 @@ dtk_extend_target(${PLUGIN_NAME} EnableCov ${ENABLE_COV}) - qt_add_translations(${LIB_NAME} - TS_FILES ${TS_FILES} - QM_FILES_OUTPUT_VARIABLE QM_FILES -+ IMMEDIATE_CALL - ) - - set_target_properties(${LIB_NAME} PROPERTIES -diff --git a/src/private/dbackdropnode.cpp b/src/private/dbackdropnode.cpp -index 91c398a..1ed0ad8 100644 ---- a/src/private/dbackdropnode.cpp -+++ b/src/private/dbackdropnode.cpp -@@ -320,8 +320,8 @@ public: - renderer->setDevicePixelRatio(base->devicePixelRatio()); - renderer->setDeviceRect(base->deviceRect()); - renderer->setViewportRect(base->viewportRect()); -- renderer->setProjectionMatrix(base->projectionMatrix()); -- renderer->setProjectionMatrixWithNativeNDC(base->projectionMatrixWithNativeNDC()); -+ renderer->setProjectionMatrix(base->projectionMatrix(0)); -+ renderer->setProjectionMatrixWithNativeNDC(base->projectionMatrixWithNativeNDC(0)); - } else { - renderer->setDevicePixelRatio(1.0); - renderer->setDeviceRect(QRect(QPoint(0, 0), pixelSize)); -@@ -336,8 +336,8 @@ public: - } - - if (Q_UNLIKELY(!matrix.isIdentity())) { -- renderer->setProjectionMatrix(renderer->projectionMatrix() * matrix); -- renderer->setProjectionMatrixWithNativeNDC(renderer->projectionMatrixWithNativeNDC() * matrix); -+ renderer->setProjectionMatrix(renderer->projectionMatrix(0) * matrix); -+ renderer->setProjectionMatrixWithNativeNDC(renderer->projectionMatrixWithNativeNDC(0) * matrix); - } - - renderer->setRootNode(rootNode); -diff --git a/src/private/dmaskeffectnode.cpp b/src/private/dmaskeffectnode.cpp -index c4db07d..da1e4ce 100644 ---- a/src/private/dmaskeffectnode.cpp -+++ b/src/private/dmaskeffectnode.cpp -@@ -35,7 +35,7 @@ protected: - class OpaqueTextureMaterialShader : public QSGOpaqueTextureMaterialRhiShader - { - public: -- OpaqueTextureMaterialShader(); -+ OpaqueTextureMaterialShader(int viewCount); - - bool updateUniformData(RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) override; - -@@ -48,7 +48,7 @@ public: - class TextureMaterialShader : public OpaqueTextureMaterialShader - { - public: -- TextureMaterialShader(); -+ TextureMaterialShader(int viewCount); - - #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect) override; -@@ -61,7 +61,8 @@ protected: - #endif - }; - --OpaqueTextureMaterialShader::OpaqueTextureMaterialShader() -+OpaqueTextureMaterialShader::OpaqueTextureMaterialShader(int viewCount) -+ : QSGOpaqueTextureMaterialRhiShader(viewCount) - { - #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - #if QT_CONFIG(opengl) -@@ -236,8 +237,8 @@ bool OpaqueTextureMaterialShader::updateGraphicsPipelineState(RenderState &state - } - #endif - --TextureMaterialShader::TextureMaterialShader() -- : OpaqueTextureMaterialShader() -+TextureMaterialShader::TextureMaterialShader(int viewCount) -+ : OpaqueTextureMaterialShader(viewCount) - { - #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // TODO qt6 - #if QT_CONFIG(opengl) -@@ -529,7 +530,7 @@ QSGMaterialShader *TextureMaterial::createShader() const - QSGMaterialShader *TextureMaterial::createShader(QSGRendererInterface::RenderMode renderMode) const - { - Q_UNUSED(renderMode) -- return new TextureMaterialShader; -+ return new TextureMaterialShader(viewCount()); - } - #endif - -@@ -553,7 +554,7 @@ QSGMaterialShader *OpaqueTextureMaterial::createShader() const - QSGMaterialShader *OpaqueTextureMaterial::createShader(QSGRendererInterface::RenderMode renderMode) const - { - Q_UNUSED(renderMode) -- return new OpaqueTextureMaterialShader; -+ return new OpaqueTextureMaterialShader(viewCount()); - } - #endif - -diff --git a/src/private/drectanglenode.cpp b/src/private/drectanglenode.cpp -index efeeab6..b961588 100644 ---- a/src/private/drectanglenode.cpp -+++ b/src/private/drectanglenode.cpp -@@ -72,7 +72,8 @@ void CornerColorShader::initialize() - m_idQtOpacity = program->uniformLocation("qt_Opacity"); - } - #else --CornerColorShader::CornerColorShader() -+CornerColorShader::CornerColorShader(int viewCount) -+ : QSGOpaqueTextureMaterialRhiShader(viewCount) - { - setShaderFileName(QSGMaterialShader::VertexStage, QStringLiteral(":/dtk/declarative/shaders_ng/cornerscolorshader.vert.qsb")); - setShaderFileName(QSGMaterialShader::FragmentStage, QStringLiteral(":/dtk/declarative/shaders_ng/cornerscolorshader.frag.qsb")); -@@ -128,7 +129,7 @@ QSGMaterialShader *CornerColorMaterial::createShader() const - QSGMaterialShader *CornerColorMaterial::createShader(QSGRendererInterface::RenderMode renderMode) const - { - Q_UNUSED(renderMode) -- return new CornerColorShader; -+ return new CornerColorShader(viewCount()); - } - #endif - -diff --git a/src/private/drectanglenode_p.h b/src/private/drectanglenode_p.h -index aee5a7c..7962154 100644 ---- a/src/private/drectanglenode_p.h -+++ b/src/private/drectanglenode_p.h -@@ -37,7 +37,7 @@ private: - class CornerColorShader : public QSGOpaqueTextureMaterialRhiShader - { - public: -- CornerColorShader(); -+ CornerColorShader(int viewCount); - bool updateUniformData(RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial); - }; - #endif From 1a5ae4fc1b8d46fe63919b362f96ef3f73862e4f Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 10 Dec 2024 16:39:10 +0800 Subject: [PATCH 086/105] deepin.qt6integration: 6.0.19 -> 6.0.24 (cherry picked from commit 4ed970fdef4919074766a94defa331e4d656b7ed) --- pkgs/desktops/deepin/library/qt6integration/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/library/qt6integration/default.nix b/pkgs/desktops/deepin/library/qt6integration/default.nix index 19f6d5f936693..1383ef81e07e6 100644 --- a/pkgs/desktops/deepin/library/qt6integration/default.nix +++ b/pkgs/desktops/deepin/library/qt6integration/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "qt6integration"; - version = "6.0.19"; + version = "6.0.24"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-RVhAuEthrTE1QkRIKmBK4VM86frgAqLMJL31F11H8R8="; + hash = "sha256-J0HKtxnQCizHFf2VR9srS/CxWqAkczia7kDWxvGzKsw="; }; nativeBuildInputs = [ From 68216a6692dc8b40d75aebe3d8795f35de0c3f60 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 10 Dec 2024 16:40:45 +0800 Subject: [PATCH 087/105] deepin.qt6platform-plugins: 6.0.19 -> 6.0.24 (cherry picked from commit c66a709ed433781d5eca1883cf87c0474baa0e1c) --- pkgs/desktops/deepin/library/qt6platform-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix index 93ac45236ba9e..2befb9219bd32 100644 --- a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix +++ b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "qt6platform-plugins"; - version = "6.0.19"; + version = "6.0.24"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-aHqm+WKZLoUymiMFfrF3jgWrxgq51d6yTXWiOMsFgiQ="; + hash = "sha256-Ih3VlEv2hl8y/Cc5uI8gQFgIVvcCaHUhHAudNOSqfs4="; }; postUnpack = '' From cfef7b893398f6193925b8663f52ec13445d4319 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 10 Dec 2024 16:49:28 +0800 Subject: [PATCH 088/105] deepin.treeland-protocols: init at 0.4.5 (cherry picked from commit 49a4f198e4a46551b56c6b202ec232d37890552d) --- pkgs/desktops/deepin/default.nix | 1 + .../library/treeland-protocols/default.nix | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/desktops/deepin/library/treeland-protocols/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 21f585da53b3a..66776a7c6f78b 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -39,6 +39,7 @@ let qt6platform-plugins = callPackage ./library/qt6platform-plugins { }; qt6integration = callPackage ./library/qt6integration { }; qt6mpris = callPackage ./library/qt6mpris { }; + treeland-protocols = callPackage ./library/treeland-protocols { }; #### CORE deepin-kwin = callPackage ./core/deepin-kwin { }; diff --git a/pkgs/desktops/deepin/library/treeland-protocols/default.nix b/pkgs/desktops/deepin/library/treeland-protocols/default.nix new file mode 100644 index 0000000000000..f1b8016bb978e --- /dev/null +++ b/pkgs/desktops/deepin/library/treeland-protocols/default.nix @@ -0,0 +1,34 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, +}: + +stdenv.mkDerivation rec { + pname = "treeland-protocols"; + version = "0.4.5"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + hash = "sha256-SS4jnfr/9Ec3qpnHS4EjQViekBRMix5oz7b9qhNZpfY="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = { + description = "Wayland protocol extensions for treeland"; + homepage = "https://github.com/linuxdeepin/treeland-protocols"; + license = with lib.licenses; [ + gpl3Only + lgpl3Only + asl20 + ]; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; + }; +} From e151c98378c1f44596c900478f36f46c84667ebb Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 10 Dec 2024 16:50:38 +0800 Subject: [PATCH 089/105] deepin.dde-tray-loader: 1.0.1 -> 1.0.7 (cherry picked from commit d384030cc64f925d88adf1a9e9dd35cd61e75301) --- pkgs/desktops/deepin/core/dde-tray-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/core/dde-tray-loader/default.nix b/pkgs/desktops/deepin/core/dde-tray-loader/default.nix index 06d76e0398fd2..6c3b7febf80be 100644 --- a/pkgs/desktops/deepin/core/dde-tray-loader/default.nix +++ b/pkgs/desktops/deepin/core/dde-tray-loader/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dde-tray-loader"; - version = "1.0.1"; + version = "1.0.7"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dde-tray-loader"; rev = finalAttrs.version; - hash = "sha256-FEvoVgwzDYN23TJxu1kRSMSbS4hELYFFByxOsEO9JKE="; + hash = "sha256-LzRjOl3kHArpxwerh7XOisYIJ+t+r/zWUbvYh6k6zKw="; }; patches = [ From 0166e10881f9ed6d6d5a496ef471f4d0ff843448 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 10 Dec 2024 16:56:38 +0800 Subject: [PATCH 090/105] deepin.dde-shell: 1.0.2 -> 1.0.9 (cherry picked from commit 16db3c0ba53523b8bcfbde17ba3908b6d6356d29) --- .../deepin/core/dde-shell/default.nix | 9 ++++++--- .../fix-dock-can-not-show-with-qt6_8.diff | 20 ------------------- 2 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 pkgs/desktops/deepin/core/dde-shell/fix-dock-can-not-show-with-qt6_8.diff diff --git a/pkgs/desktops/deepin/core/dde-shell/default.nix b/pkgs/desktops/deepin/core/dde-shell/default.nix index ee1558ef61453..62663f6756e99 100644 --- a/pkgs/desktops/deepin/core/dde-shell/default.nix +++ b/pkgs/desktops/deepin/core/dde-shell/default.nix @@ -13,26 +13,27 @@ qt6integration, qt6platform-plugins, dde-tray-loader, + dde-application-manager, wayland, wayland-protocols, + treeland-protocols, yaml-cpp, xorg, }: stdenv.mkDerivation (finalAttrs: { pname = "dde-shell"; - version = "1.0.2"; + version = "1.0.9"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dde-shell"; rev = finalAttrs.version; - hash = "sha256-I3z6HL1h3qmLfOrwhyLhtSz3og4kHcAdlHJx4+SgPRo="; + hash = "sha256-Gko1fFut5zWH/L6X5hEe5OZBjRIbKWIrrjjhh2wrsCg="; }; patches = [ ./fix-path-for-nixos.diff - ./fix-dock-can-not-show-with-qt6_8.diff ]; postPatch = '' @@ -56,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ dde-tray-loader + dde-application-manager dtk6declarative dtk6widget dde-qt-dbus-factory @@ -66,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: { qt6integration wayland wayland-protocols + treeland-protocols yaml-cpp xorg.libXcursor xorg.libXres diff --git a/pkgs/desktops/deepin/core/dde-shell/fix-dock-can-not-show-with-qt6_8.diff b/pkgs/desktops/deepin/core/dde-shell/fix-dock-can-not-show-with-qt6_8.diff deleted file mode 100644 index c372dc1e5cf21..0000000000000 --- a/pkgs/desktops/deepin/core/dde-shell/fix-dock-can-not-show-with-qt6_8.diff +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/panels/dock/OverflowContainer.qml b/panels/dock/OverflowContainer.qml -index 74ca966..312f2a0 100644 ---- a/panels/dock/OverflowContainer.qml -+++ b/panels/dock/OverflowContainer.qml -@@ -52,13 +52,13 @@ Item { - for (let child of listView.contentItem.visibleChildren) { - width = calculateImplicitWidth(width, child.implicitWidth) - } -- return width -+ return Math.max(width, 1) - } - implicitHeight: { - let height = 0 - for (let child of listView.contentItem.visibleChildren) { - height = calculateImplicitHeight(height, child.implicitHeight) - } -- return height -+ return Math.max(height, 1) - } - } From 4f89eb9fafa598601a7c66cdd9fd8c85f3dcacc0 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 10 Dec 2024 17:38:14 +0800 Subject: [PATCH 091/105] deepin.dde-launchpad: 1.0.2 -> 1.0.8 (cherry picked from commit 110658a687a23d680e96f4296e8cd4a6d532d649) --- pkgs/desktops/deepin/core/dde-launchpad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/core/dde-launchpad/default.nix b/pkgs/desktops/deepin/core/dde-launchpad/default.nix index 1a7b2cb5107c1..63b625fe90aa2 100644 --- a/pkgs/desktops/deepin/core/dde-launchpad/default.nix +++ b/pkgs/desktops/deepin/core/dde-launchpad/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "dde-launchpad"; - version = "1.0.2"; + version = "1.0.8"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-kczdSd9+ZmMZQ2fWg3SRW+CS/aWktYLz/H+Ky81TwVM="; + hash = "sha256-2arO1WSILY5TVPBvdyhttssddwhMYIBcCGq/pW/DnB0="; }; nativeBuildInputs = [ From fe7eff0b925b09b9e03031b0321486a4e923a649 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 10 Dec 2024 16:17:48 +0800 Subject: [PATCH 092/105] deepin.dtk6core: 6.0.19 -> 6.0.24 (cherry picked from commit 0852cf61fbab34cb0211 from PR #363854) This is apparently needed after update of qt6 in PR #361047 https://hydra.nixos.org/build/283916989/nixlog/4/tail --- pkgs/desktops/deepin/library/dtk6core/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/deepin/library/dtk6core/default.nix b/pkgs/desktops/deepin/library/dtk6core/default.nix index a665236714270..97ac2fb5843f7 100644 --- a/pkgs/desktops/deepin/library/dtk6core/default.nix +++ b/pkgs/desktops/deepin/library/dtk6core/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, cmake, pkg-config, doxygen, @@ -15,23 +14,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6core"; - version = "6.0.19"; + version = "6.0.24"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6core"; rev = finalAttrs.version; - hash = "sha256-3MwvTnjtVVcMjQa1f4UdagEtWhJj8aDgfUlmnGo/R7s="; + hash = "sha256-51TvPQy0b/8kkBs0e3q1B53mEAKHpAYPBla4h1k616c="; }; patches = [ ./fix-pkgconfig-path.patch ./fix-pri-path.patch - (fetchpatch { - name = "fix-build-on-qt-6.8.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6core/-/raw/d2e991f96b2940e8533b7e944bab5a7dd6aa0fb7/qt-6.8.patch"; - hash = "sha256-HZxUrtUmVwnNUwcBoU7ewb+McsRkALQglPBbJU8HTkk="; - }) ]; postPatch = '' From 1b801c2b91ede9ace020606a912c45171b95427b Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Sat, 14 Dec 2024 22:21:20 +0100 Subject: [PATCH 093/105] python312Packages.nox: apply backport for wntrblm/nox#903 (cherry picked from commit 1d423154ab199b1b18003867bcdc5e7e8f43737c) --- .../python-modules/nox/default.nix | 5 +++ .../fix-broken-mock-on-cpython-3.12.8.patch | 35 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/nox/fix-broken-mock-on-cpython-3.12.8.patch diff --git a/pkgs/development/python-modules/nox/default.nix b/pkgs/development/python-modules/nox/default.nix index 2751d971c175d..9485022155da8 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") + From 153f344efc854559e0874661fac3212713904107 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Dec 2024 00:43:43 +0100 Subject: [PATCH 094/105] python312Packages.calmjs: disable failing test (cherry picked from commit 02793bc7e5250f4f5d721edd81dcb87c089c3204) https://hydra.nixos.org/build/283706835/nixlog/6/tail --- pkgs/development/python-modules/calmjs/default.nix | 5 +++++ 1 file changed, 5 insertions(+) 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 From 0788ee20d259030b65c14cea14b62cee40ee33b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 16 Dec 2024 12:42:51 -0800 Subject: [PATCH 095/105] python312Packages.httpie: disable failing test (cherry picked from commit 370c8389fcf53143d0ac9255bfd2c0ed2020edb2) https://hydra.nixos.org/build/283922535/nixlog/6/tail --- pkgs/development/python-modules/httpie/default.nix | 2 ++ 1 file changed, 2 insertions(+) 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 From c4a5f18a3f1ec3fc9ebfa227fd163ee676dc42fa Mon Sep 17 00:00:00 2001 From: FabianRig <88741530+FabianRig@users.noreply.github.com> Date: Sat, 23 Nov 2024 22:04:41 +0100 Subject: [PATCH 096/105] labelle: 1.2.3 --> 1.3.2 (cherry picked from commit 88ac05665bc6a85aabe78070b99fd23ad1675409) https://hydra.nixos.org/build/283905493/nixlog/7/tail --- pkgs/by-name/la/labelle/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/la/labelle/package.nix b/pkgs/by-name/la/labelle/package.nix index 3b2a7c98c86ad..5b238aab0575c 100644 --- a/pkgs/by-name/la/labelle/package.nix +++ b/pkgs/by-name/la/labelle/package.nix @@ -8,18 +8,19 @@ }: python3Packages.buildPythonApplication rec { pname = "labelle"; - version = "1.2.3"; + version = "1.3.2"; pyproject = true; src = fetchFromGitHub { owner = "labelle-org"; repo = "labelle"; rev = "refs/tags/v${version}"; - hash = "sha256-nGWffQAXlnKiWBUnSo/IKGdWsLdwLr9N4jAURcVGfj8="; + hash = "sha256-+aRq+zwnoHy+kXerFCw1b46OHmWDDpyOiBRu4IvYAQg="; }; postPatch = '' - sed -i 's/hatch-vcs >=0.3.0,<0.4/hatch-vcs >=0.3.0/' pyproject.toml + substituteInPlace pyproject.toml --replace-fail "hatch-vcs >=0.3.0,<0.4" "hatch-vcs >=0.3.0" + substituteInPlace pyproject.toml --replace-fail "Pillow>=8.1.2,<11" "Pillow>=8.1.2" ''; buildInputs = [ qt6.qtwayland ]; @@ -27,6 +28,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ qt6.wrapQtAppsHook python3Packages.hatchling + python3Packages.hatch-fancy-pypi-readme python3Packages.hatch-vcs copyDesktopItems ]; From a8540c71beb3d0119a0325a53579c4a3a3e1b6d1 Mon Sep 17 00:00:00 2001 From: misilelab Date: Mon, 30 Dec 2024 02:30:48 +0900 Subject: [PATCH 097/105] pdm: 2.19.3 -> 2.22.1 Signed-off-by: misilelab (cherry picked from commit 5306088e5d1dc6437c81866f4f15a23272564556) https://hydra.nixos.org/build/284299881/nixlog/5/tail --- pkgs/by-name/pd/pdm/package.nix | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix index a7b7f26f17a98..a2471e4a1a1b0 100644 --- a/pkgs/by-name/pd/pdm/package.nix +++ b/pkgs/by-name/pd/pdm/package.nix @@ -8,29 +8,43 @@ pdm, }: -python3.pkgs.buildPythonApplication rec { +let + python = python3.override { + self = python; + packageOverrides = _: super: { + resolvelib = super.resolvelib.overridePythonAttrs (old: rec { + version = "1.1.0"; + src = old.src.override { + rev = version; + hash = "sha256-UBdgFN+fvbjz+rp8+rog8FW2jwO/jCfUPV7UehJKiV8="; + }; + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { pname = "pdm"; - version = "2.19.3"; + version = "2.22.1"; pyproject = true; - disabled = python3.pkgs.pythonOlder "3.8"; + disabled = python.pkgs.pythonOlder "3.8"; src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm"; rev = "refs/tags/${version}"; - hash = "sha256-xgwIPHlTtmgCNN4R6/BJsqmI9hbA0wFAiq4YCa+r/UM="; + hash = "sha256-khAS/OpuvZTJGh9/lIGtKONajIonCwc/M9D9lSwzFvw="; }; nativeBuildInputs = [ installShellFiles ]; - build-system = with python3.pkgs; [ + build-system = with python.pkgs; [ pdm-backend pdm-build-locked ]; dependencies = - with python3.pkgs; + with python.pkgs; [ blinker dep-logic @@ -72,7 +86,7 @@ python3.pkgs.buildPythonApplication rec { unset PDM_LOG_DIR ''; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python.pkgs; [ first pytestCheckHook pytest-mock From c51788e7454d89db0efa34566e46fac63558e6de Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 4 Dec 2024 13:13:25 +0800 Subject: [PATCH 098/105] qtcreator: 14.0.2 -> 15.0.0 (cherry picked from commit b9d879b2b99e21b2c1f5f18ef961d58545bba561) https://hydra.nixos.org/build/284302871/nixlog/5/tail --- pkgs/development/tools/qtcreator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index e8f4a083723c6..1f16d8f3afcf0 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { pname = "qtcreator"; - version = "14.0.2"; + version = "15.0.0"; src = fetchurl { url = "mirror://qt/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - hash = "sha256-stL4eLtpKKjm4w2HYAvdk89ATCYZoVHGS9zcjNB4OJI="; + hash = "sha256-I7HGtHjKdgmX7N3Uxyjw2igLBpYAipvd2aEGjxbUj3I="; }; nativeBuildInputs = [ From 39417f92546a585c5960f6d28fd672c338b691ee Mon Sep 17 00:00:00 2001 From: mksafavi Date: Tue, 15 Oct 2024 20:34:48 +0330 Subject: [PATCH 099/105] libphidget22: 0-unstable-2024-04-11 -> 1.20.20240909 (cherry picked from commit 4c6a1b09291f26a45356d2b25f03a3b17f7ba9f2) The old one wouldn't fetch the source anymore. --- pkgs/by-name/li/libphidget22/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/libphidget22/package.nix b/pkgs/by-name/li/libphidget22/package.nix index 8dd3d5e2f475d..3475b7451fe08 100644 --- a/pkgs/by-name/li/libphidget22/package.nix +++ b/pkgs/by-name/li/libphidget22/package.nix @@ -5,14 +5,16 @@ automake, libusb1, }: - +let + version = "1.20.20240909"; +in stdenv.mkDerivation { pname = "libphidget22"; - version = "0-unstable-2024-04-11"; + inherit version; src = fetchurl { - url = "https://cdn.phidgets.com/downloads/phidget22/libraries/linux/libphidget22.tar.gz"; - hash = "sha256-mDoYVs0LhBb3+vzKjzYr9EmcrztmA4cy9xh5ONxHaxI="; + url = "https://www.phidgets.com/downloads/phidget22/libraries/linux/libphidget22/libphidget22-${version}.tar.gz"; + hash = "sha256-20Y7cukEzq/Rf2v91SYTC1yCtS4p5aaG4aK8x6/6ebk="; }; nativeBuildInputs = [ automake ]; From 899fe7f677dc49680ed726926a1c07974bd70ea2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 13:58:10 +0000 Subject: [PATCH 100/105] libphidget22: 1.20.20240909 -> 1.21.20241122 (cherry picked from commit 98928a7dbebef3ae32ed13ca57b607913d5d18f3) --- pkgs/by-name/li/libphidget22/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libphidget22/package.nix b/pkgs/by-name/li/libphidget22/package.nix index 3475b7451fe08..f3fa7d72f1c62 100644 --- a/pkgs/by-name/li/libphidget22/package.nix +++ b/pkgs/by-name/li/libphidget22/package.nix @@ -6,7 +6,8 @@ libusb1, }: let - version = "1.20.20240909"; + # This package should be updated together with libphidget22extra + version = "1.21.20241122"; in stdenv.mkDerivation { pname = "libphidget22"; @@ -14,7 +15,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.phidgets.com/downloads/phidget22/libraries/linux/libphidget22/libphidget22-${version}.tar.gz"; - hash = "sha256-20Y7cukEzq/Rf2v91SYTC1yCtS4p5aaG4aK8x6/6ebk="; + hash = "sha256-6Sib9CSaPUbAdyHfoSgQ6g4oik7+pjb7g79QftSeVIk="; }; nativeBuildInputs = [ automake ]; From a51848695602d39afbc6a6adb1793cd8f57a0bc6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Dec 2024 00:26:31 +0000 Subject: [PATCH 101/105] mountpoint-s3: 1.10.0 -> 1.12.0 (cherry picked from commit fb52a9d657a443dee8e7fe87a91cdeeec17747ba) https://hydra.nixos.org/build/283625177/nixlog/6/tail --- pkgs/by-name/mo/mountpoint-s3/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/mountpoint-s3/package.nix b/pkgs/by-name/mo/mountpoint-s3/package.nix index 067ceaaafb2e8..c442f08664bc3 100644 --- a/pkgs/by-name/mo/mountpoint-s3/package.nix +++ b/pkgs/by-name/mo/mountpoint-s3/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "mountpoint-s3"; - version = "1.10.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "awslabs"; repo = "mountpoint-s3"; rev = "v${version}"; - hash = "sha256-sMxggPe3m1fzfcfwsr2lUECswZ7pFSAJ8b0cURwXFmw="; + hash = "sha256-tKeQn7yyw0AL/Rx8P1FSZU3Zd2UAlDYE6/85e6Ex9IA="; fetchSubmodules = true; }; - cargoHash = "sha256-Gsp/AmxSobEut0jYakK0ymmSpStriAop+Abnl3GlSF4="; + cargoHash = "sha256-MU4wrThhy9y4ni2lfD0VcYqIEUpi/4TqKIaPSFHCkws="; # thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9: # cargo metadata failure: error: none of the selected packages contains these features: libfuse3 From 0f54e8762da96d304d64cd0469bd63ef48a9cca2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Dec 2024 08:11:24 +0000 Subject: [PATCH 102/105] mountpoint-s3: 1.12.0 -> 1.13.0 (cherry picked from commit 5672733f610986dc0cf83e034ca644b92b90a09b) --- pkgs/by-name/mo/mountpoint-s3/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/mountpoint-s3/package.nix b/pkgs/by-name/mo/mountpoint-s3/package.nix index c442f08664bc3..09021f7662645 100644 --- a/pkgs/by-name/mo/mountpoint-s3/package.nix +++ b/pkgs/by-name/mo/mountpoint-s3/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "mountpoint-s3"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "awslabs"; repo = "mountpoint-s3"; rev = "v${version}"; - hash = "sha256-tKeQn7yyw0AL/Rx8P1FSZU3Zd2UAlDYE6/85e6Ex9IA="; + hash = "sha256-L0xVrADLWVH6r600XvxI5I+IghBSmpC6F93cIH/ejh8="; fetchSubmodules = true; }; - cargoHash = "sha256-MU4wrThhy9y4ni2lfD0VcYqIEUpi/4TqKIaPSFHCkws="; + cargoHash = "sha256-Uj6/ZDRaYq99gTwHqAX2c21LecC3LLkJXgCDQ+xEytE="; # thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9: # cargo metadata failure: error: none of the selected packages contains these features: libfuse3 From ae59c8016c09659cae17a85d529401ef55d93bec Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 20 Nov 2024 20:44:21 +0100 Subject: [PATCH 103/105] python312Packages.opensearch-py: fix build (cherry picked from commit d60df245ce98d22bb333abc09803ac8a4dd5a059) https://hydra.nixos.org/build/283921055/nixlog/6/tail --- .../python-modules/opensearch-py/default.nix | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/opensearch-py/default.nix b/pkgs/development/python-modules/opensearch-py/default.nix index 0914a8ca67014..5557ea3e21b1c 100644 --- a/pkgs/development/python-modules/opensearch-py/default.nix +++ b/pkgs/development/python-modules/opensearch-py/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -62,6 +63,8 @@ buildPythonPackage rec { pytz ] ++ optional-dependencies.async; + __darwinAllowLocalNetworking = true; + disabledTestPaths = [ # require network "test_opensearchpy/test_async/test_connection.py" @@ -70,11 +73,21 @@ buildPythonPackage rec { "test_opensearchpy/test_server_secured" ]; - disabledTests = [ - # finds our ca-bundle, but expects something else (/path/to/clientcert/dir or None) - "test_ca_certs_ssl_cert_dir" - "test_no_ca_certs" - ]; + disabledTests = + [ + # finds our ca-bundle, but expects something else (/path/to/clientcert/dir or None) + "test_ca_certs_ssl_cert_dir" + "test_no_ca_certs" + + # Failing tests, issue opened at https://github.com/opensearch-project/opensearch-py/issues/849 + "test_basicauth_in_request_session" + "test_callable_in_request_session" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86) [ + # Flaky tests: OSError: [Errno 48] Address already in use + "test_redirect_failure_when_allow_redirect_false" + "test_redirect_success_when_allow_redirect_true" + ]; meta = { description = "Python low-level client for OpenSearch"; From 83042f62032c3c0bb6643a30a386bcd2a65580cb Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Mon, 18 Nov 2024 23:04:12 +0800 Subject: [PATCH 104/105] corretto{11,17,21}: {11.0.24.8.1,17.0.12.7.1,21.0.4.7.1} -> {11.0.25.9.1,17.0.13.11.1,21.0.5.11.1} (cherry picked from commit 71936fca9802aa6e0f500 from PR #356982) --- pkgs/development/compilers/corretto/11.nix | 4 ++-- pkgs/development/compilers/corretto/17.nix | 4 ++-- pkgs/development/compilers/corretto/21.nix | 4 ++-- .../compilers/corretto/mk-corretto.nix | 15 ++++++--------- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/corretto/11.nix b/pkgs/development/compilers/corretto/11.nix index c1bf6347947cc..6094f07057a01 100644 --- a/pkgs/development/compilers/corretto/11.nix +++ b/pkgs/development/compilers/corretto/11.nix @@ -26,12 +26,12 @@ let # Corretto, too. "--disable-warnings-as-errors" ]; - version = "11.0.24.8.1"; + version = "11.0.25.9.1"; src = fetchFromGitHub { owner = "corretto"; repo = "corretto-11"; rev = version; - sha256 = "sha256-MD/ipEulQCEgfqqa0QQrD6x6GQwirQfb8OT2UBDLYEE="; + hash = "sha256-ewGGj4BHmwoPdULeT3PSI0Fo9T3cFbTO7cZXhzuKISY="; }; }; in diff --git a/pkgs/development/compilers/corretto/17.nix b/pkgs/development/compilers/corretto/17.nix index 90ca350a355d8..ec1c7d7597984 100644 --- a/pkgs/development/compilers/corretto/17.nix +++ b/pkgs/development/compilers/corretto/17.nix @@ -21,12 +21,12 @@ let ; jdk = jdk17; gradle = gradle_7; - version = "17.0.12.7.1"; + version = "17.0.13.11.1"; src = fetchFromGitHub { owner = "corretto"; repo = "corretto-17"; rev = version; - sha256 = "sha256-aRn1hqaqNsBkp2jHHkwMKc8cNiBM+TYVm3tVMPJJ1YE="; + hash = "sha256-2jMre5aI02uDFjSgToTyVNriyb4EuZ01lKsNi822o5Q="; }; }; in diff --git a/pkgs/development/compilers/corretto/21.nix b/pkgs/development/compilers/corretto/21.nix index a5ab64d02c248..731eecca1fb3d 100644 --- a/pkgs/development/compilers/corretto/21.nix +++ b/pkgs/development/compilers/corretto/21.nix @@ -21,12 +21,12 @@ let ; jdk = jdk21; gradle = gradle_7; - version = "21.0.4.7.1"; + version = "21.0.5.11.1"; src = fetchFromGitHub { owner = "corretto"; repo = "corretto-21"; rev = version; - sha256 = "sha256-EQqktd2Uz9PhkCaqvbuzmONcSiRppQ40tpLB3mqu2wo="; + hash = "sha256-Df2Pq2aPrTxD4FeqG12apE/USfQULmMGsDsgXrmCINc="; }; }; in diff --git a/pkgs/development/compilers/corretto/mk-corretto.nix b/pkgs/development/compilers/corretto/mk-corretto.nix index 0de05fb0f6c87..ae77a19385e91 100644 --- a/pkgs/development/compilers/corretto/mk-corretto.nix +++ b/pkgs/development/compilers/corretto/mk-corretto.nix @@ -117,14 +117,11 @@ jdk.overrideAttrs ( # Some of the OpenJDK derivation set their `pos` by hand. We need to # overwrite this in order to point to Corretto, not OpenJDK. pos = __curPos; - meta = - with lib; - oldAttrs.meta - // { - homepage = "https://aws.amazon.com/corretto"; - license = licenses.gpl2Only; - description = "Amazon's distribution of OpenJDK"; - maintainers = with maintainers; [ rollf ]; - }; + meta = oldAttrs.meta // { + homepage = "https://aws.amazon.com/corretto"; + license = lib.licenses.gpl2Only; + description = "Amazon's distribution of OpenJDK"; + maintainers = with lib.maintainers; [ rollf ]; + }; } ) From b032c0484032044d53b63770fd029339e841f87e Mon Sep 17 00:00:00 2001 From: Arne Keller <2012gdwu+github@posteo.de> Date: Mon, 9 Dec 2024 15:21:57 +0100 Subject: [PATCH 105/105] super-slicer: fix build with GCC 14 (cherry picked from commit 1008102caf6fc3aa7e92 from PR #362194) Uh, this wouldn't pick cleanly due to mass reformatting (oh yeah), so some manual fixups were needed. --- .../misc/prusa-slicer/default.nix | 12 ++++++++++++ .../misc/prusa-slicer/meshboolean-const.patch | 19 ------------------- .../misc/prusa-slicer/super-slicer.nix | 10 +++++++--- 3 files changed, 19 insertions(+), 22 deletions(-) delete mode 100644 pkgs/applications/misc/prusa-slicer/meshboolean-const.patch diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 8d68045e94dd4..eb58f2f0c2f6d 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -90,10 +90,20 @@ stdenv.mkDerivation (finalAttrs: { rev = "version_${finalAttrs.version}"; }; + # required for GCC 14 + # (not applicable to super-slicer fork) + postPatch = lib.optionalString (finalAttrs.pname == "prusa-slicer") '' + substituteInPlace src/libslic3r/Arrange/Core/DataStoreTraits.hpp \ + --replace-fail \ + "WritableDataStoreTraits::template set" \ + "WritableDataStoreTraits::set" + ''; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 + wxGTK-override' ]; buildInputs = [ @@ -132,6 +142,8 @@ stdenv.mkDerivation (finalAttrs: { darwin.apple_sdk_11_0.frameworks.CoreWLAN ]; + strictDeps = true; + separateDebugInfo = true; # The build system uses custom logic - defined in diff --git a/pkgs/applications/misc/prusa-slicer/meshboolean-const.patch b/pkgs/applications/misc/prusa-slicer/meshboolean-const.patch deleted file mode 100644 index 7013314779d44..0000000000000 --- a/pkgs/applications/misc/prusa-slicer/meshboolean-const.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/src/libslic3r/MeshBoolean.cpp b/src/libslic3r/MeshBoolean.cpp -index 31fdc35..32acbf8 100644 ---- a/src/libslic3r/MeshBoolean.cpp -+++ b/src/libslic3r/MeshBoolean.cpp -@@ -147,12 +147,12 @@ template TriangleMesh cgal_to_triangle_mesh(const _Mesh &cgalmesh) - const auto &vertices = cgalmesh.vertices(); - int vsize = int(vertices.size()); - -- for (auto &vi : vertices) { -+ for (const auto &vi : vertices) { - auto &v = cgalmesh.point(vi); // Don't ask... - its.vertices.emplace_back(to_vec3f(v)); - } - -- for (auto &face : faces) { -+ for (const auto &face : faces) { - auto vtc = cgalmesh.vertices_around_face(cgalmesh.halfedge(face)); - - int i = 0; diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index b96321fc4dbca..5d137f557fef5 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -24,7 +24,6 @@ let ]; hash = "sha256-v0q2MhySayij7+qBTE5q01IOq/DyUcWnjpbzB/AV34c="; }) - ./meshboolean-const.patch # Drop if this fix gets merged upstream (fetchpatch { url = "https://github.com/supermerill/SuperSlicer/commit/fa7c545efa5d1880cf24af32083094fc872d3692.patch"; @@ -69,8 +68,8 @@ let # - wxScintilla is not used on macOS # - Partially applied upstream changes cause a bug when trying to link against a nonexistent libexpat - prePatch = - super.prePatch + postPatch = + super.postPatch + '' substituteInPlace src/CMakeLists.txt \ --replace "scintilla" "" \ @@ -78,6 +77,11 @@ let substituteInPlace src/libslic3r/CMakeLists.txt \ --replace "libexpat" "EXPAT::EXPAT" + + # fixes GCC 14 error + substituteInPlace src/libslic3r/MeshBoolean.cpp \ + --replace-fail 'auto &face' 'auto face' \ + --replace-fail 'auto &vi' 'auto vi' ''; # We don't need PS overrides anymore, and gcode-viewer is embedded in the binary.