From c463b4f200bac76c9d5fd79ebd821d47b3a63d32 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 12 Sep 2023 18:43:09 -0400 Subject: [PATCH 01/78] nixos/environment: drop QT_PLUGIN_PATH for qt4 and kde4 as they has been removed --- nixos/modules/programs/environment.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index 3fbda153e0b4..b95cd7ffa53b 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -38,7 +38,6 @@ in { PATH = [ "/bin" ]; INFOPATH = [ "/info" "/share/info" ]; KDEDIRS = [ "" ]; - QT_PLUGIN_PATH = [ "/lib/qt4/plugins" "/lib/kde4/plugins" ]; QTWEBKIT_PLUGIN_PATH = [ "/lib/mozilla/plugins/" ]; GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" "/lib/gtk-4.0" ]; XDG_CONFIG_DIRS = [ "/etc/xdg" ]; From 1ae69c5842694099c7672a2fb3ffbadaf48c1371 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 13 Sep 2023 11:05:45 -0400 Subject: [PATCH 02/78] nixos/environment: drop KDEDIRS as a leftover from KDE4 --- nixos/modules/programs/environment.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index b95cd7ffa53b..1ea6c95273be 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -37,7 +37,6 @@ in environment.profileRelativeSessionVariables = { PATH = [ "/bin" ]; INFOPATH = [ "/info" "/share/info" ]; - KDEDIRS = [ "" ]; QTWEBKIT_PLUGIN_PATH = [ "/lib/mozilla/plugins/" ]; GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" "/lib/gtk-4.0" ]; XDG_CONFIG_DIRS = [ "/etc/xdg" ]; From 6a36d420f26d60539bd7131bf34c3afadf7a79e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 14 Sep 2023 19:32:55 +0200 Subject: [PATCH 03/78] betterbird: 102.15.0-bb40 -> 102.15.1-bb41 --- .../networking/mailreaders/betterbird/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/betterbird/default.nix b/pkgs/applications/networking/mailreaders/betterbird/default.nix index 2bf6cfbf6136..40292268a5bb 100644 --- a/pkgs/applications/networking/mailreaders/betterbird/default.nix +++ b/pkgs/applications/networking/mailreaders/betterbird/default.nix @@ -12,13 +12,13 @@ let thunderbird-unwrapped = thunderbirdPackages.thunderbird-102; - version = "102.15.0"; + version = "102.15.1"; majVer = lib.versions.major version; betterbird-patches = fetchFromGitHub { owner = "Betterbird"; repo = "thunderbird-patches"; - rev = "${version}-bb40"; + rev = "${version}-bb41"; postFetch = '' echo "Retrieving external patches" @@ -36,7 +36,7 @@ let . ./external.sh rm external.sh ''; - hash = "sha256-7/JEcP76rp0hSSxzlIlHqkcxTSEJQswFhCoOLYntQ5I="; + hash = "sha256-fP763ec4B8LbivzmYHzQ4j39QMxWrymqI8chXfF3KX8="; }; in ((buildMozillaMach { pname = "betterbird"; @@ -49,7 +49,7 @@ in ((buildMozillaMach { src = fetchurl { # https://download.cdn.mozilla.net/pub/thunderbird/releases/ url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "11d4c77049c532753c9b693d69ab9a0bcd0eb13d49f87a511ad8ba680b70041ac6f64c5f9cd5dd44246d46e7695d9bd51146b1fe62b0b7c9fbc862eb53d5cfda"; + hash = "sha256-og1Tu7PAHOqGs02jkHU291BCGuKDy1J+72v4Gsu4oDg="; }; extraPostPatch = thunderbird-unwrapped.extraPostPatch or "" + /* bash */ '' From 818a7517a1008f32b1085a0815857dbd5ae91fed Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 16 Sep 2023 10:28:41 -0400 Subject: [PATCH 04/78] biome: 1.2.1 -> 1.2.2 Diff: https://github.com/biomejs/biome/compare/cli/v1.2.1...cli/v1.2.2 Changelog: https://github.com/biomejs/biome/blob/cli/v1.2.2/CHANGELOG.md --- pkgs/development/tools/biome/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/biome/default.nix b/pkgs/development/tools/biome/default.nix index b067a25119b7..d92dee556c60 100644 --- a/pkgs/development/tools/biome/default.nix +++ b/pkgs/development/tools/biome/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "biome"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "biomejs"; repo = "biome"; rev = "cli/v${version}"; - hash = "sha256-/rIPIZX3w28xTn+UyAsB+lgfF0LDmxM92EofcPSCD+4="; + hash = "sha256-WiyORFXS1kpOaMCbnPdr5ewa6D4ozFTIRSArVlA2FvY="; }; - cargoHash = "sha256-5mX4RDACImjiU+nSuN9SzyibIMcUWYCAJfikX2gWIfg="; + cargoHash = "sha256-s2CVEGYRzJgsg4soETStpaJ7GDNdJCBJ+Qbn88sFlDQ="; nativeBuildInputs = [ pkg-config From f460c54fe1aed9df2d1319cdffe46bf8f0da97ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 16 Sep 2023 19:32:34 -0700 Subject: [PATCH 05/78] metadata-cleaner: 2.5.0 -> 2.5.4 Diff: https://gitlab.com/rmnvgr/metadata-cleaner/-/compare/v2.5.0...v2.5.4 Changelog: https://gitlab.com/rmnvgr/metadata-cleaner/-/blob/v2.5.4/CHANGELOG.md --- pkgs/applications/misc/metadata-cleaner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index 8d88612b728b..88df68f55979 100644 --- a/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/pkgs/applications/misc/metadata-cleaner/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "metadata-cleaner"; - version = "2.5.0"; + version = "2.5.4"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "rmnvgr"; repo = pname; rev = "v${version}"; - hash = "sha256-15qs2EsvEmQQPsarozP4HVpa0/3YJBSZ9M+1s/w5LaA="; + hash = "sha256-2+ZY+ca/CTIdCiFrBOkMWKflzKjSYJ8yfwFkULNg7Xk="; }; nativeBuildInputs = [ From 8ea1377e35f107b434a8c28b126a051191fa43c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 16 Sep 2023 23:28:54 -0700 Subject: [PATCH 06/78] abcmidi: 2023.06.25 -> 2023.09.13 --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 96a37cfa47f1..3d5474a0984a 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2023.06.25"; + version = "2023.09.13"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-Fn10QcwqKPerMh3OMJTMUQZ6nUMgBysXmxCbEOXSG0k="; + hash = "sha256-rpGINfLuWHu6QA/30aI9B8Hmpfx1o6vstiQn+t0blxA="; }; meta = with lib; { From 0dc0b0fd16623f7ac4951d41fa59927f0f4ac9a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 16 Sep 2023 23:36:18 -0700 Subject: [PATCH 07/78] python310Packages.pytube: 12.1.2 -> 15.0.0 Diff: https://github.com/pytube/pytube/compare/v12.1.2...v15.0.0 --- pkgs/development/python-modules/pytube/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytube/default.nix b/pkgs/development/python-modules/pytube/default.nix index a684e5ca6a39..2c8f714e500e 100644 --- a/pkgs/development/python-modules/pytube/default.nix +++ b/pkgs/development/python-modules/pytube/default.nix @@ -7,9 +7,9 @@ buildPythonPackage rec { pname = "pytube"; - version = "12.1.2"; + version = "15.0.0"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; format = "setuptools"; @@ -17,13 +17,17 @@ buildPythonPackage rec { owner = "pytube"; repo = "pytube"; rev = "v${version}"; - hash = "sha256-Y4mriCwFvwAZ3e8kHKo9/S2vReb4q+b8KTHxtQo8SEw="; + hash = "sha256-Nvs/YlOjk/P5nd1kpUnCM2n6yiEaqZP830UQI0Ug1rk="; }; nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = [ + "test_streaming" + ]; + disabledTestPaths = [ "tests/test_extract.py" "tests/test_query.py" From e64584735c479766489d6408ec696e9eaae6745e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 17 Sep 2023 00:01:33 -0700 Subject: [PATCH 08/78] python310Packages.svg2tikz: 1.2.0 -> 2.1.0 Diff: https://github.com/xyz2tex/svg2tikz/compare/refs/tags/v1.2.0...v2.1.0 Changelog: https://github.com/xyz2tex/svg2tikz/blob/refs/tags/v2.1.0/CHANGELOG.md --- .../development/python-modules/svg2tikz/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/svg2tikz/default.nix b/pkgs/development/python-modules/svg2tikz/default.nix index 18ca0bd263e3..b6623d3b8009 100644 --- a/pkgs/development/python-modules/svg2tikz/default.nix +++ b/pkgs/development/python-modules/svg2tikz/default.nix @@ -10,9 +10,9 @@ buildPythonPackage rec { pname = "svg2tikz"; - version = "1.2.0"; + version = "2.1.0"; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.7"; format = "pyproject"; @@ -20,14 +20,9 @@ buildPythonPackage rec { owner = "xyz2tex"; repo = "svg2tikz"; rev = "refs/tags/v${version}"; - hash = "sha256-oFcKRcXef1Uz0qFi6Gga/D4u8zW0RjXAnHDlhRr33Ts="; + hash = "sha256-v8+0h90uJlkI5eJcwCG55nxPz8n2aJXwP8Ocp48cl9M="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "+dairiki.1" "" - ''; - nativeBuildInputs = [ poetry-core ]; @@ -44,7 +39,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "svg2tikz" ]; meta = with lib; { - changelog = "https://github.com/xyz2tex/svg2tikz/blob/${src.rev}/README.md#changes-bug-fixes-and-known-problems-from-the-original"; + changelog = "https://github.com/xyz2tex/svg2tikz/blob/${src.rev}/CHANGELOG.md"; homepage = "https://github.com/xyz2tex/svg2tikz"; description = "Set of tools for converting SVG graphics to TikZ/PGF code"; license = licenses.gpl2Plus; From 3f293ea9ecd5c50e5bd393fd1c560275ea0e6975 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Sun, 17 Sep 2023 23:13:59 +0200 Subject: [PATCH 09/78] ugrep: 4.0.5 -> 4.1.0 --- pkgs/tools/text/ugrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 159c8ca594ac..edfc8cce6d08 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ugrep"; - version = "4.0.5"; + version = "4.1.0"; src = fetchFromGitHub { owner = "Genivia"; repo = "ugrep"; rev = "v${finalAttrs.version}"; - hash = "sha256-7cE8kbj8ChvHOPb1F7Fj9talg82nXpXRPt4oBSGSWZw="; + hash = "sha256-FZGZ60+SGCFOfdUOlUXMZee4Il0UmT8zRmsAVX6bGYY="; }; buildInputs = [ From 9ea632eadd875b9990d17bbc0b4f6da1c0ab7ce5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 17 Sep 2023 19:12:34 +0200 Subject: [PATCH 10/78] python310Packages.skorch: 0.14.0 -> 0.15.0 --- .../python-modules/skorch/default.nix | 38 +++++++++++++++---- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index 2f8b842d9a9a..13757f13e1aa 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -2,28 +2,46 @@ , stdenv , buildPythonPackage , fetchPypi -, pytestCheckHook -, flaky +, pythonOlder , numpy -, pandas -, torch , scikit-learn , scipy , tabulate +, torch , tqdm +, flaky +, pandas +, pytestCheckHook +, safetensors +, pythonAtLeast }: buildPythonPackage rec { pname = "skorch"; - version = "0.14.0"; + version = "0.15.0"; src = fetchPypi { inherit pname version; - hash = "sha256-/d0s0N40W18uGfVbD9VEbhbWfduoo+TBqDjmTkjMUxs="; + hash = "sha256-39XVBlCmbg162z9uL84GZrU+v+M8waXbGdVV72ZYf84="; }; - propagatedBuildInputs = [ numpy torch scikit-learn scipy tabulate tqdm ]; - nativeCheckInputs = [ flaky pandas pytestCheckHook ]; + disabled = pythonOlder "3.8"; + + propagatedBuildInputs = [ + numpy + scikit-learn + scipy + tabulate + torch + tqdm + ]; + + nativeCheckInputs = [ + flaky + pandas + pytestCheckHook + safetensors + ]; # patch out pytest-cov dep/invocation postPatch = '' @@ -41,6 +59,10 @@ buildPythonPackage rec { ] ++ lib.optionals stdenv.isDarwin [ # there is a problem with the compiler selection "test_fit_and_predict_with_compile" + ] ++ lib.optionals (pythonAtLeast "3.11") [ + # Python 3.11+ not yet supported for torch.compile + # https://github.com/pytorch/pytorch/blob/v2.0.1/torch/_dynamo/eval_frame.py#L376-L377 + "test_fit_and_predict_with_compile" ]; disabledTestPaths = [ From 443321aed24916a572c67c7cb0d678c3aff9ec0d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 18 Sep 2023 08:21:02 +0200 Subject: [PATCH 11/78] ocamlPackages.telegraml: prepare for batteries 3.7.1 --- pkgs/development/ocaml-modules/telegraml/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/telegraml/default.nix b/pkgs/development/ocaml-modules/telegraml/default.nix index 1aca2da2974c..d58e6adfe2e5 100644 --- a/pkgs/development/ocaml-modules/telegraml/default.nix +++ b/pkgs/development/ocaml-modules/telegraml/default.nix @@ -10,7 +10,6 @@ buildDunePackage rec { pname = "telegraml"; version = "unstable-2021-06-17"; - duneVersion = "3"; src = fetchFromGitHub { owner = "nv-vn"; @@ -19,6 +18,10 @@ buildDunePackage rec { sha256 = "sha256-2bMHARatwl8Zl/fWppvwbH6Ut+igJVKzwyQb8Q4gem4="; }; + postPatch = '' + substituteInPlace src/dune --replace batteries batteries.unthreaded + ''; + propagatedBuildInputs = [ batteries cohttp-lwt-unix From fefd0ab1c1b0c8225e87085572f95804f58eb3ae Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 18 Sep 2023 08:21:07 +0200 Subject: [PATCH 12/78] =?UTF-8?q?ocamlPackages.batteries:=203.6.0=20?= =?UTF-8?q?=E2=86=92=203.7.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/batteries/default.nix | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 38a28eafae8d..50a4ded50c61 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,34 +1,25 @@ -{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, qcheck, num, camlp-streams +{ stdenv, lib, fetchFromGitHub, buildDunePackage, ocaml, qtest, qcheck, num, camlp-streams , doCheck ? lib.versionAtLeast ocaml.version "4.08" && !stdenv.isAarch64 }: -if lib.versionOlder ocaml.version "4.02" -then throw "batteries is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-batteries"; - version = "3.6.0"; +buildDunePackage rec { + pname = "batteries"; + version = "3.7.1"; src = fetchFromGitHub { owner = "ocaml-batteries-team"; repo = "batteries-included"; rev = "v${version}"; - hash = "sha256-D/0h0/70V8jmzHIUR6i2sT2Jz9/+tfR2dQgp4Bxtimc="; + hash = "sha256-0ZCaJA9xowO9QxCWcyJ1zhqG7+GNkMYJt62+VPOFj4Y="; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; nativeCheckInputs = [ qtest ]; checkInputs = [ qcheck ]; propagatedBuildInputs = [ camlp-streams num ]; - strictDeps = true; - inherit doCheck; checkTarget = "test"; - createFindlibDestdir = true; - meta = { homepage = "https://ocaml-batteries-team.github.io/batteries-included/hdoc2/"; description = "OCaml Batteries Included"; @@ -38,7 +29,6 @@ stdenv.mkDerivation rec { language. ''; license = lib.licenses.lgpl21Plus; - inherit (ocaml.meta) platforms; maintainers = [ lib.maintainers.maggesi ]; From c7d62eecb9bfbc3954bbc11c628df83226cb9677 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 18 Sep 2023 08:21:11 +0200 Subject: [PATCH 13/78] ocamlPackages.batteries: enable tests on AArch64 --- pkgs/development/ocaml-modules/batteries/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 50a4ded50c61..16d9e7c50fb7 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, buildDunePackage, ocaml, qtest, qcheck, num, camlp-streams -, doCheck ? lib.versionAtLeast ocaml.version "4.08" && !stdenv.isAarch64 +, doCheck ? lib.versionAtLeast ocaml.version "4.08" }: buildDunePackage rec { From 6e55577f33e5dab722409fd88c0e506623f83748 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 18 Sep 2023 14:21:26 +0200 Subject: [PATCH 14/78] build-support/php/composer-local-repo-plugin: 1.0.0 -> 1.0.2 Also fix https://github.com/NixOS/nixpkgs/issues/255860 --- pkgs/build-support/php/hooks/composer-install-hook.sh | 2 +- pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/php/hooks/composer-install-hook.sh b/pkgs/build-support/php/hooks/composer-install-hook.sh index bb6cb47e861b..86d17d0f50f7 100644 --- a/pkgs/build-support/php/hooks/composer-install-hook.sh +++ b/pkgs/build-support/php/hooks/composer-install-hook.sh @@ -41,7 +41,7 @@ composerInstallBuildHook() { # Since this file cannot be generated in the composer-repository-hook.sh # because the file contains hardcoded nix store paths, we generate it here. - composer-local-repo-plugin --no-ansi build-local-repo -p "${composerRepository}" > packages.json + composer-local-repo-plugin --no-ansi build-local-repo -m "${composerRepository}" . # Remove all the repositories of type "composer" # from the composer.json file. diff --git a/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix b/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix index 67edbf1f44f9..f4f1cc1ff72e 100644 --- a/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix +++ b/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix @@ -27,13 +27,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "composer-local-repo-plugin"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "nix-community"; repo = "composer-local-repo-plugin"; rev = finalAttrs.version; - hash = "sha256-sjWV4JXK8YJ5XLASMPipKlk9u57352wIDV2PPFIP+sk="; + hash = "sha256-L1DPAINlYiC/HdcgDpI72OI58v8LWfhZVuS1vtNDnEw="; }; COMPOSER_CACHE_DIR = "/dev/null"; From 0850dcb31880f01ded53a92a18b0fb6d088bbda6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 18 Sep 2023 14:27:39 +0200 Subject: [PATCH 15/78] rectangle: 0.70 -> 0.71 --- pkgs/os-specific/darwin/rectangle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/rectangle/default.nix b/pkgs/os-specific/darwin/rectangle/default.nix index 3eb75ab432fc..b59c6051de72 100644 --- a/pkgs/os-specific/darwin/rectangle/default.nix +++ b/pkgs/os-specific/darwin/rectangle/default.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "rectangle"; - version = "0.70"; + version = "0.71"; src = fetchurl { url = "https://github.com/rxhanson/Rectangle/releases/download/v${version}/Rectangle${version}.dmg"; - hash = "sha256-YJYDzmFfLlXDupyEjoEAin5qynyLjXjuav1DSS/Q5zU="; + hash = "sha256-QsvEBTuLh5GyVzNTKaJAVwPNtYCc/3yH+U8VgXE4nk0="; }; sourceRoot = "."; @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://rectangleapp.com/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.darwin; - maintainers = with maintainers; [ Enzime Intuinewin ]; + maintainers = with maintainers; [ Enzime Intuinewin wegank ]; license = licenses.mit; }; } From fec31bb05134fe38fb89e521557eed9830c709dc Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 18 Sep 2023 10:30:38 -0400 Subject: [PATCH 16/78] cargo-shuttle: 0.25.1 -> 0.26.0 Diff: https://github.com/shuttle-hq/shuttle/compare/v0.25.1...v0.26.0 Changelog: https://github.com/shuttle-hq/shuttle/releases/tag/v0.26.0 --- .../tools/rust/cargo-shuttle/Cargo.lock | 62 ++++++++++++++----- .../tools/rust/cargo-shuttle/default.nix | 4 +- 2 files changed, 49 insertions(+), 17 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock b/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock index 3521b27b18f3..24af540157cf 100644 --- a/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock @@ -1141,7 +1141,7 @@ dependencies = [ [[package]] name = "cargo-shuttle" -version = "0.25.1" +version = "0.26.0" dependencies = [ "anyhow", "assert_cmd", @@ -5352,7 +5352,7 @@ dependencies = [ [[package]] name = "shuttle-admin" -version = "0.25.0" +version = "0.26.0" dependencies = [ "anyhow", "clap", @@ -5369,7 +5369,7 @@ dependencies = [ [[package]] name = "shuttle-auth" -version = "0.25.0" +version = "0.26.0" dependencies = [ "anyhow", "async-trait", @@ -5398,7 +5398,7 @@ dependencies = [ [[package]] name = "shuttle-codegen" -version = "0.25.0" +version = "0.26.0" dependencies = [ "pretty_assertions", "proc-macro-error", @@ -5415,7 +5415,7 @@ dependencies = [ [[package]] name = "shuttle-common" -version = "0.25.0" +version = "0.26.0" dependencies = [ "anyhow", "async-trait", @@ -5438,7 +5438,6 @@ dependencies = [ "opentelemetry-otlp", "pin-project", "proptest", - "prost-types", "rand", "reqwest", "ring", @@ -5464,20 +5463,23 @@ dependencies = [ [[package]] name = "shuttle-common-tests" -version = "0.25.0" +version = "0.26.0" dependencies = [ "cargo-shuttle", "hyper", "portpicker", "reqwest", "shuttle-common", + "shuttle-proto", "tokio", + "tokio-stream", + "tonic", "tower", ] [[package]] name = "shuttle-deployer" -version = "0.25.0" +version = "0.26.0" dependencies = [ "anyhow", "async-trait", @@ -5500,11 +5502,13 @@ dependencies = [ "opentelemetry-http", "pipe", "portpicker", + "prost-types", "rand", "rmp-serde", "serde", "serde_json", "shuttle-common", + "shuttle-common-tests", "shuttle-proto", "shuttle-service", "sqlx", @@ -5513,6 +5517,7 @@ dependencies = [ "tempfile", "thiserror", "tokio", + "tokio-stream", "toml 0.5.11", "tonic", "tower", @@ -5528,7 +5533,7 @@ dependencies = [ [[package]] name = "shuttle-gateway" -version = "0.25.0" +version = "0.26.0" dependencies = [ "anyhow", "async-trait", @@ -5584,9 +5589,35 @@ dependencies = [ "x509-parser", ] +[[package]] +name = "shuttle-logger" +version = "0.26.0" +dependencies = [ + "async-trait", + "chrono", + "clap", + "ctor", + "once_cell", + "portpicker", + "pretty_assertions", + "prost-types", + "serde_json", + "shuttle-common", + "shuttle-common-tests", + "shuttle-proto", + "sqlx", + "thiserror", + "tokio", + "tokio-stream", + "tonic", + "tracing", + "tracing-subscriber", + "uuid", +] + [[package]] name = "shuttle-proto" -version = "0.25.0" +version = "0.26.0" dependencies = [ "anyhow", "chrono", @@ -5604,7 +5635,7 @@ dependencies = [ [[package]] name = "shuttle-provisioner" -version = "0.25.0" +version = "0.26.0" dependencies = [ "aws-config", "aws-sdk-rds", @@ -5630,7 +5661,7 @@ dependencies = [ [[package]] name = "shuttle-resource-recorder" -version = "0.25.0" +version = "0.26.0" dependencies = [ "async-trait", "chrono", @@ -5654,12 +5685,13 @@ dependencies = [ [[package]] name = "shuttle-runtime" -version = "0.25.0" +version = "0.26.0" dependencies = [ "anyhow", "async-trait", "cap-std", "chrono", + "colored", "crossbeam-channel", "futures", "hyper", @@ -5678,8 +5710,8 @@ dependencies = [ "tokio-stream", "tonic", "tower", - "tracing", "tracing-subscriber", + "uuid", "wasi-common", "wasmtime", "wasmtime-wasi", @@ -5687,7 +5719,7 @@ dependencies = [ [[package]] name = "shuttle-service" -version = "0.25.0" +version = "0.26.0" dependencies = [ "anyhow", "async-trait", diff --git a/pkgs/development/tools/rust/cargo-shuttle/default.nix b/pkgs/development/tools/rust/cargo-shuttle/default.nix index 5e3f2cca245c..db18ac85ab65 100644 --- a/pkgs/development/tools/rust/cargo-shuttle/default.nix +++ b/pkgs/development/tools/rust/cargo-shuttle/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-shuttle"; - version = "0.25.1"; + version = "0.26.0"; src = fetchFromGitHub { owner = "shuttle-hq"; repo = "shuttle"; rev = "v${version}"; - hash = "sha256-UB9S3Ougd7t+D3oAYE9i6AUY76bNKrr605W6GWh1vb0="; + hash = "sha256-O6erIv+6DbxioB4F1Mfaj51zSswQErcUuFdA+A7DQRA="; }; cargoLock = { From d8f4c08f371f72e6bea1b4106fc852d2b9e6e4ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 18 Sep 2023 18:11:36 +0200 Subject: [PATCH 17/78] nextcloud25: 25.0.10 -> 25.0.11 --- pkgs/servers/nextcloud/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 1093d49b3202..aec0e05c5646 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -6,7 +6,7 @@ let generic = { - version, sha256 + version, hash , eol ? false, extraVulnerabilities ? [] , packages }: let @@ -17,7 +17,7 @@ let src = fetchurl { url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2"; - inherit sha256; + inherit hash; }; # This patch is only necessary for NC version <26. @@ -60,8 +60,8 @@ in { ''; nextcloud25 = generic { - version = "25.0.10"; - sha256 = "sha256-alvh0fWESSS5KbfiKI1gaoahisDWnfT/bUhsSEEXfQI="; + version = "25.0.11"; + hash = "sha256-UkOCknG6t9uN8ry3dGZ0y7DS3KlQu7mS5K6UO+N+rtE="; packages = nextcloud25Packages; }; From 3f2929850f3dcd236298251adc3cd4deb63274a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 18 Sep 2023 18:11:46 +0200 Subject: [PATCH 18/78] nextcloud26: 26.0.5 -> 26.0.6 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index aec0e05c5646..27216660b012 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -66,8 +66,8 @@ in { }; nextcloud26 = generic { - version = "26.0.5"; - sha256 = "sha256-nhq0aAY4T1hUZdKJY66ZSlirCSgPQet8YJpciwJw1b4="; + version = "26.0.6"; + hash = "sha256-LKyP2S0kgjDc0Ea7u0RGmyIPWLAQ5j+V2APZhXVer2Y="; packages = nextcloud26Packages; }; From ff404e6b415aa67dfcdc8c8cec63bbe78d72d362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 18 Sep 2023 18:11:55 +0200 Subject: [PATCH 19/78] nextcloud27: 27.0.2 -> 27.1.0 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 27216660b012..5c0ead3ea5fa 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -72,8 +72,8 @@ in { }; nextcloud27 = generic { - version = "27.0.2"; - sha256 = "sha256-ei3OpDqjuPswM0fv2kxvN3M8yhE8juFt2fDl+2jHIS8="; + version = "27.1.0"; + hash = "sha256-wxZwWeacUXt64H87sLgyQz0yRnWFkIH+lT6kG8ffEkI="; packages = nextcloud27Packages; }; From 2a550d8ccddefcd1d2bbf51e5e29e18f9e15e9a1 Mon Sep 17 00:00:00 2001 From: gilice <104317939+gilice@users.noreply.github.com> Date: Mon, 18 Sep 2023 20:48:38 +0200 Subject: [PATCH 20/78] fluffychat: 1.13.0 -> 1.14.1 --- .../instant-messengers/fluffychat/default.nix | 6 +- .../instant-messengers/fluffychat/deps.json | 384 ++++++++---------- 2 files changed, 170 insertions(+), 220 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index 66ba7d3ae41e..2e47aa8ab66f 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -14,17 +14,17 @@ let in flutter.buildFlutterApplication rec { pname = "fluffychat"; - version = "1.13.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "krille-chan"; repo = "fluffychat"; rev = "refs/tags/v${version}"; - hash = "sha256-w29Nxs/d0b18jMvWnrRUjEGqY4jGtuEGodg+ncCAaVc="; + hash = "sha256-VTpZvoyZXJ5SCKr3Ocfm4iT6Z/+AWg+SCw/xmp68kMg="; }; depsListFile = ./deps.json; - vendorHash = "sha256-dkH+iI1KLsAJtSt6ndc3ZRBllZ9n21RNONqeeUzNQCE="; + vendorHash = "sha256-uGrz7QwETZGlwLbfKr1vDo0p/emK1ZCjCX2w0nNVJsA="; desktopItem = makeDesktopItem { name = "Fluffychat"; diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/deps.json b/pkgs/applications/networking/instant-messengers/fluffychat/deps.json index 80e26e4883ba..b1fd21c10866 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/deps.json +++ b/pkgs/applications/networking/instant-messengers/fluffychat/deps.json @@ -1,7 +1,7 @@ [ { "name": "fluffychat", - "version": "1.13.0+3514", + "version": "1.14.1+3516", "kind": "root", "source": "root", "dependencies": [ @@ -47,14 +47,13 @@ "flutter_webrtc", "future_loading_dialog", "geolocator", - "handy_window", + "go_router", "hive", "hive_flutter", "http", "image_picker", "intl", "just_audio", - "just_audio_mpv", "keyboard_shortcuts", "latlong2", "linkify", @@ -85,7 +84,6 @@ "vibration", "video_compress", "video_player", - "vrouter", "wakelock", "webrtc_interface", "dart_code_metrics", @@ -113,7 +111,7 @@ }, { "name": "win32", - "version": "5.0.5", + "version": "5.0.6", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -122,7 +120,7 @@ }, { "name": "ffi", - "version": "2.0.2", + "version": "2.1.0", "kind": "transitive", "source": "hosted", "dependencies": [] @@ -227,7 +225,7 @@ }, { "name": "plugin_platform_interface", - "version": "2.1.4", + "version": "2.1.5", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -320,7 +318,7 @@ }, { "name": "msix", - "version": "3.15.0", + "version": "3.16.1", "kind": "dev", "source": "hosted", "dependencies": [ @@ -397,7 +395,7 @@ }, { "name": "archive", - "version": "3.3.7", + "version": "3.3.9", "kind": "direct", "source": "hosted", "dependencies": [ @@ -730,7 +728,7 @@ }, { "name": "flutter_native_splash", - "version": "2.3.1", + "version": "2.3.2", "kind": "dev", "source": "hosted", "dependencies": [ @@ -810,7 +808,7 @@ }, { "name": "dart_code_metrics", - "version": "5.7.5", + "version": "5.7.6", "kind": "dev", "source": "hosted", "dependencies": [ @@ -969,7 +967,7 @@ }, { "name": "webrtc_interface", - "version": "1.1.0", + "version": "1.1.1", "kind": "direct", "source": "hosted", "dependencies": [] @@ -1012,26 +1010,116 @@ ] }, { - "name": "vrouter", - "version": "1.2.1", + "name": "video_player", + "version": "2.7.0", "kind": "direct", "source": "hosted", "dependencies": [ "flutter", - "url_strategy", - "url_launcher", - "move_to_background" + "html", + "video_player_android", + "video_player_avfoundation", + "video_player_platform_interface", + "video_player_web" ] }, { - "name": "move_to_background", - "version": "1.0.2", + "name": "video_player_web", + "version": "2.0.16", "kind": "transitive", "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "video_player_platform_interface" + ] + }, + { + "name": "video_player_platform_interface", + "version": "6.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "video_player_avfoundation", + "version": "2.4.9", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "video_player_platform_interface" + ] + }, + { + "name": "video_player_android", + "version": "2.4.9", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "video_player_platform_interface" + ] + }, + { + "name": "video_compress", + "version": "3.1.2", + "kind": "direct", + "source": "hosted", "dependencies": [ "flutter" ] }, + { + "name": "vibration", + "version": "1.8.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "device_info_plus" + ] + }, + { + "name": "device_info_plus", + "version": "9.0.3", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "device_info_plus_platform_interface", + "ffi", + "file", + "flutter", + "flutter_web_plugins", + "meta", + "win32", + "win32_registry" + ] + }, + { + "name": "win32_registry", + "version": "1.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi", + "win32" + ] + }, + { + "name": "device_info_plus_platform_interface", + "version": "7.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "plugin_platform_interface" + ] + }, { "name": "url_launcher", "version": "6.1.12", @@ -1081,7 +1169,7 @@ }, { "name": "url_launcher_macos", - "version": "3.0.5", + "version": "3.0.6", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1111,7 +1199,7 @@ }, { "name": "url_launcher_android", - "version": "6.0.36", + "version": "6.0.38", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1119,126 +1207,6 @@ "url_launcher_platform_interface" ] }, - { - "name": "url_strategy", - "version": "0.2.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter_web_plugins" - ] - }, - { - "name": "video_player", - "version": "2.7.0", - "kind": "direct", - "source": "hosted", - "dependencies": [ - "flutter", - "html", - "video_player_android", - "video_player_avfoundation", - "video_player_platform_interface", - "video_player_web" - ] - }, - { - "name": "video_player_web", - "version": "2.0.16", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "flutter_web_plugins", - "video_player_platform_interface" - ] - }, - { - "name": "video_player_platform_interface", - "version": "6.1.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "plugin_platform_interface" - ] - }, - { - "name": "video_player_avfoundation", - "version": "2.4.6", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "video_player_platform_interface" - ] - }, - { - "name": "video_player_android", - "version": "2.4.9", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "video_player_platform_interface" - ] - }, - { - "name": "video_compress", - "version": "3.1.2", - "kind": "direct", - "source": "hosted", - "dependencies": [ - "flutter" - ] - }, - { - "name": "vibration", - "version": "1.8.1", - "kind": "direct", - "source": "hosted", - "dependencies": [ - "flutter", - "device_info_plus" - ] - }, - { - "name": "device_info_plus", - "version": "9.0.2", - "kind": "direct", - "source": "hosted", - "dependencies": [ - "device_info_plus_platform_interface", - "ffi", - "file", - "flutter", - "flutter_web_plugins", - "meta", - "win32", - "win32_registry" - ] - }, - { - "name": "win32_registry", - "version": "1.1.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "ffi", - "win32" - ] - }, - { - "name": "device_info_plus_platform_interface", - "version": "7.0.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "meta", - "plugin_platform_interface" - ] - }, { "name": "universal_html", "version": "2.2.3", @@ -1277,7 +1245,7 @@ }, { "name": "unifiedpush_android", - "version": "2.1.1", + "version": "2.1.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1337,7 +1305,7 @@ }, { "name": "path_provider_windows", - "version": "2.1.7", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1350,7 +1318,7 @@ }, { "name": "path_provider_platform_interface", - "version": "2.0.6", + "version": "2.1.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1386,7 +1354,7 @@ }, { "name": "path_provider_linux", - "version": "2.1.11", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1399,18 +1367,17 @@ }, { "name": "xdg_directories", - "version": "1.0.0", + "version": "1.0.2", "kind": "transitive", "source": "hosted", "dependencies": [ "meta", - "path", - "process" + "path" ] }, { "name": "shared_preferences_foundation", - "version": "2.3.1", + "version": "2.3.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1488,7 +1455,7 @@ }, { "name": "share_plus", - "version": "7.0.2", + "version": "7.1.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1509,7 +1476,7 @@ }, { "name": "share_plus_platform_interface", - "version": "3.2.1", + "version": "3.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1524,7 +1491,7 @@ }, { "name": "path_provider", - "version": "2.0.15", + "version": "2.1.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1538,7 +1505,7 @@ }, { "name": "path_provider_foundation", - "version": "2.2.3", + "version": "2.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1548,7 +1515,7 @@ }, { "name": "path_provider_android", - "version": "2.0.27", + "version": "2.1.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1726,7 +1693,7 @@ }, { "name": "permission_handler", - "version": "10.4.2", + "version": "10.4.3", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1740,7 +1707,7 @@ }, { "name": "permission_handler_platform_interface", - "version": "3.11.1", + "version": "3.11.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1761,7 +1728,7 @@ }, { "name": "permission_handler_apple", - "version": "9.1.3", + "version": "9.1.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1771,7 +1738,7 @@ }, { "name": "permission_handler_android", - "version": "10.3.0", + "version": "10.3.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1792,7 +1759,7 @@ }, { "name": "package_info_plus", - "version": "4.0.2", + "version": "4.1.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1857,7 +1824,7 @@ }, { "name": "matrix", - "version": "0.22.2", + "version": "0.22.3", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2028,44 +1995,6 @@ "flutter" ] }, - { - "name": "just_audio_mpv", - "version": "0.1.6", - "kind": "direct", - "source": "hosted", - "dependencies": [ - "flutter", - "just_audio_platform_interface", - "mpv_dart" - ] - }, - { - "name": "mpv_dart", - "version": "0.0.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "eventify", - "path" - ] - }, - { - "name": "eventify", - "version": "1.0.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, - { - "name": "just_audio_platform_interface", - "version": "4.2.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "plugin_platform_interface" - ] - }, { "name": "just_audio", "version": "0.9.34", @@ -2115,9 +2044,19 @@ "flutter_web_plugins" ] }, + { + "name": "just_audio_platform_interface", + "version": "4.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, { "name": "image_picker", - "version": "1.0.0", + "version": "1.0.2", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2145,7 +2084,7 @@ }, { "name": "image_picker_platform_interface", - "version": "2.8.0", + "version": "2.9.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2192,7 +2131,7 @@ }, { "name": "file_selector_macos", - "version": "0.9.3", + "version": "0.9.3+1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2236,7 +2175,7 @@ }, { "name": "image_picker_for_web", - "version": "2.2.0", + "version": "3.0.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2248,7 +2187,7 @@ }, { "name": "image_picker_android", - "version": "0.8.7+3", + "version": "0.8.7+4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2279,14 +2218,25 @@ ] }, { - "name": "handy_window", - "version": "0.3.1", + "name": "go_router", + "version": "10.1.0", "kind": "direct", "source": "hosted", "dependencies": [ - "flutter" + "collection", + "flutter", + "flutter_web_plugins", + "logging", + "meta" ] }, + { + "name": "logging", + "version": "1.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, { "name": "geolocator", "version": "7.7.1", @@ -2332,7 +2282,7 @@ }, { "name": "flutter_webrtc", - "version": "0.9.37", + "version": "0.9.40", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2345,7 +2295,7 @@ }, { "name": "dart_webrtc", - "version": "1.1.1", + "version": "1.1.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2907,7 +2857,7 @@ }, { "name": "sqflite", - "version": "2.2.8+4", + "version": "2.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2918,7 +2868,7 @@ }, { "name": "sqflite_common", - "version": "2.4.5+1", + "version": "2.5.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2963,7 +2913,7 @@ }, { "name": "file_picker", - "version": "5.3.2", + "version": "5.3.3", "kind": "direct", "source": "hosted", "dependencies": [ @@ -3072,7 +3022,7 @@ }, { "name": "connectivity_plus", - "version": "4.0.1", + "version": "4.0.2", "kind": "direct", "source": "hosted", "dependencies": [ @@ -3119,7 +3069,7 @@ }, { "name": "wakelock_plus", - "version": "1.1.0", + "version": "1.1.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -3155,7 +3105,7 @@ }, { "name": "badges", - "version": "2.0.3", + "version": "3.1.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -3173,7 +3123,7 @@ }, { "name": "adaptive_dialog", - "version": "1.9.0-x-macos-beta.1", + "version": "1.9.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -3188,7 +3138,7 @@ }, { "name": "macos_ui", - "version": "2.0.0-beta.6", + "version": "2.0.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -3198,7 +3148,7 @@ }, { "name": "macos_window_utils", - "version": "1.1.3", + "version": "1.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ From 682493b2c4f2d31c7503774d913e12e01c30f52c Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 18 Sep 2023 16:18:51 +0200 Subject: [PATCH 21/78] team-list.nix: nixos-modules -> module-system The module system isn't about NixOS, so for consistent messaging, I'd like to rename this. If some of you would like to be in a team responsible for NixOS' _use_ of the module system, that would be great, but for consistency it should be a separate team. Note that this attribute isn't used anywhere - only generically at release time for the status update pings. --- maintainers/team-list.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 7bad8e74a217..cbaf7082f530 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -649,15 +649,15 @@ with lib.maintainers; { enableFeatureFreezePing = true; }; - nixos-modules = { + module-system = { members = [ ericson2314 infinisil qyliss roberth ]; - scope = "Maintain nixpkgs module system internals."; - shortName = "NixOS Modules / internals"; + scope = "Maintain Nixpkgs module system"; + shortName = "Module system"; enableFeatureFreezePing = true; }; From 4e2fcbf7ee7004690cc9e5a0e71e09cb27e3b8a7 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 18 Sep 2023 19:11:23 +0200 Subject: [PATCH 22/78] team-list.nix: remove members who did not join qyliss confirmed this Haven't seen ericson2314 do maint work on it, and he'd tell me if he wanted to. Co-authored-by: Silvan Mosberger --- maintainers/team-list.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index cbaf7082f530..86673fece431 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -651,9 +651,7 @@ with lib.maintainers; { module-system = { members = [ - ericson2314 infinisil - qyliss roberth ]; scope = "Maintain Nixpkgs module system"; From 3b605d204dae49e76fb3bc790f49df569abade39 Mon Sep 17 00:00:00 2001 From: Colt Frederickson Date: Wed, 13 Sep 2023 16:58:43 -0600 Subject: [PATCH 23/78] jna: add macos platforms --- pkgs/development/java-modules/jna/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/java-modules/jna/default.nix b/pkgs/development/java-modules/jna/default.nix index 615df5c72b36..00f4cd5fba83 100644 --- a/pkgs/development/java-modules/jna/default.nix +++ b/pkgs/development/java-modules/jna/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Java Native Access"; license = with licenses; [ lgpl21 asl20 ]; maintainers = with maintainers; [ nagy ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; changelog = "https://github.com/java-native-access/jna/blob/${version}/CHANGES.md"; }; } From 113b904e4eeb71d2c2317bbb0c675bc46426975c Mon Sep 17 00:00:00 2001 From: Felix Albrigtsen Date: Sun, 17 Sep 2023 02:26:04 +0200 Subject: [PATCH 24/78] thc-hydra: patch to build on darwin --- pkgs/tools/security/thc-hydra/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix index a7b6a96261f0..7222cc81780e 100644 --- a/pkgs/tools/security/thc-hydra/default.nix +++ b/pkgs/tools/security/thc-hydra/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { --replace "-lcurses" "-lncurses" ''; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-undef-prefix"; + nativeBuildInputs = lib.optionals withGUI [ pkg-config makeWrapper ]; buildInputs = [ @@ -45,6 +47,5 @@ stdenv.mkDerivation rec { license = licenses.agpl3Plus; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; - badPlatforms = platforms.darwin; # fails to build since v9.5 }; } From 67786d3c299c0f70cfa0f8f0f8ef6d48b4c745c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Sep 2023 01:44:35 +0000 Subject: [PATCH 25/78] eksctl: 0.156.0 -> 0.157.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index bf50e678a456..cb66e6d9fd5a 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.156.0"; + version = "0.157.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-E50MtMrZy2lnMjoYV4MJF+0YGLmGEioOF74rldXdOPU="; + hash = "sha256-OTWCTpxVBTJHaVmnuiGQEmRezDLLUnJKKKWYo+J5fLk="; }; - vendorHash = "sha256-maMORSR6ZAasUxAy4kXvua4C+/dWdZbDde2VIKSV8w4="; + vendorHash = "sha256-gOQ//+DJXn+5Ip0Ii1j08LD+op5WgHaPg/Wqz8Nwt1w="; doCheck = false; From f276974e8d117279efdc396ae1cc7f9f75994ede Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Sep 2023 02:38:17 +0000 Subject: [PATCH 26/78] ncmpc: 0.48 -> 0.49 --- pkgs/applications/audio/ncmpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 0333f95710e4..7459becc08d0 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -16,13 +16,13 @@ assert pcreSupport -> pcre != null; stdenv.mkDerivation rec { pname = "ncmpc"; - version = "0.48"; + version = "0.49"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "sha256-89hBaWFwMPBqSWDmsXND0PEc1a9Fte+p1ho5tWuZFlY="; + sha256 = "sha256-rqIlQQ9RhFrhPwUd9dZmMZiqwFinNoV46VaJ3pbyUI8="; }; buildInputs = [ glib ncurses libmpdclient boost ] From 068c6d4e036f7ad67e7661d6dbd5a95822229bcd Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 18 Sep 2023 22:51:43 -0400 Subject: [PATCH 27/78] typst-lsp: 0.9.5 -> 0.10.0 Diff: https://github.com/nvarner/typst-lsp/compare/v0.9.5...v0.10.0 Changelog: https://github.com/nvarner/typst-lsp/releases/tag/v0.10.0 --- .../language-servers/typst-lsp/Cargo.lock | 667 +++++++++--------- .../language-servers/typst-lsp/default.nix | 27 +- .../typst-lsp/update-typstfmt.patch | 22 - 3 files changed, 356 insertions(+), 360 deletions(-) delete mode 100644 pkgs/development/tools/language-servers/typst-lsp/update-typstfmt.patch diff --git a/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock b/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock index 0432ef322588..5977d079c179 100644 --- a/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock +++ b/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock @@ -30,9 +30,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -83,9 +83,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b74f44609f0f91493e3082d3734d98497e094777144380ea4db9f9905dd5b6" +checksum = "d495b6dc0184693324491a5ac05f559acc97bf937ab31d7a1c33dd0016be6d2b" dependencies = [ "flate2", "futures-core", @@ -102,7 +102,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -146,9 +146,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.2" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "biblatex" @@ -188,12 +188,6 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" -[[package]] -name = "bit_field" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" - [[package]] name = "bitflags" version = "1.3.2" @@ -221,9 +215,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.0" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" dependencies = [ "memchr", "serde", @@ -237,9 +231,9 @@ checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" @@ -249,9 +243,41 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "camino" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo-platform" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb9ac64500cc83ce4b9f8dafa78186aa008c8dea77a09b94cd307fd0cd5022a8" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", + "thiserror", +] [[package]] name = "castaway" @@ -276,9 +302,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chinese-number" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb8659add27dbba7575c058a3265d81cc078dc2693848445bf3788a883ec82c8" +checksum = "d9cec9efb10b00914876c7e7b1fdaec572b888443b4046cd11ba91eb8c5a1ccb" dependencies = [ "chinese-variant", "enum-ordinalize", @@ -294,14 +320,41 @@ checksum = "aeea139b89efab957972956e5d3e4efb66a6c261f726abf6911040cc8ef700f7" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", - "winapi", + "windows-targets", +] + +[[package]] +name = "ciborium" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" + +[[package]] +name = "ciborium-ll" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +dependencies = [ + "ciborium-io", + "half", ] [[package]] @@ -381,30 +434,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - [[package]] name = "crossbeam-utils" version = "0.8.16" @@ -414,12 +443,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - [[package]] name = "csv" version = "1.2.2" @@ -473,9 +496,9 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.5.2" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b101bb8960ab42ada6ae98eb82afcea4452294294c45b681295af26610d6d28" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", "hashbrown 0.14.0", @@ -525,9 +548,15 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + [[package]] name = "ecow" version = "0.1.2" @@ -571,7 +600,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -582,9 +611,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", @@ -607,22 +636,6 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" -[[package]] -name = "exr" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1e481eb11a482815d3e9d618db8c42a93207134662873809335a92327440c18" -dependencies = [ - "bit_field", - "flume", - "half", - "lebe", - "miniz_oxide", - "rayon-core", - "smallvec", - "zune-inflate", -] - [[package]] name = "fancy-regex" version = "0.11.0" @@ -685,19 +698,6 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -[[package]] -name = "flume" -version = "0.10.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" -dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "pin-project", - "spin 0.9.8", -] - [[package]] name = "fnv" version = "1.0.7" @@ -706,14 +706,14 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fontdb" -version = "0.13.1" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "237ff9f0813bbfc9de836016472e0c9ae7802f174a51594607e5f4ff334cb2f5" +checksum = "af8d8cbea8f21307d7e84bca254772981296f058a1d36b461bf4d83a7499fc9e" dependencies = [ "log", - "memmap2 0.5.10", "slotmap", - "ttf-parser", + "tinyvec", + "ttf-parser 0.19.2", ] [[package]] @@ -811,7 +811,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -851,10 +851,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi", - "wasm-bindgen", ] [[package]] @@ -875,9 +873,9 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "globmatch" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0e82f77d5e36ce0c3941a39a6d8fff8ed9553ae13586b31640d6885f7376097" +checksum = "3755076379cc2b2bbf53855fe718e1eed3093cfb769ebf5d290f617fa9cc09a0" dependencies = [ "globset", "log", @@ -918,12 +916,9 @@ dependencies = [ [[package]] name = "half" -version = "2.2.1" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" -dependencies = [ - "crunchy", -] +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "hashbrown" @@ -942,9 +937,9 @@ checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" [[package]] name = "hayagriva" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8a21ff266f0b113789bbf4a27da16330315eebbd7df8e844f95d29f92ad556d" +checksum = "065e90e53aa502be868a307f58ca6b46e31143641e809047c689de75619d8cea" dependencies = [ "biblatex", "chrono", @@ -1060,9 +1055,9 @@ dependencies = [ [[package]] name = "hypher" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927f74d31cdbfd8de201340c0bc474c52c9145193ccd8885fcede14005591aad" +checksum = "723e315d77ea8aa1aedf53ad979ff0e763cfa2a1b3403248e427ae052f403cad" [[package]] name = "iana-time-zone" @@ -1224,21 +1219,18 @@ dependencies = [ "bytemuck", "byteorder", "color_quant", - "exr", "gif", "jpeg-decoder", "num-rational", "num-traits", "png", - "qoi", - "tiff", ] [[package]] name = "imagesize" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72ad49b554c1728b1e83254a1b1565aea4161e28dabbfa171fc15fe62299caf" +checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" [[package]] name = "indexmap" @@ -1248,7 +1240,6 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", - "serde", ] [[package]] @@ -1259,8 +1250,15 @@ checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ "equivalent", "hashbrown 0.14.0", + "serde", ] +[[package]] +name = "indexmap-nostd" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" + [[package]] name = "instant" version = "0.1.12" @@ -1372,9 +1370,6 @@ name = "jpeg-decoder" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" -dependencies = [ - "rayon", -] [[package]] name = "js-sys" @@ -1400,12 +1395,6 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "lebe" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" - [[package]] name = "libc" version = "0.2.147" @@ -1447,9 +1436,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" [[package]] name = "lipsum" @@ -1498,18 +1487,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memmap2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" -dependencies = [ - "libc", -] +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "memmap2" @@ -1520,15 +1500,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - [[package]] name = "mime" version = "0.3.17" @@ -1556,15 +1527,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom", -] - [[package]] name = "native-tls" version = "0.2.11" @@ -1643,9 +1605,9 @@ checksum = "e25be21376a772d15f97ae789845340a9651d3c4246ff5ebb6a2b35f9c37bd31" [[package]] name = "object" -version = "0.32.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -1667,11 +1629,11 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl" -version = "0.10.56" +version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "cfg-if", "foreign-types", "libc", @@ -1688,7 +1650,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -1699,9 +1661,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.91" +version = "0.9.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ "cc", "libc", @@ -1864,9 +1826,9 @@ checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pdf-writer" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86af2eb3faa4614bc7fda8bd578c25e76a17ff3b1577be034b81e0c20527e204" +checksum = "9d77bc47c8968aa63f86a7e6693e270a6cbd1e3b784c364f1711a0ddecc71447" dependencies = [ "bitflags 1.3.2", "itoa", @@ -1920,7 +1882,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -1937,11 +1899,11 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pixglyph" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eefadd393715fe315c8cdcd587f893b818a6dfe4f6f9faeb44b764c7c38fd8b" +checksum = "f67591f21f6668e63c1cd85adab066ac8a92bc7b962668dd8042197a6e4b8f8f" dependencies = [ - "ttf-parser", + "ttf-parser 0.19.2", ] [[package]] @@ -1995,9 +1957,9 @@ dependencies = [ [[package]] name = "postcard" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9ee729232311d3cd113749948b689627618133b1c5012b77342c1950b25eaeb" +checksum = "d534c6e61df1c7166e636ca612d9820d486fe96ddad37f7abc671517b297488e" dependencies = [ "cobs", "serde", @@ -2051,15 +2013,6 @@ dependencies = [ "cc", ] -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] - [[package]] name = "quick-xml" version = "0.29.0" @@ -2108,28 +2061,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "rayon" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - [[package]] name = "rctree" version = "0.5.0" @@ -2167,9 +2098,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.3" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", @@ -2179,9 +2110,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", @@ -2190,9 +2121,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "reqwest" @@ -2240,9 +2171,9 @@ dependencies = [ [[package]] name = "resvg" -version = "0.32.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "142e83d8ae8c8c639f304698a5567b229ba65caba867bf4387bbc0ae158827cf" +checksum = "b6554f47c38eca56827eea7f285c2a3018b4e12e0e195cc105833c008be338f1" dependencies = [ "gif", "jpeg-decoder", @@ -2279,19 +2210,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "rosvgtree" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad747e7384940e7bf33b15ba433b7bad9f44c0c6d5287a67c2cb22cd1743d497" -dependencies = [ - "log", - "roxmltree", - "simplecss", - "siphasher 0.3.11", - "svgtypes", -] - [[package]] name = "roxmltree" version = "0.18.0" @@ -2309,9 +2227,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.38.8" +version = "0.38.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" dependencies = [ "bitflags 2.4.0", "errno", @@ -2322,9 +2240,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.6" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", @@ -2366,7 +2284,7 @@ dependencies = [ "bitflags 1.3.2", "bytemuck", "smallvec", - "ttf-parser", + "ttf-parser 0.18.1", "unicode-bidi-mirroring", "unicode-ccc", "unicode-general-category", @@ -2443,30 +2361,39 @@ dependencies = [ ] [[package]] -name = "serde" -version = "1.0.187" +name = "semver" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a7fe14252655bd1e578af19f5fa00fe02fd0013b100ca6b49fde31c41bae4c" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.188" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.187" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e46b2a6ca578b3f1d4501b12f78ed4692006d79d82a1a7c561c12dbc3d625eb8" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" dependencies = [ "itoa", "ryu", @@ -2481,7 +2408,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -2507,14 +2434,15 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.8.26" +version = "0.9.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" +checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" dependencies = [ - "indexmap 1.9.3", + "indexmap 2.0.0", + "itoa", "ryu", "serde", - "yaml-rust", + "unsafe-libyaml", ] [[package]] @@ -2619,9 +2547,6 @@ name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] [[package]] name = "stable_deref_trait" @@ -2692,7 +2617,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -2713,9 +2638,9 @@ dependencies = [ [[package]] name = "svg2pdf" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c966e59fd4afd959edcc226687f751a7d05c94d0477cca1a4c2b15a7220f2b24" +checksum = "f2adc7de163bd53f323850e65269280b2a66ffceee291cb8eca34f2eabc3acad" dependencies = [ "image", "miniz_oxide", @@ -2746,9 +2671,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" dependencies = [ "proc-macro2", "quote", @@ -2809,22 +2734,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -2859,22 +2784,11 @@ dependencies = [ "threadpool", ] -[[package]] -name = "tiff" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" -dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", -] - [[package]] name = "time" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" dependencies = [ "deranged", "itoa", @@ -2891,18 +2805,18 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733d258752e9303d392b94b75230d07b0b9c489350c69b851fc6c065fde3e8f9" +checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" dependencies = [ "time-core", ] [[package]] name = "tiny-skia" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce2986c82f77818c7b9144c70818fdde98db15308e329ae2f7204d767808fd3c" +checksum = "7db11798945fa5c3e5490c794ccca7c6de86d3afdd54b4eb324109939c6f37bc" dependencies = [ "arrayref", "arrayvec", @@ -2915,9 +2829,9 @@ dependencies = [ [[package]] name = "tiny-skia-path" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7acb0ccda1ac91084353a56d0b69b0e29c311fd809d2088b1ed2f9ae1841c47" +checksum = "2f60aa35c89ac2687ace1a2556eaaea68e8c0d47408a2e3e7f5c98a489e7281c" dependencies = [ "arrayref", "bytemuck", @@ -2975,7 +2889,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -3040,14 +2954,26 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c226a7bba6d859b63c92c4b4fe69c5b6b72d0cb897dbc8e6012298e6154cb56e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.20.0", ] [[package]] @@ -3061,9 +2987,22 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ff63e60a958cefbb518ae1fd6566af80d9d4be430a33f3723dfc47d1d411d95" dependencies = [ "indexmap 2.0.0", "serde", @@ -3123,7 +3062,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -3153,7 +3092,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -3189,12 +3128,14 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc09e402904a5261e42cf27aea09ccb7d5318c6717a9eec3d8e2e65c56b18f19" +checksum = "75327c6b667828ddc28f5e3f169036cb793c3f588d83bf0f262a7f062ffed3c8" dependencies = [ "once_cell", "opentelemetry", + "opentelemetry_sdk", + "smallvec", "tracing", "tracing-core", "tracing-log", @@ -3224,6 +3165,12 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" +[[package]] +name = "ttf-parser" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" + [[package]] name = "typed-arena" version = "2.0.2" @@ -3232,9 +3179,10 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typst" -version = "0.7.0" -source = "git+https://github.com/typst/typst.git?tag=v0.7.0#da8367e189b02918a8fe1a98fd3059fd11a82cd9" +version = "0.8.0" +source = "git+https://github.com/typst/typst.git?tag=v0.8.0#360cc9b9570f263d52530b98d0c93523e7bdb100" dependencies = [ + "base64", "bitflags 2.4.0", "bytemuck", "comemo", @@ -3243,7 +3191,7 @@ dependencies = [ "fontdb", "if_chain", "image", - "indexmap 1.9.3", + "indexmap 2.0.0", "log", "miniz_oxide", "oklab", @@ -3261,27 +3209,31 @@ dependencies = [ "svg2pdf", "time", "tiny-skia", - "toml", + "toml 0.8.0", "tracing", - "ttf-parser", + "ttf-parser 0.19.2", "typst-macros", - "typst-syntax", - "unicode-general-category", + "typst-syntax 0.8.0", "unicode-ident", "unicode-math-class", + "unicode-properties", "unicode-segmentation", "unscanny", "usvg", + "wasmi", + "xmlparser", + "xmlwriter", "xmp-writer", ] [[package]] name = "typst-library" -version = "0.7.0" -source = "git+https://github.com/typst/typst.git?tag=v0.7.0#da8367e189b02918a8fe1a98fd3059fd11a82cd9" +version = "0.8.0" +source = "git+https://github.com/typst/typst.git?tag=v0.8.0#360cc9b9570f263d52530b98d0c93523e7bdb100" dependencies = [ "az", "chinese-number", + "ciborium", "comemo", "csv", "ecow", @@ -3303,9 +3255,9 @@ dependencies = [ "smallvec", "syntect", "time", - "toml", + "toml 0.8.0", "tracing", - "ttf-parser", + "ttf-parser 0.19.2", "typed-arena", "typst", "unicode-bidi", @@ -3316,12 +3268,13 @@ dependencies = [ [[package]] name = "typst-lsp" -version = "0.9.5" +version = "0.10.0" dependencies = [ "anyhow", "async-compression", "async-trait", "bpaf", + "cargo_metadata", "chrono", "comemo", "dirs", @@ -3332,7 +3285,7 @@ dependencies = [ "internment", "itertools 0.11.0", "lazy_static", - "memmap2 0.7.1", + "memmap2", "once_cell", "opentelemetry", "opentelemetry-jaeger", @@ -3362,13 +3315,13 @@ dependencies = [ [[package]] name = "typst-macros" -version = "0.7.0" -source = "git+https://github.com/typst/typst.git?tag=v0.7.0#da8367e189b02918a8fe1a98fd3059fd11a82cd9" +version = "0.8.0" +source = "git+https://github.com/typst/typst.git?tag=v0.8.0#360cc9b9570f263d52530b98d0c93523e7bdb100" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -3387,18 +3340,34 @@ dependencies = [ "unscanny", ] +[[package]] +name = "typst-syntax" +version = "0.8.0" +source = "git+https://github.com/typst/typst.git?tag=v0.8.0#360cc9b9570f263d52530b98d0c93523e7bdb100" +dependencies = [ + "comemo", + "ecow", + "once_cell", + "serde", + "tracing", + "unicode-ident", + "unicode-math-class", + "unicode-segmentation", + "unscanny", +] + [[package]] name = "typstfmt_lib" -version = "0.2.0" -source = "git+https://github.com/astrale-sharp/typstfmt?rev=45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880#45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880" +version = "0.2.4" +source = "git+https://github.com/astrale-sharp/typstfmt?tag=0.2.4#41c834c0021b6f5fb7c603cd4f33a36657a988c9" dependencies = [ "globmatch", "itertools 0.10.5", "regex", "serde", - "toml", + "toml 0.7.8", "tracing", - "typst-syntax", + "typst-syntax 0.7.0", "unicode-segmentation", ] @@ -3465,6 +3434,12 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-properties" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f91c8b21fbbaa18853c3d0801c78f4fc94cdb976699bb03e832e75f7fd22f0" + [[package]] name = "unicode-script" version = "0.5.5" @@ -3489,6 +3464,12 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +[[package]] +name = "unsafe-libyaml" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" + [[package]] name = "unscanny" version = "0.1.0" @@ -3503,9 +3484,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -3521,9 +3502,9 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "usvg" -version = "0.32.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b44e14b7678bcc5947b397991432d0c4e02a103958a0ed5e1b9b961ddd08b21" +checksum = "14d09ddfb0d93bf84824c09336d32e42f80961a9d1680832eb24fdf249ce11e6" dependencies = [ "base64", "log", @@ -3536,26 +3517,27 @@ dependencies = [ [[package]] name = "usvg-parser" -version = "0.32.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90c8251d965c2882a636ffcc054340b1f13a6bce68779cb5b2084d8ffc2535be" +checksum = "d19bf93d230813599927d88557014e0908ecc3531666d47c634c6838bc8db408" dependencies = [ "data-url", "flate2", "imagesize", "kurbo", "log", - "rosvgtree", - "strict-num", + "roxmltree", + "simplecss", + "siphasher 0.3.11", "svgtypes", "usvg-tree", ] [[package]] name = "usvg-text-layout" -version = "0.32.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c4fed019d1af07bfe0f3bac13d120d7b51bc65b38cb24809cf4ed0b8b631138" +checksum = "035044604e89652c0a2959b8b356946997a52649ba6cade45928c2842376feb4" dependencies = [ "fontdb", "kurbo", @@ -3569,14 +3551,14 @@ dependencies = [ [[package]] name = "usvg-tree" -version = "0.32.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7371265c467cdae0ccc3655e2e3f310c695fb9f717c0d25187bf3b333f7b5159" +checksum = "7939a7e4ed21cadb5d311d6339730681c3e24c3e81d60065be80e485d3fc8b92" dependencies = [ - "kurbo", "rctree", "strict-num", "svgtypes", + "tiny-skia-path", ] [[package]] @@ -3611,9 +3593,9 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -3655,7 +3637,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", "wasm-bindgen-shared", ] @@ -3689,7 +3671,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3713,6 +3695,46 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wasmi" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f341edb80021141d4ae6468cbeefc50798716a347d4085c3811900049ea8945" +dependencies = [ + "smallvec", + "spin 0.9.8", + "wasmi_arena", + "wasmi_core", + "wasmparser-nostd", +] + +[[package]] +name = "wasmi_arena" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "401c1f35e413fac1846d4843745589d9ec678977ab35a384db8ae7830525d468" + +[[package]] +name = "wasmi_core" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a" +dependencies = [ + "downcast-rs", + "libm", + "num-traits", + "paste", +] + +[[package]] +name = "wasmparser-nostd" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724" +dependencies = [ + "indexmap-nostd", +] + [[package]] name = "web-sys" version = "0.3.64" @@ -3970,12 +3992,3 @@ dependencies = [ "syn 1.0.109", "synstructure", ] - -[[package]] -name = "zune-inflate" -version = "0.2.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" -dependencies = [ - "simd-adler32", -] diff --git a/pkgs/development/tools/language-servers/typst-lsp/default.nix b/pkgs/development/tools/language-servers/typst-lsp/default.nix index 7abe4811ba37..f6568e0ada63 100644 --- a/pkgs/development/tools/language-servers/typst-lsp/default.nix +++ b/pkgs/development/tools/language-servers/typst-lsp/default.nix @@ -1,36 +1,41 @@ { lib , rustPlatform , fetchFromGitHub +, fetchpatch , stdenv , darwin }: rustPlatform.buildRustPackage rec { pname = "typst-lsp"; - version = "0.9.5"; + version = "0.10.0"; src = fetchFromGitHub { owner = "nvarner"; repo = "typst-lsp"; rev = "v${version}"; - hash = "sha256-rV7vzI4PPyBJX/ofVCXnXd8eH6+UkGaAL7PwhP71t0k="; + hash = "sha256-rsG7YZjy4UgFGsehlslsrOAD5YMpVVBI2MERlxgniVA="; }; + patches = [ + # git information isn't available with fetchFromGitHub + # https://github.com/nvarner/typst-lsp/pull/303 + (fetchpatch { + name = "fix-build-when-git-information-is-not-available.patch"; + url = "https://github.com/nvarner/typst-lsp/commit/420de6235eb1aa492337a8cc43b04134a3ffab00.patch"; + hash = "sha256-Rs9pzSUg4YNGzYnX8tbOmCwbPyZ9P18Eyg451fa2Iqg="; + }) + ]; + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "typst-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg="; - "typstfmt_lib-0.2.0" = "sha256-DOh7WQowJXTxI9GDXfy73hvr3J+VcDqSDaClLlUpMsM="; + "typst-0.8.0" = "sha256-q2b/PoNwpzarJbIPzokYgZRD2/Oe/XB40C4VXdwL/NA="; + "typst-syntax-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg="; + "typstfmt_lib-0.2.4" = "sha256-d0vlZqg0RcRvZM7xYdMLX2/UeolUbqZ9H4drJRRKBmc="; }; }; - patches = [ - # update typstfmt to symlink its README.md into the library crate - # without this patch, typst-lsp fails to build when dependencies are vendored - # https://github.com/astrale-sharp/typstfmt/pull/81 - ./update-typstfmt.patch - ]; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/language-servers/typst-lsp/update-typstfmt.patch b/pkgs/development/tools/language-servers/typst-lsp/update-typstfmt.patch deleted file mode 100644 index 4c540b8257ce..000000000000 --- a/pkgs/development/tools/language-servers/typst-lsp/update-typstfmt.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -3390,7 +3390,7 @@ dependencies = [ - [[package]] - name = "typstfmt_lib" - version = "0.2.0" --source = "git+https://github.com/astrale-sharp/typstfmt?rev=cf0ac91#cf0ac9189a4a2d47f4bc833f2538dca032534455" -+source = "git+https://github.com/astrale-sharp/typstfmt?rev=45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880#45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880" - dependencies = [ - "globmatch", - "itertools 0.10.5", ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -70,7 +70,7 @@ tracing-subscriber = { version = "0.3.17", default-features = false, features = - "fmt", - ] } - walkdir = "2.3" --typstfmt_lib = { git = "https://github.com/astrale-sharp/typstfmt", rev = "cf0ac91" } -+typstfmt_lib = { git = "https://github.com/astrale-sharp/typstfmt", rev = "45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880" } - - # jaeger - opentelemetry = { version = "0.20.0", optional = true } From cd0f8741040c151636d218954d237db89dfd349f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Sep 2023 03:18:47 +0000 Subject: [PATCH 28/78] python310Packages.adafruit-platformdetect: 3.52.0 -> 3.52.1 --- .../python-modules/adafruit-platformdetect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index d7f3d2c9e523..11c01fe8dbb5 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.52.0"; + version = "3.52.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-RydAyIzWRVQ+/xCVPtZ4HQ7eCH8cxeHW1XjEupWlAqc="; + hash = "sha256-iAz+cGFUZWJIHNEzQyGjJkwVj9GOK8onHTO8t3bs13g="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 0656a6bbe25431fb1289066eefe266760b5c6bd0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Sep 2023 03:45:43 +0000 Subject: [PATCH 29/78] python310Packages.devito: 4.8.1 -> 4.8.2 --- pkgs/development/python-modules/devito/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix index b56c44579df4..208778465191 100644 --- a/pkgs/development/python-modules/devito/default.nix +++ b/pkgs/development/python-modules/devito/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "devito"; - version = "4.8.1"; + version = "4.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "devitocodes"; repo = "devito"; rev = "refs/tags/v${version}"; - hash = "sha256-LzqY//205XEOd3/f8k1g4OYndRHMTVplBogGJf5Forw="; + hash = "sha256-zckFU9Q5Rpj0TPeT96lXfR/yp2SYrV4sjAjqN/y8GDw="; }; pythonRemoveDeps = [ From 73f56ebb44169721b73fe01ba9af305ad2c6817b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Sep 2023 04:47:07 +0000 Subject: [PATCH 30/78] sd-local: 1.0.48 -> 1.0.49 --- pkgs/development/tools/sd-local/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/sd-local/default.nix b/pkgs/development/tools/sd-local/default.nix index da696c5d714c..bc89ce9c5259 100644 --- a/pkgs/development/tools/sd-local/default.nix +++ b/pkgs/development/tools/sd-local/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sd-local"; - version = "1.0.48"; + version = "1.0.49"; src = fetchFromGitHub { owner = "screwdriver-cd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cjPqVdHJt1/kxFCdjOKQIvq1V3KppHPeWozrawxdJek="; + sha256 = "sha256-cyu2J7clIyM6j9ELO2Xk/9agQHtvPtr9yHM/gRTzzG0="; }; vendorHash = "sha256-uHu8jPPQCJAhXE+Lzw5/9wyw7sL5REQJsPsYII+Nusc="; From 42cfdd46b35f4a5ad58d9eed4eb0761ea3a76984 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Sep 2023 05:48:39 +0000 Subject: [PATCH 31/78] cargo-crev: 0.24.3 -> 0.25.0 --- pkgs/development/tools/rust/cargo-crev/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index a4ac31210796..fa824ae613da 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-crev"; - version = "0.24.3"; + version = "0.25.0"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; rev = "v${version}"; - sha256 = "sha256-CCTG58dwO9gYe0WSUXFeaBSgvZ7pbX9S3B3hzabzkjo="; + sha256 = "sha256-Lt8ubK96ntcQJEnQ37nF8N4gJ8nmphwkbM6KJor13lo="; }; - cargoHash = "sha256-p2qAWAZ1Y0GI0t9wHmn5Ww3o5vXpA6rsA/D7HD2x6o0="; + cargoHash = "sha256-cYhzEVHpi7qMCU9fe3wxOQGX6YssJIeo4onLUBtqN6A="; preCheck = '' export HOME=$(mktemp -d) From 1e2db1049e380d53380ba8929727db7e8f42448a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Sep 2023 05:59:41 +0000 Subject: [PATCH 32/78] ruplacer: 0.8.1 -> 0.8.2 --- pkgs/tools/text/ruplacer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/ruplacer/default.nix b/pkgs/tools/text/ruplacer/default.nix index f85b3d627582..b44165d6ea88 100644 --- a/pkgs/tools/text/ruplacer/default.nix +++ b/pkgs/tools/text/ruplacer/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ruplacer"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "TankerHQ"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7qVjJLw90SUtXkfp40u/X84trnJzgCV6mp7b/yNmcPk="; + sha256 = "sha256-xuq+Scy5MyyGvI51Vs26pk9+NnlghzGEJDHYC3kSXNw="; }; - cargoSha256 = "sha256-AV6wxD2KZN53rlJofsDISL6p2dfgw+5F+GiP5u9/2/w="; + cargoHash = "sha256-Kevwpkvgq40LhWxhW9ra2Nd1zEiAF372DM1sY9hnQb0="; buildInputs = (lib.optional stdenv.isDarwin Security); From 3e88dd245d64f692f549471d97c95b05df3fba96 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Sep 2023 06:11:28 +0000 Subject: [PATCH 33/78] pocketbase: 0.18.3 -> 0.18.6 --- pkgs/servers/pocketbase/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index 58ee4cab598f..197035bc5684 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.18.3"; + version = "0.18.6"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-UwxE36y99vW/45Lnkm5qaevEToxIVs73YUJVDtr8ziA="; + hash = "sha256-QfipP/nq/vE0TnK/JGLIbO282bFSrnIgGzkfU6N+euY="; }; - vendorHash = "sha256-vb0957zO27OgrSTUiAt+vuo9NKM5ftz8mbFf613l0eM="; + vendorHash = "sha256-pDLj0Az7aQow1Q+7ANxv5kZQrqBby6gzkfAoV87/k9E="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; From 802456973b5bd0cb4a77ce6ff08445d17abfca44 Mon Sep 17 00:00:00 2001 From: Patrizio Bekerle Date: Tue, 19 Sep 2023 08:30:52 +0200 Subject: [PATCH 34/78] qc: 0.5.0 -> 0.5.1 --- pkgs/development/tools/qc/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/qc/default.nix b/pkgs/development/tools/qc/default.nix index 9be03518e5b6..786ab73758a8 100644 --- a/pkgs/development/tools/qc/default.nix +++ b/pkgs/development/tools/qc/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "qc"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "qownnotes"; repo = "qc"; rev = "v${version}"; - hash = "sha256-lNS2wrjG70gi6mpIYMvuusuAJL3LkAVh8za+KnBTioc="; + hash = "sha256-SrvcRF2yRGGPTk835ykG+NH9WPoc/bXO5tSj43Q7T3g="; }; vendorHash = "sha256-7t5rQliLm6pMUHhtev/kNrQ7AOvmA/rR93SwNQhov6o="; @@ -17,6 +17,7 @@ buildGoModule rec { "-s" "-w" "-X=github.com/qownnotes/qc/cmd.version=${version}" ]; + # There are no automated tests doCheck = false; subPackages = [ "." ]; From 026c784c2e653a0c20ff27c7239fd3587afa431b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 19 Sep 2023 08:33:42 +0200 Subject: [PATCH 35/78] python311Packages.hahomematic: 2023.9.2 -> 2023.9.3 Diff: https://github.com/danielperna84/hahomematic/compare/refs/tags/2023.9.2...2023.9.3 Changelog: https://github.com/danielperna84/hahomematic/releases/tag/2023.9.3 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index d1ece49b47a6..9a3d67da9973 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.9.2"; + version = "2023.9.3"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-h8zSj1jmqaQtJl3lPYGj7kEBucK7DAOkdUcDo7Opy7w="; + hash = "sha256-j8uM/vEfZO1C4jsYU68nTt/cmhRKsW2MTFG84g53vE4="; }; nativeBuildInputs = [ From 660af05e145bbef61dbfbbcc86703ce387225ea3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 19 Sep 2023 08:35:18 +0200 Subject: [PATCH 36/78] python311Packages.requests-pkcs12: 1.18 -> 1.21 Diff: https://github.com/m-click/requests_pkcs12/compare/1.18...1.21 --- pkgs/development/python-modules/requests-pkcs12/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requests-pkcs12/default.nix b/pkgs/development/python-modules/requests-pkcs12/default.nix index aee478432006..a4f59da74fc9 100644 --- a/pkgs/development/python-modules/requests-pkcs12/default.nix +++ b/pkgs/development/python-modules/requests-pkcs12/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "requests-pkcs12"; - version = "1.18"; + version = "1.21"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "m-click"; repo = "requests_pkcs12"; rev = version; - hash = "sha256-jZWaTcPM4EO8e+eVpYU8fQ4H53OzlaMUsT/d2DWuU+0="; + hash = "sha256-0avykVnMzClFqjDdC4BW9jnZzupinG5JUwq8TuCWkgo="; }; propagatedBuildInputs = [ From e4a186713d25e6d7b888f4f4f55e80317727af99 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 19 Sep 2023 08:37:09 +0200 Subject: [PATCH 37/78] qovery-cli: 0.70.0 -> 0.70.1 Diff: https://github.com/Qovery/qovery-cli/compare/refs/tags/v0.70.0...v0.70.1 Changelog: https://github.com/Qovery/qovery-cli/releases/tag/v0.70.1 --- pkgs/tools/admin/qovery-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index d5793e908e83..4b846b595333 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.70.0"; + version = "0.70.1"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XAgC6c+ZnPQVM/2jhEYAWZ4r4eFOFzwG36Q38sy63+s="; + hash = "sha256-g1X0DUbCwL9XTDeYsYNfXABNnyJqnB+E6nq7NynoMYk="; }; vendorHash = "sha256-OexoLqlPBr1JSL63lP172YaGJ0GLlxxsJYdXIGhNqjs="; From 28a4b95339798f2c4f62796c7fe0c56771db861f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 19 Sep 2023 08:40:17 +0200 Subject: [PATCH 38/78] checkSSLCert: 2.72.0 -> 2.74.0 Diff: https://github.com/matteocorti/check_ssl_cert/compare/refs/tags/v2.72.0...v2.74.0 Changelog: https://github.com/matteocorti/check_ssl_cert/releases/tag/v2.74.0 --- pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 21376aac9e97..be77ae102402 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.72.0"; + version = "2.74.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "refs/tags/v${version}"; - hash = "sha256-0FKxZL+PY9cU64OzzfoxaHv6/neAJPwqOKcBsiSY3dw="; + hash = "sha256-LOvJXF8J11uL70fPs2r48mGFkxqjIgMvtDn0Xrt5myE="; }; nativeBuildInputs = [ From 9bfe6dbee7e0b9a83e8b2cb9e89e9b3fcd95c973 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 19 Sep 2023 08:50:07 +0200 Subject: [PATCH 39/78] python311Packages.ossfs: 2023.5.0 -> 2023.8.0 Diff: https://github.com/fsspec/ossfs/compare/refs/tags/2023.5.0...2023.8.0 Changelog: https://github.com/fsspec/ossfs/releases/tag/2023.8.0 --- pkgs/development/python-modules/ossfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ossfs/default.nix b/pkgs/development/python-modules/ossfs/default.nix index 2989176dd2cd..9b30afeb4927 100644 --- a/pkgs/development/python-modules/ossfs/default.nix +++ b/pkgs/development/python-modules/ossfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ossfs"; - version = "2023.5.0"; + version = "2023.8.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-h9h5h2eJO1wzOR7oC2usrEx0ADSoKDu74YczAmZL9NU="; + hash = "sha256-v6QZgv1QwBrQpCwP/1z6704UNvQyoCrpQGkhTmncbjQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 90040cd36a1c01cf407f93315b268c1ead75e494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 18 Sep 2023 20:43:53 -0600 Subject: [PATCH 40/78] linux/hardened/patches/6.5: init at 6.5.3-hardened1 --- nixos/tests/kernel-generic.nix | 1 + pkgs/os-specific/linux/kernel/hardened/patches.json | 10 ++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/linux-kernels.nix | 2 ++ 4 files changed, 15 insertions(+) diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index e69dd550289c..148f66c464d6 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -32,6 +32,7 @@ let linux_5_15_hardened linux_6_1_hardened linux_6_4_hardened + linux_6_5_hardened linux_rt_5_4 linux_rt_5_10 linux_rt_5_15 diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c024f03dd0c4..659fc1a65c14 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -68,5 +68,15 @@ }, "sha256": "1phlx375ln5pslw5vjqm029cdv6pzf4ang10xlrf90x5sb4fgy93", "version": "6.4.15" + }, + "6.5": { + "patch": { + "extra": "-hardened1", + "name": "linux-hardened-6.5.3-hardened1.patch", + "sha256": "0p92x3f129hmk5r5xmxs5ihvg5cdl2bmqlhqza3wy4314f1kngl7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.5.3-hardened1/linux-hardened-6.5.3-hardened1.patch" + }, + "sha256": "0kzbcc3iar9i0hb99xf9k3b16lxb4f8qzmia0gwxrn3vn7vi7b2c", + "version": "6.5.3" } } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2a8b29b5b7b..8114377a37c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28376,6 +28376,8 @@ with pkgs; linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened; linuxPackages_6_4_hardened = linuxKernel.packages.linux_6_4_hardened; linux_6_4_hardened = linuxKernel.kernels.linux_6_4_hardened; + linuxPackages_6_5_hardened = linuxKernel.packages.linux_6_5_hardened; + linux_6_5_hardened = linuxKernel.kernels.linux_6_5_hardened; # Hardkernel (Odroid) kernels. linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 07429cee853a..39336f07529b 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -267,6 +267,7 @@ in { linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; linux_6_4_hardened = hardenedKernelFor kernels.linux_6_4 { }; + linux_6_5_hardened = hardenedKernelFor kernels.linux_6_5 { }; } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; @@ -626,6 +627,7 @@ in { linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened); linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened); linux_6_4_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_4_hardened); + linux_6_5_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_5_hardened); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); From e3a6b0c4eb15f003b3d7890230bd1a15fe4531e3 Mon Sep 17 00:00:00 2001 From: Enno Richter Date: Thu, 14 Sep 2023 12:04:07 +0200 Subject: [PATCH 41/78] python3Packages.django-ninja: init at 0.22.2 --- .../python-modules/django-ninja/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/django-ninja/default.nix diff --git a/pkgs/development/python-modules/django-ninja/default.nix b/pkgs/development/python-modules/django-ninja/default.nix new file mode 100644 index 000000000000..620960797ea0 --- /dev/null +++ b/pkgs/development/python-modules/django-ninja/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, django +, fetchFromGitHub +, flit-core +, psycopg2 +, pydantic +, pytest-asyncio +, pytest-django +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "django-ninja"; + version = "0.22.2"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "vitalik"; + repo = "django-ninja"; + rev = "v${version}"; + hash = "sha256-oeisurp9seSn3X/5jFF9DMm9nU6uDYIU1b6/J3o2be0="; + }; + + propagatedBuildInputs = [ django pydantic ]; + + nativeBuildInputs = [ flit-core ]; + + nativeCheckInputs = [ + psycopg2 + pytest-asyncio + pytest-django + pytestCheckHook + ]; + + meta = with lib; { + changelog = "https://github.com/vitalik/django-ninja/releases/tag/v${version}"; + description = "Web framework for building APIs with Django and Python type hints"; + homepage = "https://django-ninja.rest-framework.com/"; + license = licenses.mit; + maintainers = with maintainers; [ elohmeier ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 01cf514cba7c..18b7a9eca95d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2964,6 +2964,8 @@ self: super: with self; { django-mysql = callPackage ../development/python-modules/django-mysql { }; + django-ninja = callPackage ../development/python-modules/django-ninja { }; + django-nose = callPackage ../development/python-modules/django-nose { }; django-oauth-toolkit = callPackage ../development/python-modules/django-oauth-toolkit { }; From 3eb91e96ba5253d8fdf459802eedfa86cd8b951b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Sep 2023 08:31:41 +0000 Subject: [PATCH 42/78] python310Packages.metakernel: 0.30.0 -> 0.30.1 --- pkgs/development/python-modules/metakernel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/metakernel/default.nix b/pkgs/development/python-modules/metakernel/default.nix index 3f270fee8fce..3c8396bef797 100644 --- a/pkgs/development/python-modules/metakernel/default.nix +++ b/pkgs/development/python-modules/metakernel/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "metakernel"; - version = "0.30.0"; + version = "0.30.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-O5BAfb+6fCbETaJmWsVSayTId/57VjA7U3FGCeNe28Y="; + hash = "sha256-TKBvuGh8DnPDLaOpwOvLZHdj1kBOTE/JLda1nQ6J//U="; }; nativeBuildInputs = [ From d9d1ed167583941a009035c50669ab29c7eb4a2a Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 19 Sep 2023 16:35:10 +0800 Subject: [PATCH 43/78] bloat: unstable-2022-12-17 -> unstable-2023-09-18 --- pkgs/servers/bloat/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/bloat/default.nix b/pkgs/servers/bloat/default.nix index bbafb591824f..8db0a2ed962a 100644 --- a/pkgs/servers/bloat/default.nix +++ b/pkgs/servers/bloat/default.nix @@ -6,15 +6,15 @@ buildGoModule { pname = "bloat"; - version = "unstable-2022-12-17"; + version = "unstable-2023-09-18"; src = fetchgit { url = "git://git.freesoftwareextremist.com/bloat"; - rev = "5147897c6c8ba3428ea6998f77241182ee8caa24"; - sha256 = "sha256-/sSRzAAWO/KtXOD3lQsqaXc+lOuN7MJqbfASueLYBQk="; + rev = "e50f12b6158ffae6b0b59f2902798ae86d263b5d"; + hash = "sha256-vejk2f/FC0gS8t16u37pVgp2qzaGRXfcEYzqyP+QbGY="; }; - vendorSha256 = null; + vendorHash = null; postInstall = '' mkdir -p $out/share/bloat From 7c76105a0a0f6fb66d8be5b27b47012dec02f380 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Tue, 19 Sep 2023 10:36:49 +0200 Subject: [PATCH 44/78] python3Packages.geopandas: drop Python 3.8 support GeoPandas 0.14 drops support for Python 3.8. See: https://github.com/geopandas/geopandas/releases/tag/v0.14.0 --- pkgs/development/python-modules/geopandas/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index 809a9ff1072e..e176a614e8d6 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { version = "0.14.0"; format = "setuptools"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "geopandas"; From 4da06a2ec81198050c0b0569588b71e7c5d4a649 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Sep 2023 10:09:22 +0000 Subject: [PATCH 45/78] harsh: 0.8.28 -> 0.8.29 --- pkgs/applications/misc/harsh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/harsh/default.nix b/pkgs/applications/misc/harsh/default.nix index bf38ae4ffe0c..129de17fb18a 100644 --- a/pkgs/applications/misc/harsh/default.nix +++ b/pkgs/applications/misc/harsh/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "harsh"; - version = "0.8.28"; + version = "0.8.29"; src = fetchFromGitHub { owner = "wakatara"; repo = pname; rev = "v${version}"; - hash = "sha256-6BeGyyy4RFBy4TvB3bLTyDtQGljG9xE3VFfbnq9KWcs="; + hash = "sha256-LftLlKevxvjxnRUMaRXnh3TXQSauvnfuX6voglwZmZE="; }; vendorHash = "sha256-zkz7X/qj8FwtQZXGuq4Oaoe5G9a4AJE1kv3j7wwQEp4="; From 2339c121cfe14d6648eea935bd861998b2164321 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Sep 2023 10:14:05 +0000 Subject: [PATCH 46/78] python310Packages.nocaselist: 1.1.1 -> 2.0.0 --- pkgs/development/python-modules/nocaselist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nocaselist/default.nix b/pkgs/development/python-modules/nocaselist/default.nix index ffa66704c97c..3972833e1069 100644 --- a/pkgs/development/python-modules/nocaselist/default.nix +++ b/pkgs/development/python-modules/nocaselist/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "nocaselist"; - version = "1.1.1"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UnKyMuCCRmlqsm/g670ouJidrJ7lcytQJklQMjtRPSM="; + hash = "sha256-RWqgAMZ3fF0hsCnFLlMvlDKNT7TxWtKk3T3WLbMLOJI="; }; propagatedBuildInputs = [ From 2a87473dbbf721d5a03e9466c3c7b1a36e5c677e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Sep 2023 10:38:29 +0000 Subject: [PATCH 47/78] trdl-client: 0.6.5 -> 0.7.0 --- pkgs/tools/misc/trdl-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/trdl-client/default.nix b/pkgs/tools/misc/trdl-client/default.nix index 3748f1755d18..e0d92c140ced 100644 --- a/pkgs/tools/misc/trdl-client/default.nix +++ b/pkgs/tools/misc/trdl-client/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "trdl-client"; - version = "0.6.5"; + version = "0.7.0"; src = fetchFromGitHub { owner = "werf"; repo = "trdl"; rev = "v${version}"; - hash = "sha256-jJwRIfxmjlhfS/0+IN2IdQPlO9FkTb64PWUiLwkarfM="; + hash = "sha256-umeoiEq+Cp/cKpiNxCnMDghubm3LPFPJA18ChuYmIVo="; }; sourceRoot = "${src.name}/client"; From 0b4327681fc23512f35f44ff8a1c43f6e92ff7db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Sep 2023 10:48:36 +0000 Subject: [PATCH 48/78] cilium-cli: 0.15.7 -> 0.15.8 --- pkgs/applications/networking/cluster/cilium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 8b4183337051..acb4ce14a8e3 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.15.7"; + version = "0.15.8"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - hash = "sha256-kQpQszKyesM9qFlpgwYElrC9B4YBig62Pf9FoZJ2epM="; + hash = "sha256-iIE4jqvlkgf8+IrP0t+o0bZwlB5v61HzbyQy6ExAobE="; }; vendorHash = null; From a49246aef97d2902ea432107724af36516c66863 Mon Sep 17 00:00:00 2001 From: Isa Date: Tue, 19 Sep 2023 10:09:21 +0200 Subject: [PATCH 49/78] gitlab: 16.3.3 -> 16.3.4 --- .../version-management/gitlab/data.json | 14 +++++++------- .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-pages/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index d0c88d1ecb48..955edc421ac8 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.3.3", - "repo_hash": "sha256-+h3ksxuphegTvjrKTWk68fgan1n2g64b1sn5nMoYhLc=", + "version": "16.3.4", + "repo_hash": "sha256-VM3yH+6R8FyzwAhXtjbQsoMhPVALvDxQvmwyNZE0JCQ=", "yarn_hash": "02g51sfpn065513n5ngcw6rqvzaws6yfq0y7gyj4lc4d8fhis088", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.3.3-ee", + "rev": "v16.3.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.3.3", - "GITLAB_PAGES_VERSION": "16.3.3", + "GITALY_SERVER_VERSION": "16.3.4", + "GITLAB_PAGES_VERSION": "16.3.4", "GITLAB_SHELL_VERSION": "14.26.0", - "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.8", - "GITLAB_WORKHORSE_VERSION": "16.3.3" + "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.10", + "GITLAB_WORKHORSE_VERSION": "16.3.4" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index de6f3c0eb50d..9d9f930e43bb 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -13,7 +13,7 @@ }: let - version = "16.3.3"; + version = "16.3.4"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -24,7 +24,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-V9uh5QkvQ1ifO5DNCivg47NBjgE06Ehz7DnmBeU3lVY="; + hash = "sha256-5fNRoxWNBky7dJLFg+OyshfIcAqCAj41hvfrQRPIuzg="; }; vendorHash = "sha256-abyouKgn31yO3+oeowtxZcuvS6mazVM8zOMEFsyw4C0="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index c628b45c8596..775889d83ade 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.3.3"; + version = "16.3.4"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-TPXMXuxckALObfEcIguJbGToIGp8b2bpd974epaXpyk="; + hash = "sha256-hz5YCQi1O+/ana/Vpawh2nQj7fmcI6huvKFTG9rVDjw="; }; vendorHash = "sha256-Pdb+bWsECe7chgvPKFGXxVAWb+AbGF6khVJSdDsHqKM="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 83f263e49024..adcd203be21e 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.3.3"; + version = "16.3.4"; src = fetchFromGitLab { owner = data.owner; From bb2bb09564e5c23126eae8cf9562666a2f0f8885 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 18 Sep 2023 15:00:12 +0200 Subject: [PATCH 50/78] easyocr: 1.7.0 -> 1.7.1 --- pkgs/development/python-modules/easyocr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/easyocr/default.nix b/pkgs/development/python-modules/easyocr/default.nix index 3d260f1f652f..ff7f7650fce9 100644 --- a/pkgs/development/python-modules/easyocr/default.nix +++ b/pkgs/development/python-modules/easyocr/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "easyocr"; - version = "1.7.0"; + version = "1.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "JaidedAI"; repo = "EasyOCR"; rev = "refs/tags/v${version}"; - hash = "sha256-01Exz55eTIO/xzdq/dzV+ELkU75hpxe/EbjIqLBA8h0="; + hash = "sha256-EiiJ2LJ3uYIvgPd2y25MraV5kTa47JalDR7SLbkM9UI="; }; postPatch = '' From 5dacf3a0d80dab7bc04a376db04e81369134e241 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Tue, 19 Sep 2023 12:55:53 +0200 Subject: [PATCH 51/78] bitcoin: add shell completions --- .../blockchains/bitcoin/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 01a3f3e1587a..24f7d78e4f56 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -3,6 +3,7 @@ , fetchurl , autoreconfHook , pkg-config +, installShellFiles , util-linux , hexdump , autoSignDarwinBinariesHook @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = - [ autoreconfHook pkg-config ] + [ autoreconfHook pkg-config installShellFiles ] ++ lib.optionals stdenv.isLinux [ util-linux ] ++ lib.optionals stdenv.isDarwin [ hexdump ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] @@ -53,7 +54,19 @@ stdenv.mkDerivation rec { ++ lib.optionals withWallet [ db48 sqlite ] ++ lib.optionals withGui [ qrencode qtbase qttools ]; - postInstall = lib.optionalString withGui '' + postInstall = '' + installShellCompletion --cmd bitcoin-cli --bash contrib/completions/bash/bitcoin-cli.bash-completion + installShellCompletion --cmd bitcoind --bash contrib/completions/bash/bitcoind.bash-completion + installShellCompletion --cmd bitcoin-tx --bash contrib/completions/bash/bitcoin-tx.bash-completion + + installShellCompletion --fish contrib/completions/fish/bitcoin-cli.fish + installShellCompletion --fish contrib/completions/fish/bitcoind.fish + installShellCompletion --fish contrib/completions/fish/bitcoin-tx.fish + installShellCompletion --fish contrib/completions/fish/bitcoin-util.fish + installShellCompletion --fish contrib/completions/fish/bitcoin-wallet.fish + '' + lib.optionalString withGui '' + installShellCompletion --fish contrib/completions/fish/bitcoin-qt.fish + install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop substituteInPlace $out/share/applications/bitcoin-qt.desktop --replace "Icon=bitcoin128" "Icon=bitcoin" install -Dm644 share/pixmaps/bitcoin256.png $out/share/pixmaps/bitcoin.png From cc289ff682c55fbd9ec2592472065d979562b5b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Sep 2023 11:01:07 +0000 Subject: [PATCH 52/78] code-maat: 1.0.3 -> 1.0.4 --- pkgs/development/tools/code-maat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/code-maat/default.nix b/pkgs/development/tools/code-maat/default.nix index c65b8844935f..4d7be6c4b061 100644 --- a/pkgs/development/tools/code-maat/default.nix +++ b/pkgs/development/tools/code-maat/default.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "code-maat"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { url = "https://github.com/adamtornhill/code-maat/releases/download/v${finalAttrs.version}/code-maat-${finalAttrs.version}-standalone.jar"; - hash = "sha256-cAaGX9BX27Z2GN583YmhagWsBIygVc0ZDkzbspM9OJw="; + hash = "sha256-QoeuIDSQGERFD3aVR7xEl6DaGm0cf6b63IWHBeZ0O18="; }; dontUnpack = true; From 85fd87463918c383c46f8725b96eea6e63cf5d4f Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 19 Sep 2023 10:50:47 +0200 Subject: [PATCH 53/78] compcert: add aarch64 support --- .../coq-modules/compcert/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index ebb227f29279..4e25aeaec2e7 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -5,7 +5,20 @@ , version ? null }: -let compcert = mkCoqDerivation rec { +let + +# https://compcert.org/man/manual002.html +targets = { + x86_64-linux = "x86_64-linux"; + aarch64-linux = "aarch64-linux"; + x86_64-darwin = "x86_64-macos"; + aarch64-darwin = "aarch64-macos"; +}; + +target = targets.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + +compcert = mkCoqDerivation { pname = "compcert"; owner = "AbsInt"; @@ -49,7 +62,7 @@ let compcert = mkCoqDerivation rec { -coqdevdir $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ \ -toolprefix ${tools}/bin/ \ -use-external-Flocq \ - ${if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux"} + ${target} ''; installTargets = "documentation install"; @@ -80,7 +93,7 @@ let compcert = mkCoqDerivation rec { description = "Formally verified C compiler"; homepage = "https://compcert.org"; license = licenses.inria-compcert; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = builtins.attrNames targets; maintainers = with maintainers; [ thoughtpolice jwiegley vbgl ]; }; }; in From 2c73000ef028fe16f8d242bf1727fd0cdbb9d272 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 19 Sep 2023 14:32:41 +0300 Subject: [PATCH 54/78] linux-6.5: hash -> sha256 That's what the updater script expects, at least for now --- pkgs/os-specific/linux/kernel/linux-6.5.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.5.nix b/pkgs/os-specific/linux/kernel/linux-6.5.nix index 614a07b66a28..1c6b4df4c0e3 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.5.nix @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - hash = "sha256-TKwT97F72Nz5AyrWj5Ejq1MT1pjJ9ZQWBDFlFQdj608="; + sha256 = "sha256-TKwT97F72Nz5AyrWj5Ejq1MT1pjJ9ZQWBDFlFQdj608="; }; } // (args.argsOverride or { })) From cdc7c3a9f50b073633a57a4d7880916651ce6244 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 19 Sep 2023 14:33:02 +0300 Subject: [PATCH 55/78] linux: 5.10.194 -> 5.10.195 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index f340b5d9f5d2..213bf7e670f3 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.194"; + version = "5.10.195"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "15fr7krhpmqz0xqjg78m2xvfllbni3xh8xyhxh9ni31ppd3mw394"; + sha256 = "0n4vg2i9sq89wnz85arlyvwysh9s83cgzs5bk2wh98bivi5fwfs1"; }; } // (args.argsOverride or {})) From db9470470f8b976cdac377f7db4bfb01612bfe4c Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 19 Sep 2023 14:33:05 +0300 Subject: [PATCH 56/78] linux: 5.15.131 -> 5.15.132 --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index e189e7201088..d86b0cf0ce64 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.131"; + version = "5.15.132"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0sacnbw48lblnqaj56nybh588sq4k84gwf0r5zinzyrryj8k6z4r"; + sha256 = "1b0qjsaqjw2rk86shmmrj2aasblkn27acjmc761vnjg7sv2baxs1"; }; } // (args.argsOverride or { })) From 9fbd118235420dcaf1498126351e301741f87072 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 19 Sep 2023 14:33:09 +0300 Subject: [PATCH 57/78] linux: 6.1.53 -> 6.1.54 --- pkgs/os-specific/linux/kernel/linux-6.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index a9de8074de49..df99c9868510 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.53"; + version = "6.1.54"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "0zpdg3fcc12iyjhfs5w7cw75700z4i8m9jcg38mlzlhh92hf0msz"; + sha256 = "09sfrq2l8f777mx2n9mhb6bgz1064bl04921byqnmk87si31w653"; }; } // (args.argsOverride or { })) From b0ff9b40b4a73cd867b279f130124768e978031b Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 19 Sep 2023 14:33:14 +0300 Subject: [PATCH 58/78] linux: 6.5.3 -> 6.5.4 --- pkgs/os-specific/linux/kernel/linux-6.5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.5.nix b/pkgs/os-specific/linux/kernel/linux-6.5.nix index 1c6b4df4c0e3..28557090de61 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.5.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.5.3"; + version = "6.5.4"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "sha256-TKwT97F72Nz5AyrWj5Ejq1MT1pjJ9ZQWBDFlFQdj608="; + sha256 = "0s8nzd8yaq06bq8byk7aakbk95gh0rhlif26h1biw94v48anrxxx"; }; } // (args.argsOverride or { })) From a3f94d23e545e34ec6a0918c5f2baf5bc2265999 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 19 Sep 2023 14:33:56 +0300 Subject: [PATCH 59/78] linux-rt_6_1: 6.1.46-rt13 -> 6.1.46-rt14 --- pkgs/os-specific/linux/kernel/linux-rt-6.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix index cfb84c25f275..d599c3bda311 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.1.46-rt13"; # updated by ./update-rt.sh + version = "6.1.46-rt14"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -25,7 +25,7 @@ in buildLinux (args // { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "00pj02mvamxvlkwrca1j3baaa18rg6dra7al1xsvgw3ypckwyafz"; + sha256 = "0mrpsy175iz0b51hwgqbj15w83lm3m57il3gqwb489gln7mpzy17"; }; }; in [ rt-patch ] ++ kernelPatches; From 41d7b6b90788ca4a7c98e5044c73054c926a2bc3 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 19 Sep 2023 14:34:02 +0300 Subject: [PATCH 60/78] linux_latest-libre: 19397 -> 19408 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 6a0f7c2325e0..ef020b7eb56c 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19397"; - sha256 = "130q08my839kwbi1v8lqwvs6w8s6328ki7s243as4yz4kfrlymr3"; + rev = "19408"; + sha256 = "1bfpzdfd7k859ids5d5ixzn36c7f62gh2lw6gv4szwakw032gh9i"; } , ... }: From 2562793942b1cb6e13b940f73d0552b985c58226 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 19 Sep 2023 14:37:43 +0300 Subject: [PATCH 61/78] linux/hardened/patches/6.1: 6.1.52-hardened1 -> 6.1.53-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 659fc1a65c14..783353d6da0d 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,12 +52,12 @@ "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.52-hardened1.patch", - "sha256": "1xp8m9d927g3nb8l6pc4xzm0yspxxa0kpiv6hi1x0cal5a1bwnb3", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.52-hardened1/linux-hardened-6.1.52-hardened1.patch" + "name": "linux-hardened-6.1.53-hardened1.patch", + "sha256": "1v8k4rb3f24cpzvng7nyxllypmi8dc4cv0yj2jfvr64pxr7vzlkw", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.53-hardened1/linux-hardened-6.1.53-hardened1.patch" }, - "sha256": "0lis73mxnl7hxz8lyja6sfgmbym944l3k1h7dab6b4mw1nckfxsn", - "version": "6.1.52" + "sha256": "0zpdg3fcc12iyjhfs5w7cw75700z4i8m9jcg38mlzlhh92hf0msz", + "version": "6.1.53" }, "6.4": { "patch": { From 7629da1298d85379466acf80cad36e701cc6aaa8 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 19 Sep 2023 14:37:48 +0300 Subject: [PATCH 62/78] linux/hardened/patches/6.4: 6.4.15-hardened1 -> 6.4.16-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 783353d6da0d..594b303a25a8 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -62,12 +62,12 @@ "6.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.4.15-hardened1.patch", - "sha256": "1r6c1yzr0cmfhqv0qirj9nbc2hgmmh43mwal1gmyhk5qisq7h1rf", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.15-hardened1/linux-hardened-6.4.15-hardened1.patch" + "name": "linux-hardened-6.4.16-hardened1.patch", + "sha256": "10lydnnhhq9ynng1gfaqh1mncsb0dmr27zzcbygs1xigy2bl70n9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.16-hardened1/linux-hardened-6.4.16-hardened1.patch" }, - "sha256": "1phlx375ln5pslw5vjqm029cdv6pzf4ang10xlrf90x5sb4fgy93", - "version": "6.4.15" + "sha256": "0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln", + "version": "6.4.16" }, "6.5": { "patch": { From 6b2ef5d639bff49875791223efc3c25f51c415b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Tue, 19 Sep 2023 08:57:46 -0300 Subject: [PATCH 63/78] obs-studio-plugins.obs-vkcapture: 1.4.1 -> 1.4.3 --- pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index 8f8506aa05e3..a94cb71f10ee 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "obs-vkcapture"; - version = "1.4.1"; + version = "1.4.3"; src = fetchFromGitHub { owner = "nowrep"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-1M/lchsrHG01C18GXfiIcclovdHKHrHMVsPvIJ+oB+M="; + hash = "sha256-hFweWZalWMGbGXhM6uxaGoWkr9srqxRChJo5yUBiBXs="; }; cmakeFlags = lib.optionals stdenv.isi686 [ From e9352a18e43d969183f748846f7e8347c94fc913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Tue, 19 Sep 2023 09:06:23 -0300 Subject: [PATCH 64/78] sway-launcher-desktop: 1.6.0 -> 1.7.0 --- pkgs/applications/misc/sway-launcher-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/sway-launcher-desktop/default.nix b/pkgs/applications/misc/sway-launcher-desktop/default.nix index 174b95df67bb..525e25ae7e06 100644 --- a/pkgs/applications/misc/sway-launcher-desktop/default.nix +++ b/pkgs/applications/misc/sway-launcher-desktop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sway-launcher-desktop"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "Biont"; repo = "sway-launcher-desktop"; rev = "v${version}"; - sha256 = "HCGUFXrj6b9Pb6b5y9yupBumFLQyH1QVMrfoBM4HbMg="; + hash = "sha256-lv1MLPJsJJjm6RLzZXWEz1JO/4EXTQ8wj225Di+98G4="; }; postPatch = '' From 043cbacb519d179010042d52f3b5c3af155b178e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 31 Aug 2023 11:04:38 +0200 Subject: [PATCH 65/78] python310Packages.jaxlib: 0.4.14 -> 0.4.15 --- pkgs/development/python-modules/jaxlib/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 7a9e49a6a290..6fb960f684c6 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -54,7 +54,7 @@ let inherit (cudaPackages) backendStdenv cudatoolkit cudaFlags cudnn nccl; pname = "jaxlib"; - version = "0.4.14"; + version = "0.4.16"; meta = with lib; { description = "JAX is Autograd and XLA, brought together for high-performance machine learning research."; @@ -151,7 +151,7 @@ let repo = "jax"; # google/jax contains tags for jax and jaxlib. Only use jaxlib tags! rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-0KnILQkahSiA1uuyT+kgy1XaCcZ3cpx1q114e2pecvg="; + hash = "sha256-q+8CXGxK8JX0bUMK4KJB3qV/EaLHg68D1B5UrtRz0Eg="; }; nativeBuildInputs = [ @@ -203,6 +203,10 @@ let GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin"; GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/gcc"; + # The version is automatically set to ".dev" if this variable is not set. + # https://github.com/google/jax/commit/e01f2617b85c5bdffc5ffb60b3d8d8ca9519a1f3 + JAXLIB_RELEASE = "1"; + preConfigure = '' # dummy ldconfig mkdir dummy-ldconfig @@ -260,10 +264,10 @@ let ]; sha256 = (if cudaSupport then { - x86_64-linux = "sha256-L+d4umcN8eZQJS7NtbyMhFbbGUVd0a73GOYbZx3bW9Q="; + x86_64-linux = "sha256-6HkrEWAPjGPj4zRxahl0FLiV7WZO/6zsdCX8STfV5EE="; } else { - x86_64-linux = "sha256-V1giQbu70RYjbNsqudibiCgvtFNRIJ8XG75QtIzjM4g="; - aarch64-linux = "sha256-DRU4aT7kQffhsOllgHtSlIsYOeLF4Sy5o5RR1CaTle0="; + x86_64-linux = "sha256-MDnuJwJ/xKnC72Qub0ETYj5uQB2r8/AgGm10oqmzzcc="; + aarch64-linux = "sha256-aVUm612VNEsjZLDrtiOPTqSk1t+AhmOx+pOG3bZdOAw="; }).${stdenv.system} or (throw "jaxlib: unsupported system: ${stdenv.system}"); }; From ad9c1e952a06b9bc0ea57c0902b61982e61f2676 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 31 Aug 2023 11:04:45 +0200 Subject: [PATCH 66/78] python310Packages.jaxlib-bin: 0.4.14 -> 0.4.15 --- pkgs/development/python-modules/jaxlib/bin.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index c0773878c1d8..b9e8fac59306 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -39,7 +39,7 @@ in assert cudaSupport -> lib.versionAtLeast cudatoolkit.version "11.1" && lib.versionAtLeast cudnn.version "8.2" && stdenv.isLinux; let - version = "0.4.14"; + version = "0.4.16"; inherit (python) pythonVersion; @@ -60,15 +60,15 @@ let { "x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; - hash = "sha256-nyylSZfqHeftlvVgJZFCN1ldjluZVJIYu4ZSsVxvXf8="; + hash = "sha256-4XyaDnKEMhAbfPEvN3RCDEjXTWbOL6tWrTlyYeiboVs="; }; "aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; - hash = "sha256-La3wYbGCjWTl7krBD6BaBRqyBD8R530Lckbz0AWv0FM="; + hash = "sha256-IG2pCui/Yj+LDMbQwBVlu7yl2llqnaxMzz/MtBvBr6U="; }; "x86_64-darwin" = getSrcFromPypi { platform = "macosx_10_14_x86_64"; - hash = "sha256-hDg5+qisgtgOrdvbjxsUgI73cW6Aah8NLjhPe4kMAsM="; + hash = "sha256-x5DqsmHqEb7Dl7dnxT5N0l30GKt5OPZpq3HGX9MFKmo="; }; }; @@ -78,7 +78,7 @@ let # https://github.com/google/jax/issues/12879 as to why this specific URL is the correct index. gpuSrc = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn86-cp310-cp310-manylinux2014_x86_64.whl"; - hash = "sha256-CcQ5kjp4XfUX4/RwFY3T5G3kVKAeyoCTXu1Lo4O16Qo="; + hash = "sha256-eLOprP2kv6roodwRKZXVZFQCD1wC26TSTEDJBjMu/Uo="; }; in From 309c92d4eb196b2ec14b1ad01d510a20e4b1cff9 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 31 Aug 2023 11:04:52 +0200 Subject: [PATCH 67/78] python310Packages.jax: 0.4.14 -> 0.4.15 --- pkgs/development/python-modules/jax/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index b22d82d7f22f..0ad58dc03587 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -27,7 +27,7 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.4.14"; + version = "0.4.16"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -37,13 +37,17 @@ buildPythonPackage rec { repo = pname; # google/jax contains tags for jax and jaxlib. Only use jax tags! rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-0KnILQkahSiA1uuyT+kgy1XaCcZ3cpx1q114e2pecvg="; + hash = "sha256-q+8CXGxK8JX0bUMK4KJB3qV/EaLHg68D1B5UrtRz0Eg="; }; nativeBuildInputs = [ setuptools ]; + # The version is automatically set to ".dev" if this variable is not set. + # https://github.com/google/jax/commit/e01f2617b85c5bdffc5ffb60b3d8d8ca9519a1f3 + JAX_RELEASE = "1"; + # jaxlib is _not_ included in propagatedBuildInputs because there are # different versions of jaxlib depending on the desired target hardware. The # JAX project ships separate wheels for CPU, GPU, and TPU. From 01ea9ea3e6b872a7c363c2422d8828638bd99ffb Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 19 Sep 2023 08:49:16 -0400 Subject: [PATCH 68/78] argc: 1.9.0 -> 1.10.0 Diff: https://github.com/sigoden/argc/compare/v1.9.0...v1.10.0 Changelog: https://github.com/sigoden/argc/releases/tag/v1.10.0 --- pkgs/development/tools/argc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/argc/default.nix b/pkgs/development/tools/argc/default.nix index 84d9332ade14..6c6f54b4c753 100644 --- a/pkgs/development/tools/argc/default.nix +++ b/pkgs/development/tools/argc/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "argc"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "sigoden"; repo = pname; rev = "v${version}"; - hash = "sha256-BM9MXokVXA5EJwr8F7Wg5LTE1xhmj9ttVXOMNJx0RRw="; + hash = "sha256-DmBSHiil9TdPog1Tnz2UjwbgLwwJwdYg9qAykolriQs="; }; - cargoHash = "sha256-SScCPBERXScYJ9LlPcbIhwCikRum0F1tU3gZYaQRFTo="; + cargoHash = "sha256-JyiBEawBTm8t9oKFH5OCKabWasuiRoBe0rSeyHKuXGU="; nativeBuildInputs = [ installShellFiles ]; From e43f06a8bcd8acc894a6edea95e733845102ea75 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 19 Sep 2023 08:51:41 -0400 Subject: [PATCH 69/78] systeroid: 0.4.3 -> 0.4.4 Diff: https://github.com/orhun/systeroid/compare/v0.4.3...v0.4.4 Changelog: https://github.com/orhun/systeroid/blob/v0.4.4/CHANGELOG.md --- pkgs/tools/system/systeroid/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/systeroid/default.nix b/pkgs/tools/system/systeroid/default.nix index 8220b36b43f1..dca6ee3f4680 100644 --- a/pkgs/tools/system/systeroid/default.nix +++ b/pkgs/tools/system/systeroid/default.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "systeroid"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZviZ8zjUtVv7PRH9xuiGi8OtAHX1oo6JmKHLCyk4Vog="; + sha256 = "sha256-FnUXf2Ia/XIu9ESs71p0UrXC7y7n7SYpfU0+Es7KYqM="; }; postPatch = '' @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { --replace '"/usr/share/doc/kernel-doc-*/Documentation/*",' '"${linux-doc}/share/doc/linux-doc/*",' ''; - cargoHash = "sha256-xpE7cP8nISMuIqSO6o6VREsVXQ+K5PU+XUEVvl3k51s="; + cargoHash = "sha256-TTxvkRRVPCycEtAmm5BIOVc9bUmdqQBPSORBxHzm9ms="; buildInputs = [ xorg.libxcb From cd5f56c821ec127d367951f6c453744cc0b7b8d1 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 19 Sep 2023 21:13:24 +1000 Subject: [PATCH 70/78] gh: 2.34.0 -> 2.35.0 Diff: https://github.com/cli/cli/compare/v2.34.0...v2.35.0 Changelog: https://github.com/cli/cli/releases/tag/v2.35.0 --- pkgs/applications/version-management/gh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index 1d6fb52db11d..981b58381774 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gh"; - version = "2.34.0"; + version = "2.35.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-Bb0vEaMOjgQ5p9r/tfciKo4/MXjUCUIdoDSB/Bido/8="; + hash = "sha256-ddVszWyfu9BsP4yvOtVTHhZ51D8j4Vf1pdyahF0gjVk="; }; vendorHash = "sha256-iql/CEWwg6t5k8qOFEQotMUUJd4VQ/H4JcuL2Eunqg0="; From 55d4ea4be306f59feeef66bb172f2e5708f5ed8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 19 Sep 2023 15:08:48 +0200 Subject: [PATCH 71/78] actionlint: 1.6.25 -> 1.6.26 Diff: https://github.com/rhysd/actionlint/compare/v1.6.25...v1.6.26 Changelog: https://github.com/rhysd/actionlint/raw/v1.6.26/CHANGELOG.md --- pkgs/development/tools/analysis/actionlint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/actionlint/default.nix b/pkgs/development/tools/analysis/actionlint/default.nix index 2516c0c59c9b..b953aea0bb2d 100644 --- a/pkgs/development/tools/analysis/actionlint/default.nix +++ b/pkgs/development/tools/analysis/actionlint/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "actionlint"; - version = "1.6.25"; + version = "1.6.26"; subPackages = [ "cmd/actionlint" ]; @@ -18,10 +18,10 @@ buildGoModule rec { owner = "rhysd"; repo = "actionlint"; rev = "v${version}"; - hash = "sha256-MbMisADJg0c0idAZ3Ru1WJMzbYoyac71CIeQd3Xjsy0="; + hash = "sha256-BCja8twbPwYI41JuQs2LHMCXlTbY5FAjHhZvn5mIlkg="; }; - vendorHash = "sha256-YkLZYL+VgO2QfkjVG3baPCn+CExRnsnxtdmL3GGNGlI="; + vendorHash = "sha256-sBwI2L9tNg8Q/vIhhp0eIxetklytvJj+O1mWjrHkH24="; nativeBuildInputs = [ makeWrapper ronn installShellFiles ]; From 7fe536fa2d72c350c6f2e8ad6793ad4ebf322a3f Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 19 Sep 2023 08:41:30 -0400 Subject: [PATCH 72/78] bandwhich: unstable-2023-09-11 -> 0.21.0 Diff: https://github.com/imsnif/bandwhich/compare/eba356220cc06254b96cd3241bc80ab7a0ab017b...v0.21.0 --- pkgs/tools/networking/bandwhich/Cargo.lock | 141 ++++++++++++-------- pkgs/tools/networking/bandwhich/default.nix | 11 +- 2 files changed, 90 insertions(+), 62 deletions(-) diff --git a/pkgs/tools/networking/bandwhich/Cargo.lock b/pkgs/tools/networking/bandwhich/Cargo.lock index b9dd1fea7c48..5d28b7691ca6 100644 --- a/pkgs/tools/networking/bandwhich/Cargo.lock +++ b/pkgs/tools/networking/bandwhich/Cargo.lock @@ -30,9 +30,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "0f2135563fb5c609d2b2b87c1e8ce7bc41b0b45430fa9661f457981503dd5bf0" dependencies = [ "memchr", ] @@ -68,9 +68,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" +checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" [[package]] name = "anstyle-parse" @@ -117,7 +117,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.37", ] [[package]] @@ -143,13 +143,13 @@ dependencies = [ [[package]] name = "bandwhich" -version = "0.20.0" +version = "0.21.0" dependencies = [ "anyhow", "async-trait", "chrono", "clap", - "crossterm 0.27.0", + "crossterm", "http_req", "insta", "ipnetwork", @@ -199,9 +199,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "byteorder" @@ -260,9 +260,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.30" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", @@ -284,9 +284,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.2" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" +checksum = "b1d7b8d5ec32af0fadc644bf1fd509a688c2103b185644bb1e29d164e0703136" dependencies = [ "clap_builder", "clap_derive", @@ -294,9 +294,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.2" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" +checksum = "5179bb514e4d7c2051749d8fcefa2ed6d06a9f4e6d69faf3805f5d80b8cf8d56" dependencies = [ "anstream", "anstyle", @@ -313,7 +313,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.37", ] [[package]] @@ -423,22 +423,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "crossterm" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" -dependencies = [ - "bitflags 1.3.2", - "crossterm_winapi", - "libc", - "mio", - "parking_lot", - "signal-hook", - "signal-hook-mio", - "winapi", -] - [[package]] name = "crossterm" version = "0.27.0" @@ -529,7 +513,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.37", ] [[package]] @@ -706,9 +690,9 @@ dependencies = [ [[package]] name = "http_req" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f680177f2ebe4aabd573d07b322d15a5e0fbc97cd739fd627b08043c89041f8" +checksum = "42ce34c74ec562d68f2c23a532c62c1332ff1d1b6147fd118bd1938e090137d0" dependencies = [ "native-tls", "unicase", @@ -749,9 +733,9 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" [[package]] name = "inout" @@ -813,6 +797,15 @@ dependencies = [ "serde", ] +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + [[package]] name = "jobserver" version = "0.1.26" @@ -839,9 +832,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "linked-hash-map" @@ -1043,7 +1036,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.37", ] [[package]] @@ -1196,7 +1189,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.32", + "syn 2.0.37", ] [[package]] @@ -1250,9 +1243,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] @@ -1319,15 +1312,17 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8285baa38bdc9f879d92c0e37cb562ef38aa3aeefca22b3200186bc39242d3d5" +checksum = "2e2e4cd95294a85c3b4446e63ef054eea43e0205b1fd60120c16b74ff7ff96ad" dependencies = [ "bitflags 2.4.0", "cassowary", - "crossterm 0.26.1", + "crossterm", "indoc", + "itertools", "paste", + "strum", "unicode-segmentation", "unicode-width", ] @@ -1435,6 +1430,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + [[package]] name = "schannel" version = "0.1.22" @@ -1490,7 +1491,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.37", ] [[package]] @@ -1568,9 +1569,9 @@ checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" dependencies = [ "libc", "windows-sys 0.48.0", @@ -1582,6 +1583,28 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.37", +] + [[package]] name = "subtle" version = "2.5.0" @@ -1601,9 +1624,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.32" +version = "2.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" +checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" dependencies = [ "proc-macro2", "quote", @@ -1655,7 +1678,7 @@ checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.37", ] [[package]] @@ -1726,7 +1749,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.37", ] [[package]] @@ -1786,9 +1809,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicase" @@ -1807,9 +1830,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -1888,7 +1911,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.37", "wasm-bindgen-shared", ] @@ -1910,7 +1933,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.37", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index 5e0b0e242cd1..78b8f7ddf1b5 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "bandwhich"; - version = "unstable-2023-09-11"; + version = "0.21.0"; src = fetchFromGitHub { owner = "imsnif"; repo = pname; - rev = "eba356220cc06254b96cd3241bc80ab7a0ab017b"; - hash = "sha256-qrVGUbVbURXSKJy28mhpwVkzSGgct8PPOnwb0FdVWtE="; + rev = "v${version}"; + hash = "sha256-FquV+V5BTIX0HB6lLqPMUTvnPn7Y8/jhl93qvrSkYLY="; }; cargoLock = { @@ -18,6 +18,11 @@ rustPlatform.buildRustPackage rec { }; }; + checkFlags = [ + # failing in upstream CI + "--skip=tests::cases::ui::layout_under_50_width_under_50_height" + ]; + buildInputs = lib.optional stdenv.isDarwin Security; # 10 passed; 47 failed https://hydra.nixos.org/build/148943783/nixlog/1 From 44f22143b7cbe1de57ed445fb690dca2a4e2d1db Mon Sep 17 00:00:00 2001 From: Florian Agbuya Date: Mon, 18 Sep 2023 02:57:45 +0800 Subject: [PATCH 73/78] outputcheck: init at 0.4.2 --- pkgs/by-name/ou/outputcheck/package.nix | 52 +++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 pkgs/by-name/ou/outputcheck/package.nix diff --git a/pkgs/by-name/ou/outputcheck/package.nix b/pkgs/by-name/ou/outputcheck/package.nix new file mode 100644 index 000000000000..22b033ea1192 --- /dev/null +++ b/pkgs/by-name/ou/outputcheck/package.nix @@ -0,0 +1,52 @@ +{ lib +, python3 +, fetchFromGitHub +, lit +}: + +python3.pkgs.buildPythonApplication rec { + pname = "outputcheck"; + version = "0.4.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "stp"; + repo = "OutputCheck"; + rev = "eab62a5dd5129f6a4ebfbe4bbe41d35611f7c48d"; + hash = "sha256-0D5Lljn66jB/EW/ntC2eTuXAt0w0cceeeqf3aKuyeF0="; + }; + + # - Fix deprecated 'U' mode in python 3.11 + # https://github.com/python/cpython/blob/3.11/Doc/library/functions.rst?plain=1#L1386 + # - Fix expected error and actual parser error mismatch + # - Fix version number cannot find error + postPatch = '' + substituteInPlace OutputCheck/Driver.py \ + --replace "argparse.FileType('rU')" "argparse.FileType('r')" + + substituteInPlace tests/invalid-regex-syntax.smt2 \ + --replace "unbalanced parenthesis" "missing ), unterminated subpattern" + + echo ${version} > RELEASE-VERSION + ''; + + nativeCheckInputs = [ lit ]; + + checkPhase = '' + runHook preCheck + + lit -v tests/ + + runHook postCheck + ''; + + pythonImportsCheck = [ "OutputCheck" ]; + + meta = with lib; { + description = "A tool for checking tool output inspired by LLVM's FileCheck"; + homepage = "https://github.com/stp/OutputCheck"; + license = licenses.bsd3; + maintainers = with maintainers; [ fsagbuya ]; + mainProgram = "OutputCheck"; + }; +} From 79a23c6c0841d49cad98ec952bb8b830f670e0ee Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 19 Sep 2023 09:11:15 -0400 Subject: [PATCH 74/78] python311Packages.qrant-client: 1.5.0 -> 1.5.4 --- pkgs/development/python-modules/qdrant-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix index 643a67d898ed..b1d46d5fcb95 100644 --- a/pkgs/development/python-modules/qdrant-client/default.nix +++ b/pkgs/development/python-modules/qdrant-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qdrant-client"; - version = "1.5.0"; + version = "1.5.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-k+ggx4QyVduqtV4WwHELyQDAHdaGE0bizpG1ie6x7FM="; + hash = "sha256-9aZBUrGCNRQjYRF1QmIwVqeT5Tdgv7CCkyOUsbZbmVM="; }; nativeBuildInputs = [ From f9a5d84f4aadc1f0150a95db9e453b95bcd2c671 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 19 Sep 2023 08:15:50 +0000 Subject: [PATCH 75/78] cloud-hypervisor: disable vmm tests These require KVM, which we can't assume is available in builders. Fixes: 4afa887b8a69 ("cloud-hypervisor: run more tests") --- pkgs/applications/virtualization/cloud-hypervisor/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index 7e3c6d645468..7a0dc67dba28 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -37,7 +37,8 @@ rustPlatform.buildRustPackage rec { cargoTestFlags = [ "--workspace" "--bins" "--lib" # Integration tests require root. - "--exclude" "net_util" # Tries to access /dev/net/tun + "--exclude" "net_util" # /dev/net/tun + "--exclude" "vmm" # /dev/kvm ]; meta = with lib; { From fca4826dcd399813f85b61fec1442c781e345759 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 19 Sep 2023 17:34:16 +0200 Subject: [PATCH 76/78] team-list.nix: grammar Co-authored-by: Silvan Mosberger --- maintainers/team-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 86673fece431..6b90ce30588b 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -654,7 +654,7 @@ with lib.maintainers; { infinisil roberth ]; - scope = "Maintain Nixpkgs module system"; + scope = "Maintain the Nixpkgs module system."; shortName = "Module system"; enableFeatureFreezePing = true; }; From c4604341046500273fa1ab5366d07d509d2ff8c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Mon, 18 Sep 2023 15:03:27 +0000 Subject: [PATCH 77/78] nixos/vaultwarden: Fix doubly-nested `config` value. Fixes evaluation --- nixos/modules/services/security/vaultwarden/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/security/vaultwarden/default.nix b/nixos/modules/services/security/vaultwarden/default.nix index d22e6b5b40cd..0517615a4c6a 100644 --- a/nixos/modules/services/security/vaultwarden/default.nix +++ b/nixos/modules/services/security/vaultwarden/default.nix @@ -60,10 +60,8 @@ in { config = mkOption { type = attrsOf (nullOr (oneOf [ bool int str ])); default = { - config = { - ROCKET_ADDRESS = "::1"; # default to localhost - ROCKET_PORT = 8222; - }; + ROCKET_ADDRESS = "::1"; # default to localhost + ROCKET_PORT = 8222; }; example = literalExpression '' { From ae4acddbb6fd69f29373731694213c425bd7c2d9 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 19 Sep 2023 13:28:13 -0400 Subject: [PATCH 78/78] prismlauncher: include libusb1 as a runtime dependency (#256124) * prismlauncher: include libusb1 as a runtime dependency * prismlauncher: add meta.mainProgram attribute --- pkgs/games/prismlauncher/default.nix | 1 + pkgs/games/prismlauncher/wrapper.nix | 3 +++ 2 files changed, 4 insertions(+) diff --git a/pkgs/games/prismlauncher/default.nix b/pkgs/games/prismlauncher/default.nix index 63c6901326ee..9f260aaba9d5 100644 --- a/pkgs/games/prismlauncher/default.nix +++ b/pkgs/games/prismlauncher/default.nix @@ -98,6 +98,7 @@ rec { dontWrapQtApps = true; meta = with lib; { + mainProgram = "prismlauncher"; homepage = "https://prismlauncher.org/"; description = "A free, open source launcher for Minecraft"; longDescription = '' diff --git a/pkgs/games/prismlauncher/wrapper.nix b/pkgs/games/prismlauncher/wrapper.nix index 89b0b08c229e..c95a5c00bcf0 100644 --- a/pkgs/games/prismlauncher/wrapper.nix +++ b/pkgs/games/prismlauncher/wrapper.nix @@ -17,10 +17,12 @@ , flite , mesa-demos , udev +, libusb1 , msaClientID ? null , gamemodeSupport ? stdenv.isLinux , textToSpeechSupport ? stdenv.isLinux +, controllerSupport ? stdenv.isLinux , jdks ? [ jdk17 jdk8 ] , additionalLibs ? [ ] , additionalPrograms ? [ ] @@ -71,6 +73,7 @@ symlinkJoin { ] ++ lib.optional gamemodeSupport gamemode.lib ++ lib.optional textToSpeechSupport flite + ++ lib.optional controllerSupport libusb1 ++ additionalLibs; runtimePrograms = [