From 09dd617e1fddf22a6bcc01e8438417c7f55e1ae3 Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Mon, 24 Apr 2023 10:24:10 +0100 Subject: [PATCH 01/83] python3Packages.autoflake: depend on tomli for older pythons As you can see in https://github.com/PyCQA/autoflake/pull/138, TOML support is added using python 3.11's builtin `tomllib`. However, for older Python versions, they use `tomli`. Thus, it must be included for those versions. @moduon MT-2798 --- pkgs/development/python-modules/autoflake/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/autoflake/default.nix b/pkgs/development/python-modules/autoflake/default.nix index 6cb03e00de1..9446a6dc2b4 100644 --- a/pkgs/development/python-modules/autoflake/default.nix +++ b/pkgs/development/python-modules/autoflake/default.nix @@ -4,8 +4,9 @@ , hatchling , pyflakes , pytestCheckHook +, pythonOlder +, tomli }: - buildPythonPackage rec { pname = "autoflake"; version = "2.0.1"; @@ -22,7 +23,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyflakes - ]; + ] + ++ lib.optional (pythonOlder "3.11") tomli; nativeCheckInputs = [ pytestCheckHook From 49cb42647ad1d299c3640ea2c8576581e17777be Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 7 May 2023 12:53:29 +0200 Subject: [PATCH 02/83] python310Packages.filelock: 3.9.0 -> 3.12.0 Changelog: https://github.com/tox-dev/py-filelock/releases/tag/3.12.0 --- pkgs/development/python-modules/filelock/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 4b25ff52aad..62a65cfbdf6 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -3,20 +3,21 @@ , fetchPypi , hatch-vcs , hatchling +, pytest-mock , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "filelock"; - version = "3.9.0"; + version = "3.12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ezGfJDQLUfVaK/ehKsB1WpsD5xgxHaxWeg9Pf6vS9d4="; + hash = "sha256-/AOuQyiMAT0uqDyFlwAbESnbNRqtnFf+JAkyeRa45xg="; }; nativeBuildInputs = [ @@ -25,6 +26,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-mock pytestCheckHook ]; From 50bd5730c4d12fcdfed3c296b5e3c87834cdbcae Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 13 May 2023 04:20:00 +0000 Subject: [PATCH 03/83] libopus: 1.3.1 -> 1.4 https://gitlab.xiph.org/xiph/opus/-/releases/v1.4 --- .../development/libraries/libopus/default.nix | 37 ++++++++++++++----- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 7c563e081d0..67db8741081 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -1,26 +1,45 @@ -{ lib, stdenv, fetchurl -, fixedPoint ? false, withCustomModes ? true }: +{ lib +, stdenv +, fetchurl +, meson +, python3 +, ninja +, fixedPoint ? false +, withCustomModes ? true +}: stdenv.mkDerivation rec { pname = "libopus"; - version = "1.3.1"; + version = "1.4"; src = fetchurl { - url = "mirror://mozilla/opus/opus-${version}.tar.gz"; - sha256 = "17gz8kxs4i7icsc1gj713gadiapyklynlwqlf0ai98dj4lg8xdb5"; + url = "https://downloads.xiph.org/releases/opus/opus-${version}.tar.gz"; + sha256 = "sha256-ybMrQlO+WuY9H/Fu6ga5S18PKVG3oCrO71jjo85JxR8="; }; outputs = [ "out" "dev" ]; - configureFlags = lib.optional fixedPoint "--enable-fixed-point" - ++ lib.optional withCustomModes "--enable-custom-modes"; + nativeBuildInputs = [ + meson + python3 + ninja + ]; + + mesonFlags = [ + (lib.mesonBool "fixed-point" fixedPoint) + (lib.mesonBool "custom-modes" withCustomModes) + (lib.mesonEnable "asm" stdenv.hostPlatform.isAarch) + (lib.mesonEnable "docs" false) + ]; doCheck = !stdenv.isi686 && !stdenv.isAarch32; # test_unit_LPC_inv_pred_gain fails meta = with lib; { description = "Open, royalty-free, highly versatile audio codec"; - license = lib.licenses.bsd3; - homepage = "https://www.opus-codec.org/"; + homepage = "https://opus-codec.org/"; + changelog = "https://gitlab.xiph.org/xiph/opus/-/releases/v${version}"; + license = licenses.bsd3; platforms = platforms.all; + maintainers = [ ]; }; } From dcfcce73a2e4b5681caa875722190328395c6cfe Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 13 May 2023 04:20:00 +0000 Subject: [PATCH 04/83] fixup! libopus: 1.3.1 -> 1.4 --- pkgs/development/libraries/libopus/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 67db8741081..7694412efe0 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { (lib.mesonEnable "docs" false) ]; + preBuild = '' + patchShebangs meson/get-version.py + ''; + doCheck = !stdenv.isi686 && !stdenv.isAarch32; # test_unit_LPC_inv_pred_gain fails meta = with lib; { From 5c5a50907112916cc1613af4cb4415718ddfca61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 18 May 2023 14:28:21 -0700 Subject: [PATCH 05/83] libwacom: 2.6.0 -> 2.7.0 Diff: https://github.com/linuxwacom/libwacom/compare/libwacom-2.6.0...libwacom-2.7.0 Changelog: https://github.com/linuxwacom/libwacom/blob/libwacom-2.7.0/NEWS --- pkgs/development/libraries/libwacom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index f14bbb3b314..6d73d177a58 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "libwacom"; - version = "2.6.0"; + version = "2.7.0"; outputs = [ "out" "dev" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "sha256-9zqW6zPrFcxv/yAAtFgdVavKVMXeDBoMP3E/XriUcT0="; + sha256 = "sha256-NNfhZMshM5U/EfJHuNgkDe5NEkEGKtJ56vSpXyGf/xw="; }; postPatch = '' From 45ad7c046e3f91e1b758ef12d78112fb521d07d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 18 May 2023 14:30:30 -0700 Subject: [PATCH 06/83] libwacom-surface: 2.6.0 -> 2.7.0 --- pkgs/development/libraries/libwacom/surface.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwacom/surface.nix b/pkgs/development/libraries/libwacom/surface.nix index 6168686cf50..22707a37595 100644 --- a/pkgs/development/libraries/libwacom/surface.nix +++ b/pkgs/development/libraries/libwacom/surface.nix @@ -7,8 +7,8 @@ let libwacom-surface = fetchFromGitHub { owner = "linux-surface"; repo = "libwacom-surface"; - rev = "v2.6.0-1"; - hash = "sha256-4UOO9LMyCJd4LkqU0uva/0Xc44fIVdIQi27tJOtNEFk="; + rev = "v2.7.0-1"; + hash = "sha256-LgJ8YFQQN05kyd6kxBakIIiGgZ9icW27xKK3Dz6TwLs="; }; in libwacom.overrideAttrs (old: { pname = "libwacom-surface"; From 507bde9c5d95556ed6861fe97b65d6b39fdb89e4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 20 May 2023 04:20:00 +0000 Subject: [PATCH 07/83] python310Packages.platformdirs: 3.0.0 -> 3.5.1 Diff: https://github.com/platformdirs/platformdirs/compare/refs/tags/3.0.0...3.5.1 Changelog: https://github.com/platformdirs/platformdirs/releases/tag/3.5.1 --- pkgs/development/python-modules/platformdirs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix index c807faff9d0..9d2deb68d44 100644 --- a/pkgs/development/python-modules/platformdirs/default.nix +++ b/pkgs/development/python-modules/platformdirs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "platformdirs"; - version = "3.0.0"; + version = "3.5.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-RiZ26BGqS8nN5qHpUt7LIXSck/cGM8qlet3uL81TyPo="; + hash = "sha256-/qi22jiF+P7XcG/D+dxoOrHk89amdBoGewrTqZZOsoM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 9588972fe983654d05df0695899bc96c46c622f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sun, 21 May 2023 23:33:11 +0200 Subject: [PATCH 08/83] diffutils: 3.9 -> 3.10 Fixes the issue introduced in 3.9 and makes cmp and diff work past Y2K39 --- pkgs/tools/text/diffutils/default.nix | 21 ++++++--------------- pkgs/tools/text/diffutils/fix-diff-D.patch | 15 --------------- 2 files changed, 6 insertions(+), 30 deletions(-) delete mode 100644 pkgs/tools/text/diffutils/fix-diff-D.patch diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index fb0a95c49e1..7b2660a7114 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -7,28 +7,16 @@ stdenv.mkDerivation rec { pname = "diffutils"; - version = "3.9"; + version = "3.10"; src = fetchurl { url = "mirror://gnu/diffutils/diffutils-${version}.tar.xz"; - hash = "sha256-2A076QogGGjeg9eNrTQTrYgWDMU7zDbrnq98INvwI/E="; + hash = "sha256-kOXpPMck5OvhLt6A3xY0Bjx6hVaSaFkZv+YLVWyb0J4="; }; - patches = [ - # Backport of a fix for 'diff -D' output. - # TODO: remove when updating to 3.10. - ./fix-diff-D.patch - ]; - - postPatch = '' - # avoid the need for help2man - # TODO: can be removed when fix-diff-D.patch is removed. - touch man/diff.1 - ''; - outputs = [ "out" "info" ]; - nativeBuildInputs = [ xz.bin ]; + nativeBuildInputs = [ (lib.getBin xz) ]; /* If no explicit coreutils is given, use the one from stdenv. */ buildInputs = [ coreutils ]; @@ -38,10 +26,13 @@ stdenv.mkDerivation rec { lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "gl_cv_func_getopt_gnu=yes"; + doCheck = true; + meta = with lib; { homepage = "https://www.gnu.org/software/diffutils/diffutils.html"; description = "Commands for showing the differences between files (diff, cmp, etc.)"; license = licenses.gpl3; platforms = platforms.unix; + maintainers = with maintainers; [ das_j ]; }; } diff --git a/pkgs/tools/text/diffutils/fix-diff-D.patch b/pkgs/tools/text/diffutils/fix-diff-D.patch deleted file mode 100644 index 616f0927914..00000000000 --- a/pkgs/tools/text/diffutils/fix-diff-D.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://git.savannah.gnu.org/cgit/diffutils.git/patch/?id=ba08fbbb0ca5da455bf695236c57bc50e7faed50 -https://github.com/NixOS/nixpkgs/pull/213421#issuecomment-1407749912 - -Fix 'diff -D' regression ---- a/src/diff.c -+++ b/src/diff.c -@@ -416,7 +416,7 @@ main (int argc, char **argv) - char *base = b; - int changes = 0; - -- for (i = 0; i < sizeof sizeof C_ifdef_group_formats; i++) -+ for (i = 0; i < sizeof C_ifdef_group_formats; i++) - { - char ch = C_ifdef_group_formats[i]; - switch (ch) From 0f0e98dd5ef635037997f97e9269bd6d97f7e068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sun, 21 May 2023 23:45:04 +0200 Subject: [PATCH 09/83] gawk: 5.2.1 -> 5.2.2 This is a bugfix release: https://lists.gnu.org/archive/html/info-gnu/2023-05/msg00008.html --- pkgs/tools/text/gawk/darwin-no-pma.patch | 31 ------------------------ pkgs/tools/text/gawk/default.nix | 10 ++------ 2 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 pkgs/tools/text/gawk/darwin-no-pma.patch diff --git a/pkgs/tools/text/gawk/darwin-no-pma.patch b/pkgs/tools/text/gawk/darwin-no-pma.patch deleted file mode 100644 index f198acd41af..00000000000 --- a/pkgs/tools/text/gawk/darwin-no-pma.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://git.savannah.gnu.org/cgit/gawk.git/patch/?id=e0b7737930f8a677d3c509f8ce72b9130965ec0a ---- a/m4/pma.m4 -+++ b/m4/pma.m4 -@@ -23,15 +23,18 @@ then - [LDFLAGS="${LDFLAGS} -no-pie" - export LDFLAGS]) - ;; -- *darwin*) -- # 23 October 2022: See README_d/README.macosx for -- # the details on what's happening here. See also -- # the manual. -- -- # Compile as Intel binary all the time, even on M1. -- CFLAGS="${CFLAGS} -arch x86_64" -- LDFLAGS="${LDFLAGS} -Xlinker -no_pie" -- export CFLAGS LDFLAGS -+ *darwin*) -+ # 27 November 2022: PMA only works on Intel. -+ case $host in -+ x86_64-*) -+ LDFLAGS="${LDFLAGS} -Xlinker -no_pie" -+ export LDFLAGS -+ ;; -+ *) -+ # disable on all other macOS systems -+ use_persistent_malloc=no -+ ;; -+ esac - ;; - *cygwin* | *CYGWIN* | *solaris2.11* | freebsd13.* | openbsd7.* ) - true # nothing do, exes on these systems are not PIE diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index c376411e6f7..8fe044a9e21 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -18,19 +18,13 @@ assert (doCheck && stdenv.isLinux) -> glibcLocales != null; stdenv.mkDerivation rec { pname = "gawk" + lib.optionalString interactive "-interactive"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { url = "mirror://gnu/gawk/gawk-${version}.tar.xz"; - hash = "sha256-ZzVTuR+eGMxXku1RB1341RDJBA9VCm904Jya3SQ6fk8="; + hash = "sha256-PB/OFEa0y+4c0nO9fsZLyH2J9hU3RxzT4F4zqWWiUOk="; }; - patches = [ - # Pull upstream fix for aarch64-darwin where pma does not work. - # Can be removed after next gawk release. - ./darwin-no-pma.patch - ]; - # PIE is incompatible with the "persistent malloc" ("pma") feature. # While build system attempts to pass -no-pie to gcc. nixpkgs' `ld` # wrapped still passes `-pie` flag to linker and breaks linkage. From 0000022b48036f65ebc514fbb7c89071aea1248d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 May 2023 18:18:32 +0200 Subject: [PATCH 10/83] python310Packages.hypothesis: move documentation to passthru to reduce dependencies --- .../python-modules/hypothesis/default.nix | 39 +++++++++++++------ 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index bfa2ca0dc87..fab840a74e9 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -8,21 +8,21 @@ , doCheck ? true , pytestCheckHook , pytest-xdist +, python , sortedcontainers +, stdenv , pythonOlder , sphinxHook , sphinx-rtd-theme , sphinx-hoverxref , sphinx-codeautolink , tzdata -# Used to break internal dependency loop. -, enableDocumentation ? true }: buildPythonPackage rec { pname = "hypothesis"; version = "6.68.2"; - outputs = [ "out" ] ++ lib.optional enableDocumentation "doc"; + outputs = [ "out" ]; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -49,13 +49,6 @@ buildPythonPackage rec { postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; - nativeBuildInputs = lib.optionals enableDocumentation [ - sphinxHook - sphinx-rtd-theme - sphinx-hoverxref - sphinx-codeautolink - ]; - propagatedBuildInputs = [ attrs sortedcontainers @@ -67,7 +60,7 @@ buildPythonPackage rec { pexpect pytest-xdist pytestCheckHook - ] ++ lib.optionals (isPyPy) [ + ] ++ lib.optionals isPyPy [ tzdata ]; @@ -86,6 +79,30 @@ buildPythonPackage rec { "hypothesis" ]; + passthru = { + doc = stdenv.mkDerivation { + # Forge look and feel of multi-output derivation as best as we can. + # + # Using 'outputs = [ "doc" ];' breaks a lot of assumptions. + name = "${pname}-${version}-doc"; + inherit src pname version; + + postInstallSphinx = '' + mv $out/share/doc/* $out/share/doc/python$pythonVersion-$pname-$version + ''; + + nativeBuildInputs = [ + sphinxHook + sphinx-rtd-theme + sphinx-hoverxref + sphinx-codeautolink + ]; + + inherit (python) pythonVersion; + inherit meta; + }; + }; + meta = with lib; { description = "Library for property based testing"; homepage = "https://github.com/HypothesisWorks/hypothesis"; From 00000000b0be738315769701d1bc6ee298ad44a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 May 2023 18:19:06 +0200 Subject: [PATCH 11/83] treewide: remove removed hypothesis enableDocumentation option --- pkgs/applications/misc/privacyidea/default.nix | 3 --- pkgs/development/python-modules/chardet/default.nix | 3 +-- pkgs/development/python-modules/cryptography/default.nix | 3 +-- pkgs/development/python-modules/iso8601/default.nix | 3 +-- pkgs/development/python-modules/numpy/default.nix | 3 +-- pkgs/development/python-modules/pandas/default.nix | 3 +-- pkgs/development/python-modules/twisted/default.nix | 3 +-- 7 files changed, 6 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index d9c44d4a5d7..4f798a0a6a5 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -141,9 +141,6 @@ let sphinxHook = null; sphinx-better-theme = null; }).overridePythonAttrs dropDocOutput; - hypothesis = super.hypothesis.override { - enableDocumentation = false; - }; pyjwt = (super.pyjwt.override { sphinxHook = null; sphinx-rtd-theme = null; diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix index e750bbece81..69353dcaec2 100644 --- a/pkgs/development/python-modules/chardet/default.nix +++ b/pkgs/development/python-modules/chardet/default.nix @@ -23,8 +23,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - # "hypothesis" indirectly depends on chardet to build its documentation. - (hypothesis.override { enableDocumentation = false; }) + hypothesis pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 199cfd86517..fe685ae6425 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -74,8 +74,7 @@ buildPythonPackage rec { nativeCheckInputs = [ cryptography-vectors - # "hypothesis" indirectly depends on cryptography to build its documentation - (hypothesis.override { enableDocumentation = false; }) + hypothesis iso8601 pretend py diff --git a/pkgs/development/python-modules/iso8601/default.nix b/pkgs/development/python-modules/iso8601/default.nix index af90e739163..c3e022cdb38 100644 --- a/pkgs/development/python-modules/iso8601/default.nix +++ b/pkgs/development/python-modules/iso8601/default.nix @@ -25,8 +25,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - # "hypothesis" indirectly depends on iso8601 to build its documentation - (hypothesis.override { enableDocumentation = false; }) + hypothesis pytestCheckHook pytz ]; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index d18a93e1509..7d7e3b6b510 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -77,8 +77,7 @@ in buildPythonPackage rec { nativeCheckInputs = [ pytest - # "hypothesis" indirectly depends on numpy to build its documentation. - (hypothesis.override { enableDocumentation = false; }) + hypothesis typing-extensions ]; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index b852a7f82c0..b6ecbc90ff4 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -49,8 +49,7 @@ buildPythonPackage rec { nativeCheckInputs = [ glibcLocales - # hypothesis indirectly depends on pandas to build its documentation - (hypothesis.override { enableDocumentation = false; }) + hypothesis jinja2 pytest-asyncio pytest-xdist diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index f45acbe87a4..0731822c3bc 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -159,8 +159,7 @@ buildPythonPackage rec { nativeCheckInputs = [ git glibcLocales - # "hypothesis" indirectly depends on twisted to build its documentation. - (hypothesis.override { enableDocumentation = false; }) + hypothesis pyhamcrest ] ++ passthru.optional-dependencies.conch From c98d687fd6e11132efa99780d4cbbe0e6a95446c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 26 May 2023 12:55:25 +0200 Subject: [PATCH 12/83] gcc{6..11}: import a patch into nixpkgs fetchurl can't be used on generated patches this way. The hash doesn't match anymore. fetchpatch would be an alternative. --- pkgs/development/compilers/gcc/10/default.nix | 6 +- pkgs/development/compilers/gcc/11/default.nix | 6 +- pkgs/development/compilers/gcc/6/default.nix | 6 +- pkgs/development/compilers/gcc/7/default.nix | 6 +- pkgs/development/compilers/gcc/8/default.nix | 6 +- pkgs/development/compilers/gcc/9/default.nix | 6 +- .../compilers/gcc/fix-bug-80431.patch | 92 +++++++++++++++++++ 7 files changed, 98 insertions(+), 30 deletions(-) create mode 100644 pkgs/development/compilers/gcc/fix-bug-80431.patch diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 83a03cc56d6..df1cbdf1898 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -53,11 +53,7 @@ let majorVersion = "10"; patches = [ # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 - (fetchurl { - name = "fix-bug-80431.patch"; - url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; - sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; - }) + ../fix-bug-80431.patch ../11/fix-struct-redefinition-on-glibc-2.36.patch ../install-info-files-serially.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index 505b9abf06b..8513f03d2da 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -57,11 +57,7 @@ let majorVersion = "11"; patches = [ # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 - (fetchurl { - name = "fix-bug-80431.patch"; - url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; - sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; - }) + ../fix-bug-80431.patch ./fix-struct-redefinition-on-glibc-2.36.patch ../install-info-files-serially.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 82ca9fd967c..965a987aab3 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -67,11 +67,7 @@ let majorVersion = "6"; ../use-source-date-epoch.patch ./0001-Fix-build-for-glibc-2.31.patch # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 - (fetchurl { - name = "fix-bug-80431.patch"; - url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; - sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; - }) + ../fix-bug-80431.patch ../install-info-files-serially.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 50039e4c031..6ec689ab252 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -58,11 +58,7 @@ let majorVersion = "7"; ./0001-Fix-build-for-glibc-2.31.patch # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 - (fetchurl { - name = "fix-bug-80431.patch"; - url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; - sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; - }) + ../fix-bug-80431.patch ../9/fix-struct-redefinition-on-glibc-2.36.patch ../install-info-files-serially.patch diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 483cc31ea44..1baed913785 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -48,11 +48,7 @@ let majorVersion = "8"; patches = [ # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 - (fetchurl { - name = "fix-bug-80431.patch"; - url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; - sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; - }) + ../fix-bug-80431.patch ../9/fix-struct-redefinition-on-glibc-2.36.patch ../install-info-files-serially.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index f541a83cdf4..aceb912d7a6 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -58,11 +58,7 @@ let majorVersion = "9"; patches = [ ./fix-struct-redefinition-on-glibc-2.36.patch # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 - (fetchurl { - name = "fix-bug-80431.patch"; - url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; - sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; - }) + ../fix-bug-80431.patch ../install-info-files-serially.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional targetPlatform.isNetBSD ../libstdc++-netbsd-ctypes.patch diff --git a/pkgs/development/compilers/gcc/fix-bug-80431.patch b/pkgs/development/compilers/gcc/fix-bug-80431.patch new file mode 100644 index 00000000000..2d688b8c799 --- /dev/null +++ b/pkgs/development/compilers/gcc/fix-bug-80431.patch @@ -0,0 +1,92 @@ +From de31f5445b12fd9ab9969dc536d821fe6f0edad0 Mon Sep 17 00:00:00 2001 +From: Patrick Palka +Date: Mon, 21 Jun 2021 07:54:26 -0400 +Subject: [PATCH] c++: conversion to base of vbase in NSDMI [PR80431] + +The delayed processing of conversions to a virtual base in an NSDMI +assumes the target base type is a (possibly indirect) virtual base of +the current class, but the target base type could also be a base of a +virtual base, as in the testcase below. Since such a base isn't a part +of CLASSTYPE_VBASECLASSES, we end up miscompiling the testcase due to +the call to build_base_path (with binfo=NULL_TREE) silently returning +error_mark_node. Fix this by using convert_to_base to build the +conversion instead. + + PR c++/80431 + +gcc/cp/ChangeLog: + + * tree.c (bot_replace): Use convert_to_base to build the + conversion to the (morally) virtual base. + +gcc/testsuite/ChangeLog: + + * g++.dg/cpp0x/nsdmi-virtual1a.C: New test. +--- + gcc/cp/tree.c | 14 ++++------ + gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1a.C | 28 ++++++++++++++++++++ + 2 files changed, 33 insertions(+), 9 deletions(-) + create mode 100644 gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1a.C + +diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c +index fec5afaa2be..297da2b1550 100644 +--- a/gcc/cp/tree.c ++++ b/gcc/cp/tree.c +@@ -3242,15 +3242,11 @@ bot_replace (tree* t, int* /*walk_subtrees*/, void* data_) + else if (TREE_CODE (*t) == CONVERT_EXPR + && CONVERT_EXPR_VBASE_PATH (*t)) + { +- /* In an NSDMI build_base_path defers building conversions to virtual +- bases, and we handle it here. */ +- tree basetype = TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (*t))); +- vec *vbases = CLASSTYPE_VBASECLASSES (current_class_type); +- int i; tree binfo; +- FOR_EACH_VEC_SAFE_ELT (vbases, i, binfo) +- if (BINFO_TYPE (binfo) == basetype) +- break; +- *t = build_base_path (PLUS_EXPR, TREE_OPERAND (*t, 0), binfo, true, ++ /* In an NSDMI build_base_path defers building conversions to morally ++ virtual bases, and we handle it here. */ ++ tree basetype = TREE_TYPE (*t); ++ *t = convert_to_base (TREE_OPERAND (*t, 0), basetype, ++ /*check_access=*/false, /*nonnull=*/true, + tf_warning_or_error); + } + +diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1a.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1a.C +new file mode 100644 +index 00000000000..dc847cc16e5 +--- /dev/null ++++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual1a.C +@@ -0,0 +1,28 @@ ++// PR c++/80431 ++// { dg-do run { target c++11 } } ++ ++// A variant of nsdmi-virtual1.C where A is only a morally virtual base of B. ++ ++struct A ++{ ++ A(): i(42) { } ++ int i; ++ int f() { return i; } ++}; ++ ++struct D : A { int pad; }; ++ ++struct B : virtual D ++{ ++ int j = i + f(); ++ int k = A::i + A::f(); ++}; ++ ++struct C: B { int pad; }; ++ ++int main() ++{ ++ C c; ++ if (c.j != 84 || c.k != 84) ++ __builtin_abort(); ++} +-- +2.31.1 + From 0daa28448ff72308eb42d9ce5b5b8b76ab958e37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 18:38:58 +0000 Subject: [PATCH 13/83] qpdf: 11.3.0 -> 11.4.0 --- pkgs/development/libraries/qpdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 67e16f6f3ee..b1b78bb2570 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qpdf"; - version = "11.3.0"; + version = "11.4.0"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; rev = "v${version}"; - hash = "sha256-UZq973X93E+Ll1IKjfJNPQuQwBFOU3egFGODgXV21x0="; + hash = "sha256-cG8TxgWXZGol7X2eRQNeknMo4L8PoWSMvxOsDVO/Rx4="; }; nativeBuildInputs = [ cmake perl ]; From 8d4a81b1851be7823e23d26bd02abcfb902d2bef Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 26 Apr 2023 18:32:52 +0200 Subject: [PATCH 14/83] pkgsMusl.postgresql: fix build --- pkgs/servers/sql/postgresql/default.nix | 22 +++++++++++++++++-- .../sql/postgresql/locale-binary-path.patch | 13 +++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 pkgs/servers/sql/postgresql/locale-binary-path.patch diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 48b94841548..669502706fc 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -2,9 +2,9 @@ let generic = # dependencies - { stdenv, lib, fetchurl, makeWrapper + { stdenv, lib, fetchurl, makeWrapper, fetchpatch , glibc, zlib, readline, openssl, icu, lz4, zstd, systemd, libossp_uuid - , pkg-config, libxml2, tzdata, libkrb5 + , pkg-config, libxml2, tzdata, libkrb5, substituteAll, darwin # This is important to obtain a version of `libpq` that does not depend on systemd. , enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd && !stdenv.hostPlatform.isStatic @@ -103,6 +103,24 @@ let ./patches/hardcode-pgxs-path.patch ./patches/specify_pkglibdir_at_runtime.patch ./patches/findstring.patch + + (substituteAll { + src = ./locale-binary-path.patch; + locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale"; + }) + + ] ++ lib.optionals stdenv'.hostPlatform.isMusl [ + # Fixes for musl libc + # These patches are not properly guarded and should NOT be enabled everywhere + (fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; + hash = "sha256-pnl+wM3/IUyq5iJzk+h278MDA9R0GQXQX8d4wJcB2z4="; + }) + (fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/icu-collations-hack.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; + hash = "sha256-Yb6lMBDqeVP/BLMyIr5rmR6OkaVzo68cV/+cL2LOe/M="; + }) + ] ++ lib.optionals stdenv'.isLinux [ (if atLeast "13" then ./patches/socketdir-in-run-13.patch else ./patches/socketdir-in-run.patch) ]; diff --git a/pkgs/servers/sql/postgresql/locale-binary-path.patch b/pkgs/servers/sql/postgresql/locale-binary-path.patch new file mode 100644 index 00000000000..08e90bce750 --- /dev/null +++ b/pkgs/servers/sql/postgresql/locale-binary-path.patch @@ -0,0 +1,13 @@ +diff --git a/src/backend/commands/collationcmds.c b/src/backend/commands/collationcmds.c +index fcfc02d..d011394 100644 +--- a/src/backend/commands/collationcmds.c ++++ b/src/backend/commands/collationcmds.c +@@ -611,7 +611,7 @@ pg_import_system_collations(PG_FUNCTION_ARGS) + aliases = (CollAliasData *) palloc(maxaliases * sizeof(CollAliasData)); + naliases = 0; + +- locale_a_handle = OpenPipeStream("locale -a", "r"); ++ locale_a_handle = OpenPipeStream("@locale@ -a", "r"); + if (locale_a_handle == NULL) + ereport(ERROR, + (errcode_for_file_access(), From 53f5acc1346e97b93d1d19fae6dfc1c0a0f96202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Mon, 29 May 2023 14:48:32 +0200 Subject: [PATCH 15/83] gdb: 13.1 -> 13.2 --- pkgs/development/tools/misc/gdb/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 42733350996..129b55e7409 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -29,11 +29,11 @@ assert pythonSupport -> python3 != null; stdenv.mkDerivation rec { pname = targetPrefix + basename + lib.optionalString hostCpuOnly "-host-cpu-only"; - version = "13.1"; + version = "13.2"; src = fetchurl { url = "mirror://gnu/gdb/${basename}-${version}.tar.xz"; - hash = "sha256-EVrVwY1ppr4qsViC02XdoqIhHBT0gLNQLG66V24ulaA="; + hash = "sha256-/Vvrt74YM6vbbgI8L0mKNUSYKB350FUj2JFbq+uJPwo="; }; postPatch = lib.optionalString stdenv.isDarwin '' @@ -48,12 +48,6 @@ stdenv.mkDerivation rec { patches = [ ./debug-info-from-env.patch - - # Backport musl fix - (fetchpatch { - url = "https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=2e977d9901393ea1bacbe1896af0929e968bc811"; - hash = "sha256-/+UYjiOxrszJy1x8xavs63/ptNZ+ISIAQhG+i86VDpA="; - }) ] ++ lib.optionals stdenv.isDarwin [ ./darwin-target-match.patch ]; From 15da7dce6ac7e1950c0e3bc1747a81899843de12 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Fri, 19 May 2023 15:55:12 -0400 Subject: [PATCH 16/83] configd: fix build with newer LLVM and bootstrap Clang 15 does not like the fake xpc headers. Use the real ones instead. Doing this no longer causes an infinite recursion because xnu now depends on python3Minimal, which does not include configd support. --- .../apple-source-releases/configd/default.nix | 65 +++++-------------- .../darwin/apple-source-releases/default.nix | 2 + 2 files changed, 17 insertions(+), 50 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix index 37830c0665e..d17db5a345a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix @@ -1,67 +1,32 @@ -{ lib, stdenv, appleDerivation', launchd, bootstrap_cmds, xnu, ppp, IOKit, eap8021x, Security +{ lib, stdenv, appleDerivation', launchd, bootstrap_cmds, xnu, xpc, ppp, IOKit, eap8021x, Security , headersOnly ? false }: appleDerivation' stdenv { meta.broken = stdenv.cc.nativeLibc; nativeBuildInputs = lib.optionals (!headersOnly) [ bootstrap_cmds ]; - buildInputs = lib.optionals (!headersOnly) [ launchd ppp IOKit eap8021x ]; + buildInputs = lib.optionals (!headersOnly) [ launchd ppp xpc IOKit eap8021x ]; propagatedBuildInputs = lib.optionals (!headersOnly) [ Security ]; + env = lib.optionalAttrs (!headersOnly) { + NIX_CFLAGS_COMPILE = toString [ + "-ISystemConfiguration.framework/Headers" + "-I${xnu}/Library/Frameworks/System.framework/Versions/B/PrivateHeaders" + ]; + }; + patchPhase = lib.optionalString (!headersOnly) '' - HACK=$PWD/hack - mkdir $HACK - cp -r ${xnu}/Library/Frameworks/System.framework/Versions/B/PrivateHeaders/net $HACK - - - substituteInPlace SystemConfiguration.fproj/SCNetworkReachabilityInternal.h \ - --replace '#include ' "" + substituteInPlace SystemConfiguration.fproj/reachability/SCNetworkReachabilityServer_client.c \ + --replace '#include ' "" substituteInPlace SystemConfiguration.fproj/SCNetworkReachability.c \ --replace ''$'#define\tHAVE_VPN_STATUS' "" - substituteInPlace SystemConfiguration.fproj/reachability/SCNetworkReachabilityServer_client.c \ - --replace '#include ' '#include "fake_xpc.h"' \ - --replace '#include ' "" \ - # Our neutered CoreFoundation doesn't have this function, but I think we'll live... substituteInPlace SystemConfiguration.fproj/SCNetworkConnectionPrivate.c \ --replace 'CFPreferencesAppValueIsForced(serviceID, USER_PREFERENCES_APPLICATION_ID)' 'FALSE' \ --replace 'CFPreferencesAppValueIsForced(userPrivate->serviceID, USER_PREFERENCES_APPLICATION_ID)' 'FALSE' - - cat >SystemConfiguration.fproj/fake_xpc.h < Date: Mon, 29 May 2023 21:56:06 +0100 Subject: [PATCH 18/83] zeromq: backport gcc-13 fix Without the change `zeromq` build on `gcc-13` fails as: [ 92%] Building CXX object tests/CMakeFiles/test_security_curve.dir/test_security_curve.cpp.o In file included from /<>/gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:34, from /<>/gcc-13.0.0/include/c++/13.0.0/bits/stl_uninitialized.h:64, from /<>/gcc-13.0.0/include/c++/13.0.0/memory:69, from tests/../src/secure_allocator.hpp:42, from tests/../src/curve_client_tools.hpp:49, from tests/test_security_curve.cpp:53: /<>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h: In instantiation of 'struct std::__allocator_traits_base::__rebind, unsigned char, void>': /<>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:94:11: required by substitution of 'template using std::__alloc_rebind = typename std::__allocator_traits_base::__rebind<_Alloc, _Up>::type [with _Alloc = zmq::secure_allocator_t; _Up = unsigned char]' /<>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:228:8: required by substitution of 'template template using std::allocator_traits< >::rebind_alloc = std::__alloc_rebind<_Alloc, _Tp> [with _Tp = unsigned char; _Alloc = zmq::secure_allocator_t]' /<>/gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:126:65: required from 'struct __gnu_cxx::__alloc_traits, unsigned char>::rebind' /<>/gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:88:21: required from 'struct std::_Vector_base >' /<>/gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:423:11: required from 'class std::vector >' tests/../src/curve_client_tools.hpp:64:76: required from here /<>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:70:31: error: static assertion failed: allocator_traits::rebind_alloc must be A 70 | _Tp>::value, | ^~~~~ --- pkgs/development/libraries/zeromq/4.x.nix | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index b37dfbdd707..53b1f2f7431 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -1,5 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, libsodium -, enableDrafts ? false }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, asciidoc +, pkg-config +, libsodium +, enableDrafts ? false +}: stdenv.mkDerivation rec { pname = "zeromq"; @@ -12,6 +20,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-epOEyHOswUGVwzz0FLxhow/zISmZHxsIgmpOV8C8bQM="; }; + patches = [ + # Backport gcc-13 fix: + # https://github.com/zeromq/libzmq/pull/4480 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/zeromq/libzmq/commit/438d5d88392baffa6c2c5e0737d9de19d6686f0d.patch"; + hash = "sha256-tSTYSrQzgnfbY/70QhPdOnpEXX05VAYwVYuW8P1LWf0="; + }) + ]; + nativeBuildInputs = [ cmake asciidoc pkg-config ]; buildInputs = [ libsodium ]; From 3daf489719edd9776a0a452c9b4954b77e744584 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 29 May 2023 22:02:44 +0100 Subject: [PATCH 19/83] nlohmann_json: backport gcc-13 fix Without the change `nlohmann_json` build on `gcc-13 `fails as: In file included from <>-gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:34, from <>-gcc-13.0.0/include/c++/13.0.0/bits/basic_string.h:39, from <>-gcc-13.0.0/include/c++/13.0.0/string:54, from <>-gcc-13.0.0/include/c++/13.0.0/bits/locale_classes.h:40, from <>-gcc-13.0.0/include/c++/13.0.0/locale:41, from tests/src/unit-regression2.cpp:19: <>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h: In instantiation of 'struct std::__allocator_traits_base::__rebind, unsigned char, void>': <>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:94:11: required by substitution of 'template using std::__alloc_rebind = typename std::__allocator_traits_base::__rebind<_Alloc, _Up>::type [with _Alloc = my_allocator; _Up = unsigned char]' <>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:228:8: required by substitution of 'template template using std::allocator_traits< >::rebind_alloc = std::__alloc_rebind<_Alloc, _Tp> [with _Tp = unsigned char; _Alloc = my_allocator]' <>-gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:126:65: required from 'struct __gnu_cxx::__alloc_traits, unsigned char>::rebind' <>-gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:88:21: required from 'struct std::_Vector_base >' <>-gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:423:11: required from 'class std::vector >' tests/src/unit-regression2.cpp:807:63: required from here <>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:70:31: error: static assertion failed: allocator_traits::rebind_alloc must be A 70 | _Tp>::value, | ^~~~~ --- .../libraries/nlohmann_json/default.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 3c8244c7553..29c7ca2c690 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , cmake }: let @@ -21,6 +22,24 @@ in stdenv.mkDerivation (finalAttrs: { hash = "sha256-SUdhIV7tjtacf5DkoWk9cnkfyMlrkg8ZU7XnPZd22Tw="; }; + patches = [ + # Backport fix for gcc-13: + # https://github.com/nlohmann/json/pull/3895 + (fetchpatch { + name = "gcc-13-rebind.patch"; + url = "https://github.com/nlohmann/json/commit/a5b09d50b786638ed9deb09ef13860a3cb64eb6b.patch"; + hash = "sha256-Jbi0VwZP+ZHTGbpIwgKCVc66gOmwjkT5iOUe85eIzM0="; + }) + + # Backport fix for gcc-13: + # https://github.com/nlohmann/json/pull/3950 + (fetchpatch { + name = "gcc-13-eq-op.patch"; + url = "https://github.com/nlohmann/json/commit/a49829bd984c0282be18fcec070df0c31bf77dd5.patch"; + hash = "sha256-D+cRtdN6AXr4z3/y9Ui7Zqp3e/y10tp+DOL80ZtPz5E="; + }) + ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ From eed6207e96b7fa62d624e259bd6da00976a6701b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 29 May 2023 22:13:37 +0100 Subject: [PATCH 20/83] abseil-cpp: backport gcc-13 fix Without the change `abseil-cpp` build fails on `gcc-13` as: /build/abseil-cpp/absl/strings/internal/str_format/extension.h:34:33: error: found ':' in nested-name-specifier, expected '::' 34 | enum class FormatConversionChar : uint8_t; | ^ | :: --- pkgs/development/libraries/abseil-cpp/202103.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/abseil-cpp/202103.nix b/pkgs/development/libraries/abseil-cpp/202103.nix index 1c75853f522..712f89e383f 100644 --- a/pkgs/development/libraries/abseil-cpp/202103.nix +++ b/pkgs/development/libraries/abseil-cpp/202103.nix @@ -25,6 +25,14 @@ stdenv.mkDerivation rec { url = "https://github.com/abseil/abseil-cpp/commit/5bfa70c75e621c5d5ec095c8c4c0c050dcb2957e.patch"; sha256 = "0nhjxqfxpi2pkfinnqvd5m4npf9l1kg39mjx9l3087ajhadaywl5"; }) + + # Bacport gcc-13 fix: + # https://github.com/abseil/abseil-cpp/pull/1187 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/abseil/abseil-cpp/commit/36a4b073f1e7e02ed7d1ac140767e36f82f09b7c.patch"; + hash = "sha256-aA7mwGEtv/cQINcawjkukmCvfNuqwUeDFssSiNKPdgg="; + }) ] ++ lib.optionals stdenv.hostPlatform.isLoongArch64 [ # https://github.com/abseil/abseil-cpp/pull/1110 (fetchpatch { From 9ff76a51e918788ecbc5df0189310352eb055c2d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 29 May 2023 22:29:13 +0100 Subject: [PATCH 21/83] graphite2: disable broken 'nametabletest' (fails on gcc-13) Without the change the test fails on gcc-13 as: $ ./tests/nametabletest/nametabletest tests/nametabletest/nametabletest.cpp:142:79: runtime error: index 5 out of bounds for type 'NameRecord [5]' ... tests/nametabletest/nametabletest.cpp:142:79: runtime error: index 7 out of bounds for type 'NameRecord [7]' ... In https://github.com/silnrsi/graphite/pull/74 upstream agrees it's a problem in the test (and possibly the library). Let's disable the test itself until upstream fixes it completely. --- pkgs/development/libraries/silgraphite/graphite2.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 41c0c3217a4..11b430a00e5 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -21,6 +21,12 @@ stdenv.mkDerivation rec { buildInputs = [ freetype ]; patches = lib.optionals stdenv.isDarwin [ ./macosx.patch ]; + postPatch = '' + # disable broken 'nametabletest' test, fails on gcc-13: + # https://github.com/silnrsi/graphite/pull/74 + substituteInPlace tests/CMakeLists.txt \ + --replace 'add_subdirectory(nametabletest)' '#add_subdirectory(nametabletest)' + ''; cmakeFlags = lib.optionals static [ "-DBUILD_SHARED_LIBS=OFF" From 204136bd950e0bbab16041d2e71b71b0fad0f90c Mon Sep 17 00:00:00 2001 From: Cheng Shao Date: Tue, 30 May 2023 09:37:53 +0000 Subject: [PATCH 22/83] nodejs: add -licuuc to libv8 pkg-config file -licuuc is required when linking against libv8 output of nodejs. --- pkgs/development/web/nodejs/nodejs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index d824d576a47..75690367ec9 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -178,7 +178,7 @@ let Name: v8 Description: V8 JavaScript Engine Version: $major.$minor.$patch - Libs: -L$libv8/lib -lv8 -pthread -licui18n + Libs: -L$libv8/lib -lv8 -pthread -licui18n -licuuc Cflags: -I$libv8/include EOF ''; From 7c043234ecd084e90947aaf63cea5be96beee015 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Tue, 30 May 2023 13:28:34 -0400 Subject: [PATCH 23/83] darwin.stdenv: drop NIX_COREFOUNDATION_RPATH from preHook Rely on swift-corefoundation to set this in its hook. That way, it will be dropped from the `extraBuildInputs` during a cross build. --- pkgs/stdenv/darwin/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 780717db56b..64e33aa772e 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -683,7 +683,6 @@ rec { targetPlatform = localSystem; preHook = commonPreHook + '' - export NIX_COREFOUNDATION_RPATH=${pkgs.darwin.CF}/Library/Frameworks export PATH_LOCALE=${pkgs.darwin.locale}/share/locale ''; From 8e25b8e8c9c83d77fb6ff4a0a23d255573ef43a3 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Thu, 1 Jun 2023 07:57:34 +1000 Subject: [PATCH 24/83] cmocka: 1.1.6 -> 1.1.7 --- pkgs/development/libraries/cmocka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cmocka/default.nix b/pkgs/development/libraries/cmocka/default.nix index 5eefba8eb47..62ae1062bc5 100644 --- a/pkgs/development/libraries/cmocka/default.nix +++ b/pkgs/development/libraries/cmocka/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "cmocka"; majorVersion = "1.1"; - version = "${majorVersion}.6"; + version = "${majorVersion}.7"; src = fetchurl { url = "https://cmocka.org/files/${majorVersion}/cmocka-${version}.tar.xz"; - sha256 = "0xksffx1w3pzm18ynf28cx8scrhylcbz43s1rgkkdqnyil1q6cjv"; + sha256 = "sha256-gQVw6wuNZIBDMfgrKf9Hx5DOnNaxY+mNR6SAcEfsrYI="; }; patches = [ From 1364837d91fdf2647a7141f60ee8a78b1e1f16ff Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Tue, 30 May 2023 15:20:39 -0400 Subject: [PATCH 25/83] unzip: fix configure script when using clang 16 Clang 16 makes implicit int and function declarations an error by default in any mode except for C89. The configure script has two of these that cause it to misdetect features when using Clang 16. * Implicit `int main` in the errno check. This is fixed by adding the missing `int`. * Implicit definitions of `opendir` and `closedir`. These are fixed by including the required headers. --- pkgs/tools/archivers/unzip/default.nix | 4 ++++ .../unzip/implicit-declarations-fix.patch | 21 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/archivers/unzip/implicit-declarations-fix.patch diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index f61bc9df66d..b0a4484e87f 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -60,6 +60,9 @@ stdenv.mkDerivation rec { ]; sha256 = "sha256-on79jElQ+z2ULWAq14RpluAqr9d6itHiZwDkKubBzTc="; }) + # Clang 16 makes implicit declarations an error by default for C99 and newer, causing the + # configure script to fail to detect errno and the directory libraries on Darwin. + ./implicit-declarations-fix.patch ] ++ lib.optional enableNLS (fetchurl { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-arch/unzip/files/unzip-6.0-natspec.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d"; @@ -67,6 +70,7 @@ stdenv.mkDerivation rec { sha256 = "67ab260ae6adf8e7c5eda2d1d7846929b43562943ec4aff629bd7018954058b1"; }); + nativeBuildInputs = [ bzip2 ]; buildInputs = [ bzip2 ] ++ lib.optional enableNLS libnatspec; diff --git a/pkgs/tools/archivers/unzip/implicit-declarations-fix.patch b/pkgs/tools/archivers/unzip/implicit-declarations-fix.patch new file mode 100644 index 00000000000..df19bf1722f --- /dev/null +++ b/pkgs/tools/archivers/unzip/implicit-declarations-fix.patch @@ -0,0 +1,21 @@ +--- a/unix/configure 2009-04-16 15:25:12.000000000 -0400 ++++ b/unix/configure 2023-05-30 15:18:33.670321348 -0400 +@@ -408,7 +408,7 @@ + echo Check for errno declaration + cat > conftest.c << _EOF_ + #include +-main() ++int main() + { + errno = 0; + return 0; +@@ -419,6 +419,8 @@ + + echo Check for directory libraries + cat > conftest.c << _EOF_ ++#include ++#include + int main() { return closedir(opendir(".")); } + _EOF_ + + From ff16966860a59e8b8db805bf57d41f4deabdc395 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 1 Jun 2023 14:58:58 -0400 Subject: [PATCH 26/83] rustc: 1.69.0 -> 1.70.0 https://github.com/rust-lang/rust/releases/tag/1.70.0 --- .../compilers/rust/{1_69.nix => 1_70.nix} | 32 +++++++++---------- pkgs/top-level/all-packages.nix | 8 ++--- 2 files changed, 20 insertions(+), 20 deletions(-) rename pkgs/development/compilers/rust/{1_69.nix => 1_70.nix} (56%) diff --git a/pkgs/development/compilers/rust/1_69.nix b/pkgs/development/compilers/rust/1_70.nix similarity index 56% rename from pkgs/development/compilers/rust/1_69.nix rename to pkgs/development/compilers/rust/1_70.nix index 5f2e2e9acdc..9025adacfe7 100644 --- a/pkgs/development/compilers/rust/1_69.nix +++ b/pkgs/development/compilers/rust/1_70.nix @@ -20,8 +20,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.69.0"; - rustcSha256 = "sha256-+wWXGGetbMq703ICefWpS5n2ECSSMYe1a7XEVfo89g8="; + rustcVersion = "1.70.0"; + rustcSha256 = "sha256-sr+uAAt6UEDk7Eu8UKCfIVSBkMt1cLDtdzWDaEE70nw="; llvmSharedForBuild = pkgsBuildBuild.llvmPackages_15.libllvm.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvmPackages_15.libllvm.override { enableSharedLibraries = true; }; @@ -37,25 +37,25 @@ import ./default.nix { # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.68.2"; + bootstrapVersion = "1.69.0"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "a85e1aa0831e8bd31dc8ba3e042b6dea69b4d45fd5d1111bf6fd2cc9d58dd619"; - x86_64-unknown-linux-gnu = "df7c7466ef35556e855c0d35af7ff08e133040400452eb3427c53202b6731926"; - x86_64-unknown-linux-musl = "bd02cbdedb4b7f2169a68dc8410e8436fab3734a3a30cab81ab21661d70c6ddd"; - arm-unknown-linux-gnueabihf = "a5847f9bcbb1fb4183656b1b01e191d8e48c7bc8346ec6831318b697a2f305c6"; - armv7-unknown-linux-gnueabihf = "f87e4b063b5f916b4a5057e5f544f819cee9ab5da3fe1a977cddb2170e7ba0d7"; - aarch64-unknown-linux-gnu = "b24d0df852490d80791a228f18c2b75f24b1e6437e6e745f85364edab245f7fa"; - aarch64-unknown-linux-musl = "e6615e72aaa3e3c9c42c35139ab253a9b738a4eab719e3e306e25026c1aa93e5"; - x86_64-apple-darwin = "632540d3d83758cb048dc45fcfbc0b29f6f170161a3051be22b0a2962a566fb9"; - aarch64-apple-darwin = "ab4c6add94686a0392953c588c2b61d4c03f51e855232d161dc492f286e34202"; - powerpc64le-unknown-linux-gnu = "cf95658277d71bb8ae3a0fbc53099cc1397ed40e0953c026f41cde4a9619efca"; - riscv64gc-unknown-linux-gnu = "befcf2d53e35ae3fe0d609d1e056bdc814bd36ce54028b8d6b8b9e38c0afcaa5"; - mips64el-unknown-linux-gnuabi64 = "ee85bbfdc2fb831f067fda19881e6427c8c86571ebff16c1bd219d850969ef0a"; + i686-unknown-linux-gnu = "08b2b4f58c0861f40ae159c39cc12f6d41b6858e04a43c6c0aeb36707e2971d0"; + x86_64-unknown-linux-gnu = "2ca4a306047c0b8b4029c382910fcbc895badc29680e0332c9df990fd1c70d4f"; + x86_64-unknown-linux-musl = "071cb04819b15d8801584a1395b28d0472ce99c0e716296e3c0bb4e6318cf171"; + arm-unknown-linux-gnueabihf = "64c82735b4e5606af61be0d01317da436a9590b969e503cdbd19e24636e15845"; + armv7-unknown-linux-gnueabihf = "a509f02d910041c97847e2ccc4ee908c761b7dc5b3c4715922d2b1c573a09675"; + aarch64-unknown-linux-gnu = "88af5aa7a40c8f1b40416a1f27de8ffbe09c155d933f69d3e109c0ccee92353b"; + aarch64-unknown-linux-musl = "76aaf3e4fd7b552feb2d70752c43896a960a2a7c940002f58a5c3f03d2b3c862"; + x86_64-apple-darwin = "9818dab2c3726d63dfbfde12c9273e62e484ef6d6f6e05a6431a3e089c335454"; + aarch64-apple-darwin = "36228cac303298243fb84235db87a5ecf2af49db28585a82af091caefd598677"; + powerpc64le-unknown-linux-gnu = "8ef68b77971c079dbe23b54a2cfb52da012873d96399c424bc223635306e9a58"; + riscv64gc-unknown-linux-gnu = "e1976bf7d0edb7e7789a1ad7ff8086fdb5306a932650fa8182a5d009883fa6c5"; + mips64el-unknown-linux-gnuabi64 = "c4bf3043451d6122a3845db825cbe35b5ca61a44659a00004f6cca1299ad9d72"; }; - selectRustPackage = pkgs: pkgs.rust_1_69; + selectRustPackage = pkgs: pkgs.rust_1_70; rustcPatches = [ ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f37ced52b9..5fab8e7d5b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16339,11 +16339,11 @@ with pkgs; inherit (darwin) apple_sdk; }; - rust_1_69 = callPackage ../development/compilers/rust/1_69.nix { + rust_1_70 = callPackage ../development/compilers/rust/1_70.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_15 = llvmPackages_15.libllvm; }; - rust = rust_1_69; + rust = rust_1_70; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; @@ -16351,8 +16351,8 @@ with pkgs; openssl = openssl_1_1; }; - rustPackages_1_69 = rust_1_69.packages.stable; - rustPackages = rustPackages_1_69; + rustPackages_1_70 = rust_1_70.packages.stable; + rustPackages = rustPackages_1_70; inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform; From b7d4d9f519342669406874b78fbcf7f28384f39a Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 1 Jun 2023 18:50:02 -0400 Subject: [PATCH 27/83] getopt: fix build on clang 16 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Normally, when getopt builds on a non-glibc platform, it uses C library headers without including them. That’s fine unless your compiler is clang 16, which is strict about using functions without prototypes. Fortunately, Darwin’s headers are compatible enough as are Musl’s, so defining `__GNU_LIBRARY__` can be done unconditionally. --- pkgs/tools/misc/getopt/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/misc/getopt/default.nix b/pkgs/tools/misc/getopt/default.nix index c3b94465aea..2090fcbd7aa 100644 --- a/pkgs/tools/misc/getopt/default.nix +++ b/pkgs/tools/misc/getopt/default.nix @@ -8,6 +8,10 @@ stdenv.mkDerivation rec { sha256 = "1zn5kp8ar853rin0ay2j3p17blxy16agpp8wi8wfg4x98b31vgyh"; }; + # This should be fine on Linux and Darwin. Clang 16 requires it because otherwise getopt will + # attempt to use C library functions without declaring them, which is raised as an error. + env.NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__"; + makeFlags = [ "WITHOUT_GETTEXT=1" "LIBCGETOPT=0" From 9cd4e84a4dda995091afe3560d3ef517c7b31cb0 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 1 Jun 2023 19:22:00 -0400 Subject: [PATCH 28/83] libelf: fix build with clang 16 on Darwin Clang 16 does not allow `main` with an implicit `int`, which causes the configure script to misdetect clang as a non-working compiler. Patching `configure.in` and regenerating `configure` allows libelf to build. Due to the comment regarding bootstrap tools, this patching is only done on Darwin with clang. --- pkgs/development/libraries/libelf/default.nix | 10 +++++++++- .../libraries/libelf/fix-configure-main.patch | 12 ++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/libelf/fix-configure-main.patch diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index 3302d127d4d..0a1a7175296 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { # Fix warnings from preprocessor instructions. # https://github.com/NixOS/nixpkgs/issues/59929 ./preprocessor-warnings.patch + # `configure` defines a test `main` with an implicit `int` return, which clang 16 disallows. + ./fix-configure-main.patch ]; enableParallelBuilding = true; @@ -55,7 +57,13 @@ stdenv.mkDerivation rec { # cross-compiling, but `autoreconfHook` brings in `makeWrapper` which # doesn't work with the bootstrapTools bash, so can only do this for # cross builds when `stdenv.shell` is a newer bash. - ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) autoreconfHook; + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform + # The provided `configure` script fails on clang 16 because some tests have a `main` + # returning an implicit `int`, which clang 16 treats as an error. Running `autoreconf` fixes + # the test and allows `configure` to detect clang properly. + # This is done only for clang on Darwin because the Darwin stdenv bootstrap does not use + # libelf, so should be safe because it will always be run with a compatible version of bash. + || (stdenv.cc.isClang && stdenv.isDarwin)) autoreconfHook; meta = { description = "ELF object file access library"; diff --git a/pkgs/development/libraries/libelf/fix-configure-main.patch b/pkgs/development/libraries/libelf/fix-configure-main.patch new file mode 100644 index 00000000000..cc7e5f4c41d --- /dev/null +++ b/pkgs/development/libraries/libelf/fix-configure-main.patch @@ -0,0 +1,12 @@ +diff -ur a/configure.in b/configure.in +--- a/configure.in 2008-05-23 04:17:56.000000000 -0400 ++++ b/configure.in 2023-06-01 19:16:04.801921924 -0400 +@@ -282,7 +282,7 @@ + #define memmove(d,s,n) bcopy((s),(d),(n)) + #endif + extern int strcmp(); +-main() { ++int main() { + char buf[] = "0123456789"; + memmove(buf + 1, buf, 9); + if (strcmp(buf, "0012345678")) exit(1); From 7b78245076befdcc932b81c059db899f99f989a5 Mon Sep 17 00:00:00 2001 From: Henri Rosten Date: Fri, 2 Jun 2023 09:46:23 +0300 Subject: [PATCH 29/83] openexr_2: fix CVE-2021-3933, enable tests Signed-off-by: Henri Rosten --- pkgs/development/libraries/openexr/default.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index ba0263bcad1..126fa2796f3 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -28,13 +28,31 @@ stdenv.mkDerivation rec { extraPrefix = "OpenEXR/IlmImf/"; sha256 = "1wa2jn6sa0n3phaqvklnlbgk1bz60y756ad4jk4d757pzpnannsy"; }) + (fetchpatch { + name = "CVE-2021-3933.patch"; + url = "https://github.com/AcademySoftwareFoundation/openexr/commit/5db6f7aee79e3e75e8c3780b18b28699614dd08e.patch"; + stripLen = 4; + extraPrefix = "OpenEXR/IlmImf/"; + sha256 = "sha256-DrpldpNgN5pWKzIuuPIrynGX3EpP8YhJlu+lLfNFGxQ="; + }) ]; + # tests are determined to use /var/tmp on unix + postPatch = '' + find . -name tmpDir.h | while read -r f ; do + substituteInPlace $f --replace '/var/tmp' "$TMPDIR" + done + ''; + cmakeFlags = lib.optional stdenv.hostPlatform.isStatic "-DCMAKE_SKIP_RPATH=ON"; nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ ilmbase zlib ]; + # https://github.com/AcademySoftwareFoundation/openexr/issues/1400 + # https://github.com/AcademySoftwareFoundation/openexr/issues/1281 + doCheck = !stdenv.isAarch32 && !stdenv.isi686; + meta = with lib; { description = "A high dynamic-range (HDR) image file format"; homepage = "https://www.openexr.com/"; From 993283e666e58e6458835831db038a36d052082e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 3 Jun 2023 00:27:48 +0200 Subject: [PATCH 30/83] python310Packages.markupsafe: 2.1.2 -> 2.1.3 https://markupsafe.palletsprojects.com/en/2.1.x/changes/#version-2-1-3 --- pkgs/development/python-modules/markupsafe/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix index 7f2ae8af89a..e63af344a3a 100644 --- a/pkgs/development/python-modules/markupsafe/default.nix +++ b/pkgs/development/python-modules/markupsafe/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "markupsafe"; - version = "2.1.2"; + version = "2.1.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "MarkupSafe"; inherit version; - hash = "sha256-q8q8jCsmA21i1MdGOBpvfPYKr8xlMZitZ4MGmGsJRQ0="; + hash = "sha256-r1mO0y1q6G8bdHuCeDlYsaSrj2F7Bv5oeVx/Amq73K0="; }; nativeCheckInputs = [ @@ -25,6 +25,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "markupsafe" ]; meta = with lib; { + changelog = "https://markupsafe.palletsprojects.com/en/${versions.majorMinor version}.x/changes/#version-${replaceStrings [ "." ] [ "-" ] version}"; description = "Implements a XML/HTML/XHTML Markup safe string"; homepage = "https://palletsprojects.com/p/markupsafe/"; license = licenses.bsd3; From f4a67500798a93200144ce7c4bf8471458b9958c Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 2 Jun 2023 21:28:57 -0400 Subject: [PATCH 31/83] rustPlatform.fetchCargoTarball: remove explicit sparse protocol sparse protocol is now the default since rust 1.70 --- pkgs/build-support/rust/fetch-cargo-tarball/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/build-support/rust/fetch-cargo-tarball/default.nix b/pkgs/build-support/rust/fetch-cargo-tarball/default.nix index 8c6a97888c1..adbfe98d810 100644 --- a/pkgs/build-support/rust/fetch-cargo-tarball/default.nix +++ b/pkgs/build-support/rust/fetch-cargo-tarball/default.nix @@ -62,10 +62,6 @@ in stdenv.mkDerivation ({ export CARGO_HOME=$(mktemp -d cargo-home.XXX) CARGO_CONFIG=$(mktemp cargo-config.XXXX) - # https://blog.rust-lang.org/2023/03/09/Rust-1.68.0.html#cargos-sparse-protocol - # planned to become the default in 1.70 - export CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse - if [[ -n "$NIX_CRATES_INDEX" ]]; then cat >$CARGO_HOME/config.toml < Date: Sat, 3 Jun 2023 11:03:21 +0200 Subject: [PATCH 32/83] nettle: 3.9 -> 3.9.1 --- pkgs/development/libraries/nettle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index ba133320da5..3a1297f8976 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl }: callPackage ./generic.nix rec { - version = "3.9"; + version = "3.9.1"; src = fetchurl { url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - hash = "sha256-Duet9acgFhC7f+Csu3ybO+g75EkE3TXrvNllzYlr/qo="; + hash = "sha256-zP7/mBsMpxu9b7ywVPQHxg/7ZEOJpb6A1nFtW1UMbOM="; }; } From 17fa0e2fbf7a94a4f9313df2bcda17a16ab20b48 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 3 May 2023 10:09:53 +0300 Subject: [PATCH 33/83] systemd: 253.3 -> 253.5 This allows us to drop our fsck-look-for-fsck-binary-not-just-in- sbin.patch, as it was upstreamed. We also manually backport https://github.com/systemd/systemd/pull/27856 as it didn't get backported and without it we can't merge this PR as systemd-boot-builder.py will remain broken and make it impossible to do upgrade to NixOS 23.05 in some scenarios Changelog: ``` 991158e8b9 (hwdb: update to 2533fdd0fbe71e4a3fa7a2cca9830cd864fb9136, 2023-06-01) d1087bc599 (test-network: add tests for vlan QoS mapping, 2023-05-24) 7ed7b07a92 (network/vlan: paranoia about type safety, 2023-05-24) b20bc7c1ff (network/vlan: drop unnecessary restriction for QoS mapping, 2023-05-24) dbf50f1911 (udev: do not set ID_PATH and by-path symlink for nvmf disks, 2023-05-10) 75d4967502 (journalctl: fix --no-tail handling, 2023-05-04) f1ea9cd55e (journalctl: use correct variable to check if --since is specified, 2023-05-04) 0227947bab (test/README: fix advice for testsuite debugging, 2023-05-29) 3222272c46 (test-fstab-generator: fix test on systemd with systemd-boot, 2023-05-30) 23b7bf3d01 (home: move the assert back to the intended place, 2023-05-29) 901f0f0ac1 (resolvectl: drop extra colon, 2023-05-28) 5f3ca32d0c (basic/syscall: update syscall list, 2023-05-29) 375e6be16c (tree-wide: Downgrade a few more noisy log messages to trace, 2023-05-27) 3f5f7e5f30 (journal-remote: bump the refcount right after creating the writer object, 2023-05-25) 4810e789ad (man: fix UKI filename suffix in 'tries' description, 2023-05-26) 2e10f8874a (units: Shut down networkd and resolved on switch-root, 2023-05-25) 9dde31ac74 (resolve: avoid memory leak from a partially processed RR, 2023-05-23) b1663b8333 (sd-journal: avoid double-free, 2023-05-23) aa48ecb0a6 (core/timer: Always use inactive_exit_timestamp if it is set, 2023-05-23) ac380e43a4 (core: Do not check child freezability when thawing slice, 2023-05-23) 53bc78d3e0 (tree-wide: Fix false positives on newer gcc, 2023-05-23) 58c1816aa4 (json: correctly handle magic strings when parsing variant strv, 2023-05-23) fbb2c5ab19 (sysusers: fix argument confusion in error message, 2022-10-13) e5520ab28f (sysusers: add usual "ret_" prefix, fix messages, 2022-10-13) 286ce2be44 (man: extend description of --boot, 2022-10-09) 7394a75688 (sd-bus: refuse to send messages with an invalid string, 2023-05-19) ae83e97a51 (core/service: when resetting PID also reset known flag, 2023-05-22) f0bb967388 (shared: correctly propagate possible allocation errors, 2023-05-21) 318c9d5fec (wait-online: downgrade log level of failure that interface is removed or unmanaged during processing it, 2023-05-22) 1a0f2c5c57 (boot: Read files in small chunks on broken firmware, 2023-01-05) eeaf884f5b (cryptenroll: update log messages, 2023-05-20) debce7c184 (test: check if we can use --merge with --follow, 2023-05-19) 3cf401e3e3 (manager: restrict Dump*() to privileged callers or ratelimit, 2023-04-27) 6ca461fe29 (ratelimit: add ratelimit_left helper, 2023-04-28) 604d132fde (journalctl: make --follow work with --merge again, 2023-05-19) 6a4c05c615 (test: make the stress test slightly less stressful on slower machines, 2023-05-19) a08cb80451 (core/device: downgrade error when units specified in SYSTEMD_WANTS= not found, 2023-05-19) eb5dad0a72 (unit: add conditions and deps to make oomd.socket and .service consistent, 2023-05-19) c756ffea57 (oomd: shorten message, 2023-05-18) a3e5eb5606 (sd-bus,sd-event: allow querying of description even after fork, 2023-05-18) e91557a1e0 (sd-bus: do not assert if bus description is not set, 2023-05-18) 93b3bd12ac (test: don't mount /sys & /proc if already mounted, 2023-05-18) c51273941d (nspawn: make the error message less confusing, 2023-05-18) e85daabd3e (Revert (partially) "man: Clarify when OnFailure= activates after restarts (#7646)", 2023-05-17) 3e286a7b2e (man/tmpfiles: fix off-by-one in example, 2023-05-17) cb6641bde3 (man: explain allowed values for /sys/power/{disk,state}, 2023-05-17) 65bf6c5a8f (man: say that ProtectClock= also affects reads, 2023-05-17) 13c8807360 (man: fixes for assorted issues reported by the manpage-l10n project, 2023-05-17) 1809fff392 (nspawn: make sure the device type survives when setting device mode, 2023-05-16) b8ed81660f (nspawn: fix a global-buffer-overflow, 2023-05-15) 756e77b936 (nspawn: fix inverted condition, 2023-05-15) c7861222ba (nspawn: call json_dispatch() with a correct pointer, 2023-05-15) 6f577f5d92 (nspawn: use the just returned errno in the log message, 2023-05-15) 9a7c6ed568 (nspawn: avoid NULL pointer dereference, 2023-05-16) 17c7b07c67 (nspawn: file system namespace -> mount namespace, 2023-05-15) b13e836315 (nspawn: fix a typo in an error message, 2023-05-15) d88225ef44 (busctl: set a description for the bus connection, 2023-05-05) 29115ef32e (man: indicate that the JOB parameter to "systemctl cancel" is optional, 2023-05-16) 051f86ae0e (meson: fix description for link-udev-shared option, 2023-05-16) 85ba46539f (man: use correct name for --bank option, 2023-05-15) d7e75c7315 (machine,portable: fix a typo in an info message, 2023-05-12) 4d29f741c8 (machine: fix a memory leak when showing multiple machines, 2023-05-12) e6a719598c (machine: fix a memory leak when showing multiple images, 2023-05-12) ea221dc685 (fstab-generator: Fix log message, 2023-05-10) 4c3b06f255 (test: test O_CLOEXEC filtering of fdset fill logic, 2023-05-30) 88bf6b5815 (pid1: when taking possession of passed fds check O_CLOEXEC state first, 2023-05-30) 0d8372b450 (repart: Create temporary root directory using var_tmp_dir(), 2023-02-14) aedfe41cda (cryptenroll: actually allow using multiple "special" strings when wiping, 2023-05-10) f59ce1aa7b (core: fix use of uninitialized value, 2023-05-04) 3f5db0dbc1 (sd-journal: check .next_entry_array_offset earlier, 2023-05-03) 0baac8e60e (tree-wide: drop _pure_ attribute from non-pure functions, 2023-05-10) 4984f70db5 (dirent: conditionalize dirent assert based on dirent64 existence, 2023-05-10) 5fcbda8b5e (network/tc: rename settings in log messages too, 2023-05-10) 59dccdfddb (sd-bus: bus_message_type_from_string is not pure, 2023-05-10) 133d4ff6d6 (cryptenroll: fix an assertion with weak passwords, 2023-05-09) c937b8f9de (units: Add CAP_NET_ADMIN condition to systemd-networkd-wait-online@.service as well, 2023-05-07) 60af5019fb (units: add/fix Documentation= about bus interface, 2023-05-09) 53f7e5f18f (core/service: fix error cause in the log, 2023-05-09) 951c27ce14 (shell completion: add timesync-status and show-timesync to zsh completion file (#27574), 2023-05-08) 32831842ba (doc: remove legacy DefaultControlGroup from dbus properties, 2023-05-08) c31e2fa9c7 (zsh: add service-log-{level,target} completions for systemctl, 2023-05-07) 011a686a23 (test_ukify: fix loop iteration, 2023-04-21) 927d234406 (hwdb: do not include '#' in modalias, 2023-05-06) b1a7a15ed2 (core: check the unit type more thoroughly when deserializing, 2023-05-04) 154b108513 (shared: refuse fd == INT_MAX, 2023-05-04) a25605d01d (zsh: remove usage of PREFIX in _systemctl, 2023-05-05) 4be604e75a (basic/audit-util: make a test request before enabling use of audit, 2023-05-02) 4b4285e231 (main: add missing return, 2023-05-05) ce096b0212 (shared: reject empty attachment path, 2023-05-02) 6027fbf1af (shared: ignore invalid valink socket fd when deserializing, 2023-05-02) d649128268 (core: fix NULL pointer dereference during deserialization, 2023-05-02) 6ae77d6b99 (boot: Use correct memory type for allocations, 2023-05-02) de0cbaceb7 (core: check for SERVICE_RELOAD_NOTIFY in manager_dbus_is_running, 2023-05-02) 5ed087fa46 (generators: skip private tmpfs if /tmp does not exist, 2023-04-30) 93143b6d6a (test: replace sleep with timeout, 2023-05-02) 881382685e (test-network: add workaround for bug in iproute2 v6.2.0, 2023-05-02) abf9e916ad (coredumpctl: add --file/--root/--image to bash completion, 2023-04-25) dd349a0ede (coredumpctl: fix bash completion matching, 2023-04-25) 120342b62d (test: match all messages with the FILE field, 2023-04-29) e0da5c9bc6 (test: add tests for "systemctl stop" vs triggering by path unit, 2023-04-29) c1542a967b (test: create temporary units under /run, 2023-04-29) 03f2a8921e (core/path: do not enqueue new job in .trigger_notify callback, 2023-04-29) 674591e6af (core/path: align table, 2023-04-29) 0413fb7de9 (test: add a couple of tests for systemd-pstore, 2023-04-27) de41e55c7d (pstore: avoid opening the dmesg.txt file if not requested, 2023-04-28) 37c212dbd7 (pstore: explicitly set the base when converting record ID, 2023-04-28) daee48adbb (test: dont use anchor char '$' to match a part of a string, 2023-04-27) 53ac14a054 (core/transaction: use hashmap_remove_value() to make not remove job with same ID, 2023-04-26) 0258760397 (resolved: adjust message about credentials, 2023-04-25) 8f19911bc3 (fuzz-journal-remote: fix potential fd-leak, 2023-03-18) df1e479d4e (fuzz-journal-remote: remove temporary files on exit, 2023-03-18) 0d745e2de3 (hwdb: update to 46b8c3f5b297ac034f2d024c1f3d84ad2c17f410, 2023-04-30) df9d1d9bb2 (sd-journal: make journal_file_copy_entry() return earlier, 2023-04-26) 3bc2553cfc (sd-journal: copy boot ID, 2023-04-26) 45b045880c (sd-journal: tighten variable scope, 2023-04-26) 3821e3ea07 (journal: Don't try to write garbage if journal entry is corrupted, 2023-04-26) 4eedc4711a (test: add test case of negative match for SYMLINK and TAG, 2023-04-25) cd795f9abc (udev-rules: fix negative match rule for SYMLINK and TAG, 2023-04-25) a25e2ef992 (core: fix property getter method for NFileDescriptorStore bus property, 2023-04-12) eec30e3143 (repart: always take BSD lock when whole block device is opened, 2023-04-13) 50ab96e442 (bootctl: clean up handling of files with no version information, 2023-03-30) 9d97c8d423 (mkosi: disable centos 8 build, 2023-04-26) c603dae241 (mkosi: disable key check for Fedora builds, 2023-04-26) 724a50fb01 (mkfs-util: do not pass -quiet to mksquashfs, 2023-04-27) 43d194392f (test: use setpriv instead of su for user switch from root, 2023-03-14) ba683eb48c (test: wrap mkfs.*/mksquashfs/mkswap binaries when running w/ ASan, 2023-03-16) fdcd1807ff (test: bump the D-Bus related timeouts to 120s, 2023-03-09) 4f8b2abf69 (coredump filter: add mask for 'all' using UINT32_MAX, not UINT64_MAX, 2023-04-26) 021bb972ff (coredump filter: fix stack overflow with =all, 2023-04-26) 3fd444c048 (build(deps): bump github/super-linter from 4.9.7 to 4.10.1, 2023-04-01) a19396c73b (cryptenroll: fix a memory leak, 2023-03-27) 083ede1482 (test: tell dfuzzer to skip Reexecute(), 2023-04-26) ae12c1380b (portablectl: add --extension to bash completion, 2023-04-25) b1ecfe3fe7 (man: /usr/lib/systemd/random-seed -> /usr/lib/systemd/systemd-random-seed, 2023-04-25) 8895ccaaa8 (cryptsetup-fido2: Depend on libcryptsetup, 2023-04-24) c6e957d02d (test: use idiomatic bash loop iteration, 2023-04-07) 26e181e94e (testsuite-54: drop unnecessary pipe, 2023-04-05) d2c738341b (testsuite-70: drop unnecessary env, 2023-04-05) f3abd451dd (test: drop uses of "&& { echo 'unexpected success'; exit 1; }", 2023-04-05) 59243061f6 (man: fix LogControl1 manpage example, 2023-04-24) 04983c2b00 (pam: cache sd-bus separately per module, 2023-04-16) 0045d952b5 (pam_systemd_home: clean up sd-bus when called about something else's user, 2023-04-20) c50ec75e1e (testsuite-04: remove unnecessary conditional, 2023-04-04) 5a8987794e (man: clarify sd_bus_default, 2023-04-22) b9af9a320e (man: add working example to LogControl1 manpage, 2023-04-21) 4d2b5338ac (detect-virt: add message at debug level, 2023-04-20) 749a6d9959 (dissect: let's check for crypto_LUKS before fstype allowlist check, 2023-04-20) 1aa6171081 (ratelimit: handle counter overflows somewhat sanely, 2023-04-20) 5ff63b8507 (man: try to make clearer that /var/ is generally not available in /usr/lib/systemd/system-shutdown/ callouts, 2023-04-20) 2be23f69ee (dissect-image: issue BLKFLSBUF before probing an fs at block device offset != 0, 2023-04-20) 7b437659b1 (list: fix double evaluation, 2023-04-20) ffbb75aa46 (mountpoint-util: check /proc is mounted on failure, 2023-04-17) 14eb49b5eb (test: prefix the transient unit with test- to make coverage runs happy, 2023-04-18) 980954d2cf (kmod-setup: bypass heavy virtio-rng check if we are not running in a VM anyway, 2023-04-18) 567a1a6fd8 (kmod-setup: use STARTSWITH_SET() where appropriate, 2023-04-18) d37f06f96f (creds: make available to all ExecStartPre= and ExecStart= processes, 2023-04-15) d15f907b5b (user-util:remove duplicate includes, 2023-04-17) cedea4cb7e (virt: Further improve detection of EC2 metal instances, 2023-04-13) 826662680b (string-util: add strstrafter(), 2023-04-14) ac721c88af (test: add a couple of tests with invalid UTF-8 characters, 2023-04-15) 9c8d8719e4 (test: add a simple test for getenv_path_list(), 2023-04-15) a9c73150ac (test: add a couple of basic sanity tests for the security verb, 2023-04-15) 06a70861bc (test: add a couple of basic sanity tests for timedatectl, 2023-04-15) def6c37a19 (shared: add a missing include, 2023-04-15) 79e23f618f (test: add tests for uuid/uint64 specifiers, 2023-04-15) 3ee1839c19 (fsck: look for fsck binary not just in /sbin, 2023-04-13) eab75a8591 (test: stop the test unit when it's not needed anymore, 2023-04-14) f86ec34958 (Synposis and description of networkctl man page reflecting only part of its functionality (#27264), 2023-04-13) fffcebc4bb (core/main: fix a typo for --log-target, 2023-04-13) f152cdabae (test: add some tests for RuntimeMaxSec, 2023-04-13) 999f48558b (scope: do not disable timer event source when state is SCOPE_RUNNING, 2023-04-04) 430861fc96 (Fix cross-reference of manual for LogsDirectory, 2023-04-12) 91953109ec (pid1: fix coredump_filter setting, 2023-04-12) fa8d33bb37 (Uphold/StopWhenUnneeded/BindsTo: requeue when job finishes, 2023-04-12) 6fc08d8407 (Uphold/StopWhenUnneeded/BindsTo: add retry timer on rate limit, 2023-04-12) 1fb4ae32b0 (man: add util-linux to the package list for Fedora container, 2023-04-12) 841146f243 (man: link to Fedora 37, 2023-04-12) 465edc1230 (systemctl: suppress error for try-* if unit is masked, 2023-04-04) 7102925d1a (ci: drop checkout from release workflow, 2023-04-11) 167c01688f (ci: don't run release wf on `systemd-security`, 2023-04-11) bda5c892a8 (shell-completion: add --xml-interface option of busctl to the rules, 2023-04-11) 6265430ca9 (busctl: add --xml-interface to the help message, 2023-04-11) d26fd71d1a (test: update description, 2023-04-11) 35a6460a2f (test: systemd-analyze blame should succeed now, 2023-04-10) ef10974c66 (analyze: make blame command work even the default target not reached, 2023-04-10) dc2facf61d (ci: add permissions to make a release, 2023-04-03) 4c65c644d6 (test/test-functions: fix typo in install_suse_systemd(), 2023-04-04) fca5a45a59 (test: install symlinks with valid targets on SUSE and Debian, 2023-03-24) d18037b8ff (localed: fix invalid free after shifting pointers using strstrip, 2023-04-07) 93ac024b7e (test: bump the timeout for non-qemu runs to 90s, 2023-04-07) 283b7b4159 (test: enable the systemd-resolved unit in TEST-75, 2023-04-07) 6179141124 (man/systemd-mount: Clearify documentation about --bind-device, 2023-04-05) b2e1dabbeb (resolve: change DNS_PACKET_UNICAST_SIZE_LARGE_MAX to 1232 (#27171), 2023-04-07) 16dc17d68c (man: netdev: Clarify wireguard IPv6 endpoint format, 2023-04-07) 0558c490a6 (test: use kbd-mode-map we ship in TEST-73-LOCALE, 2023-04-05) 64ef6ccd4f (ci: do one build with no tpm/p11kit/fido2, 2023-04-04) 018461aaf0 (man: mention -o option for systemd-journal-remote, 2023-04-05) 31c7f6d0d1 (manager: remove transient unit directory during startup, 2023-04-04) 49c6965946 (core: a more informative error when SetProperties/StartTransientUnit fails, 2023-04-02) 649e335bc1 (journald: fix log message, 2023-04-04) eda7bf237f (Added unit test for strv_env_name_is_valid() function listed in env-util.c (#27100), 2023-04-02) 0430078cfb (man: restore description of ConditionControlGroupController=v1|v2, 2023-03-31) 0d9c2c270b (test: set ReadWritePaths= for test-.services when built w/ coverage, 2023-03-31) 384fec2622 (core: skip deps on oomd if v2 or memory unavailable, 2023-03-31) 2950b4ebf6 (test: fixed negative checks in TEST-70-TPM2. Use in-line error handling rather than redirections. Follow up on #27020, 2023-03-30) 786649c904 (test: make make_addresses() actually return the addresses, 2023-03-30) 5e3ac73017 (coverage: add a wrapper for execveat(), 2023-03-30) 8b1cc644c5 (man: add example for sd_bus_call_method, 2023-03-30) 382e53977c (man: further shorten print-unit-path example, 2023-03-29) 960f05945c (man: link up new online coredump docs from man page, 2023-03-30) edfca36727 (tree-wide: reset optind to 0 when GNU extensions in optstring are used, 2023-03-21) 91ff21962d (test-kernel-install: several cleanups, 2023-03-28) 9943f2af3d (units: let's establish the coredump socket before writting core_pattern sysctl, 2023-03-29) dbb1b9c2c8 (test: do not remove state directory on failure, 2023-03-29) 29cfb05183 (test: fix shellcheck warnings in test-sysusers.sh, 2023-03-29) 18afac6e90 (man: fix shellcheck warning for html.in, 2023-03-29) 4629419038 (added more test cases, 2023-03-27) 05ae9e276c (test: fix regexp in testsuite-74.mount.sh, 2023-03-28) 295012f7fa (test: drop extraneous bracket in testsuite-74.mount.sh, 2023-03-28) ff7040b193 (busctl: also assume --full if not writing to terminal, 2023-03-28) 00977a8e74 (busctl: use size_t for set size, 2023-03-28) 802fded9a5 (busctl: do not truncate property values when --full, 2023-03-28) e400a62a92 (oomd: add inline comments with param names, 2023-03-21) 4067ec52f4 (test: add more testcases for rm_rf(), 2023-03-19) 201830df21 (rm-rf: also chmod() directory if it cannot be opened, 2023-03-19) d91f7eb0fb (rm-rf: mask file mode with 07777 when passed to chmod(), 2023-03-19) 80417f90b0 (rm-rf: fix errno handling, 2023-03-18) ``` Co-authored-by: Arian van Putten --- nixos/tests/systemd-boot.nix | 3 +- .../systemd/0003-Fix-NixOS-containers.patch | 6 +- ...ome-NixOS-specific-unit-directories.patch} | 0 ...ook-for-fsck-binary-not-just-in-sbin.patch | 152 ------------------ ...-a-useless-message-in-user-sessions.patch} | 4 +- ...-timedated-disable-methods-that-cha.patch} | 0 ...-paths.patch => 0007-Fix-hwdb-paths.patch} | 0 ...-usr-share-zoneinfo-to-etc-zoneinfo.patch} | 4 +- ...alectl-use-etc-X11-xkb-for-list-x11.patch} | 0 ...e-statedir-and-don-t-touch-prefixdi.patch} | 0 ...-add-rootprefix-to-lookup-dir-paths.patch} | 0 ...execute-scripts-in-etc-systemd-syst.patch} | 4 +- ...cute-scripts-in-etc-systemd-system-.patch} | 0 ...placeholder-for-DEFAULT_PATH_NORMAL.patch} | 0 ...kg-config-derive-prefix-from-prefix.patch} | 0 ...environment-when-calling-generators.patch} | 4 +- ...17-core-don-t-taint-on-unmerged-usr.patch} | 4 +- ...ntext_init-fix-driver-name-checking.patch} | 0 ...nt-efi-files-not-owned-by-systemd-in.patch | 46 ++++++ pkgs/os-specific/linux/systemd/default.nix | 46 +++--- 20 files changed, 79 insertions(+), 194 deletions(-) rename pkgs/os-specific/linux/systemd/{0005-Add-some-NixOS-specific-unit-directories.patch => 0004-Add-some-NixOS-specific-unit-directories.patch} (100%) delete mode 100644 pkgs/os-specific/linux/systemd/0004-fsck-look-for-fsck-binary-not-just-in-sbin.patch rename pkgs/os-specific/linux/systemd/{0006-Get-rid-of-a-useless-message-in-user-sessions.patch => 0005-Get-rid-of-a-useless-message-in-user-sessions.patch} (91%) rename pkgs/os-specific/linux/systemd/{0007-hostnamed-localed-timedated-disable-methods-that-cha.patch => 0006-hostnamed-localed-timedated-disable-methods-that-cha.patch} (100%) rename pkgs/os-specific/linux/systemd/{0008-Fix-hwdb-paths.patch => 0007-Fix-hwdb-paths.patch} (100%) rename pkgs/os-specific/linux/systemd/{0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch => 0008-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch} (98%) rename pkgs/os-specific/linux/systemd/{0010-localectl-use-etc-X11-xkb-for-list-x11.patch => 0009-localectl-use-etc-X11-xkb-for-list-x11.patch} (100%) rename pkgs/os-specific/linux/systemd/{0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch => 0010-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch} (100%) rename pkgs/os-specific/linux/systemd/{0012-add-rootprefix-to-lookup-dir-paths.patch => 0011-add-rootprefix-to-lookup-dir-paths.patch} (100%) rename pkgs/os-specific/linux/systemd/{0013-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch => 0012-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch} (89%) rename pkgs/os-specific/linux/systemd/{0014-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch => 0013-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch} (100%) rename pkgs/os-specific/linux/systemd/{0015-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch => 0014-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch} (100%) rename pkgs/os-specific/linux/systemd/{0016-pkg-config-derive-prefix-from-prefix.patch => 0015-pkg-config-derive-prefix-from-prefix.patch} (100%) rename pkgs/os-specific/linux/systemd/{0017-inherit-systemd-environment-when-calling-generators.patch => 0016-inherit-systemd-environment-when-calling-generators.patch} (94%) rename pkgs/os-specific/linux/systemd/{0018-core-don-t-taint-on-unmerged-usr.patch => 0017-core-don-t-taint-on-unmerged-usr.patch} (92%) rename pkgs/os-specific/linux/systemd/{0019-tpm2_context_init-fix-driver-name-checking.patch => 0018-tpm2_context_init-fix-driver-name-checking.patch} (100%) create mode 100644 pkgs/os-specific/linux/systemd/0019-bootctl-also-print-efi-files-not-owned-by-systemd-in.patch diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix index 19034b29999..1583b2f8147 100644 --- a/nixos/tests/systemd-boot.nix +++ b/nixos/tests/systemd-boot.nix @@ -252,7 +252,8 @@ in ''; }; - # See: [Firmware file size bug] in systemd/default.nix + # Some UEFI firmwares fail on large reads. Now that systemd-boot loads initrd + # itself, systems with such firmware won't boot without this fix uefiLargeFileWorkaround = makeTest { name = "uefi-large-file-workaround"; diff --git a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch index c0d38c60202..08499a22834 100644 --- a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch +++ b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch @@ -10,10 +10,10 @@ container, so checking early whether it exists will fail. 1 file changed, 2 insertions(+) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index a697ea5cb9..65d9e7e398 100644 +index 3dabe12672..e5aa4feb1e 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -5635,6 +5635,7 @@ static int run(int argc, char *argv[]) { +@@ -5638,6 +5638,7 @@ static int run(int argc, char *argv[]) { goto finish; } } else { @@ -21,7 +21,7 @@ index a697ea5cb9..65d9e7e398 100644 _cleanup_free_ char *p = NULL; if (arg_pivot_root_new) -@@ -5649,6 +5650,7 @@ static int run(int argc, char *argv[]) { +@@ -5652,6 +5653,7 @@ static int run(int argc, char *argv[]) { "Directory %s doesn't look like it has an OS tree (/usr/ directory is missing). Refusing.", arg_directory); goto finish; } diff --git a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch rename to pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch diff --git a/pkgs/os-specific/linux/systemd/0004-fsck-look-for-fsck-binary-not-just-in-sbin.patch b/pkgs/os-specific/linux/systemd/0004-fsck-look-for-fsck-binary-not-just-in-sbin.patch deleted file mode 100644 index 617cef50cc3..00000000000 --- a/pkgs/os-specific/linux/systemd/0004-fsck-look-for-fsck-binary-not-just-in-sbin.patch +++ /dev/null @@ -1,152 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Florian Klink -Date: Thu, 13 Apr 2023 22:54:54 +0200 -Subject: [PATCH] fsck: look for fsck binary not just in /sbin - -This removes remaining hardcoded occurences of `/sbin/fsck`, and instead -uses `find_executable` to find `fsck`. - -We also use `fsck_exists_for_fstype` to check for the `fsck.*` -executable, which also checks in `$PATH`, so it's fair to assume fsck -itself is also available. ---- - man/systemd-fsck@.service.xml | 8 ++++---- - src/fsck/fsck.c | 9 ++++++++- - src/home/homework-luks.c | 11 ++++++++++- - src/shared/dissect-image.c | 13 +++++++++++-- - 4 files changed, 33 insertions(+), 8 deletions(-) - -diff --git a/man/systemd-fsck@.service.xml b/man/systemd-fsck@.service.xml -index e928aebdb3..403286829e 100644 ---- a/man/systemd-fsck@.service.xml -+++ b/man/systemd-fsck@.service.xml -@@ -51,17 +51,17 @@ - systemd-fsck does not know any details - about specific filesystems, and simply executes file system - checkers specific to each filesystem type -- (/sbin/fsck.type). These checkers will decide if -+ (fsck.type). These checkers will decide if - the filesystem should actually be checked based on the time since - last check, number of mounts, unclean unmount, etc. - - systemd-fsck-root.service and systemd-fsck-usr.service -- will activate reboot.target if /sbin/fsck returns the "System -- should reboot" condition, or emergency.target if /sbin/fsck -+ will activate reboot.target if fsck returns the "System -+ should reboot" condition, or emergency.target if fsck - returns the "Filesystem errors left uncorrected" condition. - - systemd-fsck@.service will fail if -- /sbin/fsck returns with either "System should reboot" -+ fsck returns with either "System should reboot" - or "Filesystem errors left uncorrected" conditions. For filesystems - listed in /etc/fstab without nofail - or noauto options, local-fs.target -diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c -index e25c5d5efa..0e0e73c9ac 100644 ---- a/src/fsck/fsck.c -+++ b/src/fsck/fsck.c -@@ -351,6 +351,7 @@ static int run(int argc, char *argv[]) { - if (r == 0) { - char dash_c[STRLEN("-C") + DECIMAL_STR_MAX(int) + 1]; - int progress_socket = -1; -+ _cleanup_free_ char *fsck_path = NULL; - const char *cmdline[9]; - int i = 0; - -@@ -371,7 +372,13 @@ static int run(int argc, char *argv[]) { - } else - dash_c[0] = 0; - -- cmdline[i++] = "/sbin/fsck"; -+ r = find_executable("fsck", &fsck_path); -+ if (r < 0) { -+ log_error_errno(r, "Cannot find fsck binary: %m"); -+ _exit(FSCK_OPERATIONAL_ERROR); -+ } -+ -+ cmdline[i++] = fsck_path; - cmdline[i++] = arg_repair; - cmdline[i++] = "-T"; - -diff --git a/src/home/homework-luks.c b/src/home/homework-luks.c -index 2ea9887853..e267457b8e 100644 ---- a/src/home/homework-luks.c -+++ b/src/home/homework-luks.c -@@ -215,6 +215,7 @@ static int block_get_size_by_path(const char *path, uint64_t *ret) { - static int run_fsck(const char *node, const char *fstype) { - int r, exit_status; - pid_t fsck_pid; -+ _cleanup_free_ char *fsck_path = NULL; - - assert(node); - assert(fstype); -@@ -227,6 +228,14 @@ static int run_fsck(const char *node, const char *fstype) { - return 0; - } - -+ r = find_executable("fsck", &fsck_path); -+ /* We proceed anyway if we can't determine whether the fsck -+ * binary for some specific fstype exists, -+ * but the lack of the main fsck binary should be considered -+ * an error. */ -+ if (r < 0) -+ return log_error_errno(r, "Cannot find fsck binary: %m"); -+ - r = safe_fork("(fsck)", - FORK_RESET_SIGNALS|FORK_RLIMIT_NOFILE_SAFE|FORK_DEATHSIG|FORK_LOG|FORK_STDOUT_TO_STDERR|FORK_CLOSE_ALL_FDS, - &fsck_pid); -@@ -234,7 +243,7 @@ static int run_fsck(const char *node, const char *fstype) { - return r; - if (r == 0) { - /* Child */ -- execl("/sbin/fsck", "/sbin/fsck", "-aTl", node, NULL); -+ execl(fsck_path, fsck_path, "-aTl", node, NULL); - log_open(); - log_error_errno(errno, "Failed to execute fsck: %m"); - _exit(FSCK_OPERATIONAL_ERROR); -diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c -index 4749bdd230..2b6e1418dd 100644 ---- a/src/shared/dissect-image.c -+++ b/src/shared/dissect-image.c -@@ -1423,6 +1423,7 @@ static int is_loop_device(const char *path) { - static int run_fsck(int node_fd, const char *fstype) { - int r, exit_status; - pid_t pid; -+ _cleanup_free_ char *fsck_path = NULL; - - assert(node_fd >= 0); - assert(fstype); -@@ -1437,6 +1438,14 @@ static int run_fsck(int node_fd, const char *fstype) { - return 0; - } - -+ r = find_executable("fsck", &fsck_path); -+ /* We proceed anyway if we can't determine whether the fsck -+ * binary for some specific fstype exists, -+ * but the lack of the main fsck binary should be considered -+ * an error. */ -+ if (r < 0) -+ return log_error_errno(r, "Cannot find fsck binary: %m"); -+ - r = safe_fork_full( - "(fsck)", - &node_fd, 1, /* Leave the node fd open */ -@@ -1446,7 +1455,7 @@ static int run_fsck(int node_fd, const char *fstype) { - return log_debug_errno(r, "Failed to fork off fsck: %m"); - if (r == 0) { - /* Child */ -- execl("/sbin/fsck", "/sbin/fsck", "-aT", FORMAT_PROC_FD_PATH(node_fd), NULL); -+ execl(fsck_path, fsck_path, "-aT", FORMAT_PROC_FD_PATH(node_fd), NULL); - log_open(); - log_debug_errno(errno, "Failed to execl() fsck: %m"); - _exit(FSCK_OPERATIONAL_ERROR); -@@ -1454,7 +1463,7 @@ static int run_fsck(int node_fd, const char *fstype) { - - exit_status = wait_for_terminate_and_check("fsck", pid, 0); - if (exit_status < 0) -- return log_debug_errno(exit_status, "Failed to fork off /sbin/fsck: %m"); -+ return log_debug_errno(exit_status, "Failed to fork off %s: %m", fsck_path); - - if ((exit_status & ~FSCK_ERROR_CORRECTED) != FSCK_SUCCESS) { - log_debug("fsck failed with exit status %i.", exit_status); diff --git a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch b/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch similarity index 91% rename from pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch rename to pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch index 0a638dfbf0e..e9f73d7c772 100644 --- a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch +++ b/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch @@ -13,10 +13,10 @@ in containers. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/manager.c b/src/core/manager.c -index 380a4e30d7..817acb87b8 100644 +index 4bc8a06bd2..342892490e 100644 --- a/src/core/manager.c +++ b/src/core/manager.c -@@ -1437,7 +1437,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) { +@@ -1486,7 +1486,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) { if (!unit_is_bound_by_inactive(u, &culprit)) continue; diff --git a/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch b/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch rename to pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch diff --git a/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch b/pkgs/os-specific/linux/systemd/0007-Fix-hwdb-paths.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch rename to pkgs/os-specific/linux/systemd/0007-Fix-hwdb-paths.patch diff --git a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/os-specific/linux/systemd/0008-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch similarity index 98% rename from pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch rename to pkgs/os-specific/linux/systemd/0008-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch index 52733a4c492..300906be04d 100644 --- a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch +++ b/pkgs/os-specific/linux/systemd/0008-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch @@ -88,10 +88,10 @@ index 9e79f84691..1a1c75718c 100644 (void) mkdir_parents(etc_localtime, 0755); r = symlink_atomic(e, etc_localtime); diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 65d9e7e398..dd44d529ca 100644 +index e5aa4feb1e..a7a8fae860 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -1915,8 +1915,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid +@@ -1918,8 +1918,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid static const char *timezone_from_path(const char *path) { return PATH_STARTSWITH_SET( path, diff --git a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch b/pkgs/os-specific/linux/systemd/0009-localectl-use-etc-X11-xkb-for-list-x11.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch rename to pkgs/os-specific/linux/systemd/0009-localectl-use-etc-X11-xkb-for-list-x11.patch diff --git a/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch b/pkgs/os-specific/linux/systemd/0010-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch rename to pkgs/os-specific/linux/systemd/0010-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch diff --git a/pkgs/os-specific/linux/systemd/0012-add-rootprefix-to-lookup-dir-paths.patch b/pkgs/os-specific/linux/systemd/0011-add-rootprefix-to-lookup-dir-paths.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0012-add-rootprefix-to-lookup-dir-paths.patch rename to pkgs/os-specific/linux/systemd/0011-add-rootprefix-to-lookup-dir-paths.patch diff --git a/pkgs/os-specific/linux/systemd/0013-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/pkgs/os-specific/linux/systemd/0012-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch similarity index 89% rename from pkgs/os-specific/linux/systemd/0013-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch rename to pkgs/os-specific/linux/systemd/0012-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch index 84ac0d882d6..9d0565a6e76 100644 --- a/pkgs/os-specific/linux/systemd/0013-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch +++ b/pkgs/os-specific/linux/systemd/0012-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch @@ -10,10 +10,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable. 1 file changed, 1 insertion(+) diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c -index 42111d2772..53467ac229 100644 +index 5dee1b3a92..c08cf80548 100644 --- a/src/shutdown/shutdown.c +++ b/src/shutdown/shutdown.c -@@ -335,6 +335,7 @@ static void init_watchdog(void) { +@@ -339,6 +339,7 @@ static void init_watchdog(void) { int main(int argc, char *argv[]) { static const char* const dirs[] = { SYSTEM_SHUTDOWN_PATH, diff --git a/pkgs/os-specific/linux/systemd/0014-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/pkgs/os-specific/linux/systemd/0013-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0014-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch rename to pkgs/os-specific/linux/systemd/0013-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch diff --git a/pkgs/os-specific/linux/systemd/0015-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/pkgs/os-specific/linux/systemd/0014-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0015-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch rename to pkgs/os-specific/linux/systemd/0014-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch diff --git a/pkgs/os-specific/linux/systemd/0016-pkg-config-derive-prefix-from-prefix.patch b/pkgs/os-specific/linux/systemd/0015-pkg-config-derive-prefix-from-prefix.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0016-pkg-config-derive-prefix-from-prefix.patch rename to pkgs/os-specific/linux/systemd/0015-pkg-config-derive-prefix-from-prefix.patch diff --git a/pkgs/os-specific/linux/systemd/0017-inherit-systemd-environment-when-calling-generators.patch b/pkgs/os-specific/linux/systemd/0016-inherit-systemd-environment-when-calling-generators.patch similarity index 94% rename from pkgs/os-specific/linux/systemd/0017-inherit-systemd-environment-when-calling-generators.patch rename to pkgs/os-specific/linux/systemd/0016-inherit-systemd-environment-when-calling-generators.patch index 236af4b2c97..0f67abe795c 100644 --- a/pkgs/os-specific/linux/systemd/0017-inherit-systemd-environment-when-calling-generators.patch +++ b/pkgs/os-specific/linux/systemd/0016-inherit-systemd-environment-when-calling-generators.patch @@ -16,10 +16,10 @@ executables that are being called from managers. 1 file changed, 8 insertions(+) diff --git a/src/core/manager.c b/src/core/manager.c -index 817acb87b8..3f31359f8a 100644 +index 342892490e..1117251fe0 100644 --- a/src/core/manager.c +++ b/src/core/manager.c -@@ -3714,9 +3714,17 @@ static int build_generator_environment(Manager *m, char ***ret) { +@@ -3771,9 +3771,17 @@ static int build_generator_environment(Manager *m, char ***ret) { * adjust generated units to that. Let's pass down some bits of information that are easy for us to * determine (but a bit harder for generator scripts to determine), as environment variables. */ diff --git a/pkgs/os-specific/linux/systemd/0018-core-don-t-taint-on-unmerged-usr.patch b/pkgs/os-specific/linux/systemd/0017-core-don-t-taint-on-unmerged-usr.patch similarity index 92% rename from pkgs/os-specific/linux/systemd/0018-core-don-t-taint-on-unmerged-usr.patch rename to pkgs/os-specific/linux/systemd/0017-core-don-t-taint-on-unmerged-usr.patch index 18982ecd04b..f509eb39ece 100644 --- a/pkgs/os-specific/linux/systemd/0018-core-don-t-taint-on-unmerged-usr.patch +++ b/pkgs/os-specific/linux/systemd/0017-core-don-t-taint-on-unmerged-usr.patch @@ -17,10 +17,10 @@ See also: https://github.com/systemd/systemd/issues/24191 1 file changed, 4 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c -index 3f31359f8a..0c4ec0b4fb 100644 +index 1117251fe0..bf5600a6cf 100644 --- a/src/core/manager.c +++ b/src/core/manager.c -@@ -4556,10 +4556,6 @@ char* manager_taint_string(const Manager *m) { +@@ -4617,10 +4617,6 @@ char* manager_taint_string(const Manager *m) { if (m->taint_usr) stage[n++] = "split-usr"; diff --git a/pkgs/os-specific/linux/systemd/0019-tpm2_context_init-fix-driver-name-checking.patch b/pkgs/os-specific/linux/systemd/0018-tpm2_context_init-fix-driver-name-checking.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0019-tpm2_context_init-fix-driver-name-checking.patch rename to pkgs/os-specific/linux/systemd/0018-tpm2_context_init-fix-driver-name-checking.patch diff --git a/pkgs/os-specific/linux/systemd/0019-bootctl-also-print-efi-files-not-owned-by-systemd-in.patch b/pkgs/os-specific/linux/systemd/0019-bootctl-also-print-efi-files-not-owned-by-systemd-in.patch new file mode 100644 index 00000000000..84fc6528b98 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0019-bootctl-also-print-efi-files-not-owned-by-systemd-in.patch @@ -0,0 +1,46 @@ +From bc0f378a1149b59e88e9345e579d62fec7f50cdf Mon Sep 17 00:00:00 2001 +From: Arian van Putten +Date: Wed, 31 May 2023 13:27:13 +0200 +Subject: [PATCH] bootctl: also print efi files not owned by systemd in status + +We should not skip over unknown entries in EFI/BOOT/ but +also print them out in status so people are aware that they are there. + +(cherry picked from commit a680d4fb87bad829989949e5ea4fc6db90453456) +--- + src/boot/bootctl-status.c | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/src/boot/bootctl-status.c b/src/boot/bootctl-status.c +index 2e2bf1f7e1..f1ac4a9c8a 100644 +--- a/src/boot/bootctl-status.c ++++ b/src/boot/bootctl-status.c +@@ -225,9 +225,8 @@ static int enumerate_binaries( + return log_error_errno(errno, "Failed to open file '%s' for reading: %m", filename); + + r = get_file_version(fd, &v); +- if (r == -ESRCH) /* Not the file we are looking for. */ +- continue; +- if (r < 0) ++ ++ if (r < 0 && r != -ESRCH) + return r; + + if (*previous) { /* Let's output the previous entry now, since now we know that there will be +@@ -242,10 +241,10 @@ static int enumerate_binaries( + /* Do not output this entry immediately, but store what should be printed in a state + * variable, because we only will know the tree glyph to print (branch or final edge) once we + * read one more entry */ +- if (r > 0) +- r = asprintf(previous, "/%s/%s (%s%s%s)", path, de->d_name, ansi_highlight(), v, ansi_normal()); +- else ++ if (r == -ESRCH) /* No systemd-owned file but still interesting to print */ + r = asprintf(previous, "/%s/%s", path, de->d_name); ++ else /* if (r >= 0) */ ++ r = asprintf(previous, "/%s/%s (%s%s%s)", path, de->d_name, ansi_highlight(), v, ansi_normal()); + if (r < 0) + return log_oom(); + +-- +2.39.2 (Apple Git-143) + diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 7275d275f74..fd5ca2df5a9 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -145,7 +145,7 @@ assert withUkify -> withEfi; let wantCurl = withRemote || withImportd; wantGcrypt = withResolved || withImportd; - version = "253.3"; + version = "253.5"; # Bump this variable on every (major) version change. See below (in the meson options list) for why. # command: @@ -162,7 +162,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "systemd"; repo = "systemd-stable"; rev = "v${version}"; - hash = "sha256-iy1kyqiVeXIhFJAQ+nYorrXm/xb2gfakyrEfMyNR5l8="; + hash = "sha256-B3A9AvpfZ8SYsiZvHnWO4RHs1/6EdczWF2NmrSqxQ7c="; }; # On major changes, or when otherwise required, you *must* reformat the patches, @@ -174,32 +174,22 @@ stdenv.mkDerivation (finalAttrs: { ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch ./0002-Don-t-try-to-unmount-nix-or-nix-store.patch ./0003-Fix-NixOS-containers.patch - ./0004-fsck-look-for-fsck-binary-not-just-in-sbin.patch - ./0005-Add-some-NixOS-specific-unit-directories.patch - ./0006-Get-rid-of-a-useless-message-in-user-sessions.patch - ./0007-hostnamed-localed-timedated-disable-methods-that-cha.patch - ./0008-Fix-hwdb-paths.patch - ./0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch - ./0010-localectl-use-etc-X11-xkb-for-list-x11.patch - ./0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch - ./0012-add-rootprefix-to-lookup-dir-paths.patch - ./0013-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch - ./0014-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch - ./0015-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch - ./0016-pkg-config-derive-prefix-from-prefix.patch - ./0017-inherit-systemd-environment-when-calling-generators.patch - ./0018-core-don-t-taint-on-unmerged-usr.patch - ./0019-tpm2_context_init-fix-driver-name-checking.patch - - (fetchpatch { - # https://github.com/systemd/systemd/pull/25948 - # - # [Firmware file size bug]: Some UEFI firmwares fail on large - # reads. Now that systemd-boot loads initrd itself, systems with - # such firmware won't boot without this fix - url = "https://github.com/systemd/systemd/commit/3ed1d966f00b002ed822ca9de116252bd91fe6c3.patch"; - hash = "sha256-pwXrLTScqgnvfddlzUBZpwsoMrvRLcZPp6e4whMcyL4="; - }) + ./0004-Add-some-NixOS-specific-unit-directories.patch + ./0005-Get-rid-of-a-useless-message-in-user-sessions.patch + ./0006-hostnamed-localed-timedated-disable-methods-that-cha.patch + ./0007-Fix-hwdb-paths.patch + ./0008-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch + ./0009-localectl-use-etc-X11-xkb-for-list-x11.patch + ./0010-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch + ./0011-add-rootprefix-to-lookup-dir-paths.patch + ./0012-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch + ./0013-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch + ./0014-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch + ./0015-pkg-config-derive-prefix-from-prefix.patch + ./0016-inherit-systemd-environment-when-calling-generators.patch + ./0017-core-don-t-taint-on-unmerged-usr.patch + ./0018-tpm2_context_init-fix-driver-name-checking.patch + ./0019-bootctl-also-print-efi-files-not-owned-by-systemd-in.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ( let oe-core = fetchzip { From 0d6a6827ea0ce8dda8481670ce48e4e28fb02c16 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Feb 2023 08:55:28 +0000 Subject: [PATCH 34/83] =?UTF-8?q?fontconfig:=202.14.0=20=E2=86=92=202.14.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.freedesktop.org/fontconfig/fontconfig/-/compare/2.14.0...2.14.2 Signed-off-by: Sefa Eyeoglu --- pkgs/development/libraries/fontconfig/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 6c0b8899a3f..eadb30352e9 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch2 , pkg-config , python3 , freetype @@ -14,15 +15,25 @@ stdenv.mkDerivation rec { pname = "fontconfig"; - version = "2.14.0"; + version = "2.14.2"; outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config src = fetchurl { url = "https://www.freedesktop.org/software/fontconfig/release/${pname}-${version}.tar.xz"; - sha256 = "3L64TJx0u/2xM9U1/hx77cnyIhqNrzkUuYTETFIOm6w="; + hash = "sha256-26aVtXvOFQI9LO7e+CBiwrkl5R9dTMSu9zbPE/YKRos="; }; + patches = [ + # Provide 11-lcdfilter-none.conf for NixOS module + # https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/268 + (fetchpatch2 { + name = "add-optional-11-lcdfilter-none-configuration.patch"; + url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/c2666a6d9a6ed18b1bfcef8176e25f62993e24db.patch"; + hash = "sha256-UBzkxy3uxFO+g0aQtPnBZv7OncgQdinwzNwWS8ngjcE="; + }) + ]; + nativeBuildInputs = [ autoreconfHook gperf From b5d2d701d1e983fe82770905e8fce703ba38caa3 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 20 Mar 2023 18:39:50 +0100 Subject: [PATCH 35/83] nixos/fontconfig: refactor antialias option for fontconfig 2.14.1 `sub-pixel` has been enabled by default since 2.14.1: https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/2b6afa02ab2b7dd3796a48cf47896c4c6de4d6ba `antialias` since 2.14.1: https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/0825a178e82c58ae97e908d49e5ad7abe88ed7f5 `lcdfilter` since 2.13.95: https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/e1c7c6d7442ace9c20c424265880ff57c23881f8 `hintstyle` since 2.12.1: https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/98434b3392172233094cac25ade7225c93da9f1c Signed-off-by: Sefa Eyeoglu --- nixos/modules/config/fonts/fontconfig.nix | 59 ++++++++++++++++------- 1 file changed, 41 insertions(+), 18 deletions(-) diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 5781679241e..a49595c58e1 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -77,18 +77,6 @@ let ${fcBool cfg.hinting.autohint} - - ${cfg.hinting.style} - - - ${fcBool cfg.antialias} - - - ${cfg.subpixel.rgba} - - - lcd${cfg.subpixel.lcdfilter} - @@ -177,6 +165,13 @@ let ''; + # Replace default linked config with a different variant + replaceDefaultConfig = defaultConfig: newConfig: '' + rm $dst/${defaultConfig} + ln -s ${pkg.out}/share/fontconfig/conf.avail/${newConfig} \ + dst/ + ''; + # fontconfig configuration package confPkg = pkgs.runCommand "fontconfig-conf" { preferLocalBuild = true; @@ -196,6 +191,26 @@ let ln -s ${pkg.out}/etc/fonts/conf.d/*.conf \ $dst/ + ${optionalString (!cfg.antialias) + (replaceDefaultConfig "10-yes-antialias.conf" + "10-no-antialias.conf") + } + + ${optionalString (cfg.hinting.style != "slight") + (replaceDefaultConfig "10-hinting-slight.conf" + "10-hinting-${cfg.hinting.style}.conf") + } + + ${optionalString (cfg.subpixel.rgba != "none") + (replaceDefaultConfig "10-sub-pixel-none.conf" + "10-sub-pixel-${cfg.subpixel.rgba}.conf") + } + + ${optionalString (cfg.subpixel.lcdfilter != "default") + (replaceDefaultConfig "11-lcdfilter-default.conf" + "11-lcdfilter-${cfg.subpixel.lcdfilter}.conf") + } + # 00-nixos-cache.conf ln -s ${cacheConf} $dst/00-nixos-cache.conf @@ -367,17 +382,25 @@ in }; style = mkOption { - type = types.enum [ "hintnone" "hintslight" "hintmedium" "hintfull" ]; - default = "hintslight"; + type = types.enum ["none" "slight" "medium" "full"]; + default = "slight"; description = lib.mdDoc '' Hintstyle is the amount of font reshaping done to line up to the grid. - hintslight will make the font more fuzzy to line up to the grid - but will be better in retaining font shape, while hintfull will - be a crisp font that aligns well to the pixel grid but will lose - a greater amount of font shape. + slight will make the font more fuzzy to line up to the grid but + will be better in retaining font shape, while full will be a + crisp font that aligns well to the pixel grid but will lose a + greater amount of font shape. ''; + apply = + val: + let + from = "fonts.fontconfig.hinting.style"; + val' = lib.removePrefix "hint" val; + warning = "The option `${from}` contains a deprecated value `${val}`. Use `${val'}` instead."; + in + lib.warnIf (lib.hasPrefix "hint" val) warning val'; }; }; From bd97ff5ff453f664791fe28bdbdffbcebdded464 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Fri, 24 Mar 2023 11:43:39 +0100 Subject: [PATCH 36/83] nixos/fontconfig: Change default antialiasing style to greyscale instead of subpixel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fontconfig before version 2.13.1 was apparently implicitly not using subpixel antialiasing. The fontconfig NixOS module deviated from this, using subpixel antialiasing with `rgb` layout by default. In fontconfig 2.14.1, subpixel antialiasing was inadvertently enabled as the default: https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/2b6afa02ab2b7dd3796a48cf47896c4c6de4d6ba According to https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/337, that deviates from GNOME/GTK’s defaults, which resulted in apps taking the settings directly from fontconfig (e.g. Firefox) from diverging from GNOME programs. The change was subsequently reverted in 2.14.2, choosing the greyscale antialiasing explicitly: https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/030759b74f5b3ce7fab6d17bbda6377444e82841 Let’s reflect this default setting in the NixOS module. Co-authored-by: Jan Tojnar Signed-off-by: Sefa Eyeoglu --- nixos/doc/manual/release-notes/rl-2311.section.md | 2 ++ nixos/modules/config/fonts/fontconfig.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 83fd6028ec6..9c8457d54be 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -30,6 +30,8 @@ - The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration. +- `fontconfig` now defaults to using greyscale antialiasing instead of subpixel antialiasing because of a [recommendation from one of the downstreams](https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/337). You can change this value by configuring [](#opt-fonts.fontconfig.subpixel.rgba) accordingly. + - A new option was added to the virtualisation module that enables specifying explicitly named network interfaces in QEMU VMs. The existing `virtualisation.vlans` is still supported for cases where the name of the network interface is irrelevant. - `services.nginx` gained a `defaultListen` option at server-level with support for PROXY protocol listeners, also `proxyProtocol` is now exposed in `services.nginx.virtualHosts..listen` option. It is now possible to run PROXY listeners and non-PROXY listeners at a server-level, see [#213510](https://github.com/NixOS/nixpkgs/pull/213510/) for more details. diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index a49595c58e1..95b1529e2a1 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -417,7 +417,7 @@ in subpixel = { rgba = mkOption { - default = "rgb"; + default = "none"; type = types.enum ["rgb" "bgr" "vrgb" "vbgr" "none"]; description = lib.mdDoc '' Subpixel order. The overwhelming majority of displays are From de643091d7596cddaeaa9690ff4d03d3a3304983 Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Sat, 3 Jun 2023 20:59:06 +0200 Subject: [PATCH 37/83] util-linux: backport bcache checksum patches In util-linux 2.39, blkid was improved to verify the checksums for several types of block devices. In the bcache case, this calculation was incorrect, leading to a regression where valid bcache cache devices would not be detected any more. In some cases, this can even break the boot because a required bcache device does not come up any more. In https://github.com/util-linux/util-linux/pull/2293, a fix was introduced upstream. Include these patches to make bcache detection work properly again. --- pkgs/os-specific/linux/util-linux/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 7b98c6bcd9d..7b4ef6ed014 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -38,6 +38,16 @@ stdenv.mkDerivation rec { url = "https://github.com/util-linux/util-linux/commit/1bd85b64632280d6bf0e86b4ff29da8b19321c5f.diff"; hash = "sha256-dgu4de5ul/si7Vzwe8lr9NvsdI1CWfDQKuqvARaY6sE="; }) + + # FIXME: backport bcache detection fixes, remove in next release + (fetchpatch { + url = "https://github.com/util-linux/util-linux/commit/158639a2a4c6e646fd4fa0acb5f4743e65daa415.diff"; + hash = "sha256-9F1OQFxKuI383u6MVy/UM15B6B+tkZFRwuDbgoZrWME="; + }) + (fetchpatch { + url = "https://github.com/util-linux/util-linux/commit/00a19fb8cdfeeae30a6688ac6b490e80371b2257.diff"; + hash = "sha256-w1S6IKSoL6JhVew9t6EemNRc/nrJQ5oMqFekcx0kno8="; + }) ]; outputs = [ "bin" "dev" "out" "lib" "man" ]; From ab8bc692eb96d5e67b0a2088794a34fe562ce7b0 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 4 Jun 2023 03:05:48 +0000 Subject: [PATCH 38/83] =?UTF-8?q?at-spi2-core:=202.48.0=20=E2=86=92=202.48?= =?UTF-8?q?.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/at-spi2-core/-/compare/AT_SPI2_CORE_2_48_0...AT_SPI2_CORE_2_48_3 --- pkgs/development/libraries/at-spi2-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 926dd9b04fb..cf6cf4f93b1 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.48.0"; + version = "2.48.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "kFpbbxeQto7oA7/6n1+rTOtZH7T64LL4xhLFTx1OijA="; + sha256 = "NzFt9DypmJzlOdVM9CmnaMKLs4oLNJUL6t0EIYJ+31U="; }; nativeBuildInputs = [ From eb9d4dbe5c35febbe1e2c1118acfb7c279d58900 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 4 Jun 2023 03:08:32 +0000 Subject: [PATCH 39/83] =?UTF-8?q?gtk3:=203.24.37=20=E2=86=92=203.24.38?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtk/-/compare/3.24.37...3.24.38 --- pkgs/development/libraries/gtk/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 33e4c446410..a527faf5a8b 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk+3"; - version = "3.24.37"; + version = "3.24.38"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; outputBin = "dev"; @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) version; in fetchurl { url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "sha256-Z0XwtMBTeUFR/Q8OJHSwd8zP9fg+ndG/PTn+n+X7f1c="; + sha256 = "sha256-zhHezwGLJb3YUFVEpPhyQoVOyIvgVNmt5fOiBETdjuc="; }; patches = [ From eacc4e2d243385517aca8fe8924a913c0ebf94c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Jun 2023 04:23:40 +0000 Subject: [PATCH 40/83] maturin: 1.0.0 -> 1.0.1 --- pkgs/development/tools/rust/maturin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index ea639874edd..27691c748a9 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-Y/eqkA23gzoCmsFeYqZsK52e6s8ElIdKavL4ay9Q0Zs="; + hash = "sha256-iVN6LpikU+TP4P9ZJUVQR/ZNkRHjYLgdDA0aQeWMZfA="; }; - cargoHash = "sha256-fr7HuMfuErYyPhAdwvj+HluW/K4mSHW/kKcdnWOW1i4="; + cargoHash = "sha256-iX4cbZ0PV0/o42f1QKNlAkwHEif2fu+RvhdzH7tWOZE="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; From 4e2cfde94e3f267c709876bbc05ba6f7455504a2 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 4 Jun 2023 09:44:13 +0100 Subject: [PATCH 41/83] modules: fix fontconfig.nix to use '$dst', not 'dst' Without the change non-default configs like: fonts.fontconfig.subpixel.rgba = "rgb" fail to build the system as: fontconfig-conf> ln: failed to create symbolic link 'dst/': No such file or directory --- nixos/modules/config/fonts/fontconfig.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 95b1529e2a1..2eee5cd34d0 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -169,7 +169,7 @@ let replaceDefaultConfig = defaultConfig: newConfig: '' rm $dst/${defaultConfig} ln -s ${pkg.out}/share/fontconfig/conf.avail/${newConfig} \ - dst/ + $dst/ ''; # fontconfig configuration package From 09799e8b80d7bb647cf28b2ca99875145e71417f Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 4 Jun 2023 09:31:39 -0400 Subject: [PATCH 42/83] apple_sdk: fix infinite recursion The 10.12 SDK uses `xar`, which depends on Python indirectly, which depends on configd by default. This causes an infinite recuresion when building configd because it needs SDK headers to build with clang 16. Fix the infinite recursion by disabling Python support in libxml2 when building the SDK, and use a minimal Python in the SDK build itself. --- pkgs/os-specific/darwin/apple-sdk/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 5cf37e8f402..4bb85609d11 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -1,6 +1,9 @@ -{ stdenv, fetchurl, xar, cpio, pkgs, python3, pbzx, lib, darwin-stubs, print-reexports }: +{ stdenv, fetchurl, libxml2, xar, cpio, pkgs, python3Minimal, pbzx, lib, darwin-stubs, print-reexports }: let + xarMinimal = xar.override { + libxml2 = libxml2.override { pythonSupport = false; }; + }; # sadly needs to be exported because security_tool needs it sdk = stdenv.mkDerivation rec { pname = "MacOS_SDK"; @@ -16,7 +19,7 @@ let sha256 = "13xq34sb7383b37hwy076gnhf96prpk1b4087p87xnwswxbrisih"; }; - nativeBuildInputs = [ xar cpio python3 pbzx ]; + nativeBuildInputs = [ xarMinimal cpio python3Minimal pbzx ]; outputs = [ "out" "dev" "man" ]; From 6ce8a3e5fa02607838a292a79181584fe3ab32c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Jun 2023 17:03:11 +0000 Subject: [PATCH 43/83] s2n-tls: 1.3.44 -> 1.3.45 --- pkgs/development/libraries/s2n-tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index 6ee476ae945..be49af907cb 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.44"; + version = "1.3.45"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8YF9PhxTrXQBTUJvTrJZFDVijQecTeZ1ayGuvQRqGEE="; + sha256 = "sha256-ZipZXCwat3H0NoUX9T6XB7/qMRvViB2QrYpgj0U41nU="; }; nativeBuildInputs = [ cmake ]; From 01b36425890182d3a1898c27d479189a7c496646 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 25 May 2023 22:40:08 +0000 Subject: [PATCH 44/83] linux.configfile: remove unused kernelTarget attr As far as I can tell this is unused since f95d214cfdf. Fixes: f95d214cfdf ("Implement generic kernel build via manual-config") Fixes: https://github.com/NixOS/nixpkgs/issues/234084 --- pkgs/os-specific/linux/kernel/generic.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 04f6cfc70ad..66052134905 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -130,8 +130,6 @@ let # e.g. "defconfig" kernelBaseConfig = if defconfig != null then defconfig else stdenv.hostPlatform.linux-kernel.baseConfig or "defconfig"; - # e.g. "bzImage" - kernelTarget = stdenv.hostPlatform.linux-kernel.target or "vmlinux"; makeFlags = lib.optionals (stdenv.hostPlatform.linux-kernel ? makeFlags) stdenv.hostPlatform.linux-kernel.makeFlags ++ extraMakeFlags; From 36689480f32ff890eb578e8b7be3b7a6ea7f799a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Jun 2023 21:49:28 +0200 Subject: [PATCH 45/83] google-cloud-cpp: schedule on big-parallel machines This time for real I hope, not like around 07310e59a62ae8e5b7e15580e. Otherwise it often takes 1-2 hours on Hydra, which seems unnecessary. --- pkgs/development/libraries/google-cloud-cpp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index 1e5271d4770..34f1ab41ff9 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -122,6 +122,8 @@ stdenv.mkDerivation rec { "-DGOOGLE_CLOUD_CPP_ENABLE=${lib.concatStringsSep ";" apis}" ]; + requiredSystemFeatures = [ "big-parallel" ]; + meta = with lib; { license = with licenses; [ asl20 ]; homepage = "https://github.com/googleapis/google-cloud-cpp"; From d55edbca4a6b3cbc66f19a046234df0900183313 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 29 May 2023 21:49:40 +0100 Subject: [PATCH 46/83] openexr: backport gcc-13 fix Without the change `openexr` build on `gcc-13` fails as: [ 99%] Building CXX object src/test/OpenEXRTest/CMakeFiles/OpenEXRTest.dir/testInputPart.cpp.o openexr/src/bin/exrcheck/main.cpp: In function 'bool exrCheck(const char*, bool, bool, bool, bool)': openexr/src/bin/exrcheck/main.cpp:65:15: error: 'uintptr_t' does not name a type 65 | const uintptr_t kMaxSize = uintptr_t (-1) / 4; | ^~~~~~~~~ --- .../development/libraries/openexr/default.nix | 4 +++ .../libraries/openexr/gcc-13.patch | 33 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/libraries/openexr/gcc-13.patch diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 126fa2796f3..38e0fadd073 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -35,6 +35,10 @@ stdenv.mkDerivation rec { extraPrefix = "OpenEXR/IlmImf/"; sha256 = "sha256-DrpldpNgN5pWKzIuuPIrynGX3EpP8YhJlu+lLfNFGxQ="; }) + + # Backport gcc-13 fix: + # https://github.com/AcademySoftwareFoundation/openexr/pull/1264 + ./gcc-13.patch ]; # tests are determined to use /var/tmp on unix diff --git a/pkgs/development/libraries/openexr/gcc-13.patch b/pkgs/development/libraries/openexr/gcc-13.patch new file mode 100644 index 00000000000..d508b6028f7 --- /dev/null +++ b/pkgs/development/libraries/openexr/gcc-13.patch @@ -0,0 +1,33 @@ +https://github.com/AcademySoftwareFoundation/openexr/pull/1264 +https://github.com/AcademySoftwareFoundation/openexr/commit/d0088a3c6943a9a53fc24e29885414d082d531fe.patch + +--- a/OpenEXR/IlmImf/ImfDwaCompressor.cpp ++++ b/OpenEXR/IlmImf/ImfDwaCompressor.cpp +@@ -159,6 +159,7 @@ + #include + + #include ++#include + + + // Windows specific addition to prevent the indirect import of the redefined min/max macros +--- a/OpenEXR/IlmImf/ImfHuf.cpp ++++ b/OpenEXR/IlmImf/ImfHuf.cpp +@@ -53,6 +53,7 @@ + #include + #include + #include ++#include + + + using namespace std; +--- a/OpenEXR/IlmImf/ImfMisc.cpp ++++ b/OpenEXR/IlmImf/ImfMisc.cpp +@@ -52,6 +52,7 @@ + #include + #include + #include ++#include + #include "ImfNamespace.h" + + OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_ENTER From d6c138dff20ca14eede530b04af499fbf2ea8dbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 5 Jun 2023 14:32:24 +0200 Subject: [PATCH 47/83] libssh2: propagate openssl I think think this started with the update in 268a7bab344. --- pkgs/development/libraries/libssh2/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index ba1455350e6..091885a1f08 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; - buildInputs = [ openssl zlib ] + propagatedBuildInputs = [ openssl ]; # see Libs: in libssh2.pc + buildInputs = [ zlib ] ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64; meta = with lib; { From 89ce4d8cac2502f60d5d82a8189a1feae250538c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 5 Jun 2023 14:33:25 +0200 Subject: [PATCH 48/83] Revert "libvlc: fix build by providing openssl" This reverts commit 46f30a032e1d83c552e1d50356f0ff4ff596e285. --- pkgs/applications/video/vlc/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index c8f3a8b0954..fd263557d48 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -54,7 +54,6 @@ , lua5 , mpeg2dec , ncurses -, openssl , perl , pkg-config , removeReferencesTo @@ -159,7 +158,6 @@ stdenv.mkDerivation rec { libXvMC xcbutilkeysyms ]) - ++ optional onlyLibVLC openssl # not sure why ++ optional (!stdenv.hostPlatform.isAarch && !onlyLibVLC) live555 ++ optional jackSupport libjack2 ++ optionals chromecastSupport [ libmicrodns protobuf ] From d88d36cfbb55e611453afd3940ccffd2428458a0 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 5 Jun 2023 15:47:35 -0400 Subject: [PATCH 49/83] evcxr: fix build with rust 1.70 --- pkgs/development/interpreters/evcxr/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index f4d07df624f..36c2dfe6a56 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -20,11 +20,15 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ libiconv CoreServices Security ]; - # test broken with rust 1.69: - # * https://github.com/evcxr/evcxr/issues/294 - # * https://github.com/NixOS/nixpkgs/issues/229524 checkFlags = [ + # test broken with rust 1.69: + # * https://github.com/evcxr/evcxr/issues/294 + # * https://github.com/NixOS/nixpkgs/issues/229524 "--skip=check_for_errors" + + # test broken with rust 1.70 + # * https://github.com/evcxr/evcxr/issues/295 + "--skip=partially_inferred_variable_type" ]; postInstall = let From fc5804e55d0172bffc2255b0cdfa734b7abfadc0 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 3 Jun 2023 10:16:44 +1000 Subject: [PATCH 50/83] git: 2.40.1 -> 2.41.0 Changelog: https://github.com/git/git/blob/v2.41.0/Documentation/RelNotes/2.41.0.txt --- 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 d23df0c8062..41d8e8a8691 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -29,7 +29,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.40.1"; + version = "2.41.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - hash = "sha256-SJO4uY7vyf3EsOfKJJ40AAT6p4BKQz0XQp4xHh/vIdI="; + hash = "sha256-50i6/UJM/oCyEsvG8bvMw6R9SGL7HreYiHd1BHhWgEA="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; From e27de0051702e7c134b2e5746e116b44302dc15e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 6 Jun 2023 09:02:50 +0100 Subject: [PATCH 51/83] gnugrep: enable parallel build and tests On a 16-core system number changes are: - before: 1m34s - after: 39s 2.5x speedup. If ./configure phase was faster the change would be even more substantial. --- pkgs/tools/text/gnugrep/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 75c6f695073..e0f4e5f8d4a 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -36,6 +36,8 @@ stdenv.mkDerivation { export MKDIR_P="mkdir -p" ''; + enableParallelBuilding = true; + # Fix reference to sh in bootstrap-tools, and invoke grep via # absolute path rather than looking at argv[0]. postInstall = From d7ccc25142f62b4c25a75ae016a1ff552cc446d4 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 26 May 2023 12:55:01 +0200 Subject: [PATCH 52/83] elfutils: split debuginfod into its own output --- pkgs/development/tools/misc/elfutils/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 83a30f3e6f1..faf7496b25f 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs tests/*.sh + '' + lib.optionalString enableDebuginfod '' + sed -i '1i DESTDIR=$(debuginfod)' debuginfod/Makefile.in '' + lib.optionalString stdenv.hostPlatform.isRiscV '' # disable failing test: # @@ -48,7 +50,10 @@ stdenv.mkDerivation rec { sed -i s/run-backtrace-dwarf.sh//g tests/Makefile.in ''; - outputs = [ "bin" "dev" "out" "man" ]; + # debuginfod goes in its own output, as it increases closure size + # significantly by depending on gcc. Many uses, such as libbpf + # (depended on by systemd), don't need debuginfod. + outputs = [ "bin" "dev" "out" "man" ] ++ lib.optional enableDebuginfod "debuginfod"; # We need bzip2 in NativeInputs because otherwise we can't unpack the src, # as the host-bzip2 will be in the path. From 4fcb96e0f6032d317331f949fb2bf9e470b16a5a Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 6 Jun 2023 14:24:52 +0200 Subject: [PATCH 53/83] cacert: 3.89.1 -> 3.90 https://github.com/nss-dev/nss/blob/NSS_3_90_BRANCH/doc/rst/releases/nss_3_90.rst --- 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 baa714576b6..6fd4a6641ce 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -30,7 +30,7 @@ let ])); extraCertificatesBundle = writeText "cacert-extra-certificates-bundle.crt" (lib.concatStringsSep "\n\n" extraCertificateStrings); - srcVersion = "3.89.1"; + srcVersion = "3.90"; version = if nssOverride != null then nssOverride.version else srcVersion; meta = with lib; { homepage = "https://curl.haxx.se/docs/caextract.html"; @@ -45,7 +45,7 @@ let src = if nssOverride != null then nssOverride.src else fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings ["."] ["_"] version}_RTM/src/nss-${version}.tar.gz"; - hash = "sha256-OtrtuecMPF9AYDv2CgHjNhkKbb4Bkp05XxawH+hKAVY="; + hash = "sha256-ms1lNMQdjq0Z/Kb8s//+0vnwnEN8PXn+5qTuZoqqk7Y="; }; dontBuild = true; From 1073ea7fa621b06f0131e72ec59d9c5a71fad8f2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 31 May 2023 20:32:25 +0200 Subject: [PATCH 54/83] libxcrypt: 4.4.33 -> 4.4.35 https://github.com/besser82/libxcrypt/blob/v4.4.35/NEWS --- pkgs/development/libraries/libxcrypt/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix index 97ca6870496..60e8168f7fd 100644 --- a/pkgs/development/libraries/libxcrypt/default.nix +++ b/pkgs/development/libraries/libxcrypt/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxcrypt"; - version = "4.4.33"; + version = "4.4.35"; src = fetchurl { url = "https://github.com/besser82/libxcrypt/releases/download/v${finalAttrs.version}/libxcrypt-${finalAttrs.version}.tar.xz"; - hash = "sha256-6HrPnGUsVzpHE9VYIVn5jzBdVu1fdUzmT1fUGU1rOm8="; + hash = "sha256-qMk1UFtV8d8NF/i/1ZRox8Zwmh0xgxsPjj4EWrj9RV0="; }; outputs = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { ''; }; enabledCryptSchemeIds = [ - # https://github.com/besser82/libxcrypt/blob/v4.4.33/lib/hashes.conf + # https://github.com/besser82/libxcrypt/blob/v4.4.35/lib/hashes.conf "y" # yescrypt "gy" # gost_yescrypt "7" # scrypt @@ -58,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { + changelog = "https://github.com/besser82/libxcrypt/blob/v${finalAttrs.version}/NEWS"; description = "Extended crypt library for descrypt, md5crypt, bcrypt, and others"; homepage = "https://github.com/besser82/libxcrypt/"; platforms = platforms.all; From fd76e6c2ab5f9b0d2468215fe16187247b092bc5 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 6 Jun 2023 20:10:06 +0100 Subject: [PATCH 55/83] gnugrep: disable gnulib tests on x86_64-darwin as well --- pkgs/tools/text/gnugrep/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index e0f4e5f8d4a..0b8e5f803b3 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -16,8 +16,10 @@ stdenv.mkDerivation { hash = "sha256-HbKu3eidDepCsW2VKPiUyNFdrk4ZC1muzHj1qVEnbqs="; }; - # Some gnulib tests fail on Musl: https://github.com/NixOS/nixpkgs/pull/228714 - postPatch = if stdenv.hostPlatform.isMusl then '' + # Some gnulib tests fail + # - on Musl: https://github.com/NixOS/nixpkgs/pull/228714 + # - on x86_64-darwin: https://github.com/NixOS/nixpkgs/pull/228714#issuecomment-1576826330 + postPatch = if stdenv.hostPlatform.isMusl || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) then '' sed -i 's:gnulib-tests::g' Makefile.in '' else null; From deb3d80ae0ccafe4f19d3edf32e2eb7fda283978 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 7 Jun 2023 07:04:36 +1000 Subject: [PATCH 56/83] go_1_20: 1.20.4 -> 1.20.5 Changelog: https://go.dev/doc/devel/release#go1.20 --- pkgs/development/compilers/go/1.20.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.20.nix b/pkgs/development/compilers/go/1.20.nix index ad5a5e5944a..7eb40c23691 100644 --- a/pkgs/development/compilers/go/1.20.nix +++ b/pkgs/development/compilers/go/1.20.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation rec { pname = "go"; - version = "1.20.4"; + version = "1.20.5"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - hash = "sha256-nzSs4Sh2S3o6SyOLgFhWzBshhDBN+eVpCCWwcQ9CAtY="; + hash = "sha256-mhXBM7os+v55ZS9IFbYufPwmf2jfG5RUxqsqPKi5aog="; }; strictDeps = true; From 131808261a30a2dd9742098a2a5d864dbc70cfc5 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 7 Jun 2023 11:06:05 +0200 Subject: [PATCH 57/83] rustc: use llvm_16 https://github.com/rust-lang/rust/releases/tag/1.70.0 (Internal Changes) https://github.com/rust-lang/rust/pull/109474/ --- pkgs/development/compilers/rust/1_70.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/rust/1_70.nix b/pkgs/development/compilers/rust/1_70.nix index 9025adacfe7..8c91ed01009 100644 --- a/pkgs/development/compilers/rust/1_70.nix +++ b/pkgs/development/compilers/rust/1_70.nix @@ -16,24 +16,24 @@ , pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost , makeRustPlatform , llvmPackages_11 -, llvmPackages_15, llvm_15 +, llvmPackages_16, llvm_16 } @ args: import ./default.nix { rustcVersion = "1.70.0"; rustcSha256 = "sha256-sr+uAAt6UEDk7Eu8UKCfIVSBkMt1cLDtdzWDaEE70nw="; - llvmSharedForBuild = pkgsBuildBuild.llvmPackages_15.libllvm.override { enableSharedLibraries = true; }; - llvmSharedForHost = pkgsBuildHost.llvmPackages_15.libllvm.override { enableSharedLibraries = true; }; - llvmSharedForTarget = pkgsBuildTarget.llvmPackages_15.libllvm.override { enableSharedLibraries = true; }; + llvmSharedForBuild = pkgsBuildBuild.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; + llvmSharedForHost = pkgsBuildHost.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; + llvmSharedForTarget = pkgsBuildTarget.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; llvmBootstrapForDarwin = llvmPackages_11; # For use at runtime - llvmShared = llvm_15.override { enableSharedLibraries = true; }; + llvmShared = llvm_16.override { enableSharedLibraries = true; }; # Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox - llvmPackages = llvmPackages_15; + llvmPackages = llvmPackages_16; # Note: the version MUST be one version prior to the version we're # building @@ -60,4 +60,4 @@ import ./default.nix { rustcPatches = [ ]; } -(builtins.removeAttrs args [ "pkgsBuildHost" "llvmPackages_11" "llvmPackages_15" "llvm_15"]) +(builtins.removeAttrs args [ "pkgsBuildHost" "llvmPackages_11" "llvmPackages_16" "llvm_16"]) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c3fcab3394..8a13c4b91cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16369,7 +16369,7 @@ with pkgs; rust_1_70 = callPackage ../development/compilers/rust/1_70.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; - llvm_15 = llvmPackages_15.libllvm; + llvm_16 = llvmPackages_16.libllvm; }; rust = rust_1_70; From c720089d58d6a090d7daf32709f4070c604e9ca2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Jun 2023 09:31:32 +0000 Subject: [PATCH 58/83] ocl-icd: 2.3.1 -> 2.3.2 --- pkgs/development/libraries/ocl-icd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index ea8e1841b0c..dfacf433b77 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "ocl-icd"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "OCL-dev"; repo = "ocl-icd"; rev = "v${version}"; - sha256 = "1km2rqc9pw6xxkqp77a22pxfsb5kgw95w9zd15l5jgvyjb6rqqad"; + sha256 = "sha256-nx9Zz5DpS29g1HRIwPAQi6i+d7Blxd53WQ7Sb1a3FHg="; }; nativeBuildInputs = [ From f80d434d9478f201506fd61081ecd7154734b98f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Jun 2023 13:09:45 +0200 Subject: [PATCH 59/83] python310: 3.10.11 -> 3.10.12 https://docs.python.org/release/3.10.12/whatsnew/changelog.html Fixes: CVE-2023-24329 --- 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 6eae07ac3a7..db5b3e689cd 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -20,10 +20,10 @@ sourceVersion = { major = "3"; minor = "10"; - patch = "11"; + patch = "12"; suffix = ""; }; - hash = "sha256-PDvDBIMDchyQSgPrgya2Mekh8RzDvimIRWpC8RXa8Ew="; + hash = "sha256-r7dL8ZEw56R9EDEsj154TyTgUnmB6raOIFRs+4ZYMLg="; }; python311 = { From 342ba7d647dfffe82961da54830feef2a4c52441 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Jun 2023 14:40:30 +0200 Subject: [PATCH 60/83] python311: 3.11.3 -> 3.11.4 https://docs.python.org/release/3.11.4/whatsnew/changelog.html Fixes: CVE-2023-24329 --- 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 db5b3e689cd..4efdcedb9a4 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -30,10 +30,10 @@ sourceVersion = { major = "3"; minor = "11"; - patch = "3"; + patch = "4"; suffix = ""; }; - hash = "sha256-il25nJYafs8nx1lWGJyWAslodR8R2+riuQDb/xwIW14="; + hash = "sha256-Lw5AnfKrV6qfxMvd+5dq9E5OVb9vYZ7ua8XCKXJkp/Y="; }; }; From b66a6ce01b1aef4bfe947ac0bfc0128050289eac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 11 May 2023 01:00:01 +0200 Subject: [PATCH 61/83] nixos/no-x-libs: gst_all_1.gst-plugins-base: disable wayland to disable GL GL was already participially disabled because X11 is disabled and lead to the following error when building gst-plguins-good: ``` Did not find CMake 'cmake' Found CMake: NO Run-time dependency gstreamer-gl-prototypes-1.0 found: NO (tried pkgconfig and cmake) Looking for a fallback subproject for the dependency gstreamer-gl-prototypes-1.0 meson.build:328:2: ERROR: Neither a subproject directory nor a gst-plugins-base.wrap file was found. ``` --- nixos/modules/config/no-x-libs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 0dce3b91845..d1d3aab413f 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -39,7 +39,7 @@ with lib; graphviz = super.graphviz-nox; gst_all_1 = super.gst_all_1 // { gst-plugins-bad = super.gst_all_1.gst-plugins-bad.override { guiSupport = false; }; - gst-plugins-base = super.gst_all_1.gst-plugins-base.override { enableX11 = false; }; + gst-plugins-base = super.gst_all_1.gst-plugins-base.override { enableWayland = false; enableX11 = false; }; }; imagemagick = super.imagemagick.override { libX11Support = false; libXtSupport = false; }; imagemagickBig = super.imagemagickBig.override { libX11Support = false; libXtSupport = false; }; From 2e261a4c35a23861511bff59ccead92127437546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 11 May 2023 01:03:32 +0200 Subject: [PATCH 62/83] gst_all_1.gst-plugins-good: add option to build without X11 --- .../libraries/gstreamer/good/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index ef6143b36ec..f125d3ae30f 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -34,13 +34,10 @@ , qt6Support ? false, qt6 , raspiCameraSupport ? false, libraspberrypi , enableJack ? true, libjack2 -, libXdamage -, libXext -, libXfixes +, enableX11 ? stdenv.isLinux, xorg , ncurses , wayland , wayland-protocols -, xorg , libgudev , wavpack , glib @@ -105,15 +102,14 @@ stdenv.mkDerivation rec { mpg123 twolame libintl - libXdamage - libXext - libXfixes ncurses - xorg.libXfixes - xorg.libXdamage wavpack ] ++ lib.optionals raspiCameraSupport [ libraspberrypi + ] ++ lib.optionals enableX11 [ + xorg.libXext + xorg.libXfixes + xorg.libXdamage ] ++ lib.optionals gtkSupport [ # for gtksink gtk3 @@ -149,6 +145,8 @@ stdenv.mkDerivation rec { "-Dqt6=disabled" ] ++ lib.optionals (!gtkSupport) [ "-Dgtk3=disabled" + ] ++ lib.optionals (!enableX11) [ + "-Dximagesrc=disabled" # Linux-only ] ++ lib.optionals (!enableJack) [ "-Djack=disabled" ] ++ lib.optionals (!stdenv.isLinux) [ @@ -158,7 +156,6 @@ stdenv.mkDerivation rec { "-Dpulse=disabled" # TODO check if we can keep this enabled "-Dv4l2-gudev=disabled" # Linux-only "-Dv4l2=disabled" # Linux-only - "-Dximagesrc=disabled" # Linux-only ] ++ lib.optionals (!raspiCameraSupport) [ "-Drpicamsrc=disabled" ]; From 5896d330e9262f674a787ad157d1afdecab22341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 11 May 2023 01:05:20 +0200 Subject: [PATCH 63/83] nixos/no-x-libs: disable x11 of gst_all_1.gst_plugins_good --- nixos/modules/config/no-x-libs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index d1d3aab413f..676d2abda08 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -40,6 +40,7 @@ with lib; gst_all_1 = super.gst_all_1 // { gst-plugins-bad = super.gst_all_1.gst-plugins-bad.override { guiSupport = false; }; gst-plugins-base = super.gst_all_1.gst-plugins-base.override { enableWayland = false; enableX11 = false; }; + gst-plugins-good = super.gst_all_1.gst-plugins-good.override { enableX11 = false; }; }; imagemagick = super.imagemagick.override { libX11Support = false; libXtSupport = false; }; imagemagickBig = super.imagemagickBig.override { libX11Support = false; libXtSupport = false; }; From bf442ea3fe08a5e00740942550ea54ebfdf04759 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 7 Jun 2023 23:26:07 +0100 Subject: [PATCH 64/83] gnugrep: disable tests x86_64-darwin When running on Rosetta 2 emulator (x86_64-darwin biaries executed on aarch64-darwin) `stack-overflow` test fails as: rosetta error: unexpectedly need to EmulateForward on a synchronous exception x86_rip=0x4303486096 arm_pc=0x4303949136 num_insts=6 inst_index=4 x86 instruction bytes: 0x6215344901283465301 0x17041981987679720769 --- pkgs/tools/text/gnugrep/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 0b8e5f803b3..1e339ee3e62 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation { # cygwin: FAIL: multibyte-white-space # freebsd: FAIL mb-non-UTF8-performance - doCheck = !stdenv.isCygwin && !stdenv.isFreeBSD; + # x86_64-darwin: fails 'stack-overflow' tests on Rosetta 2 emulator + doCheck = !stdenv.isCygwin && !stdenv.isFreeBSD && !(stdenv.isDarwin && stdenv.hostPlatform.isx86_64); # On macOS, force use of mkdir -p, since Grep's fallback # (./install-sh) is broken. From 4a8541875e3bcdd8b1914eb76a858d805c0b4994 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 9 Jun 2023 09:02:11 +0000 Subject: [PATCH 65/83] =?UTF-8?q?glib:=202.76.2=20=E2=86=92=202.76.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glib/-/compare/2.76.2...2.76.3 --- pkgs/development/libraries/glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 2f50ed4b259..c3955bc10e3 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -56,11 +56,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.76.2"; + version = "2.76.3"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - sha256 = "JPOEeFex2GdM2wOJo27ewPE8ZmzTznJ+zTQOudqKyp4="; + sha256 = "wL5ETkA9fDGE0fOU+J8LZEcQtekzG1T6TotQN4E60yo="; }; patches = lib.optionals stdenv.isDarwin [ From 6be63ce59010be21642db26b11c28a903ea1bc29 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Thu, 25 May 2023 15:45:34 +0200 Subject: [PATCH 66/83] kbd: split vlock into its own output This avoids a dependency on pam when only the actual keyboard data is used. --- nixos/doc/manual/release-notes/rl-2311.section.md | 2 ++ pkgs/os-specific/linux/kbd/default.nix | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 9746363b1f6..8c46a66bc98 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -32,6 +32,8 @@ - `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities. +- The `vlock` program from the `kbd` package has been moved into its own package output and should now be referenced explicitly as `kbd.vlock` or replaced with an alternative such as the standalone `vlock` package or `physlock`. + - `fileSystems..autoFormat` now uses `systemd-makefs`, which does not accept formatting options. Therefore, `fileSystems..formatOptions` has been removed. - `fileSystems..autoResize` now uses `systemd-growfs` to resize the file system online in stage 2. This means that `f2fs` and `ext2` can no longer be auto resized, while `xfs` and `btrfs` now can be. diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index f4290352c93..fc7da8fe9ba 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -23,7 +23,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-zN9FI4emOAlz0pJzY+nLuTn6IGiRWm+Tf/nSRSICRoM="; }; - outputs = [ "out" "dev" ]; + # vlock is moved into its own output, since it depends on pam. This + # reduces closure size for most use cases. + outputs = [ "out" "vlock" "dev" ]; configureFlags = [ "--enable-optional-progs" @@ -55,6 +57,12 @@ stdenv.mkDerivation rec { --replace 'bzip2 ' '${bzip2.bin}/bin/bzip2 ' \ --replace 'xz ' '${xz.bin}/bin/xz ' \ --replace 'zstd ' '${zstd.bin}/bin/zstd ' + + sed -i ' + 1i prefix:=$(vlock) + 1i bindir := $(vlock)/bin' \ + src/vlock/Makefile.in \ + src/vlock/Makefile.am ''; postInstall = '' From cd4ab1d9fd9f921451625bc131f8e2d07922ed64 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Wed, 31 May 2023 22:30:43 -0400 Subject: [PATCH 67/83] darwin.system_cmds: fix build with clang 16 Clang 16 makes implicit declarations an error by default. The headers are available, so include them. `getline` was renamed to `get_line` to avoid a name clash. `util.h` includes `stdio.h`, which defines `getline`. --- .../system_cmds/default.nix | 7 ++- .../fix-implicit-declarations.patch | 48 +++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/system_cmds/fix-implicit-declarations.patch diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix index 0c40bc3b186..f708d774090 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix @@ -30,7 +30,12 @@ appleDerivation { "-DAU_SESSION_FLAG_HAS_AUTHENTICATED=0x4000" ] ++ lib.optional (!stdenv.isLinux) " -D__FreeBSD__ "); - patchPhase = '' + patches = [ + # Fix implicit declarations that cause builds to fail when built with clang 16. + ./fix-implicit-declarations.patch + ]; + + postPatch = '' substituteInPlace login.tproj/login.c \ --replace bsm/audit_session.h bsm/audit.h substituteInPlace login.tproj/login_audit.c \ diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/fix-implicit-declarations.patch b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/fix-implicit-declarations.patch new file mode 100644 index 00000000000..b08f5404572 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/fix-implicit-declarations.patch @@ -0,0 +1,48 @@ +diff -ur a/getty.tproj/main.c b/getty.tproj/main.c +--- a/getty.tproj/main.c 2008-06-10 14:50:19.000000000 -0400 ++++ b/getty.tproj/main.c 2023-05-31 18:06:40.121028558 -0400 +@@ -67,6 +67,7 @@ + #include + #include + #include ++#include + #include + + #ifdef __APPLE__ +@@ -152,7 +153,7 @@ + static void putpad(const char *); + static void puts(const char *); + static void timeoverrun(int); +-static char *getline(int); ++static char *get_line(int); + static void setttymode(int); + static int opentty(const char *, int); + +@@ -352,7 +353,7 @@ + if ((fd = open(IF, O_RDONLY)) != -1) { + char * cp; + +- while ((cp = getline(fd)) != NULL) { ++ while ((cp = get_line(fd)) != NULL) { + putf(cp); + } + close(fd); +@@ -744,7 +745,7 @@ + + + static char * +-getline(int fd) ++get_line(int fd) + { + int i = 0; + static char linebuf[512]; +--- a/newgrp.tproj/newgrp.c 2021-10-06 01:38:52.000000000 -0400 ++++ b/newgrp.tproj/newgrp.c 2023-05-31 22:26:50.656157841 -0400 +@@ -47,6 +47,7 @@ + #include + #include + #ifdef __APPLE__ ++#include + #include + #endif /* __APPLE__ */ + static void addgroup(const char *grpname); From a7ce6c151a2017971bc79680da068073a06cb469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 11 Jun 2023 10:25:57 +0200 Subject: [PATCH 68/83] dbus: fill meta.changelog (so that r-ryantm update-bot shows it) --- pkgs/development/libraries/dbus/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 52928e1005f..f9b240869cc 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -115,6 +115,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple interprocess messaging system"; homepage = "http://www.freedesktop.org/wiki/Software/dbus/"; + changelog = "https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-${version}/NEWS"; license = licenses.gpl2Plus; # most is also under AFL-2.1 maintainers = teams.freedesktop.members ++ (with maintainers; [ ]); platforms = platforms.unix; From 2931f3b2f7d727e1e9657a63a3293b445b9aeba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 11 Jun 2023 10:27:01 +0200 Subject: [PATCH 69/83] mesa: 23.1.1 -> 23.1.2 https://docs.mesa3d.org/relnotes/23.1.2.html#bug-fixes --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 38afcd174db..0a0d5b47b9a 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -85,8 +85,8 @@ */ let - version = "23.1.1"; - hash = "sha256-omeQMe1bc7KcTwQqxk2W+DsM/khYYX3jLi78GWxlOkA="; + version = "23.1.2"; + hash = "sha256-YLHzrbFWGDDBWL88aFCJQ2dPudafOEw8colpQ4WrXH4="; # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule From 2da8e0eafce6a41f46bc9e1dcfb8dd27ba8e2438 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 11 Jun 2023 08:00:00 -0500 Subject: [PATCH 70/83] libopus: fix build on aarch64-linux --- pkgs/development/libraries/libopus/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 098b0b6ea84..75d8cdc6ff2 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchpatch , fetchurl , meson , python3 @@ -17,6 +18,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-ybMrQlO+WuY9H/Fu6ga5S18PKVG3oCrO71jjo85JxR8="; }; + patches = [ + # Fix meson build for arm64. Remove with next release + # https://gitlab.xiph.org/xiph/opus/-/merge_requests/59 + (fetchpatch { + url = "https://gitlab.xiph.org/xiph/opus/-/commit/20c032d27c59d65b19b8ffbb2608e5282fe817eb.patch"; + hash = "sha256-2pX+0ay5PTyHL2plameBX2L1Q4aTx7V7RGiTdhNIuE4="; + }) + ]; + postPatch = '' patchShebangs meson/ ''; From e2645f1aaf96f062d3450632292479fad1b7a0c3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 11 Jun 2023 06:24:48 -0500 Subject: [PATCH 71/83] libopus: fix build --- pkgs/development/libraries/libopus/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 7694412efe0..8b7d1261f55 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-ybMrQlO+WuY9H/Fu6ga5S18PKVG3oCrO71jjo85JxR8="; }; + postPatch = '' + patchShebangs meson/ + ''; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ @@ -32,10 +36,6 @@ stdenv.mkDerivation rec { (lib.mesonEnable "docs" false) ]; - preBuild = '' - patchShebangs meson/get-version.py - ''; - doCheck = !stdenv.isi686 && !stdenv.isAarch32; # test_unit_LPC_inv_pred_gain fails meta = with lib; { From b0e7251fa53aac7d8e63faa170221da0adc68fbc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 11 Jun 2023 07:24:04 -0500 Subject: [PATCH 72/83] fixup! libopus: fix build --- pkgs/development/libraries/libopus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 8b7d1261f55..098b0b6ea84 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { mesonFlags = [ (lib.mesonBool "fixed-point" fixedPoint) (lib.mesonBool "custom-modes" withCustomModes) - (lib.mesonEnable "asm" stdenv.hostPlatform.isAarch) + (lib.mesonEnable "asm" false) (lib.mesonEnable "docs" false) ]; From 6f57740f0beaabfbc0b125c9404653e55433d56d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Jun 2023 22:35:34 +0000 Subject: [PATCH 73/83] dbus: 1.14.6 -> 1.14.8 --- pkgs/development/libraries/dbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index f9b240869cc..d8c3309acb9 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "dbus"; - version = "1.14.6"; + version = "1.14.8"; src = fetchurl { url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.xz"; - sha256 = "sha256-/SvfG7idw2WkZTG/9jFTbyKw0cbVzixcXlm1UmWz1ms="; + sha256 = "sha256-pr1brFzxnww8WUva4lZaCVaWmApoOg7zfLYhLgk73jU="; }; patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; From 56f1e61a9a8f0fe880f5ca8854cef833959b3b58 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 11 Jun 2023 14:40:59 -0500 Subject: [PATCH 74/83] libopus: fix pkg-config path --- pkgs/development/libraries/libopus/default.nix | 1 + .../libraries/libopus/fix-pkg-config-paths.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/libopus/fix-pkg-config-paths.patch diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 75d8cdc6ff2..b5e5c9e3bd2 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { }; patches = [ + ./fix-pkg-config-paths.patch # Fix meson build for arm64. Remove with next release # https://gitlab.xiph.org/xiph/opus/-/merge_requests/59 (fetchpatch { diff --git a/pkgs/development/libraries/libopus/fix-pkg-config-paths.patch b/pkgs/development/libraries/libopus/fix-pkg-config-paths.patch new file mode 100644 index 00000000000..d54b7f5558c --- /dev/null +++ b/pkgs/development/libraries/libopus/fix-pkg-config-paths.patch @@ -0,0 +1,13 @@ +--- i/meson.build ++++ w/meson.build +@@ -591,8 +591,8 @@ pkgconf = configuration_data() + + pkgconf.set('prefix', join_paths(get_option('prefix'))) + pkgconf.set('exec_prefix', '${prefix}') +-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) +-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) ++pkgconf.set('libdir', '${prefix}' / get_option('libdir')) ++pkgconf.set('includedir', '${prefix}' / get_option('includedir')) + pkgconf.set('VERSION', opus_version) + pkgconf.set('PC_BUILD', pc_build) + pkgconf.set('LIBM', libm.found() ? '-lm' : '') From 46c81a5e6b42f3c217eda8f17b460ffbb99ff83a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 11 Jun 2023 14:42:09 -0500 Subject: [PATCH 75/83] libopus: add ffmpeg as reverse dependencies to passthru.tests --- pkgs/development/libraries/libopus/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index b5e5c9e3bd2..6c6e55a528e 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -7,6 +7,9 @@ , ninja , fixedPoint ? false , withCustomModes ? true + +# tests +, ffmpeg-headless }: stdenv.mkDerivation rec { @@ -49,6 +52,10 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isi686 && !stdenv.isAarch32; # test_unit_LPC_inv_pred_gain fails + passthru.tests = { + inherit ffmpeg-headless; + }; + meta = with lib; { description = "Open, royalty-free, highly versatile audio codec"; homepage = "https://opus-codec.org/"; From e84333228987532f86b02e0a7b9cc873c6c34b7d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 12 Jun 2023 08:34:11 +0200 Subject: [PATCH 76/83] python311Packages.sentry-sdk: 1.25.0 -> 1.25.1 Diff: https://github.com/getsentry/sentry-python/compare/refs/tags/1.25.0...1.25.1 Changelog: https://github.com/getsentry/sentry-python/blob/1.25.1/CHANGELOG.md --- pkgs/development/python-modules/sentry-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 0010723fcf4..33886f82f4f 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.25.0"; + version = "1.25.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-aY6oZf6S6jioeL10euxo1ijvzE7FcHQoWjadE21ILA4="; + hash = "sha256-I7lsyMJ6akQvpzXEcUrWfomTX+oFYCX7YiE4cf6KAuE="; }; propagatedBuildInputs = [ From 6b45fcc3a72cb4a3954cce35485374ac9cccaf27 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 13 Jun 2023 18:05:07 +0100 Subject: [PATCH 77/83] elfutils: revert "split debuginfod into its own output" This reverts commit d7ccc25142f62b4c25a75ae016a1ff552cc446d4. THe change broke builds of `gdb` and `linuxPackages_latest.systemtap`. --- pkgs/development/tools/misc/elfutils/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index faf7496b25f..83a30f3e6f1 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -41,8 +41,6 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs tests/*.sh - '' + lib.optionalString enableDebuginfod '' - sed -i '1i DESTDIR=$(debuginfod)' debuginfod/Makefile.in '' + lib.optionalString stdenv.hostPlatform.isRiscV '' # disable failing test: # @@ -50,10 +48,7 @@ stdenv.mkDerivation rec { sed -i s/run-backtrace-dwarf.sh//g tests/Makefile.in ''; - # debuginfod goes in its own output, as it increases closure size - # significantly by depending on gcc. Many uses, such as libbpf - # (depended on by systemd), don't need debuginfod. - outputs = [ "bin" "dev" "out" "man" ] ++ lib.optional enableDebuginfod "debuginfod"; + outputs = [ "bin" "dev" "out" "man" ]; # We need bzip2 in NativeInputs because otherwise we can't unpack the src, # as the host-bzip2 will be in the path. From f1962a4cf1a50d2e67d0dff5f8e4e0cddd101aa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 15 Jun 2023 05:40:07 -0700 Subject: [PATCH 78/83] python311Packages.yarl: fix tests --- pkgs/development/python-modules/yarl/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 1a1295d29be..b17b845f334 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , pythonAtLeast , pythonOlder , idna @@ -22,6 +23,14 @@ buildPythonPackage rec { hash = "sha256-SdQ0AsbjATrQl4YCv2v1MoU1xI0ZIwS5G5ejxnkLFWI="; }; + patches = [ + # https://github.com/aio-libs/yarl/issues/876 + (fetchpatch { + url = "https://github.com/aio-libs/yarl/commit/0a94c6e4948e00fff072c0cf367afbf4ac36f906.patch"; + hash = "sha256-bqT46OLZLkBef8FQ1L95ITD70mC3+WIkr3+h2ekKrvE="; + }) + ]; + postPatch = '' sed -i '/^addopts/d' setup.cfg ''; From d4f6cac30b26a69fb243318af83741682dedefd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 15 Jun 2023 22:41:59 +0200 Subject: [PATCH 79/83] python311Packages.pyflakes: patch test --- pkgs/development/python-modules/pyflakes/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index 56e6e886452..d83c0278372 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch, isPy311 , pytestCheckHook }: @@ -18,6 +19,14 @@ buildPythonPackage rec { hash = "sha256-7IsnamtgvYDe/tJa3X5DmIHBnmSFCv2bNGKD1BZf0P0="; }; + patches = lib.optional isPy311 # could be made unconditional on rebuild + (fetchpatch { + name = "tests-py311.patch"; + url = "https://github.com/PyCQA/pyflakes/commit/836631f2f73d45baa4021453d89fc9fd6f52be58.diff"; + hash = "sha256-xlgql+bN0HsGnTMkwax3ZG/5wrbkUl/kQkjlr3lsgRw="; + }) + ; + nativeCheckInputs = [ pytestCheckHook ]; From d8019d3d27dc901ba98921cbeaf2dc09e71c1349 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Jun 2023 23:30:21 +0200 Subject: [PATCH 80/83] python311Packages.pycodestyle: Fix tests on python 3.11.4 Applies a modified version of upstreams patch to fix the tests, only upstream only recognized the issue from 3.12, while it hit us on 3.11.4. --- .../python-modules/pycodestyle/default.nix | 7 +++++++ .../pycodestyle/python-3.11.4-compat.patch | 16 ++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/pycodestyle/python-3.11.4-compat.patch diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index ed4ac3f5fbf..cdbec277008 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -18,6 +18,13 @@ buildPythonPackage rec { hash = "sha256-NHGHvbR2Mp2Y9pXCE9cpWoRtEVL/T+m6y4qVkLjucFM="; }; + patches = [ + # https://github.com/PyCQA/pycodestyle/issues/1151 + # Applies a modified version of an upstream patch that only applied + # to Python 3.12. + ./python-3.11.4-compat.patch + ]; + # https://github.com/PyCQA/pycodestyle/blob/2.10.0/tox.ini#L13 checkPhase = '' ${python.interpreter} -m pycodestyle --statistics pycodestyle.py diff --git a/pkgs/development/python-modules/pycodestyle/python-3.11.4-compat.patch b/pkgs/development/python-modules/pycodestyle/python-3.11.4-compat.patch new file mode 100644 index 00000000000..d8a0d795377 --- /dev/null +++ b/pkgs/development/python-modules/pycodestyle/python-3.11.4-compat.patch @@ -0,0 +1,16 @@ +diff --git a/testsuite/test_api.py b/testsuite/test_api.py +index 8dde32ff..38e34acf 100644 +--- a/testsuite/test_api.py ++++ b/testsuite/test_api.py +@@ -329,7 +329,10 @@ def test_check_nullbytes(self): + count_errors = pep8style.input_file('stdin', lines=['\x00\n']) + + stdout = sys.stdout.getvalue() +- expected = "stdin:1:1: E901 ValueError" ++ if sys.version_info < (3, 11, 4): ++ expected = "stdin:1:1: E901 ValueError" ++ else: ++ expected = "stdin:1:1: E901 SyntaxError: source code string cannot contain null bytes" # noqa: E501 + self.assertTrue(stdout.startswith(expected), + msg='Output %r does not start with %r' % + (stdout, expected)) From 617f21be79fe1a7946f474fe020dd4f795d3ac95 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Jun 2023 11:48:45 +0200 Subject: [PATCH 81/83] python311Packages.w3lib: disable regressed test (#238004) Co-authored-by: Mario Rodas --- pkgs/development/python-modules/w3lib/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix index a01b1e5f5f9..08ce68fdd61 100644 --- a/pkgs/development/python-modules/w3lib/default.nix +++ b/pkgs/development/python-modules/w3lib/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pythonAtLeast , pythonOlder }: @@ -25,8 +26,10 @@ buildPythonPackage rec { "w3lib" ]; - disabledTests = [ - "test_add_or_replace_parameter" + disabledTests = lib.optionals (pythonAtLeast "3.11") [ + # regressed on Python 3.11.4 + # https://github.com/scrapy/w3lib/issues/212 + "test_safe_url_string_url" ]; meta = with lib; { From 9eee85085bacf2feaa51820563b8382e6d6b3639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 17 Jun 2023 08:12:19 +0200 Subject: [PATCH 82/83] python311Packages.furl: fixup tests with python 3.11.4 --- pkgs/development/python-modules/furl/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/furl/default.nix b/pkgs/development/python-modules/furl/default.nix index 0f561573d58..3c9592c37d0 100644 --- a/pkgs/development/python-modules/furl/default.nix +++ b/pkgs/development/python-modules/furl/default.nix @@ -16,6 +16,13 @@ buildPythonPackage rec { sha256 = "5a6188fe2666c484a12159c18be97a1977a71d632ef5bb867ef15f54af39cc4e"; }; + # With python 3.11.4, invalid IPv6 address does throw ValueError + # https://github.com/gruns/furl/issues/164#issuecomment-1595637359 + postPatch = '' + substituteInPlace tests/test_furl.py \ + --replace '[0:0:0:0:0:0:0:1:1:1:1:1:1:1:1:9999999999999]' '[2001:db8::9999]' + ''; + propagatedBuildInputs = [ orderedmultidict six From a28218fdcaeb7dda2ccdbf2cf0092d448f97c9d4 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 17 Jun 2023 16:12:21 +0300 Subject: [PATCH 83/83] buildMozillaMach: cherry-pick patches to fix ESR builds --- .../networking/browsers/firefox/common.nix | 13 +++++++++++ .../browsers/firefox/mp4parse-rust-170.patch | 23 +++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/networking/browsers/firefox/mp4parse-rust-170.patch diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index ae7223ec721..b58f96d6e6f 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -238,6 +238,19 @@ buildStdenv.mkDerivation ({ hash = "sha256-fLUYaJwhrC/wF24HkuWn2PHqz7LlAaIZ1HYjRDB2w9A="; }) ] + ++ lib.optional (lib.versionOlder version "109") [ + # cherry-pick bindgen change to fix build with clang 16 + (fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/community/firefox-esr/bindgen.patch?id=4c4b0c01c808657fffc5b796c56108c57301b28f"; + hash = "sha256-lTvgT358M4M2vedZ+A6xSKsBYhSN+McdmEeR9t75MLU="; + }) + ] + ++ lib.optional (lib.versionOlder version "111") [ + # cherry-pick mp4parse change fixing build with Rust 1.70+ + # original change: https://github.com/mozilla/mp4parse-rust/commit/8b5b652d38e007e736bb442ccd5aa5ed699db100 + # vendored to update checksums + ./mp4parse-rust-170.patch + ] ++ lib.optional (lib.versionOlder version "111") ./env_var_for_system_dir-ff86.patch ++ lib.optional (lib.versionAtLeast version "111") ./env_var_for_system_dir-ff111.patch ++ lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch diff --git a/pkgs/applications/networking/browsers/firefox/mp4parse-rust-170.patch b/pkgs/applications/networking/browsers/firefox/mp4parse-rust-170.patch new file mode 100644 index 00000000000..9786c85df0c --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/mp4parse-rust-170.patch @@ -0,0 +1,23 @@ +--- a/third_party/rust/mp4parse/.cargo-checksum.json ++++ b/third_party/rust/mp4parse/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{"Cargo.toml":"f283fc1597f492cd1e03cd08b9c77f042ae4494fc96b4dcb566ec0abbda65efc","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"86cb40854b93f988e3a63ce6fe39d2ce95367f8ca301a5ba50676ff98a0ad791","benches/avif_benchmark.rs":"cd99c0dde025ab40d2cd860f53dc697a1587a48c164c3e5c8adfd40add29d772","link-u-avif-sample-images/.github/workflows/encode-and-decode-daily.yml":"84b787f721024a100ce09ac5714a1d78a4811893861e89495313f435b9d02359","link-u-avif-sample-images/.gitignore":"ac16d40779ab2d608843a3cb1b0418a1ffdc0e71a06c4d140386fadf007a54a7","link-u-avif-sample-images/LICENSE.txt":"da89f9867822be4b8adb1e601d9e9226c195016c6508015eb7593e68ead0c98a","link-u-avif-sample-images/Makefile":"b5697e8685d2a9ce0f4b4c976a5f707022ed113782d16dc59ae280d3a8ce77b1","link-u-avif-sample-images/README.md":"d249fb7bef4f21359cfc4f2977e1b2f2c6e6dd6e57cb1cdc1da1f0edd8aa55d0","link-u-avif-sample-images/fox.jpg":"927997a90ae88ead007283bf9c1392159d0acd2e9890522146211fda2112a2d9","link-u-avif-sample-images/fox.odd-height.png":"6136247772bd1c0edd50426bca4f3485473ac25a784e5ec8777f7491598e96db","link-u-avif-sample-images/fox.odd-width.odd-height.png":"6f91dc21c137f318d0443ce28bbf3f74d5502180c254327b46e41040a33f1363","link-u-avif-sample-images/fox.odd-width.png":"a8b2328c8700c16280c5ab40a34147edac598d4d48ca101bef649e468ae1492e","link-u-avif-sample-images/fox.png":"c45bfb5780843c70a37426340020e3e7ff41d7cf1df9fec614a5cf429d078573","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.avif":"811af5e96631309030a14cbc30c3bacfaa667f2e36e16a4f30434b8f5a23310c","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.avif":"e35713343e9ee04c51ab9cfdc99a0c7d126a1917cb83f5b9a23c71ed59269be2","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.odd-height.avif":"485623f7838d8f442c47348c6492765e6aafbc3d5ccd8e90efc9c812ff15e265","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.odd-width.avif":"8e75b9a8975267359d827e4cbc6877b1674aa31b87f88f222dde03263f9254df","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.odd-width.odd-height.avif":"1fff5915a332d6aaa85d668f3f338bda6fad9c6ec1f380f2c46737d536cea5de","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.odd-height.avif":"cca9785f14c74d865453518c0962dabd6d1b92d2c6c5f5ac67efdbf5606acb83","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.odd-width.avif":"de3399d8b56431f0ed34e2f14200f31dd54544fddbb12f39b4d55449d5660c56","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.odd-width.odd-height.avif":"07507744cb76b74a3586b93fc3b273a98f998d75f7687db3e9cb3725d7b1fb9d","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.avif":"cb884c82ac7b6d4fa03b1f687e9e20abc346107095473e9c1d422aaf0de14eaf","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.avif":"15d84077066c47fdbe2a7b8ed583a17017d09a033144ac1b31486d6c8f6f5c82","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.odd-height.avif":"365439d2ee2fe5229e066362c03a73a182c7f6626772ecf5345b22752d32e681","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.odd-width.avif":"c623b9943123d6c47d3300444f7255cbdfebfe2b47a670287f2baeb717fac42b","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.odd-width.odd-height.avif":"dd069f3c3c4f7589f5f7ef1d7b6a91b8cb975d32663a4a92b6d75219edd72954","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.odd-height.avif":"75628450288ace3386651725411c8f0ffff7eb95f82c5307b0faa3350f09f50e","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.odd-width.avif":"f91b6f455412adabc5094011362eaaa1f6a9d5740de0b8a1be42a96c16e7617f","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.odd-width.odd-height.avif":"bb8695cacacaf8f2e13a739de75e5e8a9d970d68c3acdfb7d82171a9bac2f01e","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.avif":"a10de8204aee73ba1786daca6390546bd7aa6b069aaa644012219a1c11246a43","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.odd-height.avif":"734a5badc59a8bed19e8eb476911048ddb011ca7c9eac31b7a7ed20e0135ac2c","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.odd-width.avif":"68d15d76d95f268e810dfd87bbf96d8c3197580afce2d30b50bb1f07865077f3","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.odd-width.odd-height.avif":"01e469b33bacb7e07e15e23b2997907bbcf02d8fcc99885a027494d31c45547c","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.avif":"a0cdc981a6b056c8af2d177a1438c332d630040dacbfd1c89bb5e3e381ba5822","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.odd-height.avif":"77e0510def73213c00ebcf051cf45fa63cf27d7c69340cc145ab6d44ec77bb07","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.odd-width.avif":"12787042364bd13be01830f988cb714220bde340a3329baa808df27a269b83f8","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.odd-width.odd-height.avif":"fad3b6dd9cb99e6925858f69aafae3f68c861845f2c3d4a6d1c51c6161490134","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.avif":"e34f3bab5df802be2d422c685824464eb5f7e182b235ca99bde11c4c34ff3ac2","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.avif":"05804752621e2fd7a9d85b01e2995a50e3efd30693efd934152560622d66e841","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.odd-height.avif":"ef041f2efa0424d3a6dcfc5f0c3f619aea0e197aaeb5a050a2d877a457513921","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.odd-width.avif":"b711b321b8a4d3a41e08f80a17c2203b839458cb6346aff6fff3f8d7699032e6","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.odd-width.odd-height.avif":"e3f40aad0ddd6c04ffacf4a754a0525986c89d519119d37655282551e3ea3a59","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.odd-height.avif":"4ef74c37712b41d6e5269d939f9d52031bc10746f7c8c029db618c5935aff9a6","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.odd-width.avif":"4cf6c849f4a48a639217ad9a1e0d027f4fc804d524c03e6707ec9714a252532f","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.odd-width.odd-height.avif":"3d3978e8e8d07270f82a877d3535f9483b88fce93a1c4accb658b494452b1d36","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.avif":"626d73272e59722084c528b27b72a0920bec462a10749b3e87036e42bf8a24e5","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.avif":"caf50c467242b3fa0b895a2af131fa0d03dd7b34989f2b1a51d25b2246c98fab","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.odd-height.avif":"1e88b92df592c02af53ff5258fa898ac8fe1d71954e9a440500ef7879b8a1c46","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.odd-width.avif":"466efdd269f3be3b1c88afc093c839e50ba5eaf6bd0c2425e157000d02a3c21a","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.odd-width.odd-height.avif":"36014509d0688cb307e0ffcdb5b4c16ff6e6c79772c7fbbeea33b4d483a1566f","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.odd-height.avif":"d1786723a5d6ea1e1764b0045dc3f669fe3905ffc2913011a2b1b424d2393397","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.odd-width.avif":"a2d9178cc5622e28472a735650d9c4deaec6d27d69830110911f4158f9d4a04e","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.odd-width.odd-height.avif":"89a9fc7598d72251b903e0c7088ab3e7a7f316b5e02b85f8c69e51f8eb0c7e69","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.avif":"51476b8471e1c0a5ebbd1e7545709495bef619cc96c02d277aad32b1deff8ea9","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.avif":"caf50c467242b3fa0b895a2af131fa0d03dd7b34989f2b1a51d25b2246c98fab","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.odd-height.avif":"1e88b92df592c02af53ff5258fa898ac8fe1d71954e9a440500ef7879b8a1c46","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.odd-width.avif":"466efdd269f3be3b1c88afc093c839e50ba5eaf6bd0c2425e157000d02a3c21a","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.odd-width.odd-height.avif":"36014509d0688cb307e0ffcdb5b4c16ff6e6c79772c7fbbeea33b4d483a1566f","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.odd-height.avif":"4808960cdcd1207b29eb6ef5b4db81ae5e63c5d40ef92f7a1e8f4430e765bde4","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.odd-width.avif":"71f3c73737bc04c23d93ea2c61a8a07408f604192fe53fe12c65050927dacb4e","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.odd-width.odd-height.avif":"8f9649384fa09c70af0c2e9e0d94ecd17492c702e015d9d6290d3aefc57c548c","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.avif":"ed96eca6ed79863eaf91e4d666e4e220b5fa4e5a6cb1696477ba901ac12f5dde","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.avif":"caf50c467242b3fa0b895a2af131fa0d03dd7b34989f2b1a51d25b2246c98fab","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.odd-height.avif":"1e88b92df592c02af53ff5258fa898ac8fe1d71954e9a440500ef7879b8a1c46","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.odd-width.avif":"466efdd269f3be3b1c88afc093c839e50ba5eaf6bd0c2425e157000d02a3c21a","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.odd-width.odd-height.avif":"36014509d0688cb307e0ffcdb5b4c16ff6e6c79772c7fbbeea33b4d483a1566f","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.odd-height.avif":"c43b4c607e301e34eb953770133d89d15e77d63be8d6421a80d6212fbbbf3453","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.odd-width.avif":"0e6218ce250ee7f84a621f3af73286fd4dabea19e9898d3575c20c5955aa427d","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.odd-width.odd-height.avif":"9f19846d884ac7d161ac2ca15811bb22ff7f3847bc1ad5d7713971ea024631aa","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.avif":"2cb363d30f83bff58ee049874b1808b37cb1d35342edf16b3ce25cb243c9ea55","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.avif":"8217b88f350c5d3812d7f863fe9d710c4c1b846b0be8df29ce6b3eb30d2b8d8f","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.odd-height.avif":"51eccd8c1368ddec9bc1f3a7631dadb00682e985fbfea66c0a2f533f6a73b67e","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.odd-width.avif":"83fe4593ab839cf296a2ccb8a146daf826d1d602f4f239cb63ee020f2cc326f6","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.odd-width.odd-height.avif":"4e63b84a980a81adde586314a94d8f834ec763749d8797c286471415b6b75647","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.odd-height.avif":"efc70882aacbb533c0e833a4401949d152dceb364846442cdccca5048ad17a60","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.odd-width.avif":"c07575c88ef400c1725c9260a19439e0e784da41c7db3867059019ddbdb3bebe","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.odd-width.odd-height.avif":"86aee64fd7b11b9834537ea14b2eff234c062c98d32fab51ff14aba262d5b106","link-u-avif-sample-images/hato.16bpc.png":"53b550c587cd1d19a1997184e47f4a3ff2a05cedf7cb4e42a9466a6d6cb60d8d","link-u-avif-sample-images/hato.jpg":"6d4804e5e4adf36a6b138544c81b743ed7abdd9a495a43e883ec77689ca28943","link-u-avif-sample-images/hato.png":"313880f4cc51160fec522d78f1fb7f06df70fe1929a731fc86c68ecefd312277","link-u-avif-sample-images/hato.profile0.10bpc.yuv420.avif":"1e84598c94bc795c55a551bdf6f283b4eed4997bda15e5c4bb2e29d0dc70897b","link-u-avif-sample-images/hato.profile0.10bpc.yuv420.monochrome.avif":"25c19a187d10eac963bb51b3fae1ffe50f3ccbc7ad02e51948dc7467b397ce61","link-u-avif-sample-images/hato.profile0.8bpc.yuv420.avif":"07cd454de19dd638354f75d9e97aab08bc8a04dd45c4f7531cb62a1a5656c8c9","link-u-avif-sample-images/hato.profile0.8bpc.yuv420.monochrome.avif":"120a3f26f3d6cde80869fb52bdb8fdd55b443882c98070ea938575e4790982ff","link-u-avif-sample-images/hato.profile2.10bpc.yuv422.avif":"d54251d4bc023f2e53624a46cb18e56cbc45768bd1bd50394de191c2a42106e8","link-u-avif-sample-images/hato.profile2.10bpc.yuv422.monochrome.avif":"ed33dfdb5e663b3394298b6921f9b19b129e14788dead776430eee2f14780a73","link-u-avif-sample-images/hato.profile2.12bpc.yuv422.avif":"ad361ac7d94fbc6af7ef30cbd3601ff366bc360c304480387a58a4c6fecee9b6","link-u-avif-sample-images/hato.profile2.12bpc.yuv422.monochrome.avif":"e28b4cacda95750e465e205fbfcba6a6af1d8418dac649838730c555ff7d828f","link-u-avif-sample-images/hato.profile2.8bpc.yuv422.avif":"69c353c482c2eb3d3671bb55f7ccfc932e4d781c714a72116e9138ffc6f6c720","link-u-avif-sample-images/hato.profile2.8bpc.yuv422.monochrome.avif":"e7d6f7d42a8519e1482f225fe447b5642d19a54ee830529223eac114a0dec189","link-u-avif-sample-images/images.html":"9e18453dfe5b205600f158282c6896265281e3b04b2fbc332804fab1dbdb3faf","link-u-avif-sample-images/kimono.avif":"63412e0f67f37c8b6fcf0e8269a2afae0a017fa6a3a99d37d055c590b0be52d3","link-u-avif-sample-images/kimono.crop.avif":"f175dcd9c64813b759da185fa67076fb772b76059845b2aad3ddcfab257f75ad","link-u-avif-sample-images/kimono.crop.png":"0d5605bae0ec9d39aad9dc8e1a371d0327c6a224643983e3ee1f4d44cb00f19d","link-u-avif-sample-images/kimono.jpg":"a6ad58e3cea437ee0c841115ba67ae7354de7af734de50de9d0853dd4e571577","link-u-avif-sample-images/kimono.mirror-horizontal.avif":"2bbc004d91145488610158a5acdb4d706495a2b15511db20ff57bb9efd80885c","link-u-avif-sample-images/kimono.mirror-horizontal.png":"9af9e839fe6bf6342831970c20291f619570d2fc687951ae00cd81ea766f53fe","link-u-avif-sample-images/kimono.mirror-vertical.avif":"f10eb04791fcca3409868b367128649f32e6b6fffcf02484cdefa57909f6bb74","link-u-avif-sample-images/kimono.mirror-vertical.png":"4ed003c5868fd2e78c7b2dcbd54a67a0e7593dabb3ac82b1c9e5e2dbdf09b8ec","link-u-avif-sample-images/kimono.mirror-vertical.rotate270.avif":"33c36ec2274b00ac6f81c9f61e55c20cbfce1649ad27520afe635310f516ead1","link-u-avif-sample-images/kimono.mirror-vertical.rotate270.crop.avif":"90ca48f657455b8f8e4a4e1769a05af90a3e34dca11a8b3c32552daf378ee956","link-u-avif-sample-images/kimono.mirror-vertical.rotate270.png":"74b9b7ffa8955761f747a0e6e81d5b7ecb5e325383546110e1b6aa9986728035","link-u-avif-sample-images/kimono.png":"84fd6cfb97a27739608e21779f874b4ae7e80342b2588e8b0b092dee2d57c881","link-u-avif-sample-images/kimono.rotate270.avif":"79a99a0415276cc11f2e871d070a9df84df3385888a2f2fa3534320f6bed98ed","link-u-avif-sample-images/kimono.rotate270.png":"1918a47c02b378945a705301abd4250ddc65bb95afce9424572ffd0fdd1f45ef","link-u-avif-sample-images/kimono.rotate90.avif":"bd1157d8c840713c82b907b9d3ae80bc3817849e11c323d875f8016e035bd3cc","link-u-avif-sample-images/kimono.rotate90.png":"1a73c61692abe96d0a7a9accdb36a83d51bceac79bbb83a00571570f494cca49","link-u-avif-sample-images/plum-blossom-large.png":"af6ea005b726ca39f342e946aa53bed88e5a140413ce896d166bb35ab0aa3b4f","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-full.avif":"cf8e15ec4b210235f3d68332a1adeb64e35c41b8d8e1e7586ae38b6d9cd8926c","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-full.monochrome.avif":"b413440309d5669a7aefa06f291f72de0d0c09972e3da9a385e6016d6a1c5562","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-limited.avif":"64f6f2b1fda594af5c9e2d6e4bc752b55e8121000cdcedc0066018e53f76de40","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-limited.monochrome.avif":"2b175a600aed64c1c1de4b2d661fb405437b1ff000b964d4be6ac437ce73136f","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-full.avif":"21ebb3732186bf7c6c13cf7197155b64201e674b9c79cf613b6e5718bde14c2a","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-full.monochrome.avif":"65917797e511c9033b3e225eb5d84f3c0440b7a496d4b8ab5674e123ad68aab7","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-limited.avif":"f4809df9188fa46ed100f63c78c4cf42559d90a98351a8f69e177385920672b4","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-limited.monochrome.avif":"dffc213dc36f0b5ff3d86254f5185c2d1fb03380918a8fa39d186fb59cbba7cc","link-u-avif-sample-images/plum-blossom-large.profile1.10bpc.yuv444.alpha-full.avif":"0a615cfb673ab45e37da3582c17dd36f86d5da3d81246a32951d1db4ed90149d","link-u-avif-sample-images/plum-blossom-large.profile1.10bpc.yuv444.alpha-limited.avif":"d1cc6a0db116a68e229676b289e8ced84d42a9f0e8d3ccd760fc92dbeb932547","link-u-avif-sample-images/plum-blossom-large.profile1.8bpc.yuv444.alpha-full.avif":"8626cf0b2c60fee51cf1df7fe4d8a18081b72e3604f7d3ff14cc5a35581927d9","link-u-avif-sample-images/plum-blossom-large.profile1.8bpc.yuv444.alpha-limited.avif":"56bf18e4bcbfbea460c306ab900fc506169854d2b91690e1a48156a86fff3264","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-full.avif":"b56f3c33797e4c5bb80418ae25f6f2c6fc88ddc1f6965d82abc44059f052f36c","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-full.monochrome.avif":"c3c6db4ce801c68e2afd7bfb72abacc13287cc2e247917a817ff5632bd4b18fb","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-limited.avif":"095f57fff1dc037a6414c60263415dcfa86b10d81f58e8e4c3aef17cffae0e5f","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-limited.monochrome.avif":"ba3035a69296d12f47d1c450f2de8cc0c9059ebbf27bb8b0996ff6d1ab1132a1","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-full.avif":"a9551e1963049b874216b40aaf9be45bc44dc11887770712b77240862c6c08a9","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-full.monochrome.avif":"a8a0ba881cd0aef45a5874f412e97812ca457eaf12e56b34bac2ba051e142828","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-limited.avif":"6891b5bdbed7f541c673c66cec4584b191bb737a49b37cca16ae069830890b42","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-limited.monochrome.avif":"67e66826637e349e1c3c46316c7048d152aed8453d8cdd00c6b786f87fe176d8","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-full.avif":"a466503110f60dcadaafe78c2cb0a8ca58334c22868efe428c7ac12b69407c95","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-full.monochrome.avif":"a8a0ba881cd0aef45a5874f412e97812ca457eaf12e56b34bac2ba051e142828","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-limited.avif":"061b4c70707e7fc8866580656cca7ca2da2263645829a564dbf8f205d639f058","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-limited.monochrome.avif":"67e66826637e349e1c3c46316c7048d152aed8453d8cdd00c6b786f87fe176d8","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-full.avif":"4a03c8bcfcaadccdeb07432ed80680b06aba5ae5e616fc370b376acb478f6cd1","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-full.monochrome.avif":"a8a0ba881cd0aef45a5874f412e97812ca457eaf12e56b34bac2ba051e142828","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-limited.avif":"376625ce4e7ec3b57344a9f2185a34975fe380774c9f8e0dd4ef61c46da94fca","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-limited.monochrome.avif":"67e66826637e349e1c3c46316c7048d152aed8453d8cdd00c6b786f87fe176d8","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-full.avif":"1e17b7dd8e351cb667bc6ec0b81fdebca9fd30ad5e588b3eac57bf9f90a9b58b","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-full.monochrome.avif":"f77588d2ff39e4461869a95ca236efdf4a3fdc17b8a6e3907e63b417e56c81b5","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-limited.avif":"f2eabd3fc2db07b361d55b5af63023d28b5bdd0047a665e9d0685651ce9db94b","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-limited.monochrome.avif":"dd88c377b253d689bfd4600d7c3007448df0ed92f679b661d5d51e051a6916d8","link-u-avif-sample-images/plum-blossom-small.png":"c859fd97b647e494461f65835b9c1c3476807aee77076599adf18a832b3617a4","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-full.avif":"fe3379620f983e5da4210b0f7c5d164e86208b34106d6b11d56e2b52beee5dfe","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-full.monochrome.avif":"9e6234686053dba2e44bb32192c641074095a61e45aa1bede85bb83751e6e157","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-limited.avif":"60ffa59dd007aea3bb596cfb03853b3dad490b1ffd10471ad4fe1901ec819907","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-limited.monochrome.avif":"58abfa027525aca7339a705f311bc30b000aef9822c7c50b232894ece1ba9cb1","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-full.avif":"541ca66a11b1430d11f77b74a13f859239a3bd9f44976b8dfe163c5d7595a69f","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-full.monochrome.avif":"6d7852c63c27a77bef94443e178ecf6b6a3da8cc846f9f0c1adc17f7fc35e1f3","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-limited.avif":"3712216ffc7edb95a976b68469ead533fda6fe9f3d2e8cb09cbdb0d01d9c094b","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-limited.monochrome.avif":"59672af536b169ebf7e48129167dc91cb253925517c37db28b64539f7afba5d3","link-u-avif-sample-images/plum-blossom-small.profile1.10bpc.yuv444.alpha-full.avif":"561d5158425ad39425916a3be048b0202e82efef44cf1a9f711db57192d2ff01","link-u-avif-sample-images/plum-blossom-small.profile1.10bpc.yuv444.alpha-limited.avif":"88336f29457c1dc4ae0b754ef14b791de4d8c337f2b44d7960aafcca08a5586e","link-u-avif-sample-images/plum-blossom-small.profile1.8bpc.yuv444.alpha-full.avif":"245a3dad6371dc702f29eb7e9735f843b63c525da871859728bedbe5bb274985","link-u-avif-sample-images/plum-blossom-small.profile1.8bpc.yuv444.alpha-limited.avif":"490c216b5850c670f6088ee72c7fd906102b2dd0c8432c01a517b3328db27c75","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-full.avif":"0d0bbbcb0c9ade1c827317a6409ce6ba25027b36da1b6752379a5f5d4c8af056","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-full.monochrome.avif":"418a9d4b7dcbc1f67fc4b95ccb2e7946c446fddd35a79f0d587b3f2165cb3f14","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-limited.avif":"a41dcfabb3795ed93a05881a91bf4d1c5d1b9b0e5d0db728f12684b12613e0c9","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-limited.monochrome.avif":"4b6a18f4f608d1b00598e67c1c91a4e8f4943ae5acf0166ae0121cc21f3b7437","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-full.avif":"5e6b83adee3aeac4bba3f38e854e2ed7585aa1557a74b5fa66596098c53e26f2","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-full.monochrome.avif":"fb0937564c08f4e1c22ebbde426a0eff6a1d388434c30148bc7e5582dc378caa","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-limited.avif":"f42e780bff644167e27525fee65b23e70814f7665ea19b6d693eb127c5eeebd8","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-limited.monochrome.avif":"d41ead1d69d33d0cf5f6fe575beb5f60d9565300c535f9042113dd8a748c1d31","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-full.avif":"c6ee9234ee7783d0203f9512e3cc8fe76a694675bcf03c320ff8bab4684bd4e9","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-full.monochrome.avif":"fb0937564c08f4e1c22ebbde426a0eff6a1d388434c30148bc7e5582dc378caa","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-limited.avif":"21e1e51fc6da66e090e12e1df5aeabf1f478df64bcb8151caaa687ad262bdd9d","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-limited.monochrome.avif":"d41ead1d69d33d0cf5f6fe575beb5f60d9565300c535f9042113dd8a748c1d31","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-full.avif":"dfed73d646d7159d3ee4f9ce95ea628fdd33bf8bf1bb02a83d88302d088f4d97","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-full.monochrome.avif":"fb0937564c08f4e1c22ebbde426a0eff6a1d388434c30148bc7e5582dc378caa","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-limited.avif":"5539cd575256772ba31d6e87cb0136d5f465f84b041a4677b1023cfd6bee9956","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-limited.monochrome.avif":"d41ead1d69d33d0cf5f6fe575beb5f60d9565300c535f9042113dd8a748c1d31","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-full.avif":"f205cf2c05265b84e45ceb723e9a3707fd8749130166d4797e64c8c62b497f8c","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-full.monochrome.avif":"ad2244cb7b2ac487a5104d6e5a07270f9ceb2550e4d56d3662fcc1868910ced5","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-limited.avif":"7ef9468effdc970e4e6e8cc7533d66dc967686e357dda3dda186c021f9e6156b","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-limited.monochrome.avif":"3dd34d854ff83b6e27a2bf98301380a6cac272084ed863735285ab5dc8acda00","link-u-avif-sample-images/plum-blossom.svg":"be1f03dd05f63292c85a96b1c48fb06727283610cc69b1e116d547bab27b171d","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-10bpc.avif":"5842951d81118d256962384e08a986816e8ade6b05530269f0208c6b69cedb3b","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-12bpc.avif":"1f0c9f36d69b9aa13eff3897ada3e78b81099c613b329a402c27e09453e7e261","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-8bpc.avif":"3e6f2f4016e66e3c94707eaa8373e6f582321e005964cd35b64bc183e1bf10ea","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-lossy.avif":"79483242f2dca12c4ec18bd33ff8099216b3094fb55a26a909f046b2f9b4ce58","link-u-avif-sample-images/red-at-12-oclock-with-color-profile.jpg":"d56f809ea5eda74578af57e2f80b41856a1fe2ff436c741aa58757387af998bd","link-u-avif-sample-images/red-at-12-oclock-with-color-profile.png":"4eab95e358eb48e052c7b8c94d30a8c6cb1c9c3c2dfd9845240281dd5dd7b800","link-u-avif-sample-images/scripts/compare.sh":"0562689bcd40e9fc1322bf037d6f999aa4406a2229f19e74b96cc450e370e429","link-u-avif-sample-images/star-10bpc-with-alpha.avifs":"5643ac1f235ae6599186dd66c66507db6fa46a17b2b18e82ea9344870eb98a9b","link-u-avif-sample-images/star-10bpc.avifs":"c61d899a59dbd8c7b2f7bcfca9069a0e13ff1606899af227938a28502e6cbf88","link-u-avif-sample-images/star-12bpc-with-alpha.avifs":"88a350c3550ce36c1777fe7eb1e906c6829d3ed8b241aa1e0e46f1a4e2567c4b","link-u-avif-sample-images/star-12bpc.avifs":"c1a59db6f180208a3177d77c7f9ab08290e903c7bdaf929331b807a510f8c619","link-u-avif-sample-images/star-8bpc-with-alpha.avifs":"13a12908cb162a855cccc9221a5f9f736e8ea07902ffbdcf007f8fde5ed255f2","link-u-avif-sample-images/star-8bpc.avifs":"ae35b161de67a5afeb195ee401f369c34990f0ff8662f70ab4065bc6931f0a66","link-u-avif-sample-images/star.gif":"389cdd02efbdce4f0205cae6e91c1f64e34fa0ca1fe02351da1b37e16cbb642a","link-u-avif-sample-images/star.input.txt":"970163b942843618616f42233abe91d40fb68f6f5451860db259551711867b55","link-u-avif-sample-images/star.png":"18569167cf7ebd265ab6973d071d259aacfbb46c0408b7d4874c8cc9df9bb1ad","link-u-avif-sample-images/star.svg":"13089d0986b31b87919029fa69f2b68981af4023306bf0f79922f6772396008a","link-u-avif-sample-images/star180.png":"21bc11be2b51334fe4589634507612e7edce96d36e6a99219d029e440164e8b8","link-u-avif-sample-images/star270.png":"5c93f538dcdc70840b9925b4089083acc9c25e95265b3f3dea18d695451b441e","link-u-avif-sample-images/star90.png":"2defc5d21e70447653fec5dc14a697d9dd555d7a0c14e79cb2d9f80796a51a6d","src/boxes.rs":"270a3e3bf90279bfc83f95acadaba9611c25243280bca71dfa9c044d5441cf15","src/lib.rs":"73114a5c28472e77082ad259113ffafb418ed602c1741f26da3e10278b0bf93e","src/macros.rs":"76c840f9299797527fe71aa5b378ffb01312767372b45cc62deddb19775400ae","src/tests.rs":"75fe5467109242b2cc7991f8228e2e2ad1de5be2f29272a4a7f08c4e21ab5fa4","src/unstable.rs":"c2cef9a3b2b08a4da66fa0305fce7a117bd99c9b8d57b0a044e1d99dbda6faf5","tests/1x1-black-alpha-50pct-premultiplied.avif":"31a8c235bf2cf601a593a7bc33f7f2779f2d5b2e0cd145897b931fce94b0c0b8","tests/a1lx.avif":"81a784c568e7619bd47c4e7153181e9a86c8a03221097aa63979f97affd7efbb","tests/a1op.avif":"184e50efd3ad226800c610da7bc470d29b548d9fa942fd1fd1848ed02e2e5f0a","tests/alpha_video_avif_major_avis_compatible.avif":"81771981248c4e0d708f0828eadb20e9e37e7c21280efe5726666958f899c237","tests/alpha_video_fixed.avif":"67051d1a4ccf9f3e38d4514d8a6b3a2e07f1beb979369cabdc60881a698a36ac","tests/alpha_video_no_avis.avif":"a95f0e7c818bc5bf646143cf43474b70722e17669d4f2a32874c125936207d6a","tests/amr_nb_1f.3gp":"d1423e3414ad06b69f8b58d5c916ec353ba2d0402d99dec9f1c88acc33b6a127","tests/amr_wb_1f.3gp":"be635b24097e8757b0c04d70ab28e00417ca113e86108b6c269b79b64b89bcd5","tests/av1C-missing-essential.avif":"a1501254c4071847b2269fe40b81409c389ff14e91cf7c0005a47e6ea97a6803","tests/bad-ipma-flags.avif":"ecde7997b97db1910b9dcc7ca8e3c8957da0e83681ea9008c66dc9f12b78ad19","tests/bad-ipma-version.avif":"7f9a1a0b4ebbf8d800d22eaae5ff78970cc6b811317db6c1467c6883952b7c9b","tests/bbb_sunflower_QCIF_30fps_h263_noaudio_1f.3gp":"03e5b1264d0a188d77b9e676ba3ce23a801b17aaa11c0343dfd851d6ea4e3a40","tests/clap-basic-1_3x3-to-1x1.avif":"83af9c8196fa93b2475163585a23d0eb5a8f8015d0db8da7a5d6de61adfb1876","tests/clap-missing-essential.avif":"4d61aacd2327661a456abc76d3d490e5ddd2b6f8cbfa52922a6c541c9d983193","tests/clusterfuzz-testcase-minimized-mp4-6093954524250112":"af7044a470732d4e7e34ac7ab5ff038c58b66f09702cbcd774931d7766bbfd35","tests/corrupt/a1lx-marked-essential.avif":"0d481240222450827ea335ae9a1a300777a0db4f9b0f4c17ed77c758c5133fa3","tests/corrupt/a1op-missing-essential.avif":"33c24d54f43f1a7be7a8334718881c8a0de24730c997c7842b9d7140e75017ea","tests/corrupt/alpha_video_moov_is_moop.avif":"89e0091edd6efc2c5b163525553c5abc56263fe1b3b885184bb07b9ea4bf346d","tests/corrupt/bug-1655846.avif":"e0a5a06225800fadf05f5352503a4cec11af73eef705c43b4acab5f4a99dea50","tests/corrupt/bug-1661347.avif":"31c26561e1d9eafb60f7c5968b82a0859d203d73f17f26b29276256acee12966","tests/corrupt/clusterfuzz-testcase-minimized-avif-4914209301856256.avif":"34a142c7916e314881f3fb6394add1c543fac0e5b45109e3a425eeb4c68998d0","tests/corrupt/hdlr-not-first.avif":"2c29308af077209b9c984921b7e36f8fb7ca7cf379cf8eba4c7a91f65bc7a304","tests/corrupt/hdlr-not-pict.avif":"9fe37619606645a95725300a9e34fada9190d1e0b3919881db84353941ca9291","tests/corrupt/imir-before-clap.avif":"22d6b5dacf0ef0be59053beba7564b08037fed859ada2885e3476e0ff0d19c95","tests/corrupt/invalid-avif-colr-multiple-nclx.avif":"7990a995855120dc4f724a6098816595becc35077fcd9e0de8c68300b49c4f1f","tests/corrupt/invalid-avif-colr-multiple-prof.avif":"b077a6b58e3a13ad743ee3f19fbae53b521eab8727606e0dba9bf06384f3121c","tests/corrupt/invalid-avif-colr-multiple-rICC.avif":"88b24d4d588744b9f2cdc03944f28283e9315eb3de7d7d57773a0541137f6529","tests/corrupt/invalid-avif-colr-multiple.zip":"9abddcbc47fde6da20263a29b770c6a9e76c8ab8dc785ef8512f35d9cb3206ed","tests/corrupt/ipma-duplicate-item_id.avif":"ca8c5275b0b8b79c1068489a52d0a5c8f0b4453463971e72b694189f11c10745","tests/corrupt/ipma-duplicate-version-and-flags.avif":"cf8e15ec4b210235f3d68332a1adeb64e35c41b8d8e1e7586ae38b6d9cd8926c","tests/corrupt/ipma-invalid-property-index.avif":"2480e773fa716d22883032d05fd4cf2c6b00fba8796cf4ff286a5d1ba26adff6","tests/corrupt/lsel-missing-essential.avif":"43c3b1e4c4acecd7559a9a7197a7befd43c71705748f0f8c063bca3be1c6d074","tests/corrupt/no-alpha-av1C.avif":"ad3d34d6331db7d9bea0c5f37efb88923520e33e08e7c636a5df435a4575eae7","tests/corrupt/no-av1C.avif":"eeb4fc50930c91465999f787c4a2a3b12de20556da0857be72da5a1a9eaa3f01","tests/corrupt/no-ftyp.avif":"74b431f32b2e2761e77df7fdb260f623b4e8f7e3f4c8af8a42d6826911706d7b","tests/corrupt/no-hdlr.avif":"91a1eb70c7b6adf2104e471d7deeeb98084a591d64ce09ba106c27edfbc3a409","tests/corrupt/no-ispe.avif":"4b6edfd8c9b40c25dc40305a6057e32b5e65f40da4a9d810c58dbff53254113f","tests/corrupt/no-pitm.avif":"7960eeb9e6e5140fbe5eb6d281e6974efd6c3c0147562f3dcf06f6b009dc540a","tests/corrupt/no-pixi-for-alpha.avif":"f8adc3573c79ee25bf6d4dd2693c61661469b28f86a5c7b1d9e41b0e8d2d53bb","tests/corrupt/no-pixi.avif":"4b1776def440dc8b913c170e4479772ee6bbb299b8679f7c564704bd03c9597e","tests/hdlr-nonzero-reserved.avif":"b872dcd7b4f49c6808d6da109cf4fedc26a237c42e8529c5aa8f7130abaf40a9","tests/imir-missing-essential.avif":"b1226e4b1358528befbd3f1126b5caf0c5051b4354777b87e71f6001f3829f87","tests/invalid-avif-hdlr-name-multiple-nul.avif":"0d3e4a6ce42154ee288c18339c2b59ff2104fd890cd2d616e5dbf26375a90e98","tests/irot-missing-essential.avif":"b7da1fc1d1b45bb1b7ca3494476e052f711d794a6d010df6870872ed8b9da10e","tests/lsel.avif":"ef8ba6827709f48cd45f749efb580129162d9599ea98f3363d2140957502d806","tests/multiple-extents.avif":"b5549ac68793e155a726d754e565cea0da03fa17833d3545f45c79e13f4c9360","tests/no-mif1.avif":"1442aa6ffaeb9512724287768bfd1850d3aa29a651ef05abb33e5dec2b3ee5c2","tests/overflow.rs":"16b591d8def1a155b3b997622f6ea255536870d99c3d8f97c51755b77a50de3c","tests/public.rs":"8918d5190a36c697445aa4b140a31cd3032582f1e504b4c2527f75a2155f80ae","tests/valid-alpha.avif":"9d417a35b9b62ad3ff66ffbc55f16552aacf821a092aa5ef4adff7e746bd4c2f","tests/valid-avif-colr-nclx-and-prof-and-rICC.avif":"ab6f5e786d26f8bcade5993f8b9cca3cd004a3d7fcec76e829f5d0f98cb18e7b","tests/valid-avif-colr-nclx-and-prof.avif":"0e982818de61869fcb85a2a4c2b7b8aeecb3053cbfdc6276987f91204998eefb","tests/valid-avif-colr-nclx-and-rICC.avif":"8530ef1305ff956a0c2912d0b3d1e0fc3a68cf3103e70b04cc2574530389b030","tests/valid-avif-colr-nclx.avif":"345ab58b7b1cb48aba2e21eb8dc5ab0a751a78a752ce1896c59b4bf361992f38","tests/valid-avif-colr-prof-and-rICC.avif":"1f0f085141106885bda78b0879c768818420d8196b39440a36578456a7d50a6c","tests/valid-avif-colr-prof.avif":"5d7aaefb5204ebe1cc296456866b8e46e023748b921a38ee56fd6c776a9733ff","tests/valid-avif-colr-rICC.avif":"e1c7b49bfad5904b484bd5118e6b33b78e2dc708a31a10fcbb0e4a373ed8dbb7","tests/valid.avif":"f0b33e09bf01232e0877df325f47986c0bee7764f2a81c9c908ae109e7dc63c4"},"package":null} ++{"files":{"Cargo.toml":"f283fc1597f492cd1e03cd08b9c77f042ae4494fc96b4dcb566ec0abbda65efc","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"86cb40854b93f988e3a63ce6fe39d2ce95367f8ca301a5ba50676ff98a0ad791","benches/avif_benchmark.rs":"cd99c0dde025ab40d2cd860f53dc697a1587a48c164c3e5c8adfd40add29d772","link-u-avif-sample-images/.github/workflows/encode-and-decode-daily.yml":"84b787f721024a100ce09ac5714a1d78a4811893861e89495313f435b9d02359","link-u-avif-sample-images/.gitignore":"ac16d40779ab2d608843a3cb1b0418a1ffdc0e71a06c4d140386fadf007a54a7","link-u-avif-sample-images/LICENSE.txt":"da89f9867822be4b8adb1e601d9e9226c195016c6508015eb7593e68ead0c98a","link-u-avif-sample-images/Makefile":"b5697e8685d2a9ce0f4b4c976a5f707022ed113782d16dc59ae280d3a8ce77b1","link-u-avif-sample-images/README.md":"d249fb7bef4f21359cfc4f2977e1b2f2c6e6dd6e57cb1cdc1da1f0edd8aa55d0","link-u-avif-sample-images/fox.jpg":"927997a90ae88ead007283bf9c1392159d0acd2e9890522146211fda2112a2d9","link-u-avif-sample-images/fox.odd-height.png":"6136247772bd1c0edd50426bca4f3485473ac25a784e5ec8777f7491598e96db","link-u-avif-sample-images/fox.odd-width.odd-height.png":"6f91dc21c137f318d0443ce28bbf3f74d5502180c254327b46e41040a33f1363","link-u-avif-sample-images/fox.odd-width.png":"a8b2328c8700c16280c5ab40a34147edac598d4d48ca101bef649e468ae1492e","link-u-avif-sample-images/fox.png":"c45bfb5780843c70a37426340020e3e7ff41d7cf1df9fec614a5cf429d078573","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.avif":"811af5e96631309030a14cbc30c3bacfaa667f2e36e16a4f30434b8f5a23310c","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.avif":"e35713343e9ee04c51ab9cfdc99a0c7d126a1917cb83f5b9a23c71ed59269be2","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.odd-height.avif":"485623f7838d8f442c47348c6492765e6aafbc3d5ccd8e90efc9c812ff15e265","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.odd-width.avif":"8e75b9a8975267359d827e4cbc6877b1674aa31b87f88f222dde03263f9254df","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.monochrome.odd-width.odd-height.avif":"1fff5915a332d6aaa85d668f3f338bda6fad9c6ec1f380f2c46737d536cea5de","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.odd-height.avif":"cca9785f14c74d865453518c0962dabd6d1b92d2c6c5f5ac67efdbf5606acb83","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.odd-width.avif":"de3399d8b56431f0ed34e2f14200f31dd54544fddbb12f39b4d55449d5660c56","link-u-avif-sample-images/fox.profile0.10bpc.yuv420.odd-width.odd-height.avif":"07507744cb76b74a3586b93fc3b273a98f998d75f7687db3e9cb3725d7b1fb9d","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.avif":"cb884c82ac7b6d4fa03b1f687e9e20abc346107095473e9c1d422aaf0de14eaf","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.avif":"15d84077066c47fdbe2a7b8ed583a17017d09a033144ac1b31486d6c8f6f5c82","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.odd-height.avif":"365439d2ee2fe5229e066362c03a73a182c7f6626772ecf5345b22752d32e681","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.odd-width.avif":"c623b9943123d6c47d3300444f7255cbdfebfe2b47a670287f2baeb717fac42b","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.monochrome.odd-width.odd-height.avif":"dd069f3c3c4f7589f5f7ef1d7b6a91b8cb975d32663a4a92b6d75219edd72954","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.odd-height.avif":"75628450288ace3386651725411c8f0ffff7eb95f82c5307b0faa3350f09f50e","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.odd-width.avif":"f91b6f455412adabc5094011362eaaa1f6a9d5740de0b8a1be42a96c16e7617f","link-u-avif-sample-images/fox.profile0.8bpc.yuv420.odd-width.odd-height.avif":"bb8695cacacaf8f2e13a739de75e5e8a9d970d68c3acdfb7d82171a9bac2f01e","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.avif":"a10de8204aee73ba1786daca6390546bd7aa6b069aaa644012219a1c11246a43","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.odd-height.avif":"734a5badc59a8bed19e8eb476911048ddb011ca7c9eac31b7a7ed20e0135ac2c","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.odd-width.avif":"68d15d76d95f268e810dfd87bbf96d8c3197580afce2d30b50bb1f07865077f3","link-u-avif-sample-images/fox.profile1.10bpc.yuv444.odd-width.odd-height.avif":"01e469b33bacb7e07e15e23b2997907bbcf02d8fcc99885a027494d31c45547c","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.avif":"a0cdc981a6b056c8af2d177a1438c332d630040dacbfd1c89bb5e3e381ba5822","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.odd-height.avif":"77e0510def73213c00ebcf051cf45fa63cf27d7c69340cc145ab6d44ec77bb07","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.odd-width.avif":"12787042364bd13be01830f988cb714220bde340a3329baa808df27a269b83f8","link-u-avif-sample-images/fox.profile1.8bpc.yuv444.odd-width.odd-height.avif":"fad3b6dd9cb99e6925858f69aafae3f68c861845f2c3d4a6d1c51c6161490134","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.avif":"e34f3bab5df802be2d422c685824464eb5f7e182b235ca99bde11c4c34ff3ac2","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.avif":"05804752621e2fd7a9d85b01e2995a50e3efd30693efd934152560622d66e841","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.odd-height.avif":"ef041f2efa0424d3a6dcfc5f0c3f619aea0e197aaeb5a050a2d877a457513921","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.odd-width.avif":"b711b321b8a4d3a41e08f80a17c2203b839458cb6346aff6fff3f8d7699032e6","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.monochrome.odd-width.odd-height.avif":"e3f40aad0ddd6c04ffacf4a754a0525986c89d519119d37655282551e3ea3a59","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.odd-height.avif":"4ef74c37712b41d6e5269d939f9d52031bc10746f7c8c029db618c5935aff9a6","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.odd-width.avif":"4cf6c849f4a48a639217ad9a1e0d027f4fc804d524c03e6707ec9714a252532f","link-u-avif-sample-images/fox.profile2.10bpc.yuv422.odd-width.odd-height.avif":"3d3978e8e8d07270f82a877d3535f9483b88fce93a1c4accb658b494452b1d36","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.avif":"626d73272e59722084c528b27b72a0920bec462a10749b3e87036e42bf8a24e5","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.avif":"caf50c467242b3fa0b895a2af131fa0d03dd7b34989f2b1a51d25b2246c98fab","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.odd-height.avif":"1e88b92df592c02af53ff5258fa898ac8fe1d71954e9a440500ef7879b8a1c46","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.odd-width.avif":"466efdd269f3be3b1c88afc093c839e50ba5eaf6bd0c2425e157000d02a3c21a","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.monochrome.odd-width.odd-height.avif":"36014509d0688cb307e0ffcdb5b4c16ff6e6c79772c7fbbeea33b4d483a1566f","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.odd-height.avif":"d1786723a5d6ea1e1764b0045dc3f669fe3905ffc2913011a2b1b424d2393397","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.odd-width.avif":"a2d9178cc5622e28472a735650d9c4deaec6d27d69830110911f4158f9d4a04e","link-u-avif-sample-images/fox.profile2.12bpc.yuv420.odd-width.odd-height.avif":"89a9fc7598d72251b903e0c7088ab3e7a7f316b5e02b85f8c69e51f8eb0c7e69","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.avif":"51476b8471e1c0a5ebbd1e7545709495bef619cc96c02d277aad32b1deff8ea9","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.avif":"caf50c467242b3fa0b895a2af131fa0d03dd7b34989f2b1a51d25b2246c98fab","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.odd-height.avif":"1e88b92df592c02af53ff5258fa898ac8fe1d71954e9a440500ef7879b8a1c46","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.odd-width.avif":"466efdd269f3be3b1c88afc093c839e50ba5eaf6bd0c2425e157000d02a3c21a","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.monochrome.odd-width.odd-height.avif":"36014509d0688cb307e0ffcdb5b4c16ff6e6c79772c7fbbeea33b4d483a1566f","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.odd-height.avif":"4808960cdcd1207b29eb6ef5b4db81ae5e63c5d40ef92f7a1e8f4430e765bde4","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.odd-width.avif":"71f3c73737bc04c23d93ea2c61a8a07408f604192fe53fe12c65050927dacb4e","link-u-avif-sample-images/fox.profile2.12bpc.yuv422.odd-width.odd-height.avif":"8f9649384fa09c70af0c2e9e0d94ecd17492c702e015d9d6290d3aefc57c548c","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.avif":"ed96eca6ed79863eaf91e4d666e4e220b5fa4e5a6cb1696477ba901ac12f5dde","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.avif":"caf50c467242b3fa0b895a2af131fa0d03dd7b34989f2b1a51d25b2246c98fab","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.odd-height.avif":"1e88b92df592c02af53ff5258fa898ac8fe1d71954e9a440500ef7879b8a1c46","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.odd-width.avif":"466efdd269f3be3b1c88afc093c839e50ba5eaf6bd0c2425e157000d02a3c21a","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.monochrome.odd-width.odd-height.avif":"36014509d0688cb307e0ffcdb5b4c16ff6e6c79772c7fbbeea33b4d483a1566f","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.odd-height.avif":"c43b4c607e301e34eb953770133d89d15e77d63be8d6421a80d6212fbbbf3453","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.odd-width.avif":"0e6218ce250ee7f84a621f3af73286fd4dabea19e9898d3575c20c5955aa427d","link-u-avif-sample-images/fox.profile2.12bpc.yuv444.odd-width.odd-height.avif":"9f19846d884ac7d161ac2ca15811bb22ff7f3847bc1ad5d7713971ea024631aa","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.avif":"2cb363d30f83bff58ee049874b1808b37cb1d35342edf16b3ce25cb243c9ea55","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.avif":"8217b88f350c5d3812d7f863fe9d710c4c1b846b0be8df29ce6b3eb30d2b8d8f","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.odd-height.avif":"51eccd8c1368ddec9bc1f3a7631dadb00682e985fbfea66c0a2f533f6a73b67e","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.odd-width.avif":"83fe4593ab839cf296a2ccb8a146daf826d1d602f4f239cb63ee020f2cc326f6","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.monochrome.odd-width.odd-height.avif":"4e63b84a980a81adde586314a94d8f834ec763749d8797c286471415b6b75647","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.odd-height.avif":"efc70882aacbb533c0e833a4401949d152dceb364846442cdccca5048ad17a60","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.odd-width.avif":"c07575c88ef400c1725c9260a19439e0e784da41c7db3867059019ddbdb3bebe","link-u-avif-sample-images/fox.profile2.8bpc.yuv422.odd-width.odd-height.avif":"86aee64fd7b11b9834537ea14b2eff234c062c98d32fab51ff14aba262d5b106","link-u-avif-sample-images/hato.16bpc.png":"53b550c587cd1d19a1997184e47f4a3ff2a05cedf7cb4e42a9466a6d6cb60d8d","link-u-avif-sample-images/hato.jpg":"6d4804e5e4adf36a6b138544c81b743ed7abdd9a495a43e883ec77689ca28943","link-u-avif-sample-images/hato.png":"313880f4cc51160fec522d78f1fb7f06df70fe1929a731fc86c68ecefd312277","link-u-avif-sample-images/hato.profile0.10bpc.yuv420.avif":"1e84598c94bc795c55a551bdf6f283b4eed4997bda15e5c4bb2e29d0dc70897b","link-u-avif-sample-images/hato.profile0.10bpc.yuv420.monochrome.avif":"25c19a187d10eac963bb51b3fae1ffe50f3ccbc7ad02e51948dc7467b397ce61","link-u-avif-sample-images/hato.profile0.8bpc.yuv420.avif":"07cd454de19dd638354f75d9e97aab08bc8a04dd45c4f7531cb62a1a5656c8c9","link-u-avif-sample-images/hato.profile0.8bpc.yuv420.monochrome.avif":"120a3f26f3d6cde80869fb52bdb8fdd55b443882c98070ea938575e4790982ff","link-u-avif-sample-images/hato.profile2.10bpc.yuv422.avif":"d54251d4bc023f2e53624a46cb18e56cbc45768bd1bd50394de191c2a42106e8","link-u-avif-sample-images/hato.profile2.10bpc.yuv422.monochrome.avif":"ed33dfdb5e663b3394298b6921f9b19b129e14788dead776430eee2f14780a73","link-u-avif-sample-images/hato.profile2.12bpc.yuv422.avif":"ad361ac7d94fbc6af7ef30cbd3601ff366bc360c304480387a58a4c6fecee9b6","link-u-avif-sample-images/hato.profile2.12bpc.yuv422.monochrome.avif":"e28b4cacda95750e465e205fbfcba6a6af1d8418dac649838730c555ff7d828f","link-u-avif-sample-images/hato.profile2.8bpc.yuv422.avif":"69c353c482c2eb3d3671bb55f7ccfc932e4d781c714a72116e9138ffc6f6c720","link-u-avif-sample-images/hato.profile2.8bpc.yuv422.monochrome.avif":"e7d6f7d42a8519e1482f225fe447b5642d19a54ee830529223eac114a0dec189","link-u-avif-sample-images/images.html":"9e18453dfe5b205600f158282c6896265281e3b04b2fbc332804fab1dbdb3faf","link-u-avif-sample-images/kimono.avif":"63412e0f67f37c8b6fcf0e8269a2afae0a017fa6a3a99d37d055c590b0be52d3","link-u-avif-sample-images/kimono.crop.avif":"f175dcd9c64813b759da185fa67076fb772b76059845b2aad3ddcfab257f75ad","link-u-avif-sample-images/kimono.crop.png":"0d5605bae0ec9d39aad9dc8e1a371d0327c6a224643983e3ee1f4d44cb00f19d","link-u-avif-sample-images/kimono.jpg":"a6ad58e3cea437ee0c841115ba67ae7354de7af734de50de9d0853dd4e571577","link-u-avif-sample-images/kimono.mirror-horizontal.avif":"2bbc004d91145488610158a5acdb4d706495a2b15511db20ff57bb9efd80885c","link-u-avif-sample-images/kimono.mirror-horizontal.png":"9af9e839fe6bf6342831970c20291f619570d2fc687951ae00cd81ea766f53fe","link-u-avif-sample-images/kimono.mirror-vertical.avif":"f10eb04791fcca3409868b367128649f32e6b6fffcf02484cdefa57909f6bb74","link-u-avif-sample-images/kimono.mirror-vertical.png":"4ed003c5868fd2e78c7b2dcbd54a67a0e7593dabb3ac82b1c9e5e2dbdf09b8ec","link-u-avif-sample-images/kimono.mirror-vertical.rotate270.avif":"33c36ec2274b00ac6f81c9f61e55c20cbfce1649ad27520afe635310f516ead1","link-u-avif-sample-images/kimono.mirror-vertical.rotate270.crop.avif":"90ca48f657455b8f8e4a4e1769a05af90a3e34dca11a8b3c32552daf378ee956","link-u-avif-sample-images/kimono.mirror-vertical.rotate270.png":"74b9b7ffa8955761f747a0e6e81d5b7ecb5e325383546110e1b6aa9986728035","link-u-avif-sample-images/kimono.png":"84fd6cfb97a27739608e21779f874b4ae7e80342b2588e8b0b092dee2d57c881","link-u-avif-sample-images/kimono.rotate270.avif":"79a99a0415276cc11f2e871d070a9df84df3385888a2f2fa3534320f6bed98ed","link-u-avif-sample-images/kimono.rotate270.png":"1918a47c02b378945a705301abd4250ddc65bb95afce9424572ffd0fdd1f45ef","link-u-avif-sample-images/kimono.rotate90.avif":"bd1157d8c840713c82b907b9d3ae80bc3817849e11c323d875f8016e035bd3cc","link-u-avif-sample-images/kimono.rotate90.png":"1a73c61692abe96d0a7a9accdb36a83d51bceac79bbb83a00571570f494cca49","link-u-avif-sample-images/plum-blossom-large.png":"af6ea005b726ca39f342e946aa53bed88e5a140413ce896d166bb35ab0aa3b4f","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-full.avif":"cf8e15ec4b210235f3d68332a1adeb64e35c41b8d8e1e7586ae38b6d9cd8926c","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-full.monochrome.avif":"b413440309d5669a7aefa06f291f72de0d0c09972e3da9a385e6016d6a1c5562","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-limited.avif":"64f6f2b1fda594af5c9e2d6e4bc752b55e8121000cdcedc0066018e53f76de40","link-u-avif-sample-images/plum-blossom-large.profile0.10bpc.yuv420.alpha-limited.monochrome.avif":"2b175a600aed64c1c1de4b2d661fb405437b1ff000b964d4be6ac437ce73136f","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-full.avif":"21ebb3732186bf7c6c13cf7197155b64201e674b9c79cf613b6e5718bde14c2a","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-full.monochrome.avif":"65917797e511c9033b3e225eb5d84f3c0440b7a496d4b8ab5674e123ad68aab7","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-limited.avif":"f4809df9188fa46ed100f63c78c4cf42559d90a98351a8f69e177385920672b4","link-u-avif-sample-images/plum-blossom-large.profile0.8bpc.yuv420.alpha-limited.monochrome.avif":"dffc213dc36f0b5ff3d86254f5185c2d1fb03380918a8fa39d186fb59cbba7cc","link-u-avif-sample-images/plum-blossom-large.profile1.10bpc.yuv444.alpha-full.avif":"0a615cfb673ab45e37da3582c17dd36f86d5da3d81246a32951d1db4ed90149d","link-u-avif-sample-images/plum-blossom-large.profile1.10bpc.yuv444.alpha-limited.avif":"d1cc6a0db116a68e229676b289e8ced84d42a9f0e8d3ccd760fc92dbeb932547","link-u-avif-sample-images/plum-blossom-large.profile1.8bpc.yuv444.alpha-full.avif":"8626cf0b2c60fee51cf1df7fe4d8a18081b72e3604f7d3ff14cc5a35581927d9","link-u-avif-sample-images/plum-blossom-large.profile1.8bpc.yuv444.alpha-limited.avif":"56bf18e4bcbfbea460c306ab900fc506169854d2b91690e1a48156a86fff3264","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-full.avif":"b56f3c33797e4c5bb80418ae25f6f2c6fc88ddc1f6965d82abc44059f052f36c","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-full.monochrome.avif":"c3c6db4ce801c68e2afd7bfb72abacc13287cc2e247917a817ff5632bd4b18fb","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-limited.avif":"095f57fff1dc037a6414c60263415dcfa86b10d81f58e8e4c3aef17cffae0e5f","link-u-avif-sample-images/plum-blossom-large.profile2.10bpc.yuv422.alpha-limited.monochrome.avif":"ba3035a69296d12f47d1c450f2de8cc0c9059ebbf27bb8b0996ff6d1ab1132a1","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-full.avif":"a9551e1963049b874216b40aaf9be45bc44dc11887770712b77240862c6c08a9","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-full.monochrome.avif":"a8a0ba881cd0aef45a5874f412e97812ca457eaf12e56b34bac2ba051e142828","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-limited.avif":"6891b5bdbed7f541c673c66cec4584b191bb737a49b37cca16ae069830890b42","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv420.alpha-limited.monochrome.avif":"67e66826637e349e1c3c46316c7048d152aed8453d8cdd00c6b786f87fe176d8","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-full.avif":"a466503110f60dcadaafe78c2cb0a8ca58334c22868efe428c7ac12b69407c95","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-full.monochrome.avif":"a8a0ba881cd0aef45a5874f412e97812ca457eaf12e56b34bac2ba051e142828","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-limited.avif":"061b4c70707e7fc8866580656cca7ca2da2263645829a564dbf8f205d639f058","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv422.alpha-limited.monochrome.avif":"67e66826637e349e1c3c46316c7048d152aed8453d8cdd00c6b786f87fe176d8","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-full.avif":"4a03c8bcfcaadccdeb07432ed80680b06aba5ae5e616fc370b376acb478f6cd1","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-full.monochrome.avif":"a8a0ba881cd0aef45a5874f412e97812ca457eaf12e56b34bac2ba051e142828","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-limited.avif":"376625ce4e7ec3b57344a9f2185a34975fe380774c9f8e0dd4ef61c46da94fca","link-u-avif-sample-images/plum-blossom-large.profile2.12bpc.yuv444.alpha-limited.monochrome.avif":"67e66826637e349e1c3c46316c7048d152aed8453d8cdd00c6b786f87fe176d8","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-full.avif":"1e17b7dd8e351cb667bc6ec0b81fdebca9fd30ad5e588b3eac57bf9f90a9b58b","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-full.monochrome.avif":"f77588d2ff39e4461869a95ca236efdf4a3fdc17b8a6e3907e63b417e56c81b5","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-limited.avif":"f2eabd3fc2db07b361d55b5af63023d28b5bdd0047a665e9d0685651ce9db94b","link-u-avif-sample-images/plum-blossom-large.profile2.8bpc.yuv422.alpha-limited.monochrome.avif":"dd88c377b253d689bfd4600d7c3007448df0ed92f679b661d5d51e051a6916d8","link-u-avif-sample-images/plum-blossom-small.png":"c859fd97b647e494461f65835b9c1c3476807aee77076599adf18a832b3617a4","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-full.avif":"fe3379620f983e5da4210b0f7c5d164e86208b34106d6b11d56e2b52beee5dfe","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-full.monochrome.avif":"9e6234686053dba2e44bb32192c641074095a61e45aa1bede85bb83751e6e157","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-limited.avif":"60ffa59dd007aea3bb596cfb03853b3dad490b1ffd10471ad4fe1901ec819907","link-u-avif-sample-images/plum-blossom-small.profile0.10bpc.yuv420.alpha-limited.monochrome.avif":"58abfa027525aca7339a705f311bc30b000aef9822c7c50b232894ece1ba9cb1","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-full.avif":"541ca66a11b1430d11f77b74a13f859239a3bd9f44976b8dfe163c5d7595a69f","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-full.monochrome.avif":"6d7852c63c27a77bef94443e178ecf6b6a3da8cc846f9f0c1adc17f7fc35e1f3","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-limited.avif":"3712216ffc7edb95a976b68469ead533fda6fe9f3d2e8cb09cbdb0d01d9c094b","link-u-avif-sample-images/plum-blossom-small.profile0.8bpc.yuv420.alpha-limited.monochrome.avif":"59672af536b169ebf7e48129167dc91cb253925517c37db28b64539f7afba5d3","link-u-avif-sample-images/plum-blossom-small.profile1.10bpc.yuv444.alpha-full.avif":"561d5158425ad39425916a3be048b0202e82efef44cf1a9f711db57192d2ff01","link-u-avif-sample-images/plum-blossom-small.profile1.10bpc.yuv444.alpha-limited.avif":"88336f29457c1dc4ae0b754ef14b791de4d8c337f2b44d7960aafcca08a5586e","link-u-avif-sample-images/plum-blossom-small.profile1.8bpc.yuv444.alpha-full.avif":"245a3dad6371dc702f29eb7e9735f843b63c525da871859728bedbe5bb274985","link-u-avif-sample-images/plum-blossom-small.profile1.8bpc.yuv444.alpha-limited.avif":"490c216b5850c670f6088ee72c7fd906102b2dd0c8432c01a517b3328db27c75","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-full.avif":"0d0bbbcb0c9ade1c827317a6409ce6ba25027b36da1b6752379a5f5d4c8af056","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-full.monochrome.avif":"418a9d4b7dcbc1f67fc4b95ccb2e7946c446fddd35a79f0d587b3f2165cb3f14","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-limited.avif":"a41dcfabb3795ed93a05881a91bf4d1c5d1b9b0e5d0db728f12684b12613e0c9","link-u-avif-sample-images/plum-blossom-small.profile2.10bpc.yuv422.alpha-limited.monochrome.avif":"4b6a18f4f608d1b00598e67c1c91a4e8f4943ae5acf0166ae0121cc21f3b7437","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-full.avif":"5e6b83adee3aeac4bba3f38e854e2ed7585aa1557a74b5fa66596098c53e26f2","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-full.monochrome.avif":"fb0937564c08f4e1c22ebbde426a0eff6a1d388434c30148bc7e5582dc378caa","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-limited.avif":"f42e780bff644167e27525fee65b23e70814f7665ea19b6d693eb127c5eeebd8","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv420.alpha-limited.monochrome.avif":"d41ead1d69d33d0cf5f6fe575beb5f60d9565300c535f9042113dd8a748c1d31","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-full.avif":"c6ee9234ee7783d0203f9512e3cc8fe76a694675bcf03c320ff8bab4684bd4e9","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-full.monochrome.avif":"fb0937564c08f4e1c22ebbde426a0eff6a1d388434c30148bc7e5582dc378caa","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-limited.avif":"21e1e51fc6da66e090e12e1df5aeabf1f478df64bcb8151caaa687ad262bdd9d","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv422.alpha-limited.monochrome.avif":"d41ead1d69d33d0cf5f6fe575beb5f60d9565300c535f9042113dd8a748c1d31","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-full.avif":"dfed73d646d7159d3ee4f9ce95ea628fdd33bf8bf1bb02a83d88302d088f4d97","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-full.monochrome.avif":"fb0937564c08f4e1c22ebbde426a0eff6a1d388434c30148bc7e5582dc378caa","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-limited.avif":"5539cd575256772ba31d6e87cb0136d5f465f84b041a4677b1023cfd6bee9956","link-u-avif-sample-images/plum-blossom-small.profile2.12bpc.yuv444.alpha-limited.monochrome.avif":"d41ead1d69d33d0cf5f6fe575beb5f60d9565300c535f9042113dd8a748c1d31","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-full.avif":"f205cf2c05265b84e45ceb723e9a3707fd8749130166d4797e64c8c62b497f8c","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-full.monochrome.avif":"ad2244cb7b2ac487a5104d6e5a07270f9ceb2550e4d56d3662fcc1868910ced5","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-limited.avif":"7ef9468effdc970e4e6e8cc7533d66dc967686e357dda3dda186c021f9e6156b","link-u-avif-sample-images/plum-blossom-small.profile2.8bpc.yuv422.alpha-limited.monochrome.avif":"3dd34d854ff83b6e27a2bf98301380a6cac272084ed863735285ab5dc8acda00","link-u-avif-sample-images/plum-blossom.svg":"be1f03dd05f63292c85a96b1c48fb06727283610cc69b1e116d547bab27b171d","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-10bpc.avif":"5842951d81118d256962384e08a986816e8ade6b05530269f0208c6b69cedb3b","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-12bpc.avif":"1f0c9f36d69b9aa13eff3897ada3e78b81099c613b329a402c27e09453e7e261","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-8bpc.avif":"3e6f2f4016e66e3c94707eaa8373e6f582321e005964cd35b64bc183e1bf10ea","link-u-avif-sample-images/red-at-12-oclock-with-color-profile-lossy.avif":"79483242f2dca12c4ec18bd33ff8099216b3094fb55a26a909f046b2f9b4ce58","link-u-avif-sample-images/red-at-12-oclock-with-color-profile.jpg":"d56f809ea5eda74578af57e2f80b41856a1fe2ff436c741aa58757387af998bd","link-u-avif-sample-images/red-at-12-oclock-with-color-profile.png":"4eab95e358eb48e052c7b8c94d30a8c6cb1c9c3c2dfd9845240281dd5dd7b800","link-u-avif-sample-images/scripts/compare.sh":"0562689bcd40e9fc1322bf037d6f999aa4406a2229f19e74b96cc450e370e429","link-u-avif-sample-images/star-10bpc-with-alpha.avifs":"5643ac1f235ae6599186dd66c66507db6fa46a17b2b18e82ea9344870eb98a9b","link-u-avif-sample-images/star-10bpc.avifs":"c61d899a59dbd8c7b2f7bcfca9069a0e13ff1606899af227938a28502e6cbf88","link-u-avif-sample-images/star-12bpc-with-alpha.avifs":"88a350c3550ce36c1777fe7eb1e906c6829d3ed8b241aa1e0e46f1a4e2567c4b","link-u-avif-sample-images/star-12bpc.avifs":"c1a59db6f180208a3177d77c7f9ab08290e903c7bdaf929331b807a510f8c619","link-u-avif-sample-images/star-8bpc-with-alpha.avifs":"13a12908cb162a855cccc9221a5f9f736e8ea07902ffbdcf007f8fde5ed255f2","link-u-avif-sample-images/star-8bpc.avifs":"ae35b161de67a5afeb195ee401f369c34990f0ff8662f70ab4065bc6931f0a66","link-u-avif-sample-images/star.gif":"389cdd02efbdce4f0205cae6e91c1f64e34fa0ca1fe02351da1b37e16cbb642a","link-u-avif-sample-images/star.input.txt":"970163b942843618616f42233abe91d40fb68f6f5451860db259551711867b55","link-u-avif-sample-images/star.png":"18569167cf7ebd265ab6973d071d259aacfbb46c0408b7d4874c8cc9df9bb1ad","link-u-avif-sample-images/star.svg":"13089d0986b31b87919029fa69f2b68981af4023306bf0f79922f6772396008a","link-u-avif-sample-images/star180.png":"21bc11be2b51334fe4589634507612e7edce96d36e6a99219d029e440164e8b8","link-u-avif-sample-images/star270.png":"5c93f538dcdc70840b9925b4089083acc9c25e95265b3f3dea18d695451b441e","link-u-avif-sample-images/star90.png":"2defc5d21e70447653fec5dc14a697d9dd555d7a0c14e79cb2d9f80796a51a6d","src/boxes.rs":"270a3e3bf90279bfc83f95acadaba9611c25243280bca71dfa9c044d5441cf15","src/lib.rs":"a88d6cc10ec1322b53a8f4c782b5133135ace0fdfcf03d1624b768788e17be0f","src/macros.rs":"76c840f9299797527fe71aa5b378ffb01312767372b45cc62deddb19775400ae","src/tests.rs":"75fe5467109242b2cc7991f8228e2e2ad1de5be2f29272a4a7f08c4e21ab5fa4","src/unstable.rs":"c2cef9a3b2b08a4da66fa0305fce7a117bd99c9b8d57b0a044e1d99dbda6faf5","tests/1x1-black-alpha-50pct-premultiplied.avif":"31a8c235bf2cf601a593a7bc33f7f2779f2d5b2e0cd145897b931fce94b0c0b8","tests/a1lx.avif":"81a784c568e7619bd47c4e7153181e9a86c8a03221097aa63979f97affd7efbb","tests/a1op.avif":"184e50efd3ad226800c610da7bc470d29b548d9fa942fd1fd1848ed02e2e5f0a","tests/alpha_video_avif_major_avis_compatible.avif":"81771981248c4e0d708f0828eadb20e9e37e7c21280efe5726666958f899c237","tests/alpha_video_fixed.avif":"67051d1a4ccf9f3e38d4514d8a6b3a2e07f1beb979369cabdc60881a698a36ac","tests/alpha_video_no_avis.avif":"a95f0e7c818bc5bf646143cf43474b70722e17669d4f2a32874c125936207d6a","tests/amr_nb_1f.3gp":"d1423e3414ad06b69f8b58d5c916ec353ba2d0402d99dec9f1c88acc33b6a127","tests/amr_wb_1f.3gp":"be635b24097e8757b0c04d70ab28e00417ca113e86108b6c269b79b64b89bcd5","tests/av1C-missing-essential.avif":"a1501254c4071847b2269fe40b81409c389ff14e91cf7c0005a47e6ea97a6803","tests/bad-ipma-flags.avif":"ecde7997b97db1910b9dcc7ca8e3c8957da0e83681ea9008c66dc9f12b78ad19","tests/bad-ipma-version.avif":"7f9a1a0b4ebbf8d800d22eaae5ff78970cc6b811317db6c1467c6883952b7c9b","tests/bbb_sunflower_QCIF_30fps_h263_noaudio_1f.3gp":"03e5b1264d0a188d77b9e676ba3ce23a801b17aaa11c0343dfd851d6ea4e3a40","tests/clap-basic-1_3x3-to-1x1.avif":"83af9c8196fa93b2475163585a23d0eb5a8f8015d0db8da7a5d6de61adfb1876","tests/clap-missing-essential.avif":"4d61aacd2327661a456abc76d3d490e5ddd2b6f8cbfa52922a6c541c9d983193","tests/clusterfuzz-testcase-minimized-mp4-6093954524250112":"af7044a470732d4e7e34ac7ab5ff038c58b66f09702cbcd774931d7766bbfd35","tests/corrupt/a1lx-marked-essential.avif":"0d481240222450827ea335ae9a1a300777a0db4f9b0f4c17ed77c758c5133fa3","tests/corrupt/a1op-missing-essential.avif":"33c24d54f43f1a7be7a8334718881c8a0de24730c997c7842b9d7140e75017ea","tests/corrupt/alpha_video_moov_is_moop.avif":"89e0091edd6efc2c5b163525553c5abc56263fe1b3b885184bb07b9ea4bf346d","tests/corrupt/bug-1655846.avif":"e0a5a06225800fadf05f5352503a4cec11af73eef705c43b4acab5f4a99dea50","tests/corrupt/bug-1661347.avif":"31c26561e1d9eafb60f7c5968b82a0859d203d73f17f26b29276256acee12966","tests/corrupt/clusterfuzz-testcase-minimized-avif-4914209301856256.avif":"34a142c7916e314881f3fb6394add1c543fac0e5b45109e3a425eeb4c68998d0","tests/corrupt/hdlr-not-first.avif":"2c29308af077209b9c984921b7e36f8fb7ca7cf379cf8eba4c7a91f65bc7a304","tests/corrupt/hdlr-not-pict.avif":"9fe37619606645a95725300a9e34fada9190d1e0b3919881db84353941ca9291","tests/corrupt/imir-before-clap.avif":"22d6b5dacf0ef0be59053beba7564b08037fed859ada2885e3476e0ff0d19c95","tests/corrupt/invalid-avif-colr-multiple-nclx.avif":"7990a995855120dc4f724a6098816595becc35077fcd9e0de8c68300b49c4f1f","tests/corrupt/invalid-avif-colr-multiple-prof.avif":"b077a6b58e3a13ad743ee3f19fbae53b521eab8727606e0dba9bf06384f3121c","tests/corrupt/invalid-avif-colr-multiple-rICC.avif":"88b24d4d588744b9f2cdc03944f28283e9315eb3de7d7d57773a0541137f6529","tests/corrupt/invalid-avif-colr-multiple.zip":"9abddcbc47fde6da20263a29b770c6a9e76c8ab8dc785ef8512f35d9cb3206ed","tests/corrupt/ipma-duplicate-item_id.avif":"ca8c5275b0b8b79c1068489a52d0a5c8f0b4453463971e72b694189f11c10745","tests/corrupt/ipma-duplicate-version-and-flags.avif":"cf8e15ec4b210235f3d68332a1adeb64e35c41b8d8e1e7586ae38b6d9cd8926c","tests/corrupt/ipma-invalid-property-index.avif":"2480e773fa716d22883032d05fd4cf2c6b00fba8796cf4ff286a5d1ba26adff6","tests/corrupt/lsel-missing-essential.avif":"43c3b1e4c4acecd7559a9a7197a7befd43c71705748f0f8c063bca3be1c6d074","tests/corrupt/no-alpha-av1C.avif":"ad3d34d6331db7d9bea0c5f37efb88923520e33e08e7c636a5df435a4575eae7","tests/corrupt/no-av1C.avif":"eeb4fc50930c91465999f787c4a2a3b12de20556da0857be72da5a1a9eaa3f01","tests/corrupt/no-ftyp.avif":"74b431f32b2e2761e77df7fdb260f623b4e8f7e3f4c8af8a42d6826911706d7b","tests/corrupt/no-hdlr.avif":"91a1eb70c7b6adf2104e471d7deeeb98084a591d64ce09ba106c27edfbc3a409","tests/corrupt/no-ispe.avif":"4b6edfd8c9b40c25dc40305a6057e32b5e65f40da4a9d810c58dbff53254113f","tests/corrupt/no-pitm.avif":"7960eeb9e6e5140fbe5eb6d281e6974efd6c3c0147562f3dcf06f6b009dc540a","tests/corrupt/no-pixi-for-alpha.avif":"f8adc3573c79ee25bf6d4dd2693c61661469b28f86a5c7b1d9e41b0e8d2d53bb","tests/corrupt/no-pixi.avif":"4b1776def440dc8b913c170e4479772ee6bbb299b8679f7c564704bd03c9597e","tests/hdlr-nonzero-reserved.avif":"b872dcd7b4f49c6808d6da109cf4fedc26a237c42e8529c5aa8f7130abaf40a9","tests/imir-missing-essential.avif":"b1226e4b1358528befbd3f1126b5caf0c5051b4354777b87e71f6001f3829f87","tests/invalid-avif-hdlr-name-multiple-nul.avif":"0d3e4a6ce42154ee288c18339c2b59ff2104fd890cd2d616e5dbf26375a90e98","tests/irot-missing-essential.avif":"b7da1fc1d1b45bb1b7ca3494476e052f711d794a6d010df6870872ed8b9da10e","tests/lsel.avif":"ef8ba6827709f48cd45f749efb580129162d9599ea98f3363d2140957502d806","tests/multiple-extents.avif":"b5549ac68793e155a726d754e565cea0da03fa17833d3545f45c79e13f4c9360","tests/no-mif1.avif":"1442aa6ffaeb9512724287768bfd1850d3aa29a651ef05abb33e5dec2b3ee5c2","tests/overflow.rs":"16b591d8def1a155b3b997622f6ea255536870d99c3d8f97c51755b77a50de3c","tests/public.rs":"8918d5190a36c697445aa4b140a31cd3032582f1e504b4c2527f75a2155f80ae","tests/valid-alpha.avif":"9d417a35b9b62ad3ff66ffbc55f16552aacf821a092aa5ef4adff7e746bd4c2f","tests/valid-avif-colr-nclx-and-prof-and-rICC.avif":"ab6f5e786d26f8bcade5993f8b9cca3cd004a3d7fcec76e829f5d0f98cb18e7b","tests/valid-avif-colr-nclx-and-prof.avif":"0e982818de61869fcb85a2a4c2b7b8aeecb3053cbfdc6276987f91204998eefb","tests/valid-avif-colr-nclx-and-rICC.avif":"8530ef1305ff956a0c2912d0b3d1e0fc3a68cf3103e70b04cc2574530389b030","tests/valid-avif-colr-nclx.avif":"345ab58b7b1cb48aba2e21eb8dc5ab0a751a78a752ce1896c59b4bf361992f38","tests/valid-avif-colr-prof-and-rICC.avif":"1f0f085141106885bda78b0879c768818420d8196b39440a36578456a7d50a6c","tests/valid-avif-colr-prof.avif":"5d7aaefb5204ebe1cc296456866b8e46e023748b921a38ee56fd6c776a9733ff","tests/valid-avif-colr-rICC.avif":"e1c7b49bfad5904b484bd5118e6b33b78e2dc708a31a10fcbb0e4a373ed8dbb7","tests/valid.avif":"f0b33e09bf01232e0877df325f47986c0bee7764f2a81c9c908ae109e7dc63c4"},"package":null} +--- a/third_party/rust/mp4parse/src/lib.rs ++++ b//third_party/rust/mp4parse/src/lib.rs +@@ -3184,8 +3184,13 @@ macro_rules! impl_mul { + type Output = $output; + + fn mul(self, rhs: $rhs) -> Self::Output { +- static_assertions::const_assert!(<$output>::MAX <= <$inner>::MAX as u64); +- static_assertions::const_assert!(<$lhs>::MAX * <$rhs>::MAX <= <$output>::MAX); ++ static_assertions::const_assert!( ++ <$output as UpperBounded>::MAX <= <$inner>::MAX as u64 ++ ); ++ static_assertions::const_assert!( ++ <$lhs as UpperBounded>::MAX * <$rhs as UpperBounded>::MAX ++ <= <$output as UpperBounded>::MAX ++ ); + + let lhs: $inner = self.get().into(); + let rhs: $inner = rhs.get().into();